Index: trunk/resources/data/defaultpresets.xml
===================================================================
--- trunk/resources/data/defaultpresets.xml	(revision 19017)
+++ trunk/resources/data/defaultpresets.xml	(revision 19025)
@@ -9980,5 +9980,5 @@
                 <text key="ref:fgkz" text="Reference FGKZ (DE)" regions="DE" />
                 <text key="ref:regine" text="Reference REGINE (NO)" regions="NO" />
-                <text key="ref:gnis" text="Reference GNIS (USA)" regions="US" />
+                <text key="gnis:feature_id" text="Reference GNIS (USA)" regions="US" />
                 <text key="ref:gnbc" text="Reference GNBC (CA)" regions="CA" />
                 <reference ref="wikipedia_wikidata" />
Index: trunk/resources/data/validator/deprecated.mapcss
===================================================================
--- trunk/resources/data/validator/deprecated.mapcss	(revision 19017)
+++ trunk/resources/data/validator/deprecated.mapcss	(revision 19025)
@@ -2510,3 +2510,24 @@
 }
 
+/* Tags were consolidated, see #23177 */
+*[gnis:id][!gnis:feature_id],
+*[tiger:PLACENS][!gnis:feature_id],
+*[NHD:GNIS_ID][!gnis:feature_id],
+*[nhd:gnis_id][!gnis:feature_id],
+*[ref:gnis][!gnis:feature_id] {
+  throwWarning: tr("{0} is deprecated", "{0.key}");
+  group: tr("deprecated tagging");
+  suggestAlternative: "{1.key}={0.value}";
+  fixChangeKey: "{0.key} => {1.key}";
+}
+*[gnis:id][gnis:feature_id],
+*[tiger:PLACENS][gnis:feature_id],
+*[NHD:GNIS_ID][gnis:feature_id],
+*[nhd:gnis_id][gnis:feature_id],
+*[ref:gnis][gnis:feature_id] {
+  throwWarning: tr("{0} is deprecated", "{0.key}");
+  group: tr("deprecated tagging");
+  suggestAlternative: "{1.key}";
+}
+
 /* When tags are deprecated they should be added to ignoretags.cfg too. */
Index: trunk/resources/data/validator/ignoretags.cfg
===================================================================
--- trunk/resources/data/validator/ignoretags.cfg	(revision 19017)
+++ trunk/resources/data/validator/ignoretags.cfg	(revision 19025)
@@ -747,4 +747,9 @@
 E:site_type
 E:parking:orientation
+K:NHD:GNIS_ID
+K:gnis:id
+K:nhd:gnis_id
+K:ref:gnis
+K:tiger:PLACENS
 ;
 ; Tags not yet decided (to remove from this section when added or moved up when deprecated)