Subject: [PATCH] Fix #22561: change site_type to archaeological_site
---
Index: resources/data/validator/combinations.mapcss
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/resources/data/validator/combinations.mapcss b/resources/data/validator/combinations.mapcss
--- a/resources/data/validator/combinations.mapcss	(revision 18612)
+++ b/resources/data/validator/combinations.mapcss	(date 1670516389011)
@@ -106,7 +106,7 @@
 *[shelter_type                 ][amenity!=shelter],
 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],
 *[parking                      ][amenity!~/^(parking|parking_space|parking_entrance|motorcycle_parking)$/][parking!=yes][parking!=no],
Index: resources/data/validator/deprecated.mapcss
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/resources/data/validator/deprecated.mapcss b/resources/data/validator/deprecated.mapcss
--- a/resources/data/validator/deprecated.mapcss	(revision 18612)
+++ b/resources/data/validator/deprecated.mapcss	(date 1670516966154)
@@ -2401,7 +2401,7 @@
   group: tr("deprecated tagging");
 }
 
-/* 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}");
   fixRemove: "{0.key}";
@@ -2410,4 +2410,12 @@
   assertNoMatch: "node image=https://commons.wikimedia.org/wiki/File:2015-05-13_Basteibr%C3%BCcke-.jpg";
 }
 
+/* Replaced by archaeological_site */
+*[historic=archaeological_site][site_type] {
+  throwWarning: tr("{0} should be replaced with {1}", "{0.key}", "{1.key}");
+  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. */
Index: resources/data/defaultpresets.xml
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/resources/data/defaultpresets.xml b/resources/data/defaultpresets.xml
--- a/resources/data/defaultpresets.xml	(revision 18612)
+++ b/resources/data/defaultpresets.xml	(date 1670517118644)
@@ -6981,7 +6981,7 @@
             <link wiki="Tag:historic=archaeological_site" />
             <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="catacombs,city,fortification,geoglyph,petroglyph,hut_circle,megalith,necropolis,roman_circus,roman_theater,roman_villa,settlement,tumulus" />
             <reference ref="name_oh_wheelchair" />
         </item> <!-- Archaeological Site -->
         <item name="Battlefield" icon="presets/sightseeing/battlefield.svg" type="node,closedway,multipolygon" preset_name_label="true">