CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-03-06 19:31:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't allow adding point-only features as vertices

Browse Source
This commit is contained in:
Quincy Morgan
2019-03-04 17:04:35 -05:00
parent 5e02523396
commit b828ada0e2
9 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/behavior/draw.js
View File

@@ -127,11 +127,15 @@ export function behaviorDraw(context) {
var d = datum();
var target = d && d.properties && d.properties.entity;
var mode = context.mode();
var allowsSnappingToWay = (mode.id !== 'add-point' || mode.preset.matchGeometry('vertex'));
if (target && target.type === 'node' && allowsVertex(target)) { // Snap to a node
dispatch.call('clickNode', this, target, d);
return;
} else if (target && target.type === 'way') { // Snap to a way
} else if (target && target.type === 'way' && allowsSnappingToWay) { // Snap to a way
var choice = geoChooseEdge(
context.childNodes(target), context.mouse(), context.projection, context.activeID()
);

18
modules/behavior/hover.js
View File

@@ -107,6 +107,15 @@ export function behaviorHover(context) {
return d.geometry(context.graph()) === 'vertex' || context.presets().allowsVertex(d, context.graph());
}
function modeAllowsHover(target) {
var mode = context.mode();
if (mode.id === 'add-point') {
return mode.preset.matchGeometry('vertex') ||
(target.type !== 'way' && target.geometry(context.graph()) !== 'vertex');
}
return true;
}
function enter(datum) {
if (datum === _target) return;
_target = datum;
@@ -144,17 +153,20 @@ export function behaviorHover(context) {
}
}
var mode = context.mode();
// Update hover state and dispatch event
if (entity && entity.id !== _newNodeId) {
// If drawing a way, don't hover on a node that was just placed. #3974
var mode = context.mode() && context.mode().id;
if ((mode === 'draw-line' || mode === 'draw-area') && !_newNodeId && entity.type === 'node') {
if ((mode.id === 'draw-line' || mode.id === 'draw-area') && !_newNodeId && entity.type === 'node') {
_newNodeId = entity.id;
return;
}
var suppressed = (_altDisables && d3_event && d3_event.altKey) ||
(entity.type === 'node' && _ignoreVertex && !allowsVertex(entity));
(entity.type === 'node' && _ignoreVertex && !allowsVertex(entity)) ||
!modeAllowsHover(entity);
_selection.selectAll(selector)
.classed(suppressed ? 'hover-suppressed' : 'hover', true);