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

Don't close unclosed multipolygon parts with fewer than three nodes when generating geojson

Browse Source 
Update multipolygon geojson code tests
This commit is contained in:
Quincy Morgan
2019-11-22 17:01:51 -05:00
parent b62162b191
commit 81b561fffc
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/osm/relation.js
+3 -2
View File
@@ -308,8 +308,9 @@ Object.assign(osmRelation.prototype, {
inners = osmJoinWays(inners, resolver);
var sequenceToLineString = function(sequence) {
if (sequence.nodes[0] !== sequence.nodes[sequence.nodes.length - 1]) {
// treat all parts as closed even if they aren't
if (sequence.nodes.length > 2 &&
sequence.nodes[0] !== sequence.nodes[sequence.nodes.length - 1]) {
// close unclosed parts to ensure correct area rendering - #2945
sequence.nodes.push(sequence.nodes[0]);
}
return sequence.nodes.map(function(node) { return node.loc; });
test/spec/osm/relation.js
+6 -6
View File
@@ -647,7 +647,7 @@ describe('iD.osmRelation', function () {
var r = iD.osmRelation({members: [{id: w.id, type: 'way'}]});
var g = iD.coreGraph([a, b, c, w, r]);
expect(r.multipolygon(g)).to.eql([[[a.loc, b.loc, c.loc]]]);
expect(r.multipolygon(g)).to.eql([[[a.loc, b.loc, c.loc, a.loc]]]);
});
specify('invalid geometry: unclosed ring consisting of multiple ways', function () {
@@ -659,7 +659,7 @@ describe('iD.osmRelation', function () {
var r = iD.osmRelation({members: [{id: w1.id, type: 'way'}, {id: w2.id, type: 'way'}]});
var g = iD.coreGraph([a, b, c, w1, w2, r]);
expect(r.multipolygon(g)).to.eql([[[a.loc, b.loc, c.loc]]]);
expect(r.multipolygon(g)).to.eql([[[a.loc, b.loc, c.loc, a.loc]]]);
});
specify('invalid geometry: unclosed ring consisting of multiple ways, alternate order', function () {
@@ -672,7 +672,7 @@ describe('iD.osmRelation', function () {
var r = iD.osmRelation({members: [{id: w1.id, type: 'way'}, {id: w2.id, type: 'way'}]});
var g = iD.coreGraph([a, b, c, d, w1, w2, r]);
expect(r.multipolygon(g)).to.eql([[[d.loc, c.loc, b.loc, a.loc]]]);
expect(r.multipolygon(g)).to.eql([[[d.loc, c.loc, b.loc, a.loc, d.loc]]]);
});
specify('invalid geometry: unclosed ring consisting of multiple ways, one needing reversal', function () {
@@ -685,7 +685,7 @@ describe('iD.osmRelation', function () {
var r = iD.osmRelation({members: [{id: w1.id, type: 'way'}, {id: w2.id, type: 'way'}]});
var g = iD.coreGraph([a, b, c, d, w1, w2, r]);
expect(r.multipolygon(g)).to.eql([[[d.loc, c.loc, b.loc, a.loc]]]);
expect(r.multipolygon(g)).to.eql([[[a.loc, d.loc, c.loc, b.loc, a.loc]]]);
});
specify('invalid geometry: unclosed ring consisting of multiple ways, one needing reversal, alternate order', function () {
@@ -698,7 +698,7 @@ describe('iD.osmRelation', function () {
var r = iD.osmRelation({members: [{id: w1.id, type: 'way'}, {id: w2.id, type: 'way'}]});
var g = iD.coreGraph([a, b, c, d, w1, w2, r]);
expect(r.multipolygon(g)).to.eql([[[d.loc, c.loc, b.loc, a.loc]]]);
expect(r.multipolygon(g)).to.eql([[[d.loc, c.loc, b.loc, a.loc, d.loc]]]);
});
specify('single polygon with single single-way inner', function () {
@@ -805,7 +805,7 @@ describe('iD.osmRelation', function () {
var r = iD.osmRelation({members: [{id: w2.id, type: 'way'}, {id: w1.id, type: 'way'}]});
var g = iD.coreGraph([a, b, c, w1, r]);
expect(r.multipolygon(g)).to.eql([[[a.loc, b.loc, c.loc]]]);
expect(r.multipolygon(g)).to.eql([[[a.loc, c.loc, b.loc, a.loc]]]);
});
});