Changeset 8592 in josm

Timestamp:

2015-07-10T19:10:35+02:00 (9 years ago)

Author:

Klumbumbus

Message:

fix #11445 - replace some icons, move old icons to josm nodist folder. source of new icons: ​https://github.com/nebulon42/osmic-josm-style/archive/master.zip, CC0

Location:

trunk

Files:

• data/defaultpresets.xml (modified) (10 diffs)
• images_nodist/icons/clock.png (added)
• images_nodist/icons/court_of_law.png (added)
• images_nodist/icons/hostel.png (added)
• images_nodist/icons/hotel.png (added)
• images_nodist/icons/hotel2.png (copied) (copied from trunk/images_nodist/icons/hotel.png )
• images_nodist/icons/motel.png (added)
• images_nodist/icons/museum.png (added)
• images_nodist/icons/museum2.png (copied) (copied from trunk/images_nodist/icons/museum.png )
• images_nodist/icons/prison.png (moved) (moved from trunk/images/presets/prison.png )
• images_nodist/icons/supermarket2.png (added)
• images_nodist/icons/water_tower.png (added)
• styles/standard/elemstyles.mapcss (modified) (8 diffs)

trunk/data/defaultpresets.xml

@@ -3197 +3197 @@
   <group name="Facilities" icon="presets/bed.png">
     <group name="Accommodation" icon="presets/bed.png">
-        <item name="Hotel" icon="styles/standard/accommodation.png" type="node,closedway" preset_name_label="true">
+        <item name="Hotel" icon="styles/standard/accommodation/hotel.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tourism=hotel"
@@ -3218 +3218 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Hotel -->
-        <item name="Motel" icon="styles/standard/accommodation/motel.png" type="node,closedway" preset_name_label="true">
+        <item name="Motel" icon="styles/standard/accommodation/motel.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tourism=motel"
@@ -3277 +3277 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Chalet -->
-        <item name="Hostel" icon="styles/standard/accommodation/hostel.png" type="node,closedway" preset_name_label="true">
+        <item name="Hostel" icon="styles/standard/accommodation/hostel.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tourism=hostel"
@@ -3887 +3887 @@
     </group> <!-- Leisure -->
     <group name="Culture" icon="presets/theater.png">
-        <item name="Museum" icon="styles/standard/sightseeing/museum.png" type="node,closedway" preset_name_label="true">
+        <item name="Museum" icon="styles/standard/sightseeing/museum.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tourism=museum"
@@ -4187 +4187 @@
             <reference ref="link_contact_address" />
         </item> <!-- Embassy -->
-        <item name="Courthouse" icon="presets/JusticeScales.png" type="node,closedway,relation" preset_name_label="true">
+        <item name="Courthouse" icon="styles/standard/service/administration/courthouse.svg" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=courthouse"
@@ -4199 +4199 @@
             <reference ref="link_contact_address" />
         </item> <!-- Courthouse -->
-        <item name="Prison" icon="presets/prison.png" type="node,closedway,relation" preset_name_label="true">
+        <item name="Prison" icon="styles/standard/service/administration/prison.svg" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=prison"
@@ -4582 +4582 @@
             -->
         </item> <!-- Automated Defibrillator -->
-        <item name="Clock" icon="styles/standard/service/clock.png" type="node" preset_name_label="true">
+        <item name="Clock" icon="styles/standard/service/clock.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=clock"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=clock"
@@ -5548 +5548 @@
         </item> <!-- Embankment -->
         <separator/>
-        <item name="Water Tower" icon="styles/standard/misc/landmark/water_tower.png" type="node,closedway" preset_name_label="true">
+        <item name="Water Tower" icon="styles/standard/misc/landmark/water_tower.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=water_tower"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=water_tower"
@@ -6315 +6315 @@
   </group> <!-- Man Made -->
   <group name="Shops" icon="styles/standard/shop/mall.png">
-    <group name="Food" icon="styles/standard/shop/supermarket.png">
-        <item name="Supermarket" icon="styles/standard/shop/supermarket.png" type="node,closedway" preset_name_label="true">
+    <group name="Food" icon="styles/standard/shop/supermarket.svg">
+        <item name="Supermarket" icon="styles/standard/shop/supermarket.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=supermarket"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=supermarket"
@@ -6906 +6906 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Book Store -->
-        <item name="Newspaper Stand" icon="presets/kiosk.png" type="node,closedway" preset_name_label="true">
+        <item name="Newspaper Stand" icon="styles/standard/shop/news.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=newsagent"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=newsagent"

trunk/styles/standard/elemstyles.mapcss

@@ -1435 +1435 @@
 }
 node[man_made=water_tower] {
-    icon-image: "misc/landmark/water_tower.png";
+    icon-image: "misc/landmark/water_tower.svg";
     set icon_z17;
     text: auto;
@@ -1750 +1750 @@
 }
 node[shop=supermarket] {
-    icon-image: "shop/supermarket.png";
+    icon-image: "shop/supermarket.svg";
     set icon_z17;
     text: auto;
@@ -1972 +1972 @@
 }
 node[shop=newsagent] {
-    icon-image: "shop/kiosk.png";
+    icon-image: "shop/news.svg";
     set icon_z17;
     text: auto;
@@ -2342 +2342 @@
 }
 node[amenity=clock] {
-    icon-image: "service/clock.png";
+    icon-image: "service/clock.svg";
     set icon_z17;
     text: auto;
@@ -2689 +2689 @@
 }
 node[amenity=courthouse] {
-    icon-image: "service/administration/court_of_law.png";
+    icon-image: "service/administration/courthouse.svg";
     set icon_z17;
     text: auto;
 }
 node[amenity=prison] {
-    icon-image: "service/administration/prison.png";
+    icon-image: "service/administration/prison.svg";
     set icon_z17;
     text: auto;
@@ -2845 +2845 @@
 }
 node[tourism=hotel] {
-    icon-image: "accommodation.png";
+    icon-image: "accommodation/hotel.svg";
     set icon_z17;
     text: auto;
 }
 node[tourism=motel] {
-    icon-image: "accommodation/motel.png";
+    icon-image: "accommodation/motel.svg";
     set icon_z17;
     text: auto;
@@ -2860 +2860 @@
 }
 node[tourism=hostel] {
-    icon-image: "accommodation/hostel.png";
+    icon-image: "accommodation/hostel.svg";
     set icon_z17;
     text: auto;
@@ -2933 +2933 @@
 }
 node[tourism=museum] {
-    icon-image: "sightseeing/museum.png";
+    icon-image: "sightseeing/museum.svg";
     set icon_z17;
     text: auto;