From 9c637647a930709a292da7939fefeaa13b1f00cc Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Tue, 15 Oct 2019 12:47:27 +0200 Subject: [PATCH] Don't disable items in the preset list during the walkthrough (close #6634) Update changelog --- CHANGELOG.md | 7 ++++++- modules/ui/preset_list.js | 4 +++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a087897ea..9d2774ae6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -30,7 +30,7 @@ _Breaking changes, which may affect downstream projects or sites that embed iD, --> # 2.16.0 -##### Planned: 2019-Oct-14 +##### Planned: 2019-Oct-15 #### :tada: New Features * Add Map Features layer showing objects detected in Mapillary images ([#5845], [#6792], thanks [@kratico]) @@ -63,6 +63,7 @@ _Breaking changes, which may affect downstream projects or sites that embed iD, * Allow tabbing past the last row in the All Tags table ([#4233]) * Replace hardcoded ranking of OpenStreetMap communities with granular upstream ordering ([#6752]) * Make the "Report an Imagery Problem" text clearer ([#6820]) +* Open the Map Data pane when clicking the "hidden features" badge [#6764]: https://github.com/openstreetmap/iD/issues/6764 [#6839]: https://github.com/openstreetmap/iD/issues/6839 @@ -141,8 +142,12 @@ _Breaking changes, which may affect downstream projects or sites that embed iD, #### :mortar_board: Walkthrough / Help * Update the link to the Mapbox Imagery Request site ([#6874], thanks [@1ec5]) +* Fix issue where walkthrough could not be completed if certain data layers were disabled ([#6634]) [#6874]: https://github.com/openstreetmap/iD/issues/6874 +[#6634]: https://github.com/openstreetmap/iD/issues/6634 + +[@1ec5]: https://github.com/1ec5 #### :rocket: Presets * Add Indoor Stairwell and Indoor Elevator Shaft presets ([#6863], thanks [@danielsjf]) diff --git a/modules/ui/preset_list.js b/modules/ui/preset_list.js index 71dbe260f..651469e63 100644 --- a/modules/ui/preset_list.js +++ b/modules/ui/preset_list.js @@ -444,7 +444,9 @@ export function uiPresetList(context) { button.each(function(item, index) { var hiddenPresetFeaturesId = context.features().isHiddenPreset(item.preset, geometry); - var isHiddenPreset = !!hiddenPresetFeaturesId && item.preset !== _currentPreset; + var isHiddenPreset = !context.inIntro() && + !!hiddenPresetFeaturesId && + item.preset !== _currentPreset; d3_select(this) .classed('disabled', isHiddenPreset);