From ed6bdd67cb70db704ff6acf1f09918dd19e67104 Mon Sep 17 00:00:00 2001 From: JamesKingdom Date: Fri, 4 Aug 2017 16:36:45 +0100 Subject: [PATCH 1/4] Adding separate runway reference --- data/presets.yaml | 5 +++++ data/presets/fields.json | 6 ++++++ data/presets/fields/ref_runway.json | 6 ++++++ data/presets/presets.json | 2 +- data/presets/presets/aeroway/runway.json | 2 +- dist/locales/en.json | 4 ++++ 6 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 data/presets/fields/ref_runway.json diff --git a/data/presets.yaml b/data/presets.yaml index 9b503802e..a34f9f6ac 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -1043,6 +1043,11 @@ en: ref_route: # ref=* label: Route Number + ref_runway: + # ref=* + label: Runway Number + # ref_runway field placeholder + placeholder: e.g 01L/23R ref_stop_position: # ref=* label: Stop Number diff --git a/data/presets/fields.json b/data/presets/fields.json index ead82bb63..169c78d44 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -1393,6 +1393,12 @@ "type": "text", "label": "Route Number" }, + "ref_runway": { + "key": "ref", + "type": "text", + "label": "Runway Number", + "placeholder": "e.g 01L/23R" + }, "ref_stop_position": { "key": "ref", "type": "text", diff --git a/data/presets/fields/ref_runway.json b/data/presets/fields/ref_runway.json new file mode 100644 index 000000000..5b42857f1 --- /dev/null +++ b/data/presets/fields/ref_runway.json @@ -0,0 +1,6 @@ +{ + "key": "ref", + "type": "text", + "label": "Runway Number", + "placeholder": "e.g 01L/23R" +} diff --git a/data/presets/presets.json b/data/presets/presets.json index 7aeddfcdb..7d520bbb3 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -467,7 +467,7 @@ "landing strip" ], "fields": [ - "ref", + "ref_runway", "surface", "length", "width" diff --git a/data/presets/presets/aeroway/runway.json b/data/presets/presets/aeroway/runway.json index 42f9dec3d..34885e219 100644 --- a/data/presets/presets/aeroway/runway.json +++ b/data/presets/presets/aeroway/runway.json @@ -7,7 +7,7 @@ "landing strip" ], "fields": [ - "ref", + "ref_runway", "surface", "length", "width" diff --git a/dist/locales/en.json b/dist/locales/en.json index 39d7c52c7..778a60c0a 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -1949,6 +1949,10 @@ "ref_route": { "label": "Route Number" }, + "ref_runway": { + "label": "Runway Number", + "placeholder": "e.g 01L/23R" + }, "ref_stop_position": { "label": "Stop Number" }, From c90424aee5ead748d377ebf546fa7455002480b5 Mon Sep 17 00:00:00 2001 From: JamesKingdom Date: Fri, 4 Aug 2017 16:44:07 +0100 Subject: [PATCH 2/4] Adding separate taxiway reference --- data/presets.yaml | 5 +++++ data/presets/fields.json | 6 ++++++ data/presets/fields/ref_taxiway.json | 6 ++++++ data/presets/presets.json | 2 +- data/presets/presets/aeroway/taxiway.json | 2 +- dist/locales/en.json | 4 ++++ 6 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 data/presets/fields/ref_taxiway.json diff --git a/data/presets.yaml b/data/presets.yaml index a34f9f6ac..73f91ba11 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -1051,6 +1051,11 @@ en: ref_stop_position: # ref=* label: Stop Number + ref_taxiway: + # ref=* + label: Taxiway Name + # ref_taxiway field placeholder + placeholder: e.g A5 relation: # type=* label: Type diff --git a/data/presets/fields.json b/data/presets/fields.json index 169c78d44..6d7e0c431 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -1404,6 +1404,12 @@ "type": "text", "label": "Stop Number" }, + "ref_taxiway": { + "key": "ref", + "type": "text", + "label": "Taxiway Name", + "placeholder": "e.g A5" + }, "ref": { "key": "ref", "type": "text", diff --git a/data/presets/fields/ref_taxiway.json b/data/presets/fields/ref_taxiway.json new file mode 100644 index 000000000..a38d1a84d --- /dev/null +++ b/data/presets/fields/ref_taxiway.json @@ -0,0 +1,6 @@ +{ + "key": "ref", + "type": "text", + "label": "Taxiway Name", + "placeholder": "e.g A5" +} diff --git a/data/presets/presets.json b/data/presets/presets.json index 7d520bbb3..8efc678f5 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -482,7 +482,7 @@ "line" ], "fields": [ - "ref", + "ref_taxiway", "surface" ], "tags": { diff --git a/data/presets/presets/aeroway/taxiway.json b/data/presets/presets/aeroway/taxiway.json index 2f389be5d..3882deaba 100644 --- a/data/presets/presets/aeroway/taxiway.json +++ b/data/presets/presets/aeroway/taxiway.json @@ -3,7 +3,7 @@ "line" ], "fields": [ - "ref", + "ref_taxiway", "surface" ], "tags": { diff --git a/dist/locales/en.json b/dist/locales/en.json index 778a60c0a..0928c72a3 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -1956,6 +1956,10 @@ "ref_stop_position": { "label": "Stop Number" }, + "ref_taxiway": { + "label": "Taxiway Name", + "placeholder": "e.g A5" + }, "ref": { "label": "Reference Code" }, From 7a7cff39a437dafd24cf81e9dabe8263697cea8e Mon Sep 17 00:00:00 2001 From: JamesKingdom Date: Fri, 4 Aug 2017 16:48:12 +0100 Subject: [PATCH 3/4] Make t-bar lift more searchable --- data/presets.yaml | 1 + data/presets/presets.json | 3 +++ data/presets/presets/aerialway/t-bar.json | 3 +++ dist/locales/en.json | 2 +- 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/data/presets.yaml b/data/presets.yaml index 73f91ba11..9720941a1 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -1467,6 +1467,7 @@ en: aerialway/t-bar: # aerialway=t-bar name: T-bar Lift + # 'terms: tbar' terms: '' aeroway: # aeroway=* diff --git a/data/presets/presets.json b/data/presets/presets.json index 8efc678f5..ed3490fcf 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -366,6 +366,9 @@ "aerialway/capacity", "aerialway/duration" ], + "terms": [ + "tbar" + ], "tags": { "aerialway": "t-bar" }, diff --git a/data/presets/presets/aerialway/t-bar.json b/data/presets/presets/aerialway/t-bar.json index e5a08bf8e..7852b99b6 100644 --- a/data/presets/presets/aerialway/t-bar.json +++ b/data/presets/presets/aerialway/t-bar.json @@ -7,6 +7,9 @@ "aerialway/capacity", "aerialway/duration" ], + "terms": [ + "tbar" + ], "tags": { "aerialway": "t-bar" }, diff --git a/dist/locales/en.json b/dist/locales/en.json index 0928c72a3..29a267e79 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -2350,7 +2350,7 @@ }, "aerialway/t-bar": { "name": "T-bar Lift", - "terms": "" + "terms": "tbar" }, "aeroway/aerodrome": { "name": "Airport", From e73be2e933fdb6fd36cef4fe41102e411d303449 Mon Sep 17 00:00:00 2001 From: JamesKingdom Date: Fri, 4 Aug 2017 16:51:08 +0100 Subject: [PATCH 4/4] Allow aerialway station to be drawn as an area --- data/presets/presets.json | 6 ++++-- data/presets/presets/aerialway/station.json | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/data/presets/presets.json b/data/presets/presets.json index ed3490fcf..92c966b3c 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -345,12 +345,14 @@ "icon": "aerialway", "geometry": [ "point", - "vertex" + "vertex", + "area" ], "fields": [ "aerialway/access", "aerialway/summer/access", - "elevation" + "elevation", + "building_area" ], "tags": { "aerialway": "station" diff --git a/data/presets/presets/aerialway/station.json b/data/presets/presets/aerialway/station.json index 19e31c2d9..690a357ae 100644 --- a/data/presets/presets/aerialway/station.json +++ b/data/presets/presets/aerialway/station.json @@ -2,12 +2,14 @@ "icon": "aerialway", "geometry": [ "point", - "vertex" + "vertex", + "area" ], "fields": [ "aerialway/access", "aerialway/summer/access", - "elevation" + "elevation", + "building_area" ], "tags": { "aerialway": "station"