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

Merge pull request #5875 from openstreetmap/dont-snap-non-vertices

Browse Source 
Dont snap to non-vertices
This commit is contained in:
Bryan Housel
2019-02-10 22:13:09 -05:00
committed by GitHub
parent 26368522c9 b7786fd081
commit 6e45796be7
5 changed files with 58 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/behavior/draw.js
View File

@@ -13,6 +13,7 @@ import { behaviorTail } from './tail';
import { geoChooseEdge, geoVecLength } from '../geo';
import { utilKeybinding, utilRebind } from '../util';
import _isEmpty from 'lodash-es/isEmpty';
var _usedTails = {};
var _disableSpace = false;
@@ -26,7 +27,7 @@ export function behaviorDraw(context) {
var keybinding = utilKeybinding('draw');
var hover = behaviorHover(context).altDisables(true)
var hover = behaviorHover(context).altDisables(true).ignoreVertex(true)
.on('hover', context.ui().sidebar.hover);
var tail = behaviorTail();
var edit = behaviorEdit(context);
@@ -116,6 +117,9 @@ export function behaviorDraw(context) {
_mouseLeave = true;
}
function allowsVertex(d) {
return _isEmpty(d.tags) || context.presets().allowsVertex(d, context.graph());
}
// related code
// - `mode/drag_node.js` `doMode()`
@@ -125,7 +129,7 @@ export function behaviorDraw(context) {
var d = datum();
var target = d && d.properties && d.properties.entity;
if (target && target.type === 'node') { // Snap to a node
if (target && target.type === 'node' && allowsVertex(target)) { // Snap to a node
dispatch.call('clickNode', this, target, d);
return;

6
modules/behavior/draw_way.js
View File

@@ -17,6 +17,7 @@ import { modeBrowse, modeSelect } from '../modes';
import { osmNode } from '../osm';
import { utilKeybinding } from '../util';
import _isEmpty from 'lodash-es/isEmpty';
export function behaviorDrawWay(context, wayId, index, mode, startGraph) {
var origWay = context.entity(wayId);
@@ -65,6 +66,9 @@ export function behaviorDrawWay(context, wayId, index, mode, startGraph) {
}
}
function allowsVertex(d) {
return _isEmpty(d.tags) || context.presets().allowsVertex(d, context.graph());
}
// related code
// - `mode/drag_node.js` `doMode()`
@@ -73,7 +77,7 @@ export function behaviorDrawWay(context, wayId, index, mode, startGraph) {
function move(datum) {
context.surface().classed('nope-disabled', d3_event.altKey);
var targetLoc = datum && datum.properties && datum.properties.entity && datum.properties.entity.loc;
var targetLoc = datum && datum.properties && datum.properties.entity && allowsVertex(datum.properties.entity) && datum.properties.entity.loc;
var targetNodes = datum && datum.properties && datum.properties.nodes;
var loc = context.map().mouseCoordinates();

13
modules/behavior/hover.js
View File

@@ -8,6 +8,7 @@ import {
import { osmEntity, osmNote, qaError } from '../osm';
import { utilKeybinding, utilRebind } from '../util';
import _isEmpty from 'lodash-es/isEmpty';
/*
The hover behavior adds the `.hover` class on mouseover to all elements to which
@@ -24,6 +25,7 @@ export function behaviorHover(context) {
var _newId = null;
var _buttonDown;
var _altDisables;
var _vertex;
var _target;
@@ -96,6 +98,9 @@ export function behaviorHover(context) {
.on('mouseup.hover', null, true);
}
function allowsVertex(d) {
return _isEmpty(d.tags) || context.presets().allowsVertex(d, context.graph());
}
function enter(datum) {
if (datum === _target) return;
@@ -126,7 +131,6 @@ export function behaviorHover(context) {
if (entity.type === 'relation') {
entity.members.forEach(function(member) { selector += ', .' + member.id; });
}
} else if (datum && datum.properties && (datum.properties.entity instanceof osmEntity)) {
entity = datum.properties.entity;
selector = '.' + entity.id;
@@ -144,7 +148,7 @@ export function behaviorHover(context) {
return;
}
var suppressed = _altDisables && d3_event && d3_event.altKey;
var suppressed = (_altDisables && d3_event && d3_event.altKey) || (_vertex && !allowsVertex(entity, context.graph()));
_selection.selectAll(selector)
.classed(suppressed ? 'hover-suppressed' : 'hover', true);
@@ -182,6 +186,11 @@ export function behaviorHover(context) {
return behavior;
};
behavior.ignoreVertex = function(val) {
if (!arguments.length) return _vertex;
_vertex = val;
return behavior;
};
return utilRebind(behavior, dispatch, 'on');
}

1
modules/modes/drag_node.js
View File

@@ -355,7 +355,6 @@ export function modeDragNode(context) {
}
}
function end(entity) {
if (_isCancelled) return;

37
modules/presets/index.js
View File

@@ -53,7 +53,7 @@ export function presetIndex() {
for (var k in entity.tags) {
// If any part of an address is present,
// allow fallback to "Address" preset - #4353
if (k.match(/^addr:/) !== null && geometryMatches['addr:*']) {
if (/^addr:/.test(k) && geometryMatches['addr:*']) {
address = geometryMatches['addr:*'][0];
}
@@ -67,6 +67,7 @@ export function presetIndex() {
match = keyMatches[i];
}
}
}
if (address && (!match || match.isFallback())) {
@@ -76,6 +77,40 @@ export function presetIndex() {
});
};
all.allowsVertex = function(entity, resolver) {
return resolver.transient(entity, 'vertexMatch', function() {
var vertexPresets = _index.vertex;
var match;
if (entity.isOnAddressLine(resolver)) {
match = true;
} else {
for (var k in entity.tags) {
var keyMatches = vertexPresets[k];
if (!keyMatches) continue;
for (var i = 0; i < keyMatches.length; i++) {
var preset = keyMatches[i];
if (preset.searchable !== false) {
if (preset.matchScore(entity) > -1) {
match = preset;
break;
}
}
}
if (!match && /^addr:/.test(k) && vertexPresets['addr:*']) {
match = true;
}
if (match) break;
}
}
return match;
});
};
// Because of the open nature of tagging, iD will never have a complete
// list of tags used in OSM, so we want it to have logic like "assume