hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-03-11 21:34:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

rename ambiguous variables to make postgresql 8.4 happy

Browse Source
This commit is contained in:
Sarah Hoffmann
2012-05-24 00:25:15 +02:00
parent 410ce603f7
commit 1e307392b2
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
sql/functions.sql
View File

@@ -598,8 +598,8 @@ BEGIN
isArea := true; isArea := true;
centroid := ST_Centroid(geometry); centroid := ST_Centroid(geometry);
FOR geometry IN select split_geometry(geometry) as geometry LOOP FOR secgeo IN select split_geometry(geometry) AS geom LOOP
x := insertLocationAreaLarge(partition, place_id, country_code, keywords, rank_search, rank_address, false, centroid, geometry); x := insertLocationAreaLarge(partition, place_id, country_code, keywords, rank_search, rank_address, false, centroid, secgeo);
END LOOP; END LOOP;
ELSEIF rank_search < 26 THEN ELSEIF rank_search < 26 THEN
@@ -2878,10 +2878,10 @@ BEGIN
IF st_intersects(geometry, secbox) THEN IF st_intersects(geometry, secbox) THEN
secgeo := st_intersection(geometry, secbox); secgeo := st_intersection(geometry, secbox);
IF NOT ST_IsEmpty(secgeo) AND ST_GeometryType(secgeo) in ('ST_Polygon','ST_MultiPolygon') THEN IF NOT ST_IsEmpty(secgeo) AND ST_GeometryType(secgeo) in ('ST_Polygon','ST_MultiPolygon') THEN
FOR geo IN select quad_split_geometry(secgeo, maxarea, remainingdepth) as geometry LOOP FOR geo IN select quad_split_geometry(secgeo, maxarea, remainingdepth) as geom LOOP
IF NOT ST_IsEmpty(geo.geometry) AND ST_GeometryType(geo.geometry) in ('ST_Polygon','ST_MultiPolygon') THEN IF NOT ST_IsEmpty(geo.geom) AND ST_GeometryType(geo.geom) in ('ST_Polygon','ST_MultiPolygon') THEN
added := added + 1; added := added + 1;
RETURN NEXT geo.geometry; RETURN NEXT geo.geom;
END IF; END IF;
END LOOP; END LOOP;
END IF; END IF;
@@ -2900,8 +2900,8 @@ DECLARE
geo RECORD; geo RECORD;
BEGIN BEGIN
-- 10000000000 is ~~ 1x1 degree -- 10000000000 is ~~ 1x1 degree
FOR geo IN select quad_split_geometry(geometry, 0.25, 20) as geometry LOOP FOR geo IN select quad_split_geometry(geometry, 0.25, 20) as geom LOOP
RETURN NEXT geo.geometry; RETURN NEXT geo.geom;
END LOOP; END LOOP;
RETURN; RETURN;
END; END;