Changes between Version 12 and Version 13 of Rules/PublicTransportGtfs

Timestamp:

2020-07-25T14:54:37+02:00 (6 years ago)

Author:

skyper

Comment:

test stops for vehicle

Rules/PublicTransportGtfs

@@ -55 +55 @@
 }
 
-/*  Class  */
+/*  -----------------------
+ *
+ *       Classes
+ */
 
 relation[type=route_master][route_master =~ /^(bus|share_taxi|trolleybus|train|tram|light_rail|subway|monorail|ferry)$/] {
@@ -70 +73 @@
 }
 
-
-/*  Rules  */
-
-/*  -----------------------
+*[!aerialway][bus!=yes][share_taxi!=yes][trolleybus!=yes][train!=yes][tram!=yes][light_rail!=yes][subway!=yes][monorail!=yes][ferry!=yes] {
+  set noPtVehicle;
+}
+
+/*  -----------------------
+ *
+ *        Rules
+ */
+
+/*  -----------------------
+ *
  *  missing tag
  */
@@ -166 +176 @@
 }
 
+/* {0.tag} without any (warning level) */
+
+/* platform and stop_position */
+*[public_transport =~ /^(platform|stop_position)$/][highway!=bus_stop][public_transport].noPtVehicle {
+  throwWarning: tr("`{0}` without serving vehicle type specified.", "{1.tag}");
+  group: tr("Public Transport GTFS: missing tag");
+  assertMatch:   "relation public_transport=platform";
+  assertNoMatch: "relation public_transport=platform highway=bus_stop";
+} 
+
 /* {0.tag} and {1.tag} without {2.key} (warning level) */
 
@@ -180 +200 @@
 
 /* platform */
-*[public_transport=platform][highway=bus_stop][bus!=yes][share_taxi!=yes][trolleybus!=yes] {
-  throwWarning: tr("`{0}` with `{1}` but none of `{2}*`, `{3}*` or `{4}*`.", "{0.tag}", "{1.tag}", "{2.tag}", "{3.tag}", "{4.tag}");
+*[public_transport =~ /^(platform|stop_position)$/][highway=bus_stop][bus!=yes][share_taxi!=yes][trolleybus!=yes][public_transport] {
+  throwWarning: tr("`{0}` with `{1}` but none of `{2}*`, `{3}*` or `{4}*`.", "{5.tag}", "{1.tag}", "{2.tag}", "{3.tag}", "{4.tag}");
   group: tr("Public Transport GTFS: missing tag");
   assertMatch:   "node public_transport=platform highway=bus_stop";
@@ -261 +281 @@
  */
 
+/* ref:IFOPT, gtfs:stop_id, local_ref */
+*[public_transport][public_transport =~ /^(platform|stop_position)$/][!(tag("local_ref") == get(regexp_match("^(.*:){4}([1-9][0-9]?)", tag("ref:IFOPT")), 2))][local_ref][ref:IFOPT] {
+  throwWarning:  tr("`{0}` conflicts with `{1}`.", "{3.tag}", "{4.tag}");
+  group: tr("Public Transport GTFS: conflicting tags");
+  assertMatch:   "relation public_transport=platform local_ref=14 ref:IFOPT=de:08315:6504:0:1";
+  assertNoMatch: "relation public_transport=platform local_ref=14 ref:IFOPT=de:08315:6504:0:14";
+  assertNoMatch: "relation public_transport=platform local_ref=14 ref:IFOPT=de:08315:6504:14";
+}
+
 /* route_id, shape_id, trip_id */
 /* FIXME: How to check proper syntax with multiple values */
@@ -297 +326 @@
 }
 
-/* ref:IFOPT, gtfs:stop_id, local_ref */
-*[public_transport][public_transport =~ /^(platform|stop_position)$/][!(tag("local_ref") == get(regexp_match("^(.*:){4}([1-9][0-9]?)", tag("ref:IFOPT")), 2))][local_ref][ref:IFOPT] {
-  throwWarning:  tr("`{0}` conflicts with `{1}`.", "{3.tag}", "{4.tag}");
-  group: tr("Public Transport GTFS: conflicting tags");
-  assertMatch:   "relation public_transport=platform local_ref=14 ref:IFOPT=de:08315:6504:0:1";
-  assertNoMatch: "relation public_transport=platform local_ref=14 ref:IFOPT=de:08315:6504:0:14";
-  assertNoMatch: "relation public_transport=platform local_ref=14 ref:IFOPT=de:08315:6504:14";
-}
-
 
 /*  -----------------------