Changes between Version 22 and Version 23 of Rules/FranceSpecificRules


Ignore:
Timestamp:
2020-03-30T09:29:31+02:00 (6 years ago)
Author:
didier2020
Comment:

fix missing $ at end of nat_ref regex

Legend:

Unmodified
Added
Removed
Modified

  • Rules/FranceSpecificRules

    v22 v23  
    8888/* #xxxxx add validation rules for French RIU (Referentiel Inter Urbain) at https://www.data.gouv.fr/fr/datasets/bornage-du-reseau-routier-national/*
    8989/* # nat_ref is well formed on node (milestone) */
    90 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")] {
     90node[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)$/] {
    9191    throwWarning: tr("{0} is not a node valid reference RIU", "{1.tag}");
    9292    group: tr("validation rules nat_ref in France");
    93     -osmoseAssertMatchWithContext: list("node highway=milestone nat_ref=77PR38DC operator=SANEF","inside=FR");
     93    -osmoseAssertMatch: list("node highway=milestone distance=38 ref='A 4' nat_ref=77PR38DC operator=SANEF");
     94    -osmoseAssertNoMatch: list("node highway=milestone distance=38");
    9495}
    9596/* # Select major roads */
    … …  
    119120}
    120121/* # tag nat_ref is well formed */
    121 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]{2}[a-z]*(|CD)_(1[0-9]|[1-9])/][inside("FR")] {
     122way.link_road[nat_ref][operator!="VILLE DE PARIS"][nat_ref!~/([1-9][0-9]|0[1-9])[ANP]9[0-9]{3}[0-9]{2}[a-z]*(|CD)_(1[0-9]|[1-9])$/][inside("FR")] {
    122123    throwWarning: tr("{0} is not a valid reference", "{1.tag}");
    123124    group: tr("validation rules nat_ref in France");
    … …  
    127128}
    128129/* # tag nat_ref is well formed specific Paris*/
    129 way.link_road[nat_ref][operator="VILLE DE PARIS"][nat_ref!~/75Periph_Paris_[0-9]{2}_(1[0-9]|[1-9])/][inside("FR")] {
     130way.link_road[nat_ref][operator="VILLE DE PARIS"][nat_ref!~/75Periph_Paris_[0-9]{2}_(1[0-9]|[1-9])$/][inside("FR")] {
    130131    throwWarning: tr("{0} is not a valid reference (Paris)", "{1.tag}");
    131132    group: tr("validation rules nat_ref in France");
    132133    -osmoseAssertMatchWithContext: list("way highway=trunk_link nat_ref='75Periph_Paris_05_3' operator='VILLE DE PARIS'", "inside=FR");
    133134}
    134 
    135 way.link_road[nat_ref:forward][nat_ref:forward!~/([1-9][0-9]|0[1-9])[ANP]9[0-9]{3}[0-9]{2}[a-z]*(|CD)_(1[0-9]|[1-9])/][inside("FR")][one_way!=yes] {
     135way.link_road[nat_ref:forward][nat_ref:forward!~/([1-9][0-9]|0[1-9])[ANP]9[0-9]{3}[0-9]{2}[a-z]*(|CD)_(1[0-9]|[1-9])$/][inside("FR")][one_way!=yes] {
    136136    throwWarning: tr("{0} is not a valid reference", "{1.tag}");
    137137    group: tr("validation rules nat_ref in France");
    … …  
    140140    -osmoseAssertNoMatchWithContext: list("way highway=motorway nat_ref:forward='62A902615CD_1' one_way='no' operator='SANEF'", "inside=FR");
    141141}
    142 way.link_road[nat_ref:backward][nat_ref:backward!~/([1-9][0-9]|0[1-9])[ANP]9[0-9]{3}[0-9]{2}[a-z]*(|CD)_(1[0-9]|[1-9])/][inside("FR")][one_way!=yes] {
     142way.link_road[nat_ref:backward][nat_ref:backward!~/([1-9][0-9]|0[1-9])[ANP]9[0-9]{3}[0-9]{2}[a-z]*(|CD)_(1[0-9]|[1-9])$/][inside("FR")][one_way!=yes] {
    143143    throwWarning: tr("{0} is not a valid reference", "{1.tag}");
    144144    group: tr("validation rules nat_ref in France");
    … …  
    158158}
    159159
     160
    160161}}}