CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-05-15 05:30:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix issues with the walkthrough

Browse Source
This commit is contained in:
Quincy Morgan
2019-03-27 17:41:15 -04:00
parent d123d1eb21
commit 53625a9364
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/presets/index.js
+7 -2
View File
@@ -271,7 +271,10 @@ export function presetIndex(context) {
};
all.defaults = function(geometry, n) {
var rec = all.recent().matchGeometry(geometry).collection.slice(0, 4);
var rec = [];
if (!context.inIntro()) {
rec = all.recent().matchGeometry(geometry).collection.slice(0, 4);
}
var def = utilArrayUniq(rec.concat(_defaults[geometry].collection)).slice(0, n - 1);
return presetCollection(utilArrayUniq(rec.concat(def).concat(all.fallback(geometry))));
};
@@ -451,9 +454,11 @@ export function presetIndex(context) {
};
all.setMostRecent = function(preset, geometry) {
geometry = all.fallback(geometry).id;
if (context.inIntro()) return;
if (preset.searchable === false) return;
geometry = all.fallback(geometry).id;
var items = all.getRecents();
var item = all.recentMatching(preset, geometry);
if (item) {
modules/ui/intro/line.js
+3 -3
View File
@@ -20,7 +20,7 @@ export function uiIntroLine(context, reveal) {
var tulipRoadStart = [-85.6297754121684, 41.95805253325314];
var tulipRoadMidpoint = [-85.62975395449628, 41.95787501510204];
var tulipRoadIntersection = [-85.62974496187628, 41.95742515554585];
var roadCategory = context.presets().item('category-road');
var roadCategory = context.presets().item('category-road_minor');
var residentialPreset = context.presets().item('highway/residential');
var woodRoadID = 'w525';
var woodRoadEndID = 'n2862';
@@ -241,7 +241,7 @@ export function uiIntroLine(context, reveal) {
return chapter.restart();
});
var button = d3_select('.preset-category-road .preset-list-button');
var button = d3_select('.preset-category-road_minor .preset-list-button');
if (button.empty()) return chapter.restart();
// disallow scrolling
@@ -277,7 +277,7 @@ export function uiIntroLine(context, reveal) {
return chapter.restart();
});
var subgrid = d3_select('.preset-category-road .subgrid');
var subgrid = d3_select('.preset-category-road_minor .subgrid');
if (subgrid.empty()) return chapter.restart();
subgrid.selectAll(':not(.preset-highway-residential) .preset-list-button')