From 62e1cc7c2e3f480ba1723fe00f92c6872355f946 Mon Sep 17 00:00:00 2001 From: arch0345 Date: Sat, 18 Jun 2022 12:36:27 -0700 Subject: [PATCH 01/12] Add more barrier presets Also added field for `maxwidth` --- data/fields/maxwidth.json | 6 ++++ data/presets/barrier/_ditch.json | 11 +++++++ data/presets/barrier/_handrail.json | 11 +++++++ data/presets/barrier/_log.json | 15 ++++++++++ data/presets/barrier/bump_gate.json | 16 ++++++++++ data/presets/barrier/bus_trap.json | 19 ++++++++++++ data/presets/barrier/cable_barrier.json | 18 ++++++++++++ .../barrier/full-height_turnstile.json | 17 +++++++++++ data/presets/barrier/hampshire_gate.json | 13 +++++++++ data/presets/barrier/jersey_barrier.json | 29 +++++++++++++++++++ data/presets/barrier/motorcycle_barrier.json | 13 +++++++++ data/presets/barrier/planter.json | 11 +++++++ data/presets/barrier/rope.json | 17 +++++++++++ data/presets/barrier/wicket_gate.json | 25 ++++++++++++++++ 14 files changed, 221 insertions(+) create mode 100644 data/fields/maxwidth.json create mode 100644 data/presets/barrier/_ditch.json create mode 100644 data/presets/barrier/_handrail.json create mode 100644 data/presets/barrier/_log.json create mode 100644 data/presets/barrier/bump_gate.json create mode 100644 data/presets/barrier/bus_trap.json create mode 100644 data/presets/barrier/cable_barrier.json create mode 100644 data/presets/barrier/full-height_turnstile.json create mode 100644 data/presets/barrier/hampshire_gate.json create mode 100644 data/presets/barrier/jersey_barrier.json create mode 100644 data/presets/barrier/motorcycle_barrier.json create mode 100644 data/presets/barrier/planter.json create mode 100644 data/presets/barrier/rope.json create mode 100644 data/presets/barrier/wicket_gate.json diff --git a/data/fields/maxwidth.json b/data/fields/maxwidth.json new file mode 100644 index 000000000..6c4ee83ce --- /dev/null +++ b/data/fields/maxwidth.json @@ -0,0 +1,6 @@ +{ + "key": "maxwidth", + "type": "roadheight", + "label": "Max Width", + "snake_case": false +} diff --git a/data/presets/barrier/_ditch.json b/data/presets/barrier/_ditch.json new file mode 100644 index 000000000..92ef22df4 --- /dev/null +++ b/data/presets/barrier/_ditch.json @@ -0,0 +1,11 @@ +{ + "icon": "maki-roadblock", + "geometry": [ + "line" + ], + "tags": { + "barrier": "ditch" + }, + "name": "Ditch", + "searchable": false +} diff --git a/data/presets/barrier/_handrail.json b/data/presets/barrier/_handrail.json new file mode 100644 index 000000000..7178e10a7 --- /dev/null +++ b/data/presets/barrier/_handrail.json @@ -0,0 +1,11 @@ +{ + "icon": "temaki-railing", + "geometry": [ + "line" + ], + "tags": { + "barrier": "handrail" + }, + "name": "Handrail", + "searchable": false +} diff --git a/data/presets/barrier/_log.json b/data/presets/barrier/_log.json new file mode 100644 index 000000000..4785fa199 --- /dev/null +++ b/data/presets/barrier/_log.json @@ -0,0 +1,15 @@ +{ + "icon": "maki-roadblock", + "fields": [ + "access" + ], + "geometry": [ + "vertex", + "line" + ], + "tags": { + "barrier": "log" + }, + "name": "Fallen Tree", + "searchable": false +} diff --git a/data/presets/barrier/bump_gate.json b/data/presets/barrier/bump_gate.json new file mode 100644 index 000000000..2733cb8b2 --- /dev/null +++ b/data/presets/barrier/bump_gate.json @@ -0,0 +1,16 @@ +{ + "icon": "maki-roadblock", + "fields": [ + "access" + ], + "geometry": [ + "vertex" + ], + "terms": [ + "drive-through gate" + ], + "tags": { + "barrier": "bump_gate" + }, + "name": "Bump Gate" +} diff --git a/data/presets/barrier/bus_trap.json b/data/presets/barrier/bus_trap.json new file mode 100644 index 000000000..db5aa81d8 --- /dev/null +++ b/data/presets/barrier/bus_trap.json @@ -0,0 +1,19 @@ +{ + "icon": "maki-roadblock", + "fields": [ + "access" + ], + "moreFields": [ + "maxwidth" + ], + "geometry": [ + "vertex" + ], + "terms": [ + "car trap" + ], + "tags": { + "barrier": "bus_trap" + }, + "name": "Bus Trap" +} diff --git a/data/presets/barrier/cable_barrier.json b/data/presets/barrier/cable_barrier.json new file mode 100644 index 000000000..185781248 --- /dev/null +++ b/data/presets/barrier/cable_barrier.json @@ -0,0 +1,18 @@ +{ + "icon": "maki-roadblock", + "fields": [ + "height", + "material" + ], + "geometry": [ + "line" + ], + "tags": { + "barrier": "cable_barrier" + }, + "terms": [ + "guard cable", + "wire rope safety barrier" + ], + "name": "Cable Barrier" +} diff --git a/data/presets/barrier/full-height_turnstile.json b/data/presets/barrier/full-height_turnstile.json new file mode 100644 index 000000000..2f1389f8f --- /dev/null +++ b/data/presets/barrier/full-height_turnstile.json @@ -0,0 +1,17 @@ +{ + "icon": "maki-roadblock", + "fields": [ + "access" + ], + "geometry": [ + "vertex" + ], + "terms": [ + "baffle gate", + "turnstyle" + ], + "tags": { + "barrier": "full-height_turnstile" + }, + "name": "Full-height Turnstile" +} diff --git a/data/presets/barrier/hampshire_gate.json b/data/presets/barrier/hampshire_gate.json new file mode 100644 index 000000000..83062bffb --- /dev/null +++ b/data/presets/barrier/hampshire_gate.json @@ -0,0 +1,13 @@ +{ + "icon": "temaki-gate", + "fields": [ + "access" + ], + "geometry": [ + "vertex" + ], + "tags": { + "barrier": "hampshire_gate" + }, + "name": "Hampshire Gate" +} diff --git a/data/presets/barrier/jersey_barrier.json b/data/presets/barrier/jersey_barrier.json new file mode 100644 index 000000000..0921b9c2c --- /dev/null +++ b/data/presets/barrier/jersey_barrier.json @@ -0,0 +1,29 @@ +{ + "icon": "maki-roadblock", + "fields": [ + "height", + "material" + ], + "moreFields": [ + "access" + ], + "geometry": [ + "point", + "line" + ], + "tags": { + "barrier": "jersey_barrier" + }, + "terms": [ + "concrete median", + "concrete barrier", + "constant-slope barrier", + "f-shape barrier", + "k-rail", + "median", + "new jersey wall", + "ontario tall wall", + "plastic barrier" + ], + "name": "Jersey Barrier" +} diff --git a/data/presets/barrier/motorcycle_barrier.json b/data/presets/barrier/motorcycle_barrier.json new file mode 100644 index 000000000..b76eae028 --- /dev/null +++ b/data/presets/barrier/motorcycle_barrier.json @@ -0,0 +1,13 @@ +{ + "icon": "maki-roadblock", + "fields": [ + "access" + ], + "geometry": [ + "vertex" + ], + "tags": { + "barrier": "motorcycle_barrier" + }, + "name": "Motorcycle Barrier" +} diff --git a/data/presets/barrier/planter.json b/data/presets/barrier/planter.json new file mode 100644 index 000000000..7188dee00 --- /dev/null +++ b/data/presets/barrier/planter.json @@ -0,0 +1,11 @@ +{ + "icon": "maki-garden", + "geometry": [ + "vertex", + "line" + ], + "tags": { + "barrier": "planter" + }, + "name": "Planter Barrier" +} diff --git a/data/presets/barrier/rope.json b/data/presets/barrier/rope.json new file mode 100644 index 000000000..10637e444 --- /dev/null +++ b/data/presets/barrier/rope.json @@ -0,0 +1,17 @@ +{ + "icon": "temaki-rope_fence", + "fields": [ + "access" + ], + "moreFields": [ + "wheelchair" + ], + "geometry": [ + "vertex", + "line" + ], + "tags": { + "barrier": "rope" + }, + "name": "Rope Barrier" +} diff --git a/data/presets/barrier/wicket_gate.json b/data/presets/barrier/wicket_gate.json new file mode 100644 index 000000000..26d94f2a5 --- /dev/null +++ b/data/presets/barrier/wicket_gate.json @@ -0,0 +1,25 @@ +{ + "icon": "temaki-gate", + "geometry": [ + "vertex", + "line" + ], + "fields": [ + "access", + "locked", + "wheelchair", + "opening_hours", + "height", + "material" + ], + "moreFields": [ + "colour", + "manufacturer", + "operator", + "ref" + ], + "tags": { + "barrier": "wicket_gate" + }, + "name": "Wicket Gate" +} From f88a1b918b6bd553d84751ce2ba097b4e36e8527 Mon Sep 17 00:00:00 2001 From: arch0345 Date: Sat, 18 Jun 2022 12:53:25 -0700 Subject: [PATCH 02/12] Rope Barrier -> Rope Fence --- data/presets/barrier/rope.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/presets/barrier/rope.json b/data/presets/barrier/rope.json index 10637e444..ab35c85bc 100644 --- a/data/presets/barrier/rope.json +++ b/data/presets/barrier/rope.json @@ -13,5 +13,5 @@ "tags": { "barrier": "rope" }, - "name": "Rope Barrier" + "name": "Rope Fence" } From 57721eb5b07a733b3076940bdc9ea39d7da38fc3 Mon Sep 17 00:00:00 2001 From: arch0345 Date: Tue, 21 Jun 2022 08:46:10 -0700 Subject: [PATCH 03/12] Add terms to Hampshire Gate preset --- data/presets/barrier/hampshire_gate.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/data/presets/barrier/hampshire_gate.json b/data/presets/barrier/hampshire_gate.json index 83062bffb..4672f9b5a 100644 --- a/data/presets/barrier/hampshire_gate.json +++ b/data/presets/barrier/hampshire_gate.json @@ -9,5 +9,9 @@ "tags": { "barrier": "hampshire_gate" }, + "terms": [ + "new zealand gate", + "wire gate" + ], "name": "Hampshire Gate" } From 2ace6ff56c5d8bd5826ff157741f82bcd5f78456 Mon Sep 17 00:00:00 2001 From: archpdx Date: Tue, 21 Jun 2022 08:47:03 -0700 Subject: [PATCH 04/12] Add `wheelchair` to moreFields in Motorcycle Barrier preset Co-authored-by: Martin Raifer --- data/presets/barrier/motorcycle_barrier.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/data/presets/barrier/motorcycle_barrier.json b/data/presets/barrier/motorcycle_barrier.json index b76eae028..09ffe28fc 100644 --- a/data/presets/barrier/motorcycle_barrier.json +++ b/data/presets/barrier/motorcycle_barrier.json @@ -3,6 +3,9 @@ "fields": [ "access" ], + "moreFields": [ + "wheelchair" + ], "geometry": [ "vertex" ], From 2e4f6ba3deef5a81e679e9dc132d5638869d7f47 Mon Sep 17 00:00:00 2001 From: arch0345 Date: Tue, 21 Jun 2022 08:56:53 -0700 Subject: [PATCH 05/12] Remove fields from Wicket Gate preset --- data/presets/barrier/wicket_gate.json | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/data/presets/barrier/wicket_gate.json b/data/presets/barrier/wicket_gate.json index 26d94f2a5..032983746 100644 --- a/data/presets/barrier/wicket_gate.json +++ b/data/presets/barrier/wicket_gate.json @@ -5,18 +5,11 @@ "line" ], "fields": [ - "access", - "locked", - "wheelchair", - "opening_hours", - "height", - "material" + "access" ], "moreFields": [ - "colour", - "manufacturer", - "operator", - "ref" + "entrance", + "opening_hours" ], "tags": { "barrier": "wicket_gate" From 536a8eebd7b218a76f95518cc1f5a959be1e70c1 Mon Sep 17 00:00:00 2001 From: arch0345 Date: Tue, 21 Jun 2022 09:13:01 -0700 Subject: [PATCH 06/12] Change Planter preset * Remove `barrier=planter` preset * Add `planter_barrier` field which adds `barrier=planter` * Add `man_made=planter` preset with `planter_barrier` field --- data/fields/planter_barrier.json | 11 +++++++++++ data/presets/barrier/planter.json | 11 ----------- data/presets/man_made/planter.json | 17 +++++++++++++++++ 3 files changed, 28 insertions(+), 11 deletions(-) create mode 100644 data/fields/planter_barrier.json delete mode 100644 data/presets/barrier/planter.json create mode 100644 data/presets/man_made/planter.json diff --git a/data/fields/planter_barrier.json b/data/fields/planter_barrier.json new file mode 100644 index 000000000..199ea58fd --- /dev/null +++ b/data/fields/planter_barrier.json @@ -0,0 +1,11 @@ +{ + "key": "barrier", + "type": "defaultCheck", + "label": "Barrier", + "strings": { + "options": { + "undefined": "No", + "planter": "Yes" + } + } +} \ No newline at end of file diff --git a/data/presets/barrier/planter.json b/data/presets/barrier/planter.json deleted file mode 100644 index 7188dee00..000000000 --- a/data/presets/barrier/planter.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "icon": "maki-garden", - "geometry": [ - "vertex", - "line" - ], - "tags": { - "barrier": "planter" - }, - "name": "Planter Barrier" -} diff --git a/data/presets/man_made/planter.json b/data/presets/man_made/planter.json new file mode 100644 index 000000000..1e4d9864c --- /dev/null +++ b/data/presets/man_made/planter.json @@ -0,0 +1,17 @@ +{ + "icon": "maki-garden", + "geometry": [ + "point", + "vertex", + "line", + "area" + ], + "fields": [ + "material", + "planter_barrier" + ], + "tags": { + "man_made": "planter" + }, + "name": "Planter" +} From 37806579837257919c1cb4aa1dba1ba2f757409e Mon Sep 17 00:00:00 2001 From: arch0345 Date: Tue, 21 Jun 2022 09:17:59 -0700 Subject: [PATCH 07/12] npm run lint:fix --- data/fields/planter_barrier.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/fields/planter_barrier.json b/data/fields/planter_barrier.json index 199ea58fd..75e7aa314 100644 --- a/data/fields/planter_barrier.json +++ b/data/fields/planter_barrier.json @@ -8,4 +8,4 @@ "planter": "Yes" } } -} \ No newline at end of file +} From bb8c053ec920c506d0d7c07049717700845fb893 Mon Sep 17 00:00:00 2001 From: archpdx Date: Tue, 21 Jun 2022 10:46:45 -0700 Subject: [PATCH 08/12] Rename planter_barrier.json to barrier_planter.json --- data/fields/{planter_barrier.json => barrier_planter.json} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename data/fields/{planter_barrier.json => barrier_planter.json} (100%) diff --git a/data/fields/planter_barrier.json b/data/fields/barrier_planter.json similarity index 100% rename from data/fields/planter_barrier.json rename to data/fields/barrier_planter.json From 3bf81f86e8231d6caf9c8b2d0da888e5c9f13149 Mon Sep 17 00:00:00 2001 From: archpdx Date: Tue, 21 Jun 2022 11:09:08 -0700 Subject: [PATCH 09/12] Update field name --- data/presets/man_made/planter.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/presets/man_made/planter.json b/data/presets/man_made/planter.json index 1e4d9864c..894365720 100644 --- a/data/presets/man_made/planter.json +++ b/data/presets/man_made/planter.json @@ -8,7 +8,7 @@ ], "fields": [ "material", - "planter_barrier" + "barrier_planter" ], "tags": { "man_made": "planter" From 0117fa8169b5033d5a86a5fc2b0357ff4b5e439e Mon Sep 17 00:00:00 2001 From: arch0345 Date: Tue, 21 Jun 2022 11:12:18 -0700 Subject: [PATCH 10/12] Remove fields --- data/presets/barrier/rope.json | 3 --- data/presets/barrier/wicket_gate.json | 3 +-- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/data/presets/barrier/rope.json b/data/presets/barrier/rope.json index ab35c85bc..d4df1fff0 100644 --- a/data/presets/barrier/rope.json +++ b/data/presets/barrier/rope.json @@ -3,9 +3,6 @@ "fields": [ "access" ], - "moreFields": [ - "wheelchair" - ], "geometry": [ "vertex", "line" diff --git a/data/presets/barrier/wicket_gate.json b/data/presets/barrier/wicket_gate.json index 032983746..f63b313b1 100644 --- a/data/presets/barrier/wicket_gate.json +++ b/data/presets/barrier/wicket_gate.json @@ -8,8 +8,7 @@ "access" ], "moreFields": [ - "entrance", - "opening_hours" + "entrance" ], "tags": { "barrier": "wicket_gate" From 2cccadfa3252a8d7f01cd439952829887869de2a Mon Sep 17 00:00:00 2001 From: Martin Raifer Date: Wed, 22 Jun 2022 11:42:14 +0200 Subject: [PATCH 11/12] be more restrictive on planter geometry types --- data/fields/barrier_planter.json | 3 +++ data/presets/man_made/planter.json | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/data/fields/barrier_planter.json b/data/fields/barrier_planter.json index 75e7aa314..841e00137 100644 --- a/data/fields/barrier_planter.json +++ b/data/fields/barrier_planter.json @@ -2,6 +2,9 @@ "key": "barrier", "type": "defaultCheck", "label": "Barrier", + "geometry": [ + "vertex" + ], "strings": { "options": { "undefined": "No", diff --git a/data/presets/man_made/planter.json b/data/presets/man_made/planter.json index 894365720..13809686b 100644 --- a/data/presets/man_made/planter.json +++ b/data/presets/man_made/planter.json @@ -3,7 +3,6 @@ "geometry": [ "point", "vertex", - "line", "area" ], "fields": [ From 87e795f6d03823c6f56ec496f79ba9614a4facb6 Mon Sep 17 00:00:00 2001 From: Martin Raifer Date: Wed, 22 Jun 2022 11:53:35 +0200 Subject: [PATCH 12/12] add non-searchable "Planter (Barrier)" preset This allows to show the "access" field if a man_made=planter vertex has also the barrier=planter tag. --- data/presets/barrier/_planter.json | 16 ++++++++++++++++ data/presets/man_made/planter.json | 1 + 2 files changed, 17 insertions(+) create mode 100644 data/presets/barrier/_planter.json diff --git a/data/presets/barrier/_planter.json b/data/presets/barrier/_planter.json new file mode 100644 index 000000000..74949993d --- /dev/null +++ b/data/presets/barrier/_planter.json @@ -0,0 +1,16 @@ +{ + "icon": "maki-garden", + "fields": [ + "access", + "material" + ], + "geometry": [ + "vertex" + ], + "tags": { + "barrier": "planter", + "man_made": "planter" + }, + "name": "Planter (Barrier)", + "searchable": false +} diff --git a/data/presets/man_made/planter.json b/data/presets/man_made/planter.json index 13809686b..b0a5e2b08 100644 --- a/data/presets/man_made/planter.json +++ b/data/presets/man_made/planter.json @@ -12,5 +12,6 @@ "tags": { "man_made": "planter" }, + "matchScore": 0.9, "name": "Planter" }