Changeset 15648 in josm for trunk/data/defaultpresets.xml

Timestamp:

2020-01-06T22:13:13+01:00 (6 years ago)

Author:

Klumbumbus

Message:

• fix #18374 - warn if collection_times is used instead of opening_hours on amenity=recycling, rewording in preset
• see #18411, see #10576 - add railway=construction preset, icon derived from internal rail and way_construction icons, PD and CC0 licensed
• see #18411 - warn about railway=construction or highway=construction together with construction=yes
• see #18517 - restore office=administrative icon in nodist folder, add autofix for office=administrative -> government
• move building=ger to residential building preset
• remove TLD from IANA
• see #18507
  • add kerb=* to crossing and traffic signals preset
  • warn about barrier=kerb together with kerb=no
  • warn about kerb=unknown
  • warn if barrier=kerb and kerb=* are used on isolated nodes
  • warn if barrier=kerb is used on highway=crossing as part of a major road and suggest kerb=* instead
  • deprecate sloped_curb=* in favor of kerb=*
• see #12575 - new craft icons, all PD and CC0 licensed:
  • gardener: derived from internal florist icon and ​https://publicdomainvectors.org/en/free-clipart/Planting-a-new-tree/83454.html
  • shoemaker: resized from ​https://publicdomainvectors.org/en/free-clipart/Brown-shoe/43147.html
  • upholsterer: resized from ​https://publicdomainvectors.org/en/free-clipart/Old-chair-vector-image/71929.html

File:

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

trunk/data/defaultpresets.xml

@@ -1115 +1115 @@
                 <combo key="crossing" text="Pedestrian crossing type" values="uncontrolled,traffic_signals,unmarked,no" />
                 <combo key="crossing_ref" text="Crossing type name (UK)" values="zebra,pelican,toucan,puffin,pegasus,tiger" />
+                <combo key="kerb" text="Kerb" values="flush,lowered,no,raised,rolled,yes" values_context="kerb" />
                 <check key="crossing:island" text="With island" />
                 <check key="button_operated" text="Button operated" />
@@ -1160 +1161 @@
             </combo>
             <combo key="crossing_ref" text="Crossing type name (UK)" values="zebra,pelican,toucan,puffin,pegasus,tiger" values_searchable="true" />
+            <combo key="kerb" text="Kerb" values="flush,lowered,no,raised,rolled,yes" values_context="kerb" />
             <combo key="supervised" text="Crossing attendant" delimiter="|" values="yes|no|06:00-20:00|Mo-Fr 09:00-18:00,Sa 08:00-14:00|May-Sep 09:30-12:30,14:15-19:30" />
             <combo key="tactile_paving" text="Tactile Paving" values="yes,no,incorrect" />
@@ -1993 +1995 @@
         </item> <!-- Bus Guideway -->
         <separator/>
+        <item name="Railway construction" icon="presets/transport/railway/railway_construction.svg" type="way" preset_name_label="true">
+            <link wiki="Key:construction" />
+            <key key="railway" value="construction" />
+            <combo key="construction" text="Railway type" values="rail,narrow_gauge,monorail,preserved,light_rail,subway,tram,funicular" />
+            <optional>
+                <combo key="usage" text="Usage" values="main,branch,industrial,military,tourism,freight" />
+                <reference ref="railway_service_gauge_electrified_yesno" />
+            </optional>
+        </item> <!-- Railway construction -->
         <item name="Disused Rail" icon="presets/transport/railway/disused_rail.svg" type="way" preset_name_label="true">
             <link wiki="Tag:railway=disused" />
@@ -4073 +4084 @@
             <key key="recycling_type" value="container" />
             <text key="operator" text="Operator" />
-            <reference ref="oh_wheelchair" />
+            <combo key="opening_hours" text="Throw in times" delimiter="|" values="24/7|Mo-Fr 06:30-12:30,15:30-20:00; Sa 08:00-12:00; PH off" values_no_i18n="true" />
+            <combo key="wheelchair" text="Wheelchairs" values="yes,limited,no" />
             <space />
             <checkgroup columns="4">
@@ -4751 +4763 @@
             <link wiki="Key:building" />
             <space />
-            <combo key="building" text="Building" values="allotment_house,bakehouse,barn,basilica,cabin,carport,cathedral,chapel,church,college,commercial,construction,cowshed,farm_auxiliary,garage,garages,gasometer,ger,greenhouse,hangar,hospital,industrial,kindergarten,manufacture,mosque,office,public,retail,roof,ruins,school,service,shed,silo,stable,storage_tank,supermarket,synagogue,temple,toilets,train_station,transformer_tower,transportation,university,warehouse,yes" values_context="building" default="yes" match="keyvalue!" values_searchable="true" />
+            <combo key="building" text="Building" values="allotment_house,bakehouse,barn,basilica,cabin,carport,cathedral,chapel,church,college,commercial,construction,cowshed,farm_auxiliary,garage,garages,gasometer,greenhouse,hangar,hospital,industrial,kindergarten,manufacture,mosque,office,public,retail,roof,ruins,school,service,shed,silo,stable,storage_tank,supermarket,synagogue,temple,toilets,train_station,transformer_tower,transportation,university,warehouse,yes" values_context="building" default="yes" match="keyvalue!" values_searchable="true" />
             <optional>
                 <text key="name" text="Name" />
@@ -4762 +4774 @@
             <link wiki="Key:building" />
             <space />
-            <combo key="building" text="Building" values="yes,residential,apartments,house,hotel,hut,bungalow,dormitory,terrace,detached,farm" default="residential" match="keyvalue!" values_context="building" values_searchable="true" />
+            <combo key="building" text="Building" values="yes,residential,apartments,ger,house,hotel,hut,bungalow,dormitory,terrace,detached,farm" default="residential" match="keyvalue!" values_context="building" values_searchable="true" />
             <optional>
                 <text key="name" text="Name" />
@@ -6677 +6689 @@
     </item> <!-- Caterer -->
     <separator/> <!-- food group -->
-    <item name="Upholsterer" type="node,closedway,multipolygon" preset_name_label="true">
+    <item name="Upholsterer" icon="presets/craft/upholsterer.svg" type="node,closedway,multipolygon" preset_name_label="true">
         <link wiki="Tag:craft=upholsterer" />
         <space />
@@ -6776 +6788 @@
         <reference ref="link_contact_address" />
     </item> <!-- Pottery -->
-    <item name="Gardener" type="node,closedway,multipolygon" preset_name_label="true">
+    <item name="Gardener" icon="presets/craft/gardener.svg" type="node,closedway,multipolygon" preset_name_label="true">
         <link wiki="Tag:craft=gardener" />
         <space />
@@ -6783 +6795 @@
         <reference ref="link_contact_address" />
     </item> <!-- Gardener -->
-    <item name="Shoemaker" type="node,closedway,multipolygon" preset_name_label="true">
+    <item name="Shoemaker" icon="presets/craft/shoemaker.svg" type="node,closedway,multipolygon" preset_name_label="true">
         <link wiki="Tag:craft=shoemaker" />
         <space />