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

Only recenter view if necessary, select after delay, fix maprules type

Browse Source
This commit is contained in:
Bryan Housel
2019-02-12 17:25:54 -05:00
parent 14896b0ce5
commit 448fe498bd
4 changed files with 42 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/ui/entity_issues.js
+7 -6
View File
@@ -77,12 +77,13 @@ export function uiEntityIssues(context) {
selection.selectAll('.issue')
.classed('expanded', function(d, i) { return i === _expanded; });
var loc = d.loc();
if (loc) {
context.map().centerZoomEase(loc, Math.max(context.map().zoom(), 18));
} else if (d.entities && d.entities.length > 0 &&
!d.entities[0].intersects(context.map().extent(), context.graph())) {
context.map().zoomToEase(d.entities[0]);
var extent = d.extent(context.graph());
if (extent) {
var view = context.map().trimmedExtent();
var zoom = context.map().zoom();
if (!view.contains(extent) || zoom < 19) {
context.map().centerZoomEase(extent.center(), Math.max(zoom, 19));
}
}
});
modules/ui/issues.js
+20 -10
View File
@@ -83,16 +83,26 @@ export function uiIssues(context) {
.append('li')
.attr('class', function (d) { return 'issue severity-' + d.severity; })
.on('click', function(d) {
var loc = d.loc();
if (loc) {
context.map().centerZoomEase(loc, Math.max(context.map().zoom(), 18));
} else if (d.entities && d.entities.length > 0) {
context.map().zoomTo(d.entities[0]);
}
if (d.entities) {
var ids = d.entities.map(function(e) { return e.id; });
context.enter(modeSelect(context, ids));
utilHighlightEntities(ids, true, context);
var extent = d.extent(context.graph());
if (extent) {
var msec = 0;
var view = context.map().trimmedExtent();
var zoom = context.map().zoom();
// make sure user can see the issue
if (!view.contains(extent) || zoom < 19) {
msec = 250;
context.map().centerZoomEase(extent.center(), Math.max(zoom, 19), msec);
}
// select the first entity
if (d.entities && d.entities.length) {
window.setTimeout(function() {
var ids = d.entities.map(function(e) { return e.id; });
context.enter(modeSelect(context, [ids[0]]));
utilHighlightEntities(ids, true, context);
}, msec);
}
}
})
.on('mouseover', function(d) {