From 192beec27535174865b4fd016b1291e2127e619a Mon Sep 17 00:00:00 2001 From: hikemaniac <31667811+hikemaniac@users.noreply.github.com> Date: Tue, 27 Mar 2018 19:32:45 +0200 Subject: [PATCH 1/2] Added type of industry field. --- data/presets.yaml | 3 +++ data/presets/fields.json | 5 +++++ data/presets/fields/industrial.json | 5 +++++ data/presets/presets.json | 3 ++- data/presets/presets/landuse/industrial.json | 3 ++- dist/locales/en.json | 3 +++ 6 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 data/presets/fields/industrial.json diff --git a/data/presets.yaml b/data/presets.yaml index 273f7fbd0..ee5905589 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -686,6 +686,9 @@ en: indoor: # indoor=* label: Indoor + industrial: + # industrial=* + label: Type information: # information=* label: Type diff --git a/data/presets/fields.json b/data/presets/fields.json index 6b9369f03..5e9ab9b3a 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -951,6 +951,11 @@ "type": "check", "label": "Indoor" }, + "indoor": { + "key": "industrial", + "type": "combo", + "label": "Type" + }, "information": { "key": "information", "type": "typeCombo", diff --git a/data/presets/fields/industrial.json b/data/presets/fields/industrial.json new file mode 100644 index 000000000..e0878a022 --- /dev/null +++ b/data/presets/fields/industrial.json @@ -0,0 +1,5 @@ +{ + "key": "industrial", + "type": "combo", + "label": "Type" +} \ No newline at end of file diff --git a/data/presets/presets.json b/data/presets/presets.json index 1c7ba99ae..4d4e84bc0 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -8588,7 +8588,8 @@ "landuse/industrial": { "icon": "industry", "fields": [ - "name" + "name", + "industrial" ], "geometry": [ "area" diff --git a/data/presets/presets/landuse/industrial.json b/data/presets/presets/landuse/industrial.json index d0c2cf94c..7ac859226 100644 --- a/data/presets/presets/landuse/industrial.json +++ b/data/presets/presets/landuse/industrial.json @@ -1,7 +1,8 @@ { "icon": "industry", "fields": [ - "name" + "name", + "industrial" ], "geometry": [ "area" diff --git a/dist/locales/en.json b/dist/locales/en.json index ca16b9f29..e5893a500 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -1944,6 +1944,9 @@ "indoor": { "label": "Indoor" }, + "industrial": { + "label": "Type" + }, "information": { "label": "Type" }, From 79c37cf07bc73cd511d9a94a3a96e8af0f89c626 Mon Sep 17 00:00:00 2001 From: hikemaniac <31667811+hikemaniac@users.noreply.github.com> Date: Tue, 27 Mar 2018 19:58:54 +0200 Subject: [PATCH 2/2] Fixed a typo. --- data/presets/fields.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/presets/fields.json b/data/presets/fields.json index 5e9ab9b3a..3c95bb242 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -951,7 +951,7 @@ "type": "check", "label": "Indoor" }, - "indoor": { + "industrial": { "key": "industrial", "type": "combo", "label": "Type"