@vcmap/core 5.0.0-rc.36 → 5.0.0-rc.38
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/src/category/category.js +2 -4
- package/dist/src/category/category.js.map +1 -1
- package/dist/src/interaction/featureProviderInteraction.js +4 -2
- package/dist/src/interaction/featureProviderInteraction.js.map +1 -1
- package/dist/src/layer/cesium/cesiumTilesetCesiumImpl.d.ts +1 -0
- package/dist/src/layer/cesium/cesiumTilesetCesiumImpl.js +50 -3
- package/dist/src/layer/cesium/cesiumTilesetCesiumImpl.js.map +1 -1
- package/dist/src/layer/cesium/openStreetMapCesiumImpl.d.ts +1 -1
- package/dist/src/layer/cesium/openStreetMapCesiumImpl.js +2 -2
- package/dist/src/layer/cesium/openStreetMapCesiumImpl.js.map +1 -1
- package/dist/src/layer/cesium/rasterLayerCesiumImpl.d.ts +1 -1
- package/dist/src/layer/cesium/rasterLayerCesiumImpl.js +6 -2
- package/dist/src/layer/cesium/rasterLayerCesiumImpl.js.map +1 -1
- package/dist/src/layer/cesium/singleImageCesiumImpl.d.ts +1 -1
- package/dist/src/layer/cesium/singleImageCesiumImpl.js +2 -3
- package/dist/src/layer/cesium/singleImageCesiumImpl.js.map +1 -1
- package/dist/src/layer/cesium/tmsCesiumImpl.d.ts +1 -1
- package/dist/src/layer/cesium/tmsCesiumImpl.js +2 -3
- package/dist/src/layer/cesium/tmsCesiumImpl.js.map +1 -1
- package/dist/src/layer/cesium/vectorCesiumImpl.d.ts +1 -1
- package/dist/src/layer/cesium/vectorCesiumImpl.js +17 -15
- package/dist/src/layer/cesium/vectorCesiumImpl.js.map +1 -1
- package/dist/src/layer/cesium/vectorContext.d.ts +1 -0
- package/dist/src/layer/cesium/vectorContext.js +17 -5
- package/dist/src/layer/cesium/vectorContext.js.map +1 -1
- package/dist/src/layer/cesium/vectorRasterTileCesiumImpl.d.ts +1 -1
- package/dist/src/layer/cesium/vectorRasterTileCesiumImpl.js +2 -3
- package/dist/src/layer/cesium/vectorRasterTileCesiumImpl.js.map +1 -1
- package/dist/src/layer/cesium/wmsCesiumImpl.d.ts +1 -1
- package/dist/src/layer/cesium/wmsCesiumImpl.js +1 -1
- package/dist/src/layer/cesium/wmsCesiumImpl.js.map +1 -1
- package/dist/src/layer/cesium/wmtsCesiumImpl.d.ts +1 -1
- package/dist/src/layer/cesium/wmtsCesiumImpl.js +1 -1
- package/dist/src/layer/cesium/wmtsCesiumImpl.js.map +1 -1
- package/dist/src/layer/featureVisibility.d.ts +2 -2
- package/dist/src/layer/featureVisibility.js +3 -2
- package/dist/src/layer/featureVisibility.js.map +1 -1
- package/dist/src/layer/layer.d.ts +10 -0
- package/dist/src/layer/layer.js +10 -0
- package/dist/src/layer/layer.js.map +1 -1
- package/dist/src/layer/vectorLayer.d.ts +1 -0
- package/dist/src/layer/vectorLayer.js.map +1 -1
- package/dist/src/layer/vectorProperties.d.ts +12 -0
- package/dist/src/layer/vectorProperties.js +134 -0
- package/dist/src/layer/vectorProperties.js.map +1 -1
- package/dist/src/layer/wfsLayer.d.ts +5 -0
- package/dist/src/layer/wfsLayer.js +13 -3
- package/dist/src/layer/wfsLayer.js.map +1 -1
- package/dist/src/map/cesiumMap.d.ts +6 -0
- package/dist/src/map/cesiumMap.js +4 -1
- package/dist/src/map/cesiumMap.js.map +1 -1
- package/dist/src/oblique/obliqueCollection.d.ts +4 -3
- package/dist/src/oblique/obliqueCollection.js +9 -5
- package/dist/src/oblique/obliqueCollection.js.map +1 -1
- package/dist/src/style/styleHelpers.d.ts +2 -0
- package/dist/src/style/styleHelpers.js +9 -0
- package/dist/src/style/styleHelpers.js.map +1 -1
- package/dist/src/style/vectorStyleItem.d.ts +1 -1
- package/dist/src/util/editor/createFeatureSession.js +7 -0
- package/dist/src/util/editor/createFeatureSession.js.map +1 -1
- package/dist/src/util/editor/editFeaturesSession.js +13 -1
- package/dist/src/util/editor/editFeaturesSession.js.map +1 -1
- package/dist/src/util/editor/editGeometrySession.js +15 -1
- package/dist/src/util/editor/editGeometrySession.js.map +1 -1
- package/dist/src/util/editor/editorHelpers.d.ts +2 -1
- package/dist/src/util/editor/editorHelpers.js +5 -0
- package/dist/src/util/editor/editorHelpers.js.map +1 -1
- package/dist/src/util/editor/interactions/editGeometryMouseOverInteraction.js +8 -1
- package/dist/src/util/editor/interactions/editGeometryMouseOverInteraction.js.map +1 -1
- package/dist/src/util/editor/interactions/mapInteractionController.d.ts +1 -0
- package/dist/src/util/editor/interactions/mapInteractionController.js +3 -0
- package/dist/src/util/editor/interactions/mapInteractionController.js.map +1 -1
- package/dist/src/util/featureconverter/arcToCesium.d.ts +1 -1
- package/dist/src/util/featureconverter/arcToCesium.js +2 -2
- package/dist/src/util/featureconverter/arcToCesium.js.map +1 -1
- package/dist/src/util/featureconverter/convert.d.ts +1 -1
- package/dist/src/util/featureconverter/convert.js +13 -13
- package/dist/src/util/featureconverter/convert.js.map +1 -1
- package/dist/src/util/featureconverter/featureconverterHelper.js +1 -1
- package/dist/src/util/featureconverter/featureconverterHelper.js.map +1 -1
- package/dist/src/util/featureconverter/lineStringToCesium.d.ts +2 -2
- package/dist/src/util/featureconverter/lineStringToCesium.js +6 -6
- package/dist/src/util/featureconverter/lineStringToCesium.js.map +1 -1
- package/dist/src/util/featureconverter/pointHelpers.d.ts +4 -4
- package/dist/src/util/featureconverter/pointHelpers.js +34 -23
- package/dist/src/util/featureconverter/pointHelpers.js.map +1 -1
- package/dist/src/util/featureconverter/pointToCesium.d.ts +1 -1
- package/dist/src/util/featureconverter/pointToCesium.js +11 -5
- package/dist/src/util/featureconverter/pointToCesium.js.map +1 -1
- package/dist/src/util/featureconverter/polygonToCesium.d.ts +2 -2
- package/dist/src/util/featureconverter/polygonToCesium.js +13 -4
- package/dist/src/util/featureconverter/polygonToCesium.js.map +1 -1
- package/dist/src/vcsApp.d.ts +13 -1
- package/dist/src/vcsApp.js +22 -11
- package/dist/src/vcsApp.js.map +1 -1
- package/dist/src/vcsModule.d.ts +4 -0
- package/dist/src/vcsModule.js +12 -5
- package/dist/src/vcsModule.js.map +1 -1
- package/package.json +3 -3
- package/src/category/category.ts +2 -5
- package/src/cesium/cesium.d.ts +5 -1
- package/src/interaction/featureProviderInteraction.ts +10 -8
- package/src/layer/cesium/cesiumTilesetCesiumImpl.ts +58 -5
- package/src/layer/cesium/openStreetMapCesiumImpl.ts +9 -7
- package/src/layer/cesium/rasterLayerCesiumImpl.ts +7 -3
- package/src/layer/cesium/singleImageCesiumImpl.ts +6 -4
- package/src/layer/cesium/tmsCesiumImpl.ts +5 -3
- package/src/layer/cesium/vectorCesiumImpl.ts +17 -15
- package/src/layer/cesium/vectorContext.ts +46 -33
- package/src/layer/cesium/vectorRasterTileCesiumImpl.ts +8 -7
- package/src/layer/cesium/wmsCesiumImpl.ts +4 -2
- package/src/layer/cesium/wmtsCesiumImpl.ts +4 -2
- package/src/layer/featureVisibility.ts +3 -11
- package/src/layer/layer.ts +19 -0
- package/src/layer/vectorLayer.ts +5 -0
- package/src/layer/vectorProperties.ts +191 -0
- package/src/layer/wfsLayer.ts +21 -6
- package/src/map/cesiumMap.ts +12 -1
- package/src/oblique/obliqueCollection.ts +10 -9
- package/src/style/styleHelpers.ts +11 -0
- package/src/style/vectorStyleItem.ts +1 -1
- package/src/util/editor/createFeatureSession.ts +8 -0
- package/src/util/editor/editFeaturesSession.ts +17 -1
- package/src/util/editor/editGeometrySession.ts +17 -1
- package/src/util/editor/editorHelpers.ts +9 -1
- package/src/util/editor/interactions/editGeometryMouseOverInteraction.ts +11 -1
- package/src/util/editor/interactions/mapInteractionController.ts +4 -0
- package/src/util/featureconverter/arcToCesium.ts +3 -3
- package/src/util/featureconverter/convert.ts +50 -32
- package/src/util/featureconverter/featureconverterHelper.ts +5 -1
- package/src/util/featureconverter/lineStringToCesium.ts +38 -36
- package/src/util/featureconverter/pointHelpers.ts +167 -140
- package/src/util/featureconverter/pointToCesium.ts +15 -8
- package/src/util/featureconverter/polygonToCesium.ts +16 -1
- package/src/vcsApp.ts +35 -15
- package/src/vcsModule.ts +16 -5
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { check } from '@vcsuite/check';
|
|
2
|
-
import { v4 as uuidv4 } from 'uuid';
|
|
3
2
|
import { Feature } from 'ol';
|
|
4
3
|
import { destroyCollection } from '../vcsModuleHelpers.js';
|
|
5
4
|
import makeOverrideCollection, { isOverrideCollection, } from '../util/overrideCollection.js';
|
|
@@ -12,8 +11,7 @@ import { getStyleOrDefaultStyle } from '../style/styleFactory.js';
|
|
|
12
11
|
import { categoryClassRegistry, getObjectFromClassRegistry, } from '../classRegistry.js';
|
|
13
12
|
import OverrideClassRegistry from '../overrideClassRegistry.js';
|
|
14
13
|
import VcsEvent from '../vcsEvent.js';
|
|
15
|
-
import {
|
|
16
|
-
const categoryModuleId = uuidv4();
|
|
14
|
+
import { markVolatile } from '../vcsModule.js';
|
|
17
15
|
function assignLayerOptions(layer, options) {
|
|
18
16
|
if (options.style) {
|
|
19
17
|
layer.setStyle(getStyleOrDefaultStyle(options.style, layer.defaultStyle));
|
|
@@ -84,7 +82,7 @@ class Category extends VcsObject {
|
|
|
84
82
|
this._layer = null;
|
|
85
83
|
if (this._featureProperty) {
|
|
86
84
|
this._layer = new VectorLayer(this._layerOptions);
|
|
87
|
-
this._layer
|
|
85
|
+
markVolatile(this._layer);
|
|
88
86
|
}
|
|
89
87
|
this._keyProperty =
|
|
90
88
|
options.keyProperty || defaultOptions.keyProperty;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"category.js","sourceRoot":"","sources":["../../../src/category/category.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AACvC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"category.js","sourceRoot":"","sources":["../../../src/category/category.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AACvC,OAAO,EAAE,OAAO,EAAE,MAAM,IAAI,CAAC;AAE7B,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,sBAAsB,EAAE,EAC7B,oBAAoB,GAGrB,MAAM,+BAA+B,CAAC;AACvC,OAAO,SAA+B,MAAM,iBAAiB,CAAC;AAC9D,OAAO,WAAmC,MAAM,yBAAyB,CAAC;AAC1E,OAAO,iBAAiB,MAAM,8BAA8B,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAC/E,OAAO,UAAU,MAAM,uBAAuB,CAAC;AAC/C,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EACL,qBAAqB,EACrB,0BAA0B,GAE3B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,qBAAqB,MAAM,6BAA6B,CAAC;AAChE,OAAO,QAAQ,MAAM,gBAAgB,CAAC;AAGtC,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAa/C,SAAS,kBAAkB,CAAC,KAAkB,EAAE,OAAsB;IACpE,IAAI,OAAO,CAAC,KAAK,EAAE;QACjB,KAAK,CAAC,QAAQ,CAAC,sBAAsB,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC;KAC3E;IAED,IAAI,OAAO,CAAC,cAAc,EAAE;QAC1B,MAAM,cAAc,GAAG,sBAAsB,CAC3C,OAAO,CAAC,cAAc,EACtB,KAAK,CAAC,cAAc,CACF,CAAC;QACrB,KAAK,CAAC,iBAAiB,CAAC,cAAc,CAAC,CAAC;KACzC;IAED,IAAI,OAAO,CAAC,gBAAgB,EAAE;QAC5B,KAAK,CAAC,gBAAgB,CAAC,SAAS,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;KAC5D;IAED,IAAI,OAAO,CAAC,MAAM,IAAI,IAAI,EAAE;QAC1B,KAAK,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;KAC/B;AACH,CAAC;AAED,SAAS,wBAAwB,CAE/B,GAAW,EAAE,KAAQ,EAAE,aAAgB,EAAE,MAAU;IACnD,MAAM,UAAU,GACd,MAAM,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,KAAK,aAAa,CAAC,CAAC,CAAC,MAAM,KAAK,KAAK,CAAC;IAC9D,IAAI,UAAU,EAAE;QACd,MAAM,IAAI,KAAK,CAAC,mCAAmC,GAAG,eAAe,CAAC,CAAC;KACxE;AACH,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,QAEJ,SAAQ,SAAS;IACjB,MAAM,KAAK,SAAS;QAClB,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,MAAM,CAAC,gBAAgB;QACrB,OAAO;YACL,KAAK,EAAE,EAAE;YACT,eAAe,EAAE,SAAS;YAC1B,iBAAiB,EAAE,SAAS;YAC5B,YAAY,EAAE,EAAE;YAChB,WAAW,EAAE,MAAM;SACpB,CAAC;IACJ,CAAC;IAED,KAAK,CAAS;IAEJ,IAAI,GAAkB,IAAI,CAAC;IAE7B,gBAAgB,CAAsB;IAEtC,kBAAkB,CAA2B;IAE7C,aAAa,CAAgB;IAE3B,MAAM,CAAqB;IAE7B,YAAY,CAAU;IAE9B;;OAEG;IACK,kBAAkB,GAAG,IAAI,QAAQ,EAAQ,CAAC;IAE1C,oBAAoB,GAAmB,EAAE,CAAC;IAE1C,WAAW,GAA0B,sBAAsB,CACjE,IAAI,iBAAiB,EAAE,EACvB,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,EACnC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,EAC9B,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,CACjC,CAAC;IAEF,kDAAkD;IAC1C,sBAAsB,GAAe,GAAG,EAAE,GAAE,CAAC,CAAC;IAEtD,YAAY,OAA2B;QACrC,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,MAAM,cAAc,GAAG,QAAQ,CAAC,gBAAgB,EAAE,CAAC;QAEnD,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,IAAI,IAAI,CAAC,IAAI,CAAC;QACxC,IAAI,CAAC,gBAAgB;YACnB,OAAO,CAAC,eAAe;gBACtB,cAAc,CAAC,eAAuC,CAAC;QAE1D,IAAI,CAAC,kBAAkB,GAAG,OAAO,CAAC,iBAAiB,CAAC;QACpD,IAAI,CAAC,aAAa;YAChB,OAAO,CAAC,YAAY,IAAK,cAAc,CAAC,YAA8B,CAAC;QACzE,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;QACnB,IAAI,IAAI,CAAC,gBAAgB,EAAE;YACzB,IAAI,CAAC,MAAM,GAAG,IAAI,WAAW,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;YAClD,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;SAC3B;QAED,IAAI,CAAC,YAAY;YACf,OAAO,CAAC,WAAW,IAAK,cAAc,CAAC,WAAuB,CAAC;QAEjE,IAAI,CAAC,aAAa,CAAC,IAAI,iBAAiB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC;IAC/D,CAAC;IAED,IAAI,iBAAiB;QACnB,OAAO,IAAI,CAAC,kBAAkB,CAAC;IACjC,CAAC;IAED,IAAI,UAAU;QACZ,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;IAED;;OAEG;IACH,IAAI,iBAAiB;QACnB,OAAO,IAAI,CAAC,kBAAkB,CAAC;IACjC,CAAC;IAED;;;;OAIG;IACH,IAAI,KAAK;QACP,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAES,UAAU,CAAC,IAAO;QAC1B,IAAI,IAAI,CAAC,gBAAgB,IAAI,IAAI,CAAC,MAAM,EAAE;YACxC,MAAM,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YACnC,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC,EAAY,CAAC,CAAC,CAAC,CAAC,6BAA6B;YAE7E,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;YACnD,IAAI,OAA4B,CAAC;YACjC,IAAI,cAAc,YAAY,OAAO,EAAE;gBACrC,OAAO,GAAG,cAAc,CAAC;aAC1B;iBAAM,IAAI,OAAO,cAAc,KAAK,QAAQ,EAAE;gBAC7C,MAAM,EAAE,QAAQ,EAAE,GAAG,YAAY,CAAC,cAAgC,CAAC,CAAC;gBACpE,IAAI,QAAQ,CAAC,CAAC,CAAC,EAAE;oBACf,wCAAwC;oBACxC,OAAO,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;iBACvB;aACF;YAED,IAAI,OAAO,EAAE;gBACX,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC;gBAC1B,UAAU,CAAC,GAAG,EAAE;oBACd,IAAI,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,OAAkB,CAAC,CAAC,CAAC;gBACjD,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,kJAAkJ;aAC1J;SACF;IACH,CAAC;IAES,YAAY,CAAC,IAAO;QAC5B,IAAI,IAAI,CAAC,gBAAgB,IAAI,IAAI,CAAC,MAAM,EAAE;YACxC,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAW,CAAC,CAAC,CAAC;SACrE;IACH,CAAC;IAED,iEAAiE;IACvD,aAAa,CAAC,KAAuB,IAAS,CAAC;IAEzD,iEAAiE;IACvD,UAAU,CAAC,KAAQ,IAAS,CAAC;IAE/B,mBAAmB;QACzB,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE;YACd,MAAM,IAAI,KAAK,CAAC,wDAAwD,CAAC,CAAC;SAC3E;QACD,OAAO,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC;IACnC,CAAC;IAED;;;;OAIG;IACH,YAAY,CAAC,OAA2B;QACtC,MAAM,cAAc,GAAG,QAAQ,CAAC,gBAAgB,EAAE,CAAC;QACnD,wBAAwB,CACtB,mBAAmB,EACnB,IAAI,CAAC,kBAAkB,EACvB,cAAc,CAAC,iBAAiB,EAChC,OAAO,CAAC,iBAAiB,CAC1B,CAAC;QACF,wBAAwB,CACtB,iBAAiB,EACjB,IAAI,CAAC,gBAAgB,EACrB,cAAc,CAAC,eAA0B,EACzC,OAAO,CAAC,eAAe,CACxB,CAAC;QACF,wBAAwB,CACtB,aAAa,EACb,IAAI,CAAC,YAAY,EACjB,cAAc,CAAC,WAAsB,EACrC,OAAO,CAAC,WAAW,CACpB,CAAC;QACF,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC;QACzC,IAAI,OAAO,CAAC,YAAY,IAAI,IAAI,CAAC,MAAM,EAAE;YACvC,kBAAkB,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;SACvD;IACH,CAAC;IAED;;;;;;OAMG;IACH,aAAa,CACX,UAAuE;QAEvE,KAAK,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;QAE9B,IAAI,IAAI,CAAC,YAAY,KAAK,UAAU,CAAC,SAAS,EAAE;YAC9C,MAAM,IAAI,KAAK,CACb,yEAAyE,CAC1E,CAAC;SACH;QAED,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE;YACvC,EAAE,EAAE,CAAC;QACP,CAAC,CAAC,CAAC;QACH,IAAI,IAAI,CAAC,WAAW,EAAE;YACpB,iBAAiB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;SACrC;QACD,IAAI,IAAI,CAAC,MAAM,EAAE;YACf,IAAI,CAAC,MAAM,CAAC,iBAAiB,EAAE,CAAC,CAAC,4CAA4C;SAC9E;QAED,IAAI,CAAC,WAAW,GAAI,UAAoC,CACtD,oBAAoB,CACrB;YACC,CAAC,CAAE,UAAoC;YACvC,CAAC,CAAC,sBAAsB,CACpB,UAAU,EACV,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,EACnC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,EAC9B,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,CACjC,CAAC;QAEN,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YACpC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QACxB,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,oBAAoB,GAAG;YAC1B,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,gBAAgB,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACnE,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,gBAAgB,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACvE,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,gBAAgB,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SAC1E,CAAC;QAEF,IACG,IAAI,CAAC,WAA2D,CAAC,KAAK,EACvE;YACA,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAE1B,IAAI,CAAC,WACN,CAAC,KAAK,CAAC,gBAAgB,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CACrD,CAAC;SACH;QACD,IAAI,CAAC,iBAAiB,CAAC,UAAU,EAAE,CAAC;IACtC,CAAC;IAED,MAAM,CAAC,GAAW;QAChB,IAAI,IAAI,CAAC,IAAI,EAAE;YACb,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;SACvC;QACD,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC;QAChB,IAAI,CAAC,sBAAsB,GAAG,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,gBAAgB,CACpE,CAAC,MAAM,EAAE,EAAE;YACT,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAC5C,CAAC,CACF,CAAC;QACF,IAAI,IAAI,CAAC,MAAM,EAAE;YACf,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;SACnC;IACH,CAAC;IAES,gBAAgB,CAAC,MAAc;QACvC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE;YACd,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;SACrE;QACD,MAAM,aAAa,GAAG,IAAI,CAAC,kBAAkB;YAC3C,CAAC,CAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAEhC;YACJ,CAAC,CAAC,IAAI,CAAC;QAET,IAAI,IAAI,GAAa,IAAI,CAAC;QAC1B,IAAI,aAAa,IAAI,aAAa,YAAY,qBAAqB,EAAE;YACnE,IAAI,GAAG,0BAA0B,CAC/B,aAAa,EACb,MAAiC,CAClC,CAAC;SACH;QACD,OAAO,OAAO,CAAC,OAAO,CAAC,CAAC,IAAI,IAAI,MAAM,CAAM,CAAC,CAAC;IAChD,CAAC;IAES,cAAc,CAAC,IAAO;QAC9B,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAA6B,CAAC;QAC5E,IAAI,IAAI,CAAC,gBAAgB,IAAI,IAAI,CAAC,MAAM,EAAE;YACxC,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,cAAc,CACxC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAW,CAClC,CAAC;YACF,IAAI,OAAO,EAAE;gBACX,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,GAAG,mBAAmB,CAAC,OAAO,CAAC,CAAC;aAC9D;SACF;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,eAAe,CAAC,QAAgB;QAC9B,IAAI,IAAI,CAAC,WAAW,CAAC,IAAI,KAAK,CAAC,EAAE;YAC/B,OAAO,IAAI,CAAC;SACb;QAED,OAAO;YACL,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,KAAK,EAAE,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,QAAQ,CAAC;SACjD,CAAC;IACJ,CAAC;IAED,MAAM;QACJ,MAAM,MAAM,GAAuB,KAAK,CAAC,MAAM,EAAE,CAAC;QAElD,MAAM,cAAc,GAAG,QAAQ,CAAC,gBAAgB,EAAE,CAAC;QACnD,IAAI,IAAI,CAAC,KAAK,KAAK,IAAI,CAAC,IAAI,EAAE;YAC5B,MAAM,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;SAC3B;QACD,IAAI,IAAI,CAAC,gBAAgB,KAAK,cAAc,CAAC,eAAe,EAAE;YAC5D,MAAM,CAAC,eAAe,GAAG,IAAI,CAAC,gBAAgB,CAAC;SAChD;QACD,IAAI,IAAI,CAAC,kBAAkB,KAAK,cAAc,CAAC,iBAAiB,EAAE;YAChE,MAAM,CAAC,iBAAiB,GAAG,IAAI,CAAC,kBAAkB,CAAC;SACpD;QACD,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE;YAC9C,MAAM,CAAC,YAAY,GAAG,EAAE,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC;SACjD;QACD,IAAI,IAAI,CAAC,YAAY,KAAK,cAAc,CAAC,WAAW,EAAE;YACpD,MAAM,CAAC,WAAW,GAAG,IAAI,CAAC,YAAY,CAAC;SACxC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,OAAO;QACL,KAAK,CAAC,OAAO,EAAE,CAAC;QAChB,IAAI,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM,EAAE;YAC5B,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;SACtC;QACD,IAAI,IAAI,CAAC,MAAM,EAAE;YACf,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;SACvB;QAED,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE;YACvC,EAAE,EAAE,CAAC;QACP,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QACpC,IAAI,CAAC,sBAAsB,EAAE,CAAC;QAC9B,IAAI,CAAC,sBAAsB,GAAG,GAAS,EAAE,GAAE,CAAC,CAAC;QAC7C,iBAAiB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QACpC,IAAI,CAAC,kBAAkB,CAAC,OAAO,EAAE,CAAC;QAClC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;CACF;AAED,eAAe,QAAQ,CAAC;AACxB,qBAAqB,CAAC,aAAa,CAAC,QAAQ,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC"}
|
|
@@ -11,12 +11,14 @@ class FeatureProviderInteraction extends AbstractInteraction {
|
|
|
11
11
|
// eslint-disable-next-line class-methods-use-this
|
|
12
12
|
async pipe(event) {
|
|
13
13
|
if (!event.feature) {
|
|
14
|
-
const layersWithProvider = [...event.map.layerCollection]
|
|
14
|
+
const layersWithProvider = [...event.map.layerCollection]
|
|
15
|
+
.filter((l) => {
|
|
15
16
|
return (l.featureProvider &&
|
|
16
17
|
l.active &&
|
|
17
18
|
l.isSupported(event.map) &&
|
|
18
19
|
l.featureProvider.isSupported(event.map));
|
|
19
|
-
})
|
|
20
|
+
})
|
|
21
|
+
.reverse();
|
|
20
22
|
if (layersWithProvider.length > 0) {
|
|
21
23
|
const resolution = event.map.getCurrentResolution(event.position);
|
|
22
24
|
const features = (await Promise.all(layersWithProvider.map((l) => l.featureProvider?.getFeaturesByCoordinate?.(event.position, resolution)))).flat();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"featureProviderInteraction.js","sourceRoot":"","sources":["../../../src/interaction/featureProviderInteraction.ts"],"names":[],"mappings":"AAEA,OAAO,mBAEN,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,SAAS,EACT,mBAAmB,EACnB,cAAc,GACf,MAAM,sBAAsB,CAAC;AAE9B;;GAEG;AACH,MAAM,0BAA2B,SAAQ,mBAAmB;IAC1D;QACE,KAAK,CAAC,SAAS,CAAC,KAAK,EAAE,mBAAmB,CAAC,GAAG,EAAE,cAAc,CAAC,GAAG,CAAC,CAAC;QAEpE,IAAI,CAAC,SAAS,EAAE,CAAC;IACnB,CAAC;IAED,kDAAkD;IAClD,KAAK,CAAC,IAAI,CAAC,KAAuB;QAChC,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE;YAClB,MAAM,kBAAkB,GAAG,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC,eAAe,CAAC,
|
|
1
|
+
{"version":3,"file":"featureProviderInteraction.js","sourceRoot":"","sources":["../../../src/interaction/featureProviderInteraction.ts"],"names":[],"mappings":"AAEA,OAAO,mBAEN,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,SAAS,EACT,mBAAmB,EACnB,cAAc,GACf,MAAM,sBAAsB,CAAC;AAE9B;;GAEG;AACH,MAAM,0BAA2B,SAAQ,mBAAmB;IAC1D;QACE,KAAK,CAAC,SAAS,CAAC,KAAK,EAAE,mBAAmB,CAAC,GAAG,EAAE,cAAc,CAAC,GAAG,CAAC,CAAC;QAEpE,IAAI,CAAC,SAAS,EAAE,CAAC;IACnB,CAAC;IAED,kDAAkD;IAClD,KAAK,CAAC,IAAI,CAAC,KAAuB;QAChC,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE;YAClB,MAAM,kBAAkB,GAAG,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC,eAAe,CAAC;iBACtD,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE;gBACZ,OAAO,CACL,CAAC,CAAC,eAAe;oBACjB,CAAC,CAAC,MAAM;oBACR,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC;oBACxB,CAAC,CAAC,eAAe,CAAC,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CACzC,CAAC;YACJ,CAAC,CAAC;iBACD,OAAO,EAAE,CAAC;YAEb,IAAI,kBAAkB,CAAC,MAAM,GAAG,CAAC,EAAE;gBACjC,MAAM,UAAU,GAAG,KAAK,CAAC,GAAG,CAAC,oBAAoB,CAC/C,KAAK,CAAC,QAAsB,CAC7B,CAAC;gBACF,MAAM,QAAQ,GAAG,CACf,MAAM,OAAO,CAAC,GAAG,CACf,kBAAkB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAC3B,CAAC,CAAC,eAAe,EAAE,uBAAuB,EAAE,CAC1C,KAAK,CAAC,QAAsB,EAC5B,UAAU,CACX,CACF,CACF,CACF,CAAC,IAAI,EAAE,CAAC;gBAET,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;oBACvB,KAAK,CAAC,OAAO,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;iBAC7B;aACF;SACF;QACD,OAAO,KAAK,CAAC;IACf,CAAC;CACF;AAED,eAAe,0BAA0B,CAAC"}
|
|
@@ -9,6 +9,7 @@ import type { FeatureLayerImplementation } from '../featureLayer.js';
|
|
|
9
9
|
import type StyleItem from '../../style/styleItem.js';
|
|
10
10
|
import GlobalHider from '../globalHider.js';
|
|
11
11
|
export declare const cesiumTilesetLastUpdated: unique symbol;
|
|
12
|
+
export declare const updateFeatureOverride: unique symbol;
|
|
12
13
|
export declare function getExtentFromTileset(cesium3DTileset?: Cesium3DTileset): OLExtent;
|
|
13
14
|
/**
|
|
14
15
|
* represents the cesium implementation for a {@link CesiumTilesetLayer} layer.
|
|
@@ -2,10 +2,11 @@ import { Composite3DTileContent, Cesium3DTileset, Cesium3DTileColorBlendMode, Ma
|
|
|
2
2
|
import { createEmpty } from 'ol/extent.js';
|
|
3
3
|
import LayerImplementation from '../layerImplementation.js';
|
|
4
4
|
import { vcsLayerName } from '../layerSymbols.js';
|
|
5
|
-
import { originalStyle, updateOriginalStyle, } from '../featureVisibility.js';
|
|
5
|
+
import { hideFeature, highlightFeature, originalStyle, updateOriginalStyle, } from '../featureVisibility.js';
|
|
6
6
|
import Projection from '../../util/projection.js';
|
|
7
7
|
import { circleFromCenterRadius } from '../../util/geometryHelpers.js';
|
|
8
8
|
export const cesiumTilesetLastUpdated = Symbol('cesiumTilesetLastUpdated');
|
|
9
|
+
export const updateFeatureOverride = Symbol('updateFeatureOverride');
|
|
9
10
|
export function getExtentFromTileset(cesium3DTileset) {
|
|
10
11
|
if (!cesium3DTileset) {
|
|
11
12
|
return createEmpty();
|
|
@@ -68,8 +69,15 @@ class CesiumTilesetCesiumImpl extends LayerImplementation {
|
|
|
68
69
|
}
|
|
69
70
|
async initialize() {
|
|
70
71
|
if (!this._initializedPromise) {
|
|
71
|
-
this._initializedPromise = Cesium3DTileset.fromUrl(this.url,
|
|
72
|
+
this._initializedPromise = Cesium3DTileset.fromUrl(this.url, {
|
|
73
|
+
...this.tilesetOptions,
|
|
74
|
+
show: false, // show is handled by activate
|
|
75
|
+
});
|
|
72
76
|
this.cesium3DTileset = await this._initializedPromise;
|
|
77
|
+
if (this.isDestroyed) {
|
|
78
|
+
this.cesium3DTileset.destroy();
|
|
79
|
+
return;
|
|
80
|
+
}
|
|
73
81
|
if (this.tilesetProperties) {
|
|
74
82
|
this.tilesetProperties.forEach(({ key, value }) => {
|
|
75
83
|
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
@@ -81,6 +89,8 @@ class CesiumTilesetCesiumImpl extends LayerImplementation {
|
|
|
81
89
|
this.cesium3DTileset.tileVisible.addEventListener(this.applyStyle.bind(this));
|
|
82
90
|
this.cesium3DTileset.tileUnload.addEventListener((tile) => {
|
|
83
91
|
delete tile[cesiumTilesetLastUpdated];
|
|
92
|
+
delete tile.content[cesiumTilesetLastUpdated];
|
|
93
|
+
delete tile.content[updateFeatureOverride];
|
|
84
94
|
});
|
|
85
95
|
this._originalOrigin = Cartesian3.clone(this.cesium3DTileset.boundingSphere.center);
|
|
86
96
|
if (this.modelMatrix) {
|
|
@@ -197,7 +207,14 @@ class CesiumTilesetCesiumImpl extends LayerImplementation {
|
|
|
197
207
|
content[cesiumTilesetLastUpdated] <
|
|
198
208
|
(this.globalHider?.lastUpdated ?? 0) ||
|
|
199
209
|
content[cesiumTilesetLastUpdated] < this._styleLastUpdated) {
|
|
210
|
+
// content[updateFeatureOverride]?.reset();
|
|
211
|
+
delete content[updateFeatureOverride];
|
|
200
212
|
const batchSize = content.featuresLength;
|
|
213
|
+
const featureOverride = {
|
|
214
|
+
hideLocal: [],
|
|
215
|
+
hideGlobal: [],
|
|
216
|
+
highlight: [],
|
|
217
|
+
};
|
|
201
218
|
for (let batchId = 0; batchId < batchSize; batchId++) {
|
|
202
219
|
const feature = content.getFeature(batchId);
|
|
203
220
|
if (feature) {
|
|
@@ -205,27 +222,57 @@ class CesiumTilesetCesiumImpl extends LayerImplementation {
|
|
|
205
222
|
if (!id) {
|
|
206
223
|
id = `${content.url}${batchId}`;
|
|
207
224
|
}
|
|
225
|
+
let shouldUpdateOriginalStyle = true;
|
|
208
226
|
if (this.featureVisibility.highlightedObjects[id] &&
|
|
209
227
|
!this.featureVisibility.hasHighlightFeature(id, feature)) {
|
|
210
228
|
this.featureVisibility.addHighlightFeature(id, feature);
|
|
229
|
+
featureOverride.highlight.push([id, feature]);
|
|
230
|
+
shouldUpdateOriginalStyle = false;
|
|
211
231
|
}
|
|
212
232
|
if (this.featureVisibility.hiddenObjects[id] &&
|
|
213
233
|
!this.featureVisibility.hasHiddenFeature(id, feature)) {
|
|
214
234
|
this.featureVisibility.addHiddenFeature(id, feature);
|
|
235
|
+
featureOverride.hideLocal.push([id, feature]);
|
|
215
236
|
}
|
|
216
237
|
if (this.globalHider?.hiddenObjects[id] &&
|
|
217
238
|
!this.globalHider?.hasFeature(id, feature)) {
|
|
218
239
|
this.globalHider?.addFeature(id, feature);
|
|
240
|
+
featureOverride.hideGlobal.push([id, feature]);
|
|
219
241
|
}
|
|
220
|
-
if (
|
|
242
|
+
if (shouldUpdateOriginalStyle &&
|
|
243
|
+
this._styleLastUpdated > (content[cesiumTilesetLastUpdated] ?? 0) &&
|
|
221
244
|
feature[originalStyle] // can only be a color for cesium, so no check for undefined required
|
|
222
245
|
) {
|
|
223
246
|
updateOriginalStyle(feature);
|
|
224
247
|
}
|
|
225
248
|
}
|
|
226
249
|
}
|
|
250
|
+
if (featureOverride.hideLocal.length > 0 ||
|
|
251
|
+
featureOverride.hideGlobal.length > 0 ||
|
|
252
|
+
featureOverride.highlight.length > 0) {
|
|
253
|
+
content[updateFeatureOverride] = () => {
|
|
254
|
+
featureOverride.hideGlobal.forEach(([id, feature]) => {
|
|
255
|
+
if (this.globalHider?.hasFeature(id, feature)) {
|
|
256
|
+
hideFeature(feature);
|
|
257
|
+
}
|
|
258
|
+
});
|
|
259
|
+
featureOverride.hideLocal.forEach(([id, feature]) => {
|
|
260
|
+
if (this.featureVisibility.hasHiddenFeature(id, feature)) {
|
|
261
|
+
hideFeature(feature);
|
|
262
|
+
}
|
|
263
|
+
});
|
|
264
|
+
featureOverride.highlight.forEach(([id, feature]) => {
|
|
265
|
+
if (this.featureVisibility.hasHighlightFeature(id, feature)) {
|
|
266
|
+
highlightFeature(feature);
|
|
267
|
+
}
|
|
268
|
+
});
|
|
269
|
+
};
|
|
270
|
+
}
|
|
227
271
|
content[cesiumTilesetLastUpdated] = Date.now();
|
|
228
272
|
}
|
|
273
|
+
else {
|
|
274
|
+
content[updateFeatureOverride]?.();
|
|
275
|
+
}
|
|
229
276
|
}
|
|
230
277
|
destroy() {
|
|
231
278
|
if (this.cesium3DTileset) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cesiumTilesetCesiumImpl.js","sourceRoot":"","sources":["../../../../src/layer/cesium/cesiumTilesetCesiumImpl.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"cesiumTilesetCesiumImpl.js","sourceRoot":"","sources":["../../../../src/layer/cesium/cesiumTilesetCesiumImpl.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,6 @@ import RasterLayerCesiumImpl from './rasterLayerCesiumImpl.js';
|
|
|
5
5
|
*/
|
|
6
6
|
declare class OpenStreetMapCesiumImpl extends RasterLayerCesiumImpl {
|
|
7
7
|
static get className(): string;
|
|
8
|
-
getCesiumLayer(): CesiumImageryLayer
|
|
8
|
+
getCesiumLayer(): Promise<CesiumImageryLayer>;
|
|
9
9
|
}
|
|
10
10
|
export default OpenStreetMapCesiumImpl;
|
|
@@ -8,10 +8,10 @@ class OpenStreetMapCesiumImpl extends RasterLayerCesiumImpl {
|
|
|
8
8
|
return 'OpenStreetMapCesiumImpl';
|
|
9
9
|
}
|
|
10
10
|
getCesiumLayer() {
|
|
11
|
-
return new CesiumImageryLayer(new OpenStreetMapImageryProvider({ maximumLevel: this.maxLevel }), {
|
|
11
|
+
return Promise.resolve(new CesiumImageryLayer(new OpenStreetMapImageryProvider({ maximumLevel: this.maxLevel }), {
|
|
12
12
|
alpha: this.opacity,
|
|
13
13
|
splitDirection: this.splitDirection,
|
|
14
|
-
});
|
|
14
|
+
}));
|
|
15
15
|
}
|
|
16
16
|
}
|
|
17
17
|
export default OpenStreetMapCesiumImpl;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openStreetMapCesiumImpl.js","sourceRoot":"","sources":["../../../../src/layer/cesium/openStreetMapCesiumImpl.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,4BAA4B,EAC5B,YAAY,IAAI,kBAAkB,GACnC,MAAM,sBAAsB,CAAC;AAC9B,OAAO,qBAAqB,MAAM,4BAA4B,CAAC;AAE/D;;GAEG;AACH,MAAM,uBAAwB,SAAQ,qBAAqB;IACzD,MAAM,KAAK,SAAS;QAClB,OAAO,yBAAyB,CAAC;IACnC,CAAC;IAED,cAAc;QACZ,OAAO,IAAI,kBAAkB,
|
|
1
|
+
{"version":3,"file":"openStreetMapCesiumImpl.js","sourceRoot":"","sources":["../../../../src/layer/cesium/openStreetMapCesiumImpl.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,4BAA4B,EAC5B,YAAY,IAAI,kBAAkB,GACnC,MAAM,sBAAsB,CAAC;AAC9B,OAAO,qBAAqB,MAAM,4BAA4B,CAAC;AAE/D;;GAEG;AACH,MAAM,uBAAwB,SAAQ,qBAAqB;IACzD,MAAM,KAAK,SAAS;QAClB,OAAO,yBAAyB,CAAC;IACnC,CAAC;IAED,cAAc;QACZ,OAAO,OAAO,CAAC,OAAO,CACpB,IAAI,kBAAkB,CACpB,IAAI,4BAA4B,CAAC,EAAE,YAAY,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,EACjE;YACE,KAAK,EAAE,IAAI,CAAC,OAAO;YACnB,cAAc,EAAE,IAAI,CAAC,cAAc;SACpC,CACF,CACF,CAAC;IACJ,CAAC;CACF;AAED,eAAe,uBAAuB,CAAC"}
|
|
@@ -15,7 +15,7 @@ declare class RasterLayerCesiumImpl extends LayerImplementation<CesiumMap> imple
|
|
|
15
15
|
constructor(map: CesiumMap, options: RasterLayerImplementationOptions);
|
|
16
16
|
initialize(): Promise<void>;
|
|
17
17
|
updateSplitDirection(splitDirection: SplitDirection): void;
|
|
18
|
-
getCesiumLayer(): ImageryLayer
|
|
18
|
+
getCesiumLayer(): Promise<ImageryLayer>;
|
|
19
19
|
activate(): Promise<void>;
|
|
20
20
|
deactivate(): void;
|
|
21
21
|
updateOpacity(opacity: number): void;
|
|
@@ -20,9 +20,13 @@ class RasterLayerCesiumImpl extends LayerImplementation {
|
|
|
20
20
|
this.opacity = options.opacity;
|
|
21
21
|
this.tilingSchema = options.tilingSchema;
|
|
22
22
|
}
|
|
23
|
-
initialize() {
|
|
23
|
+
async initialize() {
|
|
24
24
|
if (!this.initialized) {
|
|
25
|
-
this.cesiumLayer = this.getCesiumLayer();
|
|
25
|
+
this.cesiumLayer = await this.getCesiumLayer();
|
|
26
|
+
if (this.isDestroyed) {
|
|
27
|
+
this.cesiumLayer.destroy();
|
|
28
|
+
return Promise.resolve();
|
|
29
|
+
}
|
|
26
30
|
this.cesiumLayer[vcsLayerName] = this.name;
|
|
27
31
|
this.cesiumLayer.show = false;
|
|
28
32
|
this.map.addImageryLayer(this.cesiumLayer);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rasterLayerCesiumImpl.js","sourceRoot":"","sources":["../../../../src/layer/cesium/rasterLayerCesiumImpl.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,mBAAmB,MAAM,2BAA2B,CAAC;AAS5D,MAAM,qBACJ,SAAQ,mBAA8B;IAGtC,MAAM,KAAK,SAAS;QAClB,OAAO,uBAAuB,CAAC;IACjC,CAAC;IAED,WAAW,GAAwB,IAAI,CAAC;IAExC,cAAc,CAAiB;IAE/B,QAAQ,CAAS;IAEjB,QAAQ,CAAS;IAEjB,MAAM,CAAqB;IAE3B,OAAO,CAAS;IAEhB,YAAY,CAAe;IAE3B,YAAY,GAAc,EAAE,OAAyC;QACnE,KAAK,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QACpB,IAAI,CAAC,cAAc,GAAG,OAAO,CAAC,cAAc,CAAC;QAC7C,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;QACjC,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;QACjC,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;QAC7B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;QAC/B,IAAI,CAAC,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC;IAC3C,CAAC;IAED,UAAU;
|
|
1
|
+
{"version":3,"file":"rasterLayerCesiumImpl.js","sourceRoot":"","sources":["../../../../src/layer/cesium/rasterLayerCesiumImpl.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,6 +9,6 @@ declare class SingleImageCesiumImpl extends RasterLayerCesiumImpl {
|
|
|
9
9
|
static get className(): string;
|
|
10
10
|
credit: string | undefined;
|
|
11
11
|
constructor(map: CesiumMap, options: SingleImageImplementationOptions);
|
|
12
|
-
getCesiumLayer(): ImageryLayer
|
|
12
|
+
getCesiumLayer(): Promise<ImageryLayer>;
|
|
13
13
|
}
|
|
14
14
|
export default SingleImageCesiumImpl;
|
|
@@ -13,16 +13,15 @@ class SingleImageCesiumImpl extends RasterLayerCesiumImpl {
|
|
|
13
13
|
super(map, options);
|
|
14
14
|
this.credit = options.credit;
|
|
15
15
|
}
|
|
16
|
-
getCesiumLayer() {
|
|
16
|
+
async getCesiumLayer() {
|
|
17
17
|
const options = {
|
|
18
|
-
url: this.url,
|
|
19
18
|
credit: this.credit,
|
|
20
19
|
};
|
|
21
20
|
const extent = this.extent?.getCoordinatesInProjection(wgs84Projection);
|
|
22
21
|
if (extent) {
|
|
23
22
|
options.rectangle = Rectangle.fromDegrees(extent[0], extent[1], extent[2], extent[3]);
|
|
24
23
|
}
|
|
25
|
-
const imageryProvider =
|
|
24
|
+
const imageryProvider = await SingleTileImageryProvider.fromUrl(this.url, options);
|
|
26
25
|
const layerOptions = {
|
|
27
26
|
rectangle: options.rectangle,
|
|
28
27
|
alpha: this.opacity,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"singleImageCesiumImpl.js","sourceRoot":"","sources":["../../../../src/layer/cesium/singleImageCesiumImpl.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EACT,yBAAyB,EACzB,YAAY,GACb,MAAM,sBAAsB,CAAC;AAC9B,OAAO,qBAAqB,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAI3D;;GAEG;AACH,MAAM,qBAAsB,SAAQ,qBAAqB;IACvD,MAAM,KAAK,SAAS;QAClB,OAAO,uBAAuB,CAAC;IACjC,CAAC;IAED,MAAM,CAAqB;IAE3B,YAAY,GAAc,EAAE,OAAyC;QACnE,KAAK,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QACpB,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAC/B,CAAC;IAED,cAAc;
|
|
1
|
+
{"version":3,"file":"singleImageCesiumImpl.js","sourceRoot":"","sources":["../../../../src/layer/cesium/singleImageCesiumImpl.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EACT,yBAAyB,EACzB,YAAY,GACb,MAAM,sBAAsB,CAAC;AAC9B,OAAO,qBAAqB,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAI3D;;GAEG;AACH,MAAM,qBAAsB,SAAQ,qBAAqB;IACvD,MAAM,KAAK,SAAS;QAClB,OAAO,uBAAuB,CAAC;IACjC,CAAC;IAED,MAAM,CAAqB;IAE3B,YAAY,GAAc,EAAE,OAAyC;QACnE,KAAK,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QACpB,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAC/B,CAAC;IAED,KAAK,CAAC,cAAc;QAClB,MAAM,OAAO,GAA6C;YACxD,MAAM,EAAE,IAAI,CAAC,MAAM;SACpB,CAAC;QAEF,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,EAAE,0BAA0B,CAAC,eAAe,CAAC,CAAC;QACxE,IAAI,MAAM,EAAE;YACV,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC,WAAW,CACvC,MAAM,CAAC,CAAC,CAAC,EACT,MAAM,CAAC,CAAC,CAAC,EACT,MAAM,CAAC,CAAC,CAAC,EACT,MAAM,CAAC,CAAC,CAAC,CACV,CAAC;SACH;QAED,MAAM,eAAe,GAAG,MAAM,yBAAyB,CAAC,OAAO,CAC7D,IAAI,CAAC,GAAI,EACT,OAAO,CACR,CAAC;QACF,MAAM,YAAY,GAAG;YACnB,SAAS,EAAE,OAAO,CAAC,SAAS;YAC5B,KAAK,EAAE,IAAI,CAAC,OAAO;YACnB,YAAY,EAAE,GAAG;YACjB,cAAc,EAAE,IAAI,CAAC,cAAc;SACpC,CAAC;QACF,OAAO,IAAI,YAAY,CAAC,eAAe,EAAE,YAAY,CAAC,CAAC;IACzD,CAAC;CACF;AAED,eAAe,qBAAqB,CAAC"}
|
|
@@ -9,6 +9,6 @@ declare class TmsCesiumImpl extends RasterLayerCesiumImpl {
|
|
|
9
9
|
static get className(): string;
|
|
10
10
|
format: string;
|
|
11
11
|
constructor(map: CesiumMap, options: TMSImplementationOptions);
|
|
12
|
-
getCesiumLayer(): CesiumImageryLayer
|
|
12
|
+
getCesiumLayer(): Promise<CesiumImageryLayer>;
|
|
13
13
|
}
|
|
14
14
|
export default TmsCesiumImpl;
|
|
@@ -14,9 +14,8 @@ class TmsCesiumImpl extends RasterLayerCesiumImpl {
|
|
|
14
14
|
super(map, options);
|
|
15
15
|
this.format = options.format;
|
|
16
16
|
}
|
|
17
|
-
getCesiumLayer() {
|
|
17
|
+
async getCesiumLayer() {
|
|
18
18
|
const options = {
|
|
19
|
-
url: this.url,
|
|
20
19
|
fileExtension: this.format,
|
|
21
20
|
maximumLevel: this.maxLevel,
|
|
22
21
|
minimumLevel: this.minLevel,
|
|
@@ -31,7 +30,7 @@ class TmsCesiumImpl extends RasterLayerCesiumImpl {
|
|
|
31
30
|
if (this.tilingSchema === TilingScheme.GEOGRAPHIC) {
|
|
32
31
|
options.tilingScheme = new GeographicTilingScheme();
|
|
33
32
|
}
|
|
34
|
-
const imageryProvider =
|
|
33
|
+
const imageryProvider = await TileMapServiceImageryProvider.fromUrl(this.url, options);
|
|
35
34
|
const layerOptions = {
|
|
36
35
|
alpha: this.opacity,
|
|
37
36
|
splitDirection: this.splitDirection,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tmsCesiumImpl.js","sourceRoot":"","sources":["../../../../src/layer/cesium/tmsCesiumImpl.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EACT,sBAAsB,EACtB,6BAA6B,EAC7B,YAAY,IAAI,kBAAkB,GACnC,MAAM,sBAAsB,CAAC;AAC9B,OAAO,qBAAqB,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAIjD;;GAEG;AACH,MAAM,aAAc,SAAQ,qBAAqB;IAC/C,MAAM,KAAK,SAAS;QAClB,OAAO,eAAe,CAAC;IACzB,CAAC;IAED,MAAM,CAAS;IAEf,YAAY,GAAc,EAAE,OAAiC;QAC3D,KAAK,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QACpB,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAC/B,CAAC;IAED,cAAc;
|
|
1
|
+
{"version":3,"file":"tmsCesiumImpl.js","sourceRoot":"","sources":["../../../../src/layer/cesium/tmsCesiumImpl.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EACT,sBAAsB,EACtB,6BAA6B,EAC7B,YAAY,IAAI,kBAAkB,GACnC,MAAM,sBAAsB,CAAC;AAC9B,OAAO,qBAAqB,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAIjD;;GAEG;AACH,MAAM,aAAc,SAAQ,qBAAqB;IAC/C,MAAM,KAAK,SAAS;QAClB,OAAO,eAAe,CAAC;IACzB,CAAC;IAED,MAAM,CAAS;IAEf,YAAY,GAAc,EAAE,OAAiC;QAC3D,KAAK,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QACpB,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAC/B,CAAC;IAED,KAAK,CAAC,cAAc;QAClB,MAAM,OAAO,GAAqD;YAChE,aAAa,EAAE,IAAI,CAAC,MAAM;YAC1B,YAAY,EAAE,IAAI,CAAC,QAAQ;YAC3B,YAAY,EAAE,IAAI,CAAC,QAAQ;YAC3B,6DAA6D;YAC7D,aAAa;YACb,IAAI,EAAE,KAAK;SACZ,CAAC;QAEF,IAAI,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE;YACxC,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,0BAA0B,CAAC,eAAe,CAAC,CAAC;YACvE,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC,WAAW,CACvC,MAAM,CAAC,CAAC,CAAC,EACT,MAAM,CAAC,CAAC,CAAC,EACT,MAAM,CAAC,CAAC,CAAC,EACT,MAAM,CAAC,CAAC,CAAC,CACV,CAAC;SACH;QACD,IAAI,IAAI,CAAC,YAAY,KAAK,YAAY,CAAC,UAAU,EAAE;YACjD,OAAO,CAAC,YAAY,GAAG,IAAI,sBAAsB,EAAE,CAAC;SACrD;QACD,MAAM,eAAe,GAAG,MAAM,6BAA6B,CAAC,OAAO,CACjE,IAAI,CAAC,GAAI,EACT,OAAO,CACR,CAAC;QACF,MAAM,YAAY,GAAG;YACnB,KAAK,EAAE,IAAI,CAAC,OAAO;YACnB,cAAc,EAAE,IAAI,CAAC,cAAc;SACpC,CAAC;QAEF,OAAO,IAAI,kBAAkB,CAAC,eAAe,EAAE,YAAY,CAAC,CAAC;IAC/D,CAAC;CACF;AAED,eAAe,aAAa,CAAC"}
|
|
@@ -42,13 +42,15 @@ class VectorCesiumImpl extends LayerImplementation {
|
|
|
42
42
|
}
|
|
43
43
|
_addListeners() {
|
|
44
44
|
this._olListeners.push(this.source.on('addfeature', (event) => {
|
|
45
|
-
|
|
45
|
+
// eslint-disable-next-line no-void
|
|
46
|
+
void this._addFeature(event.feature);
|
|
46
47
|
}));
|
|
47
48
|
this._olListeners.push(this.source.on('removefeature', (event) => {
|
|
48
49
|
this._removeFeature(event.feature);
|
|
49
50
|
}));
|
|
50
51
|
this._olListeners.push(this.source.on('changefeature', (event) => {
|
|
51
|
-
|
|
52
|
+
// eslint-disable-next-line no-void
|
|
53
|
+
void this._featureChanged(event.feature);
|
|
52
54
|
}));
|
|
53
55
|
this._removeVectorPropertiesChangeHandler =
|
|
54
56
|
this.vectorProperties.propertyChanged.addEventListener(this.refresh.bind(this));
|
|
@@ -63,7 +65,7 @@ class VectorCesiumImpl extends LayerImplementation {
|
|
|
63
65
|
if (!this.initialized) {
|
|
64
66
|
this._scene = this.map.getScene();
|
|
65
67
|
this._addListeners();
|
|
66
|
-
this._addFeatures(this.source.getFeatures());
|
|
68
|
+
await this._addFeatures(this.source.getFeatures());
|
|
67
69
|
await this._setupContext(this.map);
|
|
68
70
|
}
|
|
69
71
|
await super.initialize();
|
|
@@ -71,19 +73,18 @@ class VectorCesiumImpl extends LayerImplementation {
|
|
|
71
73
|
this.updateSplitDirection(this.splitDirection);
|
|
72
74
|
}
|
|
73
75
|
}
|
|
74
|
-
_addFeatures(features) {
|
|
76
|
+
async _addFeatures(features) {
|
|
75
77
|
// TODO we should make this non-blocking to better handle larger data sets check in RIWA Impl
|
|
76
|
-
features.
|
|
77
|
-
this._addFeature(f);
|
|
78
|
-
});
|
|
78
|
+
await Promise.allSettled(features.map((f) => this._addFeature(f)));
|
|
79
79
|
}
|
|
80
80
|
/**
|
|
81
81
|
* converts a feature and adds the associated primitives to the collection of primitives
|
|
82
82
|
*/
|
|
83
|
-
_addFeature(feature) {
|
|
83
|
+
async _addFeature(feature) {
|
|
84
84
|
if (this.active) {
|
|
85
85
|
// XXX cluster check here? or on init?
|
|
86
|
-
|
|
86
|
+
this._context.features.add(feature);
|
|
87
|
+
await convert(feature, this.style.style, this.vectorProperties, this._context, this._scene);
|
|
87
88
|
}
|
|
88
89
|
else {
|
|
89
90
|
this._featureToAdd.add(feature);
|
|
@@ -92,9 +93,9 @@ class VectorCesiumImpl extends LayerImplementation {
|
|
|
92
93
|
/**
|
|
93
94
|
* Forces a complete re-render of all features.
|
|
94
95
|
*/
|
|
95
|
-
refresh() {
|
|
96
|
+
async refresh() {
|
|
96
97
|
this._context?.clear();
|
|
97
|
-
this._addFeatures(this.source.getFeatures());
|
|
98
|
+
await this._addFeatures(this.source.getFeatures());
|
|
98
99
|
}
|
|
99
100
|
/**
|
|
100
101
|
* removes the primitive of the specified feature
|
|
@@ -106,17 +107,17 @@ class VectorCesiumImpl extends LayerImplementation {
|
|
|
106
107
|
/**
|
|
107
108
|
* called when a features property have changed
|
|
108
109
|
*/
|
|
109
|
-
_featureChanged(feature) {
|
|
110
|
+
async _featureChanged(feature) {
|
|
110
111
|
const cache = this._context.createFeatureCache(feature);
|
|
111
112
|
this._featureToAdd.delete(feature);
|
|
112
|
-
this._addFeature(feature);
|
|
113
|
+
await this._addFeature(feature);
|
|
113
114
|
this._context.clearFeatureCache(cache);
|
|
114
115
|
}
|
|
115
116
|
async activate() {
|
|
116
117
|
if (!this.active) {
|
|
117
118
|
await super.activate();
|
|
118
119
|
if (this.active) {
|
|
119
|
-
this._addFeatures([...this._featureToAdd]);
|
|
120
|
+
await this._addFeatures([...this._featureToAdd]);
|
|
120
121
|
this._featureToAdd.clear();
|
|
121
122
|
this._rootCollection.show = true;
|
|
122
123
|
if (this._featureVisibilityListeners.length === 0) {
|
|
@@ -139,7 +140,8 @@ class VectorCesiumImpl extends LayerImplementation {
|
|
|
139
140
|
if (this.initialized && !silent) {
|
|
140
141
|
const features = this.source.getFeatures().filter((f) => !f.getStyle());
|
|
141
142
|
features.forEach((f) => {
|
|
142
|
-
|
|
143
|
+
// eslint-disable-next-line no-void
|
|
144
|
+
void this._featureChanged(f);
|
|
143
145
|
});
|
|
144
146
|
}
|
|
145
147
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vectorCesiumImpl.js","sourceRoot":"","sources":["../../../../src/layer/cesium/vectorCesiumImpl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EACL,mBAAmB,GAGpB,MAAM,sBAAsB,CAAC;AAI9B,OAAO,OAAO,MAAM,wCAAwC,CAAC;AAC7D,OAAO,aAAa,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,mBAAmB,MAAM,2BAA2B,CAAC;AAC5D,OAAO,EAAE,sCAAsC,EAAE,MAAM,qBAAqB,CAAC;AAS7E;;GAEG;AACH,MAAM,gBACJ,SAAQ,mBAA8B;IAGtC,MAAM,KAAK,SAAS;QAClB,OAAO,kBAAkB,CAAC;IAC5B,CAAC;IAED,gBAAgB,CAAmB;IAEnC,MAAM,CAAe;IAErB,cAAc,CAAiB;IAE/B,KAAK,CAAY;IAEjB,iBAAiB,CAAoB;IAE7B,2BAA2B,GAAmB,EAAE,CAAC;IAEzD,kDAAkD;IAC1C,oCAAoC,GAAG,GAAS,EAAE,GAAE,CAAC,CAAC;IAEpD,eAAe,CAAsB;IAEvC,YAAY,GAAgC,EAAE,CAAC;IAEvD;;OAEG;IACK,aAAa,GAAiB,IAAI,GAAG,EAAE,CAAC;IAEtC,QAAQ,GAAyB,IAAI,CAAC;IAExC,MAAM,GAAsB,SAAS,CAAC;IAE9C,WAAW,CAA0B;IAErC,YAAY,GAAc,EAAE,OAAoC;QAC9D,KAAK,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QAEpB,IAAI,CAAC,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,CAAC;QACjD,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;QAC7B,IAAI,CAAC,cAAc,GAAG,OAAO,CAAC,cAAc,CAAC;QAC7C,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;QAC3B,IAAI,CAAC,iBAAiB,GAAG,OAAO,CAAC,iBAAiB,CAAC;QAEnD,IAAI,CAAC,eAAe,GAAG,IAAI,mBAAmB,EAAE,CAAC;QACjD,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;QAClD,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;IACzC,CAAC;IAEO,aAAa;QACnB,IAAI,CAAC,YAAY,CAAC,IAAI,CACpB,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,YAAY,EAAE,CAAC,KAAK,EAAE,EAAE;YACrC,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,OAAkB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"vectorCesiumImpl.js","sourceRoot":"","sources":["../../../../src/layer/cesium/vectorCesiumImpl.ts"],"names":[],"mappings":"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"}
|
|
@@ -43,6 +43,7 @@ declare class VectorContext implements CesiumVectorContext {
|
|
|
43
43
|
featureToScaledPrimitiveMap: Map<Feature, Array<Primitive | GroundPrimitive | GroundPolylinePrimitive | ClassificationPrimitive | Model>>;
|
|
44
44
|
featureToBillboardMap: Map<Feature, Array<Billboard>>;
|
|
45
45
|
featureToLabelMap: Map<Feature, Array<Label>>;
|
|
46
|
+
features: Set<Feature>;
|
|
46
47
|
splitDirection: SplitDirection;
|
|
47
48
|
private _rootCollection;
|
|
48
49
|
private _scaledDirty;
|
|
@@ -91,6 +91,7 @@ class VectorContext {
|
|
|
91
91
|
featureToScaledPrimitiveMap = new Map();
|
|
92
92
|
featureToBillboardMap = new Map();
|
|
93
93
|
featureToLabelMap = new Map();
|
|
94
|
+
features = new Set();
|
|
94
95
|
splitDirection;
|
|
95
96
|
_rootCollection;
|
|
96
97
|
_scaledDirty;
|
|
@@ -109,22 +110,31 @@ class VectorContext {
|
|
|
109
110
|
this._postRenderListener = setupScalingPrimitiveCollection(map, this.scaledPrimitives, this._scaledDirty);
|
|
110
111
|
}
|
|
111
112
|
addPrimitives(primitives, feature, allowPicking = false) {
|
|
112
|
-
|
|
113
|
+
if (this.features.has(feature)) {
|
|
114
|
+
addPrimitiveToContext(primitives, feature, allowPicking, this.primitives, this.featureToPrimitiveMap, this.splitDirection);
|
|
115
|
+
}
|
|
113
116
|
}
|
|
114
117
|
addScaledPrimitives(primitives, feature, allowPicking = false) {
|
|
115
|
-
|
|
116
|
-
|
|
118
|
+
if (this.features.has(feature)) {
|
|
119
|
+
addPrimitiveToContext(primitives, feature, allowPicking, this.scaledPrimitives, this.featureToScaledPrimitiveMap, this.splitDirection);
|
|
120
|
+
this._scaledDirty.value = true;
|
|
121
|
+
}
|
|
117
122
|
}
|
|
118
123
|
addBillboards(billboardOptions, feature, allowPicking = false) {
|
|
119
|
-
|
|
124
|
+
if (this.features.has(feature)) {
|
|
125
|
+
addPrimitiveToContext(billboardOptions, feature, allowPicking, this.billboards, this.featureToBillboardMap, this.splitDirection);
|
|
126
|
+
}
|
|
120
127
|
}
|
|
121
128
|
addLabels(labelOptions, feature, allowPicking = false) {
|
|
122
|
-
|
|
129
|
+
if (this.features.has(feature)) {
|
|
130
|
+
addPrimitiveToContext(labelOptions, feature, allowPicking, this.labels, this.featureToLabelMap, this.splitDirection);
|
|
131
|
+
}
|
|
123
132
|
}
|
|
124
133
|
/**
|
|
125
134
|
* @param feature
|
|
126
135
|
*/
|
|
127
136
|
removeFeature(feature) {
|
|
137
|
+
this.features.delete(feature);
|
|
128
138
|
removeFeatureFromMap(feature, this.featureToPrimitiveMap, this.primitives);
|
|
129
139
|
this._scaledDirty.value = removeFeatureFromMap(feature, this.featureToScaledPrimitiveMap, this.scaledPrimitives);
|
|
130
140
|
removeFeatureFromMap(feature, this.featureToBillboardMap, this.billboards);
|
|
@@ -177,6 +187,7 @@ class VectorContext {
|
|
|
177
187
|
this.featureToPrimitiveMap.clear();
|
|
178
188
|
this._scaledDirty.value = this.featureToScaledPrimitiveMap.size > 0;
|
|
179
189
|
this.featureToScaledPrimitiveMap.clear();
|
|
190
|
+
this.features.clear();
|
|
180
191
|
}
|
|
181
192
|
/**
|
|
182
193
|
* Destroys this context and all its resources
|
|
@@ -194,6 +205,7 @@ class VectorContext {
|
|
|
194
205
|
this.featureToBillboardMap.clear();
|
|
195
206
|
this.featureToLabelMap.clear();
|
|
196
207
|
this.featureToPrimitiveMap.clear();
|
|
208
|
+
this.features.clear();
|
|
197
209
|
this.featureToScaledPrimitiveMap.clear();
|
|
198
210
|
this._postRenderListener();
|
|
199
211
|
}
|