From 5a86ee532a9502c13c625835120da66bb2b2f080 Mon Sep 17 00:00:00 2001 From: Wille Marcel Date: Fri, 22 Jul 2016 14:16:15 -0300 Subject: [PATCH 01/17] add preset for amenity=planetarium --- data/presets.yaml | 5 +++++ data/presets/presets.json | 22 +++++++++++++++++++ data/presets/presets/amenity/planetarium.json | 22 +++++++++++++++++++ data/taginfo.json | 4 ++++ dist/locales/en.json | 4 ++++ 5 files changed, 57 insertions(+) create mode 100644 data/presets/presets/amenity/planetarium.json diff --git a/data/presets.yaml b/data/presets.yaml index 3ef38bf74..d33952d31 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -1426,6 +1426,11 @@ en: name: Mosque # 'terms: muslim' terms: '' + amenity/planetarium: + # amenity=planetarium + name: Planetarium + # 'terms: museum,astronomy,observatory' + terms: '' amenity/police: # amenity=police name: Police diff --git a/data/presets/presets.json b/data/presets/presets.json index 9c8300e76..64d312d43 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -1468,6 +1468,28 @@ }, "name": "Mosque" }, + "amenity/planetarium": { + "icon": "museum", + "fields": [ + "operator", + "building_area", + "address", + "opening_hours" + ], + "geometry": [ + "point", + "area" + ], + "terms": [ + "museum", + "astronomy", + "observatory" + ], + "tags": { + "amenity": "planetarium" + }, + "name": "Planetarium" + }, "amenity/police": { "icon": "police", "fields": [ diff --git a/data/presets/presets/amenity/planetarium.json b/data/presets/presets/amenity/planetarium.json new file mode 100644 index 000000000..e9263a253 --- /dev/null +++ b/data/presets/presets/amenity/planetarium.json @@ -0,0 +1,22 @@ +{ + "icon": "museum", + "fields": [ + "operator", + "building_area", + "address", + "opening_hours" + ], + "geometry": [ + "point", + "area" + ], + "terms": [ + "museum", + "astronomy", + "observatory" + ], + "tags": { + "amenity": "planetarium" + }, + "name": "Planetarium" +} diff --git a/data/taginfo.json b/data/taginfo.json index 1f5da2772..c9f7a4806 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -316,6 +316,10 @@ "key": "religion", "value": "muslim" }, + { + "key": "amenity", + "value": "planetarium" + }, { "key": "amenity", "value": "police" diff --git a/dist/locales/en.json b/dist/locales/en.json index 62d4297d4..c1fa3cd2e 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -1840,6 +1840,10 @@ "name": "Mosque", "terms": "muslim" }, + "amenity/planetarium": { + "name": "Planetarium", + "terms": "museum,astronomy,observatory" + }, "amenity/police": { "name": "Police", "terms": "badge,constable,constabulary,cop,detective,fed,law,enforcement,officer,patrol" From 2f627560c84e1e78867707ac7715d1cd8873a3ae Mon Sep 17 00:00:00 2001 From: Holger Jeromin Date: Wed, 3 Aug 2016 09:59:55 +0200 Subject: [PATCH 02/17] added fields to clock preset --- data/presets/presets/amenity/clock.json | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/data/presets/presets/amenity/clock.json b/data/presets/presets/amenity/clock.json index 89b7d5607..f4c1f9bf3 100644 --- a/data/presets/presets/amenity/clock.json +++ b/data/presets/presets/amenity/clock.json @@ -1,4 +1,10 @@ { + "fields": [ + "support", + "display", + "visibility", + "date" + ], "geometry": [ "point", "vertex" @@ -7,4 +13,4 @@ "amenity": "clock" }, "name": "Clock" -} \ No newline at end of file +} From 2fb0af1594f57e9cdf674e6fa28a3e7f53d1c11d Mon Sep 17 00:00:00 2001 From: Holger Jeromin Date: Wed, 3 Aug 2016 10:02:42 +0200 Subject: [PATCH 03/17] Create date.json --- data/presets/fields/date.json | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 data/presets/fields/date.json diff --git a/data/presets/fields/date.json b/data/presets/fields/date.json new file mode 100644 index 000000000..e8501e407 --- /dev/null +++ b/data/presets/fields/date.json @@ -0,0 +1,5 @@ +{ + "key": "date", + "type": "check", + "label": "Date" +} From bbaaae5a63580c94f95db4980a034e3849cd57e5 Mon Sep 17 00:00:00 2001 From: Holger Jeromin Date: Wed, 3 Aug 2016 10:04:00 +0200 Subject: [PATCH 04/17] added support for clock preset --- data/presets/fields/support.json | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 data/presets/fields/support.json diff --git a/data/presets/fields/support.json b/data/presets/fields/support.json new file mode 100644 index 000000000..d01e64ab6 --- /dev/null +++ b/data/presets/fields/support.json @@ -0,0 +1,5 @@ +{ + "key": "support", + "type": "combo", + "label": "Support" +} From 45964ebb90270b92a44075396887f4ac463c7d4b Mon Sep 17 00:00:00 2001 From: Holger Jeromin Date: Wed, 3 Aug 2016 10:06:05 +0200 Subject: [PATCH 05/17] added display for clocks --- data/presets/fields/display.json | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 data/presets/fields/display.json diff --git a/data/presets/fields/display.json b/data/presets/fields/display.json new file mode 100644 index 000000000..19298b277 --- /dev/null +++ b/data/presets/fields/display.json @@ -0,0 +1,5 @@ +{ + "key": "display", + "type": "combo", + "label": "Display" +} From 0c4bdcc8e427191c706328ab515fcc7f8050785f Mon Sep 17 00:00:00 2001 From: Holger Jeromin Date: Wed, 3 Aug 2016 10:06:55 +0200 Subject: [PATCH 06/17] added visibility for clocks --- data/presets/fields/visibility.json | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 data/presets/fields/visibility.json diff --git a/data/presets/fields/visibility.json b/data/presets/fields/visibility.json new file mode 100644 index 000000000..7802424fb --- /dev/null +++ b/data/presets/fields/visibility.json @@ -0,0 +1,5 @@ +{ + "key": "visibility", + "type": "combo", + "label": "Visibility" +} From 60dd3fdb8077685a72f4af4e19eadc5ae891593d Mon Sep 17 00:00:00 2001 From: Jon D Date: Sun, 21 Aug 2016 15:57:53 +0100 Subject: [PATCH 07/17] Add access_simple field to basketball and tennis presets as per issue #3336 --- data/presets/presets/leisure/pitch/basketball.json | 3 ++- data/presets/presets/leisure/pitch/tennis.json | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/data/presets/presets/leisure/pitch/basketball.json b/data/presets/presets/leisure/pitch/basketball.json index 708bf7687..80d49bc2c 100644 --- a/data/presets/presets/leisure/pitch/basketball.json +++ b/data/presets/presets/leisure/pitch/basketball.json @@ -3,7 +3,8 @@ "fields": [ "surface", "hoops", - "lit" + "lit", + "access_simple" ], "geometry": [ "point", diff --git a/data/presets/presets/leisure/pitch/tennis.json b/data/presets/presets/leisure/pitch/tennis.json index b9920471d..48d6a133a 100644 --- a/data/presets/presets/leisure/pitch/tennis.json +++ b/data/presets/presets/leisure/pitch/tennis.json @@ -2,7 +2,8 @@ "icon": "tennis", "fields": [ "surface", - "lit" + "lit", + "access_simple" ], "geometry": [ "point", From 278816473e472794daf280afdd5f6057a62c9666 Mon Sep 17 00:00:00 2001 From: Jon D Date: Sun, 21 Aug 2016 16:03:25 +0100 Subject: [PATCH 08/17] Add access_simple field to garden also #3336 --- data/presets/presets/leisure/garden.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/data/presets/presets/leisure/garden.json b/data/presets/presets/leisure/garden.json index 5cd9f7377..c37b8048c 100644 --- a/data/presets/presets/leisure/garden.json +++ b/data/presets/presets/leisure/garden.json @@ -1,5 +1,8 @@ { "icon": "garden", + "fields": [ + "access_simple" + ], "geometry": [ "point", "vertex", From d0fcb9689280c616b49f5789bd3b91dd54d7370a Mon Sep 17 00:00:00 2001 From: Jon D Date: Mon, 22 Aug 2016 09:01:37 +0100 Subject: [PATCH 09/17] Check in generated presets.json file from `make` for #3336 --- data/presets/presets.json | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/data/presets/presets.json b/data/presets/presets.json index 7885fd960..31e71e2c9 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -5836,6 +5836,9 @@ }, "leisure/garden": { "icon": "garden", + "fields": [ + "access_simple" + ], "geometry": [ "point", "vertex", @@ -6051,7 +6054,8 @@ "fields": [ "surface", "hoops", - "lit" + "lit", + "access_simple" ], "geometry": [ "point", @@ -6153,7 +6157,8 @@ "icon": "tennis", "fields": [ "surface", - "lit" + "lit", + "access_simple" ], "geometry": [ "point", From 4a776cc7c7e29a6940cf21ff73164b6452f5b91a Mon Sep 17 00:00:00 2001 From: greenkeeperio-bot Date: Fri, 26 Aug 2016 14:30:34 -0400 Subject: [PATCH 10/17] chore(package): update eslint to version 3.4.0 https://greenkeeper.io/ --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1f92ddd0e..1db01d796 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "brfs": "1.4.3", "d3": "3.5.5", "editor-layer-index": "git://github.com/osmlab/editor-layer-index.git#gh-pages", - "eslint": "~3.3.1", + "eslint": "~3.4.0", "glob": "~7.0.5", "happen": "~0.3.1", "http-server": "0.9.0", From 9a5598e8cd43d3ccbb6136fc3a4ddfae21cf2220 Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Sat, 27 Aug 2016 21:24:07 +0200 Subject: [PATCH 11/17] Add fire-station icon for fire-hydrant Fire hydrants are for firemen anyway, and it help distinguish them from other no-icon point on the map. By the way, is there any plan to upgrade maki from version 0.5.0 to latest version 2.0.x? Is that OK if I migrate iD by updating icons' name or there is a particular reason to use maki 0.5.0? --- data/presets/presets/emergency/fire_hydrant.json | 1 + 1 file changed, 1 insertion(+) diff --git a/data/presets/presets/emergency/fire_hydrant.json b/data/presets/presets/emergency/fire_hydrant.json index 98cff3625..11fb9155f 100644 --- a/data/presets/presets/emergency/fire_hydrant.json +++ b/data/presets/presets/emergency/fire_hydrant.json @@ -1,4 +1,5 @@ { + "icon": "fire-station", "fields": [ "fire_hydrant/type" ], From 84de65e316a3fcfa3fcc71e09b2de317cee35bca Mon Sep 17 00:00:00 2001 From: Wille Marcel Date: Sun, 28 Aug 2016 11:24:42 -0300 Subject: [PATCH 12/17] add preset to amenity=coworking_space --- data/presets.yaml | 5 +++++ data/presets/presets.json | 20 +++++++++++++++++++ .../presets/amenity/coworking_space.json | 20 +++++++++++++++++++ data/taginfo.json | 4 ++++ dist/locales/en.json | 4 ++++ 5 files changed, 53 insertions(+) create mode 100644 data/presets/presets/amenity/coworking_space.json diff --git a/data/presets.yaml b/data/presets.yaml index 382c41ab8..c67164e04 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -1368,6 +1368,11 @@ en: # amenity=courthouse name: Courthouse terms: '' + amenity/coworking_space: + # amenity=coworking_space + name: Coworking Space + # 'terms: coworking,office' + terms: '' amenity/dentist: # amenity=dentist name: Dentist diff --git a/data/presets/presets.json b/data/presets/presets.json index 7885fd960..24d396616 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -980,6 +980,26 @@ }, "name": "Courthouse" }, + "amenity/coworking_space": { + "icon": "commercial", + "fields": [ + "address", + "building_area", + "opening_hours" + ], + "geometry": [ + "point", + "area" + ], + "terms": [ + "coworking", + "office" + ], + "tags": { + "amenity": "coworking_space" + }, + "name": "Coworking Space" + }, "amenity/dentist": { "icon": "dentist", "fields": [ diff --git a/data/presets/presets/amenity/coworking_space.json b/data/presets/presets/amenity/coworking_space.json new file mode 100644 index 000000000..d12b7924c --- /dev/null +++ b/data/presets/presets/amenity/coworking_space.json @@ -0,0 +1,20 @@ +{ + "icon": "commercial", + "fields": [ + "address", + "building_area", + "opening_hours" + ], + "geometry": [ + "point", + "area" + ], + "terms": [ + "coworking", + "office" + ], + "tags": { + "amenity": "coworking_space" + }, + "name": "Coworking Space" +} diff --git a/data/taginfo.json b/data/taginfo.json index 679345bfa..85f0b3531 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -227,6 +227,10 @@ "key": "amenity", "value": "courthouse" }, + { + "key": "amenity", + "value": "coworking_space" + }, { "key": "amenity", "value": "dentist" diff --git a/dist/locales/en.json b/dist/locales/en.json index 9d912e5ec..86f3a4565 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -1815,6 +1815,10 @@ "name": "Courthouse", "terms": "" }, + "amenity/coworking_space": { + "name": "Coworking Space", + "terms": "coworking,office" + }, "amenity/dentist": { "name": "Dentist", "terms": "tooth,teeth" From 0695a38827f009e992980652b731f149fae091ae Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Sun, 28 Aug 2016 15:39:31 -0400 Subject: [PATCH 13/17] Run make for new preset strings --- data/presets/presets.json | 1 + 1 file changed, 1 insertion(+) diff --git a/data/presets/presets.json b/data/presets/presets.json index 24d396616..6db915209 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -4251,6 +4251,7 @@ "name": "Defibrillator" }, "emergency/fire_hydrant": { + "icon": "fire-station", "fields": [ "fire_hydrant/type" ], From 7e30fa0fe39e4fa613a6e9ebf7b845585edca598 Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Sun, 28 Aug 2016 16:10:16 -0400 Subject: [PATCH 14/17] Add string suggestions for display and visibility combos --- data/presets.yaml | 19 +++++++++++++++++ data/presets/fields.json | 33 +++++++++++++++++++++++++++++ data/presets/fields/display.json | 3 ++- data/presets/fields/visibility.json | 9 +++++++- data/presets/presets.json | 6 ++++++ dist/locales/en.json | 17 +++++++++++++++ 6 files changed, 85 insertions(+), 2 deletions(-) diff --git a/data/presets.yaml b/data/presets.yaml index c67164e04..b5180ed2c 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -321,6 +321,9 @@ en: types: 'cycleway:left': Left side 'cycleway:right': Right side + date: + # date=* + label: Date delivery: # delivery=* label: Delivery @@ -336,6 +339,9 @@ en: diaper: # diaper=* label: Diaper Changing Available + display: + # display=* + label: Display dock: # dock=* label: Type @@ -1040,6 +1046,9 @@ en: supervised: # supervised=* label: Supervised + support: + # support=* + label: Support surface: # surface=* label: Surface @@ -1122,6 +1131,16 @@ en: vending: # vending=* label: Type of Goods + visibility: + # visibility=* + label: Visibility + options: + # visibility=area + area: Over 20m (65ft) + # visibility=house + house: Up to 5m (16ft) + # visibility=street + street: 5 to 20m (16 to 65ft) water: # water=* label: Type diff --git a/data/presets/fields.json b/data/presets/fields.json index e16b320bc..3d5ebf5bc 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -418,6 +418,11 @@ } } }, + "date": { + "key": "date", + "type": "check", + "label": "Date" + }, "delivery": { "key": "delivery", "type": "check", @@ -454,6 +459,17 @@ "5" ] }, + "display": { + "key": "display", + "type": "combo", + "label": "Display", + "options": [ + "analog", + "digital", + "sundial", + "unorthodox" + ] + }, "dock": { "key": "dock", "type": "combo", @@ -1391,6 +1407,11 @@ "type": "check", "label": "Supervised" }, + "support": { + "key": "support", + "type": "combo", + "label": "Support" + }, "surface": { "key": "surface", "type": "combo", @@ -1489,6 +1510,18 @@ "type": "combo", "label": "Type of Goods" }, + "visibility": { + "key": "visibility", + "type": "combo", + "label": "Visibility", + "strings": { + "options": { + "house": "Up to 5m (16ft)", + "street": "5 to 20m (16 to 65ft)", + "area": "Over 20m (65ft)" + } + } + }, "water_point": { "key": "water_point", "type": "check", diff --git a/data/presets/fields/display.json b/data/presets/fields/display.json index 19298b277..83d9dc845 100644 --- a/data/presets/fields/display.json +++ b/data/presets/fields/display.json @@ -1,5 +1,6 @@ { "key": "display", "type": "combo", - "label": "Display" + "label": "Display", + "options": ["analog", "digital", "sundial", "unorthodox"] } diff --git a/data/presets/fields/visibility.json b/data/presets/fields/visibility.json index 7802424fb..a36b27396 100644 --- a/data/presets/fields/visibility.json +++ b/data/presets/fields/visibility.json @@ -1,5 +1,12 @@ { "key": "visibility", "type": "combo", - "label": "Visibility" + "label": "Visibility", + "strings": { + "options": { + "house": "Up to 5m (16ft)", + "street": "5 to 20m (16 to 65ft)", + "area": "Over 20m (65ft)" + } + } } diff --git a/data/presets/presets.json b/data/presets/presets.json index 0e5fc7eae..923f44e41 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -906,6 +906,12 @@ "name": "Clinic" }, "amenity/clock": { + "fields": [ + "support", + "display", + "visibility", + "date" + ], "geometry": [ "point", "vertex" diff --git a/dist/locales/en.json b/dist/locales/en.json index 86f3a4565..2345ba686 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -914,6 +914,9 @@ } } }, + "date": { + "label": "Date" + }, "delivery": { "label": "Delivery" }, @@ -929,6 +932,9 @@ "diaper": { "label": "Diaper Changing Available" }, + "display": { + "label": "Display" + }, "dock": { "label": "Type" }, @@ -1499,6 +1505,9 @@ "supervised": { "label": "Supervised" }, + "support": { + "label": "Support" + }, "surface": { "label": "Surface" }, @@ -1564,6 +1573,14 @@ "vending": { "label": "Type of Goods" }, + "visibility": { + "label": "Visibility", + "options": { + "house": "Up to 5m (16ft)", + "street": "5 to 20m (16 to 65ft)", + "area": "Over 20m (65ft)" + } + }, "water_point": { "label": "Water Point" }, From aa1d03c82370b993e56dc3e18b6849453918c9dd Mon Sep 17 00:00:00 2001 From: Holger Jeromin Date: Fri, 2 Sep 2016 09:20:44 +0200 Subject: [PATCH 15/17] Added Radix for parseInt call --- modules/core/way.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/core/way.js b/modules/core/way.js index 319e2aefd..4d698b9d7 100644 --- a/modules/core/way.js +++ b/modules/core/way.js @@ -146,11 +146,11 @@ _.extend(Way.prototype, { break; } - if (this.tags.lanes) metadata.count = parseInt(this.tags.lanes); + if (this.tags.lanes) metadata.count = parseInt(this.tags.lanes, 10); metadata.oneway = this.isOneWay(); - if (parseInt(this.tags.oneway) === -1) { + if (parseInt(this.tags.oneway, 10) === -1) { metadata.forward = 0; metadata.bothways = 0; metadata.backward = metadata.count; @@ -160,12 +160,12 @@ _.extend(Way.prototype, { metadata.bothways = 0; metadata.backward = 0; } else { - metadata.bothways = parseInt(this.tags['lanes:both_ways']) > 0 ? 1 : 0; - metadata.forward = parseInt(this.tags['lanes:forward']); - metadata.backward = parseInt(this.tags['lanes:backward']); + metadata.bothways = parseInt(this.tags['lanes:both_ways'], 10) > 0 ? 1 : 0; + metadata.forward = parseInt(this.tags['lanes:forward'], 10); + metadata.backward = parseInt(this.tags['lanes:backward'], 10); if (_.isNaN(metadata.forward) && _.isNaN(metadata.backward)) { - metadata.forward = parseInt((metadata.count - metadata.bothways) / 2); + metadata.forward = parseInt((metadata.count - metadata.bothways) / 2, 10); metadata.backward = metadata.count - metadata.bothways - metadata.forward; } else if (_.isNaN(metadata.forward)) { From d1105ccc14b300a5e42b692ee2b0d02bd41d8166 Mon Sep 17 00:00:00 2001 From: Holger Jeromin Date: Fri, 2 Sep 2016 09:35:21 +0200 Subject: [PATCH 16/17] Removing parseInt call of a number --- modules/core/way.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/core/way.js b/modules/core/way.js index 4d698b9d7..91f50670a 100644 --- a/modules/core/way.js +++ b/modules/core/way.js @@ -165,7 +165,7 @@ _.extend(Way.prototype, { metadata.backward = parseInt(this.tags['lanes:backward'], 10); if (_.isNaN(metadata.forward) && _.isNaN(metadata.backward)) { - metadata.forward = parseInt((metadata.count - metadata.bothways) / 2, 10); + metadata.forward = (metadata.count - metadata.bothways) / 2; metadata.backward = metadata.count - metadata.bothways - metadata.forward; } else if (_.isNaN(metadata.forward)) { From 8c29dd93480f905e13b728d5bc7bf231757b1347 Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Fri, 2 Sep 2016 10:39:54 -0400 Subject: [PATCH 17/17] Enable radix eslint rule --- .eslintrc | 1 + 1 file changed, 1 insertion(+) diff --git a/.eslintrc b/.eslintrc index 914c74e93..2535fa3fe 100644 --- a/.eslintrc +++ b/.eslintrc @@ -58,6 +58,7 @@ "no-warning-comments": "warn", "no-with": "error", "no-use-before-define": ["off", "nofunc"], + "radix": ["error", "always"], "semi": ["error", "always"], "semi-spacing": "error", "space-unary-ops": "error",