ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #8376 from virtualcitySYSTEMS/feature-polygonMakeRegularXYZ

Browse Source 
copy ZM values to polygon in makeRegular
This commit is contained in:
Andreas Hocevar
2018-07-12 18:00:54 +02:00
committed by GitHub
parent ed7788ca37 88fbd6e35d
commit 84d2c3a42e
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/ol/geom/Polygon.js
View File

@@ -404,14 +404,19 @@ export function fromCircle(circle, opt_sides, opt_angle) {
const sides = opt_sides ? opt_sides : 32;
const stride = circle.getStride();
const layout = circle.getLayout();
const center = circle.getCenter();
const arrayLength = stride * (sides + 1);
const flatCoordinates = new Array(arrayLength);
for (let i = 0; i < arrayLength; i++) {
for (let i = 0; i < arrayLength; i += stride) {
flatCoordinates[i] = 0;
flatCoordinates[i + 1] = 0;
for (let j = 2; j < stride; j++) {
flatCoordinates[i + j] = center[j];
}
}
const ends = [flatCoordinates.length];
const polygon = new Polygon(flatCoordinates, layout, ends);
makeRegular(polygon, circle.getCenter(), circle.getRadius(), opt_angle);
makeRegular(polygon, center, circle.getRadius(), opt_angle);
return polygon;
}

8
test/spec/ol/geom/polygon.test.js
View File

@@ -605,6 +605,14 @@ describe('ol/geom/Polygon', function() {
expect(coordinates[0][0]).to.roughlyEqual(0, 1e-9);
expect(coordinates[0][1]).to.roughlyEqual(1, 1e-9);
});
it('creates a regular polygon, maintaining ZM values', () => {
const circle = new Circle([0, 0, 1, 1], 1, 'XYZM');
const polygon = fromCircle(circle);
const coordinates = polygon.getLinearRing(0).getCoordinates();
expect(coordinates[0][2]).to.eql(1);
expect(coordinates[0][3]).to.eql(1);
});
});
});