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

Merge pull request #10004 from tschaub/revisions

Browse Source 
Return a new simplified geometry after modification
This commit is contained in:
Tim Schaub
2019-09-26 09:22:12 +02:00
committed by GitHub
parent e1d9f8dd59 680372ac3f
commit 965d0541f2
2 changed files with 51 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/ol/geom/Geometry.js
View File

@@ -60,12 +60,13 @@ class Geometry extends BaseObject {
/**
* Get a transformed and simplified version of the geometry.
* @abstract
* @param {number} revision The geometry revision.
* @param {number} squaredTolerance Squared tolerance.
* @param {import("../proj/Projection.js").default} [sourceProjection] The source projection.
* @param {import("../proj/Projection.js").default} [destProjection] The destination projection.
* @return {Geometry} Simplified geometry.
*/
this.simplifyTransformed = memoizeOne(function(squaredTolerance, sourceProjection, destProjection) {
this.simplifyTransformedInternal = memoizeOne(function(revision, squaredTolerance, sourceProjection, destProjection) {
if (!sourceProjection || !destProjection) {
return this.getSimplifiedGeometry(squaredTolerance);
}
@@ -77,6 +78,18 @@ class Geometry extends BaseObject {
}
/**
* Get a transformed and simplified version of the geometry.
* @abstract
* @param {number} squaredTolerance Squared tolerance.
* @param {import("../proj/Projection.js").default} sourceProjection The source projection.
* @param {import("../proj/Projection.js").default} destProjection The destination projection.
* @return {Geometry} Simplified geometry.
*/
simplifyTransformed(squaredTolerance, sourceProjection, destProjection) {
return this.simplifyTransformedInternal(this.getRevision(), squaredTolerance, sourceProjection, destProjection);
}
/**
* Make a complete copy of the geometry.
* @abstract

37
test/spec/ol/geom/point.test.js
View File

@@ -1,4 +1,5 @@
import Point from '../../../../src/ol/geom/Point.js';
import {get as getProjection} from '../../../../src/ol/proj.js';
describe('ol.geom.Point', function() {
@@ -154,6 +155,42 @@ describe('ol.geom.Point', function() {
});
describe('#simplifyTransformed()', function() {
it('returns the same result if called twice with the same arguments', function() {
const geom = new Point([1, 2]);
const source = getProjection('EPSG:4326');
const dest = getProjection('EPSG:3857');
const squaredTolerance = 0.5;
const first = geom.simplifyTransformed(squaredTolerance, source, dest);
const second = geom.simplifyTransformed(squaredTolerance, source, dest);
expect(second).to.be(first);
});
it('returns a different result if called with a different tolerance', function() {
const geom = new Point([1, 2]);
const source = getProjection('EPSG:4326');
const dest = getProjection('EPSG:3857');
const squaredTolerance = 0.5;
const first = geom.simplifyTransformed(squaredTolerance, source, dest);
const second = geom.simplifyTransformed(squaredTolerance * 2, source, dest);
expect(second).not.to.be(first);
});
it('returns a different result if called after geometry modification', function() {
const geom = new Point([1, 2]);
const source = getProjection('EPSG:4326');
const dest = getProjection('EPSG:3857');
const squaredTolerance = 0.5;
const first = geom.simplifyTransformed(squaredTolerance, source, dest);
geom.setCoordinates([3, 4]);
const second = geom.simplifyTransformed(squaredTolerance * 2, source, dest);
expect(second).not.to.be(first);
});
});
describe('#applyTransform()', function() {
let point, transform;