diff --git a/CHANGELOG.md b/CHANGELOG.md index 9d2774ae6..b235a73b7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -154,7 +154,7 @@ _Breaking changes, which may affect downstream projects or sites that embed iD, * Add Loading Dock preset ([#6849]) * Add Utility Pole preset ([#6848]) * Add Karting Racetrack and Motocross Racetrack presets ([#6826]) -* Add presets: Spaceport, Hot Dog Fast Food, Recording Studio, Film Studio, Radio Station, Television Station, Truck Scale +* Add presets: Spaceport, Hot Dog Fast Food, Recording Studio, Film Studio, Radio Station, Television Station, Truck Scale, City Hall * Add Type and Material fields to the Stile preset ([#6857], thanks [@ewnh]) * Add Waste field to relevant presets ([#6821]) * Add Hours field to the Recycling Container preset ([#6861]) diff --git a/data/deprecated.json b/data/deprecated.json index 150120deb..1a17d8c00 100644 --- a/data/deprecated.json +++ b/data/deprecated.json @@ -1029,6 +1029,10 @@ "old": {"tower:type": "suspension"}, "replace": {"line_attachment": "suspension"} }, + { + "old": {"townhall:village": "yes"}, + "replace": {"amenity": "townhall", "townhall:type": "village"} + }, { "old": {"type": "broad_leaved"}, "replace": {"leaf_type": "broadleaved"} diff --git a/data/presets.yaml b/data/presets.yaml index b1cc9bcf8..81aa076ee 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -2323,6 +2323,9 @@ en: tower/type: # 'tower:type=*' label: Type + townhall/type: + # 'townhall:type=*' + label: Type tracktype: # tracktype=* label: Track Type @@ -3586,6 +3589,11 @@ en: name: Town Hall # 'terms: village,city,government,courthouse,municipal' terms: '' + amenity/townhall/city: + # 'amenity=townhall, townhall:type=city' + name: City Hall + # 'terms: council,courthouse,government,mayor,municipality' + terms: '' amenity/toy_library: # amenity=toy_library name: Toy Library diff --git a/data/presets/fields.json b/data/presets/fields.json index 0609662da..f308d08af 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -397,6 +397,7 @@ "tourism": {"key": "tourism", "type": "typeCombo", "label": "Type"}, "tower/construction": {"key": "tower:construction", "type": "combo", "label": "Construction", "placeholder": "Guyed, Lattice, Concealed, ..."}, "tower/type": {"key": "tower:type", "type": "combo", "label": "Type"}, + "townhall/type": {"key": "townhall:type", "type": "combo", "label": "Type"}, "tracktype": {"key": "tracktype", "type": "combo", "label": "Track Type", "placeholder": "Solid, Mostly Solid, Soft...", "strings": {"options": {"grade1": "Solid: paved or heavily compacted hardcore surface", "grade2": "Mostly Solid: gravel/rock with some soft material mixed in", "grade3": "Even mixture of hard and soft materials", "grade4": "Mostly Soft: soil/sand/grass with some hard material mixed in", "grade5": "Soft: soil/sand/grass"}}}, "trade": {"key": "trade", "type": "typeCombo", "label": "Type"}, "traffic_calming": {"key": "traffic_calming", "type": "typeCombo", "label": "Type"}, diff --git a/data/presets/fields/townhall/type.json b/data/presets/fields/townhall/type.json new file mode 100644 index 000000000..ec2235c36 --- /dev/null +++ b/data/presets/fields/townhall/type.json @@ -0,0 +1,5 @@ +{ + "key": "townhall:type", + "type": "combo", + "label": "Type" +} diff --git a/data/presets/presets.json b/data/presets/presets.json index 1a08853c4..73ffa03cb 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -233,7 +233,8 @@ "amenity/toilets": {"icon": "maki-toilet", "fields": ["toilets/disposal", "access_simple", "gender", "changing_table", "wheelchair", "building_area"], "moreFields": ["charge_fee", "fee", "level", "opening_hours", "operator", "payment_multi_fee", "toilets/handwashing", "toilets/position"], "geometry": ["point", "vertex", "area"], "terms": ["bathroom", "restroom", "outhouse", "privy", "head", "lavatory", "latrine", "water closet", "WC", "W.C."], "tags": {"amenity": "toilets"}, "name": "Toilets"}, "amenity/toilets/disposal/flush": {"icon": "fas-toilet", "fields": ["toilets/disposal", "{amenity/toilets}"], "moreFields": ["{amenity/toilets}"], "geometry": ["point", "vertex", "area"], "terms": ["bathroom", "head", "lavatory", "privy", "restroom", "water closet", "WC", "W.C."], "tags": {"amenity": "toilets", "toilets:disposal": "flush"}, "reference": {"key": "toilets:disposal", "value": "flush"}, "name": "Flush Toilets"}, "amenity/toilets/disposal/pitlatrine": {"icon": "tnp-2009541", "fields": ["toilets/disposal", "{amenity/toilets}", "toilets/handwashing"], "moreFields": ["{amenity/toilets}"], "geometry": ["point", "vertex", "area"], "terms": ["head", "lavatory", "long drop", "outhouse", "pit toilet", "privy"], "tags": {"amenity": "toilets", "toilets:disposal": "pitlatrine"}, "reference": {"key": "toilets:disposal", "value": "pitlatrine"}, "name": "Pit Latrine"}, - "amenity/townhall": {"icon": "maki-town-hall", "fields": ["name", "operator", "address", "building_area"], "moreFields": ["email", "fax", "phone", "polling_station", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["village", "city", "government", "courthouse", "municipal"], "tags": {"amenity": "townhall"}, "name": "Town Hall"}, + "amenity/townhall": {"icon": "maki-town-hall", "fields": ["name", "operator", "townhall/type", "address", "building_area"], "moreFields": ["email", "fax", "phone", "polling_station", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["village", "city", "government", "courthouse", "municipal"], "tags": {"amenity": "townhall"}, "name": "Town Hall"}, + "amenity/townhall/city": {"icon": "maki-town-hall", "geometry": ["point", "area"], "terms": ["council", "courthouse", "government", "mayor", "municipality"], "tags": {"amenity": "townhall", "townhall:type": "city"}, "name": "City Hall"}, "amenity/toy_library": {"icon": "fas-chess-knight", "fields": ["operator", "address", "building_area", "opening_hours"], "moreFields": ["level", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["game", "toy"], "tags": {"amenity": "toy_library"}, "name": "Toy Library"}, "amenity/university": {"icon": "maki-college", "fields": ["{amenity/college}"], "moreFields": ["{amenity/college}"], "geometry": ["point", "area"], "terms": ["college", "graduate school", "PhD program", "master's degree program"], "tags": {"amenity": "university"}, "name": "University Grounds"}, "amenity/vehicle_inspection": {"icon": "maki-car", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["email", "fax", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["car inspection"], "tags": {"amenity": "vehicle_inspection"}, "name": "Vehicle Inspection"}, diff --git a/data/presets/presets/amenity/townhall.json b/data/presets/presets/amenity/townhall.json index 8cb522d09..f42066d1f 100644 --- a/data/presets/presets/amenity/townhall.json +++ b/data/presets/presets/amenity/townhall.json @@ -3,6 +3,7 @@ "fields": [ "name", "operator", + "townhall/type", "address", "building_area" ], diff --git a/data/presets/presets/amenity/townhall/city.json b/data/presets/presets/amenity/townhall/city.json new file mode 100644 index 000000000..9fee4907e --- /dev/null +++ b/data/presets/presets/amenity/townhall/city.json @@ -0,0 +1,19 @@ +{ + "icon": "maki-town-hall", + "geometry": [ + "point", + "area" + ], + "terms": [ + "council", + "courthouse", + "government", + "mayor", + "municipality" + ], + "tags": { + "amenity": "townhall", + "townhall:type": "city" + }, + "name": "City Hall" +} diff --git a/data/taginfo.json b/data/taginfo.json index 0e37e4445..0921448be 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -231,6 +231,7 @@ {"key": "toilets:disposal", "value": "flush", "description": "🄿 Flush Toilets, 🄵 Disposal", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-toilet.svg"}, {"key": "toilets:disposal", "value": "pitlatrine", "description": "🄿 Pit Latrine, 🄵 Disposal", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/the-noun-project/2009541.svg"}, {"key": "amenity", "value": "townhall", "description": "🄿 Town Hall", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/town-hall-15.svg"}, + {"key": "townhall:type", "value": "city", "description": "🄿 City Hall", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/town-hall-15.svg"}, {"key": "amenity", "value": "toy_library", "description": "🄿 Toy Library", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-chess-knight.svg"}, {"key": "amenity", "value": "university", "description": "🄿 University Grounds", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/college-15.svg"}, {"key": "amenity", "value": "vehicle_inspection", "description": "🄿 Vehicle Inspection", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/car-15.svg"}, @@ -1781,6 +1782,7 @@ {"key": "tomb", "description": "🄵 Type"}, {"key": "tower:construction", "description": "🄵 Construction"}, {"key": "tower:type", "description": "🄵 Type"}, + {"key": "townhall:type", "description": "🄵 Type"}, {"key": "tracktype", "value": "grade1", "description": "🄵 Track Type"}, {"key": "tracktype", "value": "grade2", "description": "🄵 Track Type"}, {"key": "tracktype", "value": "grade3", "description": "🄵 Track Type"}, @@ -2081,6 +2083,7 @@ {"key": "tower:type", "value": "power", "description": "🄳 ➜ power=tower"}, {"key": "tower:type", "value": "anchor", "description": "🄳 ➜ line_attachment=anchor"}, {"key": "tower:type", "value": "suspension", "description": "🄳 ➜ line_attachment=suspension"}, + {"key": "townhall:village", "value": "yes", "description": "🄳 ➜ amenity=townhall + townhall:type=village"}, {"key": "type", "value": "broad_leaved", "description": "🄳 ➜ leaf_type=broadleaved"}, {"key": "type", "value": "conifer", "description": "🄳 ➜ leaf_type=needleleaved"}, {"key": "type", "value": "deciduous", "description": "🄳 ➜ leaf_cycle=deciduous"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index d49ea0214..740fe2640 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -4692,6 +4692,10 @@ "label": "Type", "terms": "" }, + "townhall/type": { + "label": "Type", + "terms": "" + }, "tracktype": { "label": "Track Type", "terms": "", @@ -5867,6 +5871,10 @@ "name": "Town Hall", "terms": "village,city,government,courthouse,municipal" }, + "amenity/townhall/city": { + "name": "City Hall", + "terms": "council,courthouse,government,mayor,municipality" + }, "amenity/toy_library": { "name": "Toy Library", "terms": "game,toy"