Changes between Version 23 and Version 24 of Rules/PublicTransportGtfs

Timestamp:

2020-08-14T14:19:22+02:00 (6 years ago)

Author:

skyper

Comment:

warn about missing feed info and relative PTNA GTFS urls.

Rules/PublicTransportGtfs

@@ -65 +65 @@
   set PtRouteMaster;
 }
-/* Not only relations as ferry can be a way */
-*[type=route              ][route        =~ /^(bus|coach|share_taxi|trolleybus|train|light_rail|subway|tram|monorail|funicular|ferry|aerialway|school_bus|walking_bus)$/] {
+/* Note: Only relations, routes on way are not supported  */
+relation[type=route              ][route        =~ /^(bus|coach|share_taxi|trolleybus|train|light_rail|subway|tram|monorail|funicular|ferry|aerialway|school_bus|walking_bus)$/] {
   set PtRoute;
 }
@@ -78 +78 @@
 }
 
+*[public_transport =~ /^(platform|stop_area|stop_position)$/] {
+  set PtStop;
+}
+
 /*  -----------------------
  *
@@ -90 +94 @@
 /* {0.tag} without {1.key} (error level) */
 
-/* route_master and route relations, ToDo ferry on ways */
+/* route_master and route relations */
 
 /* {0.tag} without {1.key} (warning level) */
 
-/* stop_position, platform */
+/* stop_area, stop_position, platform */
 *[public_transport =~ /^(platform|stop_position)$/][public_transport][!local_ref],
-*[public_transport =~ /^(platform|stop_position)$/][public_transport][!network] {
+*.PtStop[public_transport][!network] {
   throwWarning: tr("`{0}` without `{1}*`.", "{1.tag}", "{2.tag}");
   group: tr("Public Transport GTFS: missing tag");
@@ -104 +108 @@
 }
 
-/* stop_area */
-
-/* route_master and route relations, ToDo ferry on ways */
+/* route_master and route relations */
 relation.PtRouteMaster[type=route_master][!colour],
 relation.PtRouteMaster[type=route_master][!fee],
@@ -142 +144 @@
 /* {0.tag} without {1.key} (info level) */
 
-/* route_master and route relations, ToDo ferry on ways */
+/* route_master and route relations */
 relation.PtRouteMaster[type=route_master][!network:short],
 relation.PtRouteMaster[type=route_master][!operator:short],
@@ -155 +157 @@
 /* {0.tag} without {1.key} or {2.key} (warning level) */
 
-/* stop_position, platform */
-*[public_transport =~ /^(platform|stop_area|stop_position)$/][!ref:IFOPT][!gtfs:stop_id][public_transport] {
+/* stop_are, stop_position, platform */
+*.PtStop[!ref:IFOPT][!gtfs:stop_id][public_transport] {
   throwWarning: tr("`{0}` without `{1}*` or `{2}*`.", "{3.tag}", "{1.tag}", "{2.tag}");
   group: tr("Public Transport GTFS: missing tag");
@@ -163 +165 @@
 }
 
-/* {0.tag} without {1.key}, {2.key} or {3.key} (warning level) */
-
-/* stop_position, platform */
-
-/* stop_area */
-
-/* route_master and route relations, ToDo ferry on ways */
+/* {0.key} without {1.key}, {2.key} or {3.key} (warning level) */
+
+/* stop_are, stop_position, platform */
+*.PtStop[ref:IFOPT   ][!gtfs:feed][!network:guid][!operator:guid],
+*.PtStop[gtfs:stop_id][!gtfs:feed][!network:guid][!operator:guid] {
+  throwWarning: tr("Public transport stop with `{0}=*` but none of `{1}*`, `{2}*` or `{3}*`.", "{1.key}", "{2.tag}", "{3.tag}", "{4.tag}");
+  group: tr("Public Transport GTFS: missing tag");
+  assertMatch:   "node public_transport=stop_position ref:IFOPT=A";
+  assertNoMatch: "node public_transport=stop_position ref:IFOPT=A gtfs:feed=A";
+}
+
+/* route_master and route relations */
 relation["public_transport:version"=2].PtRoute[!gtfs:shape_id][!gtfs:trip_id][!gtfs:trip_id:sample],
 relation[gtfs:route_id].PtRouteMaster[!gtfs:feed][!network:guid][!operator:guid],
@@ -179 +186 @@
   group: tr("Public Transport GTFS: missing tag");
   assertMatch:   "relation type=route_master route_master=train gtfs:route_id=0-7-242-19j-1";
+  assertNoMatch: "relation type=route_master route_master=train gtfs:route_id=0-7-242-19j-1 network:guid=DE-BY-MVV";
   assertMatch:   "relation type=route route=bus gtfs:shape_id=0-7-242-19j-1.26.R";
-  assertNoMatch: "relation type=route_master route_master=train gtfs:route_id=0-7-242-19j-1 network:guid=DE-BY-MVV";
-  assertNoMatch: "relation type=route_master route=bus colour=green";
+  assertNoMatch: "relation type=route_master route=bus";
 }
 
@@ -360 +367 @@
 relation.PtRoute[network      ][!network:short][network =~ /^[A-Z0-9]+$/] {
   throwWarning: tr(" `{0}` looks like an abbreviation", "{1.tag}");
-  group: tr("Public Transport GTFS: value syntax");
+  group: tr("Public Transport GTFS: abbreviation as value");
   suggestAlternative: "`network:short=*` and a longer form for `network=*`"; 
   fixChangeKey: "network=>network:short";
@@ -373 +380 @@
 relation.PtRoute[operator      ][!operator:short][operator =~ /^[A-Z0-9]+$/] {
   throwWarning: tr(" `{0}` looks like an abbreviation", "{1.tag}");
-  group: tr("Public Transport GTFS: value syntax");
+  group: tr("Public Transport GTFS: abbreviation as value");
   suggestAlternative: "`operator:short=*` and a longer form for `operator=*`"; 
   fixChangeKey: "operator=>operator:short";
@@ -379 +386 @@
   assertNoMatch: "relation public_transport=stop_area operator=AA0AA operator:short=A";
   assertNoMatch: "relation public_transport=stop_area operator=Anna";
+}
+
+/* Permanet links to PTNA GTFS */
+/* *[JOSM_search("ptna.openstreetmap.de/gtfs")][!JOSM_search("^.*network=([a-zA-Z]+[-]){2,}\\d{4}(-\\d\\d){2}.*$")] { */
+*[url     =~ /^.*ptna\.openstreetmap\.de\/gtfs.+$/][url     !~ /^.*network=([a-zA-Z]+[-]){2,}\d{4}(-\d\d){2}.*$/], 
+*[website =~ /^.*ptna\.openstreetmap\.de\/gtfs.+$/][website !~ /^.*network=([a-zA-Z]+[-]){2,}\d{4}(-\d\d){2}.*$/],
+*[source  =~ /^.*ptna\.openstreetmap\.de\/gtfs.+$/][source  !~ /^.*network=([a-zA-Z]+[-]){2,}\d{4}(-\d\d){2}.*$/] {
+  throwWarning: tr("Relative GTFS url in `{0}=*`. Add the `source_date` behind the network value with a minus `-` as separator.", "{0.key}");
+  assertMatch:   "node source=\"https://ptna.openstreetmap.de/gtfs/19\"";
+  assertNoMatch: "node source=\"https://ptna.openstreetmap.de/gtfs/DE/trips.php?network=DE-BW-VAG-2020-07-28&route_id=10-10-I-j20-1\"";
 }