Skip to content

Commit 61ba649

Browse files
0e10e1
committed
Ajustes. #58 
1 parent 211bfee commit 61ba649

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

‎src/step01ggeohash-api.sql

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ CREATE or replace FUNCTION api.br_afacode_encode(
2121
FROM (SELECT afa.br_encode(p_lat,p_lon,p_level), afa.br_cell_area(p_level), afa.br_cell_side(p_level)) l(hbig,area,side),
2222
LATERAL (SELECT afa.hBig_to_hex(hbig), afa.br_decode(hbig)) v(id,geom)
2323
$f$ LANGUAGE SQL IMMUTABLE PARALLEL SAFE;
24-
COMMENT ON FUNCTION api.br_afacode_encode(float,float,float)
24+
COMMENT ON FUNCTION api.br_afacode_encode(float,float,int)
2525
IS 'Encodes lat/lon to AFAcode grid scientific for Brazil.';
2626

2727
CREATE or replace FUNCTION api.cm_afacode_encode(
@@ -42,7 +42,7 @@ CREATE or replace FUNCTION api.cm_afacode_encode(
4242
FROM (SELECT afa.cm_encode(p_lat,p_lon,p_level), afa.cm_cell_area(p_level), afa.cm_cell_side(p_level)) l(hbig,area,side),
4343
LATERAL (SELECT afa.hBig_to_hex(hbig), afa.cm_decode(hbig)) v(id,geom)
4444
$f$ LANGUAGE SQL IMMUTABLE PARALLEL SAFE;
45-
COMMENT ON FUNCTION api.cm_afacode_encode(float,float,float)
45+
COMMENT ON FUNCTION api.cm_afacode_encode(float,float,int)
4646
IS 'Encodes lat/lon to AFAcode grid scientific for Cameroon.';
4747

4848
CREATE or replace FUNCTION api.co_afacode_encode(
@@ -63,7 +63,7 @@ CREATE or replace FUNCTION api.co_afacode_encode(
6363
FROM (SELECT afa.co_encode(p_lat,p_lon,p_level), afa.co_cell_area(p_level), afa.co_cell_side(p_level)) l(hbig,area,side),
6464
LATERAL (SELECT afa.hBig_to_hex(hbig), afa.co_decode(hbig)) v(id,geom)
6565
$f$ LANGUAGE SQL IMMUTABLE PARALLEL SAFE;
66-
COMMENT ON FUNCTION api.co_afacode_encode(float,float,float)
66+
COMMENT ON FUNCTION api.co_afacode_encode(float,float,int)
6767
IS 'Encodes lat/lon to AFAcode grid scientific for Colombia.';
6868

6969
CREATE or replace FUNCTION api.sv_afacode_encode(
@@ -84,7 +84,7 @@ CREATE or replace FUNCTION api.sv_afacode_encode(
8484
FROM (SELECT afa.sv_encode(p_lat,p_lon,p_level), afa.sv_cell_area(p_level), afa.sv_cell_side(p_level)) l(hbig,area,side),
8585
LATERAL (SELECT afa.hBig_to_hex(hbig), afa.sv_decode(hbig)) v(id,geom)
8686
$f$ LANGUAGE SQL IMMUTABLE PARALLEL SAFE;
87-
COMMENT ON FUNCTION api.sv_afacode_encode(float,float,float)
87+
COMMENT ON FUNCTION api.sv_afacode_encode(float,float,int)
8888
IS 'Encodes lat/lon to AFAcode grid scientific for El Salvador.';
8989

9090
CREATE or replace FUNCTION api.afacode_encode(
@@ -263,7 +263,7 @@ CREATE or replace FUNCTION api.br_afacode_encode_log(
263263
LATERAL (SELECT cindex, cbits FROM osmc.encode_short_code(hbig,p_isolabel_ext)) d(cindex, cbits),
264264
LATERAL (SELECT abbrev FROM mvwjurisdiction_synonym_default_abbrev x WHERE x.isolabel_ext = p_isolabel_ext) c(default_abbrev)
265265
$f$ LANGUAGE SQL IMMUTABLE PARALLEL SAFE;
266-
COMMENT ON FUNCTION api.br_afacode_encode_log(float,float,float,text)
266+
COMMENT ON FUNCTION api.br_afacode_encode_log(float,float,int,text)
267267
IS 'Encodes lat/lon to a Logistics AFAcode for Brazil.';
268268

269269
CREATE or replace FUNCTION api.cm_afacode_encode_log(
@@ -291,7 +291,7 @@ CREATE or replace FUNCTION api.cm_afacode_encode_log(
291291
LATERAL (SELECT cindex, cbits FROM osmc.encode_short_code(hbig,p_isolabel_ext)) d(cindex, cbits),
292292
LATERAL (SELECT abbrev FROM mvwjurisdiction_synonym_default_abbrev x WHERE x.isolabel_ext = p_isolabel_ext) c(default_abbrev)
293293
$f$ LANGUAGE SQL IMMUTABLE PARALLEL SAFE;
294-
COMMENT ON FUNCTION api.cm_afacode_encode_log(float,float,float,text)
294+
COMMENT ON FUNCTION api.cm_afacode_encode_log(float,float,int,text)
295295
IS 'Encodes lat/lon to a Logistics AFAcode for Cameroon.';
296296

297297
CREATE or replace FUNCTION api.co_afacode_encode_log(
@@ -319,7 +319,7 @@ CREATE or replace FUNCTION api.co_afacode_encode_log(
319319
LATERAL (SELECT cindex, cbits FROM osmc.encode_short_code(hbig,p_isolabel_ext)) d(cindex, cbits),
320320
LATERAL (SELECT abbrev FROM mvwjurisdiction_synonym_default_abbrev x WHERE x.isolabel_ext = p_isolabel_ext) c(default_abbrev)
321321
$f$ LANGUAGE SQL IMMUTABLE PARALLEL SAFE;
322-
COMMENT ON FUNCTION api.co_afacode_encode_log(float,float,float,text)
322+
COMMENT ON FUNCTION api.co_afacode_encode_log(float,float,int,text)
323323
IS 'Encodes lat/lon to a Logistics AFAcode for Colombia.';
324324

325325
CREATE or replace FUNCTION api.sv_afacode_encode_log(
@@ -347,7 +347,7 @@ CREATE or replace FUNCTION api.sv_afacode_encode_log(
347347
LATERAL (SELECT cindex, cbits FROM osmc.encode_short_code(hbig,p_isolabel_ext)) d(cindex, cbits),
348348
LATERAL (SELECT abbrev FROM mvwjurisdiction_synonym_default_abbrev x WHERE x.isolabel_ext = p_isolabel_ext) c(default_abbrev)
349349
$f$ LANGUAGE SQL IMMUTABLE PARALLEL SAFE;
350-
COMMENT ON FUNCTION api.sv_afacode_encode_log(float,float,float,text)
350+
COMMENT ON FUNCTION api.sv_afacode_encode_log(float,float,int,text)
351351
IS 'Encodes lat/lon to a Logistics AFAcode for El Savador.';
352352

353353
CREATE or replace FUNCTION api.afacode_encode_log(
@@ -360,7 +360,7 @@ CREATE or replace FUNCTION api.afacode_encode_log(
360360
WHEN 'BR' THEN api.br_afacode_encode_log(u[1],u[2],COALESCE(ROUND(( (afa.br_cell_nearst_level(u[3]) ) /5)*5),35),p_isolabel_ext)
361361
WHEN 'CM' THEN api.cm_afacode_encode_log(u[1],u[2],COALESCE(ROUND((LEAST((afa.cm_cell_nearst_level(u[3])+1),36)/5)*5),31),p_isolabel_ext)
362362
WHEN 'CO' THEN api.co_afacode_encode_log(u[1],u[2],COALESCE(ROUND((LEAST((afa.co_cell_nearst_level(u[3])+3),38)/5)*5),33),p_isolabel_ext)
363-
WHEN 'SV' THEN api.sv_afacode_encode_log(u[1],u[2],COALESCE(ROUND((LEAST((afa.sv_cell_nearst_level(u[3]) ),32)/4)*4),28),p_isolabel_ext)
363+
-- WHEN 'SV' THEN api.sv_afacode_encode_log(u[1],u[2],COALESCE(ROUND((LEAST((afa.sv_cell_nearst_level(u[3]) ),32)/4)*4),28),p_isolabel_ext)
364364
ELSE jsonb_build_object('error', 'Jurisdiction not supported.')
365365
END
366366
FROM str_geouri_decode_new(p_uri) t(u)
@@ -615,7 +615,7 @@ CREATE or replace FUNCTION api.sv_afacode_decode_log(
615615
)))::jsonb
616616
FROM
617617
(
618-
SELECT jurisd_local_id, jurisd_base_id, x.abbrev, afa.vbit_to_hBig( afa.hBig_to_vbit(cbits) || natcod.b32nvu_to_vbit(substring(p_code,2)) ) AS hbig
618+
SELECT jurisd_local_id, jurisd_base_id, x.abbrev, afa.vbit_to_hBig( afa.hBig_to_vbit(cbits) || afa.hex_to_hBig(substring(p_code,2)) ) AS hbig
619619
FROM osmc.coverage c
620620
LEFT JOIN optim.jurisdiction j ON c.isolabel_ext = j.isolabel_ext
621621
LEFT JOIN mvwjurisdiction_synonym_default_abbrev x ON c.isolabel_ext = x.isolabel_ext

0 commit comments

Comments
 (0)