@vcmap/core 5.0.2 → 5.1.0-rc.1
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/cesium.d.ts +257 -0
- package/dist/geojson.d.ts +27 -0
- package/dist/index.d.ts +15 -2
- package/dist/index.js +9 -1
- package/dist/index.js.map +1 -1
- package/dist/ol.d.ts +138 -0
- package/dist/src/classRegistry.js +2 -2
- package/dist/src/classRegistry.js.map +1 -1
- package/dist/src/featureProvider/abstractFeatureProvider.d.ts +2 -1
- package/dist/src/featureProvider/abstractFeatureProvider.js +2 -1
- package/dist/src/featureProvider/abstractFeatureProvider.js.map +1 -1
- package/dist/src/featureProvider/tileProviderFeatureProvider.d.ts +1 -1
- package/dist/src/featureProvider/tileProviderFeatureProvider.js +2 -2
- package/dist/src/featureProvider/tileProviderFeatureProvider.js.map +1 -1
- package/dist/src/featureProvider/wmsFeatureProvider.d.ts +1 -1
- package/dist/src/featureProvider/wmsFeatureProvider.js +4 -3
- package/dist/src/featureProvider/wmsFeatureProvider.js.map +1 -1
- package/dist/src/interaction/eventHandler.js +3 -3
- package/dist/src/interaction/eventHandler.js.map +1 -1
- package/dist/src/interaction/featureProviderInteraction.js +1 -1
- package/dist/src/interaction/featureProviderInteraction.js.map +1 -1
- package/dist/src/layer/cesium/cesiumTilesetCesiumImpl.d.ts +4 -1
- package/dist/src/layer/cesium/cesiumTilesetCesiumImpl.js +31 -2
- package/dist/src/layer/cesium/cesiumTilesetCesiumImpl.js.map +1 -1
- package/dist/src/layer/cesium/resourceHelper.d.ts +2 -0
- package/dist/src/layer/cesium/resourceHelper.js +12 -0
- package/dist/src/layer/cesium/resourceHelper.js.map +1 -0
- package/dist/src/layer/cesium/singleImageCesiumImpl.js +2 -1
- package/dist/src/layer/cesium/singleImageCesiumImpl.js.map +1 -1
- package/dist/src/layer/cesium/terrainCesiumImpl.js +1 -1
- package/dist/src/layer/cesium/terrainCesiumImpl.js.map +1 -1
- package/dist/src/layer/cesium/tmsCesiumImpl.js +2 -1
- package/dist/src/layer/cesium/tmsCesiumImpl.js.map +1 -1
- package/dist/src/layer/cesium/vectorRasterTileCesiumImpl.js +1 -0
- package/dist/src/layer/cesium/vectorRasterTileCesiumImpl.js.map +1 -1
- package/dist/src/layer/cesium/vectorTileImageryProvider.d.ts +2 -0
- package/dist/src/layer/cesium/vectorTileImageryProvider.js +3 -1
- package/dist/src/layer/cesium/vectorTileImageryProvider.js.map +1 -1
- package/dist/src/layer/cesium/wmsCesiumImpl.js +2 -1
- package/dist/src/layer/cesium/wmsCesiumImpl.js.map +1 -1
- package/dist/src/layer/cesium/wmtsCesiumImpl.js +2 -1
- package/dist/src/layer/cesium/wmtsCesiumImpl.js.map +1 -1
- package/dist/src/layer/cesiumTilesetLayer.d.ts +5 -1
- package/dist/src/layer/cesiumTilesetLayer.js +17 -7
- package/dist/src/layer/cesiumTilesetLayer.js.map +1 -1
- package/dist/src/layer/czmlLayer.js +2 -1
- package/dist/src/layer/czmlLayer.js.map +1 -1
- package/dist/src/layer/featureLayer.js +2 -2
- package/dist/src/layer/featureLayer.js.map +1 -1
- package/dist/src/layer/featureStoreLayer.js +8 -5
- package/dist/src/layer/featureStoreLayer.js.map +1 -1
- package/dist/src/layer/featureStoreLayerChanges.d.ts +20 -8
- package/dist/src/layer/featureStoreLayerChanges.js +26 -26
- package/dist/src/layer/featureStoreLayerChanges.js.map +1 -1
- package/dist/src/layer/featureStoreLayerState.d.ts +1 -5
- package/dist/src/layer/featureStoreLayerState.js +0 -9
- package/dist/src/layer/featureStoreLayerState.js.map +1 -1
- package/dist/src/layer/geojsonLayer.js +3 -2
- package/dist/src/layer/geojsonLayer.js.map +1 -1
- package/dist/src/layer/layer.d.ts +15 -0
- package/dist/src/layer/layer.js +30 -4
- package/dist/src/layer/layer.js.map +1 -1
- package/dist/src/layer/layerImplementation.d.ts +1 -0
- package/dist/src/layer/layerImplementation.js +2 -0
- package/dist/src/layer/layerImplementation.js.map +1 -1
- package/dist/src/layer/oblique/vectorObliqueImpl.js +9 -6
- package/dist/src/layer/oblique/vectorObliqueImpl.js.map +1 -1
- package/dist/src/layer/openlayers/loadFunctionHelpers.d.ts +2 -0
- package/dist/src/layer/openlayers/loadFunctionHelpers.js +20 -0
- package/dist/src/layer/openlayers/loadFunctionHelpers.js.map +1 -0
- package/dist/src/layer/openlayers/singleImageOpenlayersImpl.js +25 -1
- package/dist/src/layer/openlayers/singleImageOpenlayersImpl.js.map +1 -1
- package/dist/src/layer/openlayers/tmsOpenlayersImpl.js +9 -1
- package/dist/src/layer/openlayers/tmsOpenlayersImpl.js.map +1 -1
- package/dist/src/layer/openlayers/vectorTileOpenlayersImpl.js +1 -1
- package/dist/src/layer/openlayers/vectorTileOpenlayersImpl.js.map +1 -1
- package/dist/src/layer/openlayers/wmsOpenlayersImpl.d.ts +4 -1
- package/dist/src/layer/openlayers/wmsOpenlayersImpl.js +20 -1
- package/dist/src/layer/openlayers/wmsOpenlayersImpl.js.map +1 -1
- package/dist/src/layer/openlayers/wmtsOpenlayersImpl.js +9 -1
- package/dist/src/layer/openlayers/wmtsOpenlayersImpl.js.map +1 -1
- package/dist/src/layer/pointCloudLayer.js +2 -2
- package/dist/src/layer/pointCloudLayer.js.map +1 -1
- package/dist/src/layer/terrainHelpers.d.ts +3 -3
- package/dist/src/layer/terrainHelpers.js +12 -7
- package/dist/src/layer/terrainHelpers.js.map +1 -1
- package/dist/src/layer/terrainLayer.js +1 -1
- package/dist/src/layer/terrainLayer.js.map +1 -1
- package/dist/src/layer/tileProvider/mvtTileProvider.d.ts +1 -1
- package/dist/src/layer/tileProvider/mvtTileProvider.js +4 -3
- package/dist/src/layer/tileProvider/mvtTileProvider.js.map +1 -1
- package/dist/src/layer/tileProvider/staticGeojsonTileProvider.d.ts +1 -1
- package/dist/src/layer/tileProvider/staticGeojsonTileProvider.js +4 -3
- package/dist/src/layer/tileProvider/staticGeojsonTileProvider.js.map +1 -1
- package/dist/src/layer/tileProvider/tileProvider.d.ts +14 -11
- package/dist/src/layer/tileProvider/tileProvider.js +23 -20
- package/dist/src/layer/tileProvider/tileProvider.js.map +1 -1
- package/dist/src/layer/tileProvider/urlTemplateTileProvider.d.ts +1 -1
- package/dist/src/layer/tileProvider/urlTemplateTileProvider.js +4 -3
- package/dist/src/layer/tileProvider/urlTemplateTileProvider.js.map +1 -1
- package/dist/src/layer/vectorLayer.d.ts +1 -2
- package/dist/src/layer/vectorLayer.js +3 -3
- package/dist/src/layer/vectorLayer.js.map +1 -1
- package/dist/src/layer/vectorProperties.d.ts +11 -16
- package/dist/src/layer/vectorProperties.js +16 -13
- package/dist/src/layer/vectorProperties.js.map +1 -1
- package/dist/src/layer/wfsLayer.js +9 -6
- package/dist/src/layer/wfsLayer.js.map +1 -1
- package/dist/src/layer/wmsHelpers.d.ts +10 -0
- package/dist/src/layer/wmsHelpers.js +53 -12
- package/dist/src/layer/wmsHelpers.js.map +1 -1
- package/dist/src/layer/wmsLayer.d.ts +6 -0
- package/dist/src/layer/wmsLayer.js +5 -2
- package/dist/src/layer/wmsLayer.js.map +1 -1
- package/dist/src/map/cameraLimiter.d.ts +5 -0
- package/dist/src/map/cameraLimiter.js +11 -4
- package/dist/src/map/cameraLimiter.js.map +1 -1
- package/dist/src/map/cesiumMap.d.ts +20 -1
- package/dist/src/map/cesiumMap.js +51 -2
- package/dist/src/map/cesiumMap.js.map +1 -1
- package/dist/src/map/vcsMap.js +2 -2
- package/dist/src/map/vcsMap.js.map +1 -1
- package/dist/src/oblique/helpers.d.ts +1 -1
- package/dist/src/oblique/helpers.js +5 -9
- package/dist/src/oblique/helpers.js.map +1 -1
- package/dist/src/oblique/obliqueCollection.d.ts +1 -0
- package/dist/src/oblique/obliqueCollection.js +1 -1
- package/dist/src/oblique/obliqueCollection.js.map +1 -1
- package/dist/src/oblique/obliqueDataSet.d.ts +3 -1
- package/dist/src/oblique/obliqueDataSet.js +13 -6
- package/dist/src/oblique/obliqueDataSet.js.map +1 -1
- package/dist/src/oblique/obliqueImageMeta.d.ts +2 -0
- package/dist/src/oblique/obliqueImageMeta.js +2 -0
- package/dist/src/oblique/obliqueImageMeta.js.map +1 -1
- package/dist/src/oblique/obliqueView.d.ts +1 -0
- package/dist/src/oblique/obliqueView.js +12 -2
- package/dist/src/oblique/obliqueView.js.map +1 -1
- package/dist/src/oblique/parseImageJson.d.ts +6 -5
- package/dist/src/oblique/parseImageJson.js +7 -5
- package/dist/src/oblique/parseImageJson.js.map +1 -1
- package/dist/src/ol/geom/circle.js.map +1 -1
- package/dist/src/style/declarativeStyleItem.js +10 -2
- package/dist/src/style/declarativeStyleItem.js.map +1 -1
- package/dist/src/style/styleFactory.js +2 -2
- package/dist/src/style/styleFactory.js.map +1 -1
- package/dist/src/style/styleHelpers.js +13 -3
- package/dist/src/style/styleHelpers.js.map +1 -1
- package/dist/src/style/vectorStyleItem.js +29 -16
- package/dist/src/style/vectorStyleItem.js.map +1 -1
- package/dist/src/util/clipping/clippingPlaneHelper.js +3 -3
- package/dist/src/util/clipping/clippingPlaneHelper.js.map +1 -1
- package/dist/src/util/editor/createFeatureSession.d.ts +2 -2
- package/dist/src/util/editor/createFeatureSession.js +2 -2
- package/dist/src/util/editor/createFeatureSession.js.map +1 -1
- package/dist/src/util/editor/editFeaturesSession.d.ts +2 -2
- package/dist/src/util/editor/editGeometrySession.d.ts +2 -2
- package/dist/src/util/editor/editorSessionHelpers.d.ts +2 -2
- package/dist/src/util/editor/selectFeaturesSession.d.ts +2 -2
- package/dist/src/util/editor/selectFeaturesSession.js +2 -2
- package/dist/src/util/editor/selectFeaturesSession.js.map +1 -1
- package/dist/src/util/featureconverter/arcToCesium.d.ts +1 -1
- package/dist/src/util/featureconverter/arcToCesium.js +5 -2
- package/dist/src/util/featureconverter/arcToCesium.js.map +1 -1
- package/dist/src/util/featureconverter/circleToCesium.d.ts +4 -2
- package/dist/src/util/featureconverter/circleToCesium.js +8 -3
- package/dist/src/util/featureconverter/circleToCesium.js.map +1 -1
- package/dist/src/util/featureconverter/extent3D.js.map +1 -1
- package/dist/src/util/featureconverter/featureconverterHelper.js +2 -2
- package/dist/src/util/featureconverter/featureconverterHelper.js.map +1 -1
- package/dist/src/util/featureconverter/lineStringToCesium.d.ts +3 -1
- package/dist/src/util/featureconverter/lineStringToCesium.js +7 -2
- package/dist/src/util/featureconverter/lineStringToCesium.js.map +1 -1
- package/dist/src/util/featureconverter/pointToCesium.js +1 -1
- package/dist/src/util/featureconverter/pointToCesium.js.map +1 -1
- package/dist/src/util/featureconverter/polygonToCesium.d.ts +3 -3
- package/dist/src/util/featureconverter/polygonToCesium.js +9 -15
- package/dist/src/util/featureconverter/polygonToCesium.js.map +1 -1
- package/dist/src/util/fetch.d.ts +2 -0
- package/dist/src/util/fetch.js +16 -0
- package/dist/src/util/fetch.js.map +1 -1
- package/dist/src/util/flight/flightAnchor.d.ts +23 -0
- package/dist/src/util/flight/flightAnchor.js +152 -0
- package/dist/src/util/flight/flightAnchor.js.map +1 -0
- package/dist/src/util/flight/flightCollection.d.ts +25 -0
- package/dist/src/util/flight/flightCollection.js +63 -0
- package/dist/src/util/flight/flightCollection.js.map +1 -0
- package/dist/src/util/flight/flightHelpers.d.ts +29 -0
- package/dist/src/util/flight/flightHelpers.js +134 -0
- package/dist/src/util/flight/flightHelpers.js.map +1 -0
- package/dist/src/util/flight/flightInstance.d.ts +57 -0
- package/dist/src/util/flight/flightInstance.js +166 -0
- package/dist/src/util/flight/flightInstance.js.map +1 -0
- package/dist/src/util/flight/flightPlayer.d.ts +30 -0
- package/dist/src/util/flight/flightPlayer.js +247 -0
- package/dist/src/util/flight/flightPlayer.js.map +1 -0
- package/dist/src/util/flight/flightVisualizer.d.ts +18 -0
- package/dist/src/util/flight/flightVisualizer.js +151 -0
- package/dist/src/util/flight/flightVisualizer.js.map +1 -0
- package/dist/src/util/hiddenObjects.d.ts +8 -0
- package/dist/src/util/hiddenObjects.js +17 -0
- package/dist/src/util/hiddenObjects.js.map +1 -0
- package/dist/src/util/mapCollection.js +2 -2
- package/dist/src/util/mapCollection.js.map +1 -1
- package/dist/src/util/overrideCollection.d.ts +8 -3
- package/dist/src/util/overrideCollection.js +17 -0
- package/dist/src/util/overrideCollection.js.map +1 -1
- package/dist/src/util/projection.js +5 -2
- package/dist/src/util/projection.js.map +1 -1
- package/dist/src/util/viewpoint.d.ts +1 -0
- package/dist/src/util/viewpoint.js +24 -7
- package/dist/src/util/viewpoint.js.map +1 -1
- package/dist/src/vcsApp.d.ts +10 -3
- package/dist/src/vcsApp.js +34 -15
- package/dist/src/vcsApp.js.map +1 -1
- package/dist/src/vcsModule.d.ts +4 -0
- package/dist/src/vcsModule.js.map +1 -1
- package/dist/tests/unit/helpers/cesiumHelpers.d.ts +2 -2
- package/dist/tests/unit/helpers/cesiumHelpers.js +2 -1
- package/dist/tests/unit/helpers/cesiumHelpers.js.map +1 -1
- package/dist/tests/unit/helpers/terrain/terrainData.d.ts +7 -0
- package/dist/tests/unit/helpers/terrain/terrainData.js +2 -2
- package/dist/tests/unit/helpers/terrain/terrainData.js.map +1 -1
- package/index.ts +39 -1
- package/package.json +4 -2
- package/src/classRegistry.ts +2 -2
- package/src/featureProvider/abstractFeatureProvider.ts +2 -0
- package/src/featureProvider/tileProviderFeatureProvider.ts +2 -0
- package/src/featureProvider/wmsFeatureProvider.ts +4 -2
- package/src/interaction/eventHandler.ts +3 -3
- package/src/interaction/featureProviderInteraction.ts +1 -0
- package/src/layer/cesium/cesiumTilesetCesiumImpl.ts +44 -5
- package/src/layer/cesium/resourceHelper.ts +15 -0
- package/src/layer/cesium/singleImageCesiumImpl.ts +2 -1
- package/src/layer/cesium/terrainCesiumImpl.ts +2 -1
- package/src/layer/cesium/tmsCesiumImpl.ts +2 -1
- package/src/layer/cesium/vectorRasterTileCesiumImpl.ts +1 -0
- package/src/layer/cesium/vectorTileImageryProvider.ts +10 -1
- package/src/layer/cesium/wmsCesiumImpl.ts +2 -1
- package/src/layer/cesium/wmtsCesiumImpl.ts +4 -2
- package/src/layer/cesiumTilesetLayer.ts +25 -7
- package/src/layer/czmlLayer.ts +2 -1
- package/src/layer/featureLayer.ts +2 -2
- package/src/layer/featureStoreLayer.ts +8 -8
- package/src/layer/featureStoreLayerChanges.ts +63 -45
- package/src/layer/featureStoreLayerState.ts +6 -5
- package/src/layer/geojsonLayer.ts +3 -3
- package/src/layer/layer.ts +41 -4
- package/src/layer/layerImplementation.ts +3 -0
- package/src/layer/oblique/vectorObliqueImpl.ts +9 -8
- package/src/layer/openlayers/loadFunctionHelpers.ts +24 -0
- package/src/layer/openlayers/singleImageOpenlayersImpl.ts +25 -1
- package/src/layer/openlayers/tmsOpenlayersImpl.ts +8 -1
- package/src/layer/openlayers/vectorTileOpenlayersImpl.ts +1 -0
- package/src/layer/openlayers/wmsOpenlayersImpl.ts +23 -2
- package/src/layer/openlayers/wmtsOpenlayersImpl.ts +8 -1
- package/src/layer/pointCloudLayer.ts +2 -2
- package/src/layer/terrainHelpers.ts +19 -6
- package/src/layer/terrainLayer.ts +8 -4
- package/src/layer/tileProvider/mvtTileProvider.ts +9 -3
- package/src/layer/tileProvider/staticGeojsonTileProvider.ts +9 -3
- package/src/layer/tileProvider/tileProvider.ts +49 -13
- package/src/layer/tileProvider/urlTemplateTileProvider.ts +10 -3
- package/src/layer/vectorLayer.ts +9 -9
- package/src/layer/vectorProperties.ts +46 -22
- package/src/layer/wfsLayer.ts +9 -6
- package/src/layer/wmsHelpers.ts +78 -10
- package/src/layer/wmsLayer.ts +11 -2
- package/src/map/cameraLimiter.ts +21 -2
- package/src/map/cesiumMap.ts +67 -2
- package/src/map/vcsMap.ts +2 -2
- package/src/oblique/helpers.ts +5 -13
- package/src/oblique/obliqueCollection.ts +2 -0
- package/src/oblique/obliqueDataSet.ts +16 -2
- package/src/oblique/obliqueImageMeta.ts +4 -0
- package/src/oblique/obliqueView.ts +12 -2
- package/src/oblique/parseImageJson.ts +7 -4
- package/src/ol/geojson.d.ts +1 -2
- package/src/ol/geom/circle.ts +1 -1
- package/src/style/declarativeStyleItem.ts +10 -2
- package/src/style/styleFactory.ts +2 -2
- package/src/style/styleHelpers.ts +13 -4
- package/src/style/vectorStyleItem.ts +32 -20
- package/src/util/clipping/clippingPlaneHelper.ts +3 -3
- package/src/util/editor/createFeatureSession.ts +9 -8
- package/src/util/editor/editFeaturesSession.ts +1 -1
- package/src/util/editor/editGeometrySession.ts +1 -1
- package/src/util/editor/editorSessionHelpers.ts +2 -2
- package/src/util/editor/selectFeaturesSession.ts +3 -3
- package/src/util/featureconverter/arcToCesium.ts +5 -1
- package/src/util/featureconverter/circleToCesium.ts +8 -2
- package/src/util/featureconverter/extent3D.ts +1 -1
- package/src/util/featureconverter/featureconverterHelper.ts +3 -5
- package/src/util/featureconverter/lineStringToCesium.ts +8 -1
- package/src/util/featureconverter/pointToCesium.ts +1 -1
- package/src/util/featureconverter/polygonToCesium.ts +6 -15
- package/src/util/fetch.ts +25 -0
- package/src/util/flight/flightAnchor.ts +195 -0
- package/src/util/flight/flightCollection.ts +78 -0
- package/src/util/flight/flightHelpers.ts +208 -0
- package/src/util/flight/flightInstance.ts +240 -0
- package/src/util/flight/flightPlayer.ts +326 -0
- package/src/util/flight/flightVisualizer.ts +202 -0
- package/src/util/hiddenObjects.ts +35 -0
- package/src/util/mapCollection.ts +2 -2
- package/src/util/overrideCollection.ts +26 -3
- package/src/util/projection.ts +5 -2
- package/src/util/viewpoint.ts +27 -7
- package/src/vcsApp.ts +56 -15
- package/src/vcsModule.ts +4 -0
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { Matrix4 } from '@vcmap-cesium/engine';
|
|
2
|
-
import {
|
|
1
|
+
import { Matrix4, } from '@vcmap-cesium/engine';
|
|
2
|
+
import { check, maybe } from '@vcsuite/check';
|
|
3
3
|
import { parseInteger } from '@vcsuite/parsers';
|
|
4
4
|
import VectorStyleItem from '../style/vectorStyleItem.js';
|
|
5
5
|
import FeatureLayer from './featureLayer.js';
|
|
@@ -34,13 +34,11 @@ class CesiumTilesetLayer extends FeatureLayer {
|
|
|
34
34
|
_modelMatrix;
|
|
35
35
|
_offset;
|
|
36
36
|
_supportedMaps = [CesiumMap.className];
|
|
37
|
+
_customShader = undefined;
|
|
37
38
|
constructor(options) {
|
|
38
39
|
super(options);
|
|
39
40
|
this._supportedMaps = [CesiumMap.className];
|
|
40
41
|
const defaultOptions = CesiumTilesetLayer.getDefaultOptions();
|
|
41
|
-
if (this.url && !/\.json$/.test(this.url)) {
|
|
42
|
-
this.url = `${this.url.replace(/\/$/, '')}/tileset.json`;
|
|
43
|
-
}
|
|
44
42
|
this.highlightStyle = null;
|
|
45
43
|
if (options.highlightStyle) {
|
|
46
44
|
this.highlightStyle =
|
|
@@ -68,7 +66,7 @@ class CesiumTilesetLayer extends FeatureLayer {
|
|
|
68
66
|
return this._modelMatrix;
|
|
69
67
|
}
|
|
70
68
|
set modelMatrix(modelMatrix) {
|
|
71
|
-
|
|
69
|
+
check(modelMatrix, maybe(Matrix4));
|
|
72
70
|
this._modelMatrix = modelMatrix;
|
|
73
71
|
this.getImplementations().forEach((impl) => {
|
|
74
72
|
impl.updateModelMatrix(modelMatrix);
|
|
@@ -83,18 +81,30 @@ class CesiumTilesetLayer extends FeatureLayer {
|
|
|
83
81
|
return this._offset;
|
|
84
82
|
}
|
|
85
83
|
set offset(offset) {
|
|
86
|
-
|
|
84
|
+
check(offset, maybe([Number]));
|
|
87
85
|
this._offset = offset;
|
|
88
86
|
this.getImplementations().forEach((impl) => {
|
|
89
87
|
impl.updateOffset(offset);
|
|
90
88
|
});
|
|
91
89
|
}
|
|
90
|
+
get customShader() {
|
|
91
|
+
return this._customShader;
|
|
92
|
+
}
|
|
93
|
+
set customShader(shader) {
|
|
94
|
+
if (this._customShader !== shader) {
|
|
95
|
+
this._customShader = shader;
|
|
96
|
+
this.getImplementations().forEach((impl) => {
|
|
97
|
+
impl.updateCustomShader(shader);
|
|
98
|
+
});
|
|
99
|
+
}
|
|
100
|
+
}
|
|
92
101
|
getImplementationOptions() {
|
|
93
102
|
return {
|
|
94
103
|
...super.getImplementationOptions(),
|
|
95
104
|
tilesetOptions: this.tilesetOptions,
|
|
96
105
|
modelMatrix: this.modelMatrix,
|
|
97
106
|
offset: this.offset,
|
|
107
|
+
customShader: this.customShader,
|
|
98
108
|
};
|
|
99
109
|
}
|
|
100
110
|
createImplementationsForMap(map) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cesiumTilesetLayer.js","sourceRoot":"","sources":["../../../src/layer/cesiumTilesetLayer.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"cesiumTilesetLayer.js","sourceRoot":"","sources":["../../../src/layer/cesiumTilesetLayer.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@ import { CzmlDataSource } from '@vcmap-cesium/engine';
|
|
|
2
2
|
import DataSourceLayer from './dataSourceLayer.js';
|
|
3
3
|
import { vcsLayerName } from './layerSymbols.js';
|
|
4
4
|
import { layerClassRegistry } from '../classRegistry.js';
|
|
5
|
+
import { getResourceOrUrl } from './cesium/resourceHelper.js';
|
|
5
6
|
/**
|
|
6
7
|
* @group Layer
|
|
7
8
|
*/
|
|
@@ -61,7 +62,7 @@ class CzmlLayer extends DataSourceLayer {
|
|
|
61
62
|
return this._initializedPromise;
|
|
62
63
|
}
|
|
63
64
|
async _loadData() {
|
|
64
|
-
await this.dataSource.load(this.url, this.sourceUri ? { sourceUri: this.sourceUri } : undefined);
|
|
65
|
+
await this.dataSource.load(getResourceOrUrl(this.url, this.headers), this.sourceUri ? { sourceUri: this.sourceUri } : undefined);
|
|
65
66
|
this.entities.values.forEach((entity) => {
|
|
66
67
|
entity[vcsLayerName] = this.name;
|
|
67
68
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"czmlLayer.js","sourceRoot":"","sources":["../../../src/layer/czmlLayer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEtD,OAAO,eAAe,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"czmlLayer.js","sourceRoot":"","sources":["../../../src/layer/czmlLayer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import Style from 'ol/style/Style.js';
|
|
2
|
-
import { check } from '@vcsuite/check';
|
|
2
|
+
import { check, oneOf } from '@vcsuite/check';
|
|
3
3
|
import { parseInteger } from '@vcsuite/parsers';
|
|
4
4
|
import { SplitDirection } from '@vcmap-cesium/engine';
|
|
5
5
|
import Layer from './layer.js';
|
|
@@ -111,7 +111,7 @@ class FeatureLayer extends Layer {
|
|
|
111
111
|
* Sets the style based on a styleName on a layer
|
|
112
112
|
*/
|
|
113
113
|
setStyle(style, silent) {
|
|
114
|
-
check(style,
|
|
114
|
+
check(style, oneOf(Style, StyleItem, Function));
|
|
115
115
|
if (style instanceof StyleItem) {
|
|
116
116
|
this._style = style;
|
|
117
117
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"featureLayer.js","sourceRoot":"","sources":["../../../src/layer/featureLayer.ts"],"names":[],"mappings":"AAAA,OAAO,KAA6B,MAAM,mBAAmB,CAAC;AAE9D,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"featureLayer.js","sourceRoot":"","sources":["../../../src/layer/featureLayer.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ import { SplitDirection } from '@vcmap-cesium/engine';
|
|
|
3
3
|
import VectorSource from 'ol/source/Vector.js';
|
|
4
4
|
import { createEmpty, extend as extendExtent } from 'ol/extent.js';
|
|
5
5
|
import VectorLayer from './vectorLayer.js';
|
|
6
|
-
import { featureStoreStateSymbol
|
|
6
|
+
import { featureStoreStateSymbol } from './featureStoreLayerState.js';
|
|
7
7
|
import { parseGeoJSON } from './geojsonHelpers.js';
|
|
8
8
|
import { mercatorProjection } from '../util/projection.js';
|
|
9
9
|
import FeatureStoreLayerChanges from './featureStoreLayerChanges.js';
|
|
@@ -103,7 +103,7 @@ class FeatureStoreLayer extends VectorLayer {
|
|
|
103
103
|
this.screenSpaceError = this.vcsMeta.screenSpaceError;
|
|
104
104
|
this._removeVectorPropertiesChangeHandler =
|
|
105
105
|
this.vectorProperties.propertyChanged.addEventListener(() => {
|
|
106
|
-
this.changeTracker.
|
|
106
|
+
this.changeTracker.changed.raiseEvent();
|
|
107
107
|
});
|
|
108
108
|
this.injectedFetchDynamicFeatureFunc =
|
|
109
109
|
options.injectedFetchDynamicFeatureFunc ??
|
|
@@ -152,7 +152,9 @@ class FeatureStoreLayer extends VectorLayer {
|
|
|
152
152
|
const { twoDim } = this.staticRepresentation;
|
|
153
153
|
if (!this._twoDimLoaded) {
|
|
154
154
|
this._twoDimLoaded = (async () => {
|
|
155
|
-
const data = await requestJson(twoDim
|
|
155
|
+
const data = await requestJson(twoDim, {
|
|
156
|
+
headers: this.headers,
|
|
157
|
+
});
|
|
156
158
|
const { features } = parseGeoJSON(data, {
|
|
157
159
|
targetProjection: mercatorProjection,
|
|
158
160
|
dynamicStyle: true,
|
|
@@ -206,6 +208,7 @@ class FeatureStoreLayer extends VectorLayer {
|
|
|
206
208
|
featureVisibility: this._staticFeatureVisibility,
|
|
207
209
|
globalHider: this.globalHider,
|
|
208
210
|
splitDirection: SplitDirection.NONE,
|
|
211
|
+
headers: this.headers,
|
|
209
212
|
}));
|
|
210
213
|
}
|
|
211
214
|
else if (this.staticRepresentation && this.staticRepresentation.twoDim) {
|
|
@@ -273,7 +276,7 @@ class FeatureStoreLayer extends VectorLayer {
|
|
|
273
276
|
});
|
|
274
277
|
if (changeTrackerActive) {
|
|
275
278
|
this.changeTracker.track();
|
|
276
|
-
this.changeTracker.
|
|
279
|
+
this.changeTracker.changed.raiseEvent();
|
|
277
280
|
}
|
|
278
281
|
}
|
|
279
282
|
setEditing(symbol, featureType) {
|
|
@@ -406,7 +409,7 @@ class FeatureStoreLayer extends VectorLayer {
|
|
|
406
409
|
this.hiddenStaticFeatureIds.add(featureId);
|
|
407
410
|
const feature = new Feature();
|
|
408
411
|
feature.setId(featureId);
|
|
409
|
-
feature[featureStoreStateSymbol] =
|
|
412
|
+
feature[featureStoreStateSymbol] = 'static';
|
|
410
413
|
this.changeTracker.removeFeature(feature);
|
|
411
414
|
}
|
|
412
415
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"featureStoreLayer.js","sourceRoot":"","sources":["../../../src/layer/featureStoreLayer.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"featureStoreLayer.js","sourceRoot":"","sources":["../../../src/layer/featureStoreLayer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import Feature from 'ol/Feature.js';
|
|
2
2
|
import { EventsKey } from 'ol/events.js';
|
|
3
|
-
import {
|
|
3
|
+
import type { Feature as GeojsonFeature, LineString, MultiLineString, MultiPoint, MultiPolygon, Point, Polygon } from 'geojson';
|
|
4
4
|
import VcsObject from '../vcsObject.js';
|
|
5
5
|
import type FeatureStoreLayer from './featureStoreLayer.js';
|
|
6
|
+
import VcsEvent from '../vcsEvent.js';
|
|
6
7
|
export type FeatureStoreTrackResults = {
|
|
7
8
|
add: Feature[];
|
|
8
9
|
edit: Feature[];
|
|
@@ -13,13 +14,15 @@ export type FeatureStoreChangesListeners = {
|
|
|
13
14
|
changefeature: EventsKey | EventsKey[] | null;
|
|
14
15
|
removefeature: EventsKey | EventsKey[] | null;
|
|
15
16
|
};
|
|
16
|
-
export type
|
|
17
|
-
|
|
17
|
+
export type FeatureStoreGeojsonGeometry = Point | MultiPoint | LineString | MultiLineString | Polygon | MultiPolygon;
|
|
18
|
+
export type FeatureStoreGeojsonFeature<G extends FeatureStoreGeojsonGeometry = FeatureStoreGeojsonGeometry, P extends Record<string, unknown> = Record<string, unknown>> = Omit<GeojsonFeature<G, P>, 'id'> & {
|
|
19
|
+
_id?: string;
|
|
20
|
+
id?: string;
|
|
18
21
|
};
|
|
19
22
|
type CommitAction = {
|
|
20
|
-
action:
|
|
21
|
-
feature:
|
|
22
|
-
_id: string
|
|
23
|
+
action: 'add' | 'edit' | 'remove';
|
|
24
|
+
feature: FeatureStoreGeojsonFeature | {
|
|
25
|
+
_id: string;
|
|
23
26
|
};
|
|
24
27
|
original: Feature;
|
|
25
28
|
success(opt?: string): void;
|
|
@@ -36,7 +39,7 @@ declare class FeatureStoreLayerChanges extends VcsObject {
|
|
|
36
39
|
private _editedFeatures;
|
|
37
40
|
private _removedFeatures;
|
|
38
41
|
private _convertedFeatures;
|
|
39
|
-
|
|
42
|
+
changed: VcsEvent<void>;
|
|
40
43
|
constructor(layer: FeatureStoreLayer);
|
|
41
44
|
get layer(): FeatureStoreLayer;
|
|
42
45
|
/**
|
|
@@ -49,10 +52,19 @@ declare class FeatureStoreLayerChanges extends VcsObject {
|
|
|
49
52
|
*/
|
|
50
53
|
track(): void;
|
|
51
54
|
getChanges(): FeatureStoreTrackResults;
|
|
55
|
+
hasChanges(): boolean;
|
|
52
56
|
/**
|
|
53
57
|
* commits the changes to the provided url. url should contain accessTokens and point to a featureStore layers bulk operation endpoint
|
|
54
58
|
*/
|
|
55
|
-
commitChanges(
|
|
59
|
+
commitChanges(postCallback: (body: Pick<CommitAction, 'action' | 'feature'>[]) => Promise<{
|
|
60
|
+
failedActions: {
|
|
61
|
+
index: number;
|
|
62
|
+
error: string;
|
|
63
|
+
}[];
|
|
64
|
+
insertedIds: {
|
|
65
|
+
_id: string;
|
|
66
|
+
}[];
|
|
67
|
+
}>): Promise<void>;
|
|
56
68
|
/**
|
|
57
69
|
* resets all changes since the last commit or the beginning of tracking
|
|
58
70
|
*/
|
|
@@ -1,34 +1,38 @@
|
|
|
1
1
|
import { unByKey } from 'ol/Observable.js';
|
|
2
2
|
import Feature from 'ol/Feature.js';
|
|
3
3
|
import { check } from '@vcsuite/check';
|
|
4
|
-
import {
|
|
4
|
+
import { featureStoreStateSymbol } from './featureStoreLayerState.js';
|
|
5
5
|
import { parseGeoJSON, writeGeoJSONFeature } from './geojsonHelpers.js';
|
|
6
6
|
import VcsObject from '../vcsObject.js';
|
|
7
|
-
import
|
|
7
|
+
import VcsEvent from '../vcsEvent.js';
|
|
8
8
|
export function createCommitActions(added, edited, removed) {
|
|
9
9
|
const actions = [];
|
|
10
10
|
added.forEach((f) => {
|
|
11
|
-
const feature = writeGeoJSONFeature(f, {
|
|
11
|
+
const feature = writeGeoJSONFeature(f, {
|
|
12
|
+
writeStyle: true,
|
|
13
|
+
});
|
|
12
14
|
actions.push({
|
|
13
15
|
action: 'add',
|
|
14
16
|
feature,
|
|
15
17
|
original: f,
|
|
16
18
|
success(data) {
|
|
17
19
|
f.setId(data);
|
|
18
|
-
f[featureStoreStateSymbol] =
|
|
20
|
+
f[featureStoreStateSymbol] = 'dynamic';
|
|
19
21
|
},
|
|
20
22
|
});
|
|
21
23
|
});
|
|
22
24
|
edited.forEach((f) => {
|
|
23
|
-
const feature = writeGeoJSONFeature(f, {
|
|
25
|
+
const feature = writeGeoJSONFeature(f, {
|
|
26
|
+
writeStyle: true,
|
|
27
|
+
});
|
|
24
28
|
feature._id = f.getId();
|
|
25
29
|
actions.push({
|
|
26
30
|
action: 'edit',
|
|
27
31
|
original: f,
|
|
28
32
|
feature,
|
|
29
33
|
success() {
|
|
30
|
-
if (f[featureStoreStateSymbol] ===
|
|
31
|
-
f[featureStoreStateSymbol] =
|
|
34
|
+
if (f[featureStoreStateSymbol] === 'static') {
|
|
35
|
+
f[featureStoreStateSymbol] = 'edited';
|
|
32
36
|
}
|
|
33
37
|
},
|
|
34
38
|
});
|
|
@@ -60,9 +64,7 @@ class FeatureStoreLayerChanges extends VcsObject {
|
|
|
60
64
|
_editedFeatures = new Set();
|
|
61
65
|
_removedFeatures = new Set();
|
|
62
66
|
_convertedFeatures = new Set();
|
|
63
|
-
|
|
64
|
-
changed: false,
|
|
65
|
-
};
|
|
67
|
+
changed = new VcsEvent();
|
|
66
68
|
constructor(layer) {
|
|
67
69
|
super({});
|
|
68
70
|
this._layer = layer;
|
|
@@ -101,20 +103,18 @@ class FeatureStoreLayerChanges extends VcsObject {
|
|
|
101
103
|
remove: [...this._removedFeatures],
|
|
102
104
|
};
|
|
103
105
|
}
|
|
106
|
+
hasChanges() {
|
|
107
|
+
return (this._addedFeatures.size !== 0 ||
|
|
108
|
+
this._editedFeatures.size !== 0 ||
|
|
109
|
+
this._removedFeatures.size !== 0);
|
|
110
|
+
}
|
|
104
111
|
/**
|
|
105
112
|
* commits the changes to the provided url. url should contain accessTokens and point to a featureStore layers bulk operation endpoint
|
|
106
113
|
*/
|
|
107
|
-
async commitChanges(
|
|
114
|
+
async commitChanges(postCallback) {
|
|
108
115
|
const actions = createCommitActions(this._addedFeatures, this._editedFeatures, this._removedFeatures);
|
|
109
116
|
if (actions.length > 0) {
|
|
110
|
-
const data = await
|
|
111
|
-
method: 'POST',
|
|
112
|
-
headers: {
|
|
113
|
-
...headers,
|
|
114
|
-
'Content-Type': 'application/json',
|
|
115
|
-
},
|
|
116
|
-
body: JSON.stringify(actions.map((a) => ({ action: a.action, feature: a.feature }))),
|
|
117
|
-
});
|
|
117
|
+
const data = await postCallback(actions.map((a) => ({ action: a.action, feature: a.feature })));
|
|
118
118
|
const failures = data.failedActions.map(({ index, error }) => {
|
|
119
119
|
const action = actions[index];
|
|
120
120
|
this.getLogger().log(`failed action ${action.action}: ${error}`);
|
|
@@ -178,7 +178,7 @@ class FeatureStoreLayerChanges extends VcsObject {
|
|
|
178
178
|
this.layer.removeFeaturesById(idArray);
|
|
179
179
|
return Promise.resolve();
|
|
180
180
|
}
|
|
181
|
-
if (feature[featureStoreStateSymbol] ===
|
|
181
|
+
if (feature[featureStoreStateSymbol] === 'static') {
|
|
182
182
|
this.layer.resetStaticFeature(featureId);
|
|
183
183
|
return Promise.resolve();
|
|
184
184
|
}
|
|
@@ -198,7 +198,6 @@ class FeatureStoreLayerChanges extends VcsObject {
|
|
|
198
198
|
this._editedFeatures.clear();
|
|
199
199
|
this._removedFeatures.clear();
|
|
200
200
|
this._convertedFeatures.clear();
|
|
201
|
-
this.values.changed = false;
|
|
202
201
|
}
|
|
203
202
|
/**
|
|
204
203
|
* stops tracking changes on the feature store layer
|
|
@@ -225,11 +224,11 @@ class FeatureStoreLayerChanges extends VcsObject {
|
|
|
225
224
|
if (feature) {
|
|
226
225
|
if (!feature[featureStoreStateSymbol]) {
|
|
227
226
|
this._addedFeatures.add(feature);
|
|
228
|
-
this.
|
|
227
|
+
this.changed.raiseEvent();
|
|
229
228
|
}
|
|
230
|
-
else if (feature[featureStoreStateSymbol] ===
|
|
229
|
+
else if (feature[featureStoreStateSymbol] === 'static') {
|
|
231
230
|
this._convertedFeatures.add(feature);
|
|
232
|
-
this.
|
|
231
|
+
this.changed.raiseEvent();
|
|
233
232
|
}
|
|
234
233
|
}
|
|
235
234
|
}
|
|
@@ -239,7 +238,7 @@ class FeatureStoreLayerChanges extends VcsObject {
|
|
|
239
238
|
if (feature[featureStoreStateSymbol]) {
|
|
240
239
|
this._convertedFeatures.delete(feature);
|
|
241
240
|
this._editedFeatures.add(feature);
|
|
242
|
-
this.
|
|
241
|
+
this.changed.raiseEvent();
|
|
243
242
|
}
|
|
244
243
|
}
|
|
245
244
|
}
|
|
@@ -250,7 +249,7 @@ class FeatureStoreLayerChanges extends VcsObject {
|
|
|
250
249
|
this._removedFeatures.add(feature);
|
|
251
250
|
this._editedFeatures.delete(feature);
|
|
252
251
|
this._convertedFeatures.delete(feature);
|
|
253
|
-
this.
|
|
252
|
+
this.changed.raiseEvent();
|
|
254
253
|
}
|
|
255
254
|
else {
|
|
256
255
|
this._addedFeatures.delete(feature);
|
|
@@ -281,6 +280,7 @@ class FeatureStoreLayerChanges extends VcsObject {
|
|
|
281
280
|
destroy() {
|
|
282
281
|
this.unTrack();
|
|
283
282
|
this._layer = undefined;
|
|
283
|
+
this.changed.destroy();
|
|
284
284
|
super.destroy();
|
|
285
285
|
}
|
|
286
286
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"featureStoreLayerChanges.js","sourceRoot":"","sources":["../../../src/layer/featureStoreLayerChanges.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,OAAO,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"featureStoreLayerChanges.js","sourceRoot":"","sources":["../../../src/layer/featureStoreLayerChanges.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,8 +2,4 @@ export declare const featureStoreStateSymbol: unique symbol;
|
|
|
2
2
|
/**
|
|
3
3
|
* Enumeration of feature store item states
|
|
4
4
|
*/
|
|
5
|
-
export
|
|
6
|
-
DYNAMIC = "dynamic",
|
|
7
|
-
STATIC = "static",
|
|
8
|
-
EDITED = "edited"
|
|
9
|
-
}
|
|
5
|
+
export type FeatureStoreLayerState = 'dynamic' | 'static' | 'edited' | 'deleted' | 'removed';
|
|
@@ -1,11 +1,2 @@
|
|
|
1
1
|
export const featureStoreStateSymbol = Symbol('vcsFeatureType');
|
|
2
|
-
/**
|
|
3
|
-
* Enumeration of feature store item states
|
|
4
|
-
*/
|
|
5
|
-
export var FeatureStoreLayerState;
|
|
6
|
-
(function (FeatureStoreLayerState) {
|
|
7
|
-
FeatureStoreLayerState["DYNAMIC"] = "dynamic";
|
|
8
|
-
FeatureStoreLayerState["STATIC"] = "static";
|
|
9
|
-
FeatureStoreLayerState["EDITED"] = "edited";
|
|
10
|
-
})(FeatureStoreLayerState = FeatureStoreLayerState || (FeatureStoreLayerState = {}));
|
|
11
2
|
//# sourceMappingURL=featureStoreLayerState.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"featureStoreLayerState.js","sourceRoot":"","sources":["../../../src/layer/featureStoreLayerState.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,uBAAuB,GAAG,MAAM,CAAC,gBAAgB,CAAC,CAAC
|
|
1
|
+
{"version":3,"file":"featureStoreLayerState.js","sourceRoot":"","sources":["../../../src/layer/featureStoreLayerState.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,uBAAuB,GAAG,MAAM,CAAC,gBAAgB,CAAC,CAAC"}
|
|
@@ -2,7 +2,7 @@ import VectorLayer from './vectorLayer.js';
|
|
|
2
2
|
import { parseGeoJSON, writeGeoJSONFeature } from './geojsonHelpers.js';
|
|
3
3
|
import Projection, { wgs84Projection } from '../util/projection.js';
|
|
4
4
|
import { layerClassRegistry } from '../classRegistry.js';
|
|
5
|
-
import { requestJson } from '../util/fetch.js';
|
|
5
|
+
import { getInitForUrl, requestJson } from '../util/fetch.js';
|
|
6
6
|
/**
|
|
7
7
|
* indicates, that this feature is part of the options
|
|
8
8
|
*/
|
|
@@ -63,7 +63,8 @@ class GeoJSONLayer extends VectorLayer {
|
|
|
63
63
|
this._featuresToLoad = undefined;
|
|
64
64
|
}
|
|
65
65
|
if (this.url) {
|
|
66
|
-
|
|
66
|
+
const init = getInitForUrl(this.url, this.headers);
|
|
67
|
+
this._dataFetchedPromise = requestJson(this.url, init)
|
|
67
68
|
.then((data) => this._parseGeojsonData(data))
|
|
68
69
|
.catch((err) => {
|
|
69
70
|
this.getLogger().warning(`Could not send request for loading layer content (${String(err)})`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"geojsonLayer.js","sourceRoot":"","sources":["../../../src/layer/geojsonLayer.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"geojsonLayer.js","sourceRoot":"","sources":["../../../src/layer/geojsonLayer.ts"],"names":[],"mappings":"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"}
|