Ticket #11445: new-icons-food-and-accommodation.patch

File new-icons-food-and-accommodation.patch, 10.9 KB (added by Yarl, 10 years ago)

patch

  • data/defaultpresets.xml

     
    31493149    </group> <!-- Airport -->
    31503150  </group> <!-- Transport -->
    31513151  <group name="Facilities" icon="presets/bed.png">
    3152     <group name="Accommodation" icon="presets/bed.png">
    3153         <item name="Hotel" icon="styles/standard/accommodation.png" type="node,closedway" preset_name_label="true">
     3152    <group name="Accommodation" icon="styles/standard/accommodation/hotel.svg">
     3153        <item name="Hotel" icon="styles/standard/accommodation/hotel.svg" type="node,closedway" preset_name_label="true">
    31543154            <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
    31553155                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tourism=hotel"
    31563156                  fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel"
    … …  
    31693169            <space />
    31703170            <reference ref="link_contact_address_payment" />
    31713171        </item> <!-- Hotel -->
    3172         <item name="Motel" icon="styles/standard/accommodation/motel.png" type="node,closedway" preset_name_label="true">
     3172        <item name="Motel" icon="styles/standard/accommodation/motel.svg" type="node,closedway" preset_name_label="true">
    31733173            <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel"
    31743174                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tourism=motel"
    31753175                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:tourism=motel"
    … …  
    32223222            <space />
    32233223            <reference ref="link_contact_address_payment" />
    32243224        </item> <!-- Chalet -->
    3225         <item name="Hostel" icon="styles/standard/accommodation/hostel.png" type="node,closedway" preset_name_label="true">
     3225        <item name="Hostel" icon="styles/standard/accommodation/hostel.svg" type="node,closedway" preset_name_label="true">
    32263226            <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel"
    32273227                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tourism=hostel"
    32283228                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:tourism=hostel"
    … …  
    32403240            <space />
    32413241            <reference ref="link_contact_address_payment" />
    32423242        </item> <!-- Hostel -->
    3243         <item name="Alpine Hut" icon="styles/standard/accommodation/alpine_hut_blue.png" type="node,closedway" preset_name_label="true">
     3243        <item name="Alpine Hut" icon="styles/standard/accommodation/alpine_hut.png" type="node,closedway" preset_name_label="true">
    32443244            <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=alpine_hut"
    32453245                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tourism=alpine_hut"
    32463246                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:tourism=alpine_hut"
    … …  
    32573257            <reference ref="link_contact_address_payment" />
    32583258        </item> <!-- Alpine Hut -->
    32593259        <separator/>
    3260         <item name="Caravan Site/RV Park" icon="styles/standard/accommodation/camping/caravan.png" type="node,closedway" preset_name_label="true">
     3260        <item name="Caravan Site/RV Park" icon="styles/standard/accommodation/camping/caravan.svg" type="node,closedway" preset_name_label="true">
    32613261            <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=caravan_site"
    32623262                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tourism=caravan_site"
    32633263                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:tourism=caravan_site"
    … …  
    32793279            <space />
    32803280            <reference ref="link_contact_address_payment" />
    32813281        </item> <!-- Caravan Site/RV Park -->
    3282         <item name="Camping Site" icon="styles/standard/accommodation/camping.png" type="node,closedway" preset_name_label="true">
     3282        <item name="Camping Site" icon="styles/standard/accommodation/camping.svg" type="node,closedway" preset_name_label="true">
    32833283            <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site"
    32843284                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tourism=camp_site"
    32853285                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:tourism=camp_site"
    … …  
    33003300            <reference ref="link_contact_address_payment" />
    33013301        </item> <!-- Camping Site -->
    33023302    </group> <!-- Accommodation -->
    3303     <group name="Food+Drinks" icon="presets/restaurant.png">
    3304         <item name="Restaurant" icon="presets/restaurant.png" type="node,closedway" preset_name_label="true">
     3303    <group name="Food+Drinks" icon="styles/standard/food/restaurant.svg">
     3304        <item name="Restaurant" icon="styles/standard/food/restaurant.svg" type="node,closedway" preset_name_label="true">
    33053305            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant"
    33063306                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=restaurant"
    33073307                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:amenity=restaurant"
    … …  
    33233323            <space />
    33243324            <reference ref="link_contact_address_payment" />
    33253325        </item> <!-- Restaurant -->
    3326         <item name="Fast Food" icon="presets/fastfood.png" type="node,closedway" preset_name_label="true">
     3326        <item name="Fast Food" icon="styles/standard/food/fast_food.svg" type="node,closedway" preset_name_label="true">
    33273327            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food"
    33283328                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fast_food"
    33293329                  it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=fast_food"
    … …  
    33413341            <space />
    33423342            <reference ref="link_contact_address_payment" />
    33433343        </item> <!-- Fast Food -->
    3344         <item name="Food Court" icon="presets/restaurant.png" type="node,closedway" preset_name_label="true">
     3344        <item name="Food Court" icon="styles/standard/food/restaurant.svg" type="node,closedway" preset_name_label="true">
    33453345            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=food_court"
    33463346                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=food_court"
    33473347                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=food_court"
    … …  
    33563356            <space />
    33573357            <reference ref="link_contact_address_payment" />
    33583358        </item> <!-- Food Court -->
    3359         <item name="Cafe" icon="presets/cafe.png" type="node,closedway" preset_name_label="true">
     3359        <item name="Cafe" icon="styles/standard/food/cafe.svg" type="node,closedway" preset_name_label="true">
    33603360            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe"
    33613361                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=cafe"
    33623362                  et.href="http://wiki.openstreetmap.org/wiki/Et:Tag:amenity=cafe"
    … …  
    33783378            <space />
    33793379            <reference ref="link_contact_address_payment" />
    33803380        </item> <!-- Cafe -->
    3381         <item name="Pub" icon="presets/pub.png" type="node,closedway" preset_name_label="true">
     3381        <item name="Pub" icon="styles/standard/food/pub.svg" type="node,closedway" preset_name_label="true">
    33823382            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub"
    33833383                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=pub"
    33843384                  it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=pub"
    … …  
    33963396            <space />
    33973397            <reference ref="link_contact_address_payment" />
    33983398        </item> <!-- Pub -->
    3399         <item name="Beer Garden" icon="presets/biergarten.png" type="node,closedway" preset_name_label="true">
     3399        <item name="Beer Garden" icon="styles/standard/food/biergarten.svg" type="node,closedway" preset_name_label="true">
    34003400            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=biergarten"
    34013401                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=biergarten"
    34023402                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=biergarten"
    … …  
    34123412            <space />
    34133413            <reference ref="link_contact_address_payment" />
    34143414        </item> <!-- Beer Garden -->
    3415         <item name="Bar" icon="styles/standard/food/bar.png" type="node,closedway" preset_name_label="true">
     3415        <item name="Bar" icon="styles/standard/food/bar.svg" type="node,closedway" preset_name_label="true">
    34163416            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar"
    34173417                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bar"
    34183418                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:amenity=bar"

  • styles/standard/elemstyles.mapcss

     
    21612161    fill-color: amenity#ecba52;
    21622162}
    21632163node[amenity=pub] {
    2164     icon-image: "food/pub.png";
     2164    icon-image: "food/pub.svg";
    21652165    set icon_z17;
    21662166    text: auto;
    21672167}
    21682168node[amenity=biergarten] {
    2169     icon-image: "food/biergarten.png";
     2169    icon-image: "food/biergarten.svg";
    21702170    set icon_z17;
    21712171    text: auto;
    21722172}
    … …  
    21862186    text: auto;
    21872187}
    21882188node[amenity=cafe] {
    2189     icon-image: "food/cafe.png";
     2189    icon-image: "food/cafe.svg";
    21902190    set icon_z17;
    21912191    text: auto;
    21922192}
    21932193node[amenity=restaurant],
    21942194node[amenity=food_court] {
    2195     icon-image: "food/restaurant.png";
     2195    icon-image: "food/restaurant.svg";
    21962196    set icon_z17;
    21972197    text: auto;
    21982198}
    21992199node[amenity=fast_food] {
    2200     icon-image: "food/fastfood.png";
     2200    icon-image: "food/fast_food.svg";
    22012201    set icon_z17;
    22022202    text: auto;
    22032203}
    22042204node[amenity=bar] {
    2205     icon-image: "food/bar.png";
     2205    icon-image: "food/bar.svg";
    22062206    set icon_z17;
    22072207    text: auto;
    22082208}
    … …  
    28232823    fill-color: hotel#e1a0a2;
    28242824}
    28252825node[tourism=hotel] {
    2826     icon-image: "accommodation.png";
     2826    icon-image: "accommodation/hotel.svg";
    28272827    set icon_z17;
    28282828    text: auto;
    28292829}
    28302830node[tourism=motel] {
    2831     icon-image: "accommodation/motel.png";
     2831    icon-image: "accommodation/motel.svg";
    28322832    set icon_z17;
    28332833    text: auto;
    28342834}
    … …  
    28382838    text: auto;
    28392839}
    28402840node[tourism=hostel] {
    2841     icon-image: "accommodation/hostel.png";
     2841    icon-image: "accommodation/hostel.svg";
    28422842    set icon_z17;
    28432843    text: auto;
    28442844}
    … …  
    28482848    text: auto;
    28492849}
    28502850node[tourism=alpine_hut] {
    2851     icon-image: "accommodation/alpine_hut_blue.png";
     2851    icon-image: "accommodation/alpine_hut.png";
    28522852    set icon_z17;
    28532853    text: auto;
    28542854}
    … …  
    28582858    text: auto;
    28592859}
    28602860node[tourism=camp_site] {
    2861     icon-image: "accommodation/camping.png";
     2861    icon-image: "accommodation/camping.svg";
    28622862    set icon_z17;
    28632863    text: auto;
    28642864}
    28652865node[tourism=caravan_site] {
    2866     icon-image: "accommodation/camping/caravan.png";
     2866    icon-image: "accommodation/camping/caravan.svg";
    28672867    set icon_z17;
    28682868    text: auto;
    28692869}