Changes between Version 32 and Version 33 of Rules/FranceSpecificRules

Timestamp:

2020-04-06T08:58:49+02:00 (6 years ago)

Author:

didier2020

Comment:

--

Rules/FranceSpecificRules

@@ -151 +151 @@
 
 /* tag nat_ref is well formed */
-way.link_road[nat_ref][operator!="VILLE DE PARIS"][nat_ref!~/([1-9][0-9]|0[1-9])[ANP]9[0-9]{3}[0-9][0-9]*[a-z]*(|CD)_(1[0-9]|[1-9])$/][inside("FR")] {
+way.link_road[nat_ref][operator!="VILLE DE PARIS"][nat_ref!~/([1-9][0-9]|0[1-9])[ANP]9[0-9]{3}[0-9]?[0-9][a-z]*(|CD)_(1[0-9]|[1-9])$/][inside("FR")] {
     throwWarning: tr("{0} is not a valid reference", "{1.tag}");
     group: tr("validation rules nat_ref in France");
     -osmoseTags: list("ref", "highway");
     -osmoseAssertNoMatchWithContext: list("way highway=motorway_link nat_ref=80A901645CD_6 operator=SANEF", "inside=FR");
+}
+
+/* tag nat_ref is well formed on roundabout*/
+way.major_road[nat_ref][junction=roundabout][nat_ref!~/([1-9][0-9]|0[1-9])[ANP]9[0-9]{3}[0-9]?[0-9][a-z]*(|CD)_(1[0-9]|[1-9])$/][inside("FR")] {
+    throwWarning: tr("{0} is not a valid reference", "{1.tag}");
+    group: tr("validation rules nat_ref in France");
+    -osmoseTags: list("ref", "highway");
+    -osmoseAssertNoMatchWithContext: list("way highway=primary junction=roundabout nat_ref=80A901645_6 operator=DIRN", "inside=FR");
 }
 
@@ -166 +174 @@
 }
 
-way.link_road[nat_ref:forward][nat_ref:forward!~/([1-9][0-9]|0[1-9])[ANP]9[0-9]{3}[0-9][0-9]*[a-z]*(|CD)_(1[0-9]|[1-9])$/][inside("FR")] {
+way.link_road[nat_ref:forward][nat_ref:forward!~/([1-9][0-9]|0[1-9])[ANP]9[0-9]{3}[0-9]?[0-9][a-z]*(|CD)_(1[0-9]|[1-9])$/][inside("FR")] {
     throwWarning: tr("{0} is not a valid reference", "{1.tag}");
     group: tr("validation rules nat_ref in France");
@@ -173 +181 @@
 }
 
-way.link_road[nat_ref:backward][nat_ref:backward!~/([1-9][0-9]|0[1-9])[ANP]9[0-9]{3}[0-9][0-9]*[a-z]*(|CD)_(1[0-9]|[1-9])$/][inside("FR")] {
+way.link_road[nat_ref:backward][nat_ref:backward!~/([1-9][0-9]|0[1-9])[ANP]9[0-9]{3}[0-9]?[0-9][a-z]*(|CD)_(1[0-9]|[1-9])$/][inside("FR")] {
     throwWarning: tr("{0} is not a valid reference", "{1.tag}");
     group: tr("validation rules nat_ref in France");