dancingCycle
/
osm-rvb
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(db): do not consider osm_user and osm_timestamp in sql/scripts/poi.sql

This commit is contained in:
dancingCycle 2023-06-12 13:50:46 +02:00
parent 0b640c14cb
commit 759039a181
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
db/sql/scripts/poi.sql
View File

@ -16,7 +16,7 @@ SELECT foo.id, foo.osm_id, foo.name, foo.kategorie, lk.name as landkreis,
foo.operator, array_to_string(ARRAY[foo.phone, foo.phone2], ' ') AS phone, foo.operator, array_to_string(ARRAY[foo.phone, foo.phone2], ' ') AS phone,
array_to_string(ARRAY[foo.website, foo.website2], ' ') AS website, foo.opening_hours, foo."addr:street" AS adr_street, array_to_string(ARRAY[foo.website, foo.website2], ' ') AS website, foo.opening_hours, foo."addr:street" AS adr_street,
foo."addr:housenumber" AS adr_housenumber, foo."addr:postcode" AS adr_postcode, foo."addr:city" AS adr_city, foo."addr:housenumber" AS adr_housenumber, foo."addr:postcode" AS adr_postcode, foo."addr:city" AS adr_city,
foo."addr:country" AS adr_country, foo.wikipedia, foo.st_x, foo.st_y, foo.osm_typ, osm_user, osm_timestamp, st_geomfromtext('POINT(' || foo.st_x || ' ' || foo.st_y ||')',4326) as the_geom foo."addr:country" AS adr_country, foo.wikipedia, foo.st_x, foo.st_y, foo.osm_typ, st_geomfromtext('POINT(' || foo.st_x || ' ' || foo.st_y ||')',4326) as the_geom
FROM ( FROM (
-- Block fuer den Bereich NODE -- Block fuer den Bereich NODE
SELECT 'ON'||cast(p.osm_id as text) as id, p.osm_id, p.amenity, p.building, p.historic, p.information, p.leisure, p.office, p.tourism, p.sport, p.landuse, p.shop, SELECT 'ON'||cast(p.osm_id as text) as id, p.osm_id, p.amenity, p.building, p.historic, p.information, p.leisure, p.office, p.tourism, p.sport, p.landuse, p.shop,
@ -94,8 +94,7 @@ SELECT foo.id, foo.osm_id, foo.name, foo.kategorie, lk.name as landkreis,
--- Zusaetzliche Punkte VBN --- Zusaetzliche Punkte VBN
---WHEN id IN (SELECT osm_id FROM tbl_poi_zusatz WHERE aktiv = TRUE) THEN tbt_poi.zusatz.kat ---WHEN id IN (SELECT osm_id FROM tbl_poi_zusatz WHERE aktiv = TRUE) THEN tbt_poi.zusatz.kat
ELSE 999 ELSE 999
END AS kategorie, END AS kategorie
osm_user, osm_timestamp
FROM planet_osm_point p FROM planet_osm_point p
WHERE p.proposed is null --- damit keine geplanten Gebäude etc übernommen werden WHERE p.proposed is null --- damit keine geplanten Gebäude etc übernommen werden
@ -170,8 +169,7 @@ SELECT foo.id, foo.osm_id, foo.name, foo.kategorie, lk.name as landkreis,
--- Zusaetzliche Punkte VBN --- Zusaetzliche Punkte VBN
---WHEN id IN (SELECT osm_id FROM tbl_poi_zusatz WHERE aktiv = TRUE) THEN tbt_poi.zusatz.kat ---WHEN id IN (SELECT osm_id FROM tbl_poi_zusatz WHERE aktiv = TRUE) THEN tbt_poi.zusatz.kat
ELSE 999 ELSE 999
END AS kategorie, END AS kategorie
osm_user, osm_timestamp
---,st_transform(st_centroid(p.way), 4326) AS the_geom ---,st_transform(st_centroid(p.way), 4326) AS the_geom
FROM planet_osm_polygon p FROM planet_osm_polygon p
WHERE p.proposed is null AND p.osm_id > 0 -- Ausschluss der Relationen WHERE p.proposed is null AND p.osm_id > 0 -- Ausschluss der Relationen
@ -179,7 +177,7 @@ SELECT foo.id, foo.osm_id, foo.name, foo.kategorie, lk.name as landkreis,
UNION UNION
SELECT rel.id, rel.osm_id, rel.amenity, rel.building, rel.historic, rel.information, rel.leisure, rel.office, rel.tourism, rel.sport, rel.landuse, rel.shop, SELECT rel.id, rel.osm_id, rel.amenity, rel.building, rel.historic, rel.information, rel.leisure, rel.office, rel.tourism, rel.sport, rel.landuse, rel.shop,
rel.recycling_type, rel.social_facility, rel.name, rel.operator, avg(st_x) as st_x, avg(st_y) as st_y, rel.osm_typ, rel.link, rel.website, rel.phone, rel.phone2, rel.recycling_type, rel.social_facility, rel.name, rel.operator, avg(st_x) as st_x, avg(st_y) as st_y, rel.osm_typ, rel.link, rel.website, rel.phone, rel.phone2,
rel.website2, rel.opening_hours, rel."addr:street", rel."addr:housenumber", rel."addr:postcode", rel."addr:city", rel."addr:country", rel.wikipedia, rel.kategorie, rel.osm_user, rel.osm_timestamp rel.website2, rel.opening_hours, rel."addr:street", rel."addr:housenumber", rel."addr:postcode", rel."addr:city", rel."addr:country", rel.wikipedia, rel.kategorie
FROM FROM
(SELECT 'OR'||cast(p.osm_id * -1 as text) as id, p.osm_id, p.amenity, p.building, p.historic, p.information, p.leisure, p.office, p.tourism, p.sport, p.landuse, p.shop, (SELECT 'OR'||cast(p.osm_id * -1 as text) as id, p.osm_id, p.amenity, p.building, p.historic, p.information, p.leisure, p.office, p.tourism, p.sport, p.landuse, p.shop,
p.recycling_type, p.social_facility, p.name, p.operator, st_x(st_centroid(st_transform(p.way, 4326))) AS st_x, p.recycling_type, p.social_facility, p.name, p.operator, st_x(st_centroid(st_transform(p.way, 4326))) AS st_x,
@ -254,8 +252,7 @@ SELECT foo.id, foo.osm_id, foo.name, foo.kategorie, lk.name as landkreis,
--- Zusaetzliche Punkte VBN --- Zusaetzliche Punkte VBN
---WHEN id IN (SELECT osm_id FROM tbl_poi_zusatz WHERE aktiv = TRUE) THEN tbt_poi.zusatz.kat ---WHEN id IN (SELECT osm_id FROM tbl_poi_zusatz WHERE aktiv = TRUE) THEN tbt_poi.zusatz.kat
ELSE 999 ELSE 999
END AS kategorie, END AS kategorie
osm_user, osm_timestamp
FROM planet_osm_polygon p FROM planet_osm_polygon p
WHERE p.proposed is null AND p.osm_id < 0 -- Relationen WHERE p.proposed is null AND p.osm_id < 0 -- Relationen
@ -264,7 +261,7 @@ SELECT foo.id, foo.osm_id, foo.name, foo.kategorie, lk.name as landkreis,
rel.id, rel.osm_id, rel.amenity, rel.building, rel.historic, rel.information, rel.leisure, rel.office, rel.tourism, rel.sport, rel.landuse, rel.shop, rel.id, rel.osm_id, rel.amenity, rel.building, rel.historic, rel.information, rel.leisure, rel.office, rel.tourism, rel.sport, rel.landuse, rel.shop,
rel.recycling_type, rel.social_facility, rel.name, rel.operator, rel.osm_typ, rel.link, rel.website, rel.phone, rel.phone2, rel.recycling_type, rel.social_facility, rel.name, rel.operator, rel.osm_typ, rel.link, rel.website, rel.phone, rel.phone2,
rel.website2, rel.opening_hours, rel."addr:street", rel."addr:housenumber", rel."addr:postcode", rel."addr:city", rel."addr:country", rel.website2, rel.opening_hours, rel."addr:street", rel."addr:housenumber", rel."addr:postcode", rel."addr:city", rel."addr:country",
rel.wikipedia, rel.kategorie, rel.osm_user, rel.osm_timestamp rel.wikipedia, rel.kategorie
) AS foo ) AS foo
LEFT JOIN vw_counties lk ON st_contains(lk.way, st_transform(st_geomfromtext('POINT(' || foo.st_x || ' ' || foo.st_y ||')',4326),3857)) LEFT JOIN vw_counties lk ON st_contains(lk.way, st_transform(st_geomfromtext('POINT(' || foo.st_x || ' ' || foo.st_y ||')',4326),3857))