Changeset 18633 in josm for trunk

Timestamp:

2023-01-11T20:06:22+01:00 (23 months ago)

Author:

taylor.smock

Message:

Fix #22561: change site_type to archaeological_site

See ​osmwiki:Proposed_features/Key:archaeological_site for the proposal
documentation. Of note, the proposal was approved on 2022-12-04, and
there have been no changes to ​osmwiki:Key:archaeological_site where
the definition of archaeological_site has changed.

Location:

trunk/resources/data

Files:

• defaultpresets.xml (modified) (1 diff)
• validator/combinations.mapcss (modified) (1 diff)
• validator/deprecated.mapcss (modified) (2 diffs)
• validator/ignoretags.cfg (modified) (1 diff)

trunk/resources/data/defaultpresets.xml

@@ -7030 +7030 @@
             <space />
             <key key="historic" value="archaeological_site" />
-            <combo key="site_type" text="Type" values="tumulus,megalith,fortification,settlement,necropolis,city" />
+            <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" />
         </item> <!-- Archaeological Site -->

trunk/resources/data/validator/combinations.mapcss

@@ -107 +107 @@
 node[lamp_type                 ][highway!=street_lamp],
 node[map_type                  ][information!=map],
-*[site_type                    ][historic!=archaeological_site],
+*[archaeological_site          ][historic!=archaeological_site],
 *[artwork_type                 ][tourism!=artwork][exhibit!=artwork],
 *[castle_type                  ][historic!=castle],

trunk/resources/data/validator/deprecated.mapcss

@@ -2402 +2402 @@
 }
 
-/* temporary URLs, can be exteded to other websites and other keys e.g. "url" or "website", #22397 */
+/* temporary URLs, can be extended to other websites and other keys e.g. "url" or "website", #22397 */
 *[image][image=~/^https:\/\/westnordost.de\/p\//] {
   throwWarning: tr("{0} with a temporary URL which may be outdated very soon", "{0.key}");
@@ -2411 +2411 @@
 }
 
+/* Replaced by archaeological_site, see #22561 */
+*[historic=archaeological_site][site_type] {
+  throwWarning: tr("{0} should be replaced with {1}", "{1.key}", "archaeological_site");
+  fixChangeKey: "site_type => archaeological_site";
+  assertMatch: "node historic=archaeological_site site_type=fortification";
+  assertNoMatch: "node historic=archaeological_site site_type2=fortification";
+}
+
 /* When tags are deprecated they should be added to ignoretags.cfg too. */

trunk/resources/data/validator/ignoretags.cfg

@@ -732 +732 @@
 K:type=turnlanes:turns
 K:surface=paving_stones:30
+E:site_type
 ;
 ; Tags not yet decided (to remove from this section when added or moved up when deprecated)