Ticket #21736: josm_21736_v2.patch

File josm_21736_v2.patch, 2.6 KB (added by skyper, 4 years ago)

version 2: stricter regex; adds oneway:mofa and oneway:moped

  • resources/data/validator/combinations.mapcss

     
    7575  assertMatch: "node source:addr:postcode=postman";
    7676}
    7777
    78 /* {0.key} without {1.key} (info level) */
     78/* {0.key} without {1.key} (info level), #21736 */
    7979way[lanes:forward][!lanes:backward][oneway!=yes][oneway!=-1],
    8080way[lanes:backward][!lanes:forward][oneway!=yes][oneway!=-1],
     81way[lanes:forward][!lanes:backward][oneway=~/^(yes|-1)$/][/^oneway:(psv|bus)$/=~/^no$/],
     82way[lanes:backward][!lanes:forward][oneway=~/^(yes|-1)$/][/^oneway:(psv|bus)$/=~/^no$/],
    8183*[leaf_type ][!leaf_cycle],
    8284*[leaf_cycle][!leaf_type] {
    8385  throwOther: tr("{0} without {1}", "{0.key}", "{1.key}");
    … …  
    279281  group: tr("missing tag");
    280282}
    281283
    282 /* {0.tag} together with {1.key}, see #17664, #17707, #16464, #10837, #14034, #9389, #11977, #13156, #16888, #20530 */
     284/* {0.tag} together with {1.key}, see #17664, #17707, #16464, #10837, #14034, #9389, #11977, #13156, #16888, #20530, #21736 */
    283285*[power=plant][/^generator:/],
    284286*[power=generator][/^plant:/],
    285287*[power=plant][voltage],
    … …  
    291293*[noname?][name],
    292294*[actuator][handle][actuator !~ /(^|;)manual(;|$)/],
    293295*[mechanical_driver][handle][mechanical_driver !~ /(^|;)manual(;|$)/],
    294 way[oneway=yes][/:backward/][!traffic_sign:backward][bicycle:backward!=use_sidepath][oneway:bicycle!=no][oneway:psv!=no],
    295 way[oneway=yes][/:forward/ ][!traffic_sign:forward ][bicycle:forward!=use_sidepath ][oneway:bicycle!=no][oneway:psv!=no],
    296 way[oneway=-1 ][/:backward/][!traffic_sign:backward][bicycle:backward!=use_sidepath][oneway:bicycle!=no][oneway:psv!=no],
    297 way[oneway=-1 ][/:forward/ ][!traffic_sign:forward ][bicycle:forward!=use_sidepath ][oneway:bicycle!=no][oneway:psv!=no] {
     296way[oneway=yes][/:backward/][!traffic_sign:backward][bicycle:backward!=use_sidepath][/^oneway:(bicycle|bus|mofa|moped|psv)$/!~/^no$/],
     297way[oneway=yes][/:forward/ ][!traffic_sign:forward ][bicycle:forward!=use_sidepath ][/^oneway:(bicycle|bus|mofa|moped|psv)$/!~/^no$/],
     298way[oneway=-1 ][/:backward/][!traffic_sign:backward][bicycle:backward!=use_sidepath][/^oneway:(bicycle|bus|mofa|moped|psv)$/!~/^no$/],
     299way[oneway=-1 ][/:forward/ ][!traffic_sign:forward ][bicycle:forward!=use_sidepath ][/^oneway:(bicycle|bus|mofa|moped|psv)$/!~/^no$/] {
    298300  throwWarning: tr("{0} together with {1}", "{0.tag}", "{1.key}");
    299301  group: tr("suspicious tag combination");
    300302  assertMatch: "way power=plant generator:source=wind";