From cd9c42109147c7c3b232530a39aac670bbdf84df Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Mon, 18 May 2020 13:39:52 -0400 Subject: [PATCH] Add Rooftop parking type field option (close #7578) Deprecate various parking tag values --- data/deprecated.json | 24 ++++++++++++++++++++++++ data/presets.yaml | 2 ++ data/presets/fields.json | 2 +- data/presets/fields/parking.json | 7 ++++--- data/taginfo.json | 11 +++++++++-- dist/locales/en.json | 7 ++++--- 6 files changed, 44 insertions(+), 9 deletions(-) diff --git a/data/deprecated.json b/data/deprecated.json index 300f7a0ec..775044c11 100644 --- a/data/deprecated.json +++ b/data/deprecated.json @@ -918,6 +918,30 @@ { "old": {"operator:type": "unknown"} }, + { + "old": {"parking": "covered"}, + "replace": {"covered": "yes"} + }, + { + "old": {"parking": "customers"}, + "replace": {"access": "customers"} + }, + { + "old": {"parking": "entrance"}, + "replace": {"amenity": "parking_entrance"} + }, + { + "old": {"parking": "park_and_ride"}, + "replace": {"park_ride": "yes"} + }, + { + "old": {"parking": "private"}, + "replace": {"access": "private"} + }, + { + "old": {"parking": "street"}, + "replace": {"parking": "lane"} + }, { "old": {"place_name": "*"}, "replace": {"name": "$1"} diff --git a/data/presets.yaml b/data/presets.yaml index ab4c4f1a9..27544ccb2 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -1657,6 +1657,8 @@ en: lane: Roadside Lane # parking=multi-storey multi-storey: Multilevel + # parking=rooftop + rooftop: Rooftop # parking=sheds sheds: Sheds # parking=surface diff --git a/data/presets/fields.json b/data/presets/fields.json index 89b03e550..169908e8f 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -299,7 +299,7 @@ "par": {"key": "par", "type": "number", "minValue": 1, "label": "Par", "placeholder": "3, 4, 5..."}, "park_ride": {"key": "park_ride", "type": "check", "label": "Park and Ride"}, "parking_space": {"key": "parking_space", "type": "combo", "label": "Type"}, - "parking": {"key": "parking", "type": "combo", "label": "Type", "strings": {"options": {"surface": "Surface", "multi-storey": "Multilevel", "underground": "Underground", "sheds": "Sheds", "carports": "Carports", "garage_boxes": "Garage Boxes", "lane": "Roadside Lane"}}}, + "parking": {"key": "parking", "type": "combo", "label": "Type", "strings": {"options": {"surface": "Surface", "underground": "Underground", "multi-storey": "Multilevel", "lane": "Roadside Lane", "carports": "Carports", "garage_boxes": "Garage Boxes", "rooftop": "Rooftop", "sheds": "Sheds"}}}, "payment_multi_fee": {"key": "payment:", "type": "multiCombo", "label": "Payment Types", "prerequisiteTag": {"key": "fee", "valueNot": "no"}}, "payment_multi": {"key": "payment:", "type": "multiCombo", "label": "Payment Types"}, "phases": {"key": "phases", "type": "number", "minValue": 1, "label": "Phases", "placeholder": "1, 2, 3..."}, diff --git a/data/presets/fields/parking.json b/data/presets/fields/parking.json index d0ff081d2..a0925767b 100644 --- a/data/presets/fields/parking.json +++ b/data/presets/fields/parking.json @@ -5,12 +5,13 @@ "strings": { "options": { "surface": "Surface", - "multi-storey": "Multilevel", "underground": "Underground", - "sheds": "Sheds", + "multi-storey": "Multilevel", + "lane": "Roadside Lane", "carports": "Carports", "garage_boxes": "Garage Boxes", - "lane": "Roadside Lane" + "rooftop": "Rooftop", + "sheds": "Sheds" } } } diff --git a/data/taginfo.json b/data/taginfo.json index 70e587aab..c11d95687 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -1686,10 +1686,11 @@ {"key": "park_ride", "description": "🄵 Park and Ride"}, {"key": "parking_space", "description": "🄵 Type"}, {"key": "parking", "value": "surface", "description": "🄵 Type"}, - {"key": "parking", "value": "sheds", "description": "🄵 Type"}, + {"key": "parking", "value": "lane", "description": "🄵 Type"}, {"key": "parking", "value": "carports", "description": "🄵 Type"}, {"key": "parking", "value": "garage_boxes", "description": "🄵 Type"}, - {"key": "parking", "value": "lane", "description": "🄵 Type"}, + {"key": "parking", "value": "rooftop", "description": "🄵 Type"}, + {"key": "parking", "value": "sheds", "description": "🄵 Type"}, {"key": "payment:", "description": "🄵 Payment Types"}, {"key": "phases", "description": "🄵 Phases"}, {"key": "phone", "description": "🄵 Telephone"}, @@ -2189,6 +2190,12 @@ {"key": "operator:type", "value": "Public", "description": "🄳 ➜ operator:type=public"}, {"key": "operator:type", "value": "Publico", "description": "🄳 ➜ operator:type=public"}, {"key": "operator:type", "value": "unknown", "description": "🄳"}, + {"key": "parking", "value": "covered", "description": "🄳 ➜ covered=yes"}, + {"key": "parking", "value": "customers", "description": "🄳 ➜ access=customers"}, + {"key": "parking", "value": "entrance", "description": "🄳 ➜ amenity=parking_entrance"}, + {"key": "parking", "value": "park_and_ride", "description": "🄳 ➜ park_ride=yes"}, + {"key": "parking", "value": "private", "description": "🄳 ➜ access=private"}, + {"key": "parking", "value": "street", "description": "🄳 ➜ parking=lane"}, {"key": "place_name", "description": "🄳 ➜ name=*"}, {"key": "pole", "value": "transition", "description": "🄳 ➜ location:transition=yes"}, {"key": "postcode", "description": "🄳 ➜ addr:postcode=*"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index c894fa7e1..2efd8074a 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -4042,12 +4042,13 @@ "label": "Type", "options": { "surface": "Surface", - "multi-storey": "Multilevel", "underground": "Underground", - "sheds": "Sheds", + "multi-storey": "Multilevel", + "lane": "Roadside Lane", "carports": "Carports", "garage_boxes": "Garage Boxes", - "lane": "Roadside Lane" + "rooftop": "Rooftop", + "sheds": "Sheds" } }, "payment_multi_fee": {