diff --git a/db/sql/scripts/park-ride.sql b/db/sql/scripts/park-ride.sql index b46eb7a..ec8e6da 100644 --- a/db/sql/scripts/park-ride.sql +++ b/db/sql/scripts/park-ride.sql @@ -9,17 +9,23 @@ CREATE OR REPLACE VIEW :schema.vw_park_ride AS SELECT entity.osm_id, entity.park_ride, entity.name, entity.st_x, entity.st_y FROM ( --planet_osm_point/node -SELECT osmNode.osm_id, osmNode.park_ride, osmNode.name, st_x(st_transform(osmNode.way, 4326)) AS st_x, st_y(st_transform(osmNode.way, 4326)) AS st_y +SELECT osmNode.osm_id, osmNode.park_ride, osmNode.name, +st_x(st_transform(osmNode.way, 4326)) AS st_x, +st_y(st_transform(osmNode.way, 4326)) AS st_y FROM planet_osm_point AS osmNode WHERE - (osmNode.park_ride IS NULL OR osmNode.park_ride NOT LIKE 'no') + osmNode.park_ride != 'no' + AND osmNode.park_ride IS NOT NULL AND osmNode.proposed IS NULL UNION --planet_osm_polygone/way -SELECT osmWay.osm_id, osmWay.park_ride, osmWay.name, st_x(st_centroid(st_transform(osmWay.way, 4326))) AS st_x, st_y(st_centroid(st_transform(osmWay.way, 4326))) AS st_y +SELECT osmWay.osm_id, osmWay.park_ride, osmWay.name, +st_x(st_centroid(st_transform(osmWay.way, 4326))) AS st_x, +st_y(st_centroid(st_transform(osmWay.way, 4326))) AS st_y FROM planet_osm_polygon AS osmWay WHERE - (osmWay.park_ride IS NULL OR osmWay.park_ride NOT LIKE 'no') + osmNode.park_ride != 'no' + AND osmNode.park_ride IS NOT NULL AND osmWay.proposed IS NULL ) AS entity --consider coordinates inside rvb only