PR review

Author: nlehuby

analysers/analyser_osmosis_relation_public_transport.py

@@ -399,7 +399,7 @@
            WHEN last_roundabout IS NOT NULL THEN
                 CASE
                     WHEN ST_Intersects(last_roundabout,ST_StartPoint(f.geom)) THEN
-                        CASE 
+                        CASE
                           WHEN ST_LineLocatePoint(last_roundabout, ST_EndPoint(full_way)) > ST_LineLocatePoint(last_roundabout, ST_StartPoint(f.geom)) THEN
                             full_way:= ST_MakeLine(full_way,ST_LineSubstring(last_roundabout, ST_LineLocatePoint(last_roundabout, ST_EndPoint(full_way)), 1));
                             full_way:= ST_MakeLine(full_way,ST_LineSubstring(last_roundabout, 0, ST_LineLocatePoint(last_roundabout, ST_StartPoint(f.geom))));
@@ -408,7 +408,7 @@
                         END CASE;
                         full_way:= ST_MakeLine(full_way,f.geom);
                     WHEN ST_Intersects(last_roundabout,ST_EndPoint(f.geom)) THEN
-                        CASE 
+                        CASE
                           WHEN ST_LineLocatePoint(last_roundabout, ST_EndPoint(full_way)) > ST_LineLocatePoint(last_roundabout, ST_EndPoint(f.geom)) THEN
                             full_way:= ST_MakeLine(full_way,ST_LineSubstring(last_roundabout, ST_LineLocatePoint(last_roundabout, ST_EndPoint(full_way)), 1));
                             full_way:= ST_MakeLine(full_way,ST_LineSubstring(last_roundabout, 0, ST_LineLocatePoint(last_roundabout, ST_EndPoint(f.geom))));
@@ -475,7 +475,12 @@
        ROW_NUMBER () OVER (PARTITION BY route_linestring.id
                      ORDER BY stop_platform.morder) AS stop_order,
        ROW_NUMBER () OVER (PARTITION BY route_linestring.id
-                     ORDER BY ST_LineLocatePoint(ST_OffsetCurve(route_linestring.geom, -10), stop_platform.geom) DESC) AS projected_stop_order
+                     ORDER BY ST_LineLocatePoint(ST_OffsetCurve(route_linestring.geom, -10), stop_platform.geom) DESC) AS projected_stop_order,
+       (CASE
+          WHEN LEAD(stop_platform.morder, 1) OVER (PARTITION BY route_linestring.id
+                     ORDER BY stop_platform.morder) IS NULL THEN 1
+          ELSE 0
+       END) AS is_last_platform               
 FROM stop_platform
 JOIN route_linestring ON route_linestring.id = stop_platform.id
 WHERE stop_platform.mrole IN ('platform',
@@ -506,17 +511,10 @@
   ST_AsText(ST_Transform(platform_that_can_project.stop, 4326))
 FROM platform_that_can_project
 JOIN route_linestring ON route_linestring.id = platform_that_can_project.route_id
-JOIN (
-  SELECT
-    platform_that_can_project.route_id AS route_id,
-    MAX(platform_that_can_project.stop_order) AS last_platform
-  FROM platform_that_can_project
-  GROUP BY platform_that_can_project.route_id
-) AS y ON platform_that_can_project.route_id = y.route_id
 WHERE ST_DWithin(route_linestring.geom, platform_that_can_project.stop, 50) AND
   NOT ST_Intersects(ST_Buffer(route_linestring.geom, 50, 'side={}'), platform_that_can_project.stop) AND
   route_linestring.public_transport_mode IN ('bus', 'trolleybus', 'coach', 'share_taxi', 'school_bus') AND
-  platform_that_can_project.stop_order <> last_platform AND
+  platform_that_can_project.is_last_platform <> 1 AND
   platform_that_can_project.stop_order <> 1
 """
 
@@ -566,7 +564,7 @@ def __init__(self, config, logger = None):
         self.callbackA0 = lambda res: {"class":10, "data":[self.node_full, self.positionAsText]}
         self.callback100 = lambda res: {"class":11, "data":[self.relation_full, self.positionAsText]}
         self.callback110 = lambda res: {"class":12, "data":[self.relation_full, self.any_full, self.positionAsText]}
-        
+
         if self.config.options.get("driving_side") == "left":
             self.buffer_driving_side = "left"
         else: