Changeset 14911 in josm


Ignore:
Timestamp:
2019-03-20T21:45:11+01:00 (5 weeks ago)
Author:
Klumbumbus
Message:

fix #17100, see #17471 - add name=silo|rumah|jalan to descriptive name warning, move АЗС there too, disable autofix for cases where the value of the name tag could be the value of the other tag (manual fix by human required in these cases)

Location:
trunk/data/validator
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/data/validator/deprecated.mapcss

    r14896 r14911  
    454454*[shop="*"],
    455455*[shop=yes][amenity!=fuel],
    456 *[name="АЗС"][amenity=fuel],
    457456*[craft=yes],
    458457*[service=yes],
  • trunk/data/validator/unnecessary.mapcss

    r14904 r14911  
    8888}
    8989
    90 /* #17100 */
     90/* #17100, #17471 */
    9191*[name][name=~/^(?i)(parking|parkplatz)$/][amenity=parking],
    9292*[name][name=~/^(?i)(playground|spielplatz)$/][leisure=playground],
    9393*[name][name=~/^(?i)(shop)$/][shop][shop!=no],
    94 *[name][name=~/^(?i)(building|house)$/][building][building!=no],
     94*[name][name=~/^(?i)(building)$/][building][building!=no],
     95*[name][name=~/^(?i)(house|rumah)$/][building=house],
    9596*[name][name=~/^(?i)(kiosk)$/][shop=kiosk],
     97*[name][name=~/^(?i)(jalan)$/][highway],
     98*[name][name=~/^(?i)(silo)$/][man_made=silo],
     99*[name][name=~/^(?i)(silo)$/][building=silo],
    96100*[name][name=~/^(?i)(cemetery|cmentarz)$/][amenity=graveyard],
    97 *[name][name=~/^(?i)(cemetery|cmentarz)$/][amenity=cemetery] {
     101*[name][name=~/^(?i)(cemetery|cmentarz)$/][amenity=cemetery],
     102*[name="АЗС"][amenity=fuel] {
    98103  throwWarning: tr("{0}", "{0.tag}");
    99104  group: tr("descriptive name");
    100105  fixRemove: "name";
    101   assertMatch: "way name=parking amenity=parking";
    102   assertMatch: "way name=Parking amenity=parking";
    103106  assertMatch: "node name=parking amenity=parking";
    104107  assertMatch: "node name=Parking amenity=parking";
     
    110113  assertMatch: "relation name=PLAYGROUND leisure=playground type=multipolygon";
    111114  assertMatch: "node name=PLaYGrOUNd leisure=playground";
    112   assertNoMatch: "way name=playground";
    113115  assertMatch: "node name=shop shop=whatever";
    114116  assertNoMatch: "node name=shop shop=no";
    115117  assertNoMatch: "way name=shop leisure=playground";
    116118  assertMatch: "way name=building building=yes";
    117   assertNoMatch: "way building=yes";
     119  assertMatch: "way name=building building=house";
     120  assertMatch: "way name=Rumah building=house";
     121  assertNoMatch: "way name=Rumah building=yes";
     122  assertMatch: "way name=house building=house";
     123  assertNoMatch: "way name=house building=yes";
    118124  assertMatch: "way name=kiosk building=yes shop=kiosk";
    119125  assertNoMatch: "way name=kiosk building=yes";
     126  assertMatch: "way name=silo man_made=silo";
     127  assertMatch: "way name=Silo man_made=silo building=silo";
     128  assertMatch: "way name=Silo building=silo";
    120129  assertMatch: "way name=cemetery amenity=graveyard";
    121   assertMatch: "way name=cmentarz amenity=graveyard";
    122130  assertMatch: "way name=Cmentarz amenity=graveyard";
    123131  assertNoMatch: "way name=kiosk amenity=graveyard";
    124132}
     133*[name][name=~/^(?i)(house|rumah)$/][building][building!=house][building!=no] {
     134  throwWarning: tr("{0}", "{0.tag}");
     135  group: tr("descriptive name");
     136  /* without fixRemove to avoid possible information loss */
     137  assertNoMatch: "way name=building building=yes";
     138  assertNoMatch: "way name=building building=house";
     139  assertNoMatch: "way name=Rumah building=house";
     140  assertMatch: "way name=Rumah building=yes";
     141  assertNoMatch: "way name=house building=house";
     142  assertMatch: "way name=house building=yes";
     143}
Note: See TracChangeset for help on using the changeset viewer.