diff --git a/CHANGELOG.md b/CHANGELOG.md index eceef7cd..16db42b2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -29,7 +29,7 @@ _Breaking developer changes, which may affect downstream projects or sites that * Add a preset for Barbeque Restaurants ([#535], thanks [@arch0345]) * Add Horse Race Course preset ([#537], thanks [@arch0345]) * Add presets for building=allotment_house and building=outhouse ([#528], thanks [@matkoniecz]) -* Add presets for more playground features: Play Activity Panel, Hanging Roundabout, Play Bridge, Play CLimbing Wall, Funnel Ball Funnel, Painted Playground Map, Play Sledding Hill, Play Splash Pad, Teen Shelter, Tetherball Pole, Trampoline, Play Tunnel, Gaga Pit, Funnel Ball Court ([#543], thanks [@arch0345]) +* Add presets for more playground features: Play Activity Panel, Hanging Roundabout, Play Bridge, Play Climbing Wall, Funnel Ball Funnel, Painted Playground Map, Play Sledding Hill, Play Splash Pad, Teen Shelter, Tetherball Pole, Trampoline, Play Tunnel, Gaga Pit, Funnel Ball Court ([#543], thanks [@arch0345]) * Add (hidden) preset for unspecified Barriers (`barrier=yes`) ([#531]) * Add (hidden) presets for unspecified Healthcare (`healthcare=yes`) and unspecified Traffic Calming (`traffic_calming=yes`) features ([#547]) * Add (hidden) preset for unspecified Man Made Feature (`man_made=yes`) diff --git a/README.md b/README.md index b7739589..5a551a31 100644 --- a/README.md +++ b/README.md @@ -7,8 +7,9 @@ It includes presets, fields, deprecations, and more. ## Background -OpenStreetMap itself does not have a formal tagging [schema](https://en.wikipedia.org/wiki/Database_schema), -but editing tools need to know how tags are used in order to facilitate mapping. +OpenStreetMap itself does not have a formal rigid [database schema](https://en.wikipedia.org/wiki/Database_schema), +but relies on a [tagging](https://wiki.openstreetmap.org/wiki/Tags) [folksonomy](https://en.wikipedia.org/wiki/Folksonomy) instead. +Editing tools need to know how tags are used in order to facilitate mapping. This Tagging Schema fills that need, but with a number of caveats: - This isn't authoritative or definitive @@ -39,7 +40,9 @@ makes it easier to use this data with Android or other Java platforms. ## Related Projects -iD also incorporates preset data from the [name-suggestion-index](https://github.com/osmlab/name-suggestion-index). +* The [OpenStreetMap wiki](https://wiki.openstreetmap.org/wiki/Map_features) documents the current usage of tags, and hosts discussions about proposed new tags. +* iD also incorporates preset data from the [name-suggestion-index](https://github.com/osmlab/name-suggestion-index). +* Other editors also include their own models of interpretations of OSM tags. See for example [Vespucci's](https://github.com/simonpoole/beautified-JOSM-preset) or [JOSM's](https://josm.openstreetmap.de/wiki/Presets) tagging presets. ## Contributing diff --git a/data/deprecated.json b/data/deprecated.json index 1178746c..19a9f42e 100644 --- a/data/deprecated.json +++ b/data/deprecated.json @@ -678,6 +678,10 @@ "old": {"generator:source": "photovoltaic"}, "replace": {"generator:source": "solar", "generator:method": "photovoltaic"} }, + { + "old": {"generator:method": "solar"}, + "replace": {"generator:source": "solar"} + }, { "old": {"golf": "faiway"}, "replace": {"golf": "fairway"} @@ -710,6 +714,10 @@ "old": {"highway": "abandoned"}, "replace": {"abandoned:highway": "*"} }, + { + "old": {"highway": "service", "service": "busway"}, + "replace": {"highway": "busway"} + }, { "old": {"highway": "bridleway", "horse": "no"}, "replace": {"highway": "path", "horse": "no"} @@ -774,6 +782,14 @@ "old": {"internet_access": "wifi"}, "replace": {"internet_access": "wlan"} }, +{ + "old": {"internet_access": "wi-fi"}, + "replace": {"internet_access": "wlan"} + }, +{ + "old": {"internet_access": "WLAN"}, + "replace": {"internet_access": "wlan"} + }, { "old": {"internet_access:fee": "0"}, "replace": {"internet_access:fee": "no"} @@ -878,6 +894,14 @@ "old": {"landuse": "reservoir"}, "replace": {"natural": "water", "water": "reservoir"} }, + { + "old": {"landuse": "reservoir", "reservoir_type": "tailings", "natural": "water", "water": "reservoir"}, + "replace": {"man_made": "tailings_pond"} + }, + { + "old": {"landuse": "reservoir", "reservoir_type": "tailings"}, + "replace": {"man_made": "tailings_pond"} + }, { "old": {"landuse": "school"}, "replace": {"landuse": "education"} @@ -1066,6 +1090,10 @@ "old": {"natural": "marsh"}, "replace": {"natural": "wetland", "wetland": "marsh"} }, + { + "old": {"natural": "water", "water": "reservoir", "reservoir_type": "tailings"}, + "replace": {"man_made": "tailings_pond"} + }, { "old": {"natural": "waterfall"}, "replace": {"waterway": "waterfall"} diff --git a/data/fields/address.json b/data/fields/address.json index a660165f..bec5e811 100644 --- a/data/fields/address.json +++ b/data/fields/address.json @@ -25,7 +25,6 @@ "addr:suburb", "addr:unit" ], - "icon": "address", "label": "Address", "strings": { "placeholders": { diff --git a/data/fields/bicycle_parking.json b/data/fields/bicycle_parking.json index 77feeeff..7d9ac040 100644 --- a/data/fields/bicycle_parking.json +++ b/data/fields/bicycle_parking.json @@ -1,5 +1,15 @@ { "key": "bicycle_parking", "type": "combo", - "label": "Type" + "label": "Type", + "strings": { + "options": { + "stands": "Stand (supports bicycle frame)", + "wall_loops": "Wheelbender (supports wheel only)", + "shed": "Closed Shed", + "lockers": "Individual Lockers", + "building": "In a Building", + "handlebar_holder": "Handlebar Holder" + } + } } diff --git a/data/fields/bike_ride.json b/data/fields/bike_ride.json new file mode 100644 index 00000000..207b6606 --- /dev/null +++ b/data/fields/bike_ride.json @@ -0,0 +1,5 @@ +{ + "key": "bike_ride", + "type": "check", + "label": "Bike and Ride" +} diff --git a/data/fields/building/levels_building.json b/data/fields/building/levels_building.json index 03850c68..52203809 100644 --- a/data/fields/building/levels_building.json +++ b/data/fields/building/levels_building.json @@ -2,8 +2,8 @@ "key": "building:levels", "type": "number", "minValue": 0, - "label": "Building Levels", - "placeholder": "2, 4, 6...", + "label": "{building/levels}", + "placeholder": "{building/levels}", "prerequisiteTag": { "key": "building", "valueNot": "no" diff --git a/data/fields/building/prefabricated.json b/data/fields/building/prefabricated.json new file mode 100644 index 00000000..5fb8cfd7 --- /dev/null +++ b/data/fields/building/prefabricated.json @@ -0,0 +1,10 @@ +{ + "key": "building:prefabricated", + "type": "check", + "terms": [ + "manufactured", + "modular", + "portable" + ], + "label": "Prefabricated" +} diff --git a/data/fields/colour.json b/data/fields/colour.json index d53e2a95..e47495f6 100644 --- a/data/fields/colour.json +++ b/data/fields/colour.json @@ -1,5 +1,5 @@ { "key": "colour", - "type": "text", + "type": "colour", "label": "Color" } diff --git a/data/fields/contact/webcam.json b/data/fields/contact/webcam.json index 54a6c878..33a1b939 100644 --- a/data/fields/contact/webcam.json +++ b/data/fields/contact/webcam.json @@ -1,7 +1,6 @@ { "key": "contact:webcam", "type": "url", - "icon": "website", "label": "Webcam URL", "placeholder": "http://example.com/" } diff --git a/data/fields/crop.json b/data/fields/crop.json index 1aac1542..fd923f36 100644 --- a/data/fields/crop.json +++ b/data/fields/crop.json @@ -1,5 +1,35 @@ { "key": "crop", "type": "semiCombo", - "label": "Crops" + "label": "Crops", + "strings": { + "options": { + "asparagus": "Asparagus", + "barley": "Barley", + "beet": "Beets", + "cassava": "Cassava", + "coffee": "Coffee", + "cotton": "Cotton", + "cranberries": "Cranberries", + "fast_growing_wood": "Short-Rotation Coppice", + "flowers": "Flowers", + "grape": "Grapes", + "grass": "Grass", + "hop": "Hops", + "lavender": "Lavender", + "maize": "Corn", + "potato": "Potatoes", + "rape": "Rapeseed", + "rice": "Rice", + "strawberry": "Strawberries", + "sugar_beet": "Sugar Beets", + "sugarcane": "Sugarcane", + "sunflower": "Sunflowers", + "soy": "Soybeans", + "tea": "Tea", + "tobacco": "Tobacco", + "vegetable": "Vegetables", + "wheat": "Wheat" + } + } } diff --git a/data/fields/crossing_raised.json b/data/fields/crossing_raised.json index b28dd659..3717dafd 100644 --- a/data/fields/crossing_raised.json +++ b/data/fields/crossing_raised.json @@ -13,11 +13,5 @@ "undefined": "No", "table": "Yes" } - }, - "terms": [ - "flat top", - "hump", - "speed", - "slow" - ] + } } diff --git a/data/fields/departures_board.json b/data/fields/departures_board.json index 693f5f9a..6d8afe19 100644 --- a/data/fields/departures_board.json +++ b/data/fields/departures_board.json @@ -1,7 +1,7 @@ { "key": "departures_board", "type": "combo", - "label": "Departures Board", + "label": "Departures/Arrivals Board", "strings": { "options": { "yes": "Yes", diff --git a/data/fields/dispensing.json b/data/fields/dispensing.json index b400f24a..0ffee90b 100644 --- a/data/fields/dispensing.json +++ b/data/fields/dispensing.json @@ -1,6 +1,5 @@ { "key": "dispensing", "type": "check", - "label": "Dispenses Prescriptions", - "default": "yes" + "label": "Dispenses Prescriptions" } diff --git a/data/fields/ele.json b/data/fields/ele.json index 4bd7a541..fe94c916 100644 --- a/data/fields/ele.json +++ b/data/fields/ele.json @@ -1,7 +1,6 @@ { "key": "ele", "type": "number", - "icon": "elevation", "label": "Elevation (Meters)", "geometry": [ "line", diff --git a/data/fields/ele_node.json b/data/fields/ele_node.json index 2b2a1ba1..41b072a5 100644 --- a/data/fields/ele_node.json +++ b/data/fields/ele_node.json @@ -1,7 +1,6 @@ { "key": "ele", "type": "number", - "icon": "elevation", "label": "Elevation (Meters)", "universal": true, "geometry": [ diff --git a/data/fields/entrance.json b/data/fields/entrance.json index 16d04b3f..724eb105 100644 --- a/data/fields/entrance.json +++ b/data/fields/entrance.json @@ -1,5 +1,19 @@ { "key": "entrance", "type": "typeCombo", - "label": "Type" + "label": "Type", + "strings": { + "options": { + "yes": "Unspecified", + "main": "Main", + "secondary": "Secondary", + "service": "Service", + "exit": "Exit Only", + "entrance": "Entrance Only", + "emergency": "Emergency Exit", + "staircase": "Staircase", + "home": "Private House or Apartment", + "garage": "Garage Door" + } + } } diff --git a/data/fields/fuel/fuel_multi-RU.json b/data/fields/fuel/fuel_multi-RU.json new file mode 100644 index 00000000..4e2a4047 --- /dev/null +++ b/data/fields/fuel/fuel_multi-RU.json @@ -0,0 +1,22 @@ +{ + "key": "fuel:", + "type": "multiCombo", + "label": "{fuel/fuel_multi}", + "stringsCrossReference": "{fuel/fuel_multi}", + "options": [ + "diesel", + "octane_80", + "octane_92", + "octane_95", + "octane_98", + "octane_100", + "lpg", + "cng" + ], + "autoSuggestions": false, + "locationSet": { + "include": [ + "RU" + ] + } +} diff --git a/data/fields/fuel/fuel_multi.json b/data/fields/fuel/fuel_multi.json new file mode 100644 index 00000000..35d6248c --- /dev/null +++ b/data/fields/fuel/fuel_multi.json @@ -0,0 +1,58 @@ +{ + "key": "fuel:", + "type": "multiCombo", + "label": "Fuel Types", + "strings": { + "options": { + "diesel": "Diesel", + "GTL_diesel": "GTL Diesel", + "HGV_diesel": "Truck Diesel", + "biodiesel": "Biodiesel", + "octane_80": "Gasoline (80 Octane)", + "octane_85": "Gasoline (85 Octane)", + "octane_87": "Gasoline (87 Octane)", + "octane_88": "Gasoline (88 Octane)", + "octane_89": "Gasoline (89 Octane)", + "octane_90": "Gasoline (90 Octane)", + "octane_91": "Gasoline (91 Octane)", + "octane_92": "Gasoline (92 Octane)", + "octane_93": "Gasoline (93 Octane)", + "octane_95": "Gasoline (95 Octane)", + "octane_97": "Gasoline (97 Octane)", + "octane_98": "Gasoline (98 Octane)", + "octane_100": "Gasoline (100 Octane)", + "e10": "E10 Gasoline", + "e85": "E85 Gasoline", + "lpg": "Liquefied Natural Gas (LPG)", + "cng": "Compressed Natural Gas (CNG)", + "propane": "Propane", + "LH2": "Liquid Hydrogen", + "h70": "Gaseous Hydrogen (700 bar)", + "adblue": "AdBlue / AUS 32", + "adblue:canister": "AdBlue / AUS 32 (sold in canisters)" + } + }, + "autoSuggestions": true, + "caseSensitive": true, + "terms": [ + "diesel", + "gas", + "gasoline", + "petrol", + "ethanol", + "biodiesel", + "bioethanol", + "fuel", + "fuel mix", + "mixture", + "propane", + "lpg", + "cng", + "lng" + ], + "locationSet": { + "exclude": [ + "RU" + ] + } +} diff --git a/data/fields/fuel_multi.json b/data/fields/fuel_multi.json deleted file mode 100644 index bb76d9ab..00000000 --- a/data/fields/fuel_multi.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "key": "fuel:", - "type": "multiCombo", - "label": "Fuel Types" -} diff --git a/data/fields/generator/method.json b/data/fields/generator/method.json index 211e4b15..de107f68 100644 --- a/data/fields/generator/method.json +++ b/data/fields/generator/method.json @@ -1,5 +1,23 @@ { "key": "generator:method", "type": "combo", - "label": "Method" + "label": "Method", + "strings": { + "options": { + "fission": "Fission", + "fusion": "Fusion", + "wind_turbine": "Wind Turbine", + "water-storage": "Reservoir", + "water-pumped-storage": "Pumped-Storage", + "run-of-the-river": "Run-of-the-River", + "barrage": "Tidal Barrage", + "stream": "Tidal Stream", + "thermal": "Solar Thermal", + "photovoltaic": "Photovoltaic", + "combustion": "Combustion", + "gasification": "Gasification", + "anaerobic_digestion": "Anaerobic Digestion" + } + }, + "autoSuggestions": false } diff --git a/data/fields/generator/method/hydro.json b/data/fields/generator/method/hydro.json new file mode 100644 index 00000000..1695d6e7 --- /dev/null +++ b/data/fields/generator/method/hydro.json @@ -0,0 +1,16 @@ +{ + "key": "generator:method", + "type": "combo", + "label": "{generator/method}", + "stringsCrossReference": "{generator/method}", + "options": [ + "water-storage", + "water-pumped-storage", + "run-of-the-river" + ], + "autoSuggestions": false, + "prerequisiteTag": { + "key": "generator:source", + "value": "hydro" + } +} diff --git a/data/fields/generator/source.json b/data/fields/generator/source.json index 43016ad3..ab366f77 100644 --- a/data/fields/generator/source.json +++ b/data/fields/generator/source.json @@ -1,5 +1,26 @@ { "key": "generator:source", "type": "combo", - "label": "Source" + "label": "Source", + "strings": { + "options": { + "nuclear": "Nuclear Power", + "wind": "Wind", + "hydro": "Hydropower", + "tidal": "Tidal Power", + "wave": "Wave Power", + "geothermal": "Geothermal Energy", + "solar": "Solar Radiation", + "coal": "Coal", + "gas": "Natural Gas", + "biomass": "Plant Matter", + "biofuel": "Plant Based Fuels", + "biogas": "Biogas", + "oil": "Oil", + "diesel": "Diesel", + "gasoline": "Gasoline", + "waste": "Waste", + "battery": "Battery" + } + } } diff --git a/data/fields/healthcare/speciality.json b/data/fields/healthcare/speciality.json index f4739cf0..215ac6bb 100644 --- a/data/fields/healthcare/speciality.json +++ b/data/fields/healthcare/speciality.json @@ -1,5 +1,94 @@ { "key": "healthcare:speciality", "type": "semiCombo", - "label": "Specialties" + "label": "Specialties", + "strings": { + "options": { + "abortion": "Abortion", + "acupuncture": "Acupuncture", + "allergology": "Allergy & Asthma", + "anaesthetics": "Anesthesiology", + "angiology": "Angiology", + "anthroposophical": "Anthroposophic Medicine", + "applied_kinesiology": "Applied Kinesiology", + "aromatherapy": "Aromatherapy", + "ayurveda": "Ayurveda", + "behavior": "Behavior Therapy", + "biochemistry": "Biochemistry", + "biology": "Biology", + "blood_check": "Blood Test", + "body": "Body Therapy", + "cardiology": "Cardiology", + "cardiothoracic_surgery": "Cardiothoracic Surgery", + "child_psychiatry": "Child & Adolescent Psychiatry", + "chiropractic": "Chiropractic", + "clinical_pathology": "Clinical Pathology", + "community": "Community & Public Health", + "depth": "Depth Psychology", + "dermatology": "Dermatology", + "dermatovenereology": "Dermatovenereology", + "diabetology": "Diabetology", + "diagnostic_radiology": "Diagnostic Radiology", + "emergency": "Emergency Medicine", + "endocrinology": "Endocrinology", + "fertility": "Fertility", + "gastroenterology": "Gastroenterology", + "general": "General Practice", + "geriatrics": "Geriatric Medicine", + "gynaecology": "Obstetrics & Gynecology", + "haematology": "Hematology", + "hepatology": "Hepatology", + "herbalism": "Herbalism", + "homeopathy": "Homeopathy", + "humanistic": "Humanistic Psychology", + "hydrotherapy": "Hydrotherapy", + "hypnosis": "Hypnosis", + "infectious_diseases": "Infectious Disease", + "intensive": "Intensive Care", + "internal": "Internal Medicine", + "dental_oral_maxillo_facial_surgery": "Dental, Oral & Maxillofacial Surgery", + "naturopathy": "Naturopathy", + "neonatology": "Neonatology", + "nephrology": "Nephrology", + "neurology": "Neurology", + "neuropsychiatry": "Neuropsychiatry", + "neurosurgery": "Neurosurgery", + "nuclear": "Nuclear Medicine", + "occupational": "Occupational Medicine", + "oncology": "Oncology", + "ophthalmology": "Ophthalmology", + "orthodontics": "Orthodontics", + "orthopaedics": "Orthopedic Surgery", + "osteopathy": "Osteopathy", + "otolaryngology": "Ear, Nose & Throat", + "paediatric_surgery": "Pediatric Surgery", + "paediatrics": "Pediatrics", + "palliative": "Palliative Care", + "pathology": "Pathology", + "physiatry": "Physical Medicine & Rehabilitation", + "plastic_surgery": "Plastic Surgery", + "podiatry": "Podiatry", + "proctology": "Colorectal Surgery", + "psychiatry": "Psychiatry", + "pulmonology": "Pulmonology", + "radiology": "Radiology", + "radiotherapy": "Radiotherapy", + "reflexology": "Reflexology", + "reiki": "Reiki", + "rheumatology": "Rheumatology", + "shiatsu": "Shiatsu", + "stomatology": "Stomatology", + "surgery": "General Surgery", + "systemic": "Systemic Therapy", + "traditional_chinese_medicine": "Traditional Chinese Medicine", + "transplant": "Transplant Surgery", + "trauma": "Trauma Surgery", + "tropical": "Tropical Medicine", + "tuina": "Tuī ná", + "unani": "Unani Medicine", + "urology": "Urology", + "vaccination": "Vaccination", + "vascular_surgery": "Vascular Surgery" + } + } } diff --git a/data/fields/note.json b/data/fields/note.json index b53905b1..fa35a600 100644 --- a/data/fields/note.json +++ b/data/fields/note.json @@ -2,7 +2,6 @@ "key": "note", "type": "textarea", "universal": true, - "icon": "note", "label": "Note", "terms": [ "comment" diff --git a/data/fields/payment_multi.json b/data/fields/payment_multi.json index 587fb013..0d3e70c5 100644 --- a/data/fields/payment_multi.json +++ b/data/fields/payment_multi.json @@ -1,5 +1,49 @@ { "key": "payment:", "type": "multiCombo", - "label": "Payment Types" + "label": "Payment Types", + "strings": { + "options": { + "account_cards": "Account Card", + "app": "Mobile Application", + "cards": "Payment Card", + "cash": "Cash", + "cheque": "Check", + "coins": "Coins", + "contactless": "Contactless Payment", + "credit_cards": "Credit Card", + "cryptocurrencies": "Cryptocurrency", + "debit_cards": "Debit Card", + "electronic_purses": "Electronic Purse", + "notes": "Banknotes", + "prepaid_ticket": "Prepaid Ticket", + "telephone_cards": "Telephone Card", + "alipay": "Alipay", + "american_express": "American Express", + "apple_pay": "Apple Pay", + "bancomat": "Bancomat", + "blik": "Blik", + "clipper": "Clipper", + "diners_club": "Diners Club", + "discover_card": "Discover", + "dkv": "DKV", + "ep_easycard": "悠遊卡EasyCard", + "ep_geldkarte": "GeldKarte", + "ep_ipass": "iPASS一卡通", + "girocard": "Girocard", + "google_pay": "Google Pay", + "jcb": "JCB", + "maestro": "Maestro", + "mastercard": "Mastercard", + "mastercard_contactless": "Mastercard Contactless", + "paypal": "PayPal", + "unionpay": "UnionPay", + "uta": "UTA", + "v_pay": "V Pay", + "visa": "Visa", + "visa_debit": "Visa Debit", + "visa_electron": "Visa Electron", + "wechat": "WeChat Pay" + } + } } diff --git a/data/fields/payment_multi_fee.json b/data/fields/payment_multi_fee.json index b9ad3525..6986c66d 100644 --- a/data/fields/payment_multi_fee.json +++ b/data/fields/payment_multi_fee.json @@ -1,9 +1,10 @@ { "key": "payment:", "type": "multiCombo", - "label": "Payment Types", + "label": "{payment_multi}", "prerequisiteTag": { "key": "fee", "valueNot": "no" - } + }, + "stringsCrossReference": "{payment_multi}" } diff --git a/data/fields/phone.json b/data/fields/phone.json index 23ed71e2..fe129ed9 100644 --- a/data/fields/phone.json +++ b/data/fields/phone.json @@ -1,7 +1,6 @@ { "key": "phone", "type": "tel", - "icon": "maki-telephone", "label": "Telephone", "placeholder": "+31 42 123 4567", "terms": [ diff --git a/data/fields/plant/method.json b/data/fields/plant/method.json index fd91bc1f..aec4d661 100644 --- a/data/fields/plant/method.json +++ b/data/fields/plant/method.json @@ -1,5 +1,7 @@ { "key": "plant:method", "type": "combo", - "label": "Generation Method" + "label": "Generation Method", + "stringsCrossReference": "{generator/method}", + "autoSuggestions": false } diff --git a/data/fields/plant/method/hydro.json b/data/fields/plant/method/hydro.json new file mode 100644 index 00000000..eb69df91 --- /dev/null +++ b/data/fields/plant/method/hydro.json @@ -0,0 +1,16 @@ +{ + "key": "plant:method", + "type": "combo", + "label": "{plant/method}", + "stringsCrossReference": "{generator/method}", + "options": [ + "water-storage", + "water-pumped-storage", + "run-of-the-river" + ], + "autoSuggestions": false, + "prerequisiteTag": { + "key": "plant:source", + "value": "hydro" + } +} diff --git a/data/fields/plant/method/solar.json b/data/fields/plant/method/solar.json new file mode 100644 index 00000000..0c404eb9 --- /dev/null +++ b/data/fields/plant/method/solar.json @@ -0,0 +1,15 @@ +{ + "key": "plant:method", + "type": "combo", + "label": "{plant/method}", + "stringsCrossReference": "{generator/method}", + "options": [ + "thermal", + "photovoltaic" + ], + "autoSuggestions": false, + "prerequisiteTag": { + "key": "plant:source", + "value": "solar" + } +} diff --git a/data/fields/plant/method/waste.json b/data/fields/plant/method/waste.json new file mode 100644 index 00000000..c67ef7e3 --- /dev/null +++ b/data/fields/plant/method/waste.json @@ -0,0 +1,15 @@ +{ + "key": "plant:method", + "type": "combo", + "label": "{plant/method}", + "stringsCrossReference": "{generator/method}", + "options": [ + "combustion", + "gasification" + ], + "autoSuggestions": false, + "prerequisiteTag": { + "key": "plant:source", + "value": "waste" + } +} diff --git a/data/fields/plant/output.json b/data/fields/plant/output.json new file mode 100644 index 00000000..ca33f096 --- /dev/null +++ b/data/fields/plant/output.json @@ -0,0 +1,18 @@ +{ + "key": "plant:output", + "type": "multiCombo", + "label": "Form of Power Output", + "strings": { + "options": { + "electricity": "Electricity", + "hot_water": "Hot Water", + "hot_air": "Hot Air", + "cold_water": "Cold Water", + "cold_air": "Cold Air", + "compressed_air": "Compressed Air", + "steam": "Steam", + "vacuum": "Vacuum" + } + }, + "autoSuggestions": false +} diff --git a/data/fields/plant/output/electricity.json b/data/fields/plant/output/electricity.json index 8e903cf8..8cedd173 100644 --- a/data/fields/plant/output/electricity.json +++ b/data/fields/plant/output/electricity.json @@ -1,7 +1,11 @@ { "key": "plant:output:electricity", "type": "typeCombo", - "label": "Power Output", + "label": "Electric Power Output", "placeholder": "500 MW, 1000 MW, 2000 MW...", - "snake_case": false + "snake_case": false, + "prerequisiteTag": { + "key": "plant:output:electricity", + "valueNot": "no" + } } diff --git a/data/fields/plant/source.json b/data/fields/plant/source.json index 63d3a713..fdee95d1 100644 --- a/data/fields/plant/source.json +++ b/data/fields/plant/source.json @@ -1,5 +1,6 @@ { "key": "plant:source", "type": "combo", - "label": "Energy Source" + "label": "Energy Source", + "stringsCrossReference": "{generator/source}" } diff --git a/data/fields/population.json b/data/fields/population.json index 74a231f8..1eca1140 100644 --- a/data/fields/population.json +++ b/data/fields/population.json @@ -2,5 +2,8 @@ "key": "population", "type": "number", "minValue": 0, - "label": "Population" + "label": "Population", + "terms": [ + "census" + ] } diff --git a/data/fields/population/date.json b/data/fields/population/date.json new file mode 100644 index 00000000..4c3a624b --- /dev/null +++ b/data/fields/population/date.json @@ -0,0 +1,12 @@ +{ + "key": "population:date", + "type": "text", + "label": "Population Date", + "placeholder": "YYYY-MM-DD", + "prerequisiteTag": { + "key": "population" + }, + "terms": [ + "census date" + ] +} diff --git a/data/fields/recycling_accepts.json b/data/fields/recycling_accepts.json index 870ae585..e2b25fae 100644 --- a/data/fields/recycling_accepts.json +++ b/data/fields/recycling_accepts.json @@ -2,6 +2,7 @@ "key": "recycling:", "type": "multiCombo", "label": "Accepts", + "caseSensitive": true, "strings": { "options": { "glass_bottles": "Glass Bottles and Jars", diff --git a/data/fields/religion.json b/data/fields/religion.json index 36b5b67c..19c1dfbb 100644 --- a/data/fields/religion.json +++ b/data/fields/religion.json @@ -1,5 +1,31 @@ { "key": "religion", "type": "combo", - "label": "Religion" + "label": "Religion", + "strings": { + "options": { + "bahai": "Bahá’í", + "benzhu": "Benzhu", + "buddhist": "Buddhist", + "caodaism": "Caodaist", + "chinese_folk": "Chinese Folk Religion", + "christian": "Christian", + "confucian": "Confucian", + "hindu": "Hindu", + "jain": "Jain", + "jewish": "Jewish", + "multifaith": "Multifaith", + "muslim": "Muslim", + "none": "Nonreligious", + "pagan": "Pagan", + "shinto": "Shinto", + "sikh": "Sikh", + "spiritualist": "Spiritualist", + "taoist": "Taoist", + "tenrikyo": "Tenrikyo", + "unitarian_universalist": "Unitarian Universalist", + "vietnamese_folk": "Vietnamese Folk Religion", + "voodoo": "Voodoo" + } + } } diff --git a/data/fields/restrictions.json b/data/fields/restrictions.json index 9a4eee14..61420c4e 100644 --- a/data/fields/restrictions.json +++ b/data/fields/restrictions.json @@ -3,7 +3,6 @@ "geometry": [ "vertex" ], - "icon": "iD-restrictions", "usage": "manual", "reference": { "rtype": "restriction" diff --git a/data/fields/source.json b/data/fields/source.json index 98439ed5..bff414b7 100644 --- a/data/fields/source.json +++ b/data/fields/source.json @@ -1,7 +1,6 @@ { "key": "source", "type": "semiCombo", - "icon": "source", "universal": true, "label": "Sources", "snake_case": false, diff --git a/data/fields/source/population.json b/data/fields/source/population.json new file mode 100644 index 00000000..4c1f42ea --- /dev/null +++ b/data/fields/source/population.json @@ -0,0 +1,14 @@ +{ + "key": "source:population", + "type": "combo", + "label": "Population Source", + "prerequisiteTag": { + "key": "population" + }, + "snake_case": false, + "caseSensitive": true, + "terms": [ + "census", + "population reference" + ] +} diff --git a/data/fields/substation.json b/data/fields/substation.json index b83834b8..1f433a92 100644 --- a/data/fields/substation.json +++ b/data/fields/substation.json @@ -1,5 +1,19 @@ { "key": "substation", "type": "typeCombo", - "label": "Type" + "label": "Type", + "strings": { + "options": { + "transmission": "High-Voltage Transmission", + "distribution": "Regional Distribution", + "minor_distribution": "Local Distribution", + "industrial": "Industrial", + "generation": "Generation", + "transition": "Overground/Underground Transition", + "traction": "Traction System Supply", + "converter": "High-Voltage AC/DC Converter", + "compensation": "Reactive Power Compensation" + } + }, + "autoSuggestions": false } diff --git a/data/fields/surface.json b/data/fields/surface.json index 012dabce..59079c40 100644 --- a/data/fields/surface.json +++ b/data/fields/surface.json @@ -12,11 +12,17 @@ "compacted": "Compacted", "concrete": "Concrete", "paving_stones": "Paving Stones", + "sett": "Sett", "dirt": "Dirt", "grass": "Grass", "sand": "Sand", "wood": "Wood", - "artificial_turf": "Artificial Turf" + "metal": "Metal", + "artificial_turf": "Artificial Turf", + "unhewn_cobblestone": "Cobblestone (uncut, rounded stones)", + "mud": "Persistently Muddy", + "woodchips": "Woodchips", + "salt": "Salt" } } } diff --git a/data/fields/toilets/wheelchair.json b/data/fields/toilets/wheelchair.json new file mode 100644 index 00000000..949545af --- /dev/null +++ b/data/fields/toilets/wheelchair.json @@ -0,0 +1,16 @@ +{ + "key": "toilets/wheelchair", + "type": "radio", + "strings": { + "options": { + "yes": "Yes", + "limited": "Limited", + "no": "No" + } + }, + "label": "Wheelchair Accessible Toilet", + "prerequisiteTag": { + "key": "toilets", + "valueNot": "no" + } +} diff --git a/data/fields/tunnel_combo.json b/data/fields/tunnel_combo.json index 832e5e2b..3b9d1b72 100644 --- a/data/fields/tunnel_combo.json +++ b/data/fields/tunnel_combo.json @@ -1,5 +1,13 @@ { "key": "tunnel", "type": "combo", - "label": "Type" + "label": "Type", + "strings": { + "options": { + "avalanche_protector": "Avalanche Protector", + "building_passage": "Building Passage", + "culvert": "Culvert", + "flooded": "Flooded Tunnel" + } + } } diff --git a/data/fields/two_sided.json b/data/fields/two_sided.json new file mode 100644 index 00000000..164212b5 --- /dev/null +++ b/data/fields/two_sided.json @@ -0,0 +1,17 @@ +{ + "key": "two_sided", + "type": "defaultCheck", + "label": "Two-Sided", + "terms": [ + "double-sided" + ], + "geometry": [ + "line" + ], + "strings": { + "options": { + "undefined": "No", + "yes": "Yes" + } + } +} diff --git a/data/fields/website.json b/data/fields/website.json index 69a333ac..6f50b192 100644 --- a/data/fields/website.json +++ b/data/fields/website.json @@ -1,7 +1,6 @@ { "key": "website", "type": "url", - "icon": "website", "placeholder": "https://example.com", "label": "Website", "terms": [ diff --git a/data/fields/wheelchair.json b/data/fields/wheelchair.json index 127042d8..d06f36e4 100644 --- a/data/fields/wheelchair.json +++ b/data/fields/wheelchair.json @@ -8,7 +8,6 @@ "no": "No" } }, - "icon": "maki-wheelchair", "label": "Wheelchair Access", "terms": [ "handicap access" diff --git a/data/fields/wikidata.json b/data/fields/wikidata.json index 5fe33792..b413c01c 100644 --- a/data/fields/wikidata.json +++ b/data/fields/wikidata.json @@ -5,7 +5,6 @@ "wikipedia" ], "type": "wikidata", - "icon": "wikipedia", "universal": true, "label": "Wikidata" } diff --git a/data/fields/wikipedia.json b/data/fields/wikipedia.json index a886cc02..1164729e 100644 --- a/data/fields/wikipedia.json +++ b/data/fields/wikipedia.json @@ -5,7 +5,6 @@ "wikidata" ], "type": "wikipedia", - "icon": "wikipedia", "universal": true, "label": "Wikipedia" } diff --git a/data/presets/amenity/atm.json b/data/presets/amenity/atm.json index a615a6a2..1732e5f8 100644 --- a/data/presets/amenity/atm.json +++ b/data/presets/amenity/atm.json @@ -1,5 +1,5 @@ { - "icon": "maki-bank", + "icon": "temaki-atm2", "fields": [ "operator", "network", diff --git a/data/presets/amenity/bicycle_parking.json b/data/presets/amenity/bicycle_parking.json index a249bb12..37855797 100644 --- a/data/presets/amenity/bicycle_parking.json +++ b/data/presets/amenity/bicycle_parking.json @@ -12,6 +12,7 @@ "charge_fee" ], "moreFields": [ + "bike_ride", "colour", "indoor", "level", diff --git a/data/presets/amenity/cafe.json b/data/presets/amenity/cafe.json index 8f788d58..5c9e482c 100644 --- a/data/presets/amenity/cafe.json +++ b/data/presets/amenity/cafe.json @@ -34,6 +34,8 @@ "reservation", "smoking", "takeaway", + "toilets", + "toilets/wheelchair", "wheelchair", "highchair" ], diff --git a/data/presets/amenity/community_centre/lgbtq.json b/data/presets/amenity/community_centre/lgbtq.json index f6fbef8d..7a27a549 100644 --- a/data/presets/amenity/community_centre/lgbtq.json +++ b/data/presets/amenity/community_centre/lgbtq.json @@ -16,5 +16,10 @@ "amenity": "community_centre", "lgbtq": "primary" }, + "addTags": { + "amenity": "community_centre", + "lgbtq": "primary", + "community_centre:for": "lgbtq" + }, "name": "LGBTQ+ Community Center" } diff --git a/data/presets/amenity/fast_food/cafeteria.json b/data/presets/amenity/fast_food/cafeteria.json new file mode 100644 index 00000000..8daa4af3 --- /dev/null +++ b/data/presets/amenity/fast_food/cafeteria.json @@ -0,0 +1,22 @@ +{ + "icon": "maki-restaurant", + "geometry": [ + "point", + "area" + ], + "terms": [ + "canteen", + "dining hall", + "lunchroom", + "refectory" + ], + "tags": { + "amenity": "fast_food", + "fast_food": "cafeteria" + }, + "fields": [ + "{amenity/fast_food}", + "access_simple" + ], + "name": "Cafeteria" +} diff --git a/data/presets/amenity/fuel.json b/data/presets/amenity/fuel.json index 3aa5f363..8ac84cf5 100644 --- a/data/presets/amenity/fuel.json +++ b/data/presets/amenity/fuel.json @@ -5,7 +5,8 @@ "brand", "operator", "address", - "fuel_multi", + "fuel/fuel_multi", + "fuel/fuel_multi-RU", "self_service", "building_area" ], diff --git a/data/presets/amenity/pub.json b/data/presets/amenity/pub.json index 17a0e24d..229c2531 100644 --- a/data/presets/amenity/pub.json +++ b/data/presets/amenity/pub.json @@ -29,6 +29,8 @@ "ref/FR/siret-FR", "real_fire-GB-IE", "sport_pub", + "toilets", + "toilets/wheelchair", "wheelchair" ], "geometry": [ diff --git a/data/presets/amenity/refugee_site.json b/data/presets/amenity/refugee_site.json index 959d8d2e..72e21d63 100644 --- a/data/presets/amenity/refugee_site.json +++ b/data/presets/amenity/refugee_site.json @@ -7,7 +7,9 @@ "informal", "start_date", "capacity", - "population" + "population", + "population/date", + "source/population" ], "moreFields": [ "internet_access", diff --git a/data/presets/amenity/restaurant.json b/data/presets/amenity/restaurant.json index 6fdcbf94..cb2dbdee 100644 --- a/data/presets/amenity/restaurant.json +++ b/data/presets/amenity/restaurant.json @@ -38,6 +38,8 @@ "sport_pub", "stars", "takeaway", + "toilets", + "toilets/wheelchair", "wheelchair", "highchair" ], diff --git a/data/presets/amenity/school.json b/data/presets/amenity/school.json index 5438f492..fbb5800c 100644 --- a/data/presets/amenity/school.json +++ b/data/presets/amenity/school.json @@ -8,7 +8,8 @@ "grades", "religion", "denomination", - "website" + "website", + "building_area" ], "moreFields": [ "capacity", diff --git a/data/presets/attraction/water_slide.json b/data/presets/attraction/water_slide.json index 5beb284b..f8ceada0 100644 --- a/data/presets/attraction/water_slide.json +++ b/data/presets/attraction/water_slide.json @@ -10,8 +10,8 @@ "min_age" ], "geometry": [ - "line", - "area" + "point", + "line" ], "terms": [ "theme park", diff --git a/data/presets/barrier/city_wall.json b/data/presets/barrier/city_wall.json index 4962a9f5..9ff89717 100644 --- a/data/presets/barrier/city_wall.json +++ b/data/presets/barrier/city_wall.json @@ -4,6 +4,10 @@ "height", "material" ], + "moreFields": [ + "{barrier}", + "two_sided" + ], "geometry": [ "line", "area" diff --git a/data/presets/barrier/guard_rail.json b/data/presets/barrier/guard_rail.json index 0e4978de..1e384ddb 100644 --- a/data/presets/barrier/guard_rail.json +++ b/data/presets/barrier/guard_rail.json @@ -3,6 +3,10 @@ "fields": [ "material" ], + "moreFields": [ + "{barrier}", + "two_sided" + ], "geometry": [ "line" ], diff --git a/data/presets/barrier/jersey_barrier.json b/data/presets/barrier/jersey_barrier.json index 0921b9c2..179ae8d6 100644 --- a/data/presets/barrier/jersey_barrier.json +++ b/data/presets/barrier/jersey_barrier.json @@ -8,7 +8,7 @@ "access" ], "geometry": [ - "point", + "vertex", "line" ], "tags": { diff --git a/data/presets/barrier/kerb.json b/data/presets/barrier/kerb.json index 1c55a9c5..81f9636d 100644 --- a/data/presets/barrier/kerb.json +++ b/data/presets/barrier/kerb.json @@ -3,7 +3,8 @@ "fields": [ "kerb", "tactile_paving", - "wheelchair" + "wheelchair", + "two_sided" ], "moreFields": [ "material" diff --git a/data/presets/building.json b/data/presets/building.json index d767ce1b..15850c76 100644 --- a/data/presets/building.json +++ b/data/presets/building.json @@ -11,6 +11,7 @@ "architect", "building/levels/underground", "building/material", + "building/prefabricated", "ele", "gnis/feature_id-US", "layer", diff --git a/data/presets/building/fire_station.json b/data/presets/building/fire_station.json new file mode 100644 index 00000000..3b83a73c --- /dev/null +++ b/data/presets/building/fire_station.json @@ -0,0 +1,11 @@ +{ + "icon": "fas-house-fire", + "geometry": [ + "area" + ], + "tags": { + "building": "fire_station" + }, + "matchScore": 0.5, + "name": "Fire Station Building" +} diff --git a/data/presets/club/sport.json b/data/presets/club/sport.json index 28cc79b0..194051ba 100644 --- a/data/presets/club/sport.json +++ b/data/presets/club/sport.json @@ -5,6 +5,10 @@ "sport", "{club}" ], + "moreFields": [ + "{club}", + "access_simple" + ], "geometry": [ "point", "area" diff --git a/data/presets/craft/brewery.json b/data/presets/craft/brewery.json index b0676a85..19b9ad8e 100644 --- a/data/presets/craft/brewery.json +++ b/data/presets/craft/brewery.json @@ -23,5 +23,5 @@ "tags": { "craft": "brewery" }, - "name": "Brewery" + "name": "Craft Brewery" } diff --git a/data/presets/highway/busway.json b/data/presets/highway/busway.json new file mode 100644 index 00000000..e8b62bb9 --- /dev/null +++ b/data/presets/highway/busway.json @@ -0,0 +1,27 @@ +{ + "icon": "temaki-bus", + "fields": [ + "name", + "operator", + "oneway", + "structure", + "covered" + ], + "moreFields": [ + "trolley_wire" + ], + "geometry": [ + "line" + ], + "tags": { + "highway": "busway" + }, + "aliases": [ + "Transitway", + "Bus Rapid Transit" + ], + "terms": [ + "brt" + ], + "name": "Busway" +} diff --git a/data/presets/highway/motorway_link-US-CA.json b/data/presets/highway/motorway_link-US-CA.json index afe1f844..a20fd1a4 100644 --- a/data/presets/highway/motorway_link-US-CA.json +++ b/data/presets/highway/motorway_link-US-CA.json @@ -1,5 +1,5 @@ { - "name": "Motorway Link", + "name": "{highway/motorway_link}", "icon": "iD-highway-motorway-link", "fields": [ "destination_oneway", @@ -34,14 +34,6 @@ "tags": { "highway": "motorway_link" }, - "terms": [ - "exit", - "ramp", - "road", - "street", - "on ramp", - "off ramp" - ], "locationSet": { "include": [ "ca", diff --git a/data/presets/highway/primary_link-US-CA.json b/data/presets/highway/primary_link-US-CA.json index 293ae85d..7d8b44a4 100644 --- a/data/presets/highway/primary_link-US-CA.json +++ b/data/presets/highway/primary_link-US-CA.json @@ -1,5 +1,5 @@ { - "name": "Primary Link", + "name": "{highway/primary_link}", "icon": "iD-highway-primary-link", "fields": [ "destination_oneway", @@ -38,13 +38,6 @@ "tags": { "highway": "primary_link" }, - "terms": [ - "on ramp", - "off ramp", - "ramp", - "road", - "street" - ], "locationSet": { "include": [ "ca", diff --git a/data/presets/highway/service_area.json b/data/presets/highway/service_area.json new file mode 100644 index 00000000..01507c3d --- /dev/null +++ b/data/presets/highway/service_area.json @@ -0,0 +1,41 @@ +{ + "icon": "iD-highway-service", + "fields": [ + "name", + "service", + "maxspeed", + "surface", + "structure", + "access" + ], + "moreFields": [ + "covered_no", + "flood_prone", + "lit", + "maxheight", + "maxspeed/advisory", + "maxweight_bridge", + "smoothness", + "trolley_wire" + ], + "geometry": [ + "area" + ], + "tags": { + "highway": "service" + }, + "terms": [ + "maneuvering area", + "maneuvering surface", + "manoeuvring area", + "manoeuvring surface", + "paved lot", + "service road", + "service yard", + "shunting area", + "staging lot", + "yard" + ], + "searchable": false, + "name": "Paved Service Area" +} diff --git a/data/presets/highway/track.json b/data/presets/highway/track.json index de233624..c786e676 100644 --- a/data/presets/highway/track.json +++ b/data/presets/highway/track.json @@ -33,26 +33,35 @@ "agricultural road", "atv", "carriage road", + "dirt road", "double track", "farm road", "fire road", "forest road", + "forestry road", "four wheel drive", + "haul road", + "haulage road", "high-clearance", "jeep", - "land access road", "logging road", + "mining road", "offroad", + "off-road", "overgrown", "primitive", "quad", "ranch road", "rut", - "track", - "track road", + "two-track", "two track", "unmaintained", + "vehicular trail", "woods road" ], - "name": "Track / Land-Access Road" + "name": "Track / Land-Access Road", + "aliases": [ + "Land-Access Road", + "Track Road" + ] } diff --git a/data/presets/highway/trunk_link-US-CA.json b/data/presets/highway/trunk_link-US-CA.json index 7fb672fa..5425bc5e 100644 --- a/data/presets/highway/trunk_link-US-CA.json +++ b/data/presets/highway/trunk_link-US-CA.json @@ -1,5 +1,5 @@ { - "name": "Trunk Link", + "name": "{highway/trunk_link}", "icon": "iD-highway-trunk-link", "fields": [ "{highway/motorway_link-US-CA}" @@ -13,13 +13,6 @@ "tags": { "highway": "trunk_link" }, - "terms": [ - "on ramp", - "off ramp", - "ramp", - "road", - "street" - ], "locationSet": { "include": [ "ca", diff --git a/data/presets/landuse/industrial/_brewery.json b/data/presets/landuse/industrial/_brewery.json new file mode 100644 index 00000000..5bf0e6f2 --- /dev/null +++ b/data/presets/landuse/industrial/_brewery.json @@ -0,0 +1,27 @@ +{ + "icon": "temaki-storage_fermenter", + "fields": [ + "{man_made/works/brewery}", + "product" + ], + "moreFields": [ + "{man_made/works/brewery}" + ], + "geometry": [ + "point", + "area" + ], + "tags": { + "industrial": "brewery" + }, + "addTags": { + "landuse": "industrial" + }, + "reference": { + "key": "industrial", + "value": "brewery" + }, + "searchable": false, + "matchScore": 0.9, + "name": "{man_made/works/brewery}" +} diff --git a/data/presets/leisure/nature_reserve.json b/data/presets/leisure/nature_reserve.json index dff9b32b..08776234 100644 --- a/data/presets/leisure/nature_reserve.json +++ b/data/presets/leisure/nature_reserve.json @@ -11,6 +11,7 @@ "opening_hours" ], "moreFields": [ + "access_simple", "dog", "email", "fax", diff --git a/data/presets/leisure/park.json b/data/presets/leisure/park.json index 30be50ad..707b87cb 100644 --- a/data/presets/leisure/park.json +++ b/data/presets/leisure/park.json @@ -7,6 +7,7 @@ "opening_hours" ], "moreFields": [ + "access_simple", "dog", "email", "fax", diff --git a/data/presets/leisure/pitch/american_handball.json b/data/presets/leisure/pitch/american_handball.json new file mode 100644 index 00000000..7e73ebca --- /dev/null +++ b/data/presets/leisure/pitch/american_handball.json @@ -0,0 +1,19 @@ +{ + "icon": "temaki-wall", + "geometry": [ + "area", + "point" + ], + "tags": { + "leisure": "pitch", + "sport": "american_handball" + }, + "reference": { + "key": "sport", + "value": "american_handball" + }, + "terms": [ + "wallball" + ], + "name": "American Handball Court" +} diff --git a/data/presets/leisure/sports_centre.json b/data/presets/leisure/sports_centre.json index 8da82505..d3c162e3 100644 --- a/data/presets/leisure/sports_centre.json +++ b/data/presets/leisure/sports_centre.json @@ -3,7 +3,7 @@ "fields": [ "name", "sport", - "building", + "building_area", "address", "fee", "opening_hours", @@ -11,6 +11,7 @@ "charge_fee" ], "moreFields": [ + "access_simple", "email", "fax", "gnis/feature_id-US", diff --git a/data/presets/man_made/bridge.json b/data/presets/man_made/bridge.json index d104ab59..d3e1be72 100644 --- a/data/presets/man_made/bridge.json +++ b/data/presets/man_made/bridge.json @@ -31,5 +31,7 @@ "value": "bridge" }, "name": "Bridge Area", - "matchScore": 0.85 + "aliases": [ + "Bridge" + ] } diff --git a/data/presets/man_made/tailings_pond.json b/data/presets/man_made/tailings_pond.json new file mode 100644 index 00000000..d9044f42 --- /dev/null +++ b/data/presets/man_made/tailings_pond.json @@ -0,0 +1,26 @@ +{ + "icon": "maki-water", + "fields": [ + "name", + "resource", + "operator", + "intermittent" + ], + "geometry": [ + "area" + ], + "tags": { + "man_made": "tailings_pond" + }, + "terms": [ + "mining", + "separation", + "slurry" + ], + "aliases": [ + "Tailing Pond", + "Settling Pond", + "Settling Pit" + ], + "name": "Tailings Pond" +} diff --git a/data/presets/man_made/works/brewery.json b/data/presets/man_made/works/brewery.json new file mode 100644 index 00000000..68751527 --- /dev/null +++ b/data/presets/man_made/works/brewery.json @@ -0,0 +1,31 @@ +{ + "icon": "temaki-storage_fermenter", + "fields": [ + "{man_made/works}", + "website" + ], + "moreFields": [ + "{man_made/works}", + "min_age" + ], + "geometry": [ + "point", + "area" + ], + "terms": [ + "alcohol", + "beer", + "bier", + "booze", + "cider" + ], + "tags": { + "man_made": "works", + "product": "beer" + }, + "reference": { + "key": "product", + "value": "beer" + }, + "name": "Industrial Brewery" +} diff --git a/data/presets/natural/tree_stump.json b/data/presets/natural/tree_stump.json new file mode 100644 index 00000000..222c8826 --- /dev/null +++ b/data/presets/natural/tree_stump.json @@ -0,0 +1,23 @@ +{ + "icon": "temaki-tree_stump", + "geometry": [ + "area", + "point" + ], + "moreFields": [ + "leaf_type_singular", + "leaf_cycle_singular", + "denotation", + "height", + "circumference", + "{natural/tree}" + ], + "tags": { + "natural": "tree_stump" + }, + "terms": [ + "cut tree", + "removed tree" + ], + "name": "Tree Stump" +} diff --git a/data/presets/natural/water/oxbow.json b/data/presets/natural/water/oxbow.json new file mode 100644 index 00000000..34750b20 --- /dev/null +++ b/data/presets/natural/water/oxbow.json @@ -0,0 +1,23 @@ +{ + "icon": "maki-water", + "geometry": [ + "area" + ], + "tags": { + "natural": "water", + "water": "oxbow" + }, + "reference": { + "key": "water", + "value": "oxbow" + }, + "terms": [ + "anabranch", + "billabong", + "cut off", + "meander", + "oxbow", + "resaca" + ], + "name": "Oxbow Lake" +} diff --git a/data/presets/office/property_management.json b/data/presets/office/property_management.json new file mode 100644 index 00000000..1c53b31b --- /dev/null +++ b/data/presets/office/property_management.json @@ -0,0 +1,14 @@ +{ + "icon": "maki-suitcase", + "geometry": [ + "point", + "area" + ], + "tags": { + "office": "property_management" + }, + "terms": [ + "property rental" + ], + "name": "Property Management / Leasing Office" +} diff --git a/data/presets/office/union.json b/data/presets/office/union.json new file mode 100644 index 00000000..fad61a7a --- /dev/null +++ b/data/presets/office/union.json @@ -0,0 +1,14 @@ +{ + "icon": "maki-suitcase", + "geometry": [ + "point", + "area" + ], + "tags": { + "office": "union" + }, + "terms": [ + "trade union" + ], + "name": "Labor Union Office" +} diff --git a/data/presets/place/city.json b/data/presets/place/city.json index da8fcd75..78c6c577 100644 --- a/data/presets/place/city.json +++ b/data/presets/place/city.json @@ -2,7 +2,9 @@ "icon": "maki-city", "fields": [ "name", - "population" + "population", + "population/date", + "source/population" ], "geometry": [ "point", diff --git a/data/presets/place/hamlet.json b/data/presets/place/hamlet.json index fb33b6f2..36b9e7be 100644 --- a/data/presets/place/hamlet.json +++ b/data/presets/place/hamlet.json @@ -2,7 +2,9 @@ "icon": "maki-triangle-stroked", "fields": [ "name", - "population" + "population", + "population/date", + "source/population" ], "geometry": [ "point", diff --git a/data/presets/place/neighbourhood.json b/data/presets/place/neighbourhood.json index 96b872ce..9145c7a0 100644 --- a/data/presets/place/neighbourhood.json +++ b/data/presets/place/neighbourhood.json @@ -2,7 +2,9 @@ "icon": "maki-triangle-stroked", "fields": [ "name", - "population" + "population", + "population/date", + "source/population" ], "moreFields": [ "gnis/feature_id-US" diff --git a/data/presets/place/quarter.json b/data/presets/place/quarter.json index 1291d5bd..194ba0ea 100644 --- a/data/presets/place/quarter.json +++ b/data/presets/place/quarter.json @@ -2,7 +2,9 @@ "icon": "maki-triangle-stroked", "fields": [ "name", - "population" + "population", + "population/date", + "source/population" ], "geometry": [ "point", diff --git a/data/presets/place/suburb.json b/data/presets/place/suburb.json index 03c23532..7752a520 100644 --- a/data/presets/place/suburb.json +++ b/data/presets/place/suburb.json @@ -2,7 +2,9 @@ "icon": "maki-triangle-stroked", "fields": [ "name", - "population" + "population", + "population/date", + "source/population" ], "geometry": [ "point", diff --git a/data/presets/place/town.json b/data/presets/place/town.json index 911abfcb..c97bb7f9 100644 --- a/data/presets/place/town.json +++ b/data/presets/place/town.json @@ -2,7 +2,9 @@ "icon": "maki-town", "fields": [ "name", - "population" + "population", + "population/date", + "source/population" ], "geometry": [ "point", diff --git a/data/presets/place/village.json b/data/presets/place/village.json index d08042fa..0a6af854 100644 --- a/data/presets/place/village.json +++ b/data/presets/place/village.json @@ -2,7 +2,9 @@ "icon": "maki-village", "fields": [ "name", - "population" + "population", + "population/date", + "source/population" ], "geometry": [ "point", diff --git a/data/presets/power/catenary_mast.json b/data/presets/power/catenary_mast.json new file mode 100644 index 00000000..f931150b --- /dev/null +++ b/data/presets/power/catenary_mast.json @@ -0,0 +1,28 @@ +{ + "icon": "temaki-power_pole", + "fields": [ + "ref", + "operator" + ], + "moreFields": [ + "height", + "line_attachment", + "line_management", + "manufacturer", + "material" + ], + "geometry": [ + "point", + "vertex" + ], + "tags": { + "power": "catenary_mast" + }, + "terms": [ + "catenary pylon", + "catenary mast", + "overhead line", + "overhead wire" + ], + "name": "Catenary Pole" +} diff --git a/data/presets/power/generator/source/hydro.json b/data/presets/power/generator/source/hydro.json index 399da533..1b289ad7 100644 --- a/data/presets/power/generator/source/hydro.json +++ b/data/presets/power/generator/source/hydro.json @@ -3,7 +3,7 @@ "fields": [ "ref", "operator", - "generator/method", + "generator/method/hydro", "generator/type", "generator/output/electricity" ], diff --git a/data/presets/power/generator/source/nuclear.json b/data/presets/power/generator/source/nuclear.json index f6825735..66ffd6d0 100644 --- a/data/presets/power/generator/source/nuclear.json +++ b/data/presets/power/generator/source/nuclear.json @@ -3,7 +3,6 @@ "fields": [ "ref", "operator", - "generator/method", "generator/type", "generator/output/electricity" ], diff --git a/data/presets/power/plant.json b/data/presets/power/plant.json index 35bb7e0a..abed3c92 100644 --- a/data/presets/power/plant.json +++ b/data/presets/power/plant.json @@ -3,10 +3,11 @@ "fields": [ "name", "operator", - "address", "plant/source", "plant/method", + "plant/output", "plant/output/electricity", + "address", "start_date" ], "moreFields": [ diff --git a/data/presets/power/plant/source/coal.json b/data/presets/power/plant/source/coal.json index bbfd55ed..c872b2d4 100644 --- a/data/presets/power/plant/source/coal.json +++ b/data/presets/power/plant/source/coal.json @@ -3,8 +3,9 @@ "fields": [ "name", "operator", - "address", + "plant/output", "plant/output/electricity", + "address", "start_date" ], "moreFields": [ diff --git a/data/presets/power/plant/source/gas.json b/data/presets/power/plant/source/gas.json index cbe8a961..e02d939c 100644 --- a/data/presets/power/plant/source/gas.json +++ b/data/presets/power/plant/source/gas.json @@ -3,8 +3,9 @@ "fields": [ "name", "operator", - "address", + "plant/output", "plant/output/electricity", + "address", "start_date" ], "moreFields": [ diff --git a/data/presets/power/plant/source/hydro.json b/data/presets/power/plant/source/hydro.json index d7521441..0521085f 100644 --- a/data/presets/power/plant/source/hydro.json +++ b/data/presets/power/plant/source/hydro.json @@ -1,7 +1,13 @@ { "icon": "maki-dam", "fields": [ - "{power/plant}" + "name", + "operator", + "plant/source", + "plant/method/hydro", + "plant/output/electricity", + "address", + "start_date" ], "moreFields": [ "{power/plant}" diff --git a/data/presets/power/plant/source/method/photovoltaic.json b/data/presets/power/plant/source/method/photovoltaic.json new file mode 100644 index 00000000..d120fd02 --- /dev/null +++ b/data/presets/power/plant/source/method/photovoltaic.json @@ -0,0 +1,46 @@ +{ + "icon": "fas-solar-panel", + "fields": [ + "name", + "operator", + "plant/method/solar", + "plant/output/electricity", + "address", + "start_date" + ], + "moreFields": [ + "{power/plant}" + ], + "geometry": [ + "area" + ], + "tags": { + "power": "plant", + "plant:source": "solar", + "plant:method": "photovoltaic" + }, + "addTags": { + "power": "plant", + "plant:source": "solar", + "plant:method": "photovoltaic", + "plant:output:electricity": "*" + }, + "removeTags": { + "power": "plant", + "plant:method": "*", + "plant:source": "solar", + "plant:output:electricity": "*", + "landuse": "industrial" + }, + "reference": { + "key": "plant:method", + "value": "photovoltaic" + }, + "terms": [ + "photovoltaic power station", + "solar panels", + "solar park", + "utility-scale solar" + ], + "name": "Solar Farm" +} diff --git a/data/presets/power/plant/source/oil.json b/data/presets/power/plant/source/oil.json index d6d80108..b21ec284 100644 --- a/data/presets/power/plant/source/oil.json +++ b/data/presets/power/plant/source/oil.json @@ -3,8 +3,9 @@ "fields": [ "name", "operator", - "address", + "plant/output", "plant/output/electricity", + "address", "start_date" ], "moreFields": [ diff --git a/data/presets/power/plant/source/solar.json b/data/presets/power/plant/source/solar.json index 26efb8e5..62ef1d79 100644 --- a/data/presets/power/plant/source/solar.json +++ b/data/presets/power/plant/source/solar.json @@ -1,7 +1,13 @@ { "icon": "fas-solar-panel", "fields": [ - "{power/plant}" + "name", + "operator", + "plant/method/solar", + "plant/output", + "plant/output/electricity", + "address", + "start_date" ], "moreFields": [ "{power/plant}" @@ -15,26 +21,18 @@ }, "addTags": { "power": "plant", - "plant:source": "solar", - "plant:method": "photovoltaic", - "plant:output:electricity": "*" + "plant:source": "solar" }, "removeTags": { "power": "plant", - "plant:method": "*", "plant:source": "solar", + "plant:method": "*", "plant:output:electricity": "*", "landuse": "industrial" }, "reference": { - "key": "plant:method", - "value": "photovoltaic" + "key": "plant:source", + "value": "solar" }, - "terms": [ - "photovoltaic power station", - "solar panels", - "solar park", - "utility-scale solar" - ], - "name": "Solar Farm" + "name": "Solar Power Plant" } diff --git a/data/presets/power/plant/source/waste.json b/data/presets/power/plant/source/waste.json index e57ae6de..adadc6f8 100644 --- a/data/presets/power/plant/source/waste.json +++ b/data/presets/power/plant/source/waste.json @@ -3,8 +3,10 @@ "fields": [ "name", "operator", - "address", + "plant/method/waste", + "plant/output", "plant/output/electricity", + "address", "start_date" ], "moreFields": [ diff --git a/data/presets/power/plant/source/wind.json b/data/presets/power/plant/source/wind.json index 86076bef..fd41a958 100644 --- a/data/presets/power/plant/source/wind.json +++ b/data/presets/power/plant/source/wind.json @@ -3,8 +3,8 @@ "fields": [ "name", "operator", - "address", "plant/output/electricity", + "address", "start_date" ], "moreFields": [ diff --git a/data/presets/shop.json b/data/presets/shop.json index 7e0ec732..a8a617d7 100644 --- a/data/presets/shop.json +++ b/data/presets/shop.json @@ -31,6 +31,8 @@ "ref/FR/siret-FR", "second_hand", "stroller", + "toilets", + "toilets/wheelchair", "wheelchair" ], "geometry": [ diff --git a/data/presets/shop/bed.json b/data/presets/shop/bed.json index 9dc74458..bb6bba8c 100644 --- a/data/presets/shop/bed.json +++ b/data/presets/shop/bed.json @@ -7,5 +7,11 @@ "tags": { "shop": "bed" }, + "terms": [ + "bed", + "duvet", + "mattress", + "pillow" + ], "name": "Bedding/Mattress Store" } diff --git a/data/presets/shop/clothes.json b/data/presets/shop/clothes.json index de623feb..4df642d4 100644 --- a/data/presets/shop/clothes.json +++ b/data/presets/shop/clothes.json @@ -19,6 +19,7 @@ "clothes", "dresses", "fashion", + "outfits", "pants", "shirts", "shorts", diff --git a/data/presets/shop/clothes/wedding.json b/data/presets/shop/clothes/wedding.json index 4bfc896f..2c4fd939 100644 --- a/data/presets/shop/clothes/wedding.json +++ b/data/presets/shop/clothes/wedding.json @@ -20,6 +20,7 @@ "bridesmaid", "groom", "groomsman", + "marriage outfits", "tuxedo", "wedding dress", "wedding gown" diff --git a/data/presets/shop/fuel.json b/data/presets/shop/fuel.json index 3e7012f9..d32e2157 100644 --- a/data/presets/shop/fuel.json +++ b/data/presets/shop/fuel.json @@ -2,7 +2,7 @@ "icon": "temaki-propane_tank", "fields": [ "{shop}", - "fuel_multi" + "fuel/fuel_multi" ], "geometry": [ "point", diff --git a/data/presets/shop/supermarket.json b/data/presets/shop/supermarket.json index 8d42dbfc..97a54a89 100644 --- a/data/presets/shop/supermarket.json +++ b/data/presets/shop/supermarket.json @@ -2,6 +2,7 @@ "icon": "maki-grocery", "moreFields": [ "{shop}", + "cuisine", "diet_multi", "organic" ], diff --git a/data/presets/tourism/aquarium.json b/data/presets/tourism/aquarium.json index f93671ce..441037ab 100644 --- a/data/presets/tourism/aquarium.json +++ b/data/presets/tourism/aquarium.json @@ -21,6 +21,8 @@ "phone", "ref/vatin", "smoking", + "toilets", + "toilets/wheelchair", "wheelchair" ], "geometry": [ diff --git a/data/presets/tourism/gallery.json b/data/presets/tourism/gallery.json index d7dcd6f7..dd379573 100644 --- a/data/presets/tourism/gallery.json +++ b/data/presets/tourism/gallery.json @@ -18,6 +18,8 @@ "payment_multi", "phone", "ref/vatin", + "toilets", + "toilets/wheelchair", "wheelchair" ], "geometry": [ diff --git a/data/presets/tourism/information/office.json b/data/presets/tourism/information/office.json index 0d222846..b67653d4 100644 --- a/data/presets/tourism/information/office.json +++ b/data/presets/tourism/information/office.json @@ -16,6 +16,8 @@ "height_building", "internet_access/ssid", "phone", + "toilets", + "toilets/wheelchair", "wheelchair" ], "geometry": [ diff --git a/data/presets/tourism/museum.json b/data/presets/tourism/museum.json index 79197f2e..27fe10e1 100644 --- a/data/presets/tourism/museum.json +++ b/data/presets/tourism/museum.json @@ -25,6 +25,8 @@ "opening_hours/covid19", "payment_multi", "phone", + "toilets", + "toilets/wheelchair", "wheelchair" ], "geometry": [ diff --git a/data/presets/tourism/zoo.json b/data/presets/tourism/zoo.json index 1d4d367c..ce38564f 100644 --- a/data/presets/tourism/zoo.json +++ b/data/presets/tourism/zoo.json @@ -19,6 +19,8 @@ "opening_hours/covid19", "phone", "ref/vatin", + "toilets", + "toilets/wheelchair", "wheelchair" ], "geometry": [ diff --git a/data/presets/waterway/fuel.json b/data/presets/waterway/fuel.json index 2b81d9d2..07c1fe52 100644 --- a/data/presets/waterway/fuel.json +++ b/data/presets/waterway/fuel.json @@ -5,7 +5,7 @@ "operator", "address", "opening_hours", - "fuel_multi" + "fuel/fuel_multi" ], "moreFields": [ "branch_brand", diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml index d52c10f7..5ae95710 100644 --- a/interim/source_strings.yaml +++ b/interim/source_strings.yaml @@ -334,6 +334,23 @@ en: bicycle_parking: # bicycle_parking=* label: Type + options: + # bicycle_parking=building + building: In a Building + # bicycle_parking=handlebar_holder + handlebar_holder: Handlebar Holder + # bicycle_parking=lockers + lockers: Individual Lockers + # bicycle_parking=shed + shed: Closed Shed + # bicycle_parking=stands + stands: Stand (supports bicycle frame) + # bicycle_parking=wall_loops + wall_loops: Wheelbender (supports wheel only) + bike_ride: + # bike_ride=* + label: Bike and Ride + terms: '[translate with synonyms or related terms for ''Bike and Ride'', separated by commas]' bin: # bin=* label: Waste Bin @@ -431,10 +448,6 @@ en: terms: '[translate with synonyms or related terms for ''Underground Levels'', separated by commas]' building/levels_building: # building:levels=* - label: Building Levels - # building/levels_building field placeholder - placeholder: 2, 4, 6... - terms: '[translate with synonyms or related terms for ''Building Levels'', separated by commas]' building/material: # building:material=* label: Material @@ -442,6 +455,11 @@ en: building/part: # building:part=* label: Building Part + building/prefabricated: + # building:prefabricated=* + label: Prefabricated + # 'terms: manufactured,modular,portable' + terms: '[translate with synonyms or related terms for ''Prefabricated'', separated by commas]' building_area: # building=* label: Building @@ -581,6 +599,8 @@ en: label: Circumference (at Breast Height) # circumference field placeholder placeholder: 1 m, 20 cm, 30"… + # 'terms: dbh,diameter at breast height' + terms: '[translate with synonyms or related terms for ''Circumference (at Breast Height)'', separated by commas]' clothes: # clothes=* label: Clothes @@ -682,6 +702,59 @@ en: crop: # crop=* label: Crops + options: + # crop=asparagus + asparagus: Asparagus + # crop=barley + barley: Barley + # crop=beet + beet: Beets + # crop=cassava + cassava: Cassava + # crop=coffee + coffee: Coffee + # crop=cotton + cotton: Cotton + # crop=cranberries + cranberries: Cranberries + # crop=fast_growing_wood + fast_growing_wood: Short-Rotation Coppice + # crop=flowers + flowers: Flowers + # crop=grape + grape: Grapes + # crop=grass + grass: Grass + # crop=hop + hop: Hops + # crop=lavender + lavender: Lavender + # crop=maize + maize: Corn + # crop=potato + potato: Potatoes + # crop=rape + rape: Rapeseed + # crop=rice + rice: Rice + # crop=soy + soy: Soybeans + # crop=strawberry + strawberry: Strawberries + # crop=sugar_beet + sugar_beet: Sugar Beets + # crop=sugarcane + sugarcane: Sugarcane + # crop=sunflower + sunflower: Sunflowers + # crop=tea + tea: Tea + # crop=tobacco + tobacco: Tobacco + # crop=vegetable + vegetable: Vegetables + # crop=wheat + wheat: Wheat crossing: # crossing=* label: Type @@ -888,9 +961,10 @@ en: denotation: # denotation=* label: Denotation + terms: '[translate with synonyms or related terms for ''Denotation'', separated by commas]' departures_board: # departures_board=* - label: Departures Board + label: Departures/Arrivals Board options: # departures_board=no 'no': None @@ -1180,6 +1254,27 @@ en: entrance: # entrance=* label: Type + options: + # entrance=emergency + emergency: Emergency Exit + # entrance=entrance + entrance: Entrance Only + # entrance=exit + exit: Exit Only + # entrance=garage + garage: Garage Door + # entrance=home + home: Private House or Apartment + # entrance=main + main: Main + # entrance=secondary + secondary: Secondary + # entrance=service + service: Service + # entrance=staircase + staircase: Staircase + # entrance=yes + 'yes': Unspecified terms: '[translate with synonyms or related terms for ''Type'', separated by commas]' except: # except=* @@ -1321,9 +1416,64 @@ en: fuel: # fuel=* label: Fuel - fuel_multi: + fuel/fuel_multi: # fuel:=* label: Fuel Types + options: + # fuel:=GTL_diesel + GTL_diesel: GTL Diesel + # fuel:=HGV_diesel + HGV_diesel: Truck Diesel + # fuel:=LH2 + LH2: Liquid Hydrogen + # fuel:=adblue + adblue: AdBlue / AUS 32 + #canister': fuel:=adblue:canister + adblue:canister: AdBlue / AUS 32 (sold in canisters) + # fuel:=biodiesel + biodiesel: Biodiesel + # fuel:=cng + cng: Compressed Natural Gas (CNG) + # fuel:=diesel + diesel: Diesel + # fuel:=e10 + e10: E10 Gasoline + # fuel:=e85 + e85: E85 Gasoline + # fuel:=h70 + h70: Gaseous Hydrogen (700 bar) + # fuel:=lpg + lpg: Liquefied Natural Gas (LPG) + # fuel:=octane_100 + octane_100: Gasoline (100 Octane) + # fuel:=octane_80 + octane_80: Gasoline (80 Octane) + # fuel:=octane_85 + octane_85: Gasoline (85 Octane) + # fuel:=octane_87 + octane_87: Gasoline (87 Octane) + # fuel:=octane_88 + octane_88: Gasoline (88 Octane) + # fuel:=octane_89 + octane_89: Gasoline (89 Octane) + # fuel:=octane_90 + octane_90: Gasoline (90 Octane) + # fuel:=octane_91 + octane_91: Gasoline (91 Octane) + # fuel:=octane_92 + octane_92: Gasoline (92 Octane) + # fuel:=octane_93 + octane_93: Gasoline (93 Octane) + # fuel:=octane_95 + octane_95: Gasoline (95 Octane) + # fuel:=octane_97 + octane_97: Gasoline (97 Octane) + # fuel:=octane_98 + octane_98: Gasoline (98 Octane) + # fuel:=propane + propane: Propane + fuel/fuel_multi-RU: + # fuel:=* gambling: # gambling=* label: Games @@ -1347,6 +1497,35 @@ en: generator/method: # generator:method=* label: Method + options: + # generator:method=anaerobic_digestion + anaerobic_digestion: Anaerobic Digestion + # generator:method=barrage + barrage: Tidal Barrage + # generator:method=combustion + combustion: Combustion + # generator:method=fission + fission: Fission + # generator:method=fusion + fusion: Fusion + # generator:method=gasification + gasification: Gasification + # generator:method=photovoltaic + photovoltaic: Photovoltaic + # generator:method=run-of-the-river + run-of-the-river: Run-of-the-River + # generator:method=stream + stream: Tidal Stream + # generator:method=thermal + thermal: Solar Thermal + # generator:method=water-pumped-storage + water-pumped-storage: Pumped-Storage + # generator:method=water-storage + water-storage: Reservoir + # generator:method=wind_turbine + wind_turbine: Wind Turbine + generator/method/hydro: + # generator:method=* generator/output/electricity: # generator:output:electricity=* label: Power Output @@ -1355,6 +1534,41 @@ en: generator/source: # generator:source=* label: Source + options: + # generator:source=battery + battery: Battery + # generator:source=biofuel + biofuel: Plant Based Fuels + # generator:source=biogas + biogas: Biogas + # generator:source=biomass + biomass: Plant Matter + # generator:source=coal + coal: Coal + # generator:source=diesel + diesel: Diesel + # generator:source=gas + gas: Natural Gas + # generator:source=gasoline + gasoline: Gasoline + # generator:source=geothermal + geothermal: Geothermal Energy + # generator:source=hydro + hydro: Hydropower + # generator:source=nuclear + nuclear: Nuclear Power + # generator:source=oil + oil: Oil + # generator:source=solar + solar: Solar Radiation + # generator:source=tidal + tidal: Tidal Power + # generator:source=waste + waste: Waste + # generator:source=wave + wave: Wave Power + # generator:source=wind + wind: Wind generator/type: # generator:type=* label: Type @@ -1408,6 +1622,177 @@ en: healthcare/speciality: # healthcare:speciality=* label: Specialties + options: + # healthcare:speciality=abortion + abortion: Abortion + # healthcare:speciality=acupuncture + acupuncture: Acupuncture + # healthcare:speciality=allergology + allergology: Allergy & Asthma + # healthcare:speciality=anaesthetics + anaesthetics: Anesthesiology + # healthcare:speciality=angiology + angiology: Angiology + # healthcare:speciality=anthroposophical + anthroposophical: Anthroposophic Medicine + # healthcare:speciality=applied_kinesiology + applied_kinesiology: Applied Kinesiology + # healthcare:speciality=aromatherapy + aromatherapy: Aromatherapy + # healthcare:speciality=ayurveda + ayurveda: Ayurveda + # healthcare:speciality=behavior + behavior: Behavior Therapy + # healthcare:speciality=biochemistry + biochemistry: Biochemistry + # healthcare:speciality=biology + biology: Biology + # healthcare:speciality=blood_check + blood_check: Blood Test + # healthcare:speciality=body + body: Body Therapy + # healthcare:speciality=cardiology + cardiology: Cardiology + # healthcare:speciality=cardiothoracic_surgery + cardiothoracic_surgery: Cardiothoracic Surgery + # healthcare:speciality=child_psychiatry + child_psychiatry: Child & Adolescent Psychiatry + # healthcare:speciality=chiropractic + chiropractic: Chiropractic + # healthcare:speciality=clinical_pathology + clinical_pathology: Clinical Pathology + # healthcare:speciality=community + community: Community & Public Health + # healthcare:speciality=dental_oral_maxillo_facial_surgery + dental_oral_maxillo_facial_surgery: Dental, Oral & Maxillofacial Surgery + # healthcare:speciality=depth + depth: Depth Psychology + # healthcare:speciality=dermatology + dermatology: Dermatology + # healthcare:speciality=dermatovenereology + dermatovenereology: Dermatovenereology + # healthcare:speciality=diabetology + diabetology: Diabetology + # healthcare:speciality=diagnostic_radiology + diagnostic_radiology: Diagnostic Radiology + # healthcare:speciality=emergency + emergency: Emergency Medicine + # healthcare:speciality=endocrinology + endocrinology: Endocrinology + # healthcare:speciality=fertility + fertility: Fertility + # healthcare:speciality=gastroenterology + gastroenterology: Gastroenterology + # healthcare:speciality=general + general: General Practice + # healthcare:speciality=geriatrics + geriatrics: Geriatric Medicine + # healthcare:speciality=gynaecology + gynaecology: Obstetrics & Gynecology + # healthcare:speciality=haematology + haematology: Hematology + # healthcare:speciality=hepatology + hepatology: Hepatology + # healthcare:speciality=herbalism + herbalism: Herbalism + # healthcare:speciality=homeopathy + homeopathy: Homeopathy + # healthcare:speciality=humanistic + humanistic: Humanistic Psychology + # healthcare:speciality=hydrotherapy + hydrotherapy: Hydrotherapy + # healthcare:speciality=hypnosis + hypnosis: Hypnosis + # healthcare:speciality=infectious_diseases + infectious_diseases: Infectious Disease + # healthcare:speciality=intensive + intensive: Intensive Care + # healthcare:speciality=internal + internal: Internal Medicine + # healthcare:speciality=naturopathy + naturopathy: Naturopathy + # healthcare:speciality=neonatology + neonatology: Neonatology + # healthcare:speciality=nephrology + nephrology: Nephrology + # healthcare:speciality=neurology + neurology: Neurology + # healthcare:speciality=neuropsychiatry + neuropsychiatry: Neuropsychiatry + # healthcare:speciality=neurosurgery + neurosurgery: Neurosurgery + # healthcare:speciality=nuclear + nuclear: Nuclear Medicine + # healthcare:speciality=occupational + occupational: Occupational Medicine + # healthcare:speciality=oncology + oncology: Oncology + # healthcare:speciality=ophthalmology + ophthalmology: Ophthalmology + # healthcare:speciality=orthodontics + orthodontics: Orthodontics + # healthcare:speciality=orthopaedics + orthopaedics: Orthopedic Surgery + # healthcare:speciality=osteopathy + osteopathy: Osteopathy + # healthcare:speciality=otolaryngology + otolaryngology: Ear, Nose & Throat + # healthcare:speciality=paediatric_surgery + paediatric_surgery: Pediatric Surgery + # healthcare:speciality=paediatrics + paediatrics: Pediatrics + # healthcare:speciality=palliative + palliative: Palliative Care + # healthcare:speciality=pathology + pathology: Pathology + # healthcare:speciality=physiatry + physiatry: Physical Medicine & Rehabilitation + # healthcare:speciality=plastic_surgery + plastic_surgery: Plastic Surgery + # healthcare:speciality=podiatry + podiatry: Podiatry + # healthcare:speciality=proctology + proctology: Colorectal Surgery + # healthcare:speciality=psychiatry + psychiatry: Psychiatry + # healthcare:speciality=pulmonology + pulmonology: Pulmonology + # healthcare:speciality=radiology + radiology: Radiology + # healthcare:speciality=radiotherapy + radiotherapy: Radiotherapy + # healthcare:speciality=reflexology + reflexology: Reflexology + # healthcare:speciality=reiki + reiki: Reiki + # healthcare:speciality=rheumatology + rheumatology: Rheumatology + # healthcare:speciality=shiatsu + shiatsu: Shiatsu + # healthcare:speciality=stomatology + stomatology: Stomatology + # healthcare:speciality=surgery + surgery: General Surgery + # healthcare:speciality=systemic + systemic: Systemic Therapy + # healthcare:speciality=traditional_chinese_medicine + traditional_chinese_medicine: Traditional Chinese Medicine + # healthcare:speciality=transplant + transplant: Transplant Surgery + # healthcare:speciality=trauma + trauma: Trauma Surgery + # healthcare:speciality=tropical + tropical: Tropical Medicine + # healthcare:speciality=tuina + tuina: Tuī ná + # healthcare:speciality=unani + unani: Unani Medicine + # healthcare:speciality=urology + urology: Urology + # healthcare:speciality=vaccination + vaccination: Vaccination + # healthcare:speciality=vascular_surgery + vascular_surgery: Vascular Surgery heating: # heating=* label: Heating @@ -1692,6 +2077,7 @@ en: semi_deciduous: Semi-Deciduous # leaf_cycle=semi_evergreen semi_evergreen: Semi-Evergreen + terms: '[translate with synonyms or related terms for ''Leaf Cycle'', separated by commas]' leaf_type: # leaf_type=* label: Leaf Type @@ -1715,6 +2101,7 @@ en: leafless: Leafless # leaf_type=needleleaved needleleaved: Needleleaved + terms: '[translate with synonyms or related terms for ''Leaf Type'', separated by commas]' leisure: # leisure=* label: Type @@ -1745,6 +2132,7 @@ en: line_attachment: # line_attachment=* label: Line Attachment + terms: '[translate with synonyms or related terms for ''Line Attachment'', separated by commas]' line_management: # line_management=* label: Line Management @@ -2172,11 +2560,90 @@ en: payment_multi: # payment:=* label: Payment Types + options: + # payment:=account_cards + account_cards: Account Card + # payment:=alipay + alipay: Alipay + # payment:=american_express + american_express: American Express + # payment:=app + app: Mobile Application + # payment:=apple_pay + apple_pay: Apple Pay + # payment:=bancomat + bancomat: Bancomat + # payment:=blik + blik: Blik + # payment:=cards + cards: Payment Card + # payment:=cash + cash: Cash + # payment:=cheque + cheque: Check + # payment:=clipper + clipper: Clipper + # payment:=coins + coins: Coins + # payment:=contactless + contactless: Contactless Payment + # payment:=credit_cards + credit_cards: Credit Card + # payment:=cryptocurrencies + cryptocurrencies: Cryptocurrency + # payment:=debit_cards + debit_cards: Debit Card + # payment:=diners_club + diners_club: Diners Club + # payment:=discover_card + discover_card: Discover + # payment:=dkv + dkv: DKV + # payment:=electronic_purses + electronic_purses: Electronic Purse + # payment:=ep_easycard + ep_easycard: 悠遊卡EasyCard + # payment:=ep_geldkarte + ep_geldkarte: GeldKarte + # payment:=ep_ipass + ep_ipass: iPASS一卡通 + # payment:=girocard + girocard: Girocard + # payment:=google_pay + google_pay: Google Pay + # payment:=jcb + jcb: JCB + # payment:=maestro + maestro: Maestro + # payment:=mastercard + mastercard: Mastercard + # payment:=mastercard_contactless + mastercard_contactless: Mastercard Contactless + # payment:=notes + notes: Banknotes + # payment:=paypal + paypal: PayPal + # payment:=prepaid_ticket + prepaid_ticket: Prepaid Ticket + # payment:=telephone_cards + telephone_cards: Telephone Card + # payment:=unionpay + unionpay: UnionPay + # payment:=uta + uta: UTA + # payment:=v_pay + v_pay: V Pay + # payment:=visa + visa: Visa + # payment:=visa_debit + visa_debit: Visa Debit + # payment:=visa_electron + visa_electron: Visa Electron + # payment:=wechat + wechat: WeChat Pay terms: '[translate with synonyms or related terms for ''Payment Types'', separated by commas]' payment_multi_fee: # payment:=* - label: Payment Types - terms: '[translate with synonyms or related terms for ''Payment Types'', separated by commas]' phases: # phases=* label: Phases @@ -2346,9 +2813,35 @@ en: plant/method: # plant:method=* label: Generation Method + plant/method/hydro: + # plant:method=* + plant/method/solar: + # plant:method=* + plant/method/waste: + # plant:method=* + plant/output: + # plant:output=* + label: Form of Power Output + options: + # plant:output=cold_air + cold_air: Cold Air + # plant:output=cold_water + cold_water: Cold Water + # plant:output=compressed_air + compressed_air: Compressed Air + # plant:output=electricity + electricity: Electricity + # plant:output=hot_air + hot_air: Hot Air + # plant:output=hot_water + hot_water: Hot Water + # plant:output=steam + steam: Steam + # plant:output=vacuum + vacuum: Vacuum plant/output/electricity: # plant:output:electricity=* - label: Power Output + label: Electric Power Output # plant/output/electricity field placeholder placeholder: 500 MW, 1000 MW, 2000 MW... plant/source: @@ -2373,6 +2866,11 @@ en: population: # population=* label: Population + population/date: + # population:date=* + label: Population Date + # population/date field placeholder + placeholder: YYYY-MM-DD portable: # portable=* label: Portable @@ -2560,6 +3058,51 @@ en: religion: # religion=* label: Religion + options: + # religion=bahai + bahai: Bahá’í + # religion=benzhu + benzhu: Benzhu + # religion=buddhist + buddhist: Buddhist + # religion=caodaism + caodaism: Caodaist + # religion=chinese_folk + chinese_folk: Chinese Folk Religion + # religion=christian + christian: Christian + # religion=confucian + confucian: Confucian + # religion=hindu + hindu: Hindu + # religion=jain + jain: Jain + # religion=jewish + jewish: Jewish + # religion=multifaith + multifaith: Multifaith + # religion=muslim + muslim: Muslim + # religion=none + none: Nonreligious + # religion=pagan + pagan: Pagan + # religion=shinto + shinto: Shinto + # religion=sikh + sikh: Sikh + # religion=spiritualist + spiritualist: Spiritualist + # religion=taoist + taoist: Taoist + # religion=tenrikyo + tenrikyo: Tenrikyo + # religion=unitarian_universalist + unitarian_universalist: Unitarian Universalist + # religion=vietnamese_folk + vietnamese_folk: Vietnamese Folk Religion + # religion=voodoo + voodoo: Voodoo terms: '[translate with synonyms or related terms for ''Religion'', separated by commas]' reservation: # reservation=* @@ -2958,6 +3501,9 @@ en: survey: Survey # 'terms: reference' terms: '[translate with synonyms or related terms for ''Sources'', separated by commas]' + source/population: + # source:population=* + label: Population Source species: # species=* label: Species @@ -3100,6 +3646,25 @@ en: substation: # substation=* label: Type + options: + # substation=compensation + compensation: Reactive Power Compensation + # substation=converter + converter: High-Voltage AC/DC Converter + # substation=distribution + distribution: Regional Distribution + # substation=generation + generation: Generation + # substation=industrial + industrial: Industrial + # substation=minor_distribution + minor_distribution: Local Distribution + # substation=traction + traction: Traction System Supply + # substation=transition + transition: Overground/Underground Transition + # substation=transmission + transmission: High-Voltage Transmission supervised: # supervised=* label: Supervised @@ -3129,16 +3694,28 @@ en: gravel: Gravel # surface=ground ground: Ground + # surface=metal + metal: Metal + # surface=mud + mud: Persistently Muddy # surface=paved paved: Paved # surface=paving_stones paving_stones: Paving Stones + # surface=salt + salt: Salt # surface=sand sand: Sand + # surface=sett + sett: Sett + # surface=unhewn_cobblestone + unhewn_cobblestone: Cobblestone (uncut, rounded stones) # surface=unpaved unpaved: Unpaved # surface=wood wood: Wood + # surface=woodchips + woodchips: Woodchips terms: '[translate with synonyms or related terms for ''Surface'', separated by commas]' surveillance: # surveillance=* @@ -3284,6 +3861,17 @@ en: # toilets:position=* label: Positions terms: '[translate with synonyms or related terms for ''Positions'', separated by commas]' + toilets/wheelchair: + # toilets/wheelchair=* + label: Wheelchair Accessible Toilet + options: + # toilets/wheelchair=limited + limited: Limited + # toilets/wheelchair=no + 'no': 'No' + # toilets/wheelchair=yes + 'yes': 'Yes' + terms: '[translate with synonyms or related terms for ''Wheelchair Accessible Toilet'', separated by commas]' toll: # toll=* label: Toll @@ -3439,9 +4027,28 @@ en: tunnel_combo: # tunnel=* label: Type + options: + # tunnel=avalanche_protector + avalanche_protector: Avalanche Protector + # tunnel=building_passage + building_passage: Building Passage + # tunnel=culvert + culvert: Culvert + # tunnel=flooded + flooded: Flooded Tunnel turning_circle: # turning_circle=* label: Shape + two_sided: + # two_sided=* + label: Two-Sided + options: + # two_sided=undefined + undefined: 'No' + # two_sided=yes + 'yes': 'Yes' + # 'terms: double-sided' + terms: '[translate with synonyms or related terms for ''Two-Sided'', separated by commas]' usage_rail: # usage=* label: Usage Type @@ -4147,6 +4754,11 @@ en: name: Burger Fast Food # 'terms: breakfast,dine,dining,dinner,drive-in,eat,grill,lunch,table' terms: + amenity/fast_food/cafeteria: + # amenity=fast_food + fast_food=cafeteria | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). + name: Cafeteria + # 'terms: canteen,dining hall,lunchroom,refectory' + terms: amenity/fast_food/chicken: # amenity=fast_food + cuisine=chicken | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Chicken Fast Food @@ -5437,6 +6049,10 @@ en: name: Farm Building # 'terms: agriculture,auxiliary,auxilary,chicken coop,farm auxiliary,pigsty,sty' terms: + building/fire_station: + # building=fire_station | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). + name: Fire Station Building + terms: building/garage: # building=garage | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Garage @@ -5662,9 +6278,9 @@ en: terms: craft/brewery: # craft=brewery | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). - name: Brewery + name: Craft Brewery # 'terms: alcohol,beer,beverage,bier,booze,cider' - terms: + terms: craft/carpenter: # craft=carpenter | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Carpenter @@ -6195,6 +6811,11 @@ en: highway/bus_stop: # highway=bus_stop | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Bus Stop + highway/busway: + # highway=busway | Transitway, Bus Rapid Transit | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). + name: Busway + # 'terms: brt' + terms: highway/construction: # highway=construction | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Road Under Construction @@ -6381,9 +7002,6 @@ en: terms: highway/motorway_link-US-CA: # highway=motorway_link | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). - name: Motorway Link - # 'terms: exit,ramp,road,street,on ramp,off ramp' - terms: highway/passing_place: # highway=passing_place | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Passing Place @@ -6426,9 +7044,6 @@ en: terms: highway/primary_link-US-CA: # highway=primary_link | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). - name: Primary Link - # 'terms: on ramp,off ramp,ramp,road,street' - terms: highway/raceway: # highway=raceway | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Motorsport Racetrack @@ -6498,6 +7113,9 @@ en: # highway=service + service=parking_aisle | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Parking Aisle terms: + highway/service_area: + # highway=service | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). + name: Paved Service Area highway/services: # highway=services | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Service Area @@ -6549,9 +7167,9 @@ en: # 'terms: license plate camera toll,cashless toll,electronic toll,free-flow toll,toll gantry,transponder toll' terms: highway/track: - # highway=track | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). + # highway=track | Land-Access Road, Track Road | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Track / Land-Access Road - # 'terms: 4wd,4x4,agricultural road,atv,carriage road,double track,farm road,fire road,forest road,four wheel drive,high-clearance,jeep,land access road,logging road,offroad,overgrown,primitive,quad,ranch road,rut,track,track road,two track,unmaintained,woods road' + # 'terms: 4wd,4x4,agricultural road,atv,carriage road,dirt road,double track,farm road,fire road,forest road,forestry road,four wheel drive,haul road,haulage road,high-clearance,jeep,logging road,mining road,offroad,off-road,overgrown,primitive,quad,ranch road,rut,two-track,two track,unmaintained,vehicular trail,woods road' terms: highway/traffic_mirror: # highway=traffic_mirror | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). @@ -6580,9 +7198,6 @@ en: terms: highway/trunk_link-US-CA: # highway=trunk_link | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). - name: Trunk Link - # 'terms: on ramp,off ramp,ramp,road,street' - terms: highway/turning_circle: # highway=turning_circle | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Turning Circle @@ -6835,6 +7450,8 @@ en: name: Industrial Area # 'terms: depot,factory,manufacturing' terms: + landuse/industrial/brewery: + # industrial=brewery | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). landuse/industrial/scrap_yard: # industrial=scrap_yard | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Scrap Yard @@ -7196,6 +7813,11 @@ en: name: American Football Field # 'terms: football,gridiron' terms: + leisure/pitch/american_handball: + # leisure=pitch + sport=american_handball | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). + name: American Handball Court + # 'terms: wallball' + terms: leisure/pitch/archery: # leisure=pitch + sport=archery | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Archery Range @@ -7490,7 +8112,7 @@ en: name: Breakwater terms: man_made/bridge: - # man_made=bridge | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). + # man_made=bridge | Bridge | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Bridge Area terms: man_made/bunker_silo: @@ -7735,6 +8357,11 @@ en: name: Survey Point # 'terms: trig point,trig station,survey marker,geodetic mark,geodetic point,triangulation pillar,trigonometrical station' terms: + man_made/tailings_pond: + # man_made=tailings_pond | Tailing Pond, Settling Pond, Settling Pit | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). + name: Tailings Pond + # 'terms: mining,separation,slurry' + terms: man_made/torii: # man_made=torii | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Torii @@ -7836,6 +8463,11 @@ en: name: Factory # 'terms: assembly,build,brewery,car,plant,plastic,processing,manufacture,refinery' terms: + man_made/works/brewery: + # man_made=works + product=beer | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). + name: Industrial Brewery + # 'terms: alcohol,beer,bier,booze,cider' + terms: man_made/yes: # man_made=yes | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Man-Made Feature (Unspecified Type) @@ -8027,6 +8659,11 @@ en: name: Tree Row # 'terms: tree line' terms: + natural/tree_stump: + # natural=tree_stump | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). + name: Tree Stump + # 'terms: cut tree,removed tree' + terms: natural/valley: # natural=valley | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Valley @@ -8059,6 +8696,11 @@ en: # natural=water + water=moat | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Moat terms: + natural/water/oxbow: + # natural=water + water=oxbow | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). + name: Oxbow Lake + # 'terms: anabranch,billabong,cut off,meander,oxbow,resaca' + terms: natural/water/pond: # natural=water + water=pond | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Pond @@ -8343,6 +8985,11 @@ en: name: Private Investigator Office # 'terms: pi,private eye,private detective' terms: + office/property_management: + # office=property_management | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). + name: Property Management / Leasing Office + # 'terms: property rental' + terms: office/quango: # office=quango | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Quasi-NGO Office @@ -8386,6 +9033,11 @@ en: office/travel_agent: # office=travel_agent | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Travel Agency + office/union: + # office=union | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). + name: Labor Union Office + # 'terms: trade union' + terms: office/water_utility: # office=water_utility | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Water Utility Office @@ -8658,6 +9310,11 @@ en: # power=cable + location=underground | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Underground Power Cable terms: + power/catenary_mast: + # power=catenary_mast | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). + name: Catenary Pole + # 'terms: catenary pylon,catenary mast,overhead line,overhead wire' + terms: power/generator: # power=generator | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Power Generator @@ -8722,6 +9379,11 @@ en: name: Hydroelectric Power Station # 'terms: dam,power plant,run-of-the-river,tidal,water turbine' terms: + power/plant/source/method/photovoltaic: + # power=plant + plant:source=solar + plant:method=photovoltaic | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). + name: Solar Farm + # 'terms: photovoltaic power station,solar panels,solar park,utility-scale solar' + terms: power/plant/source/nuclear: # power=plant + plant:source=nuclear | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Nuclear Power Plant @@ -8734,9 +9396,8 @@ en: terms: power/plant/source/solar: # power=plant + plant:source=solar | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). - name: Solar Farm - # 'terms: photovoltaic power station,solar panels,solar park,utility-scale solar' - terms: + name: Solar Power Plant + terms: power/plant/source/waste: # power=plant + plant:source=waste | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Waste Incineration Power Plant @@ -9226,6 +9887,7 @@ en: shop/bed: # shop=bed | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Bedding/Mattress Store + # 'terms: bed,duvet,mattress,pillow' terms: shop/beverages: # shop=beverages | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). @@ -9335,7 +9997,7 @@ en: shop/clothes: # shop=clothes | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Clothing Store - # 'terms: blouses,boutique,bras,clothes,dresses,fashion,pants,shirts,shorts,skirts,slacks,socks,suits,underwear' + # 'terms: blouses,boutique,bras,clothes,dresses,fashion,outfits,pants,shirts,shorts,skirts,slacks,socks,suits,underwear' terms: shop/clothes/second_hand: # shop=clothes + second_hand=only | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). @@ -9355,7 +10017,7 @@ en: shop/clothes/wedding: # shop=clothes + clothes=wedding | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Wedding Clothes Store - # 'terms: boutique,bridal,bride,bridegroom,bridesmaid,groom,groomsman,tuxedo,wedding dress,wedding gown' + # 'terms: boutique,bridal,bride,bridegroom,bridesmaid,groom,groomsman,marriage outfits,tuxedo,wedding dress,wedding gown' terms: shop/clothes/workwear: # shop=clothes + clothes=workwear | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). diff --git a/package.json b/package.json index 28a7d038..4a760228 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,7 @@ { + "type": "module", "name": "@openstreetmap/id-tagging-schema", - "version": "3.5.1", + "version": "5.0.0-dev", "description": "The OpenStreetMap tagging model used by the iD editor", "homepage": "https://github.com/openstreetmap/id-tagging-schema#readme", "bugs": "https://github.com/openstreetmap/id-tagging-schema/issues", @@ -19,7 +20,7 @@ "translations": "node scripts/translations.js" }, "devDependencies": { - "@ideditor/schema-builder": "~4.0.6", + "@ideditor/schema-builder": "~5.1.1", "prettier": "~2.7.1" } } diff --git a/scripts/build.js b/scripts/build.js index ff710d55..a6d9a238 100644 --- a/scripts/build.js +++ b/scripts/build.js @@ -1,4 +1,3 @@ - -const schemaBuilder = require('@ideditor/schema-builder'); +import schemaBuilder from '@ideditor/schema-builder'; schemaBuilder.buildDev(); diff --git a/scripts/dist.js b/scripts/dist.js index 342e3f72..af5baadf 100644 --- a/scripts/dist.js +++ b/scripts/dist.js @@ -1,4 +1,4 @@ -const schemaBuilder = require('@ideditor/schema-builder'); +import schemaBuilder from '@ideditor/schema-builder'; schemaBuilder.buildDist({ taginfoProjectInfo: { diff --git a/scripts/test.js b/scripts/test.js index 271cdc68..ae2dddf7 100644 --- a/scripts/test.js +++ b/scripts/test.js @@ -1,2 +1,3 @@ -const schemaBuilder = require('@ideditor/schema-builder'); +import schemaBuilder from '@ideditor/schema-builder'; + schemaBuilder.validate();