From f47333bf17aed843003508b832267920472bbea2 Mon Sep 17 00:00:00 2001 From: Quincy Morgan <2046746+quincylvania@users.noreply.github.com> Date: Wed, 7 Oct 2020 13:40:09 -0400 Subject: [PATCH 1/5] Delete ROADMAP.md Move roadmap to https://github.com/openstreetmap/iD/wiki/Development-Roadmap --- ROADMAP.md | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 ROADMAP.md diff --git a/ROADMAP.md b/ROADMAP.md deleted file mode 100644 index 03cee0067..000000000 --- a/ROADMAP.md +++ /dev/null @@ -1,11 +0,0 @@ -# Development Roadmap - -iD is a sizable project with many types of changes happening concurrently. In the past, it's been difficult to tell at a glance what to expect next and what we're broadly working toward. The [iD Blog](https://ideditor.blog/) is one place to get information, but the format doesn't lend itself to dynamic technical content. - -This roadmap aims to get everyone on the same page by outlining the general initiatives and specific goals for iD over the short, intermediate, and long terms. These should be considered only as guidelines, not a strict set of deliverables. - -The roadmap should be kept aligned with the needs of the OpenStreetMap database itself, its ecosystem of software, and the supporting community. - ---- - -_More details coming "soon"._ From ecbed19fc1d2eeff19604ea66d0f8726e8eacb37 Mon Sep 17 00:00:00 2001 From: Quincy Morgan <2046746+quincylvania@users.noreply.github.com> Date: Wed, 7 Oct 2020 19:40:11 -0400 Subject: [PATCH 2/5] Use white for custom data label color (close #8055) --- css/65_data.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/css/65_data.css b/css/65_data.css index 371dcfaea..d2c0db8bf 100644 --- a/css/65_data.css +++ b/css/65_data.css @@ -198,15 +198,15 @@ dominant-baseline: middle; } .layer-mapdata text.label { - fill: #ff26d4; + fill: #ddd; } .layer-mapdata text.label.hover, .layer-mapdata text.label.selected { - fill: #f6634f; + fill: #fff; } .layer-mapdata text.label-halo { opacity: 0.7; stroke: #000; stroke-width: 5px; stroke-miterlimit: 1; -} \ No newline at end of file +} From 5ca22537bed042ecc6a2c5ad6bb9ced57faa9c96 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 8 Oct 2020 05:08:13 +0000 Subject: [PATCH 3/5] Bump mapillary-js from 2.20.0 to 2.21.0 Bumps [mapillary-js](https://github.com/mapillary/mapillary-js) from 2.20.0 to 2.21.0. - [Release notes](https://github.com/mapillary/mapillary-js/releases) - [Commits](https://github.com/mapillary/mapillary-js/compare/v2.20.0...v2.21.0) Signed-off-by: dependabot[bot] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6f96c8be7..5f9c67840 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "js-yaml": "^3.14.0", "json-stringify-pretty-compact": "^2.0.0", "jsonschema": "^1.1.0", - "mapillary-js": "~2.20.0", + "mapillary-js": "~2.21.0", "mapillary_sprite_source": "^1.8.0", "minimist": "^1.2.3", "mocha": "^7.0.1", From 7203f1528379fb10c69b31c5408a97282a8cf3e8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 8 Oct 2020 05:31:24 +0000 Subject: [PATCH 4/5] Bump postcss from 7.0.35 to 8.1.1 Bumps [postcss](https://github.com/postcss/postcss) from 7.0.35 to 8.1.1. - [Release notes](https://github.com/postcss/postcss/releases) - [Changelog](https://github.com/postcss/postcss/blob/master/CHANGELOG.md) - [Commits](https://github.com/postcss/postcss/compare/7.0.35...8.1.1) Signed-off-by: dependabot[bot] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6f96c8be7..d7c9a107a 100644 --- a/package.json +++ b/package.json @@ -102,7 +102,7 @@ "object-inspect": "1.3.0", "osm-community-index": "2.1.1", "phantomjs-prebuilt": "~2.1.11", - "postcss": "^7.0.27", + "postcss": "^8.1.1", "postcss-selector-prepend": "^0.5.0", "rollup": "~2.23.0", "rollup-plugin-includepaths": "~0.2.3", From 3ef36a8badc50d56b15dd4749df8e36be5f50a1b Mon Sep 17 00:00:00 2001 From: Quincy Morgan <2046746+quincylvania@users.noreply.github.com> Date: Thu, 8 Oct 2020 09:29:50 -0400 Subject: [PATCH 5/5] Use the layer names instead of the IDs in the imagery_used tag (close #7842) --- modules/renderer/background_source.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/renderer/background_source.js b/modules/renderer/background_source.js index d6020d752..34d9e26b7 100644 --- a/modules/renderer/background_source.js +++ b/modules/renderer/background_source.js @@ -97,7 +97,7 @@ export function rendererBackgroundSource(data) { source.imageryUsed = function() { - return name || source.id; + return _name || source.id; };