Changes between Version 25 and Version 26 of Rules/PublicTransportGtfs

Timestamp:

2020-10-06T18:36:53+02:00 (5 years ago)

Author:

skyper

Comment:

PTNA url change

Rules/PublicTransportGtfs

@@ -158 +158 @@
 /* {0.tag} without {1.key} or {2.key} (warning level) */
 
-/* stop_are, stop_position, platform */
+/* stop_area, stop_position, platform */
 *.PtStop[!ref:IFOPT][!gtfs:stop_id][public_transport] {
   throwWarning: tr("`{0}` without `{1}*` or `{2}*`.", "{3.tag}", "{1.tag}", "{2.tag}");
@@ -168 +168 @@
 /* {0.key} without {1.key}, {2.key} or {3.key} (warning level) */
 
-/* stop_are, stop_position, platform */
+/* stop_area, stop_position, platform */
 *.PtStop[ref:IFOPT   ][!gtfs:feed][!network:guid][!operator:guid],
 *.PtStop[gtfs:stop_id][!gtfs:feed][!network:guid][!operator:guid] {
@@ -194 +194 @@
 /* {0.tag} without any (warning level) */
 
-/* platform and stop_position */
+/* stop_position */
 /* ToDo: Check against parent relation vehicle type */
 /* ToDo: Extend to check for parent relation value and offer fix */
-*[public_transport =~ /^(platform|stop_position)$/][highway!=bus_stop][public_transport].noPtVehicle {
-  throwWarning: tr("`{0}` without serving vehicle type specified.", "{2.tag}");
-  group: tr("Public Transport GTFS: missing tag");
-  assertMatch:   "relation public_transport=platform";
-  assertNoMatch: "relation public_transport=platform highway=bus_stop";
+/* *[public_transport =~ /^(platform|stop_position)$/][highway!=bus_stop][public_transport].noPtVehicle { */
+/* needs check the other way around as access tags are problematic with ways */
+node[public_transport=stop_position][highway!=bus_stop].noPtVehicle {
+  throwWarning: tr("`{0}` without serving vehicle type specified.", "{0.tag}");
+  group: tr("Public Transport GTFS: missing tag");
+  assertMatch:   "node public_transport=stop_position";
+  assertNoMatch: "node public_transport=stop_position bus=yes";
+  assertNoMatch: "node public_transport=stop_position highway=bus_stop";
 } 
+
+/* {0.tag} without any (info level) */
+
+/* platform */
+/* node[public_transport=platform][highway!=bus_stop].noPtVehicle {
+  throwInfo: tr("`{0}` without serving vehicle type specified.", "{0.tag}");
+  group: tr("Public Transport GTFS: missing tag");
+  assertMatch:   "node public_transport=platform";
+  assertNoMatch: "node public_transport=platform bus=yes";
+  assertNoMatch: "node public_transport=platform highway=bus_stop";
+} */
 
 /* {0.tag} and {1.tag} without {2.key} (warning level) */
@@ -391 +405 @@
 /* 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 `release_date` behind the network value with a minus `-` as separator.", "{0.key}");
+*[url     =~ /^.*ptna\.openstreetmap\.de\/gtfs.+$/][url     !~ /^.*(network=([a-zA-Z]+[-]){2,}|release_date=)\d{4}(-\d\d){2}.*$/], 
+*[website =~ /^.*ptna\.openstreetmap\.de\/gtfs.+$/][website !~ /^.*(network=([a-zA-Z]+[-]){2,}|release_date=)\d{4}(-\d\d){2}.*$/],
+*[source  =~ /^.*ptna\.openstreetmap\.de\/gtfs.+$/][source  !~ /^.*(network=([a-zA-Z]+[-]){2,}|release_date=)\d{4}(-\d\d){2}.*$/] {
+  throwWarning: tr("Relative GTFS url in `{0}=*`. Add `{1}` behind the feed or network value.", "{0.key}", "&release_date=*");
   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\"";
+  assertNoMatch: "node source=\"https://ptna.openstreetmap.de/gtfs/DE/trips.php?feed=DE-BW-VAG&release_date=2020-07-28&route_id=10-10-I-j20-1\"";
 }