Changeset 7976 in josm for trunk/data

Timestamp:

2015-01-21T00:25:39+01:00 (10 years ago)

Author:

Klumbumbus

Message:

see #10963 - add more colored place icons and improve paint order

File:

• trunk/data/defaultpresets.xml (modified) (7 diffs)

trunk/data/defaultpresets.xml

@@ -6824 +6824 @@
             <reference ref="population_postcode_website" />
         </item> <!-- City -->
-        <item name="Town" icon="styles/standard/place/settlement/city.png" type="node,closedway" preset_name_label="true">
+        <item name="Town" icon="styles/standard/place/settlement/town.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town"
                   da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:place=town"
@@ -6837 +6837 @@
             <reference ref="population_postcode_website" />
         </item> <!-- Town -->
-        <item name="Suburb" icon="styles/standard/place/settlement/city.png" type="node,closedway" preset_name_label="true">
+        <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"
@@ -6849 +6849 @@
             <reference ref="population_postcode_website" />
         </item> <!-- Suburb -->
-        <item name="Village" icon="styles/standard/place/settlement/city.png" type="node,closedway" preset_name_label="true">
+        <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"
                   da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:place=village"
@@ -6864 +6864 @@
             <reference ref="population_postcode_website" />
         </item> <!-- Village -->
-        <item name="Hamlet" icon="styles/standard/place/settlement/city.png" type="node,closedway" preset_name_label="true">
+        <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"
                   da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:place=hamlet"
@@ -6877 +6890 @@
             <reference ref="population_postcode_website" />
         </item> <!-- Hamlet -->
-        <item name="Farm" icon="styles/standard/place/settlement/city.png" type="node,closedway" preset_name_label="true">
+        <item name="Farm" icon="styles/standard/place/settlement/hamlet.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"
@@ -6888 +6901 @@
             <reference ref="population_postcode_website" />
         </item> <!-- Farm -->
-        <item name="Isolated Dwelling" icon="styles/standard/place/settlement/city.png" type="node,closedway" preset_name_label="true">
+        <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"
@@ -6900 +6913 @@
             <reference ref="population_postcode_website" />
         </item> <!-- Isolated Dwelling -->
-        <item name="Neighbourhood" icon="styles/standard/place/settlement/city.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 -->
         <separator/>
         <item name="Locality" icon="presets/locality.png" type="node,closedway" preset_name_label="true">