ol 10.1.1-dev.1726911855762 → 10.1.1-dev.1726937585458
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/dist/ol.js +1 -1
- package/dist/ol.js.map +1 -1
- package/layer/Layer.d.ts +5 -0
- package/layer/Layer.d.ts.map +1 -1
- package/layer/Layer.js +20 -13
- package/package.json +1 -1
- package/renderer/Composite.d.ts.map +1 -1
- package/renderer/Composite.js +2 -1
- package/renderer/webgl/VectorLayer.d.ts.map +1 -1
- package/renderer/webgl/VectorLayer.js +0 -1
- package/util.js +1 -1
- package/webgl/styleparser.d.ts.map +1 -1
- package/webgl/styleparser.js +15 -18
package/layer/Layer.d.ts
CHANGED
|
@@ -346,6 +346,11 @@ declare class Layer<SourceType extends import("../source/Source.js").default = i
|
|
|
346
346
|
* @api
|
|
347
347
|
*/
|
|
348
348
|
setMap(map: import("../Map.js").default | null): void;
|
|
349
|
+
/**
|
|
350
|
+
* @param {import("../events/Event.js").default} renderEvent Render event
|
|
351
|
+
* @private
|
|
352
|
+
*/
|
|
353
|
+
private handlePrecompose_;
|
|
349
354
|
/**
|
|
350
355
|
* Set the layer source.
|
|
351
356
|
* @param {SourceType|null} source The layer source.
|
package/layer/Layer.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Layer.d.ts","sourceRoot":"","sources":["Layer.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Layer.d.ts","sourceRoot":"","sources":["Layer.js"],"names":[],"mappings":"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"}
|
package/layer/Layer.js
CHANGED
|
@@ -449,25 +449,32 @@ class Layer extends BaseLayer {
|
|
|
449
449
|
this.mapPrecomposeKey_ = listen(
|
|
450
450
|
map,
|
|
451
451
|
RenderEventType.PRECOMPOSE,
|
|
452
|
-
|
|
453
|
-
|
|
454
|
-
/** @type {import("../render/Event.js").default} */ (evt);
|
|
455
|
-
const layerStatesArray = renderEvent.frameState.layerStatesArray;
|
|
456
|
-
const layerState = this.getLayerState(false);
|
|
457
|
-
assert(
|
|
458
|
-
!layerStatesArray.some(function (arrayLayerState) {
|
|
459
|
-
return arrayLayerState.layer === layerState.layer;
|
|
460
|
-
}),
|
|
461
|
-
'A layer can only be added to the map once. Use either `layer.setMap()` or `map.addLayer()`, not both.',
|
|
462
|
-
);
|
|
463
|
-
layerStatesArray.push(layerState);
|
|
464
|
-
},
|
|
452
|
+
this.handlePrecompose_,
|
|
453
|
+
this,
|
|
465
454
|
);
|
|
466
455
|
this.mapRenderKey_ = listen(this, EventType.CHANGE, map.render, map);
|
|
467
456
|
this.changed();
|
|
468
457
|
}
|
|
469
458
|
}
|
|
470
459
|
|
|
460
|
+
/**
|
|
461
|
+
* @param {import("../events/Event.js").default} renderEvent Render event
|
|
462
|
+
* @private
|
|
463
|
+
*/
|
|
464
|
+
handlePrecompose_(renderEvent) {
|
|
465
|
+
const layerStatesArray =
|
|
466
|
+
/** @type {import("../render/Event.js").default} */ (renderEvent)
|
|
467
|
+
.frameState.layerStatesArray;
|
|
468
|
+
const layerState = this.getLayerState(false);
|
|
469
|
+
assert(
|
|
470
|
+
!layerStatesArray.some(
|
|
471
|
+
(arrayLayerState) => arrayLayerState.layer === layerState.layer,
|
|
472
|
+
),
|
|
473
|
+
'A layer can only be added to the map once. Use either `layer.setMap()` or `map.addLayer()`, not both.',
|
|
474
|
+
);
|
|
475
|
+
layerStatesArray.push(layerState);
|
|
476
|
+
}
|
|
477
|
+
|
|
471
478
|
/**
|
|
472
479
|
* Set the layer source.
|
|
473
480
|
* @param {SourceType|null} source The layer source.
|
package/package.json
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Composite.d.ts","sourceRoot":"","sources":["Composite.js"],"names":[],"mappings":";AAcA;;;;GAIG;AACH;IAOI;;;OAGG;IACH,+
|
|
1
|
+
{"version":3,"file":"Composite.d.ts","sourceRoot":"","sources":["Composite.js"],"names":[],"mappings":";AAcA;;;;GAIG;AACH;IAOI;;;OAGG;IACH,+BAKC;IAED;;;OAGG;IACH,iBAA6C;IAY7C;;;OAGG;IACH,kBAAmB;IAEnB;;;OAGG;IACH,yBAA4B;IAoG9B;;;OAGG;IACH,sBAHW,OAAO,WAAW,EAAE,UAAU,eAC9B,KAAK,CAAC,OAAO,mBAAmB,EAAE,KAAK,CAAC,QAgBlD;CACF;wBAlLuB,UAAU"}
|
package/renderer/Composite.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"VectorLayer.d.ts","sourceRoot":"","sources":["VectorLayer.js"],"names":[],"mappings":"AAmCA;;;;;;;;;;;;;EAKE;;0BAGW,OAAO,2CAA2C,EAAE,WAAW;;;;;;;;;WAM9D,WAAW,GAAC,KAAK,CAAC,WAAW,CAAC;;;;;;;;;;;AAP5C;;GAEG;AAEH;;;;;;;GAOG;AAEH;;;;;;;;;;;;;;;;;GAiBG;AACH;IACE;;;OAGG;IACH,mBAHW,OAAO,sBAAsB,EAAE,OAAO,WACtC,OAAO,EAoGjB;IAtFC;;;OAGG;IACH,6BAAwD;IAExD;;;OAGG;IACH,yBAAqB;IAErB;;OAEG;IACH,wBAAyB;IAEzB;;OAEG;IACH,wBAAoC;IAEpC;;;;;;OAMG;IACH,0BAA0C;IAE1C;;OAEG;IACH,mBAAwB;IACxB;;OAEG;IACH,sBAAsC;IACtC;;OAEG;IACH,iBAA4B;IAE5B;;;OAGG;IACH,oCAAoD;IAEpD;;;OAGG;IACH,gBAAiB;IAEjB;;;OAGG;IACH,wBAAyB;IAEzB;;;OAGG;IACH,iBAAkB;IAIlB;;OAEG;IACH,eAAsC;IAEtC;;;OAGG;IACH,8BAAkC;IAElC;;;OAGG;IACH,0BAA6B;IAG/B;;;OAGG;IACH,
|
|
1
|
+
{"version":3,"file":"VectorLayer.d.ts","sourceRoot":"","sources":["VectorLayer.js"],"names":[],"mappings":"AAmCA;;;;;;;;;;;;;EAKE;;0BAGW,OAAO,2CAA2C,EAAE,WAAW;;;;;;;;;WAM9D,WAAW,GAAC,KAAK,CAAC,WAAW,CAAC;;;;;;;;;;;AAP5C;;GAEG;AAEH;;;;;;;GAOG;AAEH;;;;;;;;;;;;;;;;;GAiBG;AACH;IACE;;;OAGG;IACH,mBAHW,OAAO,sBAAsB,EAAE,OAAO,WACtC,OAAO,EAoGjB;IAtFC;;;OAGG;IACH,6BAAwD;IAExD;;;OAGG;IACH,yBAAqB;IAErB;;OAEG;IACH,wBAAyB;IAEzB;;OAEG;IACH,wBAAoC;IAEpC;;;;;;OAMG;IACH,0BAA0C;IAE1C;;OAEG;IACH,mBAAwB;IACxB;;OAEG;IACH,sBAAsC;IACtC;;OAEG;IACH,iBAA4B;IAE5B;;;OAGG;IACH,oCAAoD;IAEpD;;;OAGG;IACH,gBAAiB;IAEjB;;;OAGG;IACH,wBAAyB;IAEzB;;;OAGG;IACH,iBAAkB;IAIlB;;OAEG;IACH,eAAsC;IAEtC;;;OAGG;IACH,8BAAkC;IAElC;;;OAGG;IACH,0BAA6B;IAG/B;;;OAGG;IACH,4BAoCC;IAED;;;OAGG;IACH,sBAIC;IAED;;OAEG;IACH,yBAMC;IAED;;OAEG;IACH,mCAMC;IAoBD;;;;OAIG;IACH,kCAGC;IAED;;;OAGG;IACH,oCAGC;IAED;;;OAGG;IACH,mCAGC;IAED;;OAEG;IACH,kCAEC;IAED;;;OAGG;IACH,uBAsBC;IAED;;;;;OAKG;IACH,iCAJW,OAAO,cAAc,EAAE,UAAU,GAChC,WAAW,CAgCtB;IAwED;;;;;;;OAOG;IACH,yBANW,OAAO,cAAc,EAAE,UAAU,mBACjC,OAAO,cACP,MAAM,YACN,MAAM,cACN,MAAM,QAuChB;IA0CD;;;OAGG;IACH,wBAFW,OAAO,2CAA2C,EAAE,YAAY,QAkB1E;CAkBF;+BA7iB8B,YAAY"}
|
package/util.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"styleparser.d.ts","sourceRoot":"","sources":["styleparser.js"],"names":[],"mappings":"AAsBA;;;;;;;GAOG;AACH,qDALW,OAAO,gBAAgB,EAAE,kBAAkB,SAC3C,OAAO,uBAAuB,EAAE,iBAAiB,sCAEhD,MAAM,CAUjB;AAED;;;;GAIG;AACH,iCAHW,OAAO,aAAa,EAAE,KAAK,GAAC,MAAM,GACjC,KAAK,CAAC,MAAM,CAAC,CASxB;AAqCD;;;;GAIG;AACH,mCAHW,MAAO,MAAM,GACZ,MAAM,CAOjB;AA4uBD;;;;;GAKG;AAEH;;;;;;;;;;GAUG;AACH,yCAHW,OAAO,mBAAmB,EAAE,UAAU,GACrC,gBAAgB,
|
|
1
|
+
{"version":3,"file":"styleparser.d.ts","sourceRoot":"","sources":["styleparser.js"],"names":[],"mappings":"AAsBA;;;;;;;GAOG;AACH,qDALW,OAAO,gBAAgB,EAAE,kBAAkB,SAC3C,OAAO,uBAAuB,EAAE,iBAAiB,sCAEhD,MAAM,CAUjB;AAED;;;;GAIG;AACH,iCAHW,OAAO,aAAa,EAAE,KAAK,GAAC,MAAM,GACjC,KAAK,CAAC,MAAM,CAAC,CASxB;AAqCD;;;;GAIG;AACH,mCAHW,MAAO,MAAM,GACZ,MAAM,CAOjB;AA4uBD;;;;;GAKG;AAEH;;;;;;;;;;GAUG;AACH,yCAHW,OAAO,mBAAmB,EAAE,UAAU,GACrC,gBAAgB,CAuI3B;;;;;aArJa,aAAa;;;;cACb,OAAO,wCAAwC,EAAE,kBAAkB;;;;gBACnE,OAAO,wCAAwC,EAAE,oBAAoB;;8BAt0BvD,oBAAoB"}
|
package/webgl/styleparser.js
CHANGED
|
@@ -973,24 +973,21 @@ export function parseLiteralStyle(style) {
|
|
|
973
973
|
const attributes = {};
|
|
974
974
|
for (const propName in vertContext.properties) {
|
|
975
975
|
const property = vertContext.properties[propName];
|
|
976
|
-
|
|
977
|
-
|
|
978
|
-
|
|
979
|
-
|
|
980
|
-
|
|
981
|
-
|
|
982
|
-
|
|
983
|
-
|
|
984
|
-
|
|
985
|
-
|
|
986
|
-
|
|
987
|
-
|
|
988
|
-
|
|
989
|
-
|
|
990
|
-
|
|
991
|
-
return value;
|
|
992
|
-
};
|
|
993
|
-
}
|
|
976
|
+
const callback = (feature) => {
|
|
977
|
+
const value = property.evaluator
|
|
978
|
+
? property.evaluator(feature)
|
|
979
|
+
: feature.get(property.name);
|
|
980
|
+
if (property.type === ColorType) {
|
|
981
|
+
return packColor([...asArray(value || '#eee')]);
|
|
982
|
+
}
|
|
983
|
+
if (typeof value === 'string') {
|
|
984
|
+
return getStringNumberEquivalent(value);
|
|
985
|
+
}
|
|
986
|
+
if (typeof value === 'boolean') {
|
|
987
|
+
return value ? 1 : 0;
|
|
988
|
+
}
|
|
989
|
+
return value;
|
|
990
|
+
};
|
|
994
991
|
|
|
995
992
|
attributes[property.name] = {
|
|
996
993
|
size: getGlslSizeFromType(property.type),
|