Ticket #21192: josm_21192.patch

File josm_21192.patch, 5.5 KB (added by skyper, 4 years ago)

patch file

  • resources/data/validator/multiple.mapcss

     
    1010  throwWarning: tr("{0} with multiple values", "{0.key}");
    1111}
    1212
    13 /* #19419 */
     13/* Multiple access values, #19419 */
    1414node[/^(amenity|barrier|building(:part)?|entrance|(high|rail|water)way|leisure)$/][access *=";"],
    1515way[/^(amenity|building(:part)?|(high|rail|water)way|water|leisure)$/][access *=";"],
    1616relation[type =~ /^(boundary|multipolygon)$/][access *=";"],
    … …  
    6363  assertNoMatch: "relation type=multipolygon water=lake access=boat";
    6464}
    6565
     66/* Multiple access values per direction or lane, #21192 */
     67way[/^(high|rail|water)way$/][/^access((:both_ways)?:(backward|forward)|:both_ways)$/ =~ /;/],
     68way[highway][/^agricultural((:both_ways)?:(backward|forward)|:both_ways)$/ =~ /;/],
     69way[highway][/^bdouble((:both_ways)?:(backward|forward)|:both_ways)$/ =~ /;/],
     70way[highway][/^bicycle((:both_ways)?:(backward|forward)|:both_ways)$/ =~ /;/],
     71way[highway][/^bus((:both_ways)?:(backward|forward)|:both_ways)$/ =~ /;/],
     72way[highway][/^carriage((:both_ways)?:(backward|forward)|:both_ways)$/ =~ /;/],
     73way[highway][/^emergency((:both_ways)?:(backward|forward)|:both_ways)$/ =~ /;/],
     74way[highway][/^foot((:both_ways)?:(backward|forward)|:both_ways)$/ =~ /;/],
     75way[highway][/^goods((:both_ways)?:(backward|forward)|:both_ways)$/ =~ /;/],
     76way[highway][/^hazmat((:both_ways)?:(backward|forward)|:both_ways)$/ =~ /;/],
     77way[highway][/^hgv((:both_ways)?:(backward|forward)|:both_ways)$/ =~ /;/],
     78way[highway][/^horse((:both_ways)?:(backward|forward)|:both_ways)$/ =~ /;/],
     79way[highway][/^hov((:both_ways)?:(backward|forward)|:both_ways)$/ =~ /;/],
     80way[highway][/^mofa((:both_ways)?:(backward|forward)|:both_ways)$/ =~ /;/],
     81way[highway][/^moped((:both_ways)?:(backward|forward)|:both_ways)$/ =~ /;/],
     82way[highway][/^motor_vehicle((:both_ways)?:(backward|forward)|:both_ways)$/ =~ /;/],
     83way[highway][/^motorcar((:both_ways)?:(backward|forward)|:both_ways)$/ =~ /;/],
     84way[highway][/^motorcycle((:both_ways)?:(backward|forward)|:both_ways)$/ =~ /;/],
     85way[highway][/^psv((:both_ways)?:(backward|forward)|:both_ways)$/ =~ /;/],
     86way[highway][/^taxi((:both_ways)?:(backward|forward)|:both_ways)$/ =~ /;/],
     87way[highway][/^tourist_bus((:both_ways)?:(backward|forward)|:both_ways)$/ =~ /;/],
     88way[highway][/^vehicle((:both_ways)?:(backward|forward)|:both_ways)$/ =~ /;/],
     89way[railway][/^train:(backward|forward)$/ =~ /;/],
     90way[railway][/^tram:(backward|forward)$/ =~ /;/],
     91way[railway][/^subway:(backward|forward)$/ =~ /;/],
     92way[waterway][/^boat:(backward|forward)$/ =~ /;/],
     93way[waterway][/^canoe:(backward|forward)$/ =~ /;/],
     94way[waterway][/^cargo:(backward|forward)$/ =~ /;/],
     95way[waterway][/^motorboat:(backward|forward)$/ =~ /;/],
     96way[waterway][/^passenger:(backward|forward)$/ =~ /;/],
     97way[waterway][/^ship:(backward|forward)$/ =~ /;/] {
     98  throwWarning: tr("Multiple values in accces per direction tag");
     99  group: tr("Multiple values in access tag");
     100  suggestAlternative: tr("only one value and additional {0}", ":conditional");
     101  assertMatch:   "way highway=trunk bus:both_ways:forward=designated;yes";
     102  assertNoMatch: "way highway=trunk bus:both_ways:forward=designated";
     103  assertNoMatch: "way highway=trunk bus=designated;yes";
     104}
     105way[highway][/^access:lanes(:both_ways)?(:(backward|forward))?$/ =~ /;/],
     106way[highway][/^agricultural:lanes(:both_ways)?(:(backward|forward))?$/ =~ /;/],
     107way[highway][/^bdouble:lanes(:both_ways)?(:(backward|forward))?$/ =~ /;/],
     108way[highway][/^bicycle:lanes(:both_ways)?(:(backward|forward))?$/ =~ /;/],
     109way[highway][/^bus:lanes(:both_ways)?(:(backward|forward))?$/ =~ /;/],
     110way[highway][/^carriage:lanes(:both_ways)?(:(backward|forward))?$/ =~ /;/],
     111way[highway][/^emergency:lanes(:both_ways)?(:(backward|forward))?$/ =~ /;/],
     112way[highway][/^foot:lanes(:both_ways)?(:(backward|forward))?$/ =~ /;/],
     113way[highway][/^goods:lanes(:both_ways)?(:(backward|forward))?$/ =~ /;/],
     114way[highway][/^hazmat:lanes(:both_ways)?(:(backward|forward))?$/ =~ /;/],
     115way[highway][/^hgv:lanes(:both_ways)?(:(backward|forward))?$/ =~ /;/],
     116way[highway][/^horse:lanes(:both_ways)?(:(backward|forward))?$/ =~ /;/],
     117way[highway][/^hov:lanes(:both_ways)?(:(backward|forward))?$/ =~ /;/],
     118way[highway][/^mofa:lanes(:both_ways)?(:(backward|forward))?$/ =~ /;/],
     119way[highway][/^moped:lanes(:both_ways)?(:(backward|forward))?$/ =~ /;/],
     120way[highway][/^motor_vehicle:lanes(:both_ways)?(:(backward|forward))?$/ =~ /;/],
     121way[highway][/^motorcar:lanes(:both_ways)?(:(backward|forward))?$/ =~ /;/],
     122way[highway][/^motorcycle:lanes(:both_ways)?(:(backward|forward))?$/ =~ /;/],
     123way[highway][/^psv:lanes(:both_ways)?(:(backward|forward))?$/ =~ /;/],
     124way[highway][/^taxi:lanes(:both_ways)?(:(backward|forward))?$/ =~ /;/],
     125way[highway][/^tourist_bus:lanes(:both_ways)?(:(backward|forward))?$/ =~ /;/],
     126way[highway][/^vehicle:lanes(:both_ways)?(:(backward|forward))?$/ =~ /;/] {
     127  throwWarning: tr("Multiple values in access per lane tag");
     128  group: tr("Multiple values in access tag");
     129  suggestAlternative: tr("only one value and additional {0}", ":conditional");
     130  assertMatch:   "way highway=trunk bus:lanes:both_ways:forward=designated;yes|no";
     131  assertNoMatch: "way highway=trunk bus:lanes:both_ways:forward=designated|no";
     132  assertNoMatch: "way highway=trunk bus:both_ways:forward=designated;no";
     133}
     134
    66135*[source              =~ /^(;.*|.*;;.*|.*;)$/],
    67136*["source:addr"       =~ /^(;.*|.*;;.*|.*;)$/],
    68137*["source:maxspeed"   =~ /^(;.*|.*;;.*|.*;)$/],