Changeset 7296 in josm for trunk

Timestamp:

2014-07-08T18:49:07+02:00 (10 years ago)

Author:

bastiK

Message:

applied #10246 - add 10 shops (patch by Klumbumbus)

Location:

trunk

Files:

• data/defaultpresets.xml (modified) (7 diffs)
• styles/standard/elemstyles.mapcss (modified) (2 diffs)

trunk/data/defaultpresets.xml

@@ -2384 +2384 @@
             <reference ref="link_contact" />
         </item>
-        <item name="Parts" icon="presets/car_repair.png" type="node,closedway" preset_name_label="true">
+        <item name="Parts" icon="styles/standard/vehicle/car_parts.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car_parts"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=car_parts"
@@ -5463 +5463 @@
             <reference ref="link_contact" />
         </item>
+        <item name="Tea" icon="styles/standard/shop/groceries/tea.png" type="node,closedway" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=tea" />
+            <space />
+            <key key="shop" value="tea" />
+            <reference ref="name_oh" />
+            <reference ref="link_contact" />
+        </item>
+        <item name="Coffee" icon="styles/standard/shop/groceries/coffee.png" type="node,closedway" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=coffee" />
+            <space />
+            <key key="shop" value="coffee" />
+            <reference ref="name_oh" />
+            <reference ref="link_contact" />
+        </item>
         <separator/>
         <item name="Marketplace" icon="styles/standard/place/marketplace.png" type="node,way,closedway" preset_name_label="true">
@@ -5695 +5709 @@
             <space />
             <key key="shop" value="video" />
+            <reference ref="name_oh" />
+            <reference ref="link_contact" />
+        </item>
+        <item name="Video games" icon="styles/standard/shop/video_games.png" type="node,closedway" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=video_games" />
+            <space />
+            <key key="shop" value="video_games" />
             <reference ref="name_oh" />
             <reference ref="link_contact" />
@@ -5805 +5826 @@
             <reference ref="link_contact" />
         </item>
+        <item name="Beauty" icon="styles/standard/shop/beauty.png" type="node,closedway" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=beauty"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=beauty"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=beauty"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=beauty"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=beauty" />
+            <space />
+            <key key="shop" value="beauty" />
+            <reference ref="name_oh" />
+            <reference ref="link_contact" />
+        </item>
         <item name="Optician" icon="styles/standard/shop/optician.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=optician"
@@ -5946 +5978 @@
             <reference ref="link_contact" />
         </item>
+        <item name="Bed" icon="styles/standard/shop/bed.png" type="node,closedway" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bed"
+                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:shop=bed"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=bed"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=bed"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=bed" />
+            <space />
+            <key key="shop" value="bed" />
+            <reference ref="name_oh" />
+            <reference ref="link_contact" />
+        </item>
+        <item name="Interior decoration" icon="styles/standard/shop/interior_decoration.png" type="node,closedway" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=interior_decoration"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=interior_decoration"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=interior_decoration" />
+            <space />
+            <key key="shop" value="interior_decoration" />
+            <reference ref="name_oh" />
+            <reference ref="link_contact" />
+        </item>
         <separator/>
         <item name="Stationery" icon="presets/stationery.png" type="node,closedway" preset_name_label="true">
@@ -5990 +6042 @@
             <reference ref="name_oh" />
         </item>
+        <item name="Ticket" icon="styles/standard/shop/ticket.png" type="node,closedway" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=ticket"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=ticket" />
+            <space />
+            <key key="shop" value="ticket" />
+            <reference ref="name_oh" />
+            <reference ref="link_contact" />
+        </item>
         <separator/>
         <item name="Travel Agency" icon="presets/travel.png" type="node,closedway" preset_name_label="true">
@@ -6040 +6100 @@
             <key key="shop" value="lottery" />
             <reference ref="name_operator_oh" />
+        </item>
+        <item name="Bag" icon="styles/standard/shop/bag.png" type="node,closedway" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bag"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=bag"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=bag" />
+            <space />
+            <key key="shop" value="bag" />
+            <reference ref="name_oh" />
+            <reference ref="link_contact" />
+        </item>
+        <item name="Pet" icon="styles/standard/shop/pet.png" type="node,closedway" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=pet"
+                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:shop=pet"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=pet"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=pet"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=pet" />
+            <space />
+            <key key="shop" value="pet" />
+            <reference ref="name_oh" />
+            <reference ref="link_contact" />
         </item>
     </group> <!-- Other -->

trunk/styles/standard/elemstyles.mapcss

@@ -1434 +1434 @@
 area[shop=bookmaker],
 area[shop=lottery],
-area[shop=shopping_centre] {
+area[shop=shopping_centre],
+area[shop=pet],
+area[shop=ticket],
+area[shop=interior_decoration],
+area[shop=car_parts],
+area[shop=video_games],
+area[shop=bed],
+area[shop=beauty],
+area[shop=tea],
+area[shop=coffee],
+area[shop=bag] {
     fill-color: shop#00005f;
 }
@@ -1679 +1689 @@
 node[shop=shopping_centre] {
     icon-image: "shop/mall.png";
+    text: auto;
+}
+node[shop=pet] {
+    icon-image: "shop/pet.png";
+    text: auto;
+}
+node[shop=ticket] {
+    icon-image: "shop/ticket.png";
+    text: auto;
+}
+node[shop=interior_decoration] {
+    icon-image: "shop/interior_decoration.png";
+    text: auto;
+}
+node[shop=car_parts] {
+    icon-image: "vehicle/car_parts.png";
+    text: auto;
+}
+node[shop=video_games] {
+    icon-image: "shop/video_games.png";
+    text: auto;
+}
+node[shop=bed] {
+    icon-image: "shop/bed.png";
+    text: auto;
+}
+node[shop=beauty] {
+    icon-image: "shop/beauty.png";
+    text: auto;
+}
+node[shop=tea] {
+    icon-image: "shop/groceries/tea.png";
+    text: auto;
+}
+node[shop=coffee] {
+    icon-image: "shop/groceries/coffee.png";
+    text: auto;
+}
+node[shop=bag] {
+    icon-image: "shop/bag.png";
     text: auto;
 }