Changeset 9286 in josm for trunk

Timestamp:

2016-01-03T22:56:00+01:00 (9 years ago)

Author:

Klumbumbus

Message:

fix ​#12190 - add new health related icons, by zermes (icons see [o31931]); move old icons to nodist folder

Location:

trunk

Files:

• data/defaultpresets.xml (modified) (9 diffs)
• images_nodist/icons/baby_hatch.png (moved) (moved from trunk/images/presets/baby_hatch.png )
• images_nodist/icons/baby_hatch_16.png (added)
• images_nodist/icons/dentist.png (added)
• images_nodist/icons/doctor.png (added)
• images_nodist/icons/emergency.png (added)
• images_nodist/icons/emergency_access_point.png (added)
• images_nodist/icons/eye_specialist.png (added)
• images_nodist/icons/hospital.png (added)
• images_nodist/icons/hospital2.png (copied) (copied from trunk/images_nodist/icons/hospital.png )
• images_nodist/icons/optician.png (added)
• images_nodist/icons/pharmacy.png (added)
• images_nodist/icons/pharmacy2.png (copied) (copied from trunk/images_nodist/icons/pharmacy.png )
• images_nodist/icons/veterinary.png (added)
• styles/standard/elemstyles.mapcss (modified) (3 diffs)

trunk/data/defaultpresets.xml

@@ -4561 +4561 @@
         </item> <!-- Driving School -->
     </group> <!-- Education -->
-    <group name="Health" icon="styles/standard/health/pharmacy.png">
-        <item name="Hospital" icon="styles/standard/health/hospital.png" type="node,closedway" preset_name_label="true">
+    <group name="Health" icon="styles/standard/health/pharmacy.svg">
+        <item name="Hospital" icon="styles/standard/health/hospital.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=hospital"
@@ -4577 +4577 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Hospital -->
-        <item name="Clinic" icon="styles/standard/health/hospital.png" type="node,closedway" preset_name_label="true">
+        <item name="Clinic" icon="styles/standard/health/clinic.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=clinic"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=clinic"
@@ -4588 +4588 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Clinic -->
-        <item name="Doctor's Office" icon="styles/standard/health/doctor.png" type="node,closedway" preset_name_label="true">
+        <item name="Doctor's Office" icon="styles/standard/health/doctors.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=doctors"
@@ -4602 +4602 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Doctor's Office -->
-        <item name="Dentist" icon="styles/standard/health/dentist.png" type="node,closedway" preset_name_label="true">
+        <item name="Dentist" icon="styles/standard/health/dentist.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=dentist"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=dentist"
@@ -4614 +4614 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Dentist -->
-        <item name="Pharmacy" icon="styles/standard/health/pharmacy.png" type="node,closedway" preset_name_label="true">
+        <item name="Pharmacy" icon="styles/standard/health/pharmacy.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=pharmacy"
@@ -4631 +4631 @@
         </item> <!-- Pharmacy -->
         <separator/>
-        <item name="Baby Hatch/Safe Haven" icon="presets/baby_hatch.png" type="node,closedway" preset_name_label="true">
+        <item name="Baby Hatch/Safe Haven" icon="styles/standard/health/baby_hatch.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:amenity=baby_hatch"
@@ -4649 +4649 @@
         </item> <!-- Baby Hatch/Safe Haven -->
         <separator/>
-        <item name="Emergency Access Point" icon="styles/standard/service/emergency_access_point.png" type="node,closedway" preset_name_label="true">
+        <item name="Emergency Access Point" icon="styles/standard/service/emergency_access_point.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point"
@@ -4665 +4665 @@
         </item> <!-- Emergency Access Point -->
         <separator/>
-        <item name="Veterinary" icon="styles/standard/health/veterinary.png" type="node,closedway" preset_name_label="true">
+        <item name="Veterinary" icon="styles/standard/health/veterinary.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:amenity=veterinary"
@@ -4683 +4683 @@
     </group> <!-- Health -->
     <group name="Social Facility" icon="styles/standard/social_facility/outreach.svg">
-        <item name="Nursing Home" icon="styles/standard/social_facility/group_home.svg" type="node,closedway" preset_name_label="true">
+        <item name="Nursing Home" icon="styles/standard/social_facility/nursing_home.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nursing_home"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=nursing_home"

trunk/styles/standard/elemstyles.mapcss

@@ -856 +856 @@
 }
 node[highway=emergency_access_point] {
-    icon-image: "service/emergency_access_point.png";
+    icon-image: "service/emergency_access_point.svg";
     set icon_z17;
     text: auto;
@@ -2748 +2748 @@
 }
 node[amenity=pharmacy] {
-    icon-image: "health/pharmacy.png";
-    set icon_z17;
-    text: auto;
-}
-node[amenity=hospital],
+    icon-image: "health/pharmacy.svg";
+    set icon_z17;
+    text: auto;
+}
+node[amenity=hospital] {
+    icon-image: "health/hospital.svg";
+    set icon_z17;
+    text: auto;
+}
 node[amenity=clinic] {
-    icon-image: "health/hospital.png";
-    set icon_z17;
-    text: auto;
-}
-node[amenity=nursing_home],
+    icon-image: "health/clinic.svg";
+    set icon_z17;
+    text: auto;
+}
+node[amenity=nursing_home] {
+    icon-image: "social_facility/nursing_home.svg";
+    set icon_z17;
+    text: auto;
+}
 node[amenity=social_facility][social_facility=group_home] {
     icon-image: "social_facility/group_home.svg";
@@ -2785 +2793 @@
 }
 node[amenity=baby_hatch] {
-    icon-image: "health/baby_hatch.png";
+    icon-image: "health/baby_hatch.svg";
     set icon_z17;
     text: auto;
 }
 node[amenity=doctors] {
-    icon-image: "health/doctor.png";
+    icon-image: "health/doctors.svg";
     set icon_z17;
     text: auto;
 }
 node[amenity=dentist] {
-    icon-image: "health/dentist.png";
+    icon-image: "health/dentist.svg";
     set icon_z17;
     text: auto;
 }
 node[amenity=veterinary] {
-    icon-image: "health/veterinary.png";
+    icon-image: "health/veterinary.svg";
     set icon_z17;
     text: auto;