From 1ecfb90d0a8ebd2328a06ee1bbf7b4b3ae199fcf Mon Sep 17 00:00:00 2001 From: Tobias Date: Sun, 25 Feb 2024 10:18:54 +0100 Subject: [PATCH 1/3] Deprecate `cycleway` for `cycleway:both` --- data/deprecated.json | 4 ++++ data/fields/cycleway.json | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/data/deprecated.json b/data/deprecated.json index 828bc8251..b93fefe5d 100644 --- a/data/deprecated.json +++ b/data/deprecated.json @@ -1988,5 +1988,9 @@ { "old": {"industrial": "brickworks"}, "replace": {"industrial": "brickyard"} + }, + { + "old": {"cycleway": "*"}, + "replace": {"cycleway:both": "*"} } ] diff --git a/data/fields/cycleway.json b/data/fields/cycleway.json index 372e929d7..f701c7282 100644 --- a/data/fields/cycleway.json +++ b/data/fields/cycleway.json @@ -1,5 +1,5 @@ { - "key": "cycleway", + "key": "cycleway:both", "keys": [ "cycleway:left", "cycleway:right" From e23b6147c5c99978bcf874440008babea85cf3da Mon Sep 17 00:00:00 2001 From: Tobias Date: Sun, 25 Feb 2024 10:24:49 +0100 Subject: [PATCH 2/3] TEMP move cycleway field to the fields and second place --- data/presets/highway/living_street.json | 2 +- data/presets/highway/primary.json | 2 +- data/presets/highway/primary_link.json | 2 +- data/presets/highway/residential.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/data/presets/highway/living_street.json b/data/presets/highway/living_street.json index de43f1d4a..ab39d1311 100644 --- a/data/presets/highway/living_street.json +++ b/data/presets/highway/living_street.json @@ -2,6 +2,7 @@ "icon": "iD-highway-living-street", "fields": [ "name", + "cycleway", "oneway", "maxspeed", "lanes", @@ -14,7 +15,6 @@ "covered_no", "bicycle_road", "cyclestreet-BE-NL", - "cycleway", "flood_prone", "junction_line", "lit", diff --git a/data/presets/highway/primary.json b/data/presets/highway/primary.json index 0b269dbd2..6c9cdb874 100644 --- a/data/presets/highway/primary.json +++ b/data/presets/highway/primary.json @@ -2,6 +2,7 @@ "icon": "iD-highway-primary", "fields": [ "name", + "cycleway", "oneway", "maxspeed", "lanes", @@ -14,7 +15,6 @@ "bridge/ref", "charge_toll", "covered_no", - "cycleway", "expressway-US", "flood_prone", "incline", diff --git a/data/presets/highway/primary_link.json b/data/presets/highway/primary_link.json index 82fbb450f..9929255f4 100644 --- a/data/presets/highway/primary_link.json +++ b/data/presets/highway/primary_link.json @@ -2,6 +2,7 @@ "name": "Primary Link", "icon": "iD-highway-primary-link", "fields": [ + "cycleway", "destination_oneway", "destination/ref_oneway", "oneway", @@ -15,7 +16,6 @@ "bridge/ref", "charge_toll", "covered_no", - "cycleway", "destination/symbol_oneway", "flood_prone", "incline", diff --git a/data/presets/highway/residential.json b/data/presets/highway/residential.json index ee990b523..493f406e8 100644 --- a/data/presets/highway/residential.json +++ b/data/presets/highway/residential.json @@ -2,6 +2,7 @@ "icon": "iD-highway-residential", "fields": [ "name", + "cycleway", "oneway", "maxspeed", "lanes", @@ -12,7 +13,6 @@ "moreFields": [ "bridge/ref", "covered_no", - "cycleway", "bicycle_road", "cyclestreet-BE-NL", "flood_prone", From 70e09454a87ac6368c78127a8a498a74e47ad34d Mon Sep 17 00:00:00 2001 From: Tobias Date: Mon, 26 Feb 2024 15:12:38 +0100 Subject: [PATCH 3/3] Deprecation: Separate rules to not match on `cycleway=crossing` --- data/deprecated.json | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/data/deprecated.json b/data/deprecated.json index b93fefe5d..b1702d01c 100644 --- a/data/deprecated.json +++ b/data/deprecated.json @@ -1990,7 +1990,23 @@ "replace": {"industrial": "brickyard"} }, { - "old": {"cycleway": "*"}, - "replace": {"cycleway:both": "*"} + "old": {"cycleway": "yes"}, + "replace": {"cycleway:both": "yes"} + }, + { + "old": {"cycleway": "no"}, + "replace": {"cycleway:both": "no"} + }, + { + "old": {"cycleway": "separate"}, + "replace": {"cycleway:both": "separate"} + }, + { + "old": {"cycleway": "track"}, + "replace": {"cycleway:both": "track"} + }, + { + "old": {"cycleway": "lane"}, + "replace": {"cycleway:both": "lane"} } ]