ol 6.9.1-dev.1637597172069 → 6.9.1-dev.1637853899327
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/layer/MapboxVector.d.ts.map +1 -1
- package/layer/MapboxVector.js +6 -6
- package/layer/MapboxVector.js.map +1 -1
- package/package.json +1 -1
- package/src/layer/MapboxVector.js +10 -12
- package/util.js +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MapboxVector.d.ts","sourceRoot":"","sources":["../src/layer/MapboxVector.js"],"names":[],"mappings":"AAmBA;;;;;GAKG;AACH,mDAMC;AAED;;;;;;GAMG;AACH,uEAYC;AAED;;;;;;GAMG;AACH,uEAYC;AAED;;;;;;GAMG;AACH,sEAYC;AAED;;;;;;;GAOG;AACH,2FAWC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA2CD;;;;;;;GAOG;AAEH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkEG;AAEH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH;IACE;;;OAGG;IACH,8BA2CC;IAdC,iBAA8B;IAC9B,iBAA4B;IAG1B,oBAAsC;IAMpC,0BAA4B;IAMlC;;;;OAIG;IACH,6CAiBC;IAED;;;;OAIG;IACH,
|
|
1
|
+
{"version":3,"file":"MapboxVector.d.ts","sourceRoot":"","sources":["../src/layer/MapboxVector.js"],"names":[],"mappings":"AAmBA;;;;;GAKG;AACH,mDAMC;AAED;;;;;;GAMG;AACH,uEAYC;AAED;;;;;;GAMG;AACH,uEAYC;AAED;;;;;;GAMG;AACH,sEAYC;AAED;;;;;;;GAOG;AACH,2FAWC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA2CD;;;;;;;GAOG;AAEH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkEG;AAEH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH;IACE;;;OAGG;IACH,8BA2CC;IAdC,iBAA8B;IAC9B,iBAA4B;IAG1B,oBAAsC;IAMpC,0BAA4B;IAMlC;;;;OAIG;IACH,6CAiBC;IAED;;;;OAIG;IACH,gDAyGC;IAED;;;;;;OAMG;IACH,oEA6DC;IAED;;;;OAIG;IACH,0CAIC;CACF"}
|
package/layer/MapboxVector.js
CHANGED
|
@@ -394,8 +394,7 @@ var MapboxVectorLayer = /** @class */ (function (_super) {
|
|
|
394
394
|
return;
|
|
395
395
|
}
|
|
396
396
|
var source = this.getSource();
|
|
397
|
-
if (styleSource.url.indexOf('mapbox://') === 0
|
|
398
|
-
styleSource.url.indexOf('{z}') !== -1) {
|
|
397
|
+
if (styleSource.url && styleSource.url.indexOf('mapbox://') === 0) {
|
|
399
398
|
// Tile source url, handle it directly
|
|
400
399
|
source.setUrl(normalizeSourceUrl(styleSource.url, this.accessToken, this.accessTokenParam_));
|
|
401
400
|
applyStyle(this, style, sourceIdOrLayersList)
|
|
@@ -413,7 +412,9 @@ var MapboxVectorLayer = /** @class */ (function (_super) {
|
|
|
413
412
|
return normalizeSourceUrl(url, _this.accessToken, _this.accessTokenParam_);
|
|
414
413
|
});
|
|
415
414
|
}
|
|
416
|
-
setupVectorSource(styleSource,
|
|
415
|
+
setupVectorSource(styleSource, styleSource.url
|
|
416
|
+
? normalizeSourceUrl(styleSource.url, this.accessToken, this.accessTokenParam_)
|
|
417
|
+
: undefined).then(function (source) {
|
|
417
418
|
applyStyle(_this, style, sourceIdOrLayersList)
|
|
418
419
|
.then(function () {
|
|
419
420
|
_this.configureSource(source, style);
|
|
@@ -441,9 +442,8 @@ var MapboxVectorLayer = /** @class */ (function (_super) {
|
|
|
441
442
|
targetSource.tileGrid = source.tileGrid;
|
|
442
443
|
}
|
|
443
444
|
var background = style.layers.find(function (layer) { return layer.type === 'background'; });
|
|
444
|
-
if (
|
|
445
|
-
!background.layout ||
|
|
446
|
-
background.layout.visibility !== 'none') {
|
|
445
|
+
if (background &&
|
|
446
|
+
(!background.layout || background.layout.visibility !== 'none')) {
|
|
447
447
|
var style_1 = new Style({
|
|
448
448
|
fill: new Fill(),
|
|
449
449
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MapboxVector.js","sourceRoot":"","sources":["../src/layer/MapboxVector.js"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"MapboxVector.js","sourceRoot":"","sources":["../src/layer/MapboxVector.js"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -405,10 +405,7 @@ class MapboxVectorLayer extends VectorTileLayer {
|
|
|
405
405
|
}
|
|
406
406
|
|
|
407
407
|
const source = this.getSource();
|
|
408
|
-
if (
|
|
409
|
-
styleSource.url.indexOf('mapbox://') === 0 ||
|
|
410
|
-
styleSource.url.indexOf('{z}') !== -1
|
|
411
|
-
) {
|
|
408
|
+
if (styleSource.url && styleSource.url.indexOf('mapbox://') === 0) {
|
|
412
409
|
// Tile source url, handle it directly
|
|
413
410
|
source.setUrl(
|
|
414
411
|
normalizeSourceUrl(
|
|
@@ -433,11 +430,13 @@ class MapboxVectorLayer extends VectorTileLayer {
|
|
|
433
430
|
}
|
|
434
431
|
setupVectorSource(
|
|
435
432
|
styleSource,
|
|
436
|
-
|
|
437
|
-
|
|
438
|
-
|
|
439
|
-
|
|
440
|
-
|
|
433
|
+
styleSource.url
|
|
434
|
+
? normalizeSourceUrl(
|
|
435
|
+
styleSource.url,
|
|
436
|
+
this.accessToken,
|
|
437
|
+
this.accessTokenParam_
|
|
438
|
+
)
|
|
439
|
+
: undefined
|
|
441
440
|
).then((source) => {
|
|
442
441
|
applyStyle(this, style, sourceIdOrLayersList)
|
|
443
442
|
.then(() => {
|
|
@@ -470,9 +469,8 @@ class MapboxVectorLayer extends VectorTileLayer {
|
|
|
470
469
|
(layer) => layer.type === 'background'
|
|
471
470
|
);
|
|
472
471
|
if (
|
|
473
|
-
|
|
474
|
-
!background.layout ||
|
|
475
|
-
background.layout.visibility !== 'none'
|
|
472
|
+
background &&
|
|
473
|
+
(!background.layout || background.layout.visibility !== 'none')
|
|
476
474
|
) {
|
|
477
475
|
const style = new Style({
|
|
478
476
|
fill: new Fill(),
|
package/util.js
CHANGED