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

Disable merge operation when it would damage relations

Browse Source 
The operation is disabled when attempting to join ways which don't belong to identical sets of relations. Restriction relations are excluded, because they are already handled with slightly different logic.

Fixes #8674
Fixes #8645
Fixes #3825
Fixes #1512
This commit is contained in:
John Firebaugh
2021-09-04 15:38:57 -07:00
parent 73e5cf0142
commit a14cf49710
5 changed files with 66 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/actions/join.js
+20 -2
View File
@@ -3,7 +3,7 @@ import { actionDeleteWay } from './delete_way';
import { osmIsInterestingTag } from '../osm/tags';
import { osmJoinWays } from '../osm/multipolygon';
import { geoPathIntersections } from '../geo';
import { utilArrayGroupBy, utilArrayIntersection } from '../util';
import { utilArrayGroupBy, utilArrayIdentical, utilArrayIntersection } from '../util';
// Join ways at the end node they share.
@@ -129,9 +129,27 @@ export function actionJoin(ids) {
return 'not_adjacent';
}
var i;
// All joined ways must belong to the same set of (non-restriction) relations.
// Restriction relations have different logic, below, which allows some cases
// this prohibits, and prohibits some cases this allows.
var sortedParentRelations = function (id) {
return graph.parentRelations(graph.entity(id))
.filter((rel) => !rel.isRestriction())
.sort((a, b) => a.id - b.id);
};
var relsA = sortedParentRelations(ids[0]);
for (i = 1; i < ids.length; i++) {
var relsB = sortedParentRelations(ids[i]);
if (!utilArrayIdentical(relsA, relsB)) {
return 'conflicting_relations';
}
}
// Loop through all combinations of path-pairs
// to check potential intersections between all pairs
for (var i = 0; i < ids.length - 1; i++) {
for (i = 0; i < ids.length - 1; i++) {
for (var j = i + 1; j < ids.length; j++) {
var path1 = graph.childNodes(graph.entity(ids[i]))
.map(function(e) { return e.loc; });
modules/operations/merge.js
+3
View File
@@ -74,6 +74,9 @@ export function operationMerge(context, selectedIDs) {
operation.tooltip = function() {
var disabled = operation.disabled();
if (disabled) {
if (disabled === 'conflicting_relations') {
return t('operations.merge.conflicting_relations');
}
if (disabled === 'restriction') {
return t('operations.merge.restriction',
{ relation: presetManager.item('type/restriction').name() });