Changeset 10996 in josm

Timestamp:

2016-09-12T21:15:56+02:00 (8 years ago)

Author:

Klumbumbus

Message:

fix #13515 - add building=ruins and natural=shingle to preset and mappaint style; new isons for shingle and scree self created CC0 and PD licensed

Location:

trunk

Files:

• data/defaultpresets.xml (modified) (4 diffs)
• data/validator/ignoretags.cfg (modified) (2 diffs)
• images/presets/landuse/scree.svg (added)
• images/presets/landuse/shingle.svg (added)
• styles/standard/elemstyles.mapcss (modified) (2 diffs)

trunk/data/defaultpresets.xml

@@ -6077 +6077 @@
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Key:building" />
             <space />
-            <combo key="building" text="Building" values="yes,roof,garage,garages,industrial,school,hangar,commercial,service,train_station,barn,stable,cabin,farm_auxiliary,transportation,greenhouse,office,university,hospital,kindergarten,manufacture,warehouse,retail,shed,storage_tank,supermarket,gasometer,silo,cowshed,construction,basilica,cathedral,chapel,church,temple,mosque,synagogue,transformer_tower,public" values_context="building" default="yes" match="keyvalue!" values_searchable="true" />
+            <combo key="building" text="Building" values="yes,roof,garage,garages,industrial,school,hangar,commercial,service,train_station,barn,stable,cabin,farm_auxiliary,transportation,greenhouse,office,university,hospital,kindergarten,manufacture,warehouse,retail,shed,storage_tank,supermarket,gasometer,silo,cowshed,construction,basilica,cathedral,chapel,church,temple,mosque,synagogue,transformer_tower,public,ruins" values_context="building" default="yes" match="keyvalue!" values_searchable="true" />
             <optional>
                 <text key="name" text="Name" />
@@ -6117 +6117 @@
                   zh_CN.href="http://wiki.openstreetmap.org/wiki/Zh-hans:Key:building:part" />
             <space />
-            <combo key="building:part" text="Building part" values="yes,roof,garage,garages,industrial,school,hangar,commercial,barn,farm_auxiliary,transportation,greenhouse,office,university,hospital,warehouse,retail,shed,supermarket,cowshed,construction" values_context="building" default="yes" match="keyvalue!" values_searchable="true" />
+            <combo key="building:part" text="Building part" values="yes,roof,garage,garages,industrial,school,hangar,commercial,barn,farm_auxiliary,transportation,greenhouse,office,university,hospital,warehouse,retail,shed,supermarket,cowshed,construction,ruins" values_context="building" default="yes" match="keyvalue!" values_searchable="true" />
             <text key="name" text="Name" />
             <combo key="building:levels" text="Levels" values="1,2,3,4,5,6,7,8,9,10,11" text_context="building" />
@@ -9151 +9151 @@
         </item> <!-- Nature Reserve -->
         <separator/>
-        <item name="Scree" type="closedway,multipolygon" preset_name_label="true">
+        <item name="Scree" icon="presets/landuse/scree.svg" type="closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=scree"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=scree"
@@ -9162 +9162 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=scree"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=scree" />
-            <label text="An accumulation of loose rocks." />
+            <label text="An accumulation of loose angular rocks." />
             <space />
             <key key="natural" value="scree" />
             <text key="name" text="Name" />
         </item> <!-- Scree -->
+        <item name="Shingle" icon="presets/landuse/shingle.svg" type="closedway,multipolygon" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=shingle" />
+            <label text="An accumulation of loose rounded rocks on a beach or riverbed." />
+            <space />
+            <key key="natural" value="shingle" />
+            <text key="name" text="Name" />
+        </item> <!-- Shingle -->
         <item name="Fell" type="closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell"

trunk/data/validator/ignoretags.cfg

@@ -154 +154 @@
 K:building=houseboat
 K:building=static_caravan
-K:building=ruins
 K:leisure=recreation_ground
 K:old_railway_operator=PRR
@@ -207 +206 @@
 ;
 K:natural=marsh
-K:natural=shingle
 ;
 ; Relation Tags

trunk/styles/standard/elemstyles.mapcss

@@ -4043 +4043 @@
 }
 area[natural=scree] {
-    fill-color: natural#002f00;
+    fill-color: scree#c3c3c3;
+}
+area[natural=shingle] {
+    fill-color: shingle#c3c3c3;
 }
 area[natural=scrub] {
@@ -4142 +4145 @@
 node[natural=glacier],
 node[natural=scree],
+node[natural=shingle],
 node[natural=scrub],
 node[natural=fell],