ol 7.0.0-dev.1659197169870 → 7.0.0-dev.1659197606919
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/View.d.ts.map +1 -1
- package/View.js +1 -2
- package/control/ScaleLine.d.ts.map +1 -1
- package/control/ScaleLine.js +3 -5
- package/format/Feature.d.ts.map +1 -1
- package/format/Feature.js +1 -2
- package/format/MVT.d.ts.map +1 -1
- package/format/MVT.js +1 -2
- package/geom/Geometry.d.ts.map +1 -1
- package/geom/Geometry.js +1 -2
- package/interaction/MouseWheelZoom.d.ts +4 -5
- package/interaction/MouseWheelZoom.d.ts.map +1 -1
- package/interaction/MouseWheelZoom.js +3 -7
- package/layer/MapboxVector.d.ts +2 -2
- package/layer/MapboxVector.d.ts.map +1 -1
- package/layer/MapboxVector.js +1 -1
- package/layer/VectorTile.d.ts +9 -5
- package/layer/VectorTile.d.ts.map +1 -1
- package/layer/VectorTile.js +10 -16
- package/package.json +1 -1
- package/proj/Projection.d.ts +7 -7
- package/proj/Projection.d.ts.map +1 -1
- package/proj/Projection.js +5 -5
- package/proj/Units.d.ts +34 -15
- package/proj/Units.d.ts.map +1 -1
- package/proj/Units.js +25 -55
- package/proj/epsg3857.d.ts.map +1 -1
- package/proj/epsg3857.js +1 -2
- package/proj/epsg4326.d.ts.map +1 -1
- package/proj/epsg4326.js +1 -2
- package/proj/proj4.d.ts.map +1 -1
- package/proj/proj4.js +1 -2
- package/proj.d.ts +2 -2
- package/proj.d.ts.map +1 -1
- package/proj.js +4 -4
- package/renderer/canvas/VectorTileLayer.d.ts.map +1 -1
- package/renderer/canvas/VectorTileLayer.js +4 -5
- package/source/Raster.d.ts +9 -1
- package/source/Raster.d.ts.map +1 -1
- package/source/Raster.js +3 -9
- package/tilegrid.d.ts.map +1 -1
- package/tilegrid.js +1 -2
- package/layer/VectorTileRenderType.d.ts +0 -7
- package/layer/VectorTileRenderType.d.ts.map +0 -1
- package/layer/VectorTileRenderType.js +0 -34
package/View.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"View.d.ts","sourceRoot":"","sources":["View.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"View.d.ts","sourceRoot":"","sources":["View.js"],"names":[],"mappings":"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"}
|
package/View.js
CHANGED
|
@@ -2,7 +2,6 @@
|
|
|
2
2
|
* @module ol/View
|
|
3
3
|
*/
|
|
4
4
|
import BaseObject from './Object.js';
|
|
5
|
-
import Units from './proj/Units.js';
|
|
6
5
|
import ViewHint from './ViewHint.js';
|
|
7
6
|
import ViewProperty from './ViewProperty.js';
|
|
8
7
|
import {DEFAULT_TILE_SIZE} from './tilegrid/common.js';
|
|
@@ -2008,7 +2007,7 @@ export function createResolutionConstraint(options) {
|
|
|
2008
2007
|
// calculate the default min and max resolution
|
|
2009
2008
|
const size = !projExtent
|
|
2010
2009
|
? // use an extent that can fit the whole world if need be
|
|
2011
|
-
(360 * METERS_PER_UNIT
|
|
2010
|
+
(360 * METERS_PER_UNIT.degrees) / projection.getMetersPerUnit()
|
|
2012
2011
|
: Math.max(getWidth(projExtent), getHeight(projExtent));
|
|
2013
2012
|
|
|
2014
2013
|
const defaultMaxResolution =
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ScaleLine.d.ts","sourceRoot":"","sources":["ScaleLine.js"],"names":[],"mappings":";;;;
|
|
1
|
+
{"version":3,"file":"ScaleLine.d.ts","sourceRoot":"","sources":["ScaleLine.js"],"names":[],"mappings":";;;;oBAca,SAAS,GAAG,UAAU,GAAG,UAAU,GAAG,QAAQ,GAAG,IAAI;;;;2CAkBrD,OAAO,eAAe,EAAE,WAAW,CAAC,OAAO,eAAe,EAAE,UAAU,EAAE,OAAO,oBAAoB,EAAE,OAAO,EAAE,MAAM,CAAC,GACjI,OAAW,eAAe,EAAE,WAAW,CAAC,OAAO,oBAAoB,EAAE,KAAK,GAC1E,cAAoB,EAAE,OAAO,WAAW,EAAE,WAAW,EAAE,MAAM,CAAC,GAC9D,OAAW,eAAe,EAAE,mBAAmB,CAAC,OAAO,eAAe,EAAE,UAAU,GAAC,OAAO,oBAAoB,EAAE,KAAK,GAC9G,cAAc,EAAE,MAAM,CAAC;;;;;;;;;;;;;;;;;;;;qBAUR,OAAO,gBAAgB,EAAE,OAAO,KAAE,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;;;;UAU/C,MAAM,GAAC,SAAS;;AA1B9B;;;;;;;GAOG;AAEH;;;;;;;;;;;;;;;;;;;GAmBG;AAEH;;;;;;;;;;;;;GAaG;AACH;IACE;;OAEG;IACH,+CAwGC;IAxFC;;OAEG;IACH,IAFU,qBAAqB,OAAO,WAAW,EAAE,SAAS,CAAC,CAEtD;IAEP;;OAEG;IACH,MAFU,qBAAqB,OAAO,WAAW,EAAE,SAAS,CAAC,CAEpD;IAET;;OAEG;IACH,IAFU,qBAAqB,IAAI,CAAC,CAE7B;IAEP;;;OAGG;IACH,sBAAkD;IAMlD;;;OAGG;IACH,mBAAsB;IAEtB;;;OAGG;IACH,kBAAuE;IAEvE;;;OAGG;IACH,kBAAiC;IAEjC;;;OAGG;IACH,yBAA6B;IAE7B;;;OAGG;IACH,uBAA+B;IAE/B;;;OAGG;IACH,sBAAuB;IAMvB;;;OAGG;IACH,kBAAqC;IAErC;;;OAGG;IACH,uBAAwC;IAExC;;;OAGG;IACH,sBAA0C;IAE1C;;;OAGG;IACH,aAAoC;IAGtC;;;;;;OAMG;IACH,YALY,KAAK,CAOhB;IAED;;OAEG;IACH,4BAEC;IAED;;;;;OAKG;IACH,gBAJW,KAAK,QAMf;IAED;;;;OAIG;IACH,YAHW,MAAM,GAAC,SAAS,QAK1B;IAED;;OAEG;IACH,uBAqIC;IAED;;;;;;OAMG;IACH,uBA+DC;IAED;;;;;OAKG;IACH,uBAJW,MAAM,KACN,MAAM,GACL,MAAM,CAejB;IAED;;;;;;;;OAQG;IACH,kBAPW,MAAM,SACN,MAAM,UACN,OAAO,SACP,MAAM,UACN,MAAM,GACL,MAAM,CA4BjB;IAED;;;OAGG;IACH,yBAFY,MAAM,CAYjB;CAgBF"}
|
package/control/ScaleLine.js
CHANGED
|
@@ -2,7 +2,6 @@
|
|
|
2
2
|
* @module ol/control/ScaleLine
|
|
3
3
|
*/
|
|
4
4
|
import Control from './Control.js';
|
|
5
|
-
import ProjUnits from '../proj/Units.js';
|
|
6
5
|
import {CLASS_UNSELECTABLE} from '../css.js';
|
|
7
6
|
import {METERS_PER_UNIT, getPointResolution} from '../proj.js';
|
|
8
7
|
import {assert} from '../asserts.js';
|
|
@@ -237,8 +236,7 @@ class ScaleLine extends Control {
|
|
|
237
236
|
const center = viewState.center;
|
|
238
237
|
const projection = viewState.projection;
|
|
239
238
|
const units = this.getUnits();
|
|
240
|
-
const pointResolutionUnits =
|
|
241
|
-
units == 'degrees' ? ProjUnits.DEGREES : ProjUnits.METERS;
|
|
239
|
+
const pointResolutionUnits = units == 'degrees' ? 'degrees' : 'm';
|
|
242
240
|
let pointResolution = getPointResolution(
|
|
243
241
|
projection,
|
|
244
242
|
viewState.resolution,
|
|
@@ -257,7 +255,7 @@ class ScaleLine extends Control {
|
|
|
257
255
|
let nominalCount = minWidth * pointResolution;
|
|
258
256
|
let suffix = '';
|
|
259
257
|
if (units == 'degrees') {
|
|
260
|
-
const metersPerDegree = METERS_PER_UNIT
|
|
258
|
+
const metersPerDegree = METERS_PER_UNIT.degrees;
|
|
261
259
|
nominalCount *= metersPerDegree;
|
|
262
260
|
if (nominalCount < metersPerDegree / 60) {
|
|
263
261
|
suffix = '\u2033'; // seconds
|
|
@@ -498,7 +496,7 @@ class ScaleLine extends Control {
|
|
|
498
496
|
this.viewState_.projection,
|
|
499
497
|
this.viewState_.resolution,
|
|
500
498
|
this.viewState_.center,
|
|
501
|
-
|
|
499
|
+
'm'
|
|
502
500
|
);
|
|
503
501
|
const dpi = this.dpi_ || DEFAULT_DPI;
|
|
504
502
|
const inchesPerMeter = 1000 / 25.4;
|
package/format/Feature.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Feature.d.ts","sourceRoot":"","sources":["Feature.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Feature.d.ts","sourceRoot":"","sources":["Feature.js"],"names":[],"mappings":"AAsOA;;;;;GAKG;AACH,uDALW,OAAO,qBAAqB,EAAE,OAAO,SACrC,OAAO,yDAEN,OAAO,qBAAqB,EAAE,OAAO,CAiDhD;AAED;;;;GAIG;AACH,mDAJW,OAAO,cAAc,EAAE,MAAM,0CAE5B,OAAO,cAAc,EAAE,MAAM,CAmBxC;;;;;;;;;;qBAvSa,OAAO,YAAY,EAAE,cAAc;;;;;;;;;;;;;wBASnC,OAAO,YAAY,EAAE,cAAc;;;;;;;;;qBAOnC,OAAO,YAAY,EAAE,cAAc;;;;;;wBAInC,OAAO,YAAY,EAAE,cAAc;;;;;;;;;;;;;;;;;;;;;;mBAoBpC,aAAa,GAAG,MAAM,GAAG,MAAM,GAAG,KAAK;AA1CpD;;;;;;;;;;;;;;GAcG;AAEH;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAEH;;GAEG;AAEH;;;;;;;;;;;GAWG;AACH;IAEI;;;OAGG;IACH,0BAFU,OAAO,uBAAuB,EAAE,OAAO,GAAC,SAAS,CAE5B;IAE/B;;;OAGG;IACH,oCAFU,OAAO,uBAAuB,EAAE,OAAO,GAAC,SAAS,CAElB;IAEzC;;;OAGG;IACH,qBAFU,MAAM,MAAM,CAAC,CAEQ;IAGjC;;;;;;OAMG;IACH,iCALW,QAAQ,GAAC,OAAO,SAAQ,MAAM,0CAE7B,WAAW,GAAC,SAAS,CAuBhC;IAED;;;;;;;;OAQG;IACH,gCANW,YAAY,GAAC,WAAW,GAAC,SAAS,GAGjC,YAAY,GAAC,WAAW,GAAC,SAAS,CAW7C;IAED;;;OAGG;IACH,WAFY,IAAI,CAIf;IAED;;;;;;;OAOG;IACH,oBAJW,QAAQ,GAAC,OAAO,SAAQ,MAAM,0CAE7B,OAAO,eAAe,EAAE,WAAW,CAI9C;IAED;;;;;;;OAOG;IACH,qBAJW,QAAQ,GAAC,OAAO,GAAC,WAAW,SAAQ,MAAM,0CAEzC,MAAM,OAAO,eAAe,EAAE,WAAW,CAAC,CAIrD;IAED;;;;;;;OAOG;IACH,qBAJW,QAAQ,GAAC,OAAO,SAAQ,MAAM,0CAE7B,OAAO,qBAAqB,EAAE,OAAO,CAIhD;IAED;;;;;;OAMG;IACH,uBAHW,QAAQ,GAAC,OAAO,SAAQ,MAAM,GAC7B,OAAO,uBAAuB,EAAE,OAAO,GAAC,SAAS,CAI5D;IAED;;;;;;;OAOG;IACH,sBAJW,OAAO,eAAe,EAAE,OAAO,2CAE9B,MAAM,GAAC,WAAW,CAI7B;IAED;;;;;;;OAOG;IACH,wBAJW,MAAM,OAAO,eAAe,EAAE,OAAO,CAAC,2CAErC,MAAM,GAAC,WAAW,CAI7B;IAED;;;;;;;OAOG;IACH,wBAJW,OAAO,qBAAqB,EAAE,OAAO,2CAEpC,MAAM,GAAC,WAAW,CAI7B;CACF"}
|
package/format/Feature.js
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* @module ol/format/Feature
|
|
3
3
|
*/
|
|
4
|
-
import Units from '../proj/Units.js';
|
|
5
4
|
import {abstract} from '../util.js';
|
|
6
5
|
import {
|
|
7
6
|
equivalent as equivalentProjection,
|
|
@@ -103,7 +102,7 @@ class FeatureFormat {
|
|
|
103
102
|
if (
|
|
104
103
|
opt_options.extent &&
|
|
105
104
|
dataProjection &&
|
|
106
|
-
dataProjection.getUnits() ===
|
|
105
|
+
dataProjection.getUnits() === 'tile-pixels'
|
|
107
106
|
) {
|
|
108
107
|
dataProjection = getProjection(dataProjection);
|
|
109
108
|
dataProjection.setWorldExtent(opt_options.extent);
|
package/format/MVT.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MVT.d.ts","sourceRoot":"","sources":["MVT.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"MVT.d.ts","sourceRoot":"","sources":["MVT.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;AAmBA;;;;;;;;;;;GAWG;AAEH;;;;;;GAMG;AACH;IACE;;OAEG;IACH,+CAiDC;IA5CC;;OAEG;IACH,gBAFU,UAAU,CAKlB;IAEF;;;OAGG;IACH,sBAEiB;IAEjB;;;OAGG;IACH,sBAAyC;IAEzC;;;OAGG;IACH,mBAAiE;IAEjE;;;OAGG;IACH,gBAAqD;IAErD;;;OAGG;IACH,oBAAqC;IAQvC;;;;;;;;OAQG;IACH,yBAoDC;IAED;;;;;;OAMG;IACH,uBAsEC;IASD;;;;;;;OAOG;IACH,qBALW,WAAW,iEAEV,MAAM,OAAO,eAAe,EAAE,WAAW,CAAC,CAkCrD;IAED;;;;;;OAMG;IACH,uBAJW,QAAQ,GAAC,OAAO,SAAQ,MAAM,GAC7B,OAAO,uBAAuB,EAAE,OAAO,CAKlD;IAED;;;;OAIG;IACH,kBAHW,MAAM,MAAM,CAAC,QAKvB;CACF"}
|
package/format/MVT.js
CHANGED
|
@@ -13,7 +13,6 @@ import Point from '../geom/Point.js';
|
|
|
13
13
|
import Polygon from '../geom/Polygon.js';
|
|
14
14
|
import Projection from '../proj/Projection.js';
|
|
15
15
|
import RenderFeature from '../render/Feature.js';
|
|
16
|
-
import Units from '../proj/Units.js';
|
|
17
16
|
import {assert} from '../asserts.js';
|
|
18
17
|
import {get} from '../proj.js';
|
|
19
18
|
import {inflateEnds} from '../geom/flat/orient.js';
|
|
@@ -52,7 +51,7 @@ class MVT extends FeatureFormat {
|
|
|
52
51
|
*/
|
|
53
52
|
this.dataProjection = new Projection({
|
|
54
53
|
code: '',
|
|
55
|
-
units:
|
|
54
|
+
units: 'tile-pixels',
|
|
56
55
|
});
|
|
57
56
|
|
|
58
57
|
/**
|
package/geom/Geometry.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Geometry.d.ts","sourceRoot":"","sources":["Geometry.js"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"Geometry.d.ts","sourceRoot":"","sources":["Geometry.js"],"names":[],"mappings":";;;;;6BAoBa,IAAI,GAAG,KAAK,GAAG,KAAK,GAAG,MAAM;;;;;;mBAM7B,OAAO,GAAG,YAAY,GAAG,YAAY,GAAG,SAAS,GAAG,YAAY,GAAG,iBAAiB,GAAG,cAAc,GAAG,oBAAoB,GAAG,QAAQ;AAWpJ;;;;;;;;;;;GAWG;AACH;IACE,cA+CC;IA5CC;;;OAGG;IACH,gBAA4B;IAE5B;;;OAGG;IACH,wBAAyB;IAEzB;;;OAGG;IACH,oDAFU,MAAM,CAEiC;IAEjD;;;OAGG;IACH,sCAFU,MAAM,CAEmB;IAEnC;;;;;;;OAOG;IACH,qDAWE;IAGJ;;;;;;OAMG;IACH,sCAJW,MAAM,uEAEL,QAAQ,CAQnB;IAED;;;;OAIG;IACH,SAFa,QAAQ,CAIpB;IAED;;;;;;;OAOG;IACH,kBANW,MAAM,KACN,MAAM,gBACN,OAAO,kBAAkB,EAAE,UAAU,sBACrC,MAAM,GACL,MAAM,CAIjB;IAED;;;;OAIG;IACH,cAJW,MAAM,KACN,MAAM,GACL,OAAO,CAKlB;IAED;;;;;;;OAOG;IACH,uBALW,OAAO,kBAAkB,EAAE,UAAU,yEAEpC,OAAO,kBAAkB,EAAE,UAAU,CAOhD;IAED;;;;;;OAMG;IACH,iCAJW,OAAO,kBAAkB,EAAE,UAAU,GACpC,OAAO,CAKlB;IAED;;;;;OAKG;IACH,gCAJW,OAAO,cAAc,EAAE,MAAM,GAE5B,OAAO,cAAc,EAAE,MAAM,CAIxC;IAED;;;;;OAKG;IACH,mEAHY,OAAO,cAAc,EAAE,MAAM,CAYxC;IAED;;;;;;;OAOG;IACH,cAJW,MAAM,UACN,OAAO,kBAAkB,EAAE,UAAU,QAK/C;IAED;;;;;;;;;OASG;IACH,UANW,MAAM,qGAQhB;IAED;;;;;;;;OAQG;IACH,oBAJW,MAAM,GACL,QAAQ,CAKnB;IAED;;;;;;;OAOG;IACH,wCAHW,MAAM,GACL,QAAQ,CAInB;IAED;;;;OAIG;IACH,WAFY,IAAI,CAIf;IAED;;;;;;;;OAQG;IACH,4BAHW,OAAO,YAAY,EAAE,iBAAiB,QAKhD;IAED;;;;;OAKG;IACH,yBAHW,OAAO,cAAc,EAAE,MAAM,GAC5B,OAAO,CAIlB;IAED;;;;;;;OAOG;IACH,kBAJW,MAAM,UACN,MAAM,QAKhB;IAED;;;;;;;;;;;;;;OAcG;IACH,kBARW,OAAO,YAAY,EAAE,cAAc,eAEnC,OAAO,YAAY,EAAE,cAAc,GAElC,QAAQ,CAwCnB;CACF"}
|
package/geom/Geometry.js
CHANGED
|
@@ -2,7 +2,6 @@
|
|
|
2
2
|
* @module ol/geom/Geometry
|
|
3
3
|
*/
|
|
4
4
|
import BaseObject from '../Object.js';
|
|
5
|
-
import Units from '../proj/Units.js';
|
|
6
5
|
import {abstract} from '../util.js';
|
|
7
6
|
import {
|
|
8
7
|
compose as composeTransform,
|
|
@@ -310,7 +309,7 @@ class Geometry extends BaseObject {
|
|
|
310
309
|
/** @type {import("../proj/Projection.js").default} */
|
|
311
310
|
const sourceProj = getProjection(source);
|
|
312
311
|
const transformFn =
|
|
313
|
-
sourceProj.getUnits() ==
|
|
312
|
+
sourceProj.getUnits() == 'tile-pixels'
|
|
314
313
|
? function (inCoordinates, outCoordinates, stride) {
|
|
315
314
|
const pixelExtent = sourceProj.getExtent();
|
|
316
315
|
const projectedExtent = sourceProj.getWorldExtent();
|
|
@@ -1,9 +1,5 @@
|
|
|
1
|
-
export type Mode = string;
|
|
2
|
-
export namespace Mode {
|
|
3
|
-
const TRACKPAD: string;
|
|
4
|
-
const WHEEL: string;
|
|
5
|
-
}
|
|
6
1
|
export default MouseWheelZoom;
|
|
2
|
+
export type Mode = 'trackpad' | 'wheel';
|
|
7
3
|
export type Options = {
|
|
8
4
|
/**
|
|
9
5
|
* A function that
|
|
@@ -42,6 +38,9 @@ export type Options = {
|
|
|
42
38
|
*/
|
|
43
39
|
constrainResolution?: boolean | undefined;
|
|
44
40
|
};
|
|
41
|
+
/**
|
|
42
|
+
* @typedef {'trackpad' | 'wheel'} Mode
|
|
43
|
+
*/
|
|
45
44
|
/**
|
|
46
45
|
* @typedef {Object} Options
|
|
47
46
|
* @property {import("../events/condition.js").Condition} [condition] A function that
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MouseWheelZoom.d.ts","sourceRoot":"","sources":["MouseWheelZoom.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"MouseWheelZoom.d.ts","sourceRoot":"","sources":["MouseWheelZoom.js"],"names":[],"mappings":";mBAUa,UAAU,GAAG,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AADjC;;GAEG;AAEH;;;;;;;;;;;;;;;;;GAiBG;AAEH;;;;GAIG;AACH;IACE;;OAEG;IACH,+CAyGC;IAlGC;;;OAGG;IACH,oBAAoB;IAEpB;;;OAGG;IACH,mBAAmB;IAEnB;;;OAGG;IACH,kBAAsE;IAEtE;;;OAGG;IACH,kBAAwE;IAExE;;;OAGG;IACH,iBAAoE;IAEpE;;;OAGG;IACH,mBAC4D;IAE5D;;;OAGG;IACH,6BAGW;IAIX;;;OAGG;IACH,mBAEa;IAEb;;;OAGG;IACH,oBAAuB;IAEvB;;;OAGG;IACH,mBAA2B;IAE3B;;;OAGG;IACH,mBAAe;IAEf;;;OAGG;IACH,cAAsB;IAEtB;;;;OAIG;IACH,mBAFU,MAAM,CAEY;IAE5B;;OAEG;IACH,4BAAuB;IAEvB;;;;OAIG;IACH,sBAAwB;IAG1B;;OAEG;IACH,wBAYC;IA2FD;;;OAGG;IACH,yBAsBC;IAED;;;;;OAKG;IACH,0BAJW,OAAO,QASjB;CACF"}
|
|
@@ -8,12 +8,8 @@ import {all, always, focusWithTabindex} from '../events/condition.js';
|
|
|
8
8
|
import {clamp} from '../math.js';
|
|
9
9
|
|
|
10
10
|
/**
|
|
11
|
-
* @
|
|
11
|
+
* @typedef {'trackpad' | 'wheel'} Mode
|
|
12
12
|
*/
|
|
13
|
-
export const Mode = {
|
|
14
|
-
TRACKPAD: 'trackpad',
|
|
15
|
-
WHEEL: 'wheel',
|
|
16
|
-
};
|
|
17
13
|
|
|
18
14
|
/**
|
|
19
15
|
* @typedef {Object} Options
|
|
@@ -218,12 +214,12 @@ class MouseWheelZoom extends Interaction {
|
|
|
218
214
|
}
|
|
219
215
|
|
|
220
216
|
if (!this.mode_ || now - this.startTime_ > this.trackpadEventGap_) {
|
|
221
|
-
this.mode_ = Math.abs(delta) < 4 ?
|
|
217
|
+
this.mode_ = Math.abs(delta) < 4 ? 'trackpad' : 'wheel';
|
|
222
218
|
}
|
|
223
219
|
|
|
224
220
|
const view = map.getView();
|
|
225
221
|
if (
|
|
226
|
-
this.mode_ ===
|
|
222
|
+
this.mode_ === 'trackpad' &&
|
|
227
223
|
!(view.getConstrainResolution() || this.constrainResolution_)
|
|
228
224
|
) {
|
|
229
225
|
if (this.trackpadTimeoutId_) {
|
package/layer/MapboxVector.d.ts
CHANGED
|
@@ -113,7 +113,7 @@ export type Options = {
|
|
|
113
113
|
* tile layers with only a few rendered features (e.g. for highlighting a subset of features of
|
|
114
114
|
* another layer with the same source).
|
|
115
115
|
*/
|
|
116
|
-
renderMode?:
|
|
116
|
+
renderMode?: import("../layer/VectorTile.js").VectorTileRenderType | undefined;
|
|
117
117
|
/**
|
|
118
118
|
* Sets the layer as overlay on a map. The map will not manage
|
|
119
119
|
* this layer in its layers collection, and the layer will be rendered on top. This is useful for
|
|
@@ -204,7 +204,7 @@ export type Options = {
|
|
|
204
204
|
* Recommended value: Vector tiles are usually generated with a buffer, so this value should match
|
|
205
205
|
* the largest possible buffer of the used tiles. It should be at least the size of the largest
|
|
206
206
|
* point symbol or line width.
|
|
207
|
-
* @property {import("./
|
|
207
|
+
* @property {import("./VectorTile.js").VectorTileRenderType} [renderMode='hybrid'] Render mode for vector tiles:
|
|
208
208
|
* * `'hybrid'`: Polygon and line elements are rendered as images, so pixels are scaled during zoom
|
|
209
209
|
* animations. Point symbols and texts are accurately rendered as vectors and can stay upright on
|
|
210
210
|
* rotated views.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MapboxVector.d.ts","sourceRoot":"","sources":["MapboxVector.js"],"names":[],"mappings":";;;;;;;cA8Bc,MAAM
|
|
1
|
+
{"version":3,"file":"MapboxVector.d.ts","sourceRoot":"","sources":["MapboxVector.js"],"names":[],"mappings":";;;;;;;cA8Bc,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAFpB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4EG;AAEH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH;IACE;;;OAGG;IACH,qBAHW,OAAO,EAqDjB;IAnBG,gCAAsC;CAoB3C"}
|
package/layer/MapboxVector.js
CHANGED
|
@@ -81,7 +81,7 @@ class ErrorEvent extends BaseEvent {
|
|
|
81
81
|
* Recommended value: Vector tiles are usually generated with a buffer, so this value should match
|
|
82
82
|
* the largest possible buffer of the used tiles. It should be at least the size of the largest
|
|
83
83
|
* point symbol or line width.
|
|
84
|
-
* @property {import("./
|
|
84
|
+
* @property {import("./VectorTile.js").VectorTileRenderType} [renderMode='hybrid'] Render mode for vector tiles:
|
|
85
85
|
* * `'hybrid'`: Polygon and line elements are rendered as images, so pixels are scaled during zoom
|
|
86
86
|
* animations. Point symbols and texts are accurately rendered as vectors and can stay upright on
|
|
87
87
|
* rotated views.
|
package/layer/VectorTile.d.ts
CHANGED
|
@@ -3,6 +3,7 @@ export default VectorTileLayer;
|
|
|
3
3
|
* *
|
|
4
4
|
*/
|
|
5
5
|
export type VectorTileLayerOnSignature<Return> = import("../Observable").OnSignature<import("../Observable").EventTypes, import("../events/Event.js").default, Return> & import("../Observable").OnSignature<import("./Base").BaseLayerObjectEventTypes | 'change:source' | 'change:preload' | 'change:useInterimTilesOnError', import("../Object").ObjectEvent, Return> & import("../Observable").OnSignature<import("../render/EventType").LayerRenderEventTypes, import("../render/Event").default, Return> & import("../Observable").CombinedOnSignature<import("../Observable").EventTypes | import("./Base").BaseLayerObjectEventTypes | 'change:source' | 'change:preload' | 'change:useInterimTilesOnError' | import("../render/EventType").LayerRenderEventTypes, Return>;
|
|
6
|
+
export type VectorTileRenderType = 'hybrid' | 'vector';
|
|
6
7
|
export type Options = {
|
|
7
8
|
/**
|
|
8
9
|
* A CSS class name to set to the layer element.
|
|
@@ -71,7 +72,7 @@ export type Options = {
|
|
|
71
72
|
* tile layers with only a few rendered features (e.g. for highlighting a subset of features of
|
|
72
73
|
* another layer with the same source).
|
|
73
74
|
*/
|
|
74
|
-
renderMode?:
|
|
75
|
+
renderMode?: VectorTileRenderType | undefined;
|
|
75
76
|
/**
|
|
76
77
|
* Source.
|
|
77
78
|
*/
|
|
@@ -144,6 +145,9 @@ export type Options = {
|
|
|
144
145
|
* import("../Observable").CombinedOnSignature<import("../Observable").EventTypes|import("./Base").BaseLayerObjectEventTypes|
|
|
145
146
|
* 'change:source'|'change:preload'|'change:useInterimTilesOnError'|import("../render/EventType").LayerRenderEventTypes, Return>} VectorTileLayerOnSignature
|
|
146
147
|
*/
|
|
148
|
+
/**
|
|
149
|
+
* @typedef {'hybrid' | 'vector'} VectorTileRenderType
|
|
150
|
+
*/
|
|
147
151
|
/**
|
|
148
152
|
* @typedef {Object} Options
|
|
149
153
|
* @property {string} [className='ol-layer'] A CSS class name to set to the layer element.
|
|
@@ -171,7 +175,7 @@ export type Options = {
|
|
|
171
175
|
* Recommended value: Vector tiles are usually generated with a buffer, so this value should match
|
|
172
176
|
* the largest possible buffer of the used tiles. It should be at least the size of the largest
|
|
173
177
|
* point symbol or line width.
|
|
174
|
-
* @property {
|
|
178
|
+
* @property {VectorTileRenderType} [renderMode='hybrid'] Render mode for vector tiles:
|
|
175
179
|
* * `'hybrid'`: Polygon and line elements are rendered as images, so pixels are scaled during zoom
|
|
176
180
|
* animations. Point symbols and texts are accurately rendered as vectors and can stay upright on
|
|
177
181
|
* rotated views.
|
|
@@ -239,13 +243,13 @@ declare class VectorTileLayer extends BaseVectorLayer<import("../source/VectorTi
|
|
|
239
243
|
un: VectorTileLayerOnSignature<void>;
|
|
240
244
|
/**
|
|
241
245
|
* @private
|
|
242
|
-
* @type {
|
|
246
|
+
* @type {VectorTileRenderType}
|
|
243
247
|
*/
|
|
244
248
|
private renderMode_;
|
|
245
249
|
/**
|
|
246
|
-
* @return {
|
|
250
|
+
* @return {VectorTileRenderType} The render mode.
|
|
247
251
|
*/
|
|
248
|
-
getRenderMode():
|
|
252
|
+
getRenderMode(): VectorTileRenderType;
|
|
249
253
|
/**
|
|
250
254
|
* Return the level as number to which we will preload tiles up to.
|
|
251
255
|
* @return {number} The level to preload tiles up to.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"VectorTile.d.ts","sourceRoot":"","sources":["VectorTile.js"],"names":[],"mappings":";;;;
|
|
1
|
+
{"version":3,"file":"VectorTile.d.ts","sourceRoot":"","sources":["VectorTile.js"],"names":[],"mappings":";;;;iDAUa,OAAO,eAAe,EAAE,WAAW,CAAC,OAAO,eAAe,EAAE,UAAU,EAAE,OAAO,oBAAoB,EAAE,OAAO,EAAE,MAAM,CAAC,GACjI,OAAW,eAAe,EAAE,WAAW,CAAC,OAAO,QAAQ,EAAE,yBAAyB,GAClF,eAAqB,GAAC,gBAAgB,GAAC,+BAA+B,EAAE,OAAO,WAAW,EAAE,WAAW,EAAE,MAAM,CAAC,GAChH,OAAW,eAAe,EAAE,WAAW,CAAC,OAAO,qBAAqB,EAAE,qBAAqB,EAAE,OAAO,iBAAiB,EAAE,OAAO,EAAE,MAAM,CAAC,GACvI,OAAW,eAAe,EAAE,mBAAmB,CAAC,OAAO,eAAe,EAAE,UAAU,GAAC,OAAO,QAAQ,EAAE,yBAAyB,GAC7H,eAAqB,GAAC,gBAAgB,GAAC,+BAA+B,GAAC,OAAO,qBAAqB,EAAE,qBAAqB,EAAE,MAAM,CAAC;mCAIvH,QAAQ,GAAG,QAAQ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAXhC;;;;;;;;GAQG;AAEH;;GAEG;AAEH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgEG;AAEH;;;;;;;;;;GAUG;AACH;IACE;;OAEG;IACH,+CA0DC;IA7CC;;OAEG;IACH,IAFU,2BAA2B,OAAO,WAAW,EAAE,SAAS,CAAC,CAE5D;IAEP;;OAEG;IACH,MAFU,2BAA2B,OAAO,WAAW,EAAE,SAAS,CAAC,CAE1D;IAET;;OAEG;IACH,IAFU,2BAA2B,IAAI,CAAC,CAEnC;IAMP;;;OAGG;IACH,oBAA6B;IA8C/B;;OAEG;IACH,iBAFY,oBAAoB,CAI/B;IAED;;;;;OAKG;IACH,cAJY,MAAM,CAMjB;IAED;;;;;OAKG;IACH,6BAJY,OAAO,CAQlB;IAED;;;;;OAKG;IACH,oBAJW,MAAM,QAMhB;IAED;;;;;OAKG;IACH,kDAJW,OAAO,QAMjB;CACF"}
|
package/layer/VectorTile.js
CHANGED
|
@@ -4,7 +4,6 @@
|
|
|
4
4
|
import BaseVectorLayer from './BaseVector.js';
|
|
5
5
|
import CanvasVectorTileLayerRenderer from '../renderer/canvas/VectorTileLayer.js';
|
|
6
6
|
import TileProperty from './TileProperty.js';
|
|
7
|
-
import VectorTileRenderType from './VectorTileRenderType.js';
|
|
8
7
|
import {assert} from '../asserts.js';
|
|
9
8
|
|
|
10
9
|
/***
|
|
@@ -17,6 +16,10 @@ import {assert} from '../asserts.js';
|
|
|
17
16
|
* 'change:source'|'change:preload'|'change:useInterimTilesOnError'|import("../render/EventType").LayerRenderEventTypes, Return>} VectorTileLayerOnSignature
|
|
18
17
|
*/
|
|
19
18
|
|
|
19
|
+
/**
|
|
20
|
+
* @typedef {'hybrid' | 'vector'} VectorTileRenderType
|
|
21
|
+
*/
|
|
22
|
+
|
|
20
23
|
/**
|
|
21
24
|
* @typedef {Object} Options
|
|
22
25
|
* @property {string} [className='ol-layer'] A CSS class name to set to the layer element.
|
|
@@ -44,7 +47,7 @@ import {assert} from '../asserts.js';
|
|
|
44
47
|
* Recommended value: Vector tiles are usually generated with a buffer, so this value should match
|
|
45
48
|
* the largest possible buffer of the used tiles. It should be at least the size of the largest
|
|
46
49
|
* point symbol or line width.
|
|
47
|
-
* @property {
|
|
50
|
+
* @property {VectorTileRenderType} [renderMode='hybrid'] Render mode for vector tiles:
|
|
48
51
|
* * `'hybrid'`: Polygon and line elements are rendered as images, so pixels are scaled during zoom
|
|
49
52
|
* animations. Point symbols and texts are accurately rendered as vectors and can stay upright on
|
|
50
53
|
* rotated views.
|
|
@@ -126,22 +129,13 @@ class VectorTileLayer extends BaseVectorLayer {
|
|
|
126
129
|
*/
|
|
127
130
|
this.un;
|
|
128
131
|
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
console.warn('renderMode: "image" is deprecated. Option ignored.')
|
|
133
|
-
options.renderMode = undefined;
|
|
134
|
-
}
|
|
135
|
-
const renderMode = options.renderMode || VectorTileRenderType.HYBRID;
|
|
136
|
-
assert(
|
|
137
|
-
renderMode == VectorTileRenderType.HYBRID ||
|
|
138
|
-
renderMode == VectorTileRenderType.VECTOR,
|
|
139
|
-
28
|
|
140
|
-
); // `renderMode` must be `'hybrid'` or `'vector'`.
|
|
132
|
+
const renderMode = options.renderMode || 'hybrid';
|
|
133
|
+
// `renderMode` must be `'hybrid'` or `'vector'`.
|
|
134
|
+
assert(renderMode == 'hybrid' || renderMode == 'vector', 28);
|
|
141
135
|
|
|
142
136
|
/**
|
|
143
137
|
* @private
|
|
144
|
-
* @type {
|
|
138
|
+
* @type {VectorTileRenderType}
|
|
145
139
|
*/
|
|
146
140
|
this.renderMode_ = renderMode;
|
|
147
141
|
|
|
@@ -190,7 +184,7 @@ class VectorTileLayer extends BaseVectorLayer {
|
|
|
190
184
|
}
|
|
191
185
|
|
|
192
186
|
/**
|
|
193
|
-
* @return {
|
|
187
|
+
* @return {VectorTileRenderType} The render mode.
|
|
194
188
|
*/
|
|
195
189
|
getRenderMode() {
|
|
196
190
|
return this.renderMode_;
|
package/package.json
CHANGED
package/proj/Projection.d.ts
CHANGED
|
@@ -8,7 +8,7 @@ export type Options = {
|
|
|
8
8
|
* Units. Required unless a
|
|
9
9
|
* proj4 projection is defined for `code`.
|
|
10
10
|
*/
|
|
11
|
-
units?:
|
|
11
|
+
units?: import("./Units.js").Units | undefined;
|
|
12
12
|
/**
|
|
13
13
|
* The validity extent for the SRS.
|
|
14
14
|
*/
|
|
@@ -23,7 +23,7 @@ export type Options = {
|
|
|
23
23
|
global?: boolean | undefined;
|
|
24
24
|
/**
|
|
25
25
|
* The meters per unit for the SRS.
|
|
26
|
-
* If not provided, the `units` are used to get the meters per unit from the {@link
|
|
26
|
+
* If not provided, the `units` are used to get the meters per unit from the {@link METERS_PER_UNIT }lookup table.
|
|
27
27
|
*/
|
|
28
28
|
metersPerUnit?: number | undefined;
|
|
29
29
|
/**
|
|
@@ -41,13 +41,13 @@ export type Options = {
|
|
|
41
41
|
/**
|
|
42
42
|
* @typedef {Object} Options
|
|
43
43
|
* @property {string} code The SRS identifier code, e.g. `EPSG:4326`.
|
|
44
|
-
* @property {import("./Units.js").
|
|
44
|
+
* @property {import("./Units.js").Units} [units] Units. Required unless a
|
|
45
45
|
* proj4 projection is defined for `code`.
|
|
46
46
|
* @property {import("../extent.js").Extent} [extent] The validity extent for the SRS.
|
|
47
47
|
* @property {string} [axisOrientation='enu'] The axis orientation as specified in Proj4.
|
|
48
48
|
* @property {boolean} [global=false] Whether the projection is valid for the whole globe.
|
|
49
49
|
* @property {number} [metersPerUnit] The meters per unit for the SRS.
|
|
50
|
-
* If not provided, the `units` are used to get the meters per unit from the {@link
|
|
50
|
+
* If not provided, the `units` are used to get the meters per unit from the {@link METERS_PER_UNIT}
|
|
51
51
|
* lookup table.
|
|
52
52
|
* @property {import("../extent.js").Extent} [worldExtent] The world extent for the SRS.
|
|
53
53
|
* @property {function(number, import("../coordinate.js").Coordinate):number} [getPointResolution]
|
|
@@ -98,7 +98,7 @@ declare class Projection {
|
|
|
98
98
|
* `this.extent_` and `this.worldExtent_` must be configured properly for each
|
|
99
99
|
* tile.
|
|
100
100
|
* @private
|
|
101
|
-
* @type {import("./Units.js").
|
|
101
|
+
* @type {import("./Units.js").Units}
|
|
102
102
|
*/
|
|
103
103
|
private units_;
|
|
104
104
|
/**
|
|
@@ -165,10 +165,10 @@ declare class Projection {
|
|
|
165
165
|
getExtent(): import("../extent.js").Extent;
|
|
166
166
|
/**
|
|
167
167
|
* Get the units of this projection.
|
|
168
|
-
* @return {import("./Units.js").
|
|
168
|
+
* @return {import("./Units.js").Units} Units.
|
|
169
169
|
* @api
|
|
170
170
|
*/
|
|
171
|
-
getUnits(): import("./Units.js").
|
|
171
|
+
getUnits(): import("./Units.js").Units;
|
|
172
172
|
/**
|
|
173
173
|
* Get the amount of meters per unit of this projection. If the projection is
|
|
174
174
|
* not configured with `metersPerUnit` or a units identifier, the return is
|
package/proj/Projection.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Projection.d.ts","sourceRoot":"","sources":["Projection.js"],"names":[],"mappings":";;;;;UAOc,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iCAUG,MAAM,QAAE,OAAO,kBAAkB,EAAE,UAAU,KAAE,MAAM;;AAZ5E;;;;;;;;;;;;;;;;;GAiBG;AAEH;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH;IACE;;OAEG;IACH,qBAFW,OAAO,EAyEjB;IAtEC;;;OAGG;IACH,cAAyB;IAEzB;;;;;;OAMG;IACH,
|
|
1
|
+
{"version":3,"file":"Projection.d.ts","sourceRoot":"","sources":["Projection.js"],"names":[],"mappings":";;;;;UAOc,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iCAUG,MAAM,QAAE,OAAO,kBAAkB,EAAE,UAAU,KAAE,MAAM;;AAZ5E;;;;;;;;;;;;;;;;;GAiBG;AAEH;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH;IACE;;OAEG;IACH,qBAFW,OAAO,EAyEjB;IAtEC;;;OAGG;IACH,cAAyB;IAEzB;;;;;;OAMG;IACH,eAAuE;IAEvE;;;;;;OAMG;IACH,gBAAmE;IAEnE;;;;;;OAMG;IACH,qBACgE;IAEhE;;;OAGG;IACH,yBACyE;IAEzE;;;OAGG;IACH,gBAAoE;IAEpE;;;OAGG;IACH,kBAAiD;IAEjD;;;OAGG;IACH,gCAAyD;IAEzD;;;OAGG;IACH,yBAA4B;IAE5B;;;OAGG;IACH,uBAA2C;IAG7C;;OAEG;IACH,YAFY,OAAO,CAIlB;IAED;;;;OAIG;IACH,WAHY,MAAM,CAKjB;IAED;;;;OAIG;IACH,aAHY,OAAO,cAAc,EAAE,MAAM,CAKxC;IAED;;;;OAIG;IACH,YAHY,OAAO,YAAY,EAAE,KAAK,CAKrC;IAED;;;;;;OAMG;IACH,oBAHY,MAAM,GAAC,SAAS,CAK3B;IAED;;;;OAIG;IACH,kBAHY,OAAO,cAAc,EAAE,MAAM,CAKxC;IAED;;;;;;;;;;OAUG;IACH,sBAHY,MAAM,CAKjB;IAED;;;;OAIG;IACH,YAHY,OAAO,CAKlB;IAED;;;;OAIG;IACH,kBAHW,OAAO,QAMjB;IAED;;OAEG;IACH,sBAFY,OAAO,yBAAyB,EAAE,OAAO,CAIpD;IAED;;OAEG;IACH,6BAFW,OAAO,yBAAyB,EAAE,OAAO,QAInD;IAED;;;;OAIG;IACH,kBAHW,OAAO,cAAc,EAAE,MAAM,QAMvC;IAED;;;;;OAKG;IACH,4BAJW,OAAO,cAAc,EAAE,MAAM,QAMvC;IAED;;;;;OAKG;IACH,mCAHoB,MAAM,QAAE,OAAO,kBAAkB,EAAE,UAAU,KAAE,MAAM,QAKxE;IAED;;;;OAIG;IACH,iCAHqB,MAAM,QAAE,OAAO,kBAAkB,EAAE,UAAU,KAAE,MAAM,GAAC,SAAS,CAKnF;CACF"}
|
package/proj/Projection.js
CHANGED
|
@@ -6,13 +6,13 @@ import {METERS_PER_UNIT} from './Units.js';
|
|
|
6
6
|
/**
|
|
7
7
|
* @typedef {Object} Options
|
|
8
8
|
* @property {string} code The SRS identifier code, e.g. `EPSG:4326`.
|
|
9
|
-
* @property {import("./Units.js").
|
|
9
|
+
* @property {import("./Units.js").Units} [units] Units. Required unless a
|
|
10
10
|
* proj4 projection is defined for `code`.
|
|
11
11
|
* @property {import("../extent.js").Extent} [extent] The validity extent for the SRS.
|
|
12
12
|
* @property {string} [axisOrientation='enu'] The axis orientation as specified in Proj4.
|
|
13
13
|
* @property {boolean} [global=false] Whether the projection is valid for the whole globe.
|
|
14
14
|
* @property {number} [metersPerUnit] The meters per unit for the SRS.
|
|
15
|
-
* If not provided, the `units` are used to get the meters per unit from the {@link
|
|
15
|
+
* If not provided, the `units` are used to get the meters per unit from the {@link METERS_PER_UNIT}
|
|
16
16
|
* lookup table.
|
|
17
17
|
* @property {import("../extent.js").Extent} [worldExtent] The world extent for the SRS.
|
|
18
18
|
* @property {function(number, import("../coordinate.js").Coordinate):number} [getPointResolution]
|
|
@@ -65,9 +65,9 @@ class Projection {
|
|
|
65
65
|
* `this.extent_` and `this.worldExtent_` must be configured properly for each
|
|
66
66
|
* tile.
|
|
67
67
|
* @private
|
|
68
|
-
* @type {import("./Units.js").
|
|
68
|
+
* @type {import("./Units.js").Units}
|
|
69
69
|
*/
|
|
70
|
-
this.units_ = /** @type {import("./Units.js").
|
|
70
|
+
this.units_ = /** @type {import("./Units.js").Units} */ (options.units);
|
|
71
71
|
|
|
72
72
|
/**
|
|
73
73
|
* Validity extent of the projection in projected coordinates. For projections
|
|
@@ -153,7 +153,7 @@ class Projection {
|
|
|
153
153
|
|
|
154
154
|
/**
|
|
155
155
|
* Get the units of this projection.
|
|
156
|
-
* @return {import("./Units.js").
|
|
156
|
+
* @return {import("./Units.js").Units} Units.
|
|
157
157
|
* @api
|
|
158
158
|
*/
|
|
159
159
|
getUnits() {
|
package/proj/Units.d.ts
CHANGED
|
@@ -3,26 +3,45 @@
|
|
|
3
3
|
* @return {Units} Units.
|
|
4
4
|
*/
|
|
5
5
|
export function fromCode(code: number): Units;
|
|
6
|
+
/**
|
|
7
|
+
* @typedef {Object} MetersPerUnitLookup
|
|
8
|
+
* @property {number} radians Radians
|
|
9
|
+
* @property {number} degrees Degrees
|
|
10
|
+
* @property {number} ft Feet
|
|
11
|
+
* @property {number} m Meters
|
|
12
|
+
* @property {number} us-ft US feet
|
|
13
|
+
*/
|
|
6
14
|
/**
|
|
7
15
|
* Meters per unit lookup table.
|
|
8
16
|
* @const
|
|
9
|
-
* @type {
|
|
17
|
+
* @type {MetersPerUnitLookup}
|
|
10
18
|
* @api
|
|
11
19
|
*/
|
|
12
|
-
export const METERS_PER_UNIT:
|
|
13
|
-
export default Units;
|
|
20
|
+
export const METERS_PER_UNIT: MetersPerUnitLookup;
|
|
14
21
|
/**
|
|
15
|
-
* Projection units
|
|
16
|
-
* `'us-ft'`.
|
|
22
|
+
* Projection units.
|
|
17
23
|
*/
|
|
18
|
-
type Units =
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
24
|
+
export type Units = 'radians' | 'degrees' | 'ft' | 'm' | 'pixels' | 'tile-pixels' | 'us-ft';
|
|
25
|
+
export type MetersPerUnitLookup = {
|
|
26
|
+
/**
|
|
27
|
+
* Radians
|
|
28
|
+
*/
|
|
29
|
+
radians: number;
|
|
30
|
+
/**
|
|
31
|
+
* Degrees
|
|
32
|
+
*/
|
|
33
|
+
degrees: number;
|
|
34
|
+
/**
|
|
35
|
+
* Feet
|
|
36
|
+
*/
|
|
37
|
+
ft: number;
|
|
38
|
+
/**
|
|
39
|
+
* Meters
|
|
40
|
+
*/
|
|
41
|
+
m: number;
|
|
42
|
+
/**
|
|
43
|
+
* US feet
|
|
44
|
+
*/
|
|
45
|
+
"us-ft": number;
|
|
46
|
+
};
|
|
28
47
|
//# sourceMappingURL=Units.d.ts.map
|
package/proj/Units.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Units.d.ts","sourceRoot":"","sources":["Units.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Units.d.ts","sourceRoot":"","sources":["Units.js"],"names":[],"mappings":"AAqBA;;;GAGG;AACH,+BAHW,MAAM,GACL,KAAK,CAIhB;AAED;;;;;;;GAOG;AAEH;;;;;GAKG;AACH,8BAHU,mBAAmB,CAU3B;;;;oBA9CW,SAAS,GAAG,SAAS,GAAG,IAAI,GAAG,GAAG,GAAG,QAAQ,GAAG,aAAa,GAAG,OAAO;;;;;aA0BtE,MAAM;;;;aACN,MAAM;;;;QACN,MAAM;;;;OACN,MAAM;;;;aACN,MAAM"}
|
package/proj/Units.js
CHANGED
|
@@ -3,58 +3,20 @@
|
|
|
3
3
|
*/
|
|
4
4
|
|
|
5
5
|
/**
|
|
6
|
-
*
|
|
7
|
-
*
|
|
8
|
-
* @enum {string}
|
|
6
|
+
* @typedef {'radians' | 'degrees' | 'ft' | 'm' | 'pixels' | 'tile-pixels' | 'us-ft'} Units
|
|
7
|
+
* Projection units.
|
|
9
8
|
*/
|
|
10
|
-
const Units = {
|
|
11
|
-
/**
|
|
12
|
-
* Radians
|
|
13
|
-
* @api
|
|
14
|
-
*/
|
|
15
|
-
RADIANS: 'radians',
|
|
16
|
-
/**
|
|
17
|
-
* Degrees
|
|
18
|
-
* @api
|
|
19
|
-
*/
|
|
20
|
-
DEGREES: 'degrees',
|
|
21
|
-
/**
|
|
22
|
-
* Feet
|
|
23
|
-
* @api
|
|
24
|
-
*/
|
|
25
|
-
FEET: 'ft',
|
|
26
|
-
/**
|
|
27
|
-
* Meters
|
|
28
|
-
* @api
|
|
29
|
-
*/
|
|
30
|
-
METERS: 'm',
|
|
31
|
-
/**
|
|
32
|
-
* Pixels
|
|
33
|
-
* @api
|
|
34
|
-
*/
|
|
35
|
-
PIXELS: 'pixels',
|
|
36
|
-
/**
|
|
37
|
-
* Tile Pixels
|
|
38
|
-
* @api
|
|
39
|
-
*/
|
|
40
|
-
TILE_PIXELS: 'tile-pixels',
|
|
41
|
-
/**
|
|
42
|
-
* US Feet
|
|
43
|
-
* @api
|
|
44
|
-
*/
|
|
45
|
-
USFEET: 'us-ft',
|
|
46
|
-
};
|
|
47
9
|
|
|
48
10
|
/**
|
|
49
11
|
* See http://duff.ess.washington.edu/data/raster/drg/docs/geotiff.txt
|
|
50
12
|
* @type {Object<number, Units>}
|
|
51
13
|
*/
|
|
52
14
|
const unitByCode = {
|
|
53
|
-
'9001':
|
|
54
|
-
'9002':
|
|
55
|
-
'9003':
|
|
56
|
-
'9101':
|
|
57
|
-
'9102':
|
|
15
|
+
'9001': 'm',
|
|
16
|
+
'9002': 'ft',
|
|
17
|
+
'9003': 'us-ft',
|
|
18
|
+
'9101': 'radians',
|
|
19
|
+
'9102': 'degrees',
|
|
58
20
|
};
|
|
59
21
|
|
|
60
22
|
/**
|
|
@@ -65,18 +27,26 @@ export function fromCode(code) {
|
|
|
65
27
|
return unitByCode[code];
|
|
66
28
|
}
|
|
67
29
|
|
|
30
|
+
/**
|
|
31
|
+
* @typedef {Object} MetersPerUnitLookup
|
|
32
|
+
* @property {number} radians Radians
|
|
33
|
+
* @property {number} degrees Degrees
|
|
34
|
+
* @property {number} ft Feet
|
|
35
|
+
* @property {number} m Meters
|
|
36
|
+
* @property {number} us-ft US feet
|
|
37
|
+
*/
|
|
38
|
+
|
|
68
39
|
/**
|
|
69
40
|
* Meters per unit lookup table.
|
|
70
41
|
* @const
|
|
71
|
-
* @type {
|
|
42
|
+
* @type {MetersPerUnitLookup}
|
|
72
43
|
* @api
|
|
73
44
|
*/
|
|
74
|
-
export const METERS_PER_UNIT = {
|
|
75
|
-
// use the radius of the Normal sphere
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
export default Units;
|
|
45
|
+
export const METERS_PER_UNIT = {
|
|
46
|
+
// use the radius of the Normal sphere
|
|
47
|
+
'radians': 6370997 / (2 * Math.PI),
|
|
48
|
+
'degrees': (2 * Math.PI * 6370997) / 360,
|
|
49
|
+
'ft': 0.3048,
|
|
50
|
+
'm': 1,
|
|
51
|
+
'us-ft': 1200 / 3937,
|
|
52
|
+
};
|
package/proj/epsg3857.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"epsg3857.d.ts","sourceRoot":"","sources":["epsg3857.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"epsg3857.d.ts","sourceRoot":"","sources":["epsg3857.js"],"names":[],"mappings":"AA2EA;;;;;;;GAOG;AACH,oCALW,MAAM,MAAM,CAAC,0EAGZ,MAAM,MAAM,CAAC,CAyBxB;AAED;;;;;;;GAOG;AACH,kCALW,MAAM,MAAM,CAAC,0EAGZ,MAAM,MAAM,CAAC,CAoBxB;AAjID;;;;;GAKG;AACH,qBAFU,MAAM,CAEc;AAE9B;;;GAGG;AACH,wBAFU,MAAM,CAE0B;AAE1C;;;GAGG;AACH,qBAFU,OAAO,cAAc,EAAE,MAAM,CAE8B;AAErE;;;GAGG;AACH,2BAFU,OAAO,cAAc,EAAE,MAAM,CAEU;AAEjD;;;;GAIG;AACH,yBAFU,MAAM,CAEmD;AAwBnE;;;;;GAKG;AACH,0BAFU,MAAM,OAAO,iBAAiB,EAAE,OAAO,CAAC,CAShD"}
|
package/proj/epsg3857.js
CHANGED
|
@@ -2,7 +2,6 @@
|
|
|
2
2
|
* @module ol/proj/epsg3857
|
|
3
3
|
*/
|
|
4
4
|
import Projection from './Projection.js';
|
|
5
|
-
import Units from './Units.js';
|
|
6
5
|
|
|
7
6
|
/**
|
|
8
7
|
* Radius of WGS84 sphere
|
|
@@ -48,7 +47,7 @@ class EPSG3857Projection extends Projection {
|
|
|
48
47
|
constructor(code) {
|
|
49
48
|
super({
|
|
50
49
|
code: code,
|
|
51
|
-
units:
|
|
50
|
+
units: 'm',
|
|
52
51
|
extent: EXTENT,
|
|
53
52
|
global: true,
|
|
54
53
|
worldExtent: WORLD_EXTENT,
|
package/proj/epsg4326.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"epsg4326.d.ts","sourceRoot":"","sources":["epsg4326.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"epsg4326.d.ts","sourceRoot":"","sources":["epsg4326.js"],"names":[],"mappings":"AAKA;;;;;GAKG;AACH,qBAFU,MAAM,CAEc;AAE9B;;;;;GAKG;AACH,qBAFU,OAAO,cAAc,EAAE,MAAM,CAEI;AAE3C;;;GAGG;AACH,8BAFU,MAAM,CAEwC;AA4BxD;;;;;GAKG;AACH,0BAFU,MAAM,OAAO,iBAAiB,EAAE,OAAO,CAAC,CAUhD"}
|
package/proj/epsg4326.js
CHANGED
|
@@ -2,7 +2,6 @@
|
|
|
2
2
|
* @module ol/proj/epsg4326
|
|
3
3
|
*/
|
|
4
4
|
import Projection from './Projection.js';
|
|
5
|
-
import Units from './Units.js';
|
|
6
5
|
|
|
7
6
|
/**
|
|
8
7
|
* Semi-major radius of the WGS84 ellipsoid.
|
|
@@ -42,7 +41,7 @@ class EPSG4326Projection extends Projection {
|
|
|
42
41
|
constructor(code, opt_axisOrientation) {
|
|
43
42
|
super({
|
|
44
43
|
code: code,
|
|
45
|
-
units:
|
|
44
|
+
units: 'degrees',
|
|
46
45
|
extent: EXTENT,
|
|
47
46
|
axisOrientation: opt_axisOrientation,
|
|
48
47
|
global: true,
|
package/proj/proj4.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"proj4.d.ts","sourceRoot":"","sources":["proj4.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"proj4.d.ts","sourceRoot":"","sources":["proj4.js"],"names":[],"mappings":"AAaA;;;;;;;;;;GAUG;AACH,+CA2CC"}
|
package/proj/proj4.js
CHANGED
|
@@ -2,7 +2,6 @@
|
|
|
2
2
|
* @module ol/proj/proj4
|
|
3
3
|
*/
|
|
4
4
|
import Projection from './Projection.js';
|
|
5
|
-
import Units from './Units.js';
|
|
6
5
|
import {
|
|
7
6
|
addCoordinateTransforms,
|
|
8
7
|
addEquivalentProjections,
|
|
@@ -33,7 +32,7 @@ export function register(proj4) {
|
|
|
33
32
|
const def = proj4.defs(code);
|
|
34
33
|
let units = def.units;
|
|
35
34
|
if (!units && def.projName === 'longlat') {
|
|
36
|
-
units =
|
|
35
|
+
units = 'degrees';
|
|
37
36
|
}
|
|
38
37
|
addProjection(
|
|
39
38
|
new Projection({
|
package/proj.d.ts
CHANGED
|
@@ -54,12 +54,12 @@ export function get(projectionLike: ProjectionLike): Projection | null;
|
|
|
54
54
|
* @param {ProjectionLike} projection The projection.
|
|
55
55
|
* @param {number} resolution Nominal resolution in projection units.
|
|
56
56
|
* @param {import("./coordinate.js").Coordinate} point Point to find adjusted resolution at.
|
|
57
|
-
* @param {import("./proj/Units.js").
|
|
57
|
+
* @param {import("./proj/Units.js").Units} [opt_units] Units to get the point resolution in.
|
|
58
58
|
* Default is the projection's units.
|
|
59
59
|
* @return {number} Point resolution.
|
|
60
60
|
* @api
|
|
61
61
|
*/
|
|
62
|
-
export function getPointResolution(projection: ProjectionLike, resolution: number, point: import("./coordinate.js").Coordinate, opt_units?:
|
|
62
|
+
export function getPointResolution(projection: ProjectionLike, resolution: number, point: import("./coordinate.js").Coordinate, opt_units?: import("./proj/Units.js").Units | undefined): number;
|
|
63
63
|
/**
|
|
64
64
|
* Registers transformation functions that don't alter coordinates. Those allow
|
|
65
65
|
* to transform between projections with equal meaning.
|
package/proj.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"proj.d.ts","sourceRoot":"","sources":["proj.js"],"names":[],"mappings":"AAqGA;;GAEG;AACH,kFAGC;AAED;;;;;;GAMG;AACH,sCANW,MAAM,MAAM,CAAC,0EAGZ,MAAM,MAAM,CAAC,CAcxB;AAED;;;;;GAKG;AACH,yCALW,MAAM,MAAM,CAAC,0EAGZ,MAAM,MAAM,CAAC,CAUxB;AAED;;;;;;GAMG;AACH,0CAHW,UAAU,QAMpB;AAED;;GAEG;AACH,4CAFW,MAAM,UAAU,CAAC,QAI3B;AAED;;;;;;;;GAQG;AACH,oCANW,cAAc,GAGb,UAAU,GAAC,IAAI,CAO1B;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,+CARW,cAAc,cACd,MAAM,SACN,OAAO,iBAAiB,EAAE,UAAU,
|
|
1
|
+
{"version":3,"file":"proj.d.ts","sourceRoot":"","sources":["proj.js"],"names":[],"mappings":"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"}
|
package/proj.js
CHANGED
|
@@ -54,13 +54,13 @@
|
|
|
54
54
|
* this.
|
|
55
55
|
*/
|
|
56
56
|
import Projection from './proj/Projection.js';
|
|
57
|
-
import Units, {METERS_PER_UNIT} from './proj/Units.js';
|
|
58
57
|
import {
|
|
59
58
|
PROJECTIONS as EPSG3857_PROJECTIONS,
|
|
60
59
|
fromEPSG4326,
|
|
61
60
|
toEPSG4326,
|
|
62
61
|
} from './proj/epsg3857.js';
|
|
63
62
|
import {PROJECTIONS as EPSG4326_PROJECTIONS} from './proj/epsg4326.js';
|
|
63
|
+
import {METERS_PER_UNIT} from './proj/Units.js';
|
|
64
64
|
import {
|
|
65
65
|
add as addProj,
|
|
66
66
|
clear as clearProj,
|
|
@@ -192,7 +192,7 @@ export function get(projectionLike) {
|
|
|
192
192
|
* @param {ProjectionLike} projection The projection.
|
|
193
193
|
* @param {number} resolution Nominal resolution in projection units.
|
|
194
194
|
* @param {import("./coordinate.js").Coordinate} point Point to find adjusted resolution at.
|
|
195
|
-
* @param {import("./proj/Units.js").
|
|
195
|
+
* @param {import("./proj/Units.js").Units} [opt_units] Units to get the point resolution in.
|
|
196
196
|
* Default is the projection's units.
|
|
197
197
|
* @return {number} Point resolution.
|
|
198
198
|
* @api
|
|
@@ -212,7 +212,7 @@ export function getPointResolution(projection, resolution, point, opt_units) {
|
|
|
212
212
|
}
|
|
213
213
|
} else {
|
|
214
214
|
const units = projection.getUnits();
|
|
215
|
-
if ((units ==
|
|
215
|
+
if ((units == 'degrees' && !opt_units) || opt_units == 'degrees') {
|
|
216
216
|
pointResolution = resolution;
|
|
217
217
|
} else {
|
|
218
218
|
// Estimate point resolution by transforming the center pixel to EPSG:4326,
|
|
@@ -222,7 +222,7 @@ export function getPointResolution(projection, resolution, point, opt_units) {
|
|
|
222
222
|
projection,
|
|
223
223
|
get('EPSG:4326')
|
|
224
224
|
);
|
|
225
|
-
if (toEPSG4326 === identityTransform && units !==
|
|
225
|
+
if (toEPSG4326 === identityTransform && units !== 'degrees') {
|
|
226
226
|
// no transform is available
|
|
227
227
|
pointResolution = resolution * projection.getMetersPerUnit();
|
|
228
228
|
} else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"VectorTileLayer.d.ts","sourceRoot":"","sources":["VectorTileLayer.js"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"VectorTileLayer.d.ts","sourceRoot":"","sources":["VectorTileLayer.js"],"names":[],"mappings":";AAwDA;;;;;GAKG;AACH;IACE;;OAEG;IACH,mBAFW,OAAO,2BAA2B,EAAE,OAAO,EA+BrD;IA1BC,eAAe;IACf,qCAA2E;IAE3E;;;OAGG;IACH,+BAA2B;IAE3B;;;OAGG;IACH,4CAA+C;IAE/C;;;OAGG;IACH,0BAAsB;IAEtB;;;OAGG;IACH,sBAAsC;IAGxC;;;;;OAKG;IACH,kBALW,OAAO,2BAA2B,EAAE,OAAO,cAC3C,MAAM,cACN,OAAO,uBAAuB,EAAE,OAAO,GACtC,OAAO,GAAC,SAAS,CAY5B;IAkCD;;;OAGG;IACH,qBAHW,OAAO,2BAA2B,EAAE,OAAO,GAC1C,OAAO,CAUlB;IAED;;OAEG;IACH,6BAEC;IAgBD;;;;;OAKG;IACH,6BAmIC;IA4ND;;;;OAIG;IACH,gCAEC;IAED;;;OAGG;IACH,4BAFW,OAAO,uBAAuB,EAAE,UAAU,QAiCpD;IAED,6DA+BC;IA6GC,WAAkB;IAKpB;;;;;;;OAOG;IACH,uBAPW,OAAO,kBAAkB,EAAE,WAAW,oBACtC,MAAM,UACN,OAAO,sBAAsB,EAAE,OAAO,GAAC,MAAM,OAAO,sBAAsB,EAAE,OAAO,CAAC,gBACpF,OAAO,qCAAqC,EAAE,OAAO,+DAEpD,OAAO,CAsClB;IAED;;;;OAIG;IACH,8BAcC;IAED;;;;OAIG;IACH,yBAoDC;CACF"}
|
|
@@ -5,7 +5,6 @@ import CanvasBuilderGroup from '../../render/canvas/BuilderGroup.js';
|
|
|
5
5
|
import CanvasExecutorGroup from '../../render/canvas/ExecutorGroup.js';
|
|
6
6
|
import CanvasTileLayerRenderer from './TileLayer.js';
|
|
7
7
|
import TileState from '../../TileState.js';
|
|
8
|
-
import VectorTileRenderType from '../../layer/VectorTileRenderType.js';
|
|
9
8
|
import ViewHint from '../../ViewHint.js';
|
|
10
9
|
import {
|
|
11
10
|
HIT_DETECT_RESOLUTION,
|
|
@@ -139,7 +138,7 @@ class CanvasVectorTileLayerRenderer extends CanvasTileLayerRenderer {
|
|
|
139
138
|
if (
|
|
140
139
|
render &&
|
|
141
140
|
(hifi || Date.now() - frameState.time < 8) &&
|
|
142
|
-
layer.getRenderMode() !==
|
|
141
|
+
layer.getRenderMode() !== 'vector'
|
|
143
142
|
) {
|
|
144
143
|
this.renderTileImage_(tile, frameState);
|
|
145
144
|
}
|
|
@@ -154,7 +153,7 @@ class CanvasVectorTileLayerRenderer extends CanvasTileLayerRenderer {
|
|
|
154
153
|
const layer = this.getLayer();
|
|
155
154
|
return (
|
|
156
155
|
super.isDrawableTile(tile) &&
|
|
157
|
-
(layer.getRenderMode() ===
|
|
156
|
+
(layer.getRenderMode() === 'vector'
|
|
158
157
|
? getUid(layer) in tile.executorGroups
|
|
159
158
|
: tile.hasContext(layer))
|
|
160
159
|
);
|
|
@@ -289,7 +288,7 @@ class CanvasVectorTileLayerRenderer extends CanvasTileLayerRenderer {
|
|
|
289
288
|
const executorGroupInstructions = builderGroup.finish();
|
|
290
289
|
// no need to clip when the render tile is covered by a single source tile
|
|
291
290
|
const replayExtent =
|
|
292
|
-
layer.getRenderMode() !==
|
|
291
|
+
layer.getRenderMode() !== 'vector' &&
|
|
293
292
|
declutter &&
|
|
294
293
|
sourceTiles.length === 1
|
|
295
294
|
? null
|
|
@@ -784,7 +783,7 @@ class CanvasVectorTileLayerRenderer extends CanvasTileLayerRenderer {
|
|
|
784
783
|
const layer = /** @type {import("../../layer/VectorTile.js").default} */ (
|
|
785
784
|
this.getLayer()
|
|
786
785
|
);
|
|
787
|
-
if (layer.getRenderMode() ===
|
|
786
|
+
if (layer.getRenderMode() === 'vector') {
|
|
788
787
|
return false;
|
|
789
788
|
}
|
|
790
789
|
const replayState = tile.getReplayState(layer);
|
package/source/Raster.d.ts
CHANGED
|
@@ -81,6 +81,10 @@ export class Processor extends Disposable {
|
|
|
81
81
|
*/
|
|
82
82
|
_resolveJob(): void;
|
|
83
83
|
}
|
|
84
|
+
/**
|
|
85
|
+
* @typedef {'pixel' | 'image'} RasterOperationType
|
|
86
|
+
* Raster operation type. Supported values are `'pixel'` and `'image'`.
|
|
87
|
+
*/
|
|
84
88
|
/**
|
|
85
89
|
* @typedef {import("./Image.js").ImageSourceEventTypes|'beforeoperations'|'afteroperations'} RasterSourceEventTypes
|
|
86
90
|
*/
|
|
@@ -201,6 +205,10 @@ export type ProcessorOptions = {
|
|
|
201
205
|
* "beforeoperations" and accessed again in "afteroperations".
|
|
202
206
|
*/
|
|
203
207
|
export type Operation = (arg0: (Array<Array<number>> | Array<ImageData>), arg1: any) => (Array<number> | ImageData);
|
|
208
|
+
/**
|
|
209
|
+
* Raster operation type. Supported values are `'pixel'` and `'image'`.
|
|
210
|
+
*/
|
|
211
|
+
export type RasterOperationType = 'pixel' | 'image';
|
|
204
212
|
export type RasterSourceEventTypes = import("./Image.js").ImageSourceEventTypes | 'beforeoperations' | 'afteroperations';
|
|
205
213
|
export type Options = {
|
|
206
214
|
/**
|
|
@@ -233,7 +241,7 @@ export type Options = {
|
|
|
233
241
|
* array of pixels from input sources. If set to `'image'`, operations will
|
|
234
242
|
* be called with an array of ImageData objects from input sources.
|
|
235
243
|
*/
|
|
236
|
-
operationType?:
|
|
244
|
+
operationType?: RasterOperationType | undefined;
|
|
237
245
|
};
|
|
238
246
|
/**
|
|
239
247
|
* *
|
package/source/Raster.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Raster.d.ts","sourceRoot":"","sources":["Raster.js"],"names":[],"mappings":"AA4BA;;;;;GAKG;AACH,mCALW,iBAAiB,SACjB,MAAM,UACN,MAAM,GACL,SAAS,CAapB;AAiJD;;GAEG;AAEH;;;;;GAKG;AAEH;;;;;;;GAOG;AAEH;;;GAGG;AACH;IACE;;OAEG;IACH,oBAFW,gBAAgB,EAmD1B;IA9CC,mBAAkC;IAwBlC,mBAAuB;IAEvB;;;OAGG;IACH,eAAgB;IAEhB,wBAA+C;IAC/C,iBAAiB;IAEjB;;;OAGG;IACH,oBAAqB;IAErB;;;OAGG;IACH,aAAgB;IAGlB;;;;;;;;OAQG;IACH,gBAPW,MAAM,SAAS,CAAC,8BAGP,KAAK,QAAE,SAAS,gBAAW,IAAI,QAWlD;IAED;;;OAGG;IACH,cAFW,GAAG,QAOb;IAED;;OAEG;IACH,kBA+CC;IAED;;;;OAIG;IACH,wBAHW,MAAM,SACN,YAAY,QAWtB;IAED;;;OAGG;IACH,oBA2BC;CAWF;
|
|
1
|
+
{"version":3,"file":"Raster.d.ts","sourceRoot":"","sources":["Raster.js"],"names":[],"mappings":"AA4BA;;;;;GAKG;AACH,mCALW,iBAAiB,SACjB,MAAM,UACN,MAAM,GACL,SAAS,CAapB;AAiJD;;GAEG;AAEH;;;;;GAKG;AAEH;;;;;;;GAOG;AAEH;;;GAGG;AACH;IACE;;OAEG;IACH,oBAFW,gBAAgB,EAmD1B;IA9CC,mBAAkC;IAwBlC,mBAAuB;IAEvB;;;OAGG;IACH,eAAgB;IAEhB,wBAA+C;IAC/C,iBAAiB;IAEjB;;;OAGG;IACH,oBAAqB;IAErB;;;OAGG;IACH,aAAgB;IAGlB;;;;;;;;OAQG;IACH,gBAPW,MAAM,SAAS,CAAC,8BAGP,KAAK,QAAE,SAAS,gBAAW,IAAI,QAWlD;IAED;;;OAGG;IACH,cAFW,GAAG,QAOb;IAED;;OAEG;IACH,kBA+CC;IAED;;;;OAIG;IACH,wBAHW,MAAM,SACN,YAAY,QAWtB;IAED;;;OAGG;IACH,oBA2BC;CAWF;AA2CD;;;GAGG;AAEH;;GAEG;AAEH;;;;GAIG;AACH;IACE;;;;;OAKG;IACH,kBALW,MAAM,cACN,OAAO,oBAAoB,EAAE,UAAU,QACvC,MAAO,UAAa,EA2B9B;IArBC;;;;OAIG;IACH,QAHU,OAAO,cAAc,EAAE,MAAM,CAGR;IAE/B;;;;OAIG;IACH,YAHU,MAAM,CAGyD;IAEzE;;;;;OAKG;IACH,UAAgB;CAEnB;;;;;;aAhca,MAAM,WAAW,CAAC;;;;;;;;cAElB,OAAO;;;;WACP,MAAM;;;;YACN,MAAM;;;;;;;;iCA0IE,KAAK,QAAE,SAAS,QAAE,CAAC,MAAO,UAAa,CAAC,KAAG,IAAI;;;;;;;;;YAMvD,MAAM,SAAS,CAAC;;;;cAChB,WAAW;;;;;;aAKX,MAAM;;;;eACN,SAAS;;;;;;;;;;WAET,MAAM;;;;;;;;;;;;;;;;;;;;;+BA2NE,CAAC,MAAM,MAAM,MAAM,CAAC,CAAC,GAAC,MAAM,SAAS,CAAC,CAAC,gBAC5D,CAAO,MAAM,MAAM,CAAC,GAAC,SAAS,CAAC;;;;kCA0BnB,OAAO,GAAG,OAAO;qCAKjB,OAAO,YAAY,EAAE,qBAAqB,GAAC,kBAAkB,GAAC,iBAAiB;;;;;;aA4C9E,MAAM,OAAO,aAAa,EAAE,OAAO,GAAC,OAAO,mBAAmB,EAAE,OAAO,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8CAoBzE,OAAO,eAAe,EAAE,WAAW,CAAC,OAAO,eAAe,EAAE,UAAU,EAAE,OAAO,oBAAoB,EAAE,OAAO,EAAE,MAAM,CAAC,GACjI,OAAW,eAAe,EAAE,WAAW,CAAC,OAAO,oBAAoB,EAAE,KAAK,EAAE,OAAO,WAAW,EAAE,WAAW,EAAE,MAAM,CAAC,GACpH,OAAW,eAAe,EAAE,WAAW,CAAC,OAAO,YAAY,EAAE,qBAAqB,EAAE,OAAO,YAAY,EAAE,gBAAgB,EAAE,MAAM,CAAC,GAClI,OAAW,eAAe,EAAE,WAAW,CAAC,sBAAsB,EAAE,iBAAiB,EAAE,MAAM,CAAC,GAC1F,OAAW,eAAe,EAAE,mBAAmB,CAAC,OAAO,eAAe,EAAE,UAAU,GAAC,OAAO,oBAAoB,EAAE,KAAK,GAC9G,sBAAsB,EAAE,MAAM,CAAC;;;AA3BvC;;;;;;;;;;;;;;;;;;GAkBG;AAEH;;;;;;;;GAQG;AAEH;;;;;;;;GAQG;AACH;IACE;;OAEG;IACH,qBAFW,OAAO,EAoIjB;IA7HC;;OAEG;IACH,IAFU,wBAAwB,OAAO,WAAW,EAAE,SAAS,CAAC,CAEzD;IAEP;;OAEG;IACH,MAFU,wBAAwB,OAAO,WAAW,EAAE,SAAS,CAAC,CAEvD;IAET;;OAEG;IACH,IAFU,wBAAwB,IAAI,CAAC,CAEhC;IAEP;;;OAGG;IACH,mBAAsB;IAEtB;;;OAGG;IACH,uBACuE;IAEvE;;;OAGG;IACH,iBAAmE;IAEnE;;;OAGG;IACH,gBAA4C;IAO5C;;;OAGG;IACH,mBAE2B;IAE3B;;;;OAIG;IACH,6BAAyB;IAEzB;;;;OAIG;IACH,6BAAgC;IAEhC;;;OAGG;IACH,mBAFU,MAAM,CAEM;IAEtB;;;OAGG;IACH,oBAsBC;IA4BH;;;;;;OAMG;IACH,wBALW,SAAS,uBAkBnB;IAED;;;;;;;OAOG;IACH,0BAqBC;IAED;;;;OAIG;IACH,yBAWC;IAED;;;;;;OAMG;IACH,iBANW,OAAO,cAAc,EAAE,MAAM,cAC7B,MAAM,cACN,MAAM,cACN,OAAO,uBAAuB,EAAE,OAAO,GACtC,OAAO,mBAAmB,EAAE,OAAO,CAoC9C;IAED;;;OAGG;IACH,wBAuBC;IAED;;;;;;;OAOG;IACH,0BAwCC;CAQF"}
|
package/source/Raster.js
CHANGED
|
@@ -450,13 +450,9 @@ const RasterEventType = {
|
|
|
450
450
|
};
|
|
451
451
|
|
|
452
452
|
/**
|
|
453
|
+
* @typedef {'pixel' | 'image'} RasterOperationType
|
|
453
454
|
* Raster operation type. Supported values are `'pixel'` and `'image'`.
|
|
454
|
-
* @enum {string}
|
|
455
455
|
*/
|
|
456
|
-
const RasterOperationType = {
|
|
457
|
-
PIXEL: 'pixel',
|
|
458
|
-
IMAGE: 'image',
|
|
459
|
-
};
|
|
460
456
|
|
|
461
457
|
/**
|
|
462
458
|
* @typedef {import("./Image.js").ImageSourceEventTypes|'beforeoperations'|'afteroperations'} RasterSourceEventTypes
|
|
@@ -575,9 +571,7 @@ class RasterSource extends ImageSource {
|
|
|
575
571
|
* @type {RasterOperationType}
|
|
576
572
|
*/
|
|
577
573
|
this.operationType_ =
|
|
578
|
-
options.operationType !== undefined
|
|
579
|
-
? options.operationType
|
|
580
|
-
: RasterOperationType.PIXEL;
|
|
574
|
+
options.operationType !== undefined ? options.operationType : 'pixel';
|
|
581
575
|
|
|
582
576
|
/**
|
|
583
577
|
* @private
|
|
@@ -692,7 +686,7 @@ class RasterSource extends ImageSource {
|
|
|
692
686
|
|
|
693
687
|
this.processor_ = new Processor({
|
|
694
688
|
operation: operation,
|
|
695
|
-
imageOps: this.operationType_ ===
|
|
689
|
+
imageOps: this.operationType_ === 'image',
|
|
696
690
|
queue: 1,
|
|
697
691
|
lib: opt_lib,
|
|
698
692
|
threads: this.threads_,
|
package/tilegrid.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tilegrid.d.ts","sourceRoot":"","sources":["tilegrid.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"tilegrid.d.ts","sourceRoot":"","sources":["tilegrid.js"],"names":[],"mappings":"AAeA;;;;GAIG;AACH,6CAJW,OAAO,sBAAsB,EAAE,OAAO,GACpC,QAAQ,CAUpB;AAED;;;;;GAKG;AACH,gCALW,QAAQ,aACR,OAAO,gBAAgB,EAAE,SAAS,cAClC,OAAO,sBAAsB,EAAE,OAAO,GACrC,OAAO,gBAAgB,EAAE,SAAS,CAgB7C;AAED;;;;;;;;GAQG;AACH,wCARW,OAAO,aAAa,EAAE,MAAM,0JAM1B,QAAQ,CAapB;AAED;;;;;;;;;;GAUG;AAEH;;;;;GAKG;AACH,iEAHa,QAAQ,CAoBpB;AAuCD;;;;;;;;GAQG;AACH,gDARW,OAAO,WAAW,EAAE,cAAc,0JAMhC,QAAQ,CAUpB;AAED;;;;;GAKG;AACH,iDAHW,OAAO,WAAW,EAAE,cAAc,GACjC,OAAO,aAAa,EAAE,MAAM,CAWvC"}
|
package/tilegrid.js
CHANGED
|
@@ -2,7 +2,6 @@
|
|
|
2
2
|
* @module ol/tilegrid
|
|
3
3
|
*/
|
|
4
4
|
import TileGrid from './tilegrid/TileGrid.js';
|
|
5
|
-
import Units from './proj/Units.js';
|
|
6
5
|
import {DEFAULT_MAX_ZOOM, DEFAULT_TILE_SIZE} from './tilegrid/common.js';
|
|
7
6
|
import {METERS_PER_UNIT, get as getProjection} from './proj.js';
|
|
8
7
|
import {
|
|
@@ -176,7 +175,7 @@ export function extentFromProjection(projection) {
|
|
|
176
175
|
let extent = projection.getExtent();
|
|
177
176
|
if (!extent) {
|
|
178
177
|
const half =
|
|
179
|
-
(180 * METERS_PER_UNIT
|
|
178
|
+
(180 * METERS_PER_UNIT.degrees) / projection.getMetersPerUnit();
|
|
180
179
|
extent = createOrUpdate(-half, -half, half, half);
|
|
181
180
|
}
|
|
182
181
|
return extent;
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"VectorTileRenderType.d.ts","sourceRoot":"","sources":["VectorTileRenderType.js"],"names":[],"mappings":""}
|
|
@@ -1,34 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* @module ol/layer/VectorTileRenderType
|
|
3
|
-
*/
|
|
4
|
-
|
|
5
|
-
/**
|
|
6
|
-
* @enum {string}
|
|
7
|
-
* Render mode for vector tiles:
|
|
8
|
-
* @api
|
|
9
|
-
*/
|
|
10
|
-
export default {
|
|
11
|
-
/**
|
|
12
|
-
* Vector tiles are rendered as images. Great performance, but
|
|
13
|
-
* point symbols and texts are always rotated with the view and pixels are
|
|
14
|
-
* scaled during zoom animations
|
|
15
|
-
* @api
|
|
16
|
-
* @deprecated
|
|
17
|
-
*/
|
|
18
|
-
IMAGE: 'image',
|
|
19
|
-
/**
|
|
20
|
-
* Polygon and line elements are rendered as images, so pixels
|
|
21
|
-
* are scaled during zoom animations. Point symbols and texts are accurately
|
|
22
|
-
* rendered as vectors and can stay upright on rotated views.
|
|
23
|
-
* @api
|
|
24
|
-
*/
|
|
25
|
-
HYBRID: 'hybrid',
|
|
26
|
-
/**
|
|
27
|
-
* Everything is rendered as vectors. Use this mode for improved
|
|
28
|
-
* performance on vector tile layers with only a few rendered features (e.g.
|
|
29
|
-
* for highlighting a subset of features of another layer with the same
|
|
30
|
-
* source).
|
|
31
|
-
* @api
|
|
32
|
-
*/
|
|
33
|
-
VECTOR: 'vector',
|
|
34
|
-
};
|