Changes between Version 10 and Version 11 of Rules/PublicTransportGtfs

Timestamp:

2020-07-24T20:22:17+02:00 (6 years ago)

Author:

skyper

Comment:

fixes of assert and typos

Rules/PublicTransportGtfs

@@ -78 +78 @@
   group: tr("Public Transport: missing tag");
   assertMatch:   "node public_transport=stop_position";
-  assertNoMatch: "node public_transport=stop_position local_ref=2";
   assertMatch:   "way public_transport=platform";
-  assertNoMatch: "way public_transport=platform network=blabla";
+  assertNoMatch: "node public_transport=stop_position network=a local_ref=2";
 }
 
@@ -119 +118 @@
   assertMatch:   "relation type=route route=train";
   assertMatch:   "relation type=route_master route_master=bus";
-  assertNoMatch: "relation type=route route=train network:short=MVV";
-  assertNoMatch: "relation type=route_master route_master=bus colour=green";
+/* Does not make sense with that many keys above */
+/*  assertNoMatch: "relation type=route route=train network:short=MVV";
+  assertNoMatch: "relation type=route_master route_master=bus colour=green"; */
 }
 
@@ -164 +164 @@
 /* {0.tag} and {1.tag} without {2.key} (warning level) */
 /* platform */
-*[public_transport=platform][highway=bus_stop][bus!=yes][share_taxi!=yes][trolleybus=yes] {
+*[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}");
   group: tr("Public Transport GTFS: missing tag");
-  assertMatch: "node public_transport=platrom highway=bus_stop";
-  assertNoMatch: "node public_transport=platrom highway=bus_stop bus=yes";
+  assertMatch: "node public_transport=platform highway=bus_stop";
+  assertNoMatch: "node public_transport=platform highway=bus_stop bus=yes";
 }
 
@@ -178 +178 @@
 *[gtfs:shape_id][gtfs:shape_id             !~                           /^[0-9]{1,2}-[1-9][0-9]{0,2}(-[A-Z])?-j[1-9][0-9j]-[1-9][0-9]?\.[1-9][0-9]?\.[HR]$/],
 *[gtfs:trip_id][gtfs:trip_id               !~ /^[1-9][0-9]{0,3}\.T[023A]\.[0-9]{1,2}-[1-9][0-9]{0,2}(-[A-Z])?-j[1-9][0-9j]-[1-9][0-9]?\.[1-9][0-9]?\.[HR]$/],
