From c66cc3f143fd6aee60748315b2373d6546d520e2 Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Tue, 9 Jul 2019 09:44:16 -0400 Subject: [PATCH] Add Underground Levels field to building presets (close #6628) --- data/presets.yaml | 5 +++++ data/presets/fields.json | 1 + data/presets/fields/building/levels/underground.json | 7 +++++++ data/presets/presets.json | 2 +- data/presets/presets/building.json | 1 + data/taginfo.json | 1 + dist/locales/en.json | 4 ++++ 7 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 data/presets/fields/building/levels/underground.json diff --git a/data/presets.yaml b/data/presets.yaml index 701764ed9..fb5d67aa0 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -301,6 +301,11 @@ en: building: # building=* label: Building + building/levels/underground: + # 'building:levels:underground=*' + label: Underground Levels + # building/levels/underground field placeholder + placeholder: '2, 4, 6...' building/levels_building: # 'building:levels=*' label: Building Levels diff --git a/data/presets/fields.json b/data/presets/fields.json index e09739782..9cfbceb35 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -49,6 +49,7 @@ "building_area": {"key": "building", "type": "combo", "default": "yes", "geometry": "area", "label": "Building"}, "building": {"key": "building", "type": "combo", "label": "Building"}, "building/levels_building": {"key": "building:levels", "type": "number", "minValue": 0, "label": "Building Levels", "placeholder": "2, 4, 6...", "prerequisiteTag": {"key": "building", "valueNot": "no"}}, + "building/levels/underground": {"key": "building:levels:underground", "type": "number", "minValue": 0, "label": "Underground Levels", "placeholder": "2, 4, 6..."}, "building/material": {"key": "building:material", "type": "combo", "label": "Material"}, "bunker_type": {"key": "bunker_type", "type": "combo", "label": "Type"}, "cables": {"key": "cables", "type": "number", "minValue": 1, "label": "Cables", "placeholder": "1, 2, 3..."}, diff --git a/data/presets/fields/building/levels/underground.json b/data/presets/fields/building/levels/underground.json new file mode 100644 index 000000000..42673fe4d --- /dev/null +++ b/data/presets/fields/building/levels/underground.json @@ -0,0 +1,7 @@ +{ + "key": "building:levels:underground", + "type": "number", + "minValue": 0, + "label": "Underground Levels", + "placeholder": "2, 4, 6..." +} diff --git a/data/presets/presets.json b/data/presets/presets.json index d2f93027d..18bc3bbfd 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -298,7 +298,7 @@ "bridge/support": {"icon": "fas-archway", "fields": ["bridge/support"], "moreFields": ["material", "seamark/type"], "geometry": ["point", "vertex", "area"], "tags": {"bridge:support": "*"}, "name": "Bridge Support"}, "bridge/support/pier": {"icon": "fas-archway", "fields": ["bridge/support"], "moreFields": ["material", "seamark/type"], "geometry": ["point", "vertex", "area"], "tags": {"bridge:support": "pier"}, "name": "Bridge Pier"}, "building_part": {"icon": "maki-building", "fields": ["levels", "height", "building/material", "roof/colour"], "moreFields": ["layer"], "geometry": ["area"], "tags": {"building:part": "*"}, "matchScore": 0.5, "terms": ["roof", "simple 3D buildings"], "name": "Building Part"}, - "building": {"icon": "maki-home", "fields": ["name", "building", "levels", "height", "address"], "moreFields": ["architect", "building/material", "layer", "operator", "roof/colour", "smoking", "wheelchair"], "geometry": ["area"], "tags": {"building": "*"}, "matchScore": 0.6, "terms": [], "name": "Building"}, + "building": {"icon": "maki-home", "fields": ["name", "building", "levels", "height", "address"], "moreFields": ["architect", "building/levels/underground", "building/material", "layer", "operator", "roof/colour", "smoking", "wheelchair"], "geometry": ["area"], "tags": {"building": "*"}, "matchScore": 0.6, "terms": [], "name": "Building"}, "building/bunker": {"geometry": ["area"], "tags": {"building": "bunker"}, "matchScore": 0.5, "name": "Bunker", "searchable": false}, "building/entrance": {"icon": "maki-entrance-alt1", "fields": [], "moreFields": [], "geometry": ["vertex"], "tags": {"building": "entrance"}, "name": "Entrance/Exit", "searchable": false}, "building/train_station": {"icon": "maki-building", "geometry": ["point", "vertex", "area"], "tags": {"building": "train_station"}, "matchScore": 0.5, "name": "Train Station Building", "searchable": false}, diff --git a/data/presets/presets/building.json b/data/presets/presets/building.json index b70b73298..3566947ef 100644 --- a/data/presets/presets/building.json +++ b/data/presets/presets/building.json @@ -9,6 +9,7 @@ ], "moreFields": [ "architect", + "building/levels/underground", "building/material", "layer", "operator", diff --git a/data/taginfo.json b/data/taginfo.json index a00320ae6..540b54155 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -1260,6 +1260,7 @@ {"key": "brewery", "description": "🄵 Draft Beers"}, {"key": "bridge", "description": "🄵 Type, 🄵 Structure"}, {"key": "building:levels", "description": "🄵 Building Levels, 🄵 Levels"}, + {"key": "building:levels:underground", "description": "🄵 Underground Levels"}, {"key": "building:material", "description": "🄵 Material"}, {"key": "bunker_type", "description": "🄵 Type"}, {"key": "cables", "description": "🄵 Cables"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index d048b5d71..de112f5e3 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -2669,6 +2669,10 @@ "label": "Building Levels", "placeholder": "2, 4, 6..." }, + "building/levels/underground": { + "label": "Underground Levels", + "placeholder": "2, 4, 6..." + }, "building/material": { "label": "Material" },