@vcmap/core 6.2.4 → 6.3.0-rc.2
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 +12 -0
- package/dist/index.d.ts +13 -3
- package/dist/index.js +11 -2
- package/dist/index.js.map +1 -1
- package/dist/ol.d.ts +13 -2
- package/dist/src/category/category.d.ts +1 -1
- package/dist/src/category/category.js +3 -4
- package/dist/src/category/category.js.map +1 -1
- package/dist/src/cesium/cesium3DTileFeature.d.ts +1 -0
- package/dist/src/cesium/cesium3DTileFeature.js +14 -3
- package/dist/src/cesium/cesium3DTileFeature.js.map +1 -1
- package/dist/src/cesium/cesium3DTilePointFeature.js +2 -1
- package/dist/src/cesium/cesium3DTilePointFeature.js.map +1 -1
- package/dist/src/classRegistry.d.ts +7 -1
- package/dist/src/classRegistry.js.map +1 -1
- package/dist/src/featureProvider/abstractAttributeProvider.d.ts +62 -0
- package/dist/src/featureProvider/abstractAttributeProvider.js +129 -0
- package/dist/src/featureProvider/abstractAttributeProvider.js.map +1 -0
- package/dist/src/featureProvider/abstractFeatureProvider.d.ts +10 -19
- package/dist/src/featureProvider/abstractFeatureProvider.js +10 -42
- package/dist/src/featureProvider/abstractFeatureProvider.js.map +1 -1
- package/dist/src/featureProvider/compositeFeatureProvider.d.ts +27 -0
- package/dist/src/featureProvider/compositeFeatureProvider.js +53 -0
- package/dist/src/featureProvider/compositeFeatureProvider.js.map +1 -0
- package/dist/src/featureProvider/csvAttributeProvider.d.ts +41 -0
- package/dist/src/featureProvider/csvAttributeProvider.js +126 -0
- package/dist/src/featureProvider/csvAttributeProvider.js.map +1 -0
- package/dist/src/featureProvider/featureProviderFactory.d.ts +3 -0
- package/dist/src/featureProvider/featureProviderFactory.js +17 -0
- package/dist/src/featureProvider/featureProviderFactory.js.map +1 -0
- package/dist/src/featureProvider/i3sAttributeProvider.d.ts +7 -0
- package/dist/src/featureProvider/i3sAttributeProvider.js +43 -0
- package/dist/src/featureProvider/i3sAttributeProvider.js.map +1 -0
- package/dist/src/featureProvider/jsonAttributeProvider.d.ts +26 -0
- package/dist/src/featureProvider/jsonAttributeProvider.js +73 -0
- package/dist/src/featureProvider/jsonAttributeProvider.js.map +1 -0
- package/dist/src/featureProvider/tileProviderFeatureProvider.d.ts +4 -6
- package/dist/src/featureProvider/tileProviderFeatureProvider.js +9 -11
- package/dist/src/featureProvider/tileProviderFeatureProvider.js.map +1 -1
- package/dist/src/featureProvider/urlIdAttributeProvider.d.ts +28 -0
- package/dist/src/featureProvider/urlIdAttributeProvider.js +50 -0
- package/dist/src/featureProvider/urlIdAttributeProvider.js.map +1 -0
- package/dist/src/featureProvider/wmsFeatureProvider.d.ts +13 -4
- package/dist/src/featureProvider/wmsFeatureProvider.js +19 -9
- package/dist/src/featureProvider/wmsFeatureProvider.js.map +1 -1
- package/dist/src/interaction/coordinateAtPixel.js +4 -6
- package/dist/src/interaction/coordinateAtPixel.js.map +1 -1
- package/dist/src/interaction/ensurePositionInteraction.d.ts +14 -0
- package/dist/src/interaction/ensurePositionInteraction.js +42 -0
- package/dist/src/interaction/ensurePositionInteraction.js.map +1 -0
- package/dist/src/interaction/eventHandler.d.ts +3 -0
- package/dist/src/interaction/eventHandler.js +10 -1
- package/dist/src/interaction/eventHandler.js.map +1 -1
- package/dist/src/interaction/featureAtPixelInteraction.d.ts +15 -3
- package/dist/src/interaction/featureAtPixelInteraction.js +70 -18
- package/dist/src/interaction/featureAtPixelInteraction.js.map +1 -1
- package/dist/src/interaction/featureProviderInteraction.js +42 -26
- package/dist/src/interaction/featureProviderInteraction.js.map +1 -1
- package/dist/src/interaction/panoramaImageSelection.js +2 -2
- package/dist/src/interaction/panoramaImageSelection.js.map +1 -1
- package/dist/src/layer/cesium/cesiumTilesetCesiumImpl.d.ts +17 -9
- package/dist/src/layer/cesium/cesiumTilesetCesiumImpl.js +244 -165
- package/dist/src/layer/cesium/cesiumTilesetCesiumImpl.js.map +1 -1
- package/dist/src/layer/cesium/i3sCesiumImpl.d.ts +33 -0
- package/dist/src/layer/cesium/i3sCesiumImpl.js +107 -0
- package/dist/src/layer/cesium/i3sCesiumImpl.js.map +1 -0
- package/dist/src/layer/cesium/rasterLayerCesiumImpl.d.ts +3 -3
- package/dist/src/layer/cesium/rasterLayerCesiumImpl.js.map +1 -1
- package/dist/src/layer/cesium/terrainCesiumImpl.d.ts +3 -3
- package/dist/src/layer/cesium/terrainCesiumImpl.js.map +1 -1
- package/dist/src/layer/cesium/vcsTile/vcsQuadtreeTileProvider.js +2 -1
- package/dist/src/layer/cesium/vcsTile/vcsQuadtreeTileProvider.js.map +1 -1
- package/dist/src/layer/cesium/vectorContext.js +1 -1
- package/dist/src/layer/cesium/vectorContext.js.map +1 -1
- package/dist/src/layer/cesium/vectorRasterTileCesiumImpl.js +7 -6
- package/dist/src/layer/cesium/vectorRasterTileCesiumImpl.js.map +1 -1
- package/dist/src/layer/cesium/vectorTileImageryProvider.js +2 -2
- package/dist/src/layer/cesium/vectorTileImageryProvider.js.map +1 -1
- package/dist/src/layer/cesiumTilesetLayer.d.ts +10 -1
- package/dist/src/layer/cesiumTilesetLayer.js +33 -8
- package/dist/src/layer/cesiumTilesetLayer.js.map +1 -1
- package/dist/src/layer/cogLayer.d.ts +1 -1
- package/dist/src/layer/cogLayer.js +3 -4
- package/dist/src/layer/cogLayer.js.map +1 -1
- package/dist/src/layer/czmlLayer.d.ts +1 -1
- package/dist/src/layer/czmlLayer.js +4 -4
- package/dist/src/layer/czmlLayer.js.map +1 -1
- package/dist/src/layer/featureLayer.d.ts +1 -6
- package/dist/src/layer/featureLayer.js +3 -10
- package/dist/src/layer/featureLayer.js.map +1 -1
- package/dist/src/layer/featureStoreLayer.d.ts +3 -2
- package/dist/src/layer/featureStoreLayer.js +5 -5
- package/dist/src/layer/featureStoreLayer.js.map +1 -1
- package/dist/src/layer/flatGeobufLayer.d.ts +2 -0
- package/dist/src/layer/flatGeobufLayer.js +8 -0
- package/dist/src/layer/flatGeobufLayer.js.map +1 -1
- package/dist/src/layer/geojsonLayer.d.ts +1 -1
- package/dist/src/layer/geojsonLayer.js +5 -12
- package/dist/src/layer/geojsonLayer.js.map +1 -1
- package/dist/src/layer/i3sLayer.d.ts +80 -0
- package/dist/src/layer/i3sLayer.js +242 -0
- package/dist/src/layer/i3sLayer.js.map +1 -0
- package/dist/src/layer/layer.d.ts +29 -10
- package/dist/src/layer/layer.js +114 -34
- package/dist/src/layer/layer.js.map +1 -1
- package/dist/src/layer/layerSymbols.d.ts +4 -0
- package/dist/src/layer/layerSymbols.js +4 -0
- package/dist/src/layer/layerSymbols.js.map +1 -1
- package/dist/src/layer/openStreetMapLayer.d.ts +1 -1
- package/dist/src/layer/openStreetMapLayer.js +11 -6
- package/dist/src/layer/openStreetMapLayer.js.map +1 -1
- package/dist/src/layer/panorama/vectorPanoramaImpl.d.ts +38 -0
- package/dist/src/layer/panorama/vectorPanoramaImpl.js +164 -0
- package/dist/src/layer/panorama/vectorPanoramaImpl.js.map +1 -0
- package/dist/src/layer/panoramaDatasetLayer.d.ts +7 -3
- package/dist/src/layer/panoramaDatasetLayer.js +46 -20
- package/dist/src/layer/panoramaDatasetLayer.js.map +1 -1
- package/dist/src/layer/pointCloudLayer.d.ts +1 -5
- package/dist/src/layer/pointCloudLayer.js +3 -15
- package/dist/src/layer/pointCloudLayer.js.map +1 -1
- package/dist/src/layer/rasterLayer.d.ts +1 -1
- package/dist/src/layer/rasterLayer.js +4 -4
- package/dist/src/layer/rasterLayer.js.map +1 -1
- package/dist/src/layer/singleImageLayer.d.ts +1 -1
- package/dist/src/layer/singleImageLayer.js +3 -3
- package/dist/src/layer/singleImageLayer.js.map +1 -1
- package/dist/src/layer/terrainLayer.d.ts +1 -1
- package/dist/src/layer/terrainLayer.js +8 -6
- package/dist/src/layer/terrainLayer.js.map +1 -1
- package/dist/src/layer/tileProvider/flatGeobufTileProvider.d.ts +1 -1
- package/dist/src/layer/tileProvider/flatGeobufTileProvider.js +7 -5
- package/dist/src/layer/tileProvider/flatGeobufTileProvider.js.map +1 -1
- package/dist/src/layer/tileProvider/mvtTileProvider.d.ts +1 -1
- package/dist/src/layer/tileProvider/mvtTileProvider.js +6 -5
- package/dist/src/layer/tileProvider/mvtTileProvider.js.map +1 -1
- package/dist/src/layer/tileProvider/staticFeatureTileProvider.d.ts +1 -1
- package/dist/src/layer/tileProvider/staticFeatureTileProvider.js +3 -3
- package/dist/src/layer/tileProvider/staticFeatureTileProvider.js.map +1 -1
- package/dist/src/layer/tileProvider/staticGeojsonTileProvider.d.ts +1 -1
- package/dist/src/layer/tileProvider/staticGeojsonTileProvider.js +7 -4
- package/dist/src/layer/tileProvider/staticGeojsonTileProvider.js.map +1 -1
- package/dist/src/layer/tileProvider/tileProvider.d.ts +7 -1
- package/dist/src/layer/tileProvider/tileProvider.js +15 -5
- 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 +3 -3
- package/dist/src/layer/tileProvider/urlTemplateTileProvider.js.map +1 -1
- package/dist/src/layer/tmsLayer.d.ts +1 -1
- package/dist/src/layer/tmsLayer.js +3 -10
- package/dist/src/layer/tmsLayer.js.map +1 -1
- package/dist/src/layer/vectorLayer.d.ts +11 -5
- package/dist/src/layer/vectorLayer.js +21 -10
- package/dist/src/layer/vectorLayer.js.map +1 -1
- package/dist/src/layer/vectorProperties.js +10 -1
- package/dist/src/layer/vectorProperties.js.map +1 -1
- package/dist/src/layer/vectorTileLayer.d.ts +14 -5
- package/dist/src/layer/vectorTileLayer.js +82 -31
- package/dist/src/layer/vectorTileLayer.js.map +1 -1
- package/dist/src/layer/wfsLayer.d.ts +1 -1
- package/dist/src/layer/wfsLayer.js +5 -4
- package/dist/src/layer/wfsLayer.js.map +1 -1
- package/dist/src/layer/wmsLayer.d.ts +4 -1
- package/dist/src/layer/wmsLayer.js +65 -36
- package/dist/src/layer/wmsLayer.js.map +1 -1
- package/dist/src/layer/wmtsLayer.d.ts +1 -1
- package/dist/src/layer/wmtsLayer.js +3 -10
- package/dist/src/layer/wmtsLayer.js.map +1 -1
- package/dist/src/map/baseCesiumMap.d.ts +69 -0
- package/dist/src/map/baseCesiumMap.js +393 -0
- package/dist/src/map/baseCesiumMap.js.map +1 -0
- package/dist/src/map/cesiumMap.d.ts +6 -98
- package/dist/src/map/cesiumMap.js +29 -266
- package/dist/src/map/cesiumMap.js.map +1 -1
- package/dist/src/map/obliqueMap.d.ts +1 -1
- package/dist/src/map/obliqueMap.js +14 -8
- package/dist/src/map/obliqueMap.js.map +1 -1
- package/dist/src/map/openlayersMap.d.ts +1 -1
- package/dist/src/map/openlayersMap.js +3 -4
- package/dist/src/map/openlayersMap.js.map +1 -1
- package/dist/src/map/panoramaMap.d.ts +17 -29
- package/dist/src/map/panoramaMap.js +56 -100
- package/dist/src/map/panoramaMap.js.map +1 -1
- package/dist/src/map/vcsMap.d.ts +15 -2
- package/dist/src/map/vcsMap.js +26 -3
- package/dist/src/map/vcsMap.js.map +1 -1
- package/dist/src/oblique/obliqueCollection.d.ts +1 -1
- package/dist/src/oblique/obliqueCollection.js +3 -4
- package/dist/src/oblique/obliqueCollection.js.map +1 -1
- package/dist/src/panorama/panoramaCameraController.d.ts +4 -0
- package/dist/src/panorama/panoramaCameraController.js +8 -0
- package/dist/src/panorama/panoramaCameraController.js.map +1 -1
- package/dist/src/panorama/panoramaImage.d.ts +10 -1
- package/dist/src/panorama/panoramaImage.js +15 -9
- package/dist/src/panorama/panoramaImage.js.map +1 -1
- package/dist/src/panorama/panoramaImageView.d.ts +6 -1
- package/dist/src/panorama/panoramaImageView.js +11 -2
- package/dist/src/panorama/panoramaImageView.js.map +1 -1
- package/dist/src/panorama/panoramaTileMaterial.d.ts +6 -0
- package/dist/src/panorama/panoramaTileMaterial.js +14 -0
- package/dist/src/panorama/panoramaTileMaterial.js.map +1 -1
- package/dist/src/panorama/panoramaTileMaterialFS.shader.d.ts +1 -1
- package/dist/src/panorama/panoramaTileMaterialFS.shader.js +16 -1
- package/dist/src/panorama/panoramaTileMaterialFS.shader.js.map +1 -1
- package/dist/src/panorama/panoramaTilePrimitiveCollection.d.ts +6 -0
- package/dist/src/panorama/panoramaTilePrimitiveCollection.js +28 -0
- package/dist/src/panorama/panoramaTilePrimitiveCollection.js.map +1 -1
- package/dist/src/style/declarativeStyleItem.js +7 -8
- package/dist/src/style/declarativeStyleItem.js.map +1 -1
- package/dist/src/util/clipping/clippingPolygonObject.d.ts +1 -1
- package/dist/src/util/clipping/clippingPolygonObject.js +3 -4
- package/dist/src/util/clipping/clippingPolygonObject.js.map +1 -1
- package/dist/src/util/displayQuality/displayQuality.js +4 -4
- package/dist/src/util/displayQuality/displayQuality.js.map +1 -1
- package/dist/src/util/editor/createFeatureSession.js +3 -1
- package/dist/src/util/editor/createFeatureSession.js.map +1 -1
- package/dist/src/util/editor/editFeaturesSession.js +9 -2
- package/dist/src/util/editor/editFeaturesSession.js.map +1 -1
- package/dist/src/util/editor/editGeometrySession.js +3 -1
- package/dist/src/util/editor/editGeometrySession.js.map +1 -1
- package/dist/src/util/editor/editorSessionHelpers.d.ts +3 -3
- package/dist/src/util/editor/editorSessionHelpers.js +4 -2
- package/dist/src/util/editor/editorSessionHelpers.js.map +1 -1
- package/dist/src/util/editor/interactions/creationSnapping.js +4 -1
- package/dist/src/util/editor/interactions/creationSnapping.js.map +1 -1
- package/dist/src/util/editor/interactions/ensureHandlerSelectionInteraction.js +2 -2
- package/dist/src/util/editor/interactions/ensureHandlerSelectionInteraction.js.map +1 -1
- package/dist/src/util/editor/interactions/layerSnapping.js +4 -1
- package/dist/src/util/editor/interactions/layerSnapping.js.map +1 -1
- package/dist/src/util/editor/interactions/mapInteractionController.js +12 -1
- package/dist/src/util/editor/interactions/mapInteractionController.js.map +1 -1
- package/dist/src/util/editor/interactions/translationSnapping.js +4 -2
- package/dist/src/util/editor/interactions/translationSnapping.js.map +1 -1
- package/dist/src/util/editor/selectFeaturesSession.js +1 -1
- package/dist/src/util/editor/selectFeaturesSession.js.map +1 -1
- package/dist/src/util/editor/transformation/create3DHandlers.d.ts +2 -2
- package/dist/src/util/editor/transformation/create3DHandlers.js.map +1 -1
- package/dist/src/util/editor/transformation/transformationHandler.js +5 -2
- package/dist/src/util/editor/transformation/transformationHandler.js.map +1 -1
- package/dist/src/util/editor/transformation/translateInteraction.js +2 -2
- package/dist/src/util/editor/transformation/translateInteraction.js.map +1 -1
- package/dist/src/util/fetch.d.ts +7 -0
- package/dist/src/util/fetch.js +7 -0
- package/dist/src/util/fetch.js.map +1 -1
- package/dist/src/util/flight/flightInstance.d.ts +1 -1
- package/dist/src/util/flight/flightInstance.js +3 -4
- package/dist/src/util/flight/flightInstance.js.map +1 -1
- package/dist/src/util/mapCollection.d.ts +5 -0
- package/dist/src/util/mapCollection.js +14 -0
- package/dist/src/util/mapCollection.js.map +1 -1
- package/dist/src/util/renderScreenshot.js +2 -3
- package/dist/src/util/renderScreenshot.js.map +1 -1
- package/dist/src/util/viewpoint.js +1 -1
- package/dist/src/util/viewpoint.js.map +1 -1
- package/dist/src/vcsApp.d.ts +2 -3
- package/dist/src/vcsApp.js.map +1 -1
- package/dist/src/vcsModuleHelpers.d.ts +5 -2
- package/dist/src/vcsModuleHelpers.js +27 -1
- package/dist/src/vcsModuleHelpers.js.map +1 -1
- package/dist/src/vcsObject.d.ts +2 -1
- package/dist/src/vcsObject.js +9 -1
- package/dist/src/vcsObject.js.map +1 -1
- package/dist/src/vectorCluster/vectorClusterGroup.d.ts +1 -1
- package/dist/src/vectorCluster/vectorClusterGroup.js +3 -4
- package/dist/src/vectorCluster/vectorClusterGroup.js.map +1 -1
- package/dist/src/vectorCluster/vectorClusterStyleItem.d.ts +1 -1
- package/dist/src/vectorCluster/vectorClusterStyleItem.js +3 -4
- package/dist/src/vectorCluster/vectorClusterStyleItem.js.map +1 -1
- package/dist/tests/unit/helpers/cesiumHelpers.d.ts +11 -1
- package/dist/tests/unit/helpers/cesiumHelpers.js +26 -3
- package/dist/tests/unit/helpers/cesiumHelpers.js.map +1 -1
- package/dist/tests/unit/helpers/panoramaHelpers.js +1 -1
- package/dist/tests/unit/helpers/panoramaHelpers.js.map +1 -1
- package/index.ts +30 -5
- package/package.json +3 -3
- package/src/category/category.ts +3 -4
- package/src/cesium/cesium.d.ts +12 -0
- package/src/cesium/cesium3DTileFeature.ts +23 -3
- package/src/cesium/cesium3DTilePointFeature.ts +3 -1
- package/src/classRegistry.ts +8 -3
- package/src/featureProvider/abstractAttributeProvider.ts +201 -0
- package/src/featureProvider/abstractFeatureProvider.ts +32 -51
- package/src/featureProvider/compositeFeatureProvider.ts +103 -0
- package/src/featureProvider/csvAttributeProvider.ts +186 -0
- package/src/featureProvider/featureProviderFactory.ts +31 -0
- package/src/featureProvider/i3sAttributeProvider.ts +60 -0
- package/src/featureProvider/jsonAttributeProvider.ts +109 -0
- package/src/featureProvider/tileProviderFeatureProvider.ts +13 -14
- package/src/featureProvider/urlIdAttributeProvider.ts +82 -0
- package/src/featureProvider/wmsFeatureProvider.ts +31 -10
- package/src/global.d.ts +2 -0
- package/src/interaction/coordinateAtPixel.ts +4 -6
- package/src/interaction/ensurePositionInteraction.ts +50 -0
- package/src/interaction/eventHandler.ts +12 -1
- package/src/interaction/featureAtPixelInteraction.ts +92 -32
- package/src/interaction/featureProviderInteraction.ts +59 -38
- package/src/interaction/panoramaImageSelection.ts +4 -2
- package/src/layer/cesium/cesiumTilesetCesiumImpl.ts +297 -197
- package/src/layer/cesium/i3sCesiumImpl.ts +141 -0
- package/src/layer/cesium/rasterLayerCesiumImpl.ts +3 -3
- package/src/layer/cesium/terrainCesiumImpl.ts +3 -3
- package/src/layer/cesium/vcsTile/vcsQuadtreeTileProvider.ts +4 -3
- package/src/layer/cesium/vectorContext.ts +1 -1
- package/src/layer/cesium/vectorRasterTileCesiumImpl.ts +7 -6
- package/src/layer/cesium/vectorTileImageryProvider.ts +2 -2
- package/src/layer/cesiumTilesetLayer.ts +60 -8
- package/src/layer/cogLayer.ts +5 -5
- package/src/layer/czmlLayer.ts +4 -4
- package/src/layer/featureLayer.ts +5 -16
- package/src/layer/featureStoreLayer.ts +11 -5
- package/src/layer/flatGeobufLayer.ts +12 -0
- package/src/layer/geojsonLayer.ts +5 -12
- package/src/layer/i3sLayer.ts +343 -0
- package/src/layer/layer.ts +178 -39
- package/src/layer/layerSymbols.ts +5 -0
- package/src/layer/openStreetMapLayer.ts +13 -6
- package/src/layer/panorama/vectorPanoramaImpl.ts +238 -0
- package/src/layer/panoramaDatasetLayer.ts +69 -23
- package/src/layer/pointCloudLayer.ts +5 -20
- package/src/layer/rasterLayer.ts +4 -4
- package/src/layer/singleImageLayer.ts +5 -3
- package/src/layer/terrainLayer.ts +9 -6
- package/src/layer/tileProvider/flatGeobufTileProvider.ts +9 -5
- package/src/layer/tileProvider/mvtTileProvider.ts +10 -5
- package/src/layer/tileProvider/staticFeatureTileProvider.ts +5 -3
- package/src/layer/tileProvider/staticGeojsonTileProvider.ts +11 -4
- package/src/layer/tileProvider/tileProvider.ts +18 -5
- package/src/layer/tileProvider/urlTemplateTileProvider.ts +7 -3
- package/src/layer/tmsLayer.ts +3 -10
- package/src/layer/vectorLayer.ts +29 -11
- package/src/layer/vectorProperties.ts +10 -1
- package/src/layer/vectorTileLayer.ts +141 -53
- package/src/layer/wfsLayer.ts +7 -4
- package/src/layer/wmsLayer.ts +80 -48
- package/src/layer/wmtsLayer.ts +3 -10
- package/src/map/baseCesiumMap.ts +600 -0
- package/src/map/cesiumMap.ts +99 -457
- package/src/map/obliqueMap.ts +16 -10
- package/src/map/openlayersMap.ts +5 -5
- package/src/map/panoramaMap.ts +74 -139
- package/src/map/vcsMap.ts +44 -4
- package/src/oblique/obliqueCollection.ts +5 -4
- package/src/ol/ol.d.ts +13 -2
- package/src/panorama/panoramaCameraController.ts +13 -1
- package/src/panorama/panoramaImage.ts +25 -8
- package/src/panorama/panoramaImageView.ts +29 -3
- package/src/panorama/panoramaTileMaterial.ts +20 -0
- package/src/panorama/panoramaTileMaterialFS.glsl +16 -1
- package/src/panorama/panoramaTilePrimitiveCollection.ts +34 -0
- package/src/style/declarativeStyleItem.ts +7 -9
- package/src/util/clipping/clippingPolygonObject.ts +5 -4
- package/src/util/displayQuality/displayQuality.ts +4 -4
- package/src/util/editor/createFeatureSession.ts +4 -1
- package/src/util/editor/editFeaturesSession.ts +14 -4
- package/src/util/editor/editGeometrySession.ts +3 -1
- package/src/util/editor/editorSessionHelpers.ts +5 -3
- package/src/util/editor/interactions/creationSnapping.ts +7 -1
- package/src/util/editor/interactions/ensureHandlerSelectionInteraction.ts +2 -2
- package/src/util/editor/interactions/layerSnapping.ts +7 -1
- package/src/util/editor/interactions/mapInteractionController.ts +12 -2
- package/src/util/editor/interactions/translationSnapping.ts +6 -4
- package/src/util/editor/selectFeaturesSession.ts +1 -1
- package/src/util/editor/transformation/create3DHandlers.ts +2 -2
- package/src/util/editor/transformation/transformationHandler.ts +5 -3
- package/src/util/editor/transformation/translateInteraction.ts +4 -4
- package/src/util/fetch.ts +7 -0
- package/src/util/flight/flightInstance.ts +6 -5
- package/src/util/mapCollection.ts +18 -0
- package/src/util/renderScreenshot.ts +4 -8
- package/src/util/viewpoint.ts +2 -2
- package/src/vcsApp.ts +7 -8
- package/src/vcsModuleHelpers.ts +62 -4
- package/src/vcsObject.ts +10 -1
- package/src/vectorCluster/vectorClusterGroup.ts +7 -4
- package/src/vectorCluster/vectorClusterStyleItem.ts +8 -4
- package/dist/src/map/cesiumMapHelpers.d.ts +0 -7
- package/dist/src/map/cesiumMapHelpers.js +0 -144
- package/dist/src/map/cesiumMapHelpers.js.map +0 -1
- package/src/map/cesiumMapHelpers.ts +0 -219
|
@@ -2,8 +2,6 @@ import { check, maybe, oneOf } from '@vcsuite/check';
|
|
|
2
2
|
import CesiumTilesetLayer from './cesiumTilesetLayer.js';
|
|
3
3
|
import { defaultDeclarativeStyle } from '../style/declarativeStyleItem.js';
|
|
4
4
|
import VectorStyleItem from '../style/vectorStyleItem.js';
|
|
5
|
-
import CesiumMap from '../map/cesiumMap.js';
|
|
6
|
-
import CesiumTilesetCesiumImpl from './cesium/cesiumTilesetCesiumImpl.js';
|
|
7
5
|
import { layerClassRegistry } from '../classRegistry.js';
|
|
8
6
|
/**
|
|
9
7
|
* represents a specific PointCloudLayer layer for cesium.
|
|
@@ -29,10 +27,9 @@ class PointCloudLayer extends CesiumTilesetLayer {
|
|
|
29
27
|
*/
|
|
30
28
|
defaultPointSize;
|
|
31
29
|
_pointSize;
|
|
32
|
-
_supportedMaps = [CesiumMap.className];
|
|
33
30
|
constructor(options) {
|
|
34
|
-
super(options);
|
|
35
31
|
const defaultOptions = PointCloudLayer.getDefaultOptions();
|
|
32
|
+
super({ ...defaultOptions, ...options });
|
|
36
33
|
this.defaultPointSize =
|
|
37
34
|
options.pointSize != null ? options.pointSize : defaultOptions.pointSize;
|
|
38
35
|
this._pointSize = this.defaultPointSize;
|
|
@@ -52,14 +49,6 @@ class PointCloudLayer extends CesiumTilesetLayer {
|
|
|
52
49
|
await super.initialize();
|
|
53
50
|
this.pointSize = this._pointSize;
|
|
54
51
|
}
|
|
55
|
-
createImplementationsForMap(map) {
|
|
56
|
-
if (map instanceof CesiumMap) {
|
|
57
|
-
return [
|
|
58
|
-
new CesiumTilesetCesiumImpl(map, this.getImplementationOptions()),
|
|
59
|
-
];
|
|
60
|
-
}
|
|
61
|
-
return [];
|
|
62
|
-
}
|
|
63
52
|
/**
|
|
64
53
|
* Clears the style of this layer resets the point size to the defaultPointSize
|
|
65
54
|
*/
|
|
@@ -78,9 +67,8 @@ class PointCloudLayer extends CesiumTilesetLayer {
|
|
|
78
67
|
super.setStyle(style, silent);
|
|
79
68
|
}
|
|
80
69
|
}
|
|
81
|
-
toJSON() {
|
|
82
|
-
const config = super.toJSON();
|
|
83
|
-
const defaultOptions = PointCloudLayer.getDefaultOptions();
|
|
70
|
+
toJSON(defaultOptions = PointCloudLayer.getDefaultOptions()) {
|
|
71
|
+
const config = super.toJSON(defaultOptions);
|
|
84
72
|
if (this.defaultPointSize !== defaultOptions.pointSize) {
|
|
85
73
|
config.pointSize = this.defaultPointSize;
|
|
86
74
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pointCloudLayer.js","sourceRoot":"","sources":["../../../src/layer/pointCloudLayer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAIrD,OAAO,kBAAkB,MAAM,yBAAyB,CAAC;AAGzD,OAAO,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAC;AAE3E,OAAO,eAAe,MAAM,6BAA6B,CAAC;AAC1D,OAAO,
|
|
1
|
+
{"version":3,"file":"pointCloudLayer.js","sourceRoot":"","sources":["../../../src/layer/pointCloudLayer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAIrD,OAAO,kBAAkB,MAAM,yBAAyB,CAAC;AAGzD,OAAO,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAC;AAE3E,OAAO,eAAe,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAOzD;;;;;;;;GAQG;AACH,MAAM,eAAgB,SAAQ,kBAAkB;IAC9C,MAAM,KAAK,SAAS;QAClB,OAAO,iBAAiB,CAAC;IAC3B,CAAC;IAED,MAAM,CAAC,iBAAiB;QACtB,OAAO;YACL,GAAG,kBAAkB,CAAC,iBAAiB,EAAE;YACzC,SAAS,EAAE,SAAS;SACrB,CAAC;IACJ,CAAC;IAED;;OAEG;IACH,gBAAgB,CAA8B;IAEtC,UAAU,CAA8B;IAEhD,YAAY,OAA0B;QACpC,MAAM,cAAc,GAAG,eAAe,CAAC,iBAAiB,EAAE,CAAC;QAC3D,KAAK,CAAC,EAAE,GAAG,cAAc,EAAE,GAAG,OAAO,EAAE,CAAC,CAAC;QAEzC,IAAI,CAAC,gBAAgB;YACnB,OAAO,CAAC,SAAS,IAAI,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,cAAc,CAAC,SAAS,CAAC;QAC3E,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,gBAAgB,CAAC;IAC1C,CAAC;IAED,sBAAsB,CACpB,YAGa,EACb,YAAqD;QAErD,OAAO,KAAK,CAAC,sBAAsB,CACjC,YAAY,EACZ,YAAY,IAAI,uBAAuB,CACxC,CAAC;IACJ,CAAC;IAED,IAAI,SAAS;QACX,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;IAED,IAAI,SAAS,CAAC,IAAiC;QAC7C,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC;QAC1C,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;QACtB,IAAI,CAAC,KAA8B,CAAC,SAAS,GAAG,IAAI,EAAE,QAAQ,EAAE,CAAC;IACpE,CAAC;IAED,KAAK,CAAC,UAAU;QACd,MAAM,KAAK,CAAC,UAAU,EAAE,CAAC;QACzB,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC;IACnC,CAAC;IAED;;OAEG;IACH,UAAU;QACR,KAAK,CAAC,UAAU,EAAE,CAAC;QACnB,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,gBAAgB,CAAC;IACzC,CAAC;IAED;;OAEG;IACH,QAAQ,CAAC,KAA0C,EAAE,MAAgB;QACnE,IAAI,KAAK,YAAY,eAAe,EAAE,CAAC;YACrC,IAAI,CAAC,SAAS,EAAE,CAAC,OAAO,CACtB,oDAAoD,CACrD,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,KAAK,CAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAChC,CAAC;IACH,CAAC;IAED,MAAM,CACJ,cAAc,GAAG,eAAe,CAAC,iBAAiB,EAAE;QAEpD,MAAM,MAAM,GAAsB,KAAK,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;QAE/D,IAAI,IAAI,CAAC,gBAAgB,KAAK,cAAc,CAAC,SAAS,EAAE,CAAC;YACvD,MAAM,CAAC,SAAS,GAAG,IAAI,CAAC,gBAAgB,CAAC;QAC3C,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;CACF;AAED,kBAAkB,CAAC,aAAa,CAAC,eAAe,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC;AAC7E,eAAe,eAAe,CAAC"}
|
|
@@ -132,7 +132,7 @@ declare class RasterLayer<I extends LayerImplementation<VcsMap> & RasterLayerImp
|
|
|
132
132
|
get opacity(): number;
|
|
133
133
|
set opacity(opacity: number);
|
|
134
134
|
getImplementationOptions(): RasterLayerImplementationOptions;
|
|
135
|
-
toJSON(): RasterLayerOptions;
|
|
135
|
+
toJSON(defaultOptions?: RasterLayerOptions): RasterLayerOptions;
|
|
136
136
|
destroy(): void;
|
|
137
137
|
}
|
|
138
138
|
export default RasterLayer;
|
|
@@ -77,6 +77,7 @@ class RasterLayer extends Layer {
|
|
|
77
77
|
static getDefaultOptions() {
|
|
78
78
|
return {
|
|
79
79
|
...Layer.getDefaultOptions(),
|
|
80
|
+
url: '',
|
|
80
81
|
minLevel: 0,
|
|
81
82
|
maxLevel: 18,
|
|
82
83
|
minRenderingLevel: undefined,
|
|
@@ -130,8 +131,8 @@ class RasterLayer extends Layer {
|
|
|
130
131
|
* @param options
|
|
131
132
|
*/
|
|
132
133
|
constructor(options) {
|
|
133
|
-
super({ url: '', ...options });
|
|
134
134
|
const defaultOptions = RasterLayer.getDefaultOptions();
|
|
135
|
+
super({ ...defaultOptions, ...options });
|
|
135
136
|
this.extent = options.extent ? new Extent(options.extent) : new Extent();
|
|
136
137
|
this.tilingSchema = parseEnumValue(options.tilingSchema, TilingScheme, defaultOptions.tilingSchema);
|
|
137
138
|
this.maxLevel = parseInteger(options.maxLevel, defaultOptions.maxLevel);
|
|
@@ -196,9 +197,8 @@ class RasterLayer extends Layer {
|
|
|
196
197
|
}
|
|
197
198
|
return options;
|
|
198
199
|
}
|
|
199
|
-
toJSON() {
|
|
200
|
-
const config = super.toJSON();
|
|
201
|
-
const defaultOptions = RasterLayer.getDefaultOptions();
|
|
200
|
+
toJSON(defaultOptions = RasterLayer.getDefaultOptions()) {
|
|
201
|
+
const config = super.toJSON(defaultOptions);
|
|
202
202
|
if (this.extent?.equals(new Extent())) {
|
|
203
203
|
delete config.extent;
|
|
204
204
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rasterLayer.js","sourceRoot":"","sources":["../../../src/layer/rasterLayer.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"rasterLayer.js","sourceRoot":"","sources":["../../../src/layer/rasterLayer.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,6 +26,6 @@ declare class SingleImageLayer extends RasterLayer<SingleImageCesiumImpl | Singl
|
|
|
26
26
|
* @param extent
|
|
27
27
|
*/
|
|
28
28
|
setExtent(extent: Extent): void;
|
|
29
|
-
toJSON(): SingleImageOptions;
|
|
29
|
+
toJSON(defaultOptions?: SingleImageOptions): SingleImageOptions;
|
|
30
30
|
}
|
|
31
31
|
export default SingleImageLayer;
|
|
@@ -23,8 +23,8 @@ class SingleImageLayer extends RasterLayer {
|
|
|
23
23
|
}
|
|
24
24
|
credit;
|
|
25
25
|
constructor(options) {
|
|
26
|
-
super(options);
|
|
27
26
|
const defaultOptions = SingleImageLayer.getDefaultOptions();
|
|
27
|
+
super({ ...defaultOptions, ...options });
|
|
28
28
|
this.credit = options.credit || defaultOptions.credit;
|
|
29
29
|
if (!this.extent.isValid()) {
|
|
30
30
|
this.getLogger().warning(`layer ${this.name} was constructed with an invalid extent, defaulting to global extent`);
|
|
@@ -65,8 +65,8 @@ class SingleImageLayer extends RasterLayer {
|
|
|
65
65
|
// eslint-disable-next-line no-void
|
|
66
66
|
void this.forceRedraw();
|
|
67
67
|
}
|
|
68
|
-
toJSON() {
|
|
69
|
-
const config = super.toJSON();
|
|
68
|
+
toJSON(defaultOptions = SingleImageLayer.getDefaultOptions()) {
|
|
69
|
+
const config = super.toJSON(defaultOptions);
|
|
70
70
|
delete config.tilingSchema;
|
|
71
71
|
if (this.credit) {
|
|
72
72
|
config.credit = this.credit;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"singleImageLayer.js","sourceRoot":"","sources":["../../../src/layer/singleImageLayer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAKvC,OAAO,WAAW,MAAM,kBAAkB,CAAC;AAC3C,OAAO,qBAAqB,MAAM,mCAAmC,CAAC;AACtE,OAAO,yBAAyB,MAAM,2CAA2C,CAAC;AAClF,OAAO,SAAS,MAAM,qBAAqB,CAAC;AAC5C,OAAO,aAAa,MAAM,yBAAyB,CAAC;AACpD,OAAO,MAAM,MAAM,mBAAmB,CAAC;AACvC,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAYxD;;;GAGG;AACH,MAAM,gBAAiB,SAAQ,WAE9B;IACC,MAAM,KAAK,SAAS;QAClB,OAAO,kBAAkB,CAAC;IAC5B,CAAC;IAED,MAAM,CAAC,iBAAiB;QACtB,OAAO;YACL,GAAG,WAAW,CAAC,iBAAiB,EAAE;YAClC,MAAM,EAAE,SAAS;SAClB,CAAC;IACJ,CAAC;IAED,MAAM,CAAqB;IAE3B,YAAY,OAA2B;QACrC,
|
|
1
|
+
{"version":3,"file":"singleImageLayer.js","sourceRoot":"","sources":["../../../src/layer/singleImageLayer.ts"],"names":[],"mappings":"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"}
|
|
@@ -28,6 +28,6 @@ declare class TerrainLayer extends Layer<TerrainCesiumImpl> {
|
|
|
28
28
|
* @param coords - the height is added to the coordinates in place
|
|
29
29
|
*/
|
|
30
30
|
getHeightForWGS84Coordinates(coords: Coordinate[]): Promise<Coordinate[]>;
|
|
31
|
-
toJSON(): TerrainOptions;
|
|
31
|
+
toJSON(defaultOptions?: TerrainOptions): TerrainOptions;
|
|
32
32
|
}
|
|
33
33
|
export default TerrainLayer;
|
|
@@ -4,6 +4,8 @@ import { getHeightFromTerrainProvider, getTerrainProviderForUrl, } from './terra
|
|
|
4
4
|
import CesiumMap from '../map/cesiumMap.js';
|
|
5
5
|
import TerrainCesiumImpl from './cesium/terrainCesiumImpl.js';
|
|
6
6
|
import { layerClassRegistry } from '../classRegistry.js';
|
|
7
|
+
import PanoramaMap from '../map/panoramaMap.js';
|
|
8
|
+
import BaseCesiumMap from '../map/baseCesiumMap.js';
|
|
7
9
|
/**
|
|
8
10
|
* @group Layer
|
|
9
11
|
*/
|
|
@@ -14,16 +16,17 @@ class TerrainLayer extends Layer {
|
|
|
14
16
|
static getDefaultOptions() {
|
|
15
17
|
return {
|
|
16
18
|
...Layer.getDefaultOptions(),
|
|
19
|
+
ignoreMapLayerTypes: true,
|
|
17
20
|
requestVertexNormals: true,
|
|
18
21
|
requestWaterMask: false,
|
|
19
22
|
};
|
|
20
23
|
}
|
|
21
|
-
_supportedMaps = [CesiumMap.className];
|
|
24
|
+
_supportedMaps = [CesiumMap.className, PanoramaMap.className];
|
|
22
25
|
requestVertexNormals;
|
|
23
26
|
requestWaterMask;
|
|
24
27
|
constructor(options) {
|
|
25
|
-
super(options);
|
|
26
28
|
const defaultOptions = TerrainLayer.getDefaultOptions();
|
|
29
|
+
super({ ...defaultOptions, ...options });
|
|
27
30
|
this.requestVertexNormals = parseBoolean(options.requestVertexNormals, defaultOptions.requestVertexNormals);
|
|
28
31
|
this.requestWaterMask = parseBoolean(options.requestWaterMask, defaultOptions.requestWaterMask);
|
|
29
32
|
}
|
|
@@ -35,7 +38,7 @@ class TerrainLayer extends Layer {
|
|
|
35
38
|
};
|
|
36
39
|
}
|
|
37
40
|
createImplementationsForMap(map) {
|
|
38
|
-
if (map instanceof
|
|
41
|
+
if (map instanceof BaseCesiumMap) {
|
|
39
42
|
return [new TerrainCesiumImpl(map, this.getImplementationOptions())];
|
|
40
43
|
}
|
|
41
44
|
return [];
|
|
@@ -51,9 +54,8 @@ class TerrainLayer extends Layer {
|
|
|
51
54
|
}, this.headers);
|
|
52
55
|
return getHeightFromTerrainProvider(terrainProvider, coords, undefined, coords);
|
|
53
56
|
}
|
|
54
|
-
toJSON() {
|
|
55
|
-
const config = super.toJSON();
|
|
56
|
-
const defaultOptions = TerrainLayer.getDefaultOptions();
|
|
57
|
+
toJSON(defaultOptions = TerrainLayer.getDefaultOptions()) {
|
|
58
|
+
const config = super.toJSON(defaultOptions);
|
|
57
59
|
if (this.requestVertexNormals !== defaultOptions.requestVertexNormals) {
|
|
58
60
|
config.requestVertexNormals = this.requestVertexNormals;
|
|
59
61
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terrainLayer.js","sourceRoot":"","sources":["../../../src/layer/terrainLayer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAGhD,OAAO,KAAK,MAAM,YAAY,CAAC;AAC/B,OAAO,EACL,4BAA4B,EAC5B,wBAAwB,GACzB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,SAAS,MAAM,qBAAqB,CAAC;AAC5C,OAAO,iBAAiB,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"terrainLayer.js","sourceRoot":"","sources":["../../../src/layer/terrainLayer.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,5 +20,5 @@ export default class FlatGeobufTileProvider extends TileProvider {
|
|
|
20
20
|
getReaderAndProjection(level: number): Promise<HttpReader>;
|
|
21
21
|
getLevelExtent(level: number): Promise<Extent>;
|
|
22
22
|
loader(x: number, y: number, z: number): Promise<Feature[]>;
|
|
23
|
-
toJSON(): FlatGeobufTileProviderOptions;
|
|
23
|
+
toJSON(defaultOptions?: FlatGeobufTileProviderOptions): FlatGeobufTileProviderOptions;
|
|
24
24
|
}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
|
-
import TileProvider
|
|
1
|
+
import TileProvider from './tileProvider.js';
|
|
2
2
|
import Projection, { getDefaultProjection, mercatorProjection, } from '../../util/projection.js';
|
|
3
3
|
import Extent from '../../util/extent.js';
|
|
4
4
|
import { tileProviderClassRegistry } from '../../classRegistry.js';
|
|
5
5
|
import { getOlFeatures, getRootNode, getValidReader, } from '../flatGeobufHelpers.js';
|
|
6
|
+
import { rectangleToMercatorExtent } from '../../util/math.js';
|
|
6
7
|
export default class FlatGeobufTileProvider extends TileProvider {
|
|
7
8
|
static get className() {
|
|
8
9
|
return 'FlatGeobufTileProvider';
|
|
@@ -17,8 +18,9 @@ export default class FlatGeobufTileProvider extends TileProvider {
|
|
|
17
18
|
_levels;
|
|
18
19
|
_projection;
|
|
19
20
|
constructor(options) {
|
|
21
|
+
const defaultOptions = FlatGeobufTileProvider.getDefaultOptions();
|
|
20
22
|
const baseLevels = options.levels.map((level) => level.level);
|
|
21
|
-
super({ ...options, baseLevels });
|
|
23
|
+
super({ ...defaultOptions, ...options, baseLevels });
|
|
22
24
|
this._levels = new Map(options.levels.map((level) => [level.level, { url: level.url }]));
|
|
23
25
|
this._projection = options.projection
|
|
24
26
|
? new Projection(options.projection)
|
|
@@ -44,7 +46,7 @@ export default class FlatGeobufTileProvider extends TileProvider {
|
|
|
44
46
|
}
|
|
45
47
|
async loader(x, y, z) {
|
|
46
48
|
const rectangle = this.tilingScheme.tileXYToRectangle(x, y, z);
|
|
47
|
-
const extent =
|
|
49
|
+
const extent = rectangleToMercatorExtent(rectangle);
|
|
48
50
|
const mercatorExtent = new Extent({
|
|
49
51
|
coordinates: extent,
|
|
50
52
|
projection: mercatorProjection,
|
|
@@ -52,13 +54,13 @@ export default class FlatGeobufTileProvider extends TileProvider {
|
|
|
52
54
|
const reader = await this.getReaderAndProjection(z);
|
|
53
55
|
return getOlFeatures(reader, this._projection, mercatorExtent);
|
|
54
56
|
}
|
|
55
|
-
toJSON() {
|
|
57
|
+
toJSON(defaultOptions = FlatGeobufTileProvider.getDefaultOptions()) {
|
|
56
58
|
const config = {
|
|
57
59
|
levels: Array.from(this._levels.entries()).map(([level, { url }]) => ({
|
|
58
60
|
level,
|
|
59
61
|
url,
|
|
60
62
|
})),
|
|
61
|
-
...super.toJSON(),
|
|
63
|
+
...super.toJSON(defaultOptions),
|
|
62
64
|
};
|
|
63
65
|
delete config.baseLevels;
|
|
64
66
|
if (this._projection.epsg !== getDefaultProjection().epsg) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"flatGeobufTileProvider.js","sourceRoot":"","sources":["../../../../src/layer/tileProvider/flatGeobufTileProvider.ts"],"names":[],"mappings":"AAGA,OAAO,YAAY,
|
|
1
|
+
{"version":3,"file":"flatGeobufTileProvider.js","sourceRoot":"","sources":["../../../../src/layer/tileProvider/flatGeobufTileProvider.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,6 +22,6 @@ declare class MVTTileProvider extends TileProvider {
|
|
|
22
22
|
*/
|
|
23
23
|
set locale(value: string);
|
|
24
24
|
loader(x: number, y: number, z: number, headers?: Record<string, string>): Promise<Feature[]>;
|
|
25
|
-
toJSON(): MVTTileProviderOptions;
|
|
25
|
+
toJSON(defaultOptions?: MVTTileProviderOptions): MVTTileProviderOptions;
|
|
26
26
|
}
|
|
27
27
|
export default MVTTileProvider;
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
import MVT from 'ol/format/MVT.js';
|
|
2
2
|
import Feature from 'ol/Feature.js';
|
|
3
3
|
import { getCenter } from 'ol/extent.js';
|
|
4
|
-
import TileProvider
|
|
4
|
+
import TileProvider from './tileProvider.js';
|
|
5
5
|
import { getURL } from './urlTemplateTileProvider.js';
|
|
6
6
|
import { getInitForUrl, requestArrayBuffer } from '../../util/fetch.js';
|
|
7
7
|
import { tileProviderClassRegistry } from '../../classRegistry.js';
|
|
8
|
+
import { rectangleToMercatorExtent } from '../../util/math.js';
|
|
8
9
|
/**
|
|
9
10
|
* Loads the pbf tiles
|
|
10
11
|
*/
|
|
@@ -22,7 +23,7 @@ class MVTTileProvider extends TileProvider {
|
|
|
22
23
|
_mvtFormat = new MVT({ featureClass: Feature });
|
|
23
24
|
constructor(options) {
|
|
24
25
|
const defaultOptions = MVTTileProvider.getDefaultOptions();
|
|
25
|
-
super(options);
|
|
26
|
+
super({ ...defaultOptions, ...options });
|
|
26
27
|
this.url = options.url || defaultOptions.url;
|
|
27
28
|
}
|
|
28
29
|
get locale() {
|
|
@@ -43,7 +44,7 @@ class MVTTileProvider extends TileProvider {
|
|
|
43
44
|
async loader(x, y, z, headers) {
|
|
44
45
|
const rectangle = this.tilingScheme.tileXYToRectangle(x, y, z);
|
|
45
46
|
const url = getURL(this.url, x, y, z, rectangle, this.locale);
|
|
46
|
-
const extent =
|
|
47
|
+
const extent = rectangleToMercatorExtent(rectangle);
|
|
47
48
|
const center = getCenter(extent);
|
|
48
49
|
const init = getInitForUrl(this.url, headers);
|
|
49
50
|
const data = await requestArrayBuffer(url, init);
|
|
@@ -67,8 +68,8 @@ class MVTTileProvider extends TileProvider {
|
|
|
67
68
|
});
|
|
68
69
|
return features;
|
|
69
70
|
}
|
|
70
|
-
toJSON() {
|
|
71
|
-
const config = super.toJSON();
|
|
71
|
+
toJSON(defaultOptions = MVTTileProvider.getDefaultOptions()) {
|
|
72
|
+
const config = super.toJSON(defaultOptions);
|
|
72
73
|
if (this.url) {
|
|
73
74
|
config.url = this.url;
|
|
74
75
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mvtTileProvider.js","sourceRoot":"","sources":["../../../../src/layer/tileProvider/mvtTileProvider.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,kBAAkB,CAAC;AACnC,OAAO,OAAO,MAAM,eAAe,CAAC;AACpC,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAGzC,OAAO,YAAY,
|
|
1
|
+
{"version":3,"file":"mvtTileProvider.js","sourceRoot":"","sources":["../../../../src/layer/tileProvider/mvtTileProvider.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,6 @@ export default class StaticFeatureTileProvider extends TileProvider {
|
|
|
10
10
|
private _features;
|
|
11
11
|
constructor(options: StaticFeatureTileProviderOptions);
|
|
12
12
|
loader(_x: number, _y: number, _z: number, _headers?: Record<string, string>): Promise<Feature[]>;
|
|
13
|
-
toJSON(): StaticFeatureTileProviderOptions;
|
|
13
|
+
toJSON(defaultOptions?: StaticFeatureTileProviderOptions): StaticFeatureTileProviderOptions;
|
|
14
14
|
destroy(): void;
|
|
15
15
|
}
|
|
@@ -12,7 +12,7 @@ export default class StaticFeatureTileProvider extends TileProvider {
|
|
|
12
12
|
_features;
|
|
13
13
|
constructor(options) {
|
|
14
14
|
const defaultOptions = StaticFeatureTileProvider.getDefaultOptions();
|
|
15
|
-
super({ ...options, baseLevels: [0] });
|
|
15
|
+
super({ ...defaultOptions, ...options, baseLevels: [0] });
|
|
16
16
|
this._features = options.features || defaultOptions.features;
|
|
17
17
|
}
|
|
18
18
|
loader(
|
|
@@ -26,8 +26,8 @@ export default class StaticFeatureTileProvider extends TileProvider {
|
|
|
26
26
|
_headers) {
|
|
27
27
|
return Promise.resolve(this._features);
|
|
28
28
|
}
|
|
29
|
-
toJSON() {
|
|
30
|
-
const config = super.toJSON();
|
|
29
|
+
toJSON(defaultOptions = StaticFeatureTileProvider.getDefaultOptions()) {
|
|
30
|
+
const config = super.toJSON(defaultOptions);
|
|
31
31
|
delete config.baseLevels;
|
|
32
32
|
const staticFeatureConfig = {
|
|
33
33
|
...structuredClone(config),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"staticFeatureTileProvider.js","sourceRoot":"","sources":["../../../../src/layer/tileProvider/staticFeatureTileProvider.ts"],"names":[],"mappings":"AAEA,OAAO,YAAY,MAAM,mBAAmB,CAAC;AAS7C,MAAM,CAAC,OAAO,OAAO,yBAA0B,SAAQ,YAAY;IACjE,MAAM,KAAK,SAAS;QAClB,OAAO,2BAA2B,CAAC;IACrC,CAAC;IAED,MAAM,CAAC,iBAAiB;QACtB,OAAO;YACL,GAAG,YAAY,CAAC,iBAAiB,EAAE;YACnC,QAAQ,EAAE,EAAE;SACb,CAAC;IACJ,CAAC;IAEO,SAAS,CAAY;IAE7B,YAAY,OAAyC;QACnD,MAAM,cAAc,GAAG,yBAAyB,CAAC,iBAAiB,EAAE,CAAC;QACrE,KAAK,CAAC,EAAE,GAAG,OAAO,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"staticFeatureTileProvider.js","sourceRoot":"","sources":["../../../../src/layer/tileProvider/staticFeatureTileProvider.ts"],"names":[],"mappings":"AAEA,OAAO,YAAY,MAAM,mBAAmB,CAAC;AAS7C,MAAM,CAAC,OAAO,OAAO,yBAA0B,SAAQ,YAAY;IACjE,MAAM,KAAK,SAAS;QAClB,OAAO,2BAA2B,CAAC;IACrC,CAAC;IAED,MAAM,CAAC,iBAAiB;QACtB,OAAO;YACL,GAAG,YAAY,CAAC,iBAAiB,EAAE;YACnC,QAAQ,EAAE,EAAE;SACb,CAAC;IACJ,CAAC;IAEO,SAAS,CAAY;IAE7B,YAAY,OAAyC;QACnD,MAAM,cAAc,GAAG,yBAAyB,CAAC,iBAAiB,EAAE,CAAC;QACrE,KAAK,CAAC,EAAE,GAAG,cAAc,EAAE,GAAG,OAAO,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QAC1D,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,QAAQ,IAAI,cAAc,CAAC,QAAQ,CAAC;IAC/D,CAAC;IAED,MAAM;IACJ,6DAA6D;IAC7D,EAAU;IACV,6DAA6D;IAC7D,EAAU;IACV,6DAA6D;IAC7D,EAAU;IACV,6DAA6D;IAC7D,QAAiC;QAEjC,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACzC,CAAC;IAED,MAAM,CACJ,cAAc,GAAG,yBAAyB,CAAC,iBAAiB,EAAE;QAE9D,MAAM,MAAM,GAAwB,KAAK,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;QAEjE,OAAO,MAAM,CAAC,UAAU,CAAC;QACzB,MAAM,mBAAmB,GAAqC;YAC5D,GAAG,eAAe,CAAC,MAAM,CAAC;YAC1B,QAAQ,EAAE,IAAI,CAAC,SAAS;SACzB,CAAC;QAEF,OAAO,mBAAmB,CAAC;IAC7B,CAAC;IAED,OAAO;QACL,IAAI,CAAC,SAAS,GAAG,EAAE,CAAC;QACpB,KAAK,CAAC,OAAO,EAAE,CAAC;IAClB,CAAC;CACF"}
|
|
@@ -13,6 +13,6 @@ declare class StaticGeoJSONTileProvider extends TileProvider {
|
|
|
13
13
|
url: string;
|
|
14
14
|
constructor(options: StaticGeoJSONTileProviderOptions);
|
|
15
15
|
loader(_x: number, _y: number, _z: number, headers?: Record<string, string>): Promise<Feature[]>;
|
|
16
|
-
toJSON(): StaticGeoJSONTileProviderOptions;
|
|
16
|
+
toJSON(defaultOptions?: StaticGeoJSONTileProviderOptions): StaticGeoJSONTileProviderOptions;
|
|
17
17
|
}
|
|
18
18
|
export default StaticGeoJSONTileProvider;
|
|
@@ -19,7 +19,11 @@ class StaticGeoJSONTileProvider extends TileProvider {
|
|
|
19
19
|
url;
|
|
20
20
|
constructor(options) {
|
|
21
21
|
const defaultOptions = StaticGeoJSONTileProvider.getDefaultOptions();
|
|
22
|
-
super({
|
|
22
|
+
super({
|
|
23
|
+
...defaultOptions,
|
|
24
|
+
...options,
|
|
25
|
+
baseLevels: defaultOptions.baseLevels,
|
|
26
|
+
});
|
|
23
27
|
this.url = options.url || defaultOptions.url;
|
|
24
28
|
}
|
|
25
29
|
async loader(_x, _y, _z, headers) {
|
|
@@ -28,9 +32,8 @@ class StaticGeoJSONTileProvider extends TileProvider {
|
|
|
28
32
|
const { features } = parseGeoJSON(data, { dynamicStyle: true });
|
|
29
33
|
return features;
|
|
30
34
|
}
|
|
31
|
-
toJSON() {
|
|
32
|
-
const config = super.toJSON();
|
|
33
|
-
delete config.baseLevels;
|
|
35
|
+
toJSON(defaultOptions = StaticGeoJSONTileProvider.getDefaultOptions()) {
|
|
36
|
+
const config = super.toJSON(defaultOptions);
|
|
34
37
|
if (this.url) {
|
|
35
38
|
config.url = this.url;
|
|
36
39
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"staticGeojsonTileProvider.js","sourceRoot":"","sources":["../../../../src/layer/tileProvider/staticGeojsonTileProvider.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEpD,OAAO,YAAY,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AACjE,OAAO,EAAE,yBAAyB,EAAE,MAAM,wBAAwB,CAAC;AAMnE;;GAEG;AACH,MAAM,yBAA0B,SAAQ,YAAY;IAClD,MAAM,KAAK,SAAS;QAClB,OAAO,2BAA2B,CAAC;IACrC,CAAC;IAED,MAAM,CAAC,iBAAiB;QACtB,OAAO;YACL,GAAG,YAAY,CAAC,iBAAiB,EAAE;YACnC,GAAG,EAAE,EAAE;YACP,UAAU,EAAE,CAAC,CAAC,CAAC;SAChB,CAAC;IACJ,CAAC;IAED,GAAG,CAAS;IAEZ,YAAY,OAAyC;QACnD,MAAM,cAAc,GAAG,yBAAyB,CAAC,iBAAiB,EAAE,CAAC;QACrE,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"staticGeojsonTileProvider.js","sourceRoot":"","sources":["../../../../src/layer/tileProvider/staticGeojsonTileProvider.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEpD,OAAO,YAAY,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AACjE,OAAO,EAAE,yBAAyB,EAAE,MAAM,wBAAwB,CAAC;AAMnE;;GAEG;AACH,MAAM,yBAA0B,SAAQ,YAAY;IAClD,MAAM,KAAK,SAAS;QAClB,OAAO,2BAA2B,CAAC;IACrC,CAAC;IAED,MAAM,CAAC,iBAAiB;QACtB,OAAO;YACL,GAAG,YAAY,CAAC,iBAAiB,EAAE;YACnC,GAAG,EAAE,EAAE;YACP,UAAU,EAAE,CAAC,CAAC,CAAC;SAChB,CAAC;IACJ,CAAC;IAED,GAAG,CAAS;IAEZ,YAAY,OAAyC;QACnD,MAAM,cAAc,GAAG,yBAAyB,CAAC,iBAAiB,EAAE,CAAC;QACrE,KAAK,CAAC;YACJ,GAAG,cAAc;YACjB,GAAG,OAAO;YACV,UAAU,EAAE,cAAc,CAAC,UAAU;SACtC,CAAC,CAAC;QAEH,IAAI,CAAC,GAAG,GAAG,OAAO,CAAC,GAAG,IAAI,cAAc,CAAC,GAAG,CAAC;IAC/C,CAAC;IAED,KAAK,CAAC,MAAM,CACV,EAAU,EACV,EAAU,EACV,EAAU,EACV,OAAgC;QAEhC,MAAM,IAAI,GAAG,aAAa,CAAC,IAAI,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QAC9C,MAAM,IAAI,GAAG,MAAM,WAAW,CAAgB,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QAC9D,MAAM,EAAE,QAAQ,EAAE,GAAG,YAAY,CAAC,IAAI,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,CAAC;QAChE,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,MAAM,CACJ,cAAc,GAAG,yBAAyB,CAAC,iBAAiB,EAAE;QAE9D,MAAM,MAAM,GAA8C,KAAK,CAAC,MAAM,CACpE,cAAc,CACf,CAAC;QAEF,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC;YACb,MAAM,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC;QACxB,CAAC;QACD,OAAO,MAA0C,CAAC;IACpD,CAAC;CACF;AAED,eAAe,yBAAyB,CAAC;AACzC,yBAAyB,CAAC,aAAa,CACrC,yBAAyB,CAAC,SAAS,EACnC,yBAAyB,CAC1B,CAAC"}
|
|
@@ -28,6 +28,7 @@ export declare const mercatorResolutionsToLevel: number[];
|
|
|
28
28
|
* transforms cesium geographic rectangle to mercator extent
|
|
29
29
|
* @param rectangle in wgs84 radians
|
|
30
30
|
* @returns extent in mercator
|
|
31
|
+
* @deprecated use rectangleToMercatorExtent
|
|
31
32
|
*/
|
|
32
33
|
export declare function rectangleToExtent(rectangle: Rectangle): OLExtent;
|
|
33
34
|
export type TileProviderOptions = VcsObjectOptions & {
|
|
@@ -125,6 +126,11 @@ declare class TileProvider extends VcsObject {
|
|
|
125
126
|
*/
|
|
126
127
|
getBaseLevel(level: number): number | undefined;
|
|
127
128
|
getCacheKey(x: number, y: number, level: number): string;
|
|
129
|
+
parseCacheKey(key: string): {
|
|
130
|
+
x: number;
|
|
131
|
+
y: number;
|
|
132
|
+
level: number;
|
|
133
|
+
};
|
|
128
134
|
private _getRtreeForBaseTile;
|
|
129
135
|
/**
|
|
130
136
|
* returns the features intersecting this coordinate. Depending on the resolution a buffer around the coordinate is requested.
|
|
@@ -178,7 +184,7 @@ declare class TileProvider extends VcsObject {
|
|
|
178
184
|
* });
|
|
179
185
|
*/
|
|
180
186
|
loader(_x: number, _y: number, _z: number, _headers?: Record<string, string>): Promise<Feature[]>;
|
|
181
|
-
toJSON(): TileProviderOptions;
|
|
187
|
+
toJSON(defaultOptions?: TileProviderOptions): TileProviderOptions;
|
|
182
188
|
/**
|
|
183
189
|
* clears the cache and removes all entries
|
|
184
190
|
*/
|
|
@@ -9,6 +9,7 @@ import { mercatorProjection, mercatorToWgs84Transformer, wgs84Projection, wgs84T
|
|
|
9
9
|
import VcsObject from '../../vcsObject.js';
|
|
10
10
|
import VcsEvent from '../../vcsEvent.js';
|
|
11
11
|
import { tileProviderClassRegistry } from '../../classRegistry.js';
|
|
12
|
+
import { rectangleToMercatorExtent } from '../../util/math.js';
|
|
12
13
|
/**
|
|
13
14
|
* Buffer around the coordinate in pixels
|
|
14
15
|
*/
|
|
@@ -24,6 +25,7 @@ for (let i = 0; i < mercatorResolutionsToLevel.length; i++) {
|
|
|
24
25
|
* transforms cesium geographic rectangle to mercator extent
|
|
25
26
|
* @param rectangle in wgs84 radians
|
|
26
27
|
* @returns extent in mercator
|
|
28
|
+
* @deprecated use rectangleToMercatorExtent
|
|
27
29
|
*/
|
|
28
30
|
export function rectangleToExtent(rectangle) {
|
|
29
31
|
const baseSouthWestLevel = Rectangle.southwest(rectangle);
|
|
@@ -80,8 +82,8 @@ class TileProvider extends VcsObject {
|
|
|
80
82
|
_locale = 'en';
|
|
81
83
|
_idProperty;
|
|
82
84
|
constructor(options) {
|
|
83
|
-
super(options);
|
|
84
85
|
const defaultOptions = TileProvider.getDefaultOptions();
|
|
86
|
+
super({ ...defaultOptions, ...options });
|
|
85
87
|
this._tileCacheSize = parseInteger(options.tileCacheSize, defaultOptions.tileCacheSize);
|
|
86
88
|
const baseLevels = Array.isArray(options.baseLevels)
|
|
87
89
|
? options.baseLevels.slice()
|
|
@@ -263,6 +265,15 @@ class TileProvider extends VcsObject {
|
|
|
263
265
|
getCacheKey(x, y, level) {
|
|
264
266
|
return `${level}/${x}/${y}`;
|
|
265
267
|
}
|
|
268
|
+
// eslint-disable-next-line class-methods-use-this
|
|
269
|
+
parseCacheKey(key) {
|
|
270
|
+
const parts = key.split('/');
|
|
271
|
+
return {
|
|
272
|
+
level: parseInt(parts[0], 10),
|
|
273
|
+
x: parseInt(parts[1], 10),
|
|
274
|
+
y: parseInt(parts[2], 10),
|
|
275
|
+
};
|
|
276
|
+
}
|
|
266
277
|
async _getRtreeForBaseTile(baseLevel, tileCenter, headers) {
|
|
267
278
|
const baseTile = this.tilingScheme.positionToTileXY(tileCenter, baseLevel);
|
|
268
279
|
const baseTileCacheKey = this.getCacheKey(baseTile.x, baseTile.y, baseLevel);
|
|
@@ -338,7 +349,7 @@ class TileProvider extends VcsObject {
|
|
|
338
349
|
return rtree.all().map((item) => item.value);
|
|
339
350
|
}
|
|
340
351
|
else {
|
|
341
|
-
const extent =
|
|
352
|
+
const extent = rectangleToMercatorExtent(rectangle);
|
|
342
353
|
const features = rtree
|
|
343
354
|
.search({
|
|
344
355
|
minX: extent[0],
|
|
@@ -438,9 +449,8 @@ class TileProvider extends VcsObject {
|
|
|
438
449
|
_headers) {
|
|
439
450
|
return Promise.resolve([]);
|
|
440
451
|
}
|
|
441
|
-
toJSON() {
|
|
442
|
-
const config = super.toJSON();
|
|
443
|
-
const defaultOptions = TileProvider.getDefaultOptions();
|
|
452
|
+
toJSON(defaultOptions = TileProvider.getDefaultOptions()) {
|
|
453
|
+
const config = super.toJSON(defaultOptions);
|
|
444
454
|
if (defaultOptions.tileCacheSize !== this.tileCacheSize) {
|
|
445
455
|
config.tileCacheSize = this.tileCacheSize;
|
|
446
456
|
}
|