ol 7.1.1-dev.1662583264736 → 7.1.1-dev.1663009085499
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/Feature.d.ts.map +1 -1
- package/Feature.js +13 -14
- package/Map.d.ts.map +1 -1
- package/Map.js +6 -12
- package/Observable.d.ts.map +1 -1
- package/Observable.js +1 -2
- package/TileRange.d.ts.map +1 -1
- package/TileRange.js +1 -2
- package/View.d.ts.map +1 -1
- package/View.js +7 -12
- package/array.d.ts.map +1 -1
- package/array.js +24 -27
- package/color.d.ts.map +1 -1
- package/color.js +3 -6
- package/colorlike.d.ts.map +1 -1
- package/colorlike.js +1 -2
- package/coordinate.d.ts.map +1 -1
- package/coordinate.js +2 -4
- package/dist/ol.js +2 -2
- package/dist/ol.js.map +1 -1
- package/easing.d.ts.map +1 -1
- package/easing.js +1 -2
- package/extent.d.ts.map +1 -1
- package/extent.js +9 -13
- package/format/EsriJSON.d.ts.map +1 -1
- package/format/EsriJSON.js +2 -4
- package/format/Feature.d.ts.map +1 -1
- package/format/Feature.js +1 -2
- package/format/GML3.d.ts.map +1 -1
- package/format/GML3.js +3 -6
- package/format/GMLBase.d.ts.map +1 -1
- package/format/GMLBase.js +14 -19
- package/format/GPX.d.ts.map +1 -1
- package/format/GPX.js +1 -2
- package/format/IGC.d.ts.map +1 -1
- package/format/IGC.js +1 -2
- package/format/JSONFeature.js +1 -2
- package/format/KML.d.ts.map +1 -1
- package/format/KML.js +15 -30
- package/format/Polyline.d.ts.map +1 -1
- package/format/Polyline.js +2 -3
- package/format/TextFeature.js +1 -2
- package/format/TopoJSON.d.ts.map +1 -1
- package/format/TopoJSON.js +1 -2
- package/format/WFS.d.ts.map +1 -1
- package/format/WFS.js +7 -10
- package/format/WKB.js +1 -2
- package/format/WKT.d.ts.map +1 -1
- package/format/WKT.js +40 -41
- package/format/XML.d.ts.map +1 -1
- package/format/XML.js +1 -2
- package/format/XMLFeature.d.ts.map +1 -1
- package/format/XMLFeature.js +5 -16
- package/format/xsd.d.ts.map +1 -1
- package/format/xsd.js +3 -6
- package/geom/Circle.d.ts.map +1 -1
- package/geom/Circle.js +1 -2
- package/geom/GeometryCollection.d.ts.map +1 -1
- package/geom/GeometryCollection.js +2 -3
- package/geom/Point.d.ts.map +1 -1
- package/geom/Point.js +1 -2
- package/geom/SimpleGeometry.d.ts.map +1 -1
- package/geom/SimpleGeometry.js +18 -21
- package/geom/flat/closest.d.ts.map +1 -1
- package/geom/flat/closest.js +1 -2
- package/geom/flat/interiorpoint.d.ts.map +1 -1
- package/geom/flat/interiorpoint.js +1 -2
- package/geom/flat/interpolate.d.ts.map +1 -1
- package/geom/flat/interpolate.js +4 -8
- package/interaction/DragBox.d.ts.map +1 -1
- package/interaction/DragBox.js +1 -2
- package/interaction/DragPan.d.ts.map +1 -1
- package/interaction/DragPan.js +8 -10
- package/interaction/DragRotate.d.ts.map +1 -1
- package/interaction/DragRotate.js +1 -2
- package/interaction/DragRotateAndZoom.d.ts.map +1 -1
- package/interaction/DragRotateAndZoom.js +1 -2
- package/interaction/Extent.js +1 -2
- package/interaction/MouseWheelZoom.d.ts.map +1 -1
- package/interaction/MouseWheelZoom.js +1 -2
- package/interaction/PinchRotate.d.ts.map +1 -1
- package/interaction/PinchRotate.js +2 -4
- package/interaction/PinchZoom.d.ts.map +1 -1
- package/interaction/PinchZoom.js +2 -4
- package/package.json +1 -1
- package/proj.d.ts.map +1 -1
- package/proj.js +3 -5
- package/renderer/canvas/VectorImageLayer.d.ts.map +1 -1
- package/renderer/canvas/VectorImageLayer.js +7 -8
- package/resolutionconstraint.d.ts.map +1 -1
- package/resolutionconstraint.js +3 -6
- package/rotationconstraint.d.ts.map +1 -1
- package/rotationconstraint.js +5 -10
- package/size.d.ts.map +1 -1
- package/size.js +6 -7
- package/source/BingMaps.d.ts.map +1 -1
- package/source/BingMaps.js +11 -12
- package/source/Cluster.d.ts.map +1 -1
- package/source/Cluster.js +4 -5
- package/source/Image.d.ts.map +1 -1
- package/source/Image.js +30 -31
- package/source/ImageMapGuide.js +1 -2
- package/source/Raster.d.ts.map +1 -1
- package/source/Raster.js +1 -2
- package/source/Tile.d.ts.map +1 -1
- package/source/Tile.js +2 -4
- package/source/TileImage.d.ts.map +1 -1
- package/source/TileImage.js +62 -68
- package/source/UTFGrid.d.ts.map +1 -1
- package/source/UTFGrid.js +16 -21
- package/source/Vector.d.ts.map +1 -1
- package/source/Vector.js +3 -6
- package/source/WMTS.d.ts.map +1 -1
- package/source/WMTS.js +18 -22
- package/source/Zoomify.d.ts.map +1 -1
- package/source/Zoomify.js +22 -25
- package/tilecoord.d.ts.map +1 -1
- package/tilecoord.js +2 -4
- package/tilegrid/TileGrid.d.ts.map +1 -1
- package/tilegrid/TileGrid.js +3 -6
- package/tilegrid.d.ts.map +1 -1
- package/tilegrid.js +1 -2
- package/tileurlfunction.d.ts.map +1 -1
- package/tileurlfunction.js +14 -16
- package/util.js +1 -1
package/proj.js
CHANGED
|
@@ -314,9 +314,8 @@ export function createProjection(projection, defaultCode) {
|
|
|
314
314
|
return get(defaultCode);
|
|
315
315
|
} else if (typeof projection === 'string') {
|
|
316
316
|
return get(projection);
|
|
317
|
-
} else {
|
|
318
|
-
return /** @type {Projection} */ (projection);
|
|
319
317
|
}
|
|
318
|
+
return /** @type {Projection} */ (projection);
|
|
320
319
|
}
|
|
321
320
|
|
|
322
321
|
/**
|
|
@@ -444,10 +443,9 @@ export function equivalent(projection1, projection2) {
|
|
|
444
443
|
const equalUnits = projection1.getUnits() === projection2.getUnits();
|
|
445
444
|
if (projection1.getCode() === projection2.getCode()) {
|
|
446
445
|
return equalUnits;
|
|
447
|
-
} else {
|
|
448
|
-
const transformFunc = getTransformFromProjections(projection1, projection2);
|
|
449
|
-
return transformFunc === cloneTransform && equalUnits;
|
|
450
446
|
}
|
|
447
|
+
const transformFunc = getTransformFromProjections(projection1, projection2);
|
|
448
|
+
return transformFunc === cloneTransform && equalUnits;
|
|
451
449
|
}
|
|
452
450
|
|
|
453
451
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"VectorImageLayer.d.ts","sourceRoot":"","sources":["VectorImageLayer.js"],"names":[],"mappings":";AAaA;;;;GAIG;AACH;IACE;;OAEG;IACH,sEA0BC;IAvBC;;;OAGG;IACH,wBAA2D;IAE3D;;;OAGG;IACH,yBAA6C;IAE7C;;;OAGG;IACH,0CAAiD;IAEjD;;;OAGG;IACH,4CAA+C;IAsIjD;OACG;IACH,kBAAc;IAEd;OACG;IACH,mBAAe;IAEf;OACG;IACH,wBAAoB;
|
|
1
|
+
{"version":3,"file":"VectorImageLayer.d.ts","sourceRoot":"","sources":["VectorImageLayer.js"],"names":[],"mappings":";AAaA;;;;GAIG;AACH;IACE;;OAEG;IACH,sEA0BC;IAvBC;;;OAGG;IACH,wBAA2D;IAE3D;;;OAGG;IACH,yBAA6C;IAE7C;;;OAGG;IACH,0CAAiD;IAEjD;;;OAGG;IACH,4CAA+C;IAsIjD;OACG;IACH,kBAAc;IAEd;OACG;IACH,mBAAe;IAEf;OACG;IACH,wBAAoB;CAmCrB"}
|
|
@@ -215,15 +215,14 @@ class CanvasVectorImageLayerRenderer extends CanvasImageLayerRenderer {
|
|
|
215
215
|
callback,
|
|
216
216
|
matches
|
|
217
217
|
);
|
|
218
|
-
} else {
|
|
219
|
-
return super.forEachFeatureAtCoordinate(
|
|
220
|
-
coordinate,
|
|
221
|
-
frameState,
|
|
222
|
-
hitTolerance,
|
|
223
|
-
callback,
|
|
224
|
-
matches
|
|
225
|
-
);
|
|
226
218
|
}
|
|
219
|
+
return super.forEachFeatureAtCoordinate(
|
|
220
|
+
coordinate,
|
|
221
|
+
frameState,
|
|
222
|
+
hitTolerance,
|
|
223
|
+
callback,
|
|
224
|
+
matches
|
|
225
|
+
);
|
|
227
226
|
}
|
|
228
227
|
}
|
|
229
228
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolutionconstraint.d.ts","sourceRoot":"","sources":["resolutionconstraint.js"],"names":[],"mappings":"AAgEA;;;;;;GAMG;AACH,qDANW,MAAM,MAAM,CAAC,6HAIZ,IAAI,
|
|
1
|
+
{"version":3,"file":"resolutionconstraint.d.ts","sourceRoot":"","sources":["resolutionconstraint.js"],"names":[],"mappings":"AAgEA;;;;;;GAMG;AACH,qDANW,MAAM,MAAM,CAAC,6HAIZ,IAAI,CAoDf;AAED;;;;;;;;GAQG;AACH,yCARW,MAAM,iBACN,MAAM,iKAKL,IAAI,CA4Df;AAED;;;;;;;GAOG;AACH,sDAPW,MAAM,iBACN,MAAM,6HAIL,IAAI,CA0Cf;0BAxOqB,CAAC,MAAM,GAAC,SAAS,CAAC,QAAE,MAAM,QAAE,OAAO,WAAW,EAAE,IAAI,QAAE,OAAO,iBAAI,CAAC,MAAM,GAAC,SAAS,CAAC"}
|
package/resolutionconstraint.js
CHANGED
|
@@ -115,9 +115,8 @@ export function createSnapToResolutions(
|
|
|
115
115
|
return resolutions[z + 1];
|
|
116
116
|
}
|
|
117
117
|
return resolutions[z];
|
|
118
|
-
} else {
|
|
119
|
-
return undefined;
|
|
120
118
|
}
|
|
119
|
+
return undefined;
|
|
121
120
|
}
|
|
122
121
|
);
|
|
123
122
|
}
|
|
@@ -185,9 +184,8 @@ export function createSnapToPower(
|
|
|
185
184
|
const zoomLevel = Math.max(minZoomLevel, cappedZoomLevel);
|
|
186
185
|
const newResolution = maxResolution / Math.pow(power, zoomLevel);
|
|
187
186
|
return clamp(newResolution, minResolution, cappedMaxRes);
|
|
188
|
-
} else {
|
|
189
|
-
return undefined;
|
|
190
187
|
}
|
|
188
|
+
return undefined;
|
|
191
189
|
}
|
|
192
190
|
);
|
|
193
191
|
}
|
|
@@ -236,9 +234,8 @@ export function createMinMaxResolution(
|
|
|
236
234
|
cappedMaxRes,
|
|
237
235
|
minResolution
|
|
238
236
|
);
|
|
239
|
-
} else {
|
|
240
|
-
return undefined;
|
|
241
237
|
}
|
|
238
|
+
return undefined;
|
|
242
239
|
}
|
|
243
240
|
);
|
|
244
241
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rotationconstraint.d.ts","sourceRoot":"","sources":["rotationconstraint.js"],"names":[],"mappings":"AAKA;;GAEG;AAEH;;;GAGG;AACH,kCAHW,MAAM,GAAC,SAAS,GACf,MAAM,GAAC,SAAS,
|
|
1
|
+
{"version":3,"file":"rotationconstraint.d.ts","sourceRoot":"","sources":["rotationconstraint.js"],"names":[],"mappings":"AAKA;;GAEG;AAEH;;;GAGG;AACH,kCAHW,MAAM,GAAC,SAAS,GACf,MAAM,GAAC,SAAS,CAO3B;AAED;;;GAGG;AACH,+BAHW,MAAM,GAAC,SAAS,GACf,MAAM,GAAC,SAAS,CAO3B;AAED;;;GAGG;AACH,iCAHW,MAAM,GACL,IAAI,CAsBf;AAED;;;GAGG;AACH,kEAFY,IAAI,CAwBf;0BA7EqB,CAAC,MAAM,GAAC,SAAS,CAAC,QAAE,OAAO,iBAAI,CAAC,MAAM,GAAC,SAAS,CAAC"}
|
package/rotationconstraint.js
CHANGED
|
@@ -14,9 +14,8 @@ import {toRadians} from './math.js';
|
|
|
14
14
|
export function disable(rotation) {
|
|
15
15
|
if (rotation !== undefined) {
|
|
16
16
|
return 0;
|
|
17
|
-
} else {
|
|
18
|
-
return undefined;
|
|
19
17
|
}
|
|
18
|
+
return undefined;
|
|
20
19
|
}
|
|
21
20
|
|
|
22
21
|
/**
|
|
@@ -26,9 +25,8 @@ export function disable(rotation) {
|
|
|
26
25
|
export function none(rotation) {
|
|
27
26
|
if (rotation !== undefined) {
|
|
28
27
|
return rotation;
|
|
29
|
-
} else {
|
|
30
|
-
return undefined;
|
|
31
28
|
}
|
|
29
|
+
return undefined;
|
|
32
30
|
}
|
|
33
31
|
|
|
34
32
|
/**
|
|
@@ -51,9 +49,8 @@ export function createSnapToN(n) {
|
|
|
51
49
|
if (rotation !== undefined) {
|
|
52
50
|
rotation = Math.floor(rotation / theta + 0.5) * theta;
|
|
53
51
|
return rotation;
|
|
54
|
-
} else {
|
|
55
|
-
return undefined;
|
|
56
52
|
}
|
|
53
|
+
return undefined;
|
|
57
54
|
}
|
|
58
55
|
);
|
|
59
56
|
}
|
|
@@ -78,12 +75,10 @@ export function createSnapToZero(tolerance) {
|
|
|
78
75
|
if (rotation !== undefined) {
|
|
79
76
|
if (Math.abs(rotation) <= tolerance) {
|
|
80
77
|
return 0;
|
|
81
|
-
} else {
|
|
82
|
-
return rotation;
|
|
83
78
|
}
|
|
84
|
-
|
|
85
|
-
return undefined;
|
|
79
|
+
return rotation;
|
|
86
80
|
}
|
|
81
|
+
return undefined;
|
|
87
82
|
}
|
|
88
83
|
);
|
|
89
84
|
}
|
package/size.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"size.d.ts","sourceRoot":"","sources":["size.js"],"names":[],"mappings":"AAAA;;GAEG;AAEH;;;;GAIG;AAEH;;;;;;GAMG;AACH,wCAJW,MAAM,iCAWhB;AAED;;;;GAIG;AACH,qCAFY,OAAO,CAIlB;AAED;;;;;;GAMG;AACH,yCAJW,MAAM,iCAWhB;AAED;;;;;;;;GAQG;AACH,6BALW,MAAM,OAAK,
|
|
1
|
+
{"version":3,"file":"size.d.ts","sourceRoot":"","sources":["size.js"],"names":[],"mappings":"AAAA;;GAEG;AAEH;;;;GAIG;AAEH;;;;;;GAMG;AACH,wCAJW,MAAM,iCAWhB;AAED;;;;GAIG;AACH,qCAFY,OAAO,CAIlB;AAED;;;;;;GAMG;AACH,yCAJW,MAAM,iCAWhB;AAED;;;;;;;;GAQG;AACH,6BALW,MAAM,OAAK,iCAgBrB;;;;mBAjEY,MAAM,MAAM,CAAC"}
|
package/size.js
CHANGED
|
@@ -61,13 +61,12 @@ export function scale(size, ratio, dest) {
|
|
|
61
61
|
export function toSize(size, dest) {
|
|
62
62
|
if (Array.isArray(size)) {
|
|
63
63
|
return size;
|
|
64
|
+
}
|
|
65
|
+
if (dest === undefined) {
|
|
66
|
+
dest = [size, size];
|
|
64
67
|
} else {
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
} else {
|
|
68
|
-
dest[0] = size;
|
|
69
|
-
dest[1] = size;
|
|
70
|
-
}
|
|
71
|
-
return dest;
|
|
68
|
+
dest[0] = size;
|
|
69
|
+
dest[1] = size;
|
|
72
70
|
}
|
|
71
|
+
return dest;
|
|
73
72
|
}
|
package/source/BingMaps.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BingMaps.d.ts","sourceRoot":"","sources":["BingMaps.js"],"names":[],"mappings":"AAYA;;;GAGG;AACH,mCAHW,OAAO,iBAAiB,EAAE,SAAS,GAClC,MAAM,CAoBjB;;;;;;;;;;;;;;;;;;SAkBa,MAAM;;;;gBACN,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;gBAsBN,MAAM;;;;uBACN,MAAM;;;;8BACN,MAAM;;;;kBACN,MAAM,WAAW,CAAC;;;;;;eAKlB,MAAM,QAAQ,CAAC;;;;;;iBAKf,MAAM;;;;gBACN,MAAM;;;;aACN,MAAM;;;;aACN,MAAM;;;;cACN,MAAM;;;;wBACN,MAAM,MAAM,CAAC;;;;;;;;;;mBAMb,MAAM,YAAY,CAAC;;;;;;;;;;aAMnB,MAAM;;;;aACN,MAAM;;;;UACN,MAAM,MAAM,CAAC;;AA5D3B;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AAEH;;;;;;GAMG;AAEH;;;GAGG;AAEH;;;;;;;;;GASG;AAEH;;;;GAIG;AAEH;;;;;GAKG;AAEH;;;;GAIG;AACH;IACE;;OAEG;IACH,qBAFW,OAAO,EAgEjB;IA5CC;;;OAGG;IACH,eAAmB;IAEnB;;;OAGG;IACH,iBAAyE;IAEzE;;;OAGG;IACH,iBAAoE;IAEpE;;;OAGG;IACH,gBAA0B;IAE1B;;;OAGG;IACH,oBAAqC;IAkBvC;;;;;OAKG;IACH,aAHY,MAAM,CAKjB;IAED;;;;;OAKG;IACH,iBAHY,MAAM,CAKjB;IAED;;OAEG;IACH,wCAFW,+BAA+B,
|
|
1
|
+
{"version":3,"file":"BingMaps.d.ts","sourceRoot":"","sources":["BingMaps.js"],"names":[],"mappings":"AAYA;;;GAGG;AACH,mCAHW,OAAO,iBAAiB,EAAE,SAAS,GAClC,MAAM,CAoBjB;;;;;;;;;;;;;;;;;;SAkBa,MAAM;;;;gBACN,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;gBAsBN,MAAM;;;;uBACN,MAAM;;;;8BACN,MAAM;;;;kBACN,MAAM,WAAW,CAAC;;;;;;eAKlB,MAAM,QAAQ,CAAC;;;;;;iBAKf,MAAM;;;;gBACN,MAAM;;;;aACN,MAAM;;;;aACN,MAAM;;;;cACN,MAAM;;;;wBACN,MAAM,MAAM,CAAC;;;;;;;;;;mBAMb,MAAM,YAAY,CAAC;;;;;;;;;;aAMnB,MAAM;;;;aACN,MAAM;;;;UACN,MAAM,MAAM,CAAC;;AA5D3B;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AAEH;;;;;;GAMG;AAEH;;;GAGG;AAEH;;;;;;;;;GASG;AAEH;;;;GAIG;AAEH;;;;;GAKG;AAEH;;;;GAIG;AACH;IACE;;OAEG;IACH,qBAFW,OAAO,EAgEjB;IA5CC;;;OAGG;IACH,eAAmB;IAEnB;;;OAGG;IACH,iBAAyE;IAEzE;;;OAGG;IACH,iBAAoE;IAEpE;;;OAGG;IACH,gBAA0B;IAE1B;;;OAGG;IACH,oBAAqC;IAkBvC;;;;;OAKG;IACH,aAHY,MAAM,CAKjB;IAED;;;;;OAKG;IACH,iBAHY,MAAM,CAKjB;IAED;;OAEG;IACH,wCAFW,+BAA+B,QAuHzC;CACF"}
|
package/source/BingMaps.js
CHANGED
|
@@ -254,19 +254,18 @@ class BingMaps extends TileImage {
|
|
|
254
254
|
function (tileCoord, pixelRatio, projection) {
|
|
255
255
|
if (!tileCoord) {
|
|
256
256
|
return undefined;
|
|
257
|
-
} else {
|
|
258
|
-
createOrUpdate(
|
|
259
|
-
tileCoord[0],
|
|
260
|
-
tileCoord[1],
|
|
261
|
-
tileCoord[2],
|
|
262
|
-
quadKeyTileCoord
|
|
263
|
-
);
|
|
264
|
-
let url = imageUrl;
|
|
265
|
-
if (hidpi) {
|
|
266
|
-
url += '&dpi=d1&device=mobile';
|
|
267
|
-
}
|
|
268
|
-
return url.replace('{quadkey}', quadKey(quadKeyTileCoord));
|
|
269
257
|
}
|
|
258
|
+
createOrUpdate(
|
|
259
|
+
tileCoord[0],
|
|
260
|
+
tileCoord[1],
|
|
261
|
+
tileCoord[2],
|
|
262
|
+
quadKeyTileCoord
|
|
263
|
+
);
|
|
264
|
+
let url = imageUrl;
|
|
265
|
+
if (hidpi) {
|
|
266
|
+
url += '&dpi=d1&device=mobile';
|
|
267
|
+
}
|
|
268
|
+
return url.replace('{quadkey}', quadKey(quadKeyTileCoord));
|
|
270
269
|
}
|
|
271
270
|
);
|
|
272
271
|
})
|
package/source/Cluster.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Cluster.d.ts","sourceRoot":"","sources":["Cluster.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;+BA4BuB,OAAO,KAAE,KAAK;;;;;;;;;;;;;;4BAad,KAAK,QAAE,MAAM,OAAO,CAAC,KAAE,OAAO;;;;;;;;;;AAvBrD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqCG;AAEH;;;;;;;;;;GAUG;AACH;IACE;;OAEG;IACH,qBAFW,OAAO,EAsEjB;IA9DC;;;OAGG;IACH,sBAHU,MAAM,GAAC,SAAS,CAGC;IAE3B;;;OAGG;IACH,oBAHU,MAAM,CAGsD;IAEtE;;;OAGG;IACH,uBAHU,MAAM,CAG2B;IAE3C;;;OAGG;IACH,8BAHU,MAAM,CAGW;IAE3B;;;OAGG;IACH,oBAHU,MAAM,OAAO,CAAC,CAGN;IAElB;;;;OAIG;IACH,mCArFmB,OAAO,KAAE,KAAK,CA2F9B;IAEH;;;OAGG;IACH,6BAAiD;IAEjD;;;OAGG;IACH,kBAHU,YAAY,GAAC,IAAI,CAGT;IAElB;;OAEG;IACH,sBAA4C;IAgB9C;;;;OAIG;IACH,eAHY,MAAM,CAKjB;IAED;;;;OAIG;IACH,aAHY,YAAY,GAAC,IAAI,CAK5B;IAeD;;;;OAIG;IACH,sBAHW,MAAM,QAKhB;IAED;;;;;OAKG;IACH,4BAHW,MAAM,QAKhB;IAED;;;;OAIG;IACH,kBAHY,MAAM,CAKjB;IAED;;;;OAIG;IACH,kBAHW,YAAY,GAAC,IAAI,QAY3B;IAWD;;;;OAIG;IACH,yBAHW,MAAM,eACN,MAAM,QAahB;IAED;;OAEG;IACH,0BAkCC;IAED;;;;;OAKG;IACH,kCALW,MAAM,OAAO,CAAC,UACd,OAAO,cAAc,EAAE,MAAM,GAC5B,OAAO,
|
|
1
|
+
{"version":3,"file":"Cluster.d.ts","sourceRoot":"","sources":["Cluster.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;+BA4BuB,OAAO,KAAE,KAAK;;;;;;;;;;;;;;4BAad,KAAK,QAAE,MAAM,OAAO,CAAC,KAAE,OAAO;;;;;;;;;;AAvBrD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqCG;AAEH;;;;;;;;;;GAUG;AACH;IACE;;OAEG;IACH,qBAFW,OAAO,EAsEjB;IA9DC;;;OAGG;IACH,sBAHU,MAAM,GAAC,SAAS,CAGC;IAE3B;;;OAGG;IACH,oBAHU,MAAM,CAGsD;IAEtE;;;OAGG;IACH,uBAHU,MAAM,CAG2B;IAE3C;;;OAGG;IACH,8BAHU,MAAM,CAGW;IAE3B;;;OAGG;IACH,oBAHU,MAAM,OAAO,CAAC,CAGN;IAElB;;;;OAIG;IACH,mCArFmB,OAAO,KAAE,KAAK,CA2F9B;IAEH;;;OAGG;IACH,6BAAiD;IAEjD;;;OAGG;IACH,kBAHU,YAAY,GAAC,IAAI,CAGT;IAElB;;OAEG;IACH,sBAA4C;IAgB9C;;;;OAIG;IACH,eAHY,MAAM,CAKjB;IAED;;;;OAIG;IACH,aAHY,YAAY,GAAC,IAAI,CAK5B;IAeD;;;;OAIG;IACH,sBAHW,MAAM,QAKhB;IAED;;;;;OAKG;IACH,4BAHW,MAAM,QAKhB;IAED;;;;OAIG;IACH,kBAHY,MAAM,CAKjB;IAED;;;;OAIG;IACH,kBAHW,YAAY,GAAC,IAAI,QAY3B;IAWD;;;;OAIG;IACH,yBAHW,MAAM,eACN,MAAM,QAahB;IAED;;OAEG;IACH,0BAkCC;IAED;;;;;OAKG;IACH,kCALW,MAAM,OAAO,CAAC,UACd,OAAO,cAAc,EAAE,MAAM,GAC5B,OAAO,CA2BlB;CACF"}
|
package/source/Cluster.js
CHANGED
|
@@ -316,12 +316,11 @@ class Cluster extends VectorSource {
|
|
|
316
316
|
]);
|
|
317
317
|
if (this.createCustomCluster_) {
|
|
318
318
|
return this.createCustomCluster_(geometry, features);
|
|
319
|
-
} else {
|
|
320
|
-
return new Feature({
|
|
321
|
-
geometry,
|
|
322
|
-
features,
|
|
323
|
-
});
|
|
324
319
|
}
|
|
320
|
+
return new Feature({
|
|
321
|
+
geometry,
|
|
322
|
+
features,
|
|
323
|
+
});
|
|
325
324
|
}
|
|
326
325
|
}
|
|
327
326
|
|
package/source/Image.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Image.d.ts","sourceRoot":"","sources":["Image.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Image.d.ts","sourceRoot":"","sources":["Image.js"],"names":[],"mappings":"AAgQA;;;;;GAKG;AACH,gDAHW,OAAO,aAAa,EAAE,OAAO,OAC7B,MAAM,QAIhB;mCA3PS,MAAM;;;;;;AAyBhB;;GAEG;AAEH;;;;GAIG;AACH;IACE;;;OAGG;IACH,kBAHW,MAAM,SACN,OAAO,aAAa,EAAE,OAAO,EAWvC;IANC;;;;OAIG;IACH,OAHU,OAAO,aAAa,EAAE,OAAO,CAGrB;CAErB;;oCAvBY,cAAc,GAAC,gBAAgB,GAAC,gBAAgB;;;;6CA2BhD,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,qBAAqB,EAAE,gBAAgB,EAAE,MAAM,CAAC,GACxF,OAAW,eAAe,EAAE,mBAAmB,CAAC,OAAO,eAAe,EAAE,UAAU,GAAC,OAAO,oBAAoB,EAAE,KAAK,GAC9G,qBAAqB,EAAE,MAAM,CAAC;;;;;;;;;;;;;;iBAQxB,OAAO,YAAY,EAAE,cAAc;;;;;;;;;;;AAdjD;;;;;;;GAOG;AAEH;;;;;;;;GAQG;AAEH;;;;;;;;GAQG;AACH;IACE;;OAEG;IACH,qBAFW,OAAO,EA4CjB;IAjCC;;OAEG;IACH,IAFU,uBAAuB,OAAO,WAAW,EAAE,SAAS,CAAC,CAExD;IAEP;;OAEG;IACH,MAFU,uBAAuB,OAAO,WAAW,EAAE,SAAS,CAAC,CAEtD;IAET;;OAEG;IACH,IAFU,uBAAuB,IAAI,CAAC,CAE/B;IAEP;;;OAGG;IACH,qBACgE;IAEhE;;;OAGG;IACH,0BAA6B;IAE7B;;;OAGG;IACH,6BAA6B;IAU/B;;;;OAIG;IACH,4CAHW,MAAM,GACL,MAAM,CAQjB;IAED;;;;;;OAMG;IACH,iBANW,OAAO,cAAc,EAAE,MAAM,cAC7B,MAAM,cACN,MAAM,cACN,OAAO,uBAAuB,EAAE,OAAO,GACtC,OAAO,iBAAiB,EAAE,OAAO,CA8C5C;IAED;;;;;;;;OAQG;IACH,mCAPW,OAAO,cAAc,EAAE,MAAM,cAC7B,MAAM,cACN,MAAM,cACN,OAAO,uBAAuB,EAAE,OAAO,GACtC,OAAO,iBAAiB,EAAE,OAAO,CAK5C;IAED;;;;OAIG;IACH,mCAHW,OAAO,oBAAoB,EAAE,OAAO,QAyB9C;CACF"}
|
package/source/Image.js
CHANGED
|
@@ -176,40 +176,39 @@ class ImageSource extends Source {
|
|
|
176
176
|
projection = sourceProjection;
|
|
177
177
|
}
|
|
178
178
|
return this.getImageInternal(extent, resolution, pixelRatio, projection);
|
|
179
|
-
}
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
}
|
|
189
|
-
this.reprojectedImage_.dispose();
|
|
190
|
-
this.reprojectedImage_ = null;
|
|
179
|
+
}
|
|
180
|
+
if (this.reprojectedImage_) {
|
|
181
|
+
if (
|
|
182
|
+
this.reprojectedRevision_ == this.getRevision() &&
|
|
183
|
+
equivalent(this.reprojectedImage_.getProjection(), projection) &&
|
|
184
|
+
this.reprojectedImage_.getResolution() == resolution &&
|
|
185
|
+
equals(this.reprojectedImage_.getExtent(), extent)
|
|
186
|
+
) {
|
|
187
|
+
return this.reprojectedImage_;
|
|
191
188
|
}
|
|
189
|
+
this.reprojectedImage_.dispose();
|
|
190
|
+
this.reprojectedImage_ = null;
|
|
191
|
+
}
|
|
192
192
|
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
193
|
+
this.reprojectedImage_ = new ReprojImage(
|
|
194
|
+
sourceProjection,
|
|
195
|
+
projection,
|
|
196
|
+
extent,
|
|
197
|
+
resolution,
|
|
198
|
+
pixelRatio,
|
|
199
|
+
function (extent, resolution, pixelRatio) {
|
|
200
|
+
return this.getImageInternal(
|
|
201
|
+
extent,
|
|
202
|
+
resolution,
|
|
203
|
+
pixelRatio,
|
|
204
|
+
sourceProjection
|
|
205
|
+
);
|
|
206
|
+
}.bind(this),
|
|
207
|
+
this.getInterpolate()
|
|
208
|
+
);
|
|
209
|
+
this.reprojectedRevision_ = this.getRevision();
|
|
210
210
|
|
|
211
|
-
|
|
212
|
-
}
|
|
211
|
+
return this.reprojectedImage_;
|
|
213
212
|
}
|
|
214
213
|
|
|
215
214
|
/**
|
package/source/ImageMapGuide.js
CHANGED
|
@@ -273,9 +273,8 @@ function getScale(extent, size, metersPerUnit, dpi) {
|
|
|
273
273
|
const mpp = 0.0254 / dpi;
|
|
274
274
|
if (devH * mcsW > devW * mcsH) {
|
|
275
275
|
return (mcsW * metersPerUnit) / (devW * mpp); // width limited
|
|
276
|
-
} else {
|
|
277
|
-
return (mcsH * metersPerUnit) / (devH * mpp); // height limited
|
|
278
276
|
}
|
|
277
|
+
return (mcsH * metersPerUnit) / (devH * mpp); // height limited
|
|
279
278
|
}
|
|
280
279
|
|
|
281
280
|
export default ImageMapGuide;
|
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;
|
|
1
|
+
{"version":3,"file":"Raster.d.ts","sourceRoot":"","sources":["Raster.js"],"names":[],"mappings":"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"}
|
package/source/Raster.js
CHANGED
|
@@ -74,9 +74,8 @@ function createMinion(operation) {
|
|
|
74
74
|
function newWorkerImageData(data, width, height) {
|
|
75
75
|
if (workerHasImageData) {
|
|
76
76
|
return new ImageData(data, width, height);
|
|
77
|
-
} else {
|
|
78
|
-
return {data: data, width: width, height: height};
|
|
79
77
|
}
|
|
78
|
+
return {data: data, width: width, height: height};
|
|
80
79
|
}
|
|
81
80
|
|
|
82
81
|
return function (data) {
|
package/source/Tile.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Tile.d.ts","sourceRoot":"","sources":["Tile.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Tile.d.ts","sourceRoot":"","sources":["Tile.js"],"names":[],"mappings":"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"}
|
package/source/Tile.js
CHANGED
|
@@ -270,9 +270,8 @@ class TileSource extends Source {
|
|
|
270
270
|
getTileGridForProjection(projection) {
|
|
271
271
|
if (!this.tileGrid) {
|
|
272
272
|
return getTileGridForProjection(projection);
|
|
273
|
-
} else {
|
|
274
|
-
return this.tileGrid;
|
|
275
273
|
}
|
|
274
|
+
return this.tileGrid;
|
|
276
275
|
}
|
|
277
276
|
|
|
278
277
|
/**
|
|
@@ -312,9 +311,8 @@ class TileSource extends Source {
|
|
|
312
311
|
const tileSize = toSize(tileGrid.getTileSize(z), this.tmpSize);
|
|
313
312
|
if (tilePixelRatio == 1) {
|
|
314
313
|
return tileSize;
|
|
315
|
-
} else {
|
|
316
|
-
return scaleSize(tileSize, tilePixelRatio, this.tmpSize);
|
|
317
314
|
}
|
|
315
|
+
return scaleSize(tileSize, tilePixelRatio, this.tmpSize);
|
|
318
316
|
}
|
|
319
317
|
|
|
320
318
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TileImage.d.ts","sourceRoot":"","sources":["TileImage.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAyBc,OAAO,YAAY,EAAE,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAXjD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2CG;AAEH;;;;;;GAMG;AACH;IACE;;OAEG;IACH,qBAFY,OAAO,EA+DlB;IArCC;;;OAGG;IACH,uBAFW,MAAM,QAG+C;IAEhE;;;OAGG;IACH,qBAFU,gBAAgB,CAGuC;IAEjE;;;OAGG;IACH;YAFkB,MAAM,GAAE,SAAS;MAEH;IAEhC;;;OAGG;IACH;YAFkB,MAAM,GAAE,OAAO,yBAAyB,EAAE,OAAO;MAEpC;IAE/B;;;OAGG;IACH,oCAAqE;IAErE;;;OAGG;IACH,iCAAqC;
|
|
1
|
+
{"version":3,"file":"TileImage.d.ts","sourceRoot":"","sources":["TileImage.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAyBc,OAAO,YAAY,EAAE,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAXjD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2CG;AAEH;;;;;;GAMG;AACH;IACE;;OAEG;IACH,qBAFY,OAAO,EA+DlB;IArCC;;;OAGG;IACH,uBAFW,MAAM,QAG+C;IAEhE;;;OAGG;IACH,qBAFU,gBAAgB,CAGuC;IAEjE;;;OAGG;IACH;YAFkB,MAAM,GAAE,SAAS;MAEH;IAEhC;;;OAGG;IACH;YAFkB,MAAM,GAAE,OAAO,yBAAyB,EAAE,OAAO;MAEpC;IAE/B;;;OAGG;IACH,oCAAqE;IAErE;;;OAGG;IACH,iCAAqC;IAkDvC;;OAEG;IACH,aAFY,MAAM,CAIjB;IAgED;;;;;;;;;OASG;IACH,oBAoBC;IAED;;;;;;;OAOG;IACH,WAPW,MAAM,KACN,MAAM,KACN,MAAM,cACN,MAAM,cACN,OAAO,uBAAuB,EAAE,OAAO,GACrC,CAAC,SAAS,GAAC,UAAU,CAAC,CA4DlC;IAED;;;;;;;;OAQG;IACH,6BARW,MAAM,KACN,MAAM,KACN,MAAM,cACN,MAAM,cACL,OAAO,uBAAuB,EAAE,OAAO,GACtC,CAAC,SAAS,GAAC,UAAU,CAAC,CA+BlC;IAED;;;;OAIG;IACH,mCAHW,OAAO,QAYjB;IAED;;;;;;;;;;;OAWG;IACH,qCAJW,OAAO,YAAY,EAAE,cAAc,YACnC,OAAO,yBAAyB,EAAE,OAAO,QAWnD;CAQF"}
|
package/source/TileImage.js
CHANGED
|
@@ -137,13 +137,13 @@ class TileImage extends UrlTile {
|
|
|
137
137
|
canExpireCache() {
|
|
138
138
|
if (this.tileCache.canExpireCache()) {
|
|
139
139
|
return true;
|
|
140
|
-
}
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
}
|
|
140
|
+
}
|
|
141
|
+
for (const key in this.tileCacheForProjection) {
|
|
142
|
+
if (this.tileCacheForProjection[key].canExpireCache()) {
|
|
143
|
+
return true;
|
|
145
144
|
}
|
|
146
145
|
}
|
|
146
|
+
|
|
147
147
|
return false;
|
|
148
148
|
}
|
|
149
149
|
|
|
@@ -174,9 +174,8 @@ class TileImage extends UrlTile {
|
|
|
174
174
|
!equivalent(this.getProjection(), projection)
|
|
175
175
|
) {
|
|
176
176
|
return 0;
|
|
177
|
-
} else {
|
|
178
|
-
return this.getGutter();
|
|
179
177
|
}
|
|
178
|
+
return this.getGutter();
|
|
180
179
|
}
|
|
181
180
|
|
|
182
181
|
/**
|
|
@@ -209,9 +208,8 @@ class TileImage extends UrlTile {
|
|
|
209
208
|
!equivalent(this.getProjection(), projection)
|
|
210
209
|
) {
|
|
211
210
|
return false;
|
|
212
|
-
} else {
|
|
213
|
-
return super.getOpaque(projection);
|
|
214
211
|
}
|
|
212
|
+
return super.getOpaque(projection);
|
|
215
213
|
}
|
|
216
214
|
|
|
217
215
|
/**
|
|
@@ -222,14 +220,13 @@ class TileImage extends UrlTile {
|
|
|
222
220
|
const thisProj = this.getProjection();
|
|
223
221
|
if (this.tileGrid && (!thisProj || equivalent(thisProj, projection))) {
|
|
224
222
|
return this.tileGrid;
|
|
225
|
-
} else {
|
|
226
|
-
const projKey = getUid(projection);
|
|
227
|
-
if (!(projKey in this.tileGridForProjection)) {
|
|
228
|
-
this.tileGridForProjection[projKey] =
|
|
229
|
-
getTileGridForProjection(projection);
|
|
230
|
-
}
|
|
231
|
-
return this.tileGridForProjection[projKey];
|
|
232
223
|
}
|
|
224
|
+
const projKey = getUid(projection);
|
|
225
|
+
if (!(projKey in this.tileGridForProjection)) {
|
|
226
|
+
this.tileGridForProjection[projKey] =
|
|
227
|
+
getTileGridForProjection(projection);
|
|
228
|
+
}
|
|
229
|
+
return this.tileGridForProjection[projKey];
|
|
233
230
|
}
|
|
234
231
|
|
|
235
232
|
/**
|
|
@@ -240,15 +237,14 @@ class TileImage extends UrlTile {
|
|
|
240
237
|
const thisProj = this.getProjection();
|
|
241
238
|
if (!thisProj || equivalent(thisProj, projection)) {
|
|
242
239
|
return this.tileCache;
|
|
243
|
-
} else {
|
|
244
|
-
const projKey = getUid(projection);
|
|
245
|
-
if (!(projKey in this.tileCacheForProjection)) {
|
|
246
|
-
this.tileCacheForProjection[projKey] = new TileCache(
|
|
247
|
-
this.tileCache.highWaterMark
|
|
248
|
-
);
|
|
249
|
-
}
|
|
250
|
-
return this.tileCacheForProjection[projKey];
|
|
251
240
|
}
|
|
241
|
+
const projKey = getUid(projection);
|
|
242
|
+
if (!(projKey in this.tileCacheForProjection)) {
|
|
243
|
+
this.tileCacheForProjection[projKey] = new TileCache(
|
|
244
|
+
this.tileCache.highWaterMark
|
|
245
|
+
);
|
|
246
|
+
}
|
|
247
|
+
return this.tileCacheForProjection[projKey];
|
|
252
248
|
}
|
|
253
249
|
|
|
254
250
|
/**
|
|
@@ -305,52 +301,50 @@ class TileImage extends UrlTile {
|
|
|
305
301
|
pixelRatio,
|
|
306
302
|
sourceProjection || projection
|
|
307
303
|
);
|
|
308
|
-
}
|
|
309
|
-
|
|
310
|
-
|
|
311
|
-
|
|
312
|
-
|
|
313
|
-
|
|
314
|
-
|
|
315
|
-
|
|
316
|
-
|
|
317
|
-
|
|
318
|
-
|
|
319
|
-
|
|
320
|
-
|
|
321
|
-
|
|
322
|
-
|
|
323
|
-
|
|
324
|
-
|
|
325
|
-
|
|
326
|
-
|
|
327
|
-
|
|
328
|
-
|
|
329
|
-
|
|
330
|
-
|
|
331
|
-
|
|
332
|
-
|
|
333
|
-
|
|
334
|
-
|
|
335
|
-
|
|
336
|
-
|
|
337
|
-
|
|
338
|
-
|
|
339
|
-
|
|
340
|
-
|
|
341
|
-
|
|
342
|
-
|
|
304
|
+
}
|
|
305
|
+
const cache = this.getTileCacheForProjection(projection);
|
|
306
|
+
const tileCoord = [z, x, y];
|
|
307
|
+
let tile;
|
|
308
|
+
const tileCoordKey = getKey(tileCoord);
|
|
309
|
+
if (cache.containsKey(tileCoordKey)) {
|
|
310
|
+
tile = cache.get(tileCoordKey);
|
|
311
|
+
}
|
|
312
|
+
const key = this.getKey();
|
|
313
|
+
if (tile && tile.key == key) {
|
|
314
|
+
return tile;
|
|
315
|
+
}
|
|
316
|
+
const sourceTileGrid = this.getTileGridForProjection(sourceProjection);
|
|
317
|
+
const targetTileGrid = this.getTileGridForProjection(projection);
|
|
318
|
+
const wrappedTileCoord = this.getTileCoordForTileUrlFunction(
|
|
319
|
+
tileCoord,
|
|
320
|
+
projection
|
|
321
|
+
);
|
|
322
|
+
const newTile = new ReprojTile(
|
|
323
|
+
sourceProjection,
|
|
324
|
+
sourceTileGrid,
|
|
325
|
+
projection,
|
|
326
|
+
targetTileGrid,
|
|
327
|
+
tileCoord,
|
|
328
|
+
wrappedTileCoord,
|
|
329
|
+
this.getTilePixelRatio(pixelRatio),
|
|
330
|
+
this.getGutter(),
|
|
331
|
+
function (z, x, y, pixelRatio) {
|
|
332
|
+
return this.getTileInternal(z, x, y, pixelRatio, sourceProjection);
|
|
333
|
+
}.bind(this),
|
|
334
|
+
this.reprojectionErrorThreshold_,
|
|
335
|
+
this.renderReprojectionEdges_,
|
|
336
|
+
this.getInterpolate()
|
|
337
|
+
);
|
|
338
|
+
newTile.key = key;
|
|
343
339
|
|
|
344
|
-
|
|
345
|
-
|
|
346
|
-
|
|
347
|
-
|
|
348
|
-
|
|
349
|
-
|
|
350
|
-
}
|
|
351
|
-
return newTile;
|
|
352
|
-
}
|
|
340
|
+
if (tile) {
|
|
341
|
+
newTile.interimTile = tile;
|
|
342
|
+
newTile.refreshInterimChain();
|
|
343
|
+
cache.replace(tileCoordKey, newTile);
|
|
344
|
+
} else {
|
|
345
|
+
cache.set(tileCoordKey, newTile);
|
|
353
346
|
}
|
|
347
|
+
return newTile;
|
|
354
348
|
}
|
|
355
349
|
|
|
356
350
|
/**
|
package/source/UTFGrid.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UTFGrid.d.ts","sourceRoot":"","sources":["UTFGrid.js"],"names":[],"mappings":"AAiBA;;;;;GAKG;AAEH;IACE;;;;;;;OAOG;IACH,uBAPW,OAAO,iBAAiB,EAAE,SAAS,mBAEnC,MAAM,UACN,OAAO,cAAc,EAAE,MAAM,cAC7B,OAAO,SACP,OAAO,EA8CjB;IAzCC;;;OAGG;IACH,aAAe;IAEf;;;OAGG;IACH,gBAAqB;IAErB;;;OAGG;IACH,oBAA6B;IAE7B;;;OAGG;IACH,cAAiB;IAEjB;;;OAGG;IACH,cAAiB;IAEjB;;;OAGG;IACH,cAAiB;IAEjB;;;OAGG;IACH,eAAmB;IAGrB;;;OAGG;IACH,YAFY,gBAAgB,CAI3B;IAED;;;;OAIG;IACH,oBAHW,OAAO,kBAAkB,EAAE,UAAU,OAqC/C;IAED;;;;;;;OAOG;IACH,gCALW,OAAO,kBAAkB,EAAE,UAAU,2BACxB,IAAI,uCA4B3B;IAUD;;OAEG;IACH,qBAGC;IAED;;;OAGG;IACH,oBAOC;IAED;;OAEG;IACH,sBAiBC;IAED;;;OAGG;IACH,mBAiBC;IAED;;;OAGG;IACH,oBAEC;CAWF;;;;;;UA1Oa,MAAM,MAAM,CAAC;;;;UACb,MAAM,MAAM,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA2O3B;;;;;;;;;;;;;;;;;GAiBG;AAEH;;;;GAIG;AACH;IACE;;OAEG;IACH,qBAFW,OAAO,EAqDjB;IA5CC;;;OAGG;IACH,oBAC8D;IAE9D;;;OAGG;IACH,yBAA2C;IAE3C;;;OAGG;IACH,kBAA0B;IAE1B;;;OAGG;IACH,eAAoC;IAuBtC;;;OAGG;IACH,mBAiBC;IAED;;;OAGG;IACH,oBAEC;IAED;;;;OAIG;IACH,eAHY,MAAM,GAAC,SAAS,CAK3B;IAED;;;;;;;;;;OAUG;IACH,6CAPW,OAAO,kBAAkB,EAAE,UAAU,cACrC,MAAM,2BACO,IAAI,uCA4B3B;IAED;;OAEG;IACH,sCAEC;IAED;;;;OAIG;IACH,2CAFW,OAAO,eAAe,EAAE,MAAM,QA8CxC;IAED;;;;;;;OAOG;IACH,WAPW,MAAM,KACN,MAAM,KACN,MAAM,cACN,MAAM,cACN,OAAO,uBAAuB,EAAE,OAAO,GACrC,UAAU,
|
|
1
|
+
{"version":3,"file":"UTFGrid.d.ts","sourceRoot":"","sources":["UTFGrid.js"],"names":[],"mappings":"AAiBA;;;;;GAKG;AAEH;IACE;;;;;;;OAOG;IACH,uBAPW,OAAO,iBAAiB,EAAE,SAAS,mBAEnC,MAAM,UACN,OAAO,cAAc,EAAE,MAAM,cAC7B,OAAO,SACP,OAAO,EA8CjB;IAzCC;;;OAGG;IACH,aAAe;IAEf;;;OAGG;IACH,gBAAqB;IAErB;;;OAGG;IACH,oBAA6B;IAE7B;;;OAGG;IACH,cAAiB;IAEjB;;;OAGG;IACH,cAAiB;IAEjB;;;OAGG;IACH,cAAiB;IAEjB;;;OAGG;IACH,eAAmB;IAGrB;;;OAGG;IACH,YAFY,gBAAgB,CAI3B;IAED;;;;OAIG;IACH,oBAHW,OAAO,kBAAkB,EAAE,UAAU,OAqC/C;IAED;;;;;;;OAOG;IACH,gCALW,OAAO,kBAAkB,EAAE,UAAU,2BACxB,IAAI,uCA4B3B;IAUD;;OAEG;IACH,qBAGC;IAED;;;OAGG;IACH,oBAOC;IAED;;OAEG;IACH,sBAiBC;IAED;;;OAGG;IACH,mBAiBC;IAED;;;OAGG;IACH,oBAEC;CAWF;;;;;;UA1Oa,MAAM,MAAM,CAAC;;;;UACb,MAAM,MAAM,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA2O3B;;;;;;;;;;;;;;;;;GAiBG;AAEH;;;;GAIG;AACH;IACE;;OAEG;IACH,qBAFW,OAAO,EAqDjB;IA5CC;;;OAGG;IACH,oBAC8D;IAE9D;;;OAGG;IACH,yBAA2C;IAE3C;;;OAGG;IACH,kBAA0B;IAE1B;;;OAGG;IACH,eAAoC;IAuBtC;;;OAGG;IACH,mBAiBC;IAED;;;OAGG;IACH,oBAEC;IAED;;;;OAIG;IACH,eAHY,MAAM,GAAC,SAAS,CAK3B;IAED;;;;;;;;;;OAUG;IACH,6CAPW,OAAO,kBAAkB,EAAE,UAAU,cACrC,MAAM,2BACO,IAAI,uCA4B3B;IAED;;OAEG;IACH,sCAEC;IAED;;;;OAIG;IACH,2CAFW,OAAO,eAAe,EAAE,MAAM,QA8CxC;IAED;;;;;;;OAOG;IACH,WAPW,MAAM,KACN,MAAM,KACN,MAAM,cACN,MAAM,cACN,OAAO,uBAAuB,EAAE,OAAO,GACrC,UAAU,CAuBtB;IAED;;;;;OAKG;IACH,WAJW,MAAM,KACN,MAAM,KACN,MAAM,QAOhB;CACF"}
|
package/source/UTFGrid.js
CHANGED
|
@@ -480,28 +480,23 @@ class UTFGrid extends TileSource {
|
|
|
480
480
|
const tileCoordKey = getKeyZXY(z, x, y);
|
|
481
481
|
if (this.tileCache.containsKey(tileCoordKey)) {
|
|
482
482
|
return this.tileCache.get(tileCoordKey);
|
|
483
|
-
} else {
|
|
484
|
-
const tileCoord = [z, x, y];
|
|
485
|
-
const urlTileCoord = this.getTileCoordForTileUrlFunction(
|
|
486
|
-
tileCoord,
|
|
487
|
-
projection
|
|
488
|
-
);
|
|
489
|
-
const tileUrl = this.tileUrlFunction_(
|
|
490
|
-
urlTileCoord,
|
|
491
|
-
pixelRatio,
|
|
492
|
-
projection
|
|
493
|
-
);
|
|
494
|
-
const tile = new CustomTile(
|
|
495
|
-
tileCoord,
|
|
496
|
-
tileUrl !== undefined ? TileState.IDLE : TileState.EMPTY,
|
|
497
|
-
tileUrl !== undefined ? tileUrl : '',
|
|
498
|
-
this.tileGrid.getTileCoordExtent(tileCoord),
|
|
499
|
-
this.preemptive_,
|
|
500
|
-
this.jsonp_
|
|
501
|
-
);
|
|
502
|
-
this.tileCache.set(tileCoordKey, tile);
|
|
503
|
-
return tile;
|
|
504
483
|
}
|
|
484
|
+
const tileCoord = [z, x, y];
|
|
485
|
+
const urlTileCoord = this.getTileCoordForTileUrlFunction(
|
|
486
|
+
tileCoord,
|
|
487
|
+
projection
|
|
488
|
+
);
|
|
489
|
+
const tileUrl = this.tileUrlFunction_(urlTileCoord, pixelRatio, projection);
|
|
490
|
+
const tile = new CustomTile(
|
|
491
|
+
tileCoord,
|
|
492
|
+
tileUrl !== undefined ? TileState.IDLE : TileState.EMPTY,
|
|
493
|
+
tileUrl !== undefined ? tileUrl : '',
|
|
494
|
+
this.tileGrid.getTileCoordExtent(tileCoord),
|
|
495
|
+
this.preemptive_,
|
|
496
|
+
this.jsonp_
|
|
497
|
+
);
|
|
498
|
+
this.tileCache.set(tileCoordKey, tile);
|
|
499
|
+
return tile;
|
|
505
500
|
}
|
|
506
501
|
|
|
507
502
|
/**
|