diff --git a/data/presets.yaml b/data/presets.yaml index 12136725c..3dec76f76 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -2508,6 +2508,9 @@ en: # usage=tourism tourism: Tourism terms: '[translate with synonyms or related terms for ''Usage Type'', separated by commas]' + utility: + # utility=* + label: Utility utility_semi: # utility=* label: Utilities diff --git a/data/presets/fields.json b/data/presets/fields.json index 4135bb48f..71a71cdef 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -430,6 +430,7 @@ "tunnel": {"key": "tunnel", "type": "typeCombo", "label": "Type", "placeholder": "Default"}, "usage_rail": {"key": "usage", "type": "combo", "label": "Usage Type", "strings": {"options": {"main": "Main", "branch": "Branch", "industrial": "Industrial", "military": "Military", "test": "Test", "tourism": "Tourism"}}}, "utility_semi": {"key": "utility", "type": "semiCombo", "label": "Utilities"}, + "utility": {"key": "utility", "type": "typeCombo", "label": "Utility"}, "valve": {"key": "valve", "type": "combo", "label": "Type"}, "vending": {"key": "vending", "type": "semiCombo", "label": "Types of Goods"}, "video_calls": {"key": "video", "type": "check", "label": "Video Calls"}, diff --git a/data/presets/fields/utility.json b/data/presets/fields/utility.json new file mode 100644 index 000000000..e25242487 --- /dev/null +++ b/data/presets/fields/utility.json @@ -0,0 +1,5 @@ +{ + "key": "utility", + "type": "typeCombo", + "label": "Utility" +} diff --git a/data/presets/presets.json b/data/presets/presets.json index c9d52bf44..fd50547da 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -782,8 +782,8 @@ "man_made/watermill": {"icon": "maki-watermill", "fields": ["building_area"], "moreFields": ["gnis/feature_id"], "geometry": ["point", "area"], "terms": ["water", "wheel", "mill"], "tags": {"man_made": "watermill"}, "name": "Watermill"}, "man_made/windmill": {"icon": "maki-windmill", "fields": ["building_area"], "moreFields": ["gnis/feature_id"], "geometry": ["point", "area"], "terms": ["wind", "wheel", "mill"], "tags": {"man_made": "windmill"}, "name": "Windmill"}, "man_made/works": {"icon": "maki-industry", "fields": ["name", "operator", "address", "building_area", "product"], "moreFields": ["email", "fax", "gnis/feature_id", "phone", "website"], "geometry": ["point", "area"], "terms": ["assembly", "build", "brewery", "car", "plant", "plastic", "processing", "manufacture", "refinery"], "tags": {"man_made": "works"}, "name": "Factory"}, - "marker": {"icon": "temaki-silo", "fields": ["ref", "operator", "marker", "utility_semi", "inscription", "colour"], "moreFields": ["height", "location", "manufacturer", "material"], "geometry": ["point"], "terms": ["identifier", "marking", "plate", "pole", "post", "sign"], "tags": {"marker": "*"}, "name": "Marker"}, - "marker/utility": {"icon": "temaki-silo", "fields": ["ref", "operator", "marker", "{marker}"], "geometry": ["point"], "terms": ["gas line marker", "identifier", "marking", "oil marker", "pipline marker", "plate", "pole", "post", "sign"], "tags": {"marker": "*", "utility": "*"}, "name": "Utility Marker"}, + "marker": {"icon": "temaki-silo", "fields": ["ref", "operator", "marker", "utility", "inscription", "colour"], "moreFields": ["height", "location", "manufacturer", "material"], "geometry": ["point"], "terms": ["identifier", "marking", "plate", "pole", "post", "sign"], "tags": {"marker": "*"}, "name": "Marker"}, + "marker/utility": {"icon": "temaki-silo", "fields": ["ref", "operator", "marker", "utility", "{marker}"], "geometry": ["point"], "terms": ["gas line marker", "identifier", "marking", "oil marker", "pipline marker", "plate", "pole", "post", "sign"], "tags": {"marker": "*", "utility": "*"}, "name": "Utility Marker"}, "marker/utility/power": {"icon": "temaki-silo", "fields": ["ref", "operator", "marker", "{marker}"], "geometry": ["point"], "terms": ["electric line", "identifier", "marking", "plate", "pole", "post", "power cable", "power line", "sign"], "tags": {"marker": "*", "utility": "power"}, "name": "Power Marker"}, "military/bunker": {"icon": "temaki-bunker", "fields": ["name", "bunker_type", "building_area"], "moreFields": ["gnis/feature_id"], "geometry": ["point", "area"], "tags": {"military": "bunker"}, "addTags": {"building": "bunker", "military": "bunker"}, "terms": ["air force", "army", "base", "fight", "force", "guard", "marine", "navy", "troop", "war"], "name": "Military Bunker"}, "military/checkpoint": {"icon": "maki-barrier", "fields": ["name"], "geometry": ["point", "vertex", "area"], "tags": {"military": "checkpoint"}, "terms": ["air force", "army", "base", "force", "guard", "marine", "navy", "troop", "war"], "name": "Checkpoint"}, diff --git a/data/presets/presets/marker.json b/data/presets/presets/marker.json index e6a12d911..2f96d78b1 100644 --- a/data/presets/presets/marker.json +++ b/data/presets/presets/marker.json @@ -4,7 +4,7 @@ "ref", "operator", "marker", - "utility_semi", + "utility", "inscription", "colour" ], diff --git a/data/presets/presets/marker/utility.json b/data/presets/presets/marker/utility.json index 2b800a547..04c44f699 100644 --- a/data/presets/presets/marker/utility.json +++ b/data/presets/presets/marker/utility.json @@ -4,6 +4,7 @@ "ref", "operator", "marker", + "utility", "{marker}" ], "geometry": [ diff --git a/data/taginfo.json b/data/taginfo.json index 53ad76ad5..9ea2656aa 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -758,7 +758,7 @@ {"key": "man_made", "value": "windmill", "description": "🄿 Windmill", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/windmill-15.svg"}, {"key": "man_made", "value": "works", "description": "🄿 Factory", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/industry-15.svg"}, {"key": "marker", "description": "🄿 Marker, 🄵 Type", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/silo.svg"}, - {"key": "utility", "description": "🄿 Utility Marker, 🄵 Utilities", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/silo.svg"}, + {"key": "utility", "description": "🄿 Utility Marker, 🄵 Utilities, 🄵 Utility", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/silo.svg"}, {"key": "utility", "value": "power", "description": "🄿 Power Marker", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/silo.svg"}, {"key": "military", "value": "bunker", "description": "🄿 Military Bunker", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/bunker.svg"}, {"key": "military", "value": "checkpoint", "description": "🄿 Checkpoint", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/barrier-15.svg"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index 1a5434b96..b1988bfe5 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -4675,6 +4675,9 @@ "utility_semi": { "label": "Utilities" }, + "utility": { + "label": "Utility" + }, "valve": { "label": "Type" },