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

ol/geom/flat/straightchunk export

Browse Source
This commit is contained in:
raiyni
2018-02-12 23:42:11 -06:00
parent 2550ab1691
commit 78b418ba9d
3 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/geom/flat/straightchunk.js
+2 -4
View File
@@ -1,7 +1,6 @@
/** /**
* @module ol/geom/flat/straightchunk * @module ol/geom/flat/straightchunk
*/ */
const _ol_geom_flat_straightchunk_ = {};
/** /**
@@ -13,7 +12,7 @@ const _ol_geom_flat_straightchunk_ = {};
* @return {Array.<number>} Start and end of the first suitable chunk of the * @return {Array.<number>} Start and end of the first suitable chunk of the
* given `flatCoordinates`. * given `flatCoordinates`.
*/ */
_ol_geom_flat_straightchunk_.lineString = function(maxAngle, flatCoordinates, offset, end, stride) { export function matchingChunk(maxAngle, flatCoordinates, offset, end, stride) {
let chunkStart = offset; let chunkStart = offset;
let chunkEnd = offset; let chunkEnd = offset;
let chunkM = 0; let chunkM = 0;
@@ -49,5 +48,4 @@ _ol_geom_flat_straightchunk_.lineString = function(maxAngle, flatCoordinates, of
} }
m += m23; m += m23;
return m > chunkM ? [start, i] : [chunkStart, chunkEnd]; return m > chunkM ? [start, i] : [chunkStart, chunkEnd];
}; }
export default _ol_geom_flat_straightchunk_;
src/ol/render/canvas/TextReplay.js
+2 -2
View File
@@ -5,7 +5,7 @@ import {getUid, inherits} from '../../index.js';
import {asColorLike} from '../../colorlike.js'; import {asColorLike} from '../../colorlike.js';
import {createCanvasContext2D} from '../../dom.js'; import {createCanvasContext2D} from '../../dom.js';
import {intersects} from '../../extent.js'; import {intersects} from '../../extent.js';
import _ol_geom_flat_straightchunk_ from '../../geom/flat/straightchunk.js'; import {matchingChunk} from '../../geom/flat/straightchunk.js';
import GeometryType from '../../geom/GeometryType.js'; import GeometryType from '../../geom/GeometryType.js';
import {CANVAS_LINE_DASH, SAFARI} from '../../has.js'; import {CANVAS_LINE_DASH, SAFARI} from '../../has.js';
import _ol_render_canvas_ from '../canvas.js'; import _ol_render_canvas_ from '../canvas.js';
@@ -202,7 +202,7 @@ CanvasTextReplay.prototype.drawText = function(geometry, feature) {
let flatEnd; let flatEnd;
for (let o = 0, oo = ends.length; o < oo; ++o) { for (let o = 0, oo = ends.length; o < oo; ++o) {
if (textAlign == undefined) { if (textAlign == undefined) {
const range = _ol_geom_flat_straightchunk_.lineString( const range = matchingChunk(
textState.maxAngle, flatCoordinates, flatOffset, ends[o], stride); textState.maxAngle, flatCoordinates, flatOffset, ends[o], stride);
flatOffset = range[0]; flatOffset = range[0];
flatEnd = range[1]; flatEnd = range[1];
test/spec/ol/geom/flat/straightchunk.test.js
+7 -7
View File
@@ -1,4 +1,4 @@
import _ol_geom_flat_straightchunk_ from '../../../../../src/ol/geom/flat/straightchunk.js'; import {matchingChunk} from '../../../../../src/ol/geom/flat/straightchunk.js';
describe('ol.geom.flat.straightchunk', function() { describe('ol.geom.flat.straightchunk', function() {
@@ -10,12 +10,12 @@ describe('ol.geom.flat.straightchunk', function() {
const stride = 3; const stride = 3;
it('returns whole line with angle delta', function() { it('returns whole line with angle delta', function() {
const got = _ol_geom_flat_straightchunk_.lineString(Math.PI / 4, flatCoords, 0, 6, stride); const got = matchingChunk(Math.PI / 4, flatCoords, 0, 6, stride);
expect(got).to.eql([0, 6]); expect(got).to.eql([0, 6]);
}); });
it('returns whole line with zero angle delta', function() { it('returns whole line with zero angle delta', function() {
const got = _ol_geom_flat_straightchunk_.lineString(0, flatCoords, 0, 6, stride); const got = matchingChunk(0, flatCoords, 0, 6, stride);
expect(got).to.eql([0, 6]); expect(got).to.eql([0, 6]);
}); });
@@ -26,12 +26,12 @@ describe('ol.geom.flat.straightchunk', function() {
const stride = 2; const stride = 2;
it('returns whole line if straight enough', function() { it('returns whole line if straight enough', function() {
const got = _ol_geom_flat_straightchunk_.lineString(Math.PI, flatCoords, 0, 8, stride); const got = matchingChunk(Math.PI, flatCoords, 0, 8, stride);
expect(got).to.eql([0, 8]); expect(got).to.eql([0, 8]);
}); });
it('returns first matching chunk if all chunk lengths are the same', function() { it('returns first matching chunk if all chunk lengths are the same', function() {
const got = _ol_geom_flat_straightchunk_.lineString(Math.PI / 4, flatCoords, 0, 8, stride); const got = matchingChunk(Math.PI / 4, flatCoords, 0, 8, stride);
expect(got).to.eql([0, 4]); expect(got).to.eql([0, 4]);
}); });
@@ -42,12 +42,12 @@ describe('ol.geom.flat.straightchunk', function() {
const stride = 2; const stride = 2;
it('returns stright chunk from within the linestring', function() { it('returns stright chunk from within the linestring', function() {
const got = _ol_geom_flat_straightchunk_.lineString(0, flatCoords, 0, 18, stride); const got = matchingChunk(0, flatCoords, 0, 18, stride);
expect(got).to.eql([10, 16]); expect(got).to.eql([10, 16]);
}); });
it('returns long chunk at the end if angle and length within threshold', function() { it('returns long chunk at the end if angle and length within threshold', function() {
const got = _ol_geom_flat_straightchunk_.lineString(Math.PI / 4, flatCoords, 0, 18, stride); const got = matchingChunk(Math.PI / 4, flatCoords, 0, 18, stride);
expect(got).to.eql([10, 18]); expect(got).to.eql([10, 18]);
}); });