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

merge-polygons: do not merge tags from all possible members

Browse Source 
previously when merging polygons, all tags from all involved
members were merged into the resulting multipolygon. This includes
existing inner members with different tags or outer members that
are not directly involved in the merge operations.

Example: A forest (landuse=forest) containing some clearings
(landuse=meadow), whose outline is in part a river (waterway=river)
is merged with a new untagged area. The resulting multipolygon
would have falsely been tagged: landuse=forest;meadow + waterway=river
This commit is contained in:
tyr
2014-02-09 17:42:58 +01:00
parent 6752c198f7
commit 422f76be77
2 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/id/actions/merge_polygon.js
+9 -4
View File
@@ -86,10 +86,15 @@ iD.actions.MergePolygon = function(ids, newRelationId) {
graph = graph.remove(m);
});
members.forEach(function(m) {
var entity = graph.entity(m.id);
relation = relation.mergeTags(entity.tags);
graph = graph.replace(entity.update({ tags: {} }));
entities.closedWay.forEach(function(cw) {
function isThisOuter(m) {
return m.id === cw.id && m.role !== "inner";
}
if (members.some(isThisOuter)) {
var entity = graph.entity(cw.id);
relation = relation.mergeTags(entity.tags);
graph = graph.replace(entity.update({ tags: {} }));
}
});
return graph.replace(relation.update({
test/spec/actions/merge_polygon.js
+9 -4
View File
@@ -85,15 +85,20 @@ describe("iD.actions.MergePolygon", function () {
expect(find(r, 'w5').role).to.equal('outer');
});
it("moves all tags to the relation", function() {
it("moves tags to the relation", function() {
graph = graph.replace(graph.entity('w0').update({ tags: { 'building': 'yes' }}));
// this is a new inner member whose tags should not be moved to the relation
graph = graph.replace(graph.entity('w1').update({ tags: { 'natural': 'water' }}));
graph = iD.actions.MergePolygon(['w0', 'w1'], 'r')(graph);
// this is a new outer member whose tags should be moved to the relation
graph = graph.replace(graph.entity('w5').update({ tags: { 'amenity': 'school' }}));
graph = iD.actions.MergePolygon(['w0', 'w1','w5'], 'r')(graph);
var r = graph.entity('r');
expect(graph.entity('w0').tags.building).to.equal(undefined);
expect(graph.entity('w1').tags.natural).to.equal(undefined);
expect(r.tags.natural).to.equal('water');
expect(graph.entity('w1').tags.natural).to.equal('water');
expect(graph.entity('w5').tags.amenity).to.equal(undefined);
expect(r.tags.building).to.equal('yes');
expect(r.tags.natural).to.equal(undefined);
expect(r.tags.amenity).to.equal('school');
});
it("doesn't copy area tags from ways", function() {