Changeset 18730 in josm for trunk/resources

Timestamp:

2023-05-16T18:56:55+02:00 (19 months ago)

Author:

taylor.smock

Message:

Fix #22901: Add/ignore popular tags

Ignore:

• landuse=static_caravan (mostly from an import)
• service=driveway2 (largely driven by a single user, for everyone else it is a misspelling of driveway)
• guidepost (maybe a duplicate with hiking=yes/bicycle=yes since it is a list, e.g. guidepost=hiking;bicycle
• Street side parking tags (parking:<side>:*; there is an external preset for these)

Add:

• lane_markings
• footway=link|traffic_island|alley
• railway=miniature
• man_made=avalanche_protection
• fortification_type (for historic=archaeological_site)
• man_made=planter
• industrial=wellsite

Location:

trunk/resources

Files:

• data/defaultpresets.xml (modified) (7 diffs)
• data/validator/ignoretags.cfg (modified) (4 diffs)
• data/validator/words.cfg (modified) (1 diff)
• images/presets/misc/avalanche_protection.svg (added)
• images/presets/misc/planter.svg (added)
• images/presets/transport/railway/miniature_rail.svg (added)

trunk/resources/data/defaultpresets.xml

@@ -41 +41 @@
     </chunk>
     <chunk id="highway_yesno">
-        <checkgroup columns="4">
+        <checkgroup columns="5">
             <check key="bridge" text="Bridge" disable_off="true" />
             <check key="tunnel" text="Tunnel" disable_off="true" />
             <check key="embankment" text="Embankment" disable_off="true" />
             <check key="cutting" text="Cutting" disable_off="true" />
+            <check key="lane_markings" text="Lane Markings" />
         </checkgroup>
     </chunk>
@@ -1339 +1340 @@
             <key key="highway" value="footway" />
             <optional>
-                <combo key="footway" text="Type" values="access_aisle,crossing,sidewalk" values_context="footway" />
+                <combo key="footway" text="Type" values_context="footway" >
+                    <list_entry value="access_aisle" short_description="Marked footpath in a parking lot" />
+                    <list_entry value="crossing" short_description="A pedestrian crossing"/>
+                    <list_entry value="sidewalk" short_description="A footway alongside a street"/>
+                    <list_entry value="link" short_description="Footway sections that do not exist but are necessary for routing"/>
+                    <list_entry value="traffic_island" short_description="Footway sections inside a crossing island"/>
+                    <list_entry value="alley" short_description="Access for back entrances and/or emergency access"/>
+                </combo>
                 <reference ref="name_layer" />
                 <reference ref="surface_smoothness" />
@@ -2516 +2524 @@
             </optional>
         </item> <!-- Bus Guideway -->
+        <item name="Miniature Rail" icon="presets/transport/railway/miniature_rail.svg" type="way" preset_name_label="true">
+            <link wiki="Tag:railway=miniature" />
+            <key key="railway" value="miniature" />
+            <optional>
+                <reference ref="railway_service_gauge_electrified_yesno" />
+            </optional>
+        </item>
         <separator/>
         <item name="Railway construction" icon="presets/transport/railway/railway_construction.svg" type="way" preset_name_label="true">
@@ -5990 +6005 @@
             <key key="man_made" value="embankment" />
         </item> <!-- Embankment -->
+        <item name="Avalanche Protection" icon="presets/misc/avalanche_protection.svg" type="node,way,closed_way" preset_name_label="true">
+            <link wiki="Tag:man_made=avalanche_protection" />
+            <space />
+            <key key="man_made" value="avalanche_protection" />
+            <optional>
+                <combo key="avalanche_protection" values="snow_bridge,dam,berm,mound,shed,gas_ignition" />
+                <check key="barrier" value="fence" />
+            </optional>
+        </item> <!-- Avalanche Protection -->
         <separator/>
         <item name="Utility Pole" icon="presets/tower/pole.svg" type="node" preset_name_label="true">
@@ -7032 +7056 @@
             <combo key="archaeological_site" text="Type" values="baths,catacombs,city,crannog,enclosure,fortification,geoglyph,grave_field,petroglyph,hut_circle,megalith,necropolis,roman_circus,roman_theater,roman_villa,settlement,tumulus" />
             <reference ref="name_oh_wheelchair" />
+            <optional>
+                <combo key="fortification_type">
+                    <list_entry value="hill_fort" short_description="Forts using a rise of elevation"/>
+                    <list_entry value="limes" short_description="Fortifications for border defense"/>
+                    <list_entry value="sconce" short_description="A small protective fortification"/>
+                    <list_entry value="ring_ditch" short_description="Circular ditched enclosures"/>
+                    <list_entry value="ringfort" short_description="Circular fortified settlement"/>
+                    <list_entry value="motte" short_description="Raised area of ground for a castle"/>
+                    <list_entry value="watchtower" short_description="Military observation"/>
+                    <list_entry value="battery" short_description="A group of artillary (cannon) in a fixed fortification"/>
+                </combo>
+            </optional>
         </item> <!-- Archaeological Site -->
         <item name="Battlefield" icon="presets/sightseeing/battlefield.svg" type="node,closedway,multipolygon" preset_name_label="true">
@@ -9068 +9104 @@
             <preset_link preset_name="Garden" text="Similar but different tags:" />
         </item> <!-- Flowerbed -->
+        <item name="Planter" icon="presets/misc/planter.svg" type="closedway,multipolygon" preset_name_label="true">
+            <link wiki="Tag:man_made=planter"/>
+            <space />
+            <key key="man_made" value="planter"/>
+            <optional>
+                <text key="material" text="The material the planter is made out of"/>
+                <text key="surface" text="The material inside the planter"/>
+                <check key="barrier" value_on="planter" disable_off="true"/>
+            </optional>
+        </item>
         <item name="Garden" icon="presets/leisure/garden.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:leisure=garden" />
@@ -9165 +9211 @@
             <space />
             <key key="landuse" value="industrial" />
-            <combo key="industrial" text="Type" values="bakery,brewery,brickyard,depot,distributor,factory,grinding_mill,heating_station,machine_shop,mine,oil,port,salt_pond,sawmill,scrap_yard,shipyard,slaughterhouse,warehouse" values_context="industrial" />
+            <combo key="industrial" text="Type" values="bakery,brewery,brickyard,depot,distributor,factory,grinding_mill,heating_station,machine_shop,mine,oil,port,salt_pond,sawmill,scrap_yard,shipyard,slaughterhouse,warehouse,wellsite" values_context="industrial" />
             <reference ref="optional_name" />
         </item> <!-- Industrial -->

trunk/resources/data/validator/ignoretags.cfg

@@ -230 +230 @@
 K:building=tank
 K:building=trullo
+K:landuse=static_caravan
 K:leisure=recreation_ground
 E:old_railway_operator
@@ -485 +486 @@
 K:craft=yes
 K:service=yes
+K:service=driveway2
 K:place=yes
 E:place_name
@@ -766 +768 @@
 K:highway=corridor
 K:historic=bomb_crater
+; May be duplicate of older tagging, `hiking=yes` + `bicycle=yes` versus `guidepost=hiking;bicycle`
+K:guidepost
 K:indoor=area
 K:indoor=corridor
@@ -783 +787 @@
 K:military=trench
 K:natural=crevasse
+; Streetside parking tags (see #22901 22901.patch for starting icons)
+; There is an external preset for these tags
+S:parking:both
+S:parking:right
+S:parking:left
 K:path=crossing
 K:railway=proposed

trunk/resources/data/validator/words.cfg

@@ -63 +63 @@
 -denominatation
 -denoination
++driveway
+-driveway2
 +foot
 -foor