From 8b8f1f5b89de67f62a61cebd3828d26cc9033475 Mon Sep 17 00:00:00 2001 From: JamesKingdom Date: Mon, 31 Jul 2017 12:59:40 +0100 Subject: [PATCH 1/5] Adding some more railway presets --- data/presets/presets/railway/derail.json | 13 +++++++++++++ data/presets/presets/railway/milestone.json | 15 +++++++++++++++ data/presets/presets/railway/signal.json | 15 +++++++++++++++ data/presets/presets/railway/switch.json | 14 ++++++++++++++ data/presets/presets/railway/wash.json | 16 ++++++++++++++++ 5 files changed, 73 insertions(+) create mode 100644 data/presets/presets/railway/derail.json create mode 100644 data/presets/presets/railway/milestone.json create mode 100644 data/presets/presets/railway/signal.json create mode 100644 data/presets/presets/railway/switch.json create mode 100644 data/presets/presets/railway/wash.json diff --git a/data/presets/presets/railway/derail.json b/data/presets/presets/railway/derail.json new file mode 100644 index 000000000..e243c20ce --- /dev/null +++ b/data/presets/presets/railway/derail.json @@ -0,0 +1,13 @@ +{ + "icon": "roadblock", + "geometry": [ + "vertex" + ], + "tags": { + "railway": "derail" + }, + "terms": [ + "derailer" + ], + "name": "Railway Derailer" +} diff --git a/data/presets/presets/railway/milestone.json b/data/presets/presets/railway/milestone.json new file mode 100644 index 000000000..ac79e3fad --- /dev/null +++ b/data/presets/presets/railway/milestone.json @@ -0,0 +1,15 @@ +{ + "icon": "roadblock", + "geometry": [ + "point", + "vertex" + ], + "tags": { + "railway": "milestone" + }, + "terms": [ + "milestone", + "marker" + ], + "name": "Railway Milestone" +} diff --git a/data/presets/presets/railway/signal.json b/data/presets/presets/railway/signal.json new file mode 100644 index 000000000..028e4ef45 --- /dev/null +++ b/data/presets/presets/railway/signal.json @@ -0,0 +1,15 @@ +{ + "icon": "poi-junction", + "geometry": [ + "point", + "vertex" + ], + "tags": { + "railway": "signal" + }, + "terms": [ + "signal", + "lights" + ], + "name": "Railway Signal" +} diff --git a/data/presets/presets/railway/switch.json b/data/presets/presets/railway/switch.json new file mode 100644 index 000000000..9de580718 --- /dev/null +++ b/data/presets/presets/railway/switch.json @@ -0,0 +1,14 @@ +{ + "icon": "poi-junction", + "geometry": [ + "vertex" + ], + "tags": { + "railway": "switch" + }, + "terms": [ + "switch", + "points" + ], + "name": "Railway Switch" +} diff --git a/data/presets/presets/railway/wash.json b/data/presets/presets/railway/wash.json new file mode 100644 index 000000000..c4c605f7b --- /dev/null +++ b/data/presets/presets/railway/wash.json @@ -0,0 +1,16 @@ +{ + "icon": "rail", + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "railway": "wash" + }, + "terms": [ + "wash", + "clean" + ], + "name": "Railway Wash" +} From 6da0719f3a49d4173fe4769e2522a2edccd62885 Mon Sep 17 00:00:00 2001 From: JamesKingdom Date: Mon, 31 Jul 2017 15:58:06 +0100 Subject: [PATCH 2/5] Rename railway-wash to train wash, as this name seems more commonly used --- data/presets/presets/railway/{wash.json => train_wash.json} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename data/presets/presets/railway/{wash.json => train_wash.json} (88%) diff --git a/data/presets/presets/railway/wash.json b/data/presets/presets/railway/train_wash.json similarity index 88% rename from data/presets/presets/railway/wash.json rename to data/presets/presets/railway/train_wash.json index c4c605f7b..af9e8941c 100644 --- a/data/presets/presets/railway/wash.json +++ b/data/presets/presets/railway/train_wash.json @@ -12,5 +12,5 @@ "wash", "clean" ], - "name": "Railway Wash" + "name": "Train Wash" } From 6de3db3f3dbb020beb68c0427e9bbcac556e911b Mon Sep 17 00:00:00 2001 From: JamesKingdom Date: Mon, 31 Jul 2017 19:35:44 +0100 Subject: [PATCH 3/5] Updating milestone to triangle-stroked, and building NPM --- data/presets.yaml | 25 +++++++ data/presets/presets.json | 73 +++++++++++++++++++++ data/presets/presets/railway/milestone.json | 2 +- data/taginfo.json | 20 ++++++ dist/locales/en.json | 20 ++++++ 5 files changed, 139 insertions(+), 1 deletion(-) diff --git a/data/presets.yaml b/data/presets.yaml index c992fa4e4..549854fbe 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -3760,6 +3760,11 @@ en: name: Railway Crossing (Path) # 'terms: crossing,pedestrian crossing,railroad crossing,level crossing,grade crossing,path through railroad,train crossing' terms: '' + railway/derail: + # railway=derail + name: Railway Derailer + # 'terms: derailer' + terms: '' railway/disused: # railway=disused name: Disused Railway @@ -3779,6 +3784,11 @@ en: name: Railway Crossing (Road) # 'terms: crossing,railroad crossing,level crossing,grade crossing,road through railroad,train crossing' terms: '' + railway/milestone: + # railway=milestone + name: Railway Milestone + # 'terms: milestone,marker' + terms: '' railway/monorail: # railway=monorail name: Monorail @@ -3796,6 +3806,11 @@ en: # railway=rail name: Rail terms: '' + railway/signal: + # railway=signal + name: Railway Signal + # 'terms: signal,lights' + terms: '' railway/station: # railway=station name: Railway Station @@ -3811,6 +3826,16 @@ en: name: Subway Entrance # 'terms: metro,transit' terms: '' + railway/switch: + # railway=switch + name: Railway Switch + # 'terms: switch,points' + terms: '' + railway/train_wash: + # railway=wash + name: Train Wash + # 'terms: wash,clean' + terms: '' railway/tram: # railway=tram name: Tram diff --git a/data/presets/presets.json b/data/presets/presets.json index c45969634..7ade44fbf 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -10313,6 +10313,19 @@ ], "name": "Railway Crossing (Path)" }, + "railway/derail": { + "icon": "roadblock", + "geometry": [ + "vertex" + ], + "tags": { + "railway": "derail" + }, + "terms": [ + "derailer" + ], + "name": "Railway Derailer" + }, "railway/disused": { "icon": "railway-disused", "geometry": [ @@ -10386,6 +10399,21 @@ ], "name": "Railway Crossing (Road)" }, + "railway/milestone": { + "icon": "triangle-stroked", + "geometry": [ + "point", + "vertex" + ], + "tags": { + "railway": "milestone" + }, + "terms": [ + "milestone", + "marker" + ], + "name": "Railway Milestone" + }, "railway/monorail": { "icon": "railway-monorail", "geometry": [ @@ -10457,6 +10485,21 @@ "terms": [], "name": "Rail" }, + "railway/signal": { + "icon": "poi-junction", + "geometry": [ + "point", + "vertex" + ], + "tags": { + "railway": "signal" + }, + "terms": [ + "signal", + "lights" + ], + "name": "Railway Signal" + }, "railway/station": { "icon": "rail", "fields": [ @@ -10517,6 +10560,36 @@ ], "name": "Subway" }, + "railway/switch": { + "icon": "poi-junction", + "geometry": [ + "vertex" + ], + "tags": { + "railway": "switch" + }, + "terms": [ + "switch", + "points" + ], + "name": "Railway Switch" + }, + "railway/train_wash": { + "icon": "rail", + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "railway": "wash" + }, + "terms": [ + "wash", + "clean" + ], + "name": "Train Wash" + }, "railway/tram_stop": { "icon": "rail-light", "fields": [ diff --git a/data/presets/presets/railway/milestone.json b/data/presets/presets/railway/milestone.json index ac79e3fad..e7167b829 100644 --- a/data/presets/presets/railway/milestone.json +++ b/data/presets/presets/railway/milestone.json @@ -1,5 +1,5 @@ { - "icon": "roadblock", + "icon": "triangle-stroked", "geometry": [ "point", "vertex" diff --git a/data/taginfo.json b/data/taginfo.json index 245fb9134..0dfc9f114 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -2137,6 +2137,10 @@ "key": "railway", "value": "crossing" }, + { + "key": "railway", + "value": "derail" + }, { "key": "railway", "value": "disused" @@ -2153,6 +2157,10 @@ "key": "railway", "value": "level_crossing" }, + { + "key": "railway", + "value": "milestone" + }, { "key": "railway", "value": "monorail" @@ -2169,6 +2177,10 @@ "key": "railway", "value": "rail" }, + { + "key": "railway", + "value": "signal" + }, { "key": "railway", "value": "station" @@ -2181,6 +2193,14 @@ "key": "railway", "value": "subway" }, + { + "key": "railway", + "value": "switch" + }, + { + "key": "railway", + "value": "wash" + }, { "key": "railway", "value": "tram_stop" diff --git a/dist/locales/en.json b/dist/locales/en.json index 9d9ec0214..fa7219167 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -4404,6 +4404,10 @@ "name": "Railway Crossing (Path)", "terms": "crossing,pedestrian crossing,railroad crossing,level crossing,grade crossing,path through railroad,train crossing" }, + "railway/derail": { + "name": "Railway Derailer", + "terms": "derailer" + }, "railway/disused": { "name": "Disused Railway", "terms": "" @@ -4420,6 +4424,10 @@ "name": "Railway Crossing (Road)", "terms": "crossing,railroad crossing,level crossing,grade crossing,road through railroad,train crossing" }, + "railway/milestone": { + "name": "Railway Milestone", + "terms": "milestone,marker" + }, "railway/monorail": { "name": "Monorail", "terms": "" @@ -4436,6 +4444,10 @@ "name": "Rail", "terms": "" }, + "railway/signal": { + "name": "Railway Signal", + "terms": "signal,lights" + }, "railway/station": { "name": "Railway Station", "terms": "train station,station" @@ -4448,6 +4460,14 @@ "name": "Subway", "terms": "metro,transit" }, + "railway/switch": { + "name": "Railway Switch", + "terms": "switch,points" + }, + "railway/train_wash": { + "name": "Train Wash", + "terms": "wash,clean" + }, "railway/tram_stop": { "name": "Tram Stop", "terms": "light rail,streetcar,tram,trolley" From 8e618439543a6c59668cd4fe91dc47b0f2ca6f35 Mon Sep 17 00:00:00 2001 From: JamesKingdom Date: Mon, 31 Jul 2017 21:22:58 +0100 Subject: [PATCH 4/5] Updating milestone_position, and trainwash --- data/presets.yaml | 3 +++ data/presets/fields.json | 5 +++++ data/presets/fields/milestone_position.json | 5 +++++ data/presets/presets.json | 7 +++++++ data/presets/presets/railway/milestone.json | 3 +++ data/presets/presets/railway/train_wash.json | 4 ++++ dist/locales/en.json | 3 +++ 7 files changed, 30 insertions(+) create mode 100644 data/presets/fields/milestone_position.json diff --git a/data/presets.yaml b/data/presets.yaml index 549854fbe..317b5aefc 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -730,6 +730,9 @@ en: maxweight: # maxweight=* label: Max Weight + milestone_position: + # 'railway:position=*' + label: Milestone Position mtb/scale: # 'mtb:scale=*' label: Mountain Biking Difficulty diff --git a/data/presets/fields.json b/data/presets/fields.json index f1f4c1ac4..fb530443c 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -1028,6 +1028,11 @@ "label": "Max Weight", "snake_case": false }, + "milestone_position": { + "key": "railway:position", + "type": "text", + "label": "Milestone Position" + }, "mtb/scale": { "key": "mtb:scale", "type": "combo", diff --git a/data/presets/fields/milestone_position.json b/data/presets/fields/milestone_position.json new file mode 100644 index 000000000..2ad3126a7 --- /dev/null +++ b/data/presets/fields/milestone_position.json @@ -0,0 +1,5 @@ +{ + "key": "railway:position", + "type": "text", + "label": "Milestone Position" +} diff --git a/data/presets/presets.json b/data/presets/presets.json index 7ade44fbf..09e3de2b7 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -10405,6 +10405,9 @@ "point", "vertex" ], + "fields": [ + "milestone_position" + ], "tags": { "railway": "milestone" }, @@ -10581,6 +10584,10 @@ "vertex", "area" ], + "fields": [ + "operator", + "building_area" + ], "tags": { "railway": "wash" }, diff --git a/data/presets/presets/railway/milestone.json b/data/presets/presets/railway/milestone.json index e7167b829..58cfa7bbc 100644 --- a/data/presets/presets/railway/milestone.json +++ b/data/presets/presets/railway/milestone.json @@ -4,6 +4,9 @@ "point", "vertex" ], + "fields": [ + "milestone_position" + ], "tags": { "railway": "milestone" }, diff --git a/data/presets/presets/railway/train_wash.json b/data/presets/presets/railway/train_wash.json index af9e8941c..a5a36febd 100644 --- a/data/presets/presets/railway/train_wash.json +++ b/data/presets/presets/railway/train_wash.json @@ -5,6 +5,10 @@ "vertex", "area" ], + "fields": [ + "operator", + "building_area" + ], "tags": { "railway": "wash" }, diff --git a/dist/locales/en.json b/dist/locales/en.json index fa7219167..fb778f22b 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -1707,6 +1707,9 @@ "maxweight": { "label": "Max Weight" }, + "milestone_position": { + "label": "Milestone Position" + }, "mtb/scale": { "label": "Mountain Biking Difficulty", "placeholder": "0, 1, 2, 3...", From 785370189f519519306225fb1b0b352ef2292004 Mon Sep 17 00:00:00 2001 From: JamesKingdom Date: Mon, 31 Jul 2017 21:41:38 +0100 Subject: [PATCH 5/5] Adding a placeholder to milestone_position --- data/presets.yaml | 2 ++ data/presets/fields.json | 1 + data/presets/fields/milestone_position.json | 1 + dist/locales/en.json | 3 ++- 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/data/presets.yaml b/data/presets.yaml index 317b5aefc..9b503802e 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -733,6 +733,8 @@ en: milestone_position: # 'railway:position=*' label: Milestone Position + # milestone_position field placeholder + placeholder: Distance to one decimal (123.4) mtb/scale: # 'mtb:scale=*' label: Mountain Biking Difficulty diff --git a/data/presets/fields.json b/data/presets/fields.json index fb530443c..3c603245b 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -1031,6 +1031,7 @@ "milestone_position": { "key": "railway:position", "type": "text", + "placeholder": "Distance to one decimal (123.4)", "label": "Milestone Position" }, "mtb/scale": { diff --git a/data/presets/fields/milestone_position.json b/data/presets/fields/milestone_position.json index 2ad3126a7..657346515 100644 --- a/data/presets/fields/milestone_position.json +++ b/data/presets/fields/milestone_position.json @@ -1,5 +1,6 @@ { "key": "railway:position", "type": "text", + "placeholder": "Distance to one decimal (123.4)", "label": "Milestone Position" } diff --git a/dist/locales/en.json b/dist/locales/en.json index fb778f22b..39d7c52c7 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -1708,7 +1708,8 @@ "label": "Max Weight" }, "milestone_position": { - "label": "Milestone Position" + "label": "Milestone Position", + "placeholder": "Distance to one decimal (123.4)" }, "mtb/scale": { "label": "Mountain Biking Difficulty",