Changes between Version 15 and Version 16 of Rules/PublicTransportGtfs

Timestamp:

2020-07-27T17:07:27+02:00 (6 years ago)

Author:

skyper

Comment:

warn about incomplete ref:IFOPT

Rules/PublicTransportGtfs

@@ -241 +241 @@
 *[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    !~ /^(gen:[0-9]{4}|[a-z]{2}:[0-9]{5}):[1-9][0-9]{0,4}(:[0-9]{1,2}(:([A-Z]+[ ]?)?[1-9][0-9]{0,2}[A-Z]?)?)?$/],
-*[gtfs:stop_id][gtfs:stop_id !~ /^(gen:[0-9]{4}|[a-z]{2}:[0-9]{4,5}):[1-9][0-9]{0,4}(:[0-9]{1,2}(:([A-Z]+[ ]?)?[1-9][0-9]{0,2}[A-Z]?)?)?$/] {
+*[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])$/] { 
   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}"); */
@@ -256 +254 @@
   assertMatch:   "relation gtfs:source_date=2016-09-30";
   assertNoMatch: "relation gtfs:source_date=2020-09-30";
+}
+/* ref:IFOPT, gtfs:stop_id, gtfs:feed, *:guid, gtfs:source_date */
+/* FIXME: Get proper syntax as regex displayed. */
+*[ref:IFOPT   ][ref:IFOPT    !~ /^(gen:[0-9]{4}|[a-z]{2}:[0-9]{5}):[1-9][0-9]{0,4}(:[0-9]{1,2}(:([A-Z]+[ ]?)?[1-9][0-9]{0,2}[A-Z]?)?)?$/],
+*[gtfs:stop_id][gtfs:stop_id !~ /^(gen:[0-9]{4}|[a-z]{2}:[0-9]{4,5}):[1-9][0-9]{0,4}(:[0-9]{1,2}(:([A-Z]+[ ]?)?[1-9][0-9]{0,2}[A-Z]?)?)?$/] {
+  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 ErrorSyntaxIFOPT;
   assertMatch:   "node ref:IFOPT=+1";
   assertMatch:   "node ref:IFOPT=aa:aa:09";
@@ -289 +296 @@
 }
 
+/* short ref:IFOPT */
+node!.ErrorSyntaxIFOPT[ref:IFOPT        !~ /^.+(:.+){4}$/][ref:IFOPT   ][public_transport=stop_position],
+node!.ErrorSyntaxIFOPT[gtfs:stop_id     !~ /^.+(:.+){4}$/][gtfs:stop_id][public_transport=platform],
+node!.ErrorSyntaxIFOPT[ref:IFOPT        !~ /^.+(:.+){4}$/][ref:IFOPT   ][public_transport=platform],
+node!.ErrorSyntaxIFOPT[gtfs:stop_id     !~ /^.+(:.+){4}$/][gtfs:stop_id][public_transport=platform],
+way!.ErrorSyntaxIFOPT[ref:IFOPT         !~ /^.+(:.+){3}$/][ref:IFOPT   ][public_transport=platform],
+way!.ErrorSyntaxIFOPT[gtfs:stop_id      !~ /^.+(:.+){3}$/][gtfs:stop_id][public_transport=platform],
+relation!.ErrorSyntaxIFOPT[ref:IFOPT    !~ /^.+(:.+){3}$/][ref:IFOPT   ][public_transport][public_transport =~ /^(platform|stop_area)$/],
+relation!.ErrorSyntaxIFOPT[gtfs:stop_id !~ /^.+(:.+){3}$/][gtfs:stop_id][public_transport][public_transport =~ /^(platform|stop_area)$/] {
+  throwWarning: tr("Incomplete `{0}` on `{1}`.", "{2.tag}", "{3.tag}");
+  group: tr("Public Transport GTFS: value syntax");
+  assertMatch:   "node public_transport=platform ref:IFOPT=de:09162:1179:31";
+  assertNoMatch: "node public_transport=platform ref:IFOPT=de:09162:1179:53:KIF 1";
+  assertNoMatch: "node public_transport=platform ref:IFOPT=DDDD:09162:1179:3:KIF 1";
+  assertNoMatch: "way public_transport=platform ref:IFOPT=de:09162:1179:21";
+  assertMatch:   "relation public_transport=platform ref:IFOPT=de:09162:1179";
+  assertNoMatch: "relation public_transport=platform ref:IFOPT=de:09162:1179:30";
+  assertNoMatch: "relation public_transport=platform ref:IFOPT=de:09162:1179:30:KIF 1";
+}
 
 /*  -----------------------