Changeset 9892 in josm for trunk/styles


Ignore:
Timestamp:
2016-02-27T20:15:38+01:00 (3 years ago)
Author:
Klumbumbus
Message:

see #12227 - remove wrong stonemason icon; don't overwrite icons with no_icon.png icon (e.g. a node with entrance=yes and craft=caterer)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/styles/standard/elemstyles.mapcss

    r9851 r9892  
    189189    set icon_z17;
    190190}
    191 node[traffic_sign][access=permissive],
    192 node[traffic_sign][access=private],
    193 node[traffic_sign][access=destination] {
     191node[traffic_sign][access=permissive][!is_prop_set(icon-image)],
     192node[traffic_sign][access=private][!is_prop_set(icon-image)],
     193node[traffic_sign][access=destination][!is_prop_set(icon-image)] {
    194194    icon-image: "misc/no_icon.png";
    195195    set icon_z17;
     
    239239    set icon_z17;
    240240}
    241 node[traffic_sign][motorboat?!],
    242 node[traffic_sign][boat?!] {
     241node[traffic_sign][motorboat?!][!is_prop_set(icon-image)],
     242node[traffic_sign][boat?!][!is_prop_set(icon-image)] {
    243243    icon-image: "misc/no_icon.png";
    244244    set icon_z17;
     
    268268    set icon_z17;
    269269}
    270 node[traffic_sign][maxstay],
    271 node[traffic_sign][toll] {
     270node[traffic_sign][maxstay][!is_prop_set(icon-image)],
     271node[traffic_sign][toll][!is_prop_set(icon-image)] {
    272272    icon-image: "misc/no_icon.png";
    273273    set icon_z17;
     
    480480    text: auto;
    481481}
    482 node[barrier=fence],
    483 node[barrier=kissing_gate],
    484 node[barrier=bump_gate],
    485 node[barrier=portcullis],
    486 node[barrier=bus_trap],
    487 node[barrier=drawbridge],
    488 node[barrier=jersey_barrier],
    489 node[barrier=hampshire_gate] {
     482node[barrier=fence][!is_prop_set(icon-image)],
     483node[barrier=kissing_gate][!is_prop_set(icon-image)],
     484node[barrier=bump_gate][!is_prop_set(icon-image)],
     485node[barrier=portcullis][!is_prop_set(icon-image)],
     486node[barrier=bus_trap][!is_prop_set(icon-image)],
     487node[barrier=drawbridge][!is_prop_set(icon-image)],
     488node[barrier=jersey_barrier][!is_prop_set(icon-image)],
     489node[barrier=hampshire_gate][!is_prop_set(icon-image)] {
    490490    icon-image: "misc/no_icon.png";
    491491    set icon_z17;
     
    15461546    text: auto;
    15471547}
    1548 node[man_made=petroleum_well] {
     1548node[man_made=petroleum_well][!is_prop_set(icon-image)] {
    15491549    icon-image: "misc/no_icon.png";
    15501550    set icon_z17;
     
    29142914    text: auto;
    29152915}
    2916 node[amenity=place_of_worship][religion=spiritualist] {
     2916node[amenity=place_of_worship][religion=spiritualist][!is_prop_set(icon-image)] {
    29172917    icon-image: "misc/no_icon.png";
    29182918    set icon_z17;
     
    29242924    text: auto;
    29252925}
    2926 node[amenity=place_of_worship][religion=unitarian] {
     2926node[amenity=place_of_worship][religion=unitarian][!is_prop_set(icon-image)] {
    29272927    icon-image: "misc/no_icon.png";
    29282928    set icon_z17;
    29292929    text: auto;
    29302930}
    2931 node[amenity=place_of_worship][religion=zoroastrian] {
     2931node[amenity=place_of_worship][religion=zoroastrian][!is_prop_set(icon-image)] {
    29322932    icon-image: "misc/no_icon.png";
    29332933    set icon_z17;
     
    29392939    text: auto;
    29402940}
    2941 node[amenity=crematorium] {
     2941node[amenity=crematorium][!is_prop_set(icon-image)] {
    29422942    icon-image: "misc/no_icon.png";
    29432943    set icon_z17;
     
    32523252    fill-color: craft#999900;
    32533253}
    3254 node[craft=carpenter] {
     3254node[craft=carpenter][!is_prop_set(icon-image)] {
    32553255    icon-image: "misc/no_icon.png";
    32563256    set icon_z17;
    32573257    text: auto;
    32583258}
    3259 node[craft=shoemaker] {
     3259node[craft=shoemaker][!is_prop_set(icon-image)] {
    32603260    icon-image: "misc/no_icon.png";
    32613261    set icon_z17;
    32623262    text: auto;
    32633263}
    3264 node[craft=photographer] {
     3264node[craft=photographer][!is_prop_set(icon-image)] {
    32653265    icon-image: "misc/no_icon.png";
    32663266    set icon_z17;
    32673267    text: auto;
    32683268}
    3269 node[craft=metal_construction] {
     3269node[craft=metal_construction][!is_prop_set(icon-image)] {
    32703270    icon-image: "misc/no_icon.png";
    32713271    set icon_z17;
    32723272    text: auto;
    3273 }node[craft=electrician] {
     3273}node[craft=electrician][!is_prop_set(icon-image)] {
    32743274    icon-image: "misc/no_icon.png";
    32753275    set icon_z17;
    32763276    text: auto;
    32773277}
    3278 node[craft=brewery] {
     3278node[craft=brewery][!is_prop_set(icon-image)] {
    32793279    icon-image: "misc/no_icon.png";
    32803280    set icon_z17;
     
    32863286    text: auto;
    32873287}
    3288 node[craft=sawmill] {
     3288node[craft=sawmill][!is_prop_set(icon-image)] {
    32893289    icon-image: "misc/no_icon.png";
    32903290    set icon_z17;
    32913291    text: auto;
    32923292}
    3293 node[craft=gardener] {
     3293node[craft=gardener][!is_prop_set(icon-image)] {
    32943294    icon-image: "misc/no_icon.png";
    32953295    set icon_z17;
    32963296    text: auto;
    32973297}
    3298 node[craft=winery] {
     3298node[craft=winery][!is_prop_set(icon-image)] {
    32993299    icon-image: "misc/no_icon.png";
    33003300    set icon_z17;
    33013301    text: auto;
    33023302}
    3303 node[craft=hvac] {
     3303node[craft=hvac][!is_prop_set(icon-image)] {
    33043304    icon-image: "misc/no_icon.png";
    33053305    set icon_z17;
     
    33113311    text: auto;
    33123312}
    3313 node[craft=stonemason] {
    3314     icon-image: "craft/stonemason.png";
    3315     set icon_z17;
    3316     text: auto;
    3317 }
    3318 node[craft=handicraft] {
     3313node[craft=stonemason][!is_prop_set(icon-image)] {
     3314    icon-image: "misc/no_icon.png";
     3315    set icon_z17;
     3316    text: auto;
     3317}
     3318node[craft=handicraft][!is_prop_set(icon-image)] {
    33193319    icon-image: "misc/no_icon.png";
    33203320    set icon_z17;
     
    33263326    text: auto;
    33273327}
    3328 node[craft=key_cutter] {
     3328node[craft=key_cutter][!is_prop_set(icon-image)] {
    33293329    icon-image: "misc/no_icon.png";
    33303330    set icon_z17;
    33313331    text: auto;
    33323332}
    3333 node[craft=caterer] {
     3333node[craft=caterer][!is_prop_set(icon-image)] {
    33343334    icon-image: "misc/no_icon.png";
    33353335    set icon_z17;
    33363336    text: auto;
    33373337}
    3338 node[craft=roofer] {
     3338node[craft=roofer][!is_prop_set(icon-image)] {
    33393339    icon-image: "misc/no_icon.png";
    33403340    set icon_z17;
    33413341    text: auto;
    33423342}
    3343 node[craft=beekeeper] {
     3343node[craft=beekeeper][!is_prop_set(icon-image)] {
    33443344    icon-image: "misc/no_icon.png";
    33453345    set icon_z17;
    33463346    text: auto;
    33473347}
    3348 node[craft=blacksmith] {
     3348node[craft=blacksmith][!is_prop_set(icon-image)] {
    33493349    icon-image: "misc/no_icon.png";
    33503350    set icon_z17;
    33513351    text: auto;
    33523352}
    3353 node[craft=locksmith] {
     3353node[craft=locksmith][!is_prop_set(icon-image)] {
    33543354    icon-image: "misc/no_icon.png";
    33553355    set icon_z17;
     
    33613361    text: auto;
    33623362}
    3363 node[craft=upholsterer] {
     3363node[craft=upholsterer][!is_prop_set(icon-image)] {
    33643364    icon-image: "misc/no_icon.png";
    33653365    set icon_z17;
     
    37063706    text: auto;
    37073707}
    3708 node[military=barracks] {
     3708node[military=barracks][!is_prop_set(icon-image)] {
    37093709    icon-image: "misc/no_icon.png";
    37103710    set icon_z17;
     
    43704370    text: auto;
    43714371}
    4372 node[sport=paintball] {
     4372node[sport=paintball][!is_prop_set(icon-image)] {
    43734373    icon-image: "misc/no_icon.png";
    43744374    set icon_z17;
     
    43884388    fill-color: sport#bde3cb;
    43894389}
    4390 node[sport=squash] {
     4390node[sport=squash][!is_prop_set(icon-image)] {
    43914391    icon-image: "misc/no_icon.png";
    43924392    set icon_z17;
     
    44294429    text: auto;
    44304430}
    4431 node[sport=sailing] {
     4431node[sport=sailing][!is_prop_set(icon-image)] {
    44324432    icon-image: "misc/no_icon.png";
    44334433    set icon_z17;
     
    44394439    text: auto;
    44404440}
    4441 node[sport=badminton] {
     4441node[sport=badminton][!is_prop_set(icon-image)] {
    44424442    icon-image: "misc/no_icon.png";
    44434443    set icon_z17;
Note: See TracChangeset for help on using the changeset viewer.