-*[gtfs:trip_id:sample][gtfs:trip_id:sample !~ /^[1-9][0-9]{0,3}\.T[023A]\.[0-9]{1,2}-[1-9][0-9]{0,2}(-[A-Z])?-j[1-9][0-9j]-[1-9][0-9]?\.[1-9][0-9]?\.[HR]$/],
-*[gtfs:feed][gtfs:feed         !~ /^(([A-Z]{2}-){2}[a-zA-Z]{2}.*|DE-SPNV|DE-S-und-U-Bahnen|DK-Alle)$/],
-*[network:guid][network:guid   !~  /^([A-Z]{2}-){2}[a-zA-Z]{2}.*$/], 
-*[operator:guid][operator:guid !~  /^([A-Z]{2}-){2}[a-zA-Z]{2}.*$/],
-*[gtfs:source_date][gtfs:source_date !~ /^20(1[7-9]|20)-(0[1-9]|1[0-2])-(3[01]|[12][0-9]|0[1-9])$/], 
-*[ref:IFOPT][ref:IFOPT       !~ /^[a-z]{2}:[0-9]{5}:[1-9][0-9]{0,4}(:[0-9]{1,2}(:[1-9][0-9]?)?)?$/],
-*[gtfs:stop_id][gtfs:stop_id !~ /^[a-z]{2}:[0-9]{4,5}:[1-9][0-9]{0,4}(:[0-9]{1,2}(:[1-9][0-9]?)?)?$/] {
+*[gtfs:trip_id:sample][gtfs:trip_id:sample !~ /^[1-9][0-9]{0,3}\.T[023A]\.[0-9]{1,2}-[1-9][0-9]{0,2}(-[A-Z])?-j[1-9][0-9j]-[1-9][0-9]?\.[1-9][0-9]?\.[HR]$/] {
   throwError: tr("Value `{0}` for `{1}=*` does not match value syntax.", "{0.value}", "{0.key}");
 /*  throwError: tr("Value `{0}` for `{1}=*` does not match value syntax `{2}`.", "{0.value}", "{0.key}", "{1.value}"); */
   group: tr("Public Transport GTFS: value syntax");
+  set GtfsIdSyntax;
   assertMatch:   "relation gtfs:route_id=7-342-j1j-1.H";
   assertNoMatch: "relation gtfs:route_id=7-342-j1j-1";
@@ -199 +194 @@
   assertNoMatch: "relation gtfs:trip_id=29.T0.7-342-j1j-1.50.H";
   assertNoMatch: "relation gtfs:trip_id=2.TA.90-742-B-j20-1.4.R";
+}
+/* FIXME: Get proper syntax as regex displayed.
+/* ref:IFOPT, gtfs:stop_id, gtfs:feed, *:guid, gtfs:source_date */
+*[gtfs:feed][gtfs:feed         !~ /^(([A-Z]{2}-){2}[a-zA-Z]{2}.*|DE-SPNV|DE-S-und-U-Bahnen|DK-Alle)$/],
+*[network:guid][network:guid   !~  /^([A-Z]{2}-){2}[a-zA-Z]{2}.*$/], 
+*[operator:guid][operator:guid !~  /^([A-Z]{2}-){2}[a-zA-Z]{2}.*$/],
+*[gtfs:source_date][gtfs:source_date !~ /^20(1[7-9]|20)-(0[1-9]|1[0-2])-(3[01]|[12][0-9]|0[1-9])$/], 
+*[ref:IFOPT][ref:IFOPT       !~ /^[a-z]{2}:[0-9]{5}:[1-9][0-9]{0,4}(:[0-9]{1,2}(:[1-9][0-9]?)?)?$/],
+*[gtfs:stop_id][gtfs:stop_id !~ /^[a-z]{2}:[0-9]{4,5}:[1-9][0-9]{0,4}(:[0-9]{1,2}(:[1-9][0-9]?)?)?$/] {
+  throwError: tr("Value `{0}` for `{1}=*` does not match value syntax.", "{0.value}", "{0.key}");
+/*  throwError: tr("Value `{0}` for `{1}=*` does not match value syntax `{2}`.", "{0.value}", "{0.key}", "{1.value}"); */
+  group: tr("Public Transport GTFS: value syntax");
   assertMatch:   "relation gtfs:feed=DE-SH.NAH";
-  assertNoMatch: "relation gtfs:feed=df-SL-saarVV";
+  assertMatch:   "relation gtfs:feed=df-SL-saarVV";
   assertNoMatch: "relation gtfs:feed=DE-SH-NAH.SH";
   assertNoMatch: "relation gtfs:feed=DE-BY-VVM-Mittelschwaben";
@@ -225 +232 @@
 throwError: tr("`{1}` and `{0}` are not equal.", "{0.tag}", "{1.tag}");
   group: tr("Public Transport GTFS: conflicting tags");
-}
-*[gtfs:shape_id][gtfs:trip_id][!(tag("gtfs:shape_id") == get(regexp_match("^[1-9][0-9]{0,3}\\.T[023A]\\.(.+)$", tag("gtfs:trip_id")), 1))],
-*[gtfs:shape_id][gtfs:trip_id:sample][!(tag("gtfs:shape_id") == get(regexp_match("^[1-9][0-9]{0,3}\\.T[023A]\\.(.+)$", tag("gtfs:trip_id:sample")), 1))],
-*[gtfs:route_id][gtfs:shape_id][!(tag("gtfs:route_id") == get(regexp_match("^(.+)\\.[1-9][0-9]?\\.[HR]$", tag("gtfs:shape_id"), "d"), 1))],
-*[gtfs:route_id][gtfs:trip_id][!(tag("gtfs:route_id") == get(regexp_match("^[1-9][0-9]{0,3}\\.T[023A]\\.(.+)\\.[1-9][0-9]?\\.[HR]$", tag("gtfs:trip_id")), 1))],
-*[gtfs:route_id][gtfs:trip_id:sample][!(tag("gtfs:route_id") == get(regexp_match("^[1-9][0-9]{0,3}\\.T[023A]\\.(.+)\\.[1-9][0-9]?\\.[HR]$", tag("gtfs:trip_id:sample")), 1))] {
+  assertMatch:   "relation gtfs:trip_id:sample=1108.T5.11-4-I-j20-1.10.H gtfs:trip_id=1108.T2.11-4-I-j20-1.10.H";
+  assertNoMatch: "relation gtfs:trip_id:sample=1108.T2.11-4-I-j20-1.10.H gtfs:trip_id=1108.T2.11-4-I-j20-1.10.H";
+}
+*[gtfs:shape_id][gtfs:trip_id       ]!.GtfsIdSyntax[!(tag("gtfs:shape_id") == get(regexp_match("^[1-9][0-9]{0,3}\\.T[023A]\\.(.+)$", tag("gtfs:trip_id")), 1))],
+*[gtfs:shape_id][gtfs:trip_id:sample]!.GtfsIdSyntax[!(tag("gtfs:shape_id") == get(regexp_match("^[1-9][0-9]{0,3}\\.T[023A]\\.(.+)$", tag("gtfs:trip_id:sample")), 1))],
+*[gtfs:route_id][gtfs:shape_id      ]!.GtfsIdSyntax[!(tag("gtfs:route_id") == get(regexp_match("^(.+)\\.[1-9][0-9]?\\.[HR]$", tag("gtfs:shape_id")), 1))],
+*[gtfs:route_id][gtfs:trip_id       ]!.GtfsIdSyntax[!(tag("gtfs:route_id") == get(regexp_match("^[1-9][0-9]{0,3}\\.T[023A]\\.(.+)\\.[1-9][0-9]?\\.[HR]$", tag("gtfs:trip_id")), 1))],
+*[gtfs:route_id][gtfs:trip_id:sample]!.GtfsIdSyntax[!(tag("gtfs:route_id") == get(regexp_match("^[1-9][0-9]{0,3}\\.T[023A]\\.(.+)\\.[1-9][0-9]?\\.[HR]$", tag("gtfs:trip_id:sample")), 1))] {
   throwError: tr("`{1}` is not a substring of `{0}`.", "{0.tag}", "{1.tag}"); 
   group: tr("Public Transport GTFS: conflicting tags");
-  assertMatch:   "relation gtfs:route_id=7-342-j1j-1 gtfs:shape_id=7-342-j1j-1";
   assertMatch:   "relation gtfs:route_id=7-342-j1j-1 gtfs:shape_id=7-352-j1j-1.17.H";
-  assertMatch:   "relation gtfs:route_id=7-342-j1j-1 gtfs:shape_id=T7-342-j1j-1.17.H";
   assertNoMatch: "relation gtfs:route_id=7-342-j1j-1 gtfs:shape_id=7-342-j1j-1.17.H";
-  assertMatch:   "relation gtfs:route_id=11-4-I-j20-1 gtfs:trip_id=1108.T2.11-4-I-j20-1.10.";
+  assertNoMatch: "relation gtfs:route_id=7-342-j1j-1 gtfs:shape_id=7-342-j-1.17.H";
   assertMatch:   "relation gtfs:route_id=11-4-I-j20-1 gtfs:trip_id=1108.T2.11-5-I-j20-1.10.H";
-  assertMatch:   "relation gtfs:route_id=11-4-I-j20-1 gtfs:trip_id=1108.TB2.11-5-I-j20-1.10.H";
+  assertNoMatch: "relation gtfs:route_id=11-4-I-j20-1 gtfs:trip_id=1108.TB2.11-5-I-j20-1.10.H";
   assertNoMatch: "relation gtfs:route_id=11-4-I-j20-1 gtfs:trip_id=1108.T2.11-4-I-j20-1.10.H";
 }
@@ -264 +271 @@
   group: tr("Public Transport GTFS: conflicting tags");
 }
+
 }}}