From 73adebbcafdaf290ae72e141f9d291ff91a0216b Mon Sep 17 00:00:00 2001 From: arch0345 Date: Tue, 31 May 2022 19:31:53 -0700 Subject: [PATCH 1/5] Add `lane_markings` field --- data/fields/lane_markings.json | 5 +++++ data/presets/highway/living_street.json | 1 + data/presets/highway/residential.json | 1 + data/presets/highway/service.json | 1 + data/presets/highway/tertiary.json | 3 ++- 5 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 data/fields/lane_markings.json diff --git a/data/fields/lane_markings.json b/data/fields/lane_markings.json new file mode 100644 index 000000000..e149303d3 --- /dev/null +++ b/data/fields/lane_markings.json @@ -0,0 +1,5 @@ +{ + "key": "lane:markings", + "type": "check", + "label": "Lane Markings" +} diff --git a/data/presets/highway/living_street.json b/data/presets/highway/living_street.json index 45b2d733e..409dc210f 100644 --- a/data/presets/highway/living_street.json +++ b/data/presets/highway/living_street.json @@ -14,6 +14,7 @@ "cycleway", "flood_prone", "junction_line", + "lane_markings", "lit", "maxheight", "maxweight_bridge", diff --git a/data/presets/highway/residential.json b/data/presets/highway/residential.json index 636dbe281..a1d9940bc 100644 --- a/data/presets/highway/residential.json +++ b/data/presets/highway/residential.json @@ -15,6 +15,7 @@ "flood_prone", "incline", "junction_line", + "lane_markings", "lit", "maxheight", "maxspeed/advisory", diff --git a/data/presets/highway/service.json b/data/presets/highway/service.json index 3e80a904c..244994db3 100644 --- a/data/presets/highway/service.json +++ b/data/presets/highway/service.json @@ -14,6 +14,7 @@ "flood_prone", "incline", "lanes", + "lane_markings", "lit", "maxheight", "maxspeed/advisory", diff --git a/data/presets/highway/tertiary.json b/data/presets/highway/tertiary.json index f9c41fdfa..c64a186a7 100644 --- a/data/presets/highway/tertiary.json +++ b/data/presets/highway/tertiary.json @@ -4,7 +4,8 @@ "{highway/primary}" ], "moreFields": [ - "{highway/primary}" + "{highway/primary}", + "lane_markings" ], "geometry": [ "line" From d0c4e9570bd739b93c9f4617752be14a2f8b0b34 Mon Sep 17 00:00:00 2001 From: archpdx Date: Tue, 31 May 2022 19:56:39 -0700 Subject: [PATCH 2/5] Update data/fields/lane_markings.json MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Minh Nguyễn --- data/fields/lane_markings.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/fields/lane_markings.json b/data/fields/lane_markings.json index e149303d3..ead9f2970 100644 --- a/data/fields/lane_markings.json +++ b/data/fields/lane_markings.json @@ -1,5 +1,5 @@ { - "key": "lane:markings", + "key": "lane_markings", "type": "check", "label": "Lane Markings" } From 2a822ef3b205b17883739abe9b7bac59414db748 Mon Sep 17 00:00:00 2001 From: arch0345 Date: Sat, 4 Jun 2022 12:50:59 -0700 Subject: [PATCH 3/5] Add terms --- data/fields/lane_markings.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/data/fields/lane_markings.json b/data/fields/lane_markings.json index ead9f2970..1c7a5f589 100644 --- a/data/fields/lane_markings.json +++ b/data/fields/lane_markings.json @@ -1,5 +1,10 @@ { "key": "lane_markings", "type": "check", - "label": "Lane Markings" + "label": "Lane Markings", + "terms": [ + "centerline", + "striped", + "unstriped" + ] } From 6bc56ba49b051d816f8fd00be08e9d45269720bc Mon Sep 17 00:00:00 2001 From: arch0345 Date: Sat, 4 Jun 2022 12:57:38 -0700 Subject: [PATCH 4/5] Update lane_markings.json --- data/fields/lane_markings.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/fields/lane_markings.json b/data/fields/lane_markings.json index 1c7a5f589..5c78603be 100644 --- a/data/fields/lane_markings.json +++ b/data/fields/lane_markings.json @@ -3,7 +3,7 @@ "type": "check", "label": "Lane Markings", "terms": [ - "centerline", + "centerline", "striped", "unstriped" ] From 432c1212f1c03d9f3c2e94b1fab55348c37a27f5 Mon Sep 17 00:00:00 2001 From: arch0345 Date: Wed, 15 Jun 2022 16:29:23 -0700 Subject: [PATCH 5/5] Remove `lane_markings` Also added `lane_markings` to highway/primary --- data/presets/highway/living_street.json | 1 - data/presets/highway/primary.json | 1 + data/presets/highway/service.json | 1 - data/presets/highway/tertiary.json | 3 +-- 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/data/presets/highway/living_street.json b/data/presets/highway/living_street.json index 409dc210f..45b2d733e 100644 --- a/data/presets/highway/living_street.json +++ b/data/presets/highway/living_street.json @@ -14,7 +14,6 @@ "cycleway", "flood_prone", "junction_line", - "lane_markings", "lit", "maxheight", "maxweight_bridge", diff --git a/data/presets/highway/primary.json b/data/presets/highway/primary.json index 16cc53027..a57c0763d 100644 --- a/data/presets/highway/primary.json +++ b/data/presets/highway/primary.json @@ -18,6 +18,7 @@ "flood_prone", "incline", "junction_line", + "lane_markings", "lit", "maxheight", "maxspeed/advisory", diff --git a/data/presets/highway/service.json b/data/presets/highway/service.json index 244994db3..3e80a904c 100644 --- a/data/presets/highway/service.json +++ b/data/presets/highway/service.json @@ -14,7 +14,6 @@ "flood_prone", "incline", "lanes", - "lane_markings", "lit", "maxheight", "maxspeed/advisory", diff --git a/data/presets/highway/tertiary.json b/data/presets/highway/tertiary.json index c64a186a7..f9c41fdfa 100644 --- a/data/presets/highway/tertiary.json +++ b/data/presets/highway/tertiary.json @@ -4,8 +4,7 @@ "{highway/primary}" ], "moreFields": [ - "{highway/primary}", - "lane_markings" + "{highway/primary}" ], "geometry": [ "line"