From a10954b2ad21ff63da0b213d381a405176a4a17f Mon Sep 17 00:00:00 2001 From: hikemaniac <31667811+hikemaniac@users.noreply.github.com> Date: Sat, 10 Feb 2018 11:49:58 +0100 Subject: [PATCH 01/12] Added religion and denomination fields. --- data/presets/presets/historic/wayside_shrine.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/data/presets/presets/historic/wayside_shrine.json b/data/presets/presets/historic/wayside_shrine.json index 524ee646e..dada64bbc 100644 --- a/data/presets/presets/historic/wayside_shrine.json +++ b/data/presets/presets/historic/wayside_shrine.json @@ -2,6 +2,8 @@ "icon": "landmark", "fields": [ "name", + "religion", + "denomination", "inscription" ], "geometry": [ From 21ab63d9ca15b517b9ece5e94256406389149fbe Mon Sep 17 00:00:00 2001 From: hikemaniac <31667811+hikemaniac@users.noreply.github.com> Date: Sat, 10 Feb 2018 11:52:25 +0100 Subject: [PATCH 02/12] Added religion and denomination fields. --- data/presets/presets.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/data/presets/presets.json b/data/presets/presets.json index 642304d1b..67951fbc4 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -8241,6 +8241,8 @@ "icon": "landmark", "fields": [ "name", + "religion", + "denomination" "inscription" ], "geometry": [ From 746c34ecd27a816ff4dd4a8b6a248a5a4c37b3d7 Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Sat, 10 Feb 2018 10:19:14 -0500 Subject: [PATCH 03/12] npm run build --- data/presets/presets.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/presets/presets.json b/data/presets/presets.json index 67951fbc4..b924ecfb5 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -8242,7 +8242,7 @@ "fields": [ "name", "religion", - "denomination" + "denomination", "inscription" ], "geometry": [ From aa34a055f6e83667899a24ad329d97c883b6a632 Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Sat, 10 Feb 2018 10:41:10 -0500 Subject: [PATCH 04/12] Capitalize "Wholesale" --- data/presets.yaml | 2 +- data/presets/fields.json | 2 +- data/presets/fields/wholesale.json | 4 ++-- dist/locales/en.json | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/data/presets.yaml b/data/presets.yaml index 5fe76eebf..b367bee15 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -1622,7 +1622,7 @@ en: label: Wheelchair Access wholesale: # wholesale=* - label: wholesale + label: Wholesale width: # width=* label: Width (Meters) diff --git a/data/presets/fields.json b/data/presets/fields.json index 9572dd677..24ad0e858 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -2205,7 +2205,7 @@ "wholesale": { "key": "wholesale", "type": "typeCombo", - "label": "wholesale" + "label": "Wholesale" }, "width": { "key": "width", diff --git a/data/presets/fields/wholesale.json b/data/presets/fields/wholesale.json index 9612b71db..d3d1fd999 100644 --- a/data/presets/fields/wholesale.json +++ b/data/presets/fields/wholesale.json @@ -1,5 +1,5 @@ { "key": "wholesale", "type": "typeCombo", - "label": "wholesale" -} \ No newline at end of file + "label": "Wholesale" +} diff --git a/dist/locales/en.json b/dist/locales/en.json index 10539519a..bf48be27f 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -2643,7 +2643,7 @@ "label": "Wheelchair Access" }, "wholesale": { - "label": "wholesale" + "label": "Wholesale" }, "width": { "label": "Width (Meters)" From 013253ecde6eeb2e20ea92332079fac6a4ef0d80 Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Sun, 11 Feb 2018 22:24:06 -0500 Subject: [PATCH 05/12] Improve combobox option visibility (closes #4761) This improves the usability of the combobox when it appears over other rows of fields (e.g. raw tag editor) 1. shrink size on left/right to provide more separation from content beneath 2. adjust box shadow for slightly more visibility 3. shrink size of first option by one pixel, so that the combobox options will never perfectly line up with rows that they cover --- css/80_app.css | 5 +++-- modules/lib/d3.combobox.js | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/css/80_app.css b/css/80_app.css index 63208b068..6fc8cc30b 100644 --- a/css/80_app.css +++ b/css/80_app.css @@ -1883,7 +1883,7 @@ input[type=number] { div.combobox { z-index: 9999; display: none; - box-shadow: 0 0 10px 0 rgba(0,0,0,.1); + box-shadow: 0 4px 10px 1px rgba(0,0,0,.2); margin-top: -1px; background: white; max-height: 120px; @@ -1896,7 +1896,7 @@ div.combobox { .combobox a { display: block; padding: 5px 10px; - border-top:1px solid #ccc; + border-top: 1px solid #ccc; text-overflow: ellipsis; white-space: nowrap; overflow: hidden; @@ -1909,6 +1909,7 @@ div.combobox { .combobox a:first-child { border-top: 0; + padding: 4px 10px; } .combobox-caret { diff --git a/modules/lib/d3.combobox.js b/modules/lib/d3.combobox.js index 92cd0a736..60c2ecbdc 100644 --- a/modules/lib/d3.combobox.js +++ b/modules/lib/d3.combobox.js @@ -265,8 +265,8 @@ export function d3combobox() { var rect = node.getBoundingClientRect(); wrapper - .style('left', rect.left + 'px') - .style('width', rect.width + 'px') + .style('left', (rect.left + 5) + 'px') + .style('width', (rect.width - 10) + 'px') .style('top', rect.height + rect.top + 'px'); } From aa3b4882de0714d6b90f95cfbda35db9eb9659bc Mon Sep 17 00:00:00 2001 From: James Kingdom Date: Mon, 12 Feb 2018 19:28:17 +0000 Subject: [PATCH 06/12] Change max nodes per request (closes #4793) --- API.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/API.md b/API.md index dda44dd4e..9c122687a 100644 --- a/API.md +++ b/API.md @@ -296,4 +296,4 @@ var id = iD.Context() ``` -This should be set with caution for performance reasons. The OpenStreetMap API has a limitation of 50000 nodes per request. +This should be set with caution for performance reasons. The OpenStreetMap API has a limitation of 10000 nodes per request. From 73f78c3622b949270758306c88910214aeb41d37 Mon Sep 17 00:00:00 2001 From: James Kingdom Date: Mon, 12 Feb 2018 19:54:19 +0000 Subject: [PATCH 07/12] Revert max nodes to 50k --- API.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/API.md b/API.md index 9c122687a..dda44dd4e 100644 --- a/API.md +++ b/API.md @@ -296,4 +296,4 @@ var id = iD.Context() ``` -This should be set with caution for performance reasons. The OpenStreetMap API has a limitation of 10000 nodes per request. +This should be set with caution for performance reasons. The OpenStreetMap API has a limitation of 50000 nodes per request. From a80f5b0957d1e3f060218416373f618773bafe57 Mon Sep 17 00:00:00 2001 From: vershwal Date: Thu, 15 Feb 2018 17:55:04 +0530 Subject: [PATCH 08/12] fixes 4795 : Added check for properties --- modules/svg/gpx.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/svg/gpx.js b/modules/svg/gpx.js index e3f33601f..9940395fb 100644 --- a/modules/svg/gpx.js +++ b/modules/svg/gpx.js @@ -110,7 +110,10 @@ export function svgGpx(projection, context, dispatch) { .attr('class', textClass) .merge(labels) .text(function(d) { - return d.properties.desc || d.properties.name; + if(d.properties) { + return d.properties.desc || d.properties.name; + } + return null; }) .attr('x', function(d) { var centroid = getPath.centroid(d); From 4a7fa802250ce468fb32e3fa5aa10adcf057d015 Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Thu, 15 Feb 2018 08:31:31 -0500 Subject: [PATCH 09/12] eslint --- modules/svg/gpx.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/svg/gpx.js b/modules/svg/gpx.js index 9940395fb..30e9be404 100644 --- a/modules/svg/gpx.js +++ b/modules/svg/gpx.js @@ -110,7 +110,7 @@ export function svgGpx(projection, context, dispatch) { .attr('class', textClass) .merge(labels) .text(function(d) { - if(d.properties) { + if (d.properties) { return d.properties.desc || d.properties.name; } return null; From 28cb6aa1e1fbf22cdfc475b41cac5c144c2ec4ef Mon Sep 17 00:00:00 2001 From: Benoit Costamagna Date: Fri, 16 Feb 2018 11:52:05 +0100 Subject: [PATCH 10/12] reduced search priority for boat builder --- data/presets/presets.json | 1 + data/presets/presets/craft/boatbuilder.json | 1 + 2 files changed, 2 insertions(+) diff --git a/data/presets/presets.json b/data/presets/presets.json index b924ecfb5..57635ddfb 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -5207,6 +5207,7 @@ "tags": { "craft": "boatbuilder" }, + "matchScore": 0.4, "name": "Boat Builder" }, "craft/bookbinder": { diff --git a/data/presets/presets/craft/boatbuilder.json b/data/presets/presets/craft/boatbuilder.json index 4a66954b2..c199fceec 100644 --- a/data/presets/presets/craft/boatbuilder.json +++ b/data/presets/presets/craft/boatbuilder.json @@ -14,5 +14,6 @@ "tags": { "craft": "boatbuilder" }, + "matchScore": 0.4, "name": "Boat Builder" } From ca493ec47c8428ce22e208a6e13e647325f27cf9 Mon Sep 17 00:00:00 2001 From: Jordane Pelloux-Prayer Date: Fri, 16 Feb 2018 12:57:00 +0100 Subject: [PATCH 11/12] fixes #4804: do not stop mapillary autoplaying if _mlyViewer is not initialized --- modules/services/mapillary.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/services/mapillary.js b/modules/services/mapillary.js index 287c892b1..2c7bedf3c 100644 --- a/modules/services/mapillary.js +++ b/modules/services/mapillary.js @@ -491,7 +491,7 @@ export default { hideViewer: function() { _mlySelectedImage = null; - if (!_mlyFallback) { + if (!_mlyFallback && _mlyViewer) { _mlyViewer.getComponent('sequence').stop(); } From 63a41956db7d43df7302f0b23e09a01cc83b4732 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Mon, 19 Feb 2018 05:44:58 +0000 Subject: [PATCH 12/12] chore(package): update @std/esm to version 0.22.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 972a618b0..0e61e2e38 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ }, "devDependencies": { "@mapbox/maki": "^4.0.0", - "@std/esm": "^0.21.0", + "@std/esm": "^0.22.0", "chai": "^4.1.0", "colors": "^1.1.2", "concat-files": "^0.1.1",