Changes between Version 64 and Version 65 of Rules/FranceSpecificRules

Timestamp:

2022-01-18T19:24:40+01:00 (4 years ago)

Author:

didier2020

Comment:

--

Rules/FranceSpecificRules

@@ -160 +160 @@
     -osmoseItemClassLevel: "9019/9019002/3";
     -osmoseTags: list("ref", "highway");
-    -osmoseAssertNoMatchWithContext: list("way highway=motorway_link nat_ref:forward=62A902615CD_1 nat_ref:backward=62A902615CD_2 operator='SANEF'", "inside=FR");
-}
-
-/* tag nat_ref is well formed */
-way[highway=~/^(motorway_link|trunk_link|primary_link|secondary_link|tertiary_link)$/][nat_ref][nat_ref!~/^([1-9][0-9]|0[1-9])[ANP]9[0-9]{3}(|A|N)([0-9]?[0-9]|B1|B2)(|[A-Z]|[a-z])(|CD)_(1[0-9]|[1-9])$/][operator!="VILLE DE PARIS"][inside("FR")] {
+    -osmoseAssertNoMatchWithContext: list("way highway=motorway_link nat_ref:forward=62A902615CD_1D nat_ref:backward=62A902615CD_2D operator='SANEF'", "inside=FR");
+}
+
+/* tag nat_ref is well formed (isidor format) */
+way[highway=~/^(motorway_link|trunk_link|primary_link|secondary_link|tertiary_link)$/][nat_ref][nat_ref!~/^([1-9][0-9]|0[1-9])[ANP]9[0-9]{3}(|A|N)([0-9]?[0-9]|B1|B2)(|[A-Z]|[a-z])(|CD)_(1[0-9]|[1-9]D)$/][operator!="VILLE DE PARIS"][inside("FR")] {
     throwWarning: tr("{0} is not a valid reference", "{1.tag}");
     group: tr("validation rules nat_ref in France");
     -osmoseItemClassLevel: "9019/9019002/3";
     -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[junction=roundabout][highway=~/^(motorway|trunk|primary|secondary|tertiary)$/][nat_ref][nat_ref!~/^(([1-9][0-9]|0[1-9])[ANP]9[0-9]{3}(|A|N)([0-9]?[0-9]|B1|B2)(|[A-Z]|[a-z])(|CD)_(1[0-9]|[1-9]))$/][inside("FR")] {
+    -osmoseAssertNoMatchWithContext: list("way highway=motorway_link nat_ref=80A901645CD_6D operator=SANEF", "inside=FR");
+}
+
+/* tag nat_ref is well formed on roundabout (isidor format) */
+way[junction=roundabout][highway=~/^(motorway|trunk|primary|secondary|tertiary)$/][nat_ref][nat_ref!~/^(([1-9][0-9]|0[1-9])[ANP]9[0-9]{3}(|A|N)([0-9]?[0-9]|B1|B2)(|[A-Z]|[a-z])(|CD)_(1[0-9]|[1-9]D))$/][inside("FR")] {
     throwWarning: tr("{0} is not a valid reference", "{2.tag}");
     group: tr("validation rules nat_ref in France");
     -osmoseItemClassLevel: "9019/9019002/3";
     -osmoseTags: list("ref", "highway");
-    -osmoseAssertNoMatchWithContext: list("way highway=primary junction=roundabout nat_ref=80A901645_6 operator=DIRN", "inside=FR");
-}
-
-/* tag nat_ref is well formed specific Paris*/
-way[highway=~/^(motorway_link|trunk_link|primary_link|secondary_link|tertiary_link)$/][nat_ref][nat_ref!~/^(75Periph_Paris_[0-9]{2}_(1[0-9]|[1-9]))$/][operator="VILLE DE PARIS"][inside("FR")] {
+    -osmoseAssertNoMatchWithContext: list("way highway=primary junction=roundabout nat_ref=80A901645_6D operator=DIRN", "inside=FR");
+}
+
+/* tag nat_ref is well formed specific Paris (isidor format)*/
+way[highway=~/^(motorway_link|trunk_link|primary_link|secondary_link|tertiary_link)$/][nat_ref][nat_ref!~/^(75Periph_Paris_[0-9]{2}_(1[0-9]|[1-9]D))$/][operator="VILLE DE PARIS"][inside("FR")] {
     throwWarning: tr("{0} is not a valid reference (Paris)", "{1.tag}");
     group: tr("validation rules nat_ref in France");
     -osmoseItemClassLevel: "9019/9019002/3";
     -osmoseTags: list("ref", "highway");
-    -osmoseAssertNoMatchWithContext: list("way highway=trunk_link nat_ref=75Periph_Paris_05_3 operator=\"VILLE DE PARIS\"", "inside=FR");
-}
-
-way[highway=~/^(motorway_link|trunk_link|primary_link|secondary_link|tertiary_link)$/]["nat_ref:forward"]["nat_ref:forward"!~/^(([1-9][0-9]|0[1-9])[ANP]9[0-9]{3}(|A|N)([0-9]?[0-9]|B1|B2)(|[A-Z]|[a-z])(|CD)_(1[0-9]|[1-9]))$/][inside("FR")],
-way[highway=~/^(motorway_link|trunk_link|primary_link|secondary_link|tertiary_link)$/]["nat_ref:backward"]["nat_ref:backward"!~/^(([1-9][0-9]|0[1-9])[ANP]9[0-9]{3}(|A|N)([0-9]?[0-9]|B1|B2)(|[A-Z]|[a-z])(|CD)_(1[0-9]|[1-9]))$/][inside("FR")]{
+    -osmoseAssertNoMatchWithContext: list("way highway=trunk_link nat_ref=75Periph_Paris_05_3D operator=\"VILLE DE PARIS\"", "inside=FR");
+}
+
+way[highway=~/^(motorway_link|trunk_link|primary_link|secondary_link|tertiary_link)$/]["nat_ref:forward"]["nat_ref:forward"!~/^(([1-9][0-9]|0[1-9])[ANP]9[0-9]{3}(|A|N)([0-9]?[0-9]|B1|B2)(|[A-Z]|[a-z])(|CD)_(1[0-9]|[1-9]D))$/][inside("FR")],
+way[highway=~/^(motorway_link|trunk_link|primary_link|secondary_link|tertiary_link)$/]["nat_ref:backward"]["nat_ref:backward"!~/^(([1-9][0-9]|0[1-9])[ANP]9[0-9]{3}(|A|N)([0-9]?[0-9]|B1|B2)(|[A-Z]|[a-z])(|CD)_(1[0-9]|[1-9]D))$/][inside("FR")]{
     throwWarning: tr("{0} is not a valid reference", "{1.tag}");
     group: tr("validation rules nat_ref in France");
     -osmoseItemClassLevel: "9019/9019002/3";
     -osmoseTags: list("ref", "highway");
-    -osmoseAssertNoMatchWithContext: list("way highway=motorway_link nat_ref:forward=62A902615CD_1 nat_ref:backward=62A902615CD_2 operator=SANEF", "inside=FR");
+    -osmoseAssertNoMatchWithContext: list("way highway=motorway_link nat_ref:forward=62A902615CD_1D nat_ref:backward=62A902615CD_2D operator=SANEF", "inside=FR");
 }