Skip to content

Commit

Permalink
Add/ignore popular tags
Browse files Browse the repository at this point in the history
Ignore:
* `admin_type:PH`: Highly localized to the Philippines
* `residential:condominium`: Deprecated -- wiki suggests `residential=apartments`
  + `condo=*`
* `sidewalk`: This is replaced by `sidewalk:both`, but is still valid tagging.

Add:
* `managed` (to wetland, wood, fell, and heath)
* `sidewalk:{both|left|right}`: We already had validator rules for these, this
  just adds them to presets. Note that `sidewalk` and `sidewalk:both` are similar,
  but `sidewalk=separate` is unspecific as to the side of the sidewalk.

git-svn-id: https://josm.openstreetmap.de/svn/trunk@19222 0c6e7542-c601-0410-84e7-c038aed88b3b
  • Loading branch information
taylor.smock committed Sep 13, 2024
1 parent 0826abb commit 8896d5c
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 1 deletion.
13 changes: 12 additions & 1 deletion resources/data/defaultpresets.xml
Original file line number Diff line number Diff line change
Expand Up @@ -532,6 +532,11 @@
<combo key="canoe" text="Canoe" values="yes,designated,destination,delivery,permissive,permit,private,no" values_sort="false" />
</optional>
</chunk>
<chunk id="managed">
<optional>
<combo key="managed" text="Managed" values="no,yes,grazing,undergrowth,mowing,scientific" values_context="Key:managed" />
</optional>
</chunk>
<chunk id="substance">
<combo key="substance" text="Substance" values="water,hot_water,steam,sewage,gas,oil" values_sort="false" values_searchable="true" />
</chunk>
Expand Down Expand Up @@ -935,7 +940,9 @@
<reference ref="lit_common_no_times"/>
<text key="width" text="Width (meters)" />
<combo key="bus_bay" text="Bus bay" values="both,left,right" />
<combo key="sidewalk" text="Sidewalk" values="both,left,right,no,separate" values_context="sidewalk" />
<combo key="sidewalk:both" text="Sidewalk (both)" values="yes,no,separate" values_context="sidewalk" />
<combo key="sidewalk:left" text="Sidewalk (left)" values="yes,no,separate" values_context="sidewalk" />
<combo key="sidewalk:right" text="Sidewalk (right)" values="yes,no,separate" values_context="sidewalk" />
<checkgroup columns="3">
<check key="dual_carriageway" text="Divided highway" disable_off="true" />
<check key="narrow" text="Narrow" disable_off="true" />
Expand Down Expand Up @@ -2404,6 +2411,7 @@
<text key="name" text="Name" />
<combo key="wetland" text="Type" values="bog,fen,mangrove,marsh,reedbed,saltern,saltmarsh,string_bog,swamp,tidalflat,wet_meadow" values_searchable="true" />
<check key="seasonal" text="Seasonal" disable_off="true" />
<reference ref="managed" />
</item> <!-- Wetland -->
<item name="Mud" icon="presets/landuse/mud.svg" type="closedway,multipolygon" preset_name_label="true">
<link wiki="Tag:natural=mud" />
Expand Down Expand Up @@ -9286,6 +9294,7 @@
<key key="natural" value="wood" />
<text key="name" text="Name" />
<reference ref="leaf" />
<reference ref="managed" />
</item> <!-- Wood -->
<item name="Forest" icon="presets/landmark/forest.svg" type="closedway,multipolygon" preset_name_label="true">
<link wiki="Tag:landuse=forest" />
Expand Down Expand Up @@ -9339,6 +9348,7 @@
<space />
<key key="natural" value="fell" />
<text key="name" text="Name" />
<reference ref="managed" />
</item> <!-- Fell -->
<item name="Scrub" icon="presets/landuse/scrub.svg" type="closedway,multipolygon" preset_name_label="true">
<link wiki="Tag:natural=scrub" />
Expand All @@ -9358,6 +9368,7 @@
<space />
<key key="natural" value="heath" />
<text key="name" text="Name" />
<reference ref="managed" />
</item> <!-- Heath -->
<item name="Sand" icon="presets/landuse/sand.svg" type="closedway,multipolygon" preset_name_label="true">
<link wiki="Tag:natural=sand" />
Expand Down
5 changes: 5 additions & 0 deletions resources/data/validator/deprecated.mapcss
Original file line number Diff line number Diff line change
Expand Up @@ -2577,5 +2577,10 @@ way[cycleway][cycleway^=opposite_]!:righthandtraffic {
group: tr("deprecated tagging");
suggestAlternative: "oneway:bicycle=no + cycleway:right=* + cycleway:left=* + cycleway:right:oneway=-1";
}
*[residential=condominium] {
throwWarning: tr("{0} is deprecated", "{0.tag}");
group: tr("deprecated tagging");
suggestAlternative: "residential=apartments + condo=*"
}

/* When tags are deprecated they should be added to ignoretags.cfg too. */
3 changes: 3 additions & 0 deletions resources/data/validator/ignoretags.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,8 @@ E:cai_scale
E:railway:radio
E:genus:de
E:heritage:operator
E:admin_type:PH
E:sidewalk
;
; Ignore valid and semi-valid keys that end with...
;
Expand Down Expand Up @@ -752,6 +754,7 @@ E:gnis:id
E:nhd:gnis_id
E:ref:gnis
E:tiger:PLACENS
K:residential=condominium
;
; Tags not yet decided (to remove from this section when added or moved up when deprecated)
; see josm tickets: 17770 15309 15774 16315 16658 16793 19982 21396
Expand Down

0 comments on commit 8896d5c

Please sign in to comment.