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

Ensure that boundary relation members look like boundaries

Browse Source
This commit is contained in:
John Firebaugh
2016-01-30 13:01:01 -08:00
parent 3f5d7ec701
commit 087d5aa65f
3 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
js/id/svg.js
View File

@@ -83,11 +83,12 @@ iD.svg = {
};
},
MultipolygonMemberTags: function(graph) {
RelationMemberTags: function(graph) {
return function(entity) {
var tags = entity.tags;
graph.parentRelations(entity).forEach(function(relation) {
if (relation.isMultipolygon()) {
var type = relation.tags.type;
if (type === 'multipolygon' || type === 'boundary') {
tags = _.extend({}, relation.tags, tags);
}
});

2
js/id/svg/lines.js
View File

@@ -86,7 +86,7 @@ iD.svg.Lines = function(projection) {
lines
.sort(waystack)
.attr('d', getPath)
.call(iD.svg.TagClasses().tags(iD.svg.MultipolygonMemberTags(graph)));
.call(iD.svg.TagClasses().tags(iD.svg.RelationMemberTags(graph)));
lines.exit()
.remove();

21
test/spec/svg.js
View File

@@ -0,0 +1,21 @@
describe("iD.svg.RelationMemberTags", function() {
it("includes tags from parent multipolygon relations", function() {
var graph = iD.Graph([
iD.Way({id: 'w'}),
iD.Relation({id: 'r', members: [{id: 'w'}], tags: {type: 'multipolygon'}}),
]);
expect(iD.svg.RelationMemberTags(graph)(graph.entity('w')))
.to.eql({type: 'multipolygon'});
});
it("includes tags from parent boundary relations", function() {
var graph = iD.Graph([
iD.Way({id: 'w'}),
iD.Relation({id: 'r', members: [{id: 'w'}], tags: {type: 'boundary'}}),
]);
expect(iD.svg.RelationMemberTags(graph)(graph.entity('w')))
.to.eql({type: 'boundary'});
});
});