From 13b135c7d162690603cf9401b016dbbdced1880d Mon Sep 17 00:00:00 2001 From: Samu__ Date: Sun, 5 Mar 2023 10:58:36 +0100 Subject: [PATCH 01/14] Add emergency=fire_service_inlet --- .../presets/emergency/fire_service_inlet.json | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 data/presets/emergency/fire_service_inlet.json diff --git a/data/presets/emergency/fire_service_inlet.json b/data/presets/emergency/fire_service_inlet.json new file mode 100644 index 000000000..4e97139e1 --- /dev/null +++ b/data/presets/emergency/fire_service_inlet.json @@ -0,0 +1,22 @@ +{ + "icon": "temaki-fire_hydrant", + "fields": [ + "fire_mains" + ], + "moreFields": [ + "level", + "survey/date" + ], + "geometry": [ + "point", + "vertex" + ], + "terms": [ + "Building Hydrant Inlet", + "Fire Service Inlet" + ], + "tags": { + "emergency": "fire_service_inlet" + }, + "name": "Fire Department Connection" +} \ No newline at end of file From fbc1f06368946830d3dca745216ee1c96587b904 Mon Sep 17 00:00:00 2001 From: tiptoptom <73886169+tiptoptom@users.noreply.github.com> Date: Mon, 6 Mar 2023 19:26:33 +0100 Subject: [PATCH 02/14] lower case and add a few more entries Co-authored-by: Martin Raifer --- data/presets/emergency/fire_service_inlet.json | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/data/presets/emergency/fire_service_inlet.json b/data/presets/emergency/fire_service_inlet.json index 4e97139e1..5164da594 100644 --- a/data/presets/emergency/fire_service_inlet.json +++ b/data/presets/emergency/fire_service_inlet.json @@ -12,8 +12,15 @@ "vertex" ], "terms": [ - "Building Hydrant Inlet", - "Fire Service Inlet" + "building hydrant inlet", + "charged riser", + "dry riser inlet", + "dry standpipe", + "fdc", + "fire service inlet", + "fire sprinkler inlet", + "riser inlet", + "wet riser inlet" ], "tags": { "emergency": "fire_service_inlet" From bf6059e974070422ed0655d14f56804f2d5a1bb8 Mon Sep 17 00:00:00 2001 From: Samu__ Date: Mon, 6 Mar 2023 21:53:41 +0100 Subject: [PATCH 03/14] Added additional tags. --- data/presets/emergency/fire_service_inlet.json | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/data/presets/emergency/fire_service_inlet.json b/data/presets/emergency/fire_service_inlet.json index 5164da594..679b87dfb 100644 --- a/data/presets/emergency/fire_service_inlet.json +++ b/data/presets/emergency/fire_service_inlet.json @@ -1,11 +1,13 @@ { "icon": "temaki-fire_hydrant", "fields": [ - "fire_mains" + "fire_mains", + "couplings" ], "moreFields": [ "level", - "survey/date" + "survey/date", + "fire_sprinkler" ], "geometry": [ "point", @@ -26,4 +28,4 @@ "emergency": "fire_service_inlet" }, "name": "Fire Department Connection" -} \ No newline at end of file +} From 93914fe5ee86961458cfcaa958eb73da4d303925 Mon Sep 17 00:00:00 2001 From: Samu__ Date: Mon, 6 Mar 2023 22:10:58 +0100 Subject: [PATCH 04/14] Add fields for fire_mains and fire_sprinkler --- data/fields/fire_mains.json | 15 +++++++++++++++ data/fields/fire_sprinkler.json | 16 ++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 data/fields/fire_mains.json create mode 100644 data/fields/fire_sprinkler.json diff --git a/data/fields/fire_mains.json b/data/fields/fire_mains.json new file mode 100644 index 000000000..4161d7413 --- /dev/null +++ b/data/fields/fire_mains.json @@ -0,0 +1,15 @@ +{ + "key": "fire_mains", + "type": "combo", + "label": "Type", + "strings": { + "options": { + "dry": "Dry Riser Inlet", + "wet": "Charged Riser", + "yes": "yes", + "no": "no" + } + }, + "autoSuggestions": false, + "customValues": false +} diff --git a/data/fields/fire_sprinkler.json b/data/fields/fire_sprinkler.json new file mode 100644 index 000000000..56eff258f --- /dev/null +++ b/data/fields/fire_sprinkler.json @@ -0,0 +1,16 @@ +{ + "key": "fire_sprinkler", + "type": "combo", + "label": "Fire Sprinkler Inlet", + "strings": { + "options": { + "dry": "dry", + "wet": "wet", + "pre-action": "pre-action", + "yes": "yes", + "no": "no" + } + }, + "autoSuggestions": false, + "customValues": false +} From 2eaf4f8fe197b8f61711f4c8a1b6b7e6e8dffc6a Mon Sep 17 00:00:00 2001 From: Samu__ Date: Mon, 6 Mar 2023 22:16:15 +0100 Subject: [PATCH 05/14] Add fire_service_inlet --- data/fields/fire_service_inlet.json | 15 +++++++++++++++ data/presets/emergency/fire_service_inlet.json | 1 + 2 files changed, 16 insertions(+) create mode 100644 data/fields/fire_service_inlet.json diff --git a/data/fields/fire_service_inlet.json b/data/fields/fire_service_inlet.json new file mode 100644 index 000000000..d639f5431 --- /dev/null +++ b/data/fields/fire_service_inlet.json @@ -0,0 +1,15 @@ +{ + "key": "fire_service_inlet", + "type": "combo", + "label": "Shape", + "strings": { + "options": { + "pillar": "Pillar/Aboveground", + "underground": "Underground", + "wall": "Wall", + "pipe": "Capped Pipe" + } + }, + "autoSuggestions": false, + "customValues": false +} diff --git a/data/presets/emergency/fire_service_inlet.json b/data/presets/emergency/fire_service_inlet.json index 679b87dfb..547245529 100644 --- a/data/presets/emergency/fire_service_inlet.json +++ b/data/presets/emergency/fire_service_inlet.json @@ -2,6 +2,7 @@ "icon": "temaki-fire_hydrant", "fields": [ "fire_mains", + "fire_service_inlet", "couplings" ], "moreFields": [ From 133493ad1e58b4c3e75d970971d760d19fccbfed Mon Sep 17 00:00:00 2001 From: tiptoptom <73886169+tiptoptom@users.noreply.github.com> Date: Tue, 7 Mar 2023 22:52:37 +0100 Subject: [PATCH 06/14] Update data/fields/fire_mains.json Co-authored-by: Martin Raifer --- data/fields/fire_mains.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/data/fields/fire_mains.json b/data/fields/fire_mains.json index 4161d7413..1429f75eb 100644 --- a/data/fields/fire_mains.json +++ b/data/fields/fire_mains.json @@ -4,10 +4,10 @@ "label": "Type", "strings": { "options": { - "dry": "Dry Riser Inlet", - "wet": "Charged Riser", - "yes": "yes", - "no": "no" + "dry": "Dedicated Network (Normally Dry)", + "wet": "Connected to Mains (Permanently Filled)", + "yes": "Unknown Type", + "no": "No" } }, "autoSuggestions": false, From 9087d64feac80e5ec35a9e0045c13654b5e1f73c Mon Sep 17 00:00:00 2001 From: tiptoptom <73886169+tiptoptom@users.noreply.github.com> Date: Tue, 7 Mar 2023 22:53:59 +0100 Subject: [PATCH 07/14] Update data/fields/fire_sprinkler.json Co-authored-by: Martin Raifer --- data/fields/fire_sprinkler.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/data/fields/fire_sprinkler.json b/data/fields/fire_sprinkler.json index 56eff258f..9d03ebab9 100644 --- a/data/fields/fire_sprinkler.json +++ b/data/fields/fire_sprinkler.json @@ -4,11 +4,11 @@ "label": "Fire Sprinkler Inlet", "strings": { "options": { - "dry": "dry", - "wet": "wet", - "pre-action": "pre-action", - "yes": "yes", - "no": "no" + "dry": "Dedicated Network (Normally Dry)", + "wet": "Connected to Mains (Permanently Filled)", + "pre-action": "Connected to Mains (Pre-Action System)", + "yes": "Unknown Type + "no": "No" } }, "autoSuggestions": false, From 7d37a02845e2ee062b0f2ec19b9d2c95761c7c87 Mon Sep 17 00:00:00 2001 From: tiptoptom <73886169+tiptoptom@users.noreply.github.com> Date: Tue, 7 Mar 2023 22:54:49 +0100 Subject: [PATCH 08/14] Update data/presets/emergency/fire_service_inlet.json Co-authored-by: Martin Raifer --- data/presets/emergency/fire_service_inlet.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/data/presets/emergency/fire_service_inlet.json b/data/presets/emergency/fire_service_inlet.json index 547245529..e63b44634 100644 --- a/data/presets/emergency/fire_service_inlet.json +++ b/data/presets/emergency/fire_service_inlet.json @@ -23,7 +23,9 @@ "fire service inlet", "fire sprinkler inlet", "riser inlet", - "wet riser inlet" + "standpipe", + "wet riser inlet", + "wet standpipe" ], "tags": { "emergency": "fire_service_inlet" From 31ea2f25e25402dd6b07551ec99d0edfb02157f0 Mon Sep 17 00:00:00 2001 From: Samu__ Date: Tue, 7 Mar 2023 22:58:30 +0100 Subject: [PATCH 09/14] switch fire_service_inlet and fire_sprinkler --- data/presets/emergency/fire_service_inlet.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/presets/emergency/fire_service_inlet.json b/data/presets/emergency/fire_service_inlet.json index e63b44634..7ada43fae 100644 --- a/data/presets/emergency/fire_service_inlet.json +++ b/data/presets/emergency/fire_service_inlet.json @@ -2,13 +2,13 @@ "icon": "temaki-fire_hydrant", "fields": [ "fire_mains", - "fire_service_inlet", + "fire_sprinkler", "couplings" ], "moreFields": [ "level", "survey/date", - "fire_sprinkler" + "fire_service_inlet" ], "geometry": [ "point", From a068a43377f9d6ea76836b0f09dbb66e8046619e Mon Sep 17 00:00:00 2001 From: Samu__ Date: Tue, 7 Mar 2023 23:01:41 +0100 Subject: [PATCH 10/14] missing quotation mark added --- data/fields/fire_sprinkler.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/fields/fire_sprinkler.json b/data/fields/fire_sprinkler.json index 9d03ebab9..0e6a1498b 100644 --- a/data/fields/fire_sprinkler.json +++ b/data/fields/fire_sprinkler.json @@ -7,7 +7,7 @@ "dry": "Dedicated Network (Normally Dry)", "wet": "Connected to Mains (Permanently Filled)", "pre-action": "Connected to Mains (Pre-Action System)", - "yes": "Unknown Type + "yes": "Unknown Type" "no": "No" } }, From 459e182836eda0afbc47d4f94678149f39346935 Mon Sep 17 00:00:00 2001 From: Samu__ Date: Tue, 7 Mar 2023 23:03:56 +0100 Subject: [PATCH 11/14] missing comma added --- data/fields/fire_sprinkler.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/fields/fire_sprinkler.json b/data/fields/fire_sprinkler.json index 0e6a1498b..92c0598b9 100644 --- a/data/fields/fire_sprinkler.json +++ b/data/fields/fire_sprinkler.json @@ -7,7 +7,7 @@ "dry": "Dedicated Network (Normally Dry)", "wet": "Connected to Mains (Permanently Filled)", "pre-action": "Connected to Mains (Pre-Action System)", - "yes": "Unknown Type" + "yes": "Unknown Type", "no": "No" } }, From 938dbb7d55e40cf957841a2b75ed4fab29b1f00a Mon Sep 17 00:00:00 2001 From: Samu__ Date: Tue, 7 Mar 2023 23:18:55 +0100 Subject: [PATCH 12/14] add ref field --- data/presets/emergency/fire_service_inlet.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/data/presets/emergency/fire_service_inlet.json b/data/presets/emergency/fire_service_inlet.json index 7ada43fae..4f0bd816c 100644 --- a/data/presets/emergency/fire_service_inlet.json +++ b/data/presets/emergency/fire_service_inlet.json @@ -8,7 +8,8 @@ "moreFields": [ "level", "survey/date", - "fire_service_inlet" + "fire_service_inlet", + "ref" ], "geometry": [ "point", From 281092d0983c89ee690b9a3713f644f8fe2a7462 Mon Sep 17 00:00:00 2001 From: Samu__ Date: Thu, 9 Mar 2023 17:03:08 +0100 Subject: [PATCH 13/14] Icon chanched --- data/presets/emergency/fire_service_inlet.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/presets/emergency/fire_service_inlet.json b/data/presets/emergency/fire_service_inlet.json index 4f0bd816c..9cd6e356e 100644 --- a/data/presets/emergency/fire_service_inlet.json +++ b/data/presets/emergency/fire_service_inlet.json @@ -1,5 +1,5 @@ { - "icon": "temaki-fire_hydrant", + "icon": "maki-water", "fields": [ "fire_mains", "fire_sprinkler", From a3a59a6bb42615f4f13ae3733d673c92df3bead6 Mon Sep 17 00:00:00 2001 From: Samu__ Date: Thu, 9 Mar 2023 17:07:35 +0100 Subject: [PATCH 14/14] Improved formulation --- data/fields/fire_mains.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/fields/fire_mains.json b/data/fields/fire_mains.json index 1429f75eb..3aada6145 100644 --- a/data/fields/fire_mains.json +++ b/data/fields/fire_mains.json @@ -1,7 +1,7 @@ { "key": "fire_mains", "type": "combo", - "label": "Type", + "label": "Network-Type", "strings": { "options": { "dry": "Dedicated Network (Normally Dry)",