Changes between Version 40 and Version 41 of Rules/FranceSpecificRules

Timestamp:

2020-04-10T07:47:45+02:00 (6 years ago)

Author:

didier2020

Comment:

regle pour node et fusion règle forward,backward

Rules/FranceSpecificRules

@@ -96 +96 @@
 }
 
+
+/* Select milestone nodes */
+node[highway=milestone][nat_ref] {
+  set pr_node;
+}
+
+
 /* validation rules for French RIU (Referentiel Inter Urbain) at https://www.data.gouv.fr/fr/datasets/bornage-du-reseau-routier-national   */
-node[highway=milestone][nat_ref][nat_ref!~/^([1-9][0-9]|0[1-9])PR([0-9]|[1-9][0-9]|[1-9][0-9][0-9])[DGU](|C)$/][inside("FR")] {
+node.pr_node[nat_ref][nat_ref!~/^([1-9][0-9]|0[1-9])PR([0-9]|[1-9][0-9]|[1-9][0-9][0-9])[DGU](|C)$/][inside("FR")] {
     throwWarning: tr("{0} is not a milestone valid reference RIU", "{1.tag}");
     group: tr("validation rules highway milestone");
@@ -106 +113 @@
 
 /* missing ref for milestone */
-node[highway=milestone][nat_ref][!ref][inside("FR")] {
+node.pr_node[nat_ref][!ref][inside("FR")] {
     throwWarning: tr("missing ref");
     group: tr("validation rules highway milestone");
@@ -113 +120 @@
 
 /* missing distance for milestone */
-node[highway=milestone][nat_ref][!distance][inside("FR")] {
+node.pr_node[nat_ref][!distance][inside("FR")] {
     throwWarning: tr("missing distance");
     group: tr("validation rules highway milestone");
@@ -174 +181 @@
 }
 
-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]|B1|B2)(|[A-Z]|[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]|B1|B2)(|[A-Z]|[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]|B1|B2)(|[A-Z]|[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:forward=62A902615CD_1 nat_ref:backward=62A902615CD_2 operator=SANEF", "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]|B1|B2)(|[A-Z]|[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");
 }
 
@@ -194 +196 @@
 }
 
-way[highway]["nat_ref:forward"][!operator][inside("FR")] {
-    throwWarning: tr("Missing tag operator with nat_ref");
-    group: tr("validation rules nat_ref in France");
-    -osmoseTags: list("ref", "highway");
-}
-
+way[highway]["nat_ref:forward"][!operator][inside("FR")],
 way[highway]["nat_ref:backward"][!operator][inside("FR")] {
     throwWarning: tr("Missing tag operator with nat_ref");
@@ -206 +203 @@
 }
 
-way.link_road["nat_ref:forward"][oneway=~/^(yes|1|-1)$/][inside("FR")] {
+way.link_road["nat_ref:forward"][oneway=~/^(yes|1|-1)$/][inside("FR")],
+way.link_road["nat_ref:backward"][oneway=~/^(yes|1|-1)$/][inside("FR")] {
     throwWarning: tr("{0} no tag forward if oneway", "{2.tag}");
     group: tr("validation rules nat_ref in France");
@@ -212 +210 @@
 }
 
-way.link_road["nat_ref:backward"][oneway=~/^(yes|1|-1)$/][inside("FR")] {
-    throwWarning: tr("{0} no tag backward if oneway", "{2.tag}");
-    group: tr("validation rules nat_ref in France");
-    -osmoseTags: list("ref", "highway");
-}
-
 }}}