diff --git a/data/presets.yaml b/data/presets.yaml index 37667052d..8635ff40f 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -441,6 +441,11 @@ en: label: Total Spaces # capacity_parking field placeholder placeholder: '10, 20, 30...' + capacity_volume: + # capacity=* + label: Capacity (Cubic Meters) + # capacity_volume field placeholder + placeholder: '50, 100, 200...' cash_in: # cash_in=* label: Cash In diff --git a/data/presets/fields.json b/data/presets/fields.json index 188995882..a48595690 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -68,6 +68,7 @@ "camera/mount": {"key": "camera:mount", "type": "combo", "label": "Camera Mount"}, "camera/type": {"key": "camera:type", "type": "combo", "label": "Camera Type", "strings": {"options": {"fixed": "Fixed", "panning": "Panning", "dome": "Dome"}}}, "capacity_parking": {"key": "capacity", "type": "number", "minValue": 0, "label": "Total Spaces", "placeholder": "10, 20, 30..."}, + "capacity_volume": {"key": "capacity", "type": "number", "minValue": 0, "label": "Capacity (Cubic Meters)", "placeholder": "50, 100, 200..."}, "capacity": {"key": "capacity", "type": "number", "minValue": 0, "label": "Capacity", "placeholder": "50, 100, 200..."}, "capacity/disabled_parking": {"key": "capacity:disabled", "type": "number", "minValue": 0, "label": "Accessible Spaces", "placeholder": "1, 2, 3..."}, "cash_in": {"key": "cash_in", "type": "check", "label": "Cash In"}, diff --git a/data/presets/fields/capacity_volume.json b/data/presets/fields/capacity_volume.json new file mode 100644 index 000000000..c3603de5b --- /dev/null +++ b/data/presets/fields/capacity_volume.json @@ -0,0 +1,7 @@ +{ + "key": "capacity", + "type": "number", + "minValue": 0, + "label": "Capacity (Cubic Meters)", + "placeholder": "50, 100, 200..." +} \ No newline at end of file diff --git a/data/presets/presets.json b/data/presets/presets.json index ee36bf385..01463abb9 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -798,7 +798,7 @@ "man_made/pumping_station": {"icon": "temaki-powered_pump", "geometry": ["point", "area"], "moreFields": ["gnis/feature_id"], "tags": {"man_made": "pumping_station"}, "name": "Pumping Station"}, "man_made/reservoir_covered": {"icon": "maki-water", "fields": ["name", "operator", "capacity", "access_simple", "location", "layer"], "moreFields": ["ref"], "geometry": ["area", "point"], "tags": {"man_made": "reservoir_covered"}, "terms": ["underground reservoir", "water tank"], "name": "Covered Reservoir"}, "man_made/silo": {"icon": "temaki-silo", "fields": ["crop", "building_area"], "moreFields": ["gnis/feature_id"], "geometry": ["point", "area"], "terms": ["grain", "corn", "wheat"], "tags": {"man_made": "silo"}, "name": "Silo"}, - "man_made/storage_tank": {"icon": "temaki-storage_tank", "fields": ["content", "operator", "material", "building_area", "height", "capacity"], "moreFields": ["layer", "location", "manufacturer"], "geometry": ["area", "point"], "terms": ["water", "oil", "gas", "petrol"], "tags": {"man_made": "storage_tank"}, "name": "Storage Tank"}, + "man_made/storage_tank": {"icon": "temaki-storage_tank", "fields": ["content", "operator", "material", "building_area", "height", "capacity_volume"], "moreFields": ["layer", "location", "manufacturer"], "geometry": ["area", "point"], "terms": ["water", "oil", "gas", "petrol"], "tags": {"man_made": "storage_tank"}, "name": "Storage Tank"}, "man_made/storage_tank/water": {"icon": "temaki-storage_tank", "geometry": ["point", "area"], "terms": ["cistern", "water tower"], "tags": {"man_made": "storage_tank", "content": "water"}, "name": "Water Tank"}, "man_made/street_cabinet": {"icon": "fas-door-closed", "geometry": ["point", "area"], "fields": ["ref", "operator", "street_cabinet", "utility_semi", "height", "colour"], "terms": ["cable tv", "monitoring box", "technical box", "telecommunications", "traffic signal controls"], "tags": {"man_made": "street_cabinet"}, "name": "Street Cabinet"}, "man_made/surveillance": {"icon": "temaki-security_camera", "geometry": ["point", "vertex"], "fields": ["surveillance", "surveillance/type", "surveillance/zone", "direction"], "terms": ["anpr", "alpr", "camera", "car plate recognition", "cctv", "guard", "license plate recognition", "monitoring", "number plate recognition", "security", "video", "webcam"], "tags": {"man_made": "surveillance"}, "name": "Surveillance"}, diff --git a/data/presets/presets/man_made/storage_tank.json b/data/presets/presets/man_made/storage_tank.json index 3979df374..2458e6412 100644 --- a/data/presets/presets/man_made/storage_tank.json +++ b/data/presets/presets/man_made/storage_tank.json @@ -6,7 +6,7 @@ "material", "building_area", "height", - "capacity" + "capacity_volume" ], "moreFields": [ "layer", diff --git a/data/taginfo.json b/data/taginfo.json index a04f21ce7..4923f4fa8 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -1419,7 +1419,7 @@ {"key": "camera:type", "value": "fixed", "description": "🄵 Camera Type"}, {"key": "camera:type", "value": "panning", "description": "🄵 Camera Type"}, {"key": "camera:type", "value": "dome", "description": "🄵 Camera Type"}, - {"key": "capacity", "description": "🄵 Total Spaces, 🄵 Capacity"}, + {"key": "capacity", "description": "🄵 Total Spaces, 🄵 Capacity (Cubic Meters), 🄵 Capacity"}, {"key": "capacity:disabled", "description": "🄵 Accessible Spaces"}, {"key": "cash_in", "description": "🄵 Cash In"}, {"key": "castle_type", "description": "🄵 Type"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index 7c9535d70..186713269 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -3268,6 +3268,10 @@ "label": "Total Spaces", "placeholder": "10, 20, 30..." }, + "capacity_volume": { + "label": "Capacity (Cubic Meters)", + "placeholder": "50, 100, 200..." + }, "capacity": { "label": "Capacity", "terms": "",