add suffixes to all regional fields

2026-02-12 16:52:45 +00:00 · 2022-01-04 11:26:09 +01:00
parent f0a63f1026
commit 038158669f
182 changed files with 423 additions and 376 deletions
--- a/data/fields/cai_scale-IT.json
+++ b/data/fields/cai_scale-IT.json
--- a/data/fields/expressway-US.json
+++ b/data/fields/expressway-US.json
--- a/data/fields/gnis/feature_id-US.json
+++ b/data/fields/gnis/feature_id-US.json
--- a/data/fields/real_fire-GB-IE.json
+++ b/data/fields/real_fire-GB-IE.json
--- a/data/presets/_natural.json
+++ b/data/presets/_natural.json
@@ -5,7 +5,7 @@
        "natural"
    ],
    "moreFields": [
-        "gnis/feature_id"
+        "gnis/feature_id-US"
    ],
    "geometry": [
        "point",
--- a/data/presets/_place.json
+++ b/data/presets/_place.json
@@ -4,7 +4,7 @@
        "place"
    ],
    "moreFields": [
-        "gnis/feature_id"
+        "gnis/feature_id-US"
    ],
    "geometry": [
        "point",
--- a/data/presets/aeroway/aerodrome.json
+++ b/data/presets/aeroway/aerodrome.json
@@ -14,7 +14,7 @@
    "moreFields": [
        "email",
        "fax",
-        "gnis/feature_id",
+        "gnis/feature_id-US",
        "phone",
        "website"
    ],
--- a/data/presets/amenity/animal_boarding.json
+++ b/data/presets/amenity/animal_boarding.json
@@ -12,7 +12,7 @@
    "moreFields": [
        "email",
        "fax",
-        "gnis/feature_id",
+        "gnis/feature_id-US",
        "level",
        "payment_multi",
        "phone",
--- a/data/presets/amenity/animal_breeding.json
+++ b/data/presets/amenity/animal_breeding.json
@@ -12,7 +12,7 @@
    "moreFields": [
        "email",
        "fax",
-        "gnis/feature_id",
+        "gnis/feature_id-US",
        "level",
        "phone",
        "website",
--- a/data/presets/amenity/animal_shelter.json
+++ b/data/presets/amenity/animal_shelter.json
@@ -12,7 +12,7 @@
    "moreFields": [
        "email",
        "fax",
-        "gnis/feature_id",
+        "gnis/feature_id-US",
        "level",
        "phone",
        "website",
--- a/data/presets/amenity/arts_centre.json
+++ b/data/presets/amenity/arts_centre.json
@@ -13,7 +13,7 @@
        "email",
        "fax",
        "fee",
-        "gnis/feature_id",
+        "gnis/feature_id-US",
        "internet_access",
        "internet_access/fee",
        "internet_access/ssid",
--- a/data/presets/amenity/bank.json
+++ b/data/presets/amenity/bank.json
@@ -17,7 +17,7 @@
        "currency_multi",
        "email",
        "fax",
-        "gnis/feature_id",
+        "gnis/feature_id-US",
        "internet_access",
        "internet_access/fee",
        "internet_access/ssid",
--- a/data/presets/amenity/bar.json
+++ b/data/presets/amenity/bar.json
@@ -13,7 +13,7 @@
        "air_conditioning",
        "email",
        "fax",
-        "gnis/feature_id",
+        "gnis/feature_id-US",
        "internet_access",
        "internet_access/fee",
        "internet_access/ssid",
--- a/data/presets/amenity/cafe.json
+++ b/data/presets/amenity/cafe.json
@@ -24,7 +24,7 @@
        "diet_multi",
        "email",
        "fax",
-        "gnis/feature_id",
+        "gnis/feature_id-US",
        "level",
        "min_age",
        "not/name",
--- a/data/presets/amenity/car_wash.json
+++ b/data/presets/amenity/car_wash.json
@@ -10,12 +10,12 @@
        "payment_multi",
        "self_service",
        "automated"
-        
+
    ],
    "moreFields": [
        "email",
        "fax",
-        "gnis/feature_id",
+        "gnis/feature_id-US",
        "phone",
        "website",
        "wheelchair"
--- a/data/presets/amenity/casino.json
+++ b/data/presets/amenity/casino.json
@@ -14,7 +14,7 @@
        "air_conditioning",
        "email",
        "fax",
-        "gnis/feature_id",
+        "gnis/feature_id-US",
        "internet_access",
        "internet_access/fee",
        "internet_access/ssid",
--- a/data/presets/amenity/childcare.json
+++ b/data/presets/amenity/childcare.json
@@ -14,7 +14,7 @@
        "baby_feeding",
        "email",
        "fax",
-        "gnis/feature_id",
+        "gnis/feature_id-US",
        "internet_access",
        "internet_access/fee",
        "internet_access/ssid",
--- a/data/presets/amenity/cinema.json
+++ b/data/presets/amenity/cinema.json
@@ -15,7 +15,7 @@
        "brand",
        "email",
        "fax",
-        "gnis/feature_id",
+        "gnis/feature_id-US",
        "level",
        "min_age",
        "phone",
--- a/data/presets/amenity/clinic.json
+++ b/data/presets/amenity/clinic.json
@@ -16,7 +16,7 @@
        "brand",
        "email",
        "fax",
-        "gnis/feature_id",
+        "gnis/feature_id-US",
        "level",
        "payment_multi",
        "phone",
--- a/data/presets/amenity/college.json
+++ b/data/presets/amenity/college.json
@@ -14,7 +14,7 @@
        "denomination",
        "email",
        "fax",
-        "gnis/feature_id",
+        "gnis/feature_id-US",
        "not/name",
        "phone",
        "religion",
--- a/data/presets/amenity/community_centre.json
+++ b/data/presets/amenity/community_centre.json
@@ -15,7 +15,7 @@
        "baby_feeding",
        "email",
        "fax",
-        "gnis/feature_id",
+        "gnis/feature_id-US",
        "phone",
        "polling_station",
        "wheelchair"
--- a/data/presets/amenity/conference_centre.json
+++ b/data/presets/amenity/conference_centre.json
@@ -15,7 +15,7 @@
        "air_conditioning",
        "email",
        "fax",
-        "gnis/feature_id",
+        "gnis/feature_id-US",
        "not/name",
        "phone",
        "smoking",
--- a/data/presets/amenity/courthouse.json
+++ b/data/presets/amenity/courthouse.json
@@ -9,7 +9,7 @@
    "moreFields": [
        "email",
        "fax",
-        "gnis/feature_id",
+        "gnis/feature_id-US",
        "level",
        "phone",
        "polling_station",
--- a/data/presets/amenity/crematorium.json
+++ b/data/presets/amenity/crematorium.json
@@ -12,7 +12,7 @@
        "address",
        "email",
        "fax",
-        "gnis/feature_id",
+        "gnis/feature_id-US",
        "level",
        "phone",
        "website",
--- a/data/presets/amenity/dentist.json
+++ b/data/presets/amenity/dentist.json
@@ -12,7 +12,7 @@
    "moreFields": [
        "email",
        "fax",
-        "gnis/feature_id",
+        "gnis/feature_id-US",
        "level",
        "payment_multi",
        "phone",
--- a/data/presets/amenity/dive_centre.json
+++ b/data/presets/amenity/dive_centre.json
@@ -12,7 +12,7 @@
    "moreFields": [
        "email",
        "fax",
-        "gnis/feature_id",
+        "gnis/feature_id-US",
        "level",
        "payment_multi",
        "phone",
--- a/data/presets/amenity/doctors.json
+++ b/data/presets/amenity/doctors.json
@@ -12,7 +12,7 @@
    "moreFields": [
        "email",
        "fax",
-        "gnis/feature_id",
+        "gnis/feature_id-US",
        "level",
        "payment_multi",
        "phone",
--- a/data/presets/amenity/dojo.json
+++ b/data/presets/amenity/dojo.json
@@ -11,7 +11,7 @@
    "moreFields": [
        "email",
        "fax",
-        "gnis/feature_id",
+        "gnis/feature_id-US",
        "level",
        "payment_multi",
        "phone",
--- a/data/presets/amenity/driving_school.json
+++ b/data/presets/amenity/driving_school.json
@@ -12,7 +12,7 @@
    "moreFields": [
        "email",
        "fax",
-        "gnis/feature_id",
+        "gnis/feature_id-US",
        "level",
        "payment_multi",
        "phone",
--- a/data/presets/amenity/events_venue.json
+++ b/data/presets/amenity/events_venue.json
@@ -14,7 +14,7 @@
        "air_conditioning",
        "email",
        "fax",
-        "gnis/feature_id",
+        "gnis/feature_id-US",
        "level",
        "min_age",
        "phone",
--- a/data/presets/amenity/exhibition_centre.json
+++ b/data/presets/amenity/exhibition_centre.json
@@ -15,7 +15,7 @@
        "air_conditioning",
        "email",
        "fax",
-        "gnis/feature_id",
+        "gnis/feature_id-US",
        "not/name",
        "phone",
        "smoking",
--- a/data/presets/amenity/fast_food.json
+++ b/data/presets/amenity/fast_food.json
@@ -21,7 +21,7 @@
        "delivery",
        "email",
        "fax",
-        "gnis/feature_id",
+        "gnis/feature_id-US",
        "internet_access",
        "internet_access/fee",
        "internet_access/ssid",
--- a/data/presets/amenity/fire_station.json
+++ b/data/presets/amenity/fire_station.json
@@ -9,7 +9,7 @@
    "moreFields": [
        "email",
        "fax",
-        "gnis/feature_id",
+        "gnis/feature_id-US",
        "phone",
        "polling_station",
        "smoking",
--- a/data/presets/amenity/food_court.json
+++ b/data/presets/amenity/food_court.json
@@ -16,7 +16,7 @@
        "diet_multi",
        "email",
        "fax",
-        "gnis/feature_id",
+        "gnis/feature_id-US",
        "level",
        "not/name",
        "outdoor_seating",
--- a/data/presets/amenity/fuel.json
+++ b/data/presets/amenity/fuel.json
@@ -14,7 +14,7 @@
        "building",
        "email",
        "fax",
-        "gnis/feature_id",
+        "gnis/feature_id-US",
        "opening_hours",
        "opening_hours/covid19",
        "payment_multi",
--- a/data/presets/amenity/grave_yard.json
+++ b/data/presets/amenity/grave_yard.json
@@ -7,7 +7,7 @@
    "moreFields": [
        "email",
        "fax",
-        "gnis/feature_id",
+        "gnis/feature_id-US",
        "phone",
        "website"
    ],
--- a/data/presets/amenity/hospital.json
+++ b/data/presets/amenity/hospital.json
@@ -11,7 +11,7 @@
    "moreFields": [
        "email",
        "fax",
-        "gnis/feature_id",
+        "gnis/feature_id-US",
        "internet_access",
        "internet_access/fee",
        "internet_access/ssid",
--- a/data/presets/amenity/ice_cream.json
+++ b/data/presets/amenity/ice_cream.json
@@ -14,7 +14,7 @@
        "drive_through",
        "email",
        "fax",
-        "gnis/feature_id",
+        "gnis/feature_id-US",
        "internet_access",
        "internet_access/fee",
        "internet_access/ssid",
--- a/data/presets/amenity/internet_cafe.json
+++ b/data/presets/amenity/internet_cafe.json
@@ -16,7 +16,7 @@
        "air_conditioning",
        "email",
        "fax",
-        "gnis/feature_id",
+        "gnis/feature_id-US",
        "level",
        "min_age",
        "opening_hours",
--- a/data/presets/amenity/karaoke_box.json
+++ b/data/presets/amenity/karaoke_box.json
@@ -13,7 +13,7 @@
        "air_conditioning",
        "email",
        "fax",
-        "gnis/feature_id",
+        "gnis/feature_id-US",
        "level",
        "min_age",
        "payment_multi",
--- a/data/presets/amenity/kindergarten.json
+++ b/data/presets/amenity/kindergarten.json
@@ -11,7 +11,7 @@
    "moreFields": [
        "email",
        "fax",
-        "gnis/feature_id",
+        "gnis/feature_id-US",
        "internet_access",
        "internet_access/fee",
        "internet_access/ssid",
--- a/data/presets/amenity/language_school.json
+++ b/data/presets/amenity/language_school.json
@@ -13,7 +13,7 @@
    "moreFields": [
        "email",
        "fax",
-        "gnis/feature_id",
+        "gnis/feature_id-US",
        "internet_access",
        "internet_access/fee",
        "internet_access/ssid",
--- a/data/presets/amenity/lavoir.json
+++ b/data/presets/amenity/lavoir.json
@@ -9,7 +9,7 @@
        "building_area"
    ],
    "moreFields": [
-        "gnis/feature_id",
+        "gnis/feature_id-US",
        "smoking",
        "wheelchair"
    ],
--- a/data/presets/amenity/library.json
+++ b/data/presets/amenity/library.json
@@ -17,7 +17,7 @@
        "baby_feeding",
        "email",
        "fax",
-        "gnis/feature_id",
+        "gnis/feature_id-US",
        "level",
        "not/name",
        "opening_hours",
--- a/data/presets/amenity/love_hotel.json
+++ b/data/presets/amenity/love_hotel.json
@@ -13,7 +13,7 @@
    "moreFields": [
        "email",
        "fax",
-        "gnis/feature_id",
+        "gnis/feature_id-US",
        "min_age",
        "payment_multi",
        "phone",
--- a/data/presets/amenity/marketplace.json
+++ b/data/presets/amenity/marketplace.json
@@ -11,7 +11,7 @@
    "moreFields": [
        "email",
        "fax",
-        "gnis/feature_id",
+        "gnis/feature_id-US",
        "phone",
        "website",
        "wheelchair"
--- a/data/presets/amenity/monastery.json
+++ b/data/presets/amenity/monastery.json
@@ -9,7 +9,7 @@
    "moreFields": [
        "email",
        "fax",
-        "gnis/feature_id",
+        "gnis/feature_id-US",
        "phone",
        "website",
        "wheelchair"
--- a/data/presets/amenity/music_school.json
+++ b/data/presets/amenity/music_school.json
@@ -11,7 +11,7 @@
    "moreFields": [
        "email",
        "fax",
-        "gnis/feature_id",
+        "gnis/feature_id-US",
        "level",
        "payment_multi",
        "phone",
--- a/data/presets/amenity/nightclub.json
+++ b/data/presets/amenity/nightclub.json
@@ -14,7 +14,7 @@
        "air_conditioning",
        "email",
        "fax",
-        "gnis/feature_id",
+        "gnis/feature_id-US",
        "level",
        "payment_multi",
        "phone",
--- a/data/presets/amenity/pharmacy.json
+++ b/data/presets/amenity/pharmacy.json
@@ -15,7 +15,7 @@
        "brand",
        "email",
        "fax",
-        "gnis/feature_id",
+        "gnis/feature_id-US",
        "level",
        "payment_multi",
        "phone",
--- a/data/presets/amenity/place_of_worship.json
+++ b/data/presets/amenity/place_of_worship.json
@@ -13,7 +13,7 @@
        "baby_feeding",
        "email",
        "fax",
-        "gnis/feature_id",
+        "gnis/feature_id-US",
        "internet_access",
        "internet_access/ssid",
        "level",
--- a/data/presets/amenity/planetarium.json
+++ b/data/presets/amenity/planetarium.json
@@ -14,7 +14,7 @@
        "email",
        "fax",
        "fee",
-        "gnis/feature_id",
+        "gnis/feature_id-US",
        "payment_multi_fee",
        "phone",
        "website",
--- a/data/presets/amenity/police.json
+++ b/data/presets/amenity/police.json
@@ -11,7 +11,7 @@
    "moreFields": [
        "email",
        "fax",
-        "gnis/feature_id",
+        "gnis/feature_id-US",
        "level",
        "phone",
        "polling_station",
--- a/data/presets/amenity/polling_station.json
+++ b/data/presets/amenity/polling_station.json
@@ -13,7 +13,7 @@
        "air_conditioning",
        "email",
        "fax",
-        "gnis/feature_id",
+        "gnis/feature_id-US",
        "internet_access",
        "internet_access/fee",
        "internet_access/ssid",
--- a/data/presets/amenity/post_box.json
+++ b/data/presets/amenity/post_box.json
@@ -12,7 +12,7 @@
        "brand",
        "colour",
        "covered",
-        "gnis/feature_id",
+        "gnis/feature_id-US",
        "height",
        "indoor",
        "level",
--- a/data/presets/amenity/post_depot.json
+++ b/data/presets/amenity/post_depot.json
@@ -10,7 +10,7 @@
    "moreFields": [
        "email",
        "fax",
-        "gnis/feature_id",
+        "gnis/feature_id-US",
        "opening_hours",
        "opening_hours/covid19",
        "website",
--- a/data/presets/amenity/post_office.json
+++ b/data/presets/amenity/post_office.json
@@ -13,7 +13,7 @@
        "brand",
        "email",
        "fax",
-        "gnis/feature_id",
+        "gnis/feature_id-US",
        "internet_access",
        "internet_access/fee",
        "internet_access/ssid",
--- a/data/presets/amenity/prep_school.json
+++ b/data/presets/amenity/prep_school.json
@@ -11,7 +11,7 @@
    "moreFields": [
        "email",
        "fax",
-        "gnis/feature_id",
+        "gnis/feature_id-US",
        "level",
        "payment_multi",
        "phone",
--- a/data/presets/amenity/prison.json
+++ b/data/presets/amenity/prison.json
@@ -9,7 +9,7 @@
    "moreFields": [
        "email",
        "fax",
-        "gnis/feature_id",
+        "gnis/feature_id-US",
        "phone",
        "website",
        "wheelchair"
--- a/data/presets/amenity/pub.json
+++ b/data/presets/amenity/pub.json
@@ -15,7 +15,7 @@
        "diet_multi",
        "email",
        "fax",
-        "gnis/feature_id",
+        "gnis/feature_id-US",
        "internet_access",
        "internet_access/fee",
        "internet_access/ssid",
@@ -26,7 +26,7 @@
        "payment_multi",
        "phone",
        "ref/vatin",
-        "real_fire",
+        "real_fire-GB-IE",
        "website",
        "wheelchair"
    ],
--- a/data/presets/amenity/public_bath.json
+++ b/data/presets/amenity/public_bath.json
@@ -13,7 +13,7 @@
    "moreFields": [
        "email",
        "fax",
-        "gnis/feature_id",
+        "gnis/feature_id-US",
        "internet_access",
        "internet_access/fee",
        "internet_access/ssid",
--- a/data/presets/amenity/ranger_station.json
+++ b/data/presets/amenity/ranger_station.json
@@ -11,7 +11,7 @@
    "moreFields": [
        "email",
        "fax",
-        "gnis/feature_id",
+        "gnis/feature_id-US",
        "internet_access",
        "internet_access/fee",
        "internet_access/ssid",
--- a/data/presets/amenity/research_institute.json
+++ b/data/presets/amenity/research_institute.json
@@ -12,7 +12,7 @@
    "moreFields": [
        "email",
        "fax",
-        "gnis/feature_id",
+        "gnis/feature_id-US",
        "internet_access/ssid",
        "phone",
        "wheelchair"
--- a/data/presets/amenity/restaurant.json
+++ b/data/presets/amenity/restaurant.json
@@ -21,7 +21,7 @@
        "delivery",
        "email",
        "fax",
-        "gnis/feature_id",
+        "gnis/feature_id-US",
        "internet_access",
        "internet_access/fee",
        "internet_access/ssid",
--- a/data/presets/amenity/school.json
+++ b/data/presets/amenity/school.json
@@ -15,7 +15,7 @@
        "email",
        "fax",
        "fee",
-        "gnis/feature_id",
+        "gnis/feature_id-US",
        "internet_access",
        "internet_access/ssid",
        "level",
--- a/data/presets/amenity/shelter.json
+++ b/data/presets/amenity/shelter.json
@@ -9,7 +9,7 @@
        "bin"
    ],
    "moreFields": [
-        "gnis/feature_id",
+        "gnis/feature_id-US",
        "lit",
        "lockable",
        "wheelchair"
--- a/data/presets/amenity/social_centre.json
+++ b/data/presets/amenity/social_centre.json
@@ -14,7 +14,7 @@
        "branch_brand",
        "email",
        "fax",
-        "gnis/feature_id",
+        "gnis/feature_id-US",
        "internet_access",
        "internet_access/fee",
        "internet_access/ssid",
--- a/data/presets/amenity/social_facility.json
+++ b/data/presets/amenity/social_facility.json
@@ -13,7 +13,7 @@
        "baby_feeding",
        "email",
        "fax",
-        "gnis/feature_id",
+        "gnis/feature_id-US",
        "internet_access",
        "internet_access/fee",
        "internet_access/ssid",
--- a/data/presets/amenity/studio.json
+++ b/data/presets/amenity/studio.json
@@ -10,7 +10,7 @@
    "moreFields": [
        "email",
        "fax",
-        "gnis/feature_id",
+        "gnis/feature_id-US",
        "internet_access",
        "internet_access/fee",
        "internet_access/ssid",
--- a/data/presets/amenity/theatre.json
+++ b/data/presets/amenity/theatre.json
@@ -11,7 +11,7 @@
        "air_conditioning",
        "email",
        "fax",
-        "gnis/feature_id",
+        "gnis/feature_id-US",
        "internet_access",
        "internet_access/fee",
        "internet_access/ssid",
--- a/data/presets/amenity/townhall.json
+++ b/data/presets/amenity/townhall.json
@@ -11,7 +11,7 @@
        "baby_feeding",
        "email",
        "fax",
-        "gnis/feature_id",
+        "gnis/feature_id-US",
        "phone",
        "polling_station",
        "smoking",
--- a/data/presets/amenity/vehicle_inspection.json
+++ b/data/presets/amenity/vehicle_inspection.json
@@ -11,7 +11,7 @@
    "moreFields": [
        "email",
        "fax",
-        "gnis/feature_id",
+        "gnis/feature_id-US",
        "payment_multi",
        "phone",
        "website",
--- a/data/presets/amenity/veterinary.json
+++ b/data/presets/amenity/veterinary.json
@@ -13,7 +13,7 @@
        "email",
        "fax",
        "fee",
-        "gnis/feature_id",
+        "gnis/feature_id-US",
        "level",
        "payment_multi_fee",
        "phone",
--- a/data/presets/building.json
+++ b/data/presets/building.json
@@ -12,7 +12,7 @@
        "building/levels/underground",
        "building/material",
        "ele",
-        "gnis/feature_id",
+        "gnis/feature_id-US",
        "layer",
        "not/name",
        "operator",
--- a/data/presets/club.json
+++ b/data/presets/club.json
@@ -16,7 +16,7 @@
        "building/levels_building",
        "email",
        "fax",
-        "gnis/feature_id",
+        "gnis/feature_id-US",
        "height_building",
        "internet_access",
        "internet_access/fee",
--- a/data/presets/craft.json
+++ b/data/presets/craft.json
@@ -17,7 +17,7 @@
        "ele",
        "email",
        "fax",
-        "gnis/feature_id",
+        "gnis/feature_id-US",
        "height_building",
        "internet_access",
        "internet_access/fee",
--- a/data/presets/emergency/ambulance_station.json
+++ b/data/presets/emergency/ambulance_station.json
@@ -9,7 +9,7 @@
    "moreFields": [
        "email",
        "fax",
-        "gnis/feature_id",
+        "gnis/feature_id-US",
        "phone",
        "website",
        "wheelchair"
--- a/data/presets/emergency/lifeboat_station.json
+++ b/data/presets/emergency/lifeboat_station.json
@@ -11,7 +11,7 @@
    "moreFields": [
        "email",
        "fax",
-        "gnis/feature_id",
+        "gnis/feature_id-US",
        "wheelchair"
    ],
    "geometry": [
--- a/data/presets/emergency/mountain_rescue.json
+++ b/data/presets/emergency/mountain_rescue.json
@@ -10,7 +10,7 @@
    ],
    "moreFields": [
        "fax",
-        "gnis/feature_id",
+        "gnis/feature_id-US",
        "phone",
        "wheelchair"
    ],
--- a/data/presets/ford.json
+++ b/data/presets/ford.json
@@ -7,7 +7,7 @@
        "seasonal"
    ],
    "moreFields": [
-        "gnis/feature_id"
+        "gnis/feature_id-US"
    ],
    "geometry": [
        "vertex"
--- a/data/presets/healthcare.json
+++ b/data/presets/healthcare.json
@@ -16,7 +16,7 @@
        "building/levels_building",
        "email",
        "fax",
-        "gnis/feature_id",
+        "gnis/feature_id-US",
        "height_building",
        "level",
        "opening_hours",
--- a/data/presets/highway/path.json
+++ b/data/presets/highway/path.json
@@ -11,7 +11,7 @@
    "moreFields": [
        "covered",
        "dog",
-        "gnis/feature_id",
+        "gnis/feature_id-US",
        "horse_scale",
        "informal",
        "lit",
--- a/data/presets/highway/primary.json
+++ b/data/presets/highway/primary.json
@@ -14,7 +14,7 @@
        "charge_toll",
        "covered",
        "cycleway",
-        "expressway",
+        "expressway-US",
        "flood_prone",
        "incline",
        "junction_line",
--- a/data/presets/highway/trailhead.json
+++ b/data/presets/highway/trailhead.json
@@ -11,7 +11,7 @@
        "charge_fee"
    ],
    "moreFields": [
-        "gnis/feature_id",
+        "gnis/feature_id-US",
        "opening_hours",
        "opening_hours/covid19"
    ],
--- a/data/presets/highway/trunk.json
+++ b/data/presets/highway/trunk.json
@@ -6,7 +6,7 @@
        "oneway",
        "maxspeed",
        "lanes",
-        "expressway",
+        "expressway-US",
        "surface",
        "structure",
        "access"
--- a/data/presets/historic.json
+++ b/data/presets/historic.json
@@ -5,7 +5,7 @@
        "inscription"
    ],
    "moreFields": [
-        "gnis/feature_id"
+        "gnis/feature_id-US"
    ],
    "geometry": [
        "point",
--- a/data/presets/leisure/amusement_arcade.json
+++ b/data/presets/leisure/amusement_arcade.json
@@ -10,7 +10,7 @@
        "air_conditioning",
        "email",
        "fax",
-        "gnis/feature_id",
+        "gnis/feature_id-US",
        "internet_access",
        "internet_access/fee",
        "internet_access/ssid",
--- a/data/presets/leisure/bandstand.json
+++ b/data/presets/leisure/bandstand.json
@@ -6,7 +6,7 @@
        "operator"
    ],
    "moreFields": [
-        "gnis/feature_id",
+        "gnis/feature_id-US",
        "website"
    ],
    "geometry": [
--- a/data/presets/leisure/beach_resort.json
+++ b/data/presets/leisure/beach_resort.json
@@ -12,7 +12,7 @@
    "moreFields": [
        "email",
        "fax",
-        "gnis/feature_id",
+        "gnis/feature_id-US",
        "phone",
        "smoking",
        "website"
--- a/data/presets/leisure/bowling_alley.json
+++ b/data/presets/leisure/bowling_alley.json
@@ -10,7 +10,7 @@
        "air_conditioning",
        "email",
        "fax",
-        "gnis/feature_id",
+        "gnis/feature_id-US",
        "internet_access",
        "internet_access/fee",
        "internet_access/ssid",
--- a/data/presets/leisure/common.json
+++ b/data/presets/leisure/common.json
@@ -5,7 +5,7 @@
        "access_simple"
    ],
    "moreFields": [
-        "gnis/feature_id",
+        "gnis/feature_id-US",
        "website"
    ],
    "geometry": [
--- a/data/presets/leisure/dance.json
+++ b/data/presets/leisure/dance.json
@@ -10,7 +10,7 @@
    "moreFields": [
        "email",
        "fax",
-        "gnis/feature_id",
+        "gnis/feature_id-US",
        "level",
        "opening_hours",
        "opening_hours/covid19",
--- a/data/presets/leisure/dancing_school.json
+++ b/data/presets/leisure/dancing_school.json
@@ -10,7 +10,7 @@
    "moreFields": [
        "email",
        "fax",
-        "gnis/feature_id",
+        "gnis/feature_id-US",
        "level",
        "opening_hours",
        "opening_hours/covid19",
--- a/data/presets/leisure/disc_golf_course.json
+++ b/data/presets/leisure/disc_golf_course.json
@@ -15,7 +15,7 @@
        "dog",
        "email",
        "fax",
-        "gnis/feature_id",
+        "gnis/feature_id-US",
        "lit",
        "phone",
        "website",
--- a/data/presets/leisure/dog_park.json
+++ b/data/presets/leisure/dog_park.json
@@ -12,7 +12,7 @@
        "dog",
        "email",
        "fax",
-        "gnis/feature_id",
+        "gnis/feature_id-US",
        "internet_access",
        "internet_access/fee",
        "internet_access/ssid",
--- a/data/presets/leisure/fitness_centre.json
+++ b/data/presets/leisure/fitness_centre.json
@@ -17,7 +17,7 @@
        "email",
        "fax",
        "fee",
-        "gnis/feature_id",
+        "gnis/feature_id-US",
        "internet_access",
        "internet_access/fee",
        "internet_access/ssid",
--- a/data/presets/leisure/garden.json
+++ b/data/presets/leisure/garden.json
@@ -13,7 +13,7 @@
    "moreFields": [
        "email",
        "fax",
-        "gnis/feature_id",
+        "gnis/feature_id-US",
        "phone",
        "website"
    ],
--- a/data/presets/leisure/golf_course.json
+++ b/data/presets/leisure/golf_course.json
@@ -10,7 +10,7 @@
    "moreFields": [
        "email",
        "fax",
-        "gnis/feature_id",
+        "gnis/feature_id-US",
        "payment_multi",
        "phone",
        "website"
--- a/data/presets/leisure/hackerspace.json
+++ b/data/presets/leisure/hackerspace.json
@@ -18,7 +18,7 @@
        "air_conditioning",
        "email",
        "fax",
-        "gnis/feature_id",
+        "gnis/feature_id-US",
        "level",
        "phone",
        "smoking",
--- a/data/presets/leisure/horse_riding.json
+++ b/data/presets/leisure/horse_riding.json
@@ -10,7 +10,7 @@
    "moreFields": [
        "email",
        "fax",
-        "gnis/feature_id",
+        "gnis/feature_id-US",
        "opening_hours",
        "opening_hours/covid19",
        "payment_multi",
--- a/Show More
+++ b/Show More