Changes between Version 21 and Version 22 of Rules/FranceSpecificRules


Ignore:
Timestamp:
2020-03-29T17:18:48+02:00 (6 years ago)
Author:
didier2020
Comment:

fix errors

Legend:

Unmodified
Added
Removed
Modified

  • Rules/FranceSpecificRules

    v21 v22  
    8989/* # nat_ref is well formed on node (milestone) */
    9090node[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")] {
    91     throwWarning: tr("{1} is not a node valid reference RIU", "{1.tag}");
    92     group: tr("validation rules nat_ref in france");
    93     -osmoseAssertMatchWithContext: list("node highway=milestone nat_ref=77PR38DC operator=SANEF", "inside=FR");
     91    throwWarning: tr("{0} is not a node valid reference RIU", "{1.tag}");
     92    group: tr("validation rules nat_ref in France");
     93    -osmoseAssertMatchWithContext: list("node highway=milestone nat_ref=77PR38DC operator=SANEF","inside=FR");
    9494}
    9595/* # Select major roads */
    … …  
    103103/* # tag nat_ref is for links roads, ref is on major roads */
    104104way.major_road[nat_ref][operator][inside("FR")] {
    105     throwWarning: tr("{1} must be a link road", "{1.tag}");
    106     group: tr("validation rules nat_ref in france");
     105    throwWarning: tr("{0} must be a link road", "{1.tag}");
     106    group: tr("validation rules nat_ref in France");
    107107    -osmoseAssertMatchWithContext: list("way highway=primary_link nat_ref='62A901609CD_2' operator='SANEF'", "inside=FR");
    108108    -osmoseAssertNoMatchWithContext: list("way highway=primary nat_ref='62A901609CD_2' operator='SANEF'", "inside=FR");   
    109109}
    110110way.major_road[nat_ref:backward][operator][inside("FR")] {
    111     throwWarning: tr("{1} must be a link road", "{1.tag}");
    112     group: tr("validation rules nat_ref in france");
     111    throwWarning: tr("{0} must be a link road ", "{1.tag}");
     112    group: tr("validation rules nat_ref in France");
    113113    -osmoseAssertMatchWithContext: list("way highway=motorway_link nat_ref:forward='62A902615CD_1' nat_ref:backward='62A902615CD_2' operator='SANEF'", "inside=FR");
    114114    -osmoseAssertNoMatchWithContext: list("way highway=motorway nat_ref:forward='62A902615CD_1' nat_ref:backward='62A902615CD_2' operator='SANEF'", "inside=FR");
    115115}
    116116way.major_road[nat_ref:forward][operator][inside("FR")] {
    117     throwWarning: tr("{1} must be a link road", "{1.tag}");
     117    throwWarning: tr("{0} must be a link road", "{1.tag}");
     118    group: tr("validation rules nat_ref in France");
    118119}
    119120/* # tag nat_ref is well formed */
    120121way.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")] {
    121     throwWarning: tr("{1} is not a valid reference", "{1.tag}");
    122     group: tr("validation rules nat_ref in france");
     122    throwWarning: tr("{0} is not a valid reference", "{1.tag}");
     123    group: tr("validation rules nat_ref in France");
    123124    -osmoseAssertMatchWithContext: list("way highway=motorway_link nat_ref='94A900402_1' operator='DIRIF'", "inside=FR");
    124125    -osmoseAssertMatchWithContext: list("way highway=motorway_link nat_ref='80A901645CD_6' operator='SANEF'", "inside=FR");
    … …  
    127128/* # tag nat_ref is well formed specific Paris*/
    128129way.link_road[nat_ref][operator="VILLE DE PARIS"][nat_ref!~/75Periph_Paris_[0-9]{2}_(1[0-9]|[1-9])/][inside("FR")] {
    129     throwWarning: tr("{1} is not a valid reference (Paris)", "{1.tag}");
    130     group: tr("validation rules nat_ref in france");
     130    throwWarning: tr("{0} is not a valid reference (Paris)", "{1.tag}");
     131    group: tr("validation rules nat_ref in France");
    131132    -osmoseAssertMatchWithContext: list("way highway=trunk_link nat_ref='75Periph_Paris_05_3' operator='VILLE DE PARIS'", "inside=FR");
    132133}
    133134
    134135way.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] {
    135     throwWarning: tr("{1} is not a valid reference", "{1.tag}");
    136     group: tr("validation rules nat_ref in france");
     136    throwWarning: tr("{0} is not a valid reference", "{1.tag}");
     137    group: tr("validation rules nat_ref in France");
    137138    -osmoseAssertMatchWithContext: list("way highway=motorway_link nat_ref:forward='62A902615CD_1' nat_ref:backward='62A902615CD_2' operator=SANEF", "inside=FR");
    138139    -osmoseAssertNoMatchWithContext: list("way highway=motorway_link nat_ref:forward='62A902615CD_1' one_way='yes' operator='SANEF'", "inside=FR");
    … …  
    140141}
    141142way.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] {
    142     throwWarning: tr("{1} is not a valid reference", "{1.tag}");
    143     group: tr("validation rules nat_ref in france");
     143    throwWarning: tr("{0} is not a valid reference", "{1.tag}");
     144    group: tr("validation rules nat_ref in France");
    144145}
    145146/* # nat_ref reference without operator */
    146147way[highway][nat_ref][!operator][inside("FR")] {
    147148    throwWarning: tr("Missing tag operator with nat_ref");
    148     group: tr("validation rules nat_ref in france");
     149    group: tr("validation rules nat_ref in France");
    149150}
    150151way[highway][nat_ref:forward][!operator][inside("FR")] {
    151152    throwWarning: tr("Missing tag operator with nat_ref");
    152     group: tr("validation rules nat_ref in france");
     153    group: tr("validation rules nat_ref in France");
    153154}
    154155way[highway][nat_ref:backward][!operator][inside("FR")] {
    155156    throwWarning: tr("Missing tag operator with nat_ref");
    156     group: tr("validation rules nat_ref in france");
     157    group: tr("validation rules nat_ref in France");
    157158}
    158159
    159 
    160160}}}