From 972151f8098def206c20f0e4f09bf422500c5bb3 Mon Sep 17 00:00:00 2001 From: zstadler Date: Thu, 23 Nov 2023 13:45:41 +0200 Subject: [PATCH 1/9] Regional Preset: path for foot+bicycle in Israel --- .../presets/highway/path/bicycle_foot-IL.json | 55 +++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 data/presets/highway/path/bicycle_foot-IL.json diff --git a/data/presets/highway/path/bicycle_foot-IL.json b/data/presets/highway/path/bicycle_foot-IL.json new file mode 100644 index 00000000..0eb5487c --- /dev/null +++ b/data/presets/highway/path/bicycle_foot-IL.json @@ -0,0 +1,55 @@ +{ + "locationSet": { + "include": [ + "il", + "ps" + ] + }, + "icon": "temaki-pedestrian_and_cyclist", + "fields": [ + "mtb:name", + "mtb:name:he", + "oneway:mtb", + "mtb:scale", + "segregated", + "name", + "oneway", + "surface", + "smoothness", + "width", + "structure", + "access", + "incline" + ], + "geometry": [ + "line" + ], + "tags": { + "highway": "path" + }, + "addTags": { + "highway": "path", + "foot": "designated", + "bicycle": "designated" + }, + "removeTags": { + "highway": "path", + "foot": "designated", + "bicycle": "designated", + "segregated": "*" + }, + "terms": [ + "bicycle and foot path", + "bike and pedestrian path", + "green way", + "greenway", + "mixed-use trail", + "multi-use trail", + "segregated trail", + "shared path", + "shared use path", + "rail trail" + ], + "matchScore": 0.9, + "name": "Cycle & Foot Path" +} From 41a4c9f9995dfaf95600ca9b726783319fffccc4 Mon Sep 17 00:00:00 2001 From: zstadler Date: Thu, 23 Nov 2023 14:16:35 +0200 Subject: [PATCH 2/9] Add `mtb:name` field --- data/fields/mtb/name.json | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 data/fields/mtb/name.json diff --git a/data/fields/mtb/name.json b/data/fields/mtb/name.json new file mode 100644 index 00000000..fbeafc48 --- /dev/null +++ b/data/fields/mtb/name.json @@ -0,0 +1,6 @@ +{ + "key": "mtb:name", + "type": "localized", + "label": "Mountain Biking Name", + "placeholder": "MTB name (if any)" +} From 572543495929ff1cf4a2712db65747ac43133e3f Mon Sep 17 00:00:00 2001 From: zstadler Date: Thu, 23 Nov 2023 14:29:12 +0200 Subject: [PATCH 3/9] Run prettier --- data/presets/highway/path/bicycle_foot-IL.json | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/data/presets/highway/path/bicycle_foot-IL.json b/data/presets/highway/path/bicycle_foot-IL.json index 0eb5487c..993bc06f 100644 --- a/data/presets/highway/path/bicycle_foot-IL.json +++ b/data/presets/highway/path/bicycle_foot-IL.json @@ -1,9 +1,6 @@ { "locationSet": { - "include": [ - "il", - "ps" - ] + "include": ["il", "ps"] }, "icon": "temaki-pedestrian_and_cyclist", "fields": [ @@ -21,9 +18,7 @@ "access", "incline" ], - "geometry": [ - "line" - ], + "geometry": ["line"], "tags": { "highway": "path" }, From 9b549c3045eb167d46ccc40615d6bbbbb0c91a80 Mon Sep 17 00:00:00 2001 From: zstadler Date: Thu, 23 Nov 2023 14:47:47 +0200 Subject: [PATCH 4/9] Update field definition --- data/fields/oneway/mtb.json | 5 +++++ data/presets/highway/path/bicycle_foot-IL.json | 9 +++++---- 2 files changed, 10 insertions(+), 4 deletions(-) create mode 100644 data/fields/oneway/mtb.json diff --git a/data/fields/oneway/mtb.json b/data/fields/oneway/mtb.json new file mode 100644 index 00000000..c4d947f3 --- /dev/null +++ b/data/fields/oneway/mtb.json @@ -0,0 +1,5 @@ +{ + "key": "oneway:mtb", + "type": "check", + "label": "One Way (Mountain Bike)" +} diff --git a/data/presets/highway/path/bicycle_foot-IL.json b/data/presets/highway/path/bicycle_foot-IL.json index 993bc06f..cb17e393 100644 --- a/data/presets/highway/path/bicycle_foot-IL.json +++ b/data/presets/highway/path/bicycle_foot-IL.json @@ -4,10 +4,7 @@ }, "icon": "temaki-pedestrian_and_cyclist", "fields": [ - "mtb:name", - "mtb:name:he", - "oneway:mtb", - "mtb:scale", + "mtb/name", "segregated", "name", "oneway", @@ -18,6 +15,10 @@ "access", "incline" ], + "moreFields": [ + "mtb/scale", + "sac_scale" + ], "geometry": ["line"], "tags": { "highway": "path" From 2e4b86e9604933babdc3868fd1eed114e51d81eb Mon Sep 17 00:00:00 2001 From: zstadler Date: Thu, 23 Nov 2023 14:54:12 +0200 Subject: [PATCH 5/9] prettier --- data/presets/highway/path/bicycle_foot-IL.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/data/presets/highway/path/bicycle_foot-IL.json b/data/presets/highway/path/bicycle_foot-IL.json index cb17e393..9cd33900 100644 --- a/data/presets/highway/path/bicycle_foot-IL.json +++ b/data/presets/highway/path/bicycle_foot-IL.json @@ -15,10 +15,7 @@ "access", "incline" ], - "moreFields": [ - "mtb/scale", - "sac_scale" - ], + "moreFields": ["mtb/scale", "sac_scale"], "geometry": ["line"], "tags": { "highway": "path" From 985dce1711e37c27b604bec372dea1f87b6712ea Mon Sep 17 00:00:00 2001 From: zstadler Date: Thu, 23 Nov 2023 15:32:25 +0200 Subject: [PATCH 6/9] Run `npm run lint:fix` --- .../presets/highway/path/bicycle_foot-IL.json | 104 ++++++++++-------- 1 file changed, 56 insertions(+), 48 deletions(-) diff --git a/data/presets/highway/path/bicycle_foot-IL.json b/data/presets/highway/path/bicycle_foot-IL.json index 9cd33900..2bc28f2d 100644 --- a/data/presets/highway/path/bicycle_foot-IL.json +++ b/data/presets/highway/path/bicycle_foot-IL.json @@ -1,48 +1,56 @@ -{ - "locationSet": { - "include": ["il", "ps"] - }, - "icon": "temaki-pedestrian_and_cyclist", - "fields": [ - "mtb/name", - "segregated", - "name", - "oneway", - "surface", - "smoothness", - "width", - "structure", - "access", - "incline" - ], - "moreFields": ["mtb/scale", "sac_scale"], - "geometry": ["line"], - "tags": { - "highway": "path" - }, - "addTags": { - "highway": "path", - "foot": "designated", - "bicycle": "designated" - }, - "removeTags": { - "highway": "path", - "foot": "designated", - "bicycle": "designated", - "segregated": "*" - }, - "terms": [ - "bicycle and foot path", - "bike and pedestrian path", - "green way", - "greenway", - "mixed-use trail", - "multi-use trail", - "segregated trail", - "shared path", - "shared use path", - "rail trail" - ], - "matchScore": 0.9, - "name": "Cycle & Foot Path" -} +{ + "locationSet": { + "include": [ + "il", + "ps" + ] + }, + "icon": "temaki-pedestrian_and_cyclist", + "fields": [ + "mtb/name", + "segregated", + "name", + "oneway", + "surface", + "smoothness", + "width", + "structure", + "access", + "incline" + ], + "moreFields": [ + "mtb/scale", + "sac_scale" + ], + "geometry": [ + "line" + ], + "tags": { + "highway": "path" + }, + "addTags": { + "highway": "path", + "foot": "designated", + "bicycle": "designated" + }, + "removeTags": { + "highway": "path", + "foot": "designated", + "bicycle": "designated", + "segregated": "*" + }, + "terms": [ + "bicycle and foot path", + "bike and pedestrian path", + "green way", + "greenway", + "mixed-use trail", + "multi-use trail", + "segregated trail", + "shared path", + "shared use path", + "rail trail" + ], + "matchScore": 0.9, + "name": "Cycle & Foot Path" +} From be38f327adb7f5523d5df52db65a38afa526f984 Mon Sep 17 00:00:00 2001 From: zstadler Date: Thu, 23 Nov 2023 16:09:17 +0200 Subject: [PATCH 7/9] Restore `oneway:mtb` field --- data/presets/highway/path/bicycle_foot-IL.json | 1 + 1 file changed, 1 insertion(+) diff --git a/data/presets/highway/path/bicycle_foot-IL.json b/data/presets/highway/path/bicycle_foot-IL.json index 2bc28f2d..e922f2ed 100644 --- a/data/presets/highway/path/bicycle_foot-IL.json +++ b/data/presets/highway/path/bicycle_foot-IL.json @@ -10,6 +10,7 @@ "mtb/name", "segregated", "name", + "oneway/mtb", "oneway", "surface", "smoothness", From 7a15233285bf7f81348f6cc7d8d7a2b0933c268b Mon Sep 17 00:00:00 2001 From: zstadler Date: Thu, 23 Nov 2023 16:16:22 +0200 Subject: [PATCH 8/9] Move lower-priority fields to "moreFields" --- .../presets/highway/path/bicycle_foot-IL.json | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/data/presets/highway/path/bicycle_foot-IL.json b/data/presets/highway/path/bicycle_foot-IL.json index e922f2ed..cf9a8ba8 100644 --- a/data/presets/highway/path/bicycle_foot-IL.json +++ b/data/presets/highway/path/bicycle_foot-IL.json @@ -10,18 +10,18 @@ "mtb/name", "segregated", "name", - "oneway/mtb", - "oneway", - "surface", - "smoothness", - "width", - "structure", - "access", - "incline" + "mtb/scale", + "oneway/mtb" ], "moreFields": [ - "mtb/scale", - "sac_scale" + "oneway", + "structure", + "smoothness", + "sac_scale", + "surface", + "width", + "access", + "incline" ], "geometry": [ "line" From 92fffaa6c33052a6f7cca0136d7c4ca47acb8735 Mon Sep 17 00:00:00 2001 From: zstadler Date: Thu, 23 Nov 2023 16:33:53 +0200 Subject: [PATCH 9/9] Add MTB to terms --- data/presets/highway/path/bicycle_foot-IL.json | 1 + 1 file changed, 1 insertion(+) diff --git a/data/presets/highway/path/bicycle_foot-IL.json b/data/presets/highway/path/bicycle_foot-IL.json index cf9a8ba8..33f101c9 100644 --- a/data/presets/highway/path/bicycle_foot-IL.json +++ b/data/presets/highway/path/bicycle_foot-IL.json @@ -42,6 +42,7 @@ }, "terms": [ "bicycle and foot path", + "MTB and foot path", "bike and pedestrian path", "green way", "greenway",