[osm/formatting] Adding is_in tags to the address formatter as they're common in OSM, aliasing addr:district to state_district instead of suburb

scripts/geodata/address_formatting/formatter.py

@@ -52,19 +52,34 @@ class AddressFormatter(object):
         ('addr:house_number', HOUSE_NUMBER),
         ('addr:street', ROAD),
         ('addr:city', CITY),
+        ('is_in:city', CITY),
         ('addr:locality', CITY),
+        ('is_in:locality', CITY),
         ('addr:municipality', CITY),
+        ('is_in:municipality', CITY),
         ('addr:hamlet', CITY),
+        ('is_in:hamlet', CITY),
         ('addr:suburb', SUBURB),
+        ('is_in:suburb', SUBURB),
         ('addr:neighbourhood', SUBURB),
+        ('is_in:neighbourhood', SUBURB),
         ('addr:neighborhood', SUBURB),
-        ('addr:district', SUBURB),
+        ('is_in:neighborhood', SUBURB),
+        ('addr:district', STATE_DISTRICT),
+        ('is_in:district', STATE_DISTRICT),
         ('addr:state', STATE),
+        ('is_in:state', STATE),
         ('addr:province', STATE),
+        ('is_in:province', STATE),
         ('addr:region', STATE),
+        ('is_in:region', STATE),
         ('addr:postal_code', POSTCODE),
         ('addr:postcode', POSTCODE),
         ('addr:country', COUNTRY),
+        ('is_in:country', COUNTRY),
+        ('addr:country_code', COUNTRY),
+        ('country_code', COUNTRY),
+        ('is_in:country_code', COUNTRY),
         ('street', ROAD),
         ('street_name', ROAD),
         ('residential', ROAD),