Index: trunk/data/validator/territories.mapcss
===================================================================
--- trunk/data/validator/territories.mapcss	(revision 14998)
+++ trunk/data/validator/territories.mapcss	(revision 15325)
@@ -30,2 +30,16 @@
   group: tr("deprecated tagging");
 }
+
+/* #15107 */
+*[aeroway=helipad  ][!faa][inside("US")],
+*[aeroway=aerodrome][!faa][inside("US")] {
+  throwOther: tr("{0} without {1}", "{0.tag}", "{1.key}");
+  group: tr("Airport tagging");
+}
+*[aeroway=aerodrome][!icao][faa!~/\d/][inside("US")],
+*[aeroway=aerodrome][!iata][faa!~/\d/][inside("US")] {
+  throwOther: tr("{0} without {1}", "{0.tag}", "{1.key}");
+  group: tr("Airport tagging");
+  /* assertNoMatch: "way aeroway=aerodrome faa=OK12"; not properly working due to inside() */
+  /* assertMatch: "way aeroway=aerodrome faa=ORD"; */
+}