Changeset 7984 in josm for trunk

Timestamp:

2015-01-23T23:58:57+01:00 (9 years ago)

Author:

Klumbumbus

Message:

see #10963 - improve color and order of place icons

Location:

trunk

Files:

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

trunk/data/defaultpresets.xml

@@ -6783 +6783 @@
         </item> <!-- Protected Area -->
     </group> <!-- Boundaries -->
-    <group name="Places" icon="styles/standard/place/settlement/city.png">
+    <group name="Places" icon="styles/standard/place/settlement/isolated_dwelling.png">
         <item name="Continent" icon="styles/standard/place/settlement/capital.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:place=continent"
@@ -6849 +6849 @@
             <reference ref="population_postcode_website" />
         </item> <!-- Town -->
-        <item name="Suburb" icon="styles/standard/place/settlement/suburb.png" type="node,closedway" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb"
-                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:place=suburb"
-                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:place=suburb"
-                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:place=suburb"
-                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:place=suburb"
-                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:place=suburb" />
-            <space />
-            <key key="place" value="suburb" />
-            <reference ref="name_wikipedia" />
-            <reference ref="population_postcode_website" />
-        </item> <!-- Suburb -->
         <item name="Village" icon="styles/standard/place/settlement/village.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:place=village"
@@ -6876 +6864 @@
             <reference ref="population_postcode_website" />
         </item> <!-- Village -->
-        <item name="Neighbourhood" icon="styles/standard/place/settlement/hamlet.png" type="node,closedway" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:place=neighbourhood"
-                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:place=neighbourhood"
-                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:place=neighbourhood"
-                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:place=neighbourhood"
-                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:place=neighbourhood"
-                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:place=neighbourhood" />
-            <space />
-            <key key="place" value="neighbourhood" />
-            <reference ref="name_wikipedia" />
-            <text key="population" text="Population" />
-            <text key="website" text="Website" />
-        </item> <!-- Neighbourhood -->
         <item name="Hamlet" icon="styles/standard/place/settlement/hamlet.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:place=hamlet"
@@ -6902 +6877 @@
             <reference ref="population_postcode_website" />
         </item> <!-- Hamlet -->
-        <item name="Farm" icon="styles/standard/place/settlement/hamlet.png" type="node,closedway" preset_name_label="true">
+        <item name="Isolated Dwelling" icon="styles/standard/place/settlement/isolated_dwelling.png" type="node,closedway" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:place=isolated_dwelling"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:place=isolated_dwelling"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:place=isolated_dwelling"
+                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:place=isolated_dwelling"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:place=isolated_dwelling"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:place=isolated_dwelling" />
+            <space />
+            <key key="place" value="isolated_dwelling" />
+            <reference ref="name_wikipedia" />
+            <reference ref="population_postcode_website" />
+        </item> <!-- Isolated Dwelling -->
+        <separator/>
+        <item name="Suburb" icon="styles/standard/place/settlement/suburb.png" type="node,closedway" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:place=suburb"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:place=suburb"
+                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:place=suburb"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:place=suburb"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:place=suburb" />
+            <space />
+            <key key="place" value="suburb" />
+            <reference ref="name_wikipedia" />
+            <reference ref="population_postcode_website" />
+        </item> <!-- Suburb -->
+        <item name="Neighbourhood" icon="styles/standard/place/settlement/neighbourhood.png" type="node,closedway" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:place=neighbourhood"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:place=neighbourhood"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:place=neighbourhood"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:place=neighbourhood"
+                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:place=neighbourhood"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:place=neighbourhood" />
+            <space />
+            <key key="place" value="neighbourhood" />
+            <reference ref="name_wikipedia" />
+            <text key="population" text="Population" />
+            <text key="website" text="Website" />
+        </item> <!-- Neighbourhood -->
+        <item name="Farm" icon="styles/standard/place/settlement/farm.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:place=farm"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:place=farm"
@@ -6913 +6926 @@
             <reference ref="population_postcode_website" />
         </item> <!-- Farm -->
-        <item name="Isolated Dwelling" icon="styles/standard/place/settlement/hamlet.png" type="node,closedway" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:place=isolated_dwelling"
-                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:place=isolated_dwelling"
-                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:place=isolated_dwelling"
-                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:place=isolated_dwelling"
-                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:place=isolated_dwelling"
-                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:place=isolated_dwelling" />
-            <space />
-            <key key="place" value="isolated_dwelling" />
-            <reference ref="name_wikipedia" />
-            <reference ref="population_postcode_website" />
-        </item> <!-- Isolated Dwelling -->
         <separator/>
         <item name="Locality" icon="presets/locality.png" type="node,closedway" preset_name_label="true">

trunk/styles/standard/elemstyles.mapcss

@@ -4310 +4310 @@
     text-halo-color: white;
     text-halo-radius: 1;
-    z-index: 2.6;
+    z-index: 2.9;
 }
 node[place=city] {
     icon-image: "place/settlement/city.png";
+    set icon_z0;
+    text: auto;
+    set text_z0;
+    font-size: 10;
+    font-weight: bold;
+    text-color:black;
+    text-halo-color: white;
+    text-halo-radius: 1;
+    z-index: 2.8;
+}
+node[place=town] {
+    icon-image: "place/settlement/town.png";
+    set icon_z0;
+    text: auto;
+    set text_z0;
+    font-size: 10;
+    font-weight: bold;
+    text-color:black;
+    text-halo-color: white;
+    text-halo-radius: 1;
+    z-index: 2.7;
+}
+node[place=suburb] {
+    icon-image: "place/settlement/suburb.png";
+    set icon_z0;
+    text: auto;
+    set text_z0;
+    font-size: 10;
+    font-weight: bold;
+    text-color:black;
+    text-halo-color: white;
+    text-halo-radius: 1;
+    z-index: 2.6;
+}
+node[place=village] {
+    icon-image: "place/settlement/village.png";
     set icon_z0;
     text: auto;
@@ -4324 +4360 @@
     z-index: 2.5;
 }
-node[place=town] {
-    icon-image: "place/settlement/town.png";
+node[place=neighbourhood] {
+    icon-image: "place/settlement/neighbourhood.png";
     set icon_z0;
     text: auto;
@@ -4336 +4372 @@
     z-index: 2.4;
 }
-node[place=suburb] {
-    icon-image: "place/settlement/suburb.png";
+node[place=hamlet] {
+    icon-image: "place/settlement/hamlet.png";
     set icon_z0;
     text: auto;
@@ -4348 +4384 @@
     z-index: 2.3;
 }
-node[place=village] {
-    icon-image: "place/settlement/village.png";
+node[place=isolated_dwelling] {
+    icon-image: "place/settlement/isolated_dwelling.png";
     set icon_z0;
     text: auto;
@@ -4360 +4396 @@
     z-index: 2.2;
 }
-node[place=hamlet],
-node[place=farm],
-node[place=isolated_dwelling],
-node[place=neighbourhood] {
-    icon-image: "place/settlement/hamlet.png";
+node[place=farm] {
+    icon-image: "place/settlement/farm.png";
     set icon_z0;
     text: auto;