Changeset 7927 in josm


Ignore:
Timestamp:
2015-01-06T00:15:55+01:00 (9 years ago)
Author:
Klumbumbus
Message:

see #10835 - icon unification and geometry consistency for whole facilities preset group

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/data/defaultpresets.xml

    r7926 r7927  
    29792979  <group name="Facilities" icon="presets/bed.png">
    29802980    <group name="Accommodation" icon="presets/bed.png">
    2981         <item name="Hotel" icon="presets/bed.png" type="node,closedway" preset_name_label="true">
     2981        <item name="Hotel" icon="styles/standard/accommodation.png" type="node,closedway" preset_name_label="true">
    29822982            <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
    29832983                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tourism=hotel"
    … …  
    30443044            <reference ref="contact" />
    30453045        </item> <!-- Chalet -->
    3046         <item name="Hostel" icon="presets/hostel.png" type="node,closedway" preset_name_label="true">
     3046        <item name="Hostel" icon="styles/standard/accommodation/hostel.png" type="node,closedway" preset_name_label="true">
    30473047            <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel"
    30483048                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tourism=hostel"
    … …  
    30783078        </item> <!-- Alpine Hut -->
    30793079        <separator/>
    3080         <item name="Caravan Site/RV Park" icon="presets/caravan2.png" type="node,closedway" preset_name_label="true">
     3080        <item name="Caravan Site/RV Park" icon="styles/standard/accommodation/camping/caravan.png" type="node,closedway" preset_name_label="true">
    30813081            <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=caravan_site"
    30823082                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tourism=caravan_site"
    … …  
    30973097            <reference ref="contact" />
    30983098        </item> <!-- Caravan Site/RV Park -->
    3099         <item name="Camping Site" icon="presets/tent.png" type="node,closedway" preset_name_label="true">
     3099        <item name="Camping Site" icon="styles/standard/accommodation/camping.png" type="node,closedway" preset_name_label="true">
    31003100            <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site"
    31013101                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tourism=camp_site"
    … …  
    31533153            <reference ref="contact" />
    31543154        </item> <!-- Fast Food -->
    3155         <item name="Food Court" icon="presets/fastfood.png" type="node,closedway" preset_name_label="true">
     3155        <item name="Food Court" icon="presets/restaurant.png" type="node,closedway" preset_name_label="true">
    31563156            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=food_court"
    31573157                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=food_court"
    … …  
    32183218            <reference ref="contact" />
    32193219        </item> <!-- Beer Garden -->
    3220         <item name="Bar" icon="presets/bar.png" type="node,closedway" preset_name_label="true">
     3220        <item name="Bar" icon="styles/standard/food/bar.png" type="node,closedway" preset_name_label="true">
    32213221            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar"
    32223222                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bar"
    … …  
    32353235            <reference ref="contact" />
    32363236        </item> <!-- Bar -->
    3237         <item name="Night Club" icon="presets/bar.png" type="node,closedway" preset_name_label="true">
     3237        <item name="Night Club" icon="styles/standard/leisure/discoball.svg" type="node,closedway" preset_name_label="true">
    32383238            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub"
    32393239                  da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:amenity=nightclub"
    … …  
    32543254            <reference ref="contact" />
    32553255        </item> <!-- Night Club -->
    3256         <item name="Strip Club" icon="styles/standard/leisure/stripclub.png" type="node,closedway" preset_name_label="true">
     3256        <item name="Strip Club" icon="styles/standard/leisure/nightclub.png" type="node,closedway" preset_name_label="true">
    32573257            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=stripclub"
    32583258                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:amenity=stripclub"
    … …  
    32783278            <reference ref="name_oh" />
    32793279        </item> <!-- Attraction -->
    3280         <item name="Viewpoint" icon="presets/viewpoint.png" type="node,closedway" preset_name_label="true">
     3280        <item name="Viewpoint" icon="styles/standard/sightseeing/viewpoint.png" type="node,closedway" preset_name_label="true">
    32813281            <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint"
    32823282                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tourism=viewpoint"
    … …  
    33693369            </optional>
    33703370        </item> <!-- Guidepost -->
    3371         <item name="Information Terminal" icon="presets/information.png" type="node" preset_name_label="true">
     3371        <item name="Information Terminal" icon="styles/standard/misc/information.png" type="node" preset_name_label="true">
    33723372            <link href="http://wiki.openstreetmap.org/wiki/Key:information"
    33733373                  de.href="http://wiki.openstreetmap.org/wiki/DE:Key:information"
    … …  
    33863386            <reference ref="internet" />
    33873387        </item> <!-- Information Terminal -->
    3388         <item name="Audio Guide" icon="presets/information.png" type="node" preset_name_label="true">
     3388        <item name="Audio Guide" icon="styles/standard/misc/information.png" type="node" preset_name_label="true">
    33893389            <link href="http://wiki.openstreetmap.org/wiki/Key:information"
    33903390                  de.href="http://wiki.openstreetmap.org/wiki/DE:Key:information"
    … …  
    34053405            <text key="phone" text="Phone number" />
    34063406        </item> <!-- Audio Guide -->
    3407         <item name="Other Information Point" icon="presets/information.png" type="node,closedway" preset_name_label="true">
     3407        <item name="Other Information Point" icon="styles/standard/misc/information.png" type="node,closedway" preset_name_label="true">
    34083408            <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=information"
    34093409                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:tourism=information"
    … …  
    34763476            <reference ref="contact" />
    34773477        </item> <!-- Amusement/Theme Park -->
    3478         <item name="Water Park" icon="presets/swimming.png" type="node,closedway" preset_name_label="true">
     3478        <item name="Water Park" icon="styles/standard/leisure/water_park.png" type="node,closedway" preset_name_label="true">
    34793479            <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=water_park"
    34803480                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=water_park"
    … …  
    35463546            <text key="name" text="Name" />
    35473547        </item> <!-- Playground -->
    3548         <item name="Picnic Site" icon="presets/picnic.png" type="node,closedway" preset_name_label="true">
     3548        <item name="Picnic Site" icon="styles/standard/leisure/picnic.png" type="node,closedway" preset_name_label="true">
    35493549            <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=picnic_site"
    35503550                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tourism=picnic_site"
    … …  
    35583558            <check key="fireplace" text="Fireplace" />
    35593559        </item> <!-- Picnic Site -->
    3560         <item name="Picnic Table" icon="presets/picnic.png" type="node" preset_name_label="true">
     3560        <item name="Picnic Table" icon="styles/standard/leisure/picnic.png" type="node" preset_name_label="true">
    35613561            <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=picnic_table" />
    35623562            <space />
    … …  
    35643564            <check key="covered" text="Covered" />
    35653565        </item> <!-- Picnic Table -->
    3566         <item name="Public Grill" icon="presets/bbq.png" type="node" preset_name_label="true">
     3566        <item name="Public Grill" icon="presets/bbq.png" type="node,closedway" preset_name_label="true">
    35673567            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bbq"
    35683568                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bbq"
    … …  
    35853585            <text key="name" text="Name" />
    35863586        </item> <!-- Firepit -->
    3587         <item name="Fishing" icon="presets/fishing.png" type="node,closedway" preset_name_label="true">
     3587        <item name="Fishing" icon="styles/standard/sport/fishing.png" type="node,closedway" preset_name_label="true">
    35883588            <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=fishing"
    35893589                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:leisure=fishing"
    … …  
    35943594            <text key="name" text="Name" />
    35953595        </item> <!-- Fishing -->
    3596         <item name="Private Swimming Pool" icon="presets/swimming.png" type="node,closedway" preset_name_label="true">
     3596        <item name="Private Swimming Pool" icon="styles/standard/sport/pool.png" type="node,closedway" preset_name_label="true">
    35973597            <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=swimming_pool"
    35983598                  ca.href="http://wiki.openstreetmap.org/wiki/Ca:Tag:leisure=swimming_pool"
    … …  
    36083608    </group> <!-- Leisure -->
    36093609    <group name="Culture" icon="presets/theater.png">
    3610         <item name="Museum" icon="presets/State_Public.png" type="node,closedway" preset_name_label="true">
     3610        <item name="Museum" icon="styles/standard/sightseeing/museum.png" type="node,closedway" preset_name_label="true">
    36113611            <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum"
    36123612                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tourism=museum"
    … …  
    38233823            <reference ref="oh" />
    38243824        </item> <!-- Shinto Shrine -->
    3825         <item name="Other Place of Worship" type="node,closedway,relation" preset_name_label="true">
     3825        <item name="Other Place of Worship" icon="styles/standard/religion.png" type="node,closedway,relation" preset_name_label="true">
    38263826            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=place_of_worship"
    38273827                  da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:amenity=place_of_worship"
    … …  
    42404240            <check key="payment:telephone_cards" text="Telephone cards" />
    42414241        </item> <!-- Telephone -->
    4242         <item name="Emergency Phone" icon="presets/telephone.png" type="node" preset_name_label="true">
     4242        <item name="Emergency Phone" icon="styles/standard/vehicle/emergency_phone.png" type="node" preset_name_label="true">
    42434243            <link href="http://wiki.openstreetmap.org/wiki/Tag:emergency=phone"
    42444244                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:emergency=phone"
    … …  
    43374337        </item> <!-- Waste Disposal/Dumpster -->
    43384338        <separator/>
    4339         <item name="Bench" icon="presets/bench.png" type="node" preset_name_label="true">
     4339        <item name="Bench" icon="presets/bench.png" type="node,way" preset_name_label="true">
    43404340            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench"
    43414341                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bench"
    … …  
    43574357            <combo key="seats" text="Amount of Seats" values="2,3,4,5,6,7,8,9,10" />
    43584358        </item> <!-- Bench -->
    4359         <item name="Shelter" icon="presets/shelter.png" type="node,closedway" preset_name_label="true">
     4359        <item name="Shelter" icon="styles/standard/accommodation/shelter.png" type="node,closedway" preset_name_label="true">
    43604360            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=shelter"
    43614361                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=shelter"

  • trunk/styles/standard/elemstyles.mapcss

    r7915 r7927  
    14291429area[leisure=track][!area?!]:closed,
    14301430area[leisure=pitch],
     1431area[leisure=horse_riding],
    14311432area[leisure=water_park] {
    14321433    fill-color: leisure#c7f1a3;
    … …  
    14581459node[leisure=pitch] {
    14591460    icon-image: "sport/pitch.png";
     1461    set icon_z17;
     1462    text: auto;
     1463}
     1464node[leisure=horse_riding] {
     1465    icon-image: "presets/equestrian.png";
     1466    icon-width: 16;
    14601467    set icon_z17;
    14611468    text: auto;
    … …  
    15491556}
    15501557node[leisure=dog_park] {
    1551     icon-image: "leisure/dog.png";
     1558    icon-image: "presets/dogpark.png";
     1559    icon-width: 16;
    15521560    set icon_z17;
    15531561    text: auto;
    … …  
    20832091}
    20842092node[amenity=nightclub] {
     2093    icon-image: "leisure/discoball.svg";
     2094    set icon_z17;
     2095    text: auto;
     2096}
     2097node[amenity=stripclub] {
    20852098    icon-image: "leisure/nightclub.png";
    2086     set icon_z17;
    2087     text: auto;
    2088 }
    2089 node[amenity=stripclub] {
    2090     icon-image: "leisure/stripclub.png";
    20912099    set icon_z17;
    20922100    text: auto;
    … …  
    22232231    text: auto;
    22242232}
    2225 area[amenity=telephone] {
    2226     fill-color: amenity_light#f7efb7;
    2227 }
    22282233node[amenity=telephone] {
    22292234    icon-image: "service/telephone.png";
    … …  
    22362241    text: auto;
    22372242}
    2238 area[emergency=phone],
    22392243area[emergency=aed],
    2240 area[emergency=defibrillator],
    22412244area[amenity=toilets],
    22422245area[amenity=shower],
    … …  
    22902293    fill-color: amenity_light#f7efb7;
    22912294}
    2292 node[amenity=public_building],
     2295node[amenity=public_building] {
     2296    icon-image: "service.png";
     2297    set icon_z17;
     2298    text: auto;
     2299}
    22932300node[amenity=townhall] {
    2294     icon-image: "service.png";
     2301    icon-image: "presets/townhall.png";
    22952302    set icon_z17;
    22962303    text: auto;
    … …  
    23062313    text: auto;
    23072314}
    2308 area[amenity=drinking_water],
    23092315area[amenity=water_point],
    23102316area[amenity=fountain] {
    … …  
    23302336area[amenity=crematorium],
    23312337area[amenity=post_office],
    2332 area[amenity=post_box],
    23332338area[amenity=studio],
    23342339area[amenity=school],
    … …  
    24622467area[amenity=hospital],
    24632468area[amenity=clinic],
     2469area[amenity=nursing_home],
     2470area[amenity=social_facility],
    24642471area[amenity=nursery],
    24652472area[amenity=baby_hatch],
    … …  
    24802487    text: auto;
    24812488}
     2489node[amenity=nursing_home],
     2490node[amenity=social_facility],
    24822491node[amenity=nursery] {
    24832492    icon-image: "misc/no_icon.png";
    … …  
    25482557}
    25492558node[amenity=theatre] {
    2550     icon-image: "leisure/theater.png";
     2559    icon-image: "presets/theater.png";
     2560    icon-width: 16;
    25512561    set icon_z17;
    25522562    text: auto;
    … …  
    26072617}
    26082618area[amenity=shelter],
    2609 area[amenity=hunting_stand],
    26102619area[amenity=marketplace],
    26112620area[amenity=wlan],
    … …  
    26302639node[amenity=shelter][shelter_type=basic_hut] {
    26312640    icon-image: "accommodation/basic_hut_blue.png";
     2641    set icon_z17;
     2642    text: auto;
     2643}
     2644node[amenity=shelter][shelter_type=lean_to] {
     2645    icon-image: "accommodation/shelter_lean_to.svg";
    26322646    set icon_z17;
    26332647    text: auto;
Note: See TracChangeset for help on using the changeset viewer.