Changes between Version 20 and Version 21 of Rules/FranceSpecificRules


Ignore:
Timestamp:
2020-03-29T15:46:02+02:00 (6 years ago)
Author:
didier2020
Comment:

fix omsose error

Legend:

Unmodified
Added
Removed
Modified

  • Rules/FranceSpecificRules

    v20 v21  
    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 valid reference RIU", "{1.tag}");
    92     -osmoseAssertMatchWithContext: list("node highway=milestone ref='A 4' nat_ref='77PR38DC' operator='SANEF'","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");
    9394}
    9495/* # Select major roads */
    … …  
    103104way.major_road[nat_ref][operator][inside("FR")] {
    104105    throwWarning: tr("{1} must be a link road", "{1.tag}");
     106    group: tr("validation rules nat_ref in france");
    105107    -osmoseAssertMatchWithContext: list("way highway=primary_link nat_ref='62A901609CD_2' operator='SANEF'", "inside=FR");
    106108    -osmoseAssertNoMatchWithContext: list("way highway=primary nat_ref='62A901609CD_2' operator='SANEF'", "inside=FR");   
    … …  
    108110way.major_road[nat_ref:backward][operator][inside("FR")] {
    109111    throwWarning: tr("{1} must be a link road", "{1.tag}");
     112    group: tr("validation rules nat_ref in france");
    110113    -osmoseAssertMatchWithContext: list("way highway=motorway_link nat_ref:forward='62A902615CD_1' nat_ref:backward='62A902615CD_2' operator='SANEF'", "inside=FR");
    111114    -osmoseAssertNoMatchWithContext: list("way highway=motorway nat_ref:forward='62A902615CD_1' nat_ref:backward='62A902615CD_2' operator='SANEF'", "inside=FR");
    … …  
    117120way.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")] {
    118121    throwWarning: tr("{1} is not a valid reference", "{1.tag}");
     122    group: tr("validation rules nat_ref in france");
    119123    -osmoseAssertMatchWithContext: list("way highway=motorway_link nat_ref='94A900402_1' operator='DIRIF'", "inside=FR");
    120124    -osmoseAssertMatchWithContext: list("way highway=motorway_link nat_ref='80A901645CD_6' operator='SANEF'", "inside=FR");
    … …  
    124128way.link_road[nat_ref][operator="VILLE DE PARIS"][nat_ref!~/75Periph_Paris_[0-9]{2}_(1[0-9]|[1-9])/][inside("FR")] {
    125129    throwWarning: tr("{1} is not a valid reference (Paris)", "{1.tag}");
     130    group: tr("validation rules nat_ref in france");
    126131    -osmoseAssertMatchWithContext: list("way highway=trunk_link nat_ref='75Periph_Paris_05_3' operator='VILLE DE PARIS'", "inside=FR");
    127132}
    … …  
    129134way.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] {
    130135    throwWarning: tr("{1} is not a valid reference", "{1.tag}");
     136    group: tr("validation rules nat_ref in france");
    131137    -osmoseAssertMatchWithContext: list("way highway=motorway_link nat_ref:forward='62A902615CD_1' nat_ref:backward='62A902615CD_2' operator=SANEF", "inside=FR");
    132138    -osmoseAssertNoMatchWithContext: list("way highway=motorway_link nat_ref:forward='62A902615CD_1' one_way='yes' operator='SANEF'", "inside=FR");
    … …  
    135141way.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] {
    136142    throwWarning: tr("{1} is not a valid reference", "{1.tag}");
     143    group: tr("validation rules nat_ref in france");
    137144}
    138145/* # nat_ref reference without operator */
    139146way[highway][nat_ref][!operator][inside("FR")] {
    140147    throwWarning: tr("Missing tag operator with nat_ref");
     148    group: tr("validation rules nat_ref in france");
    141149}
    142150way[highway][nat_ref:forward][!operator][inside("FR")] {
    143151    throwWarning: tr("Missing tag operator with nat_ref");
     152    group: tr("validation rules nat_ref in france");
    144153}
    145154way[highway][nat_ref:backward][!operator][inside("FR")] {
    146155    throwWarning: tr("Missing tag operator with nat_ref");
     156    group: tr("validation rules nat_ref in france");
    147157}
    148158
     159
    149160}}}