@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
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import { Cesium3DTileFeature } from '@vcmap-cesium/engine';
|
|
2
|
+
import Feature from 'ol/Feature.js';
|
|
3
|
+
import AbstractAttributeProvider from './abstractAttributeProvider.js';
|
|
4
|
+
export default class I3SAttributeProvider extends AbstractAttributeProvider {
|
|
5
|
+
static get className(): string;
|
|
6
|
+
protected _getAttributes(_key: string, feature: Cesium3DTileFeature | Feature): Promise<Record<string, unknown> | undefined>;
|
|
7
|
+
}
|
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
import { getLogger } from '@vcsuite/logger';
|
|
2
|
+
import { Cesium3DTileFeature } from '@vcmap-cesium/engine';
|
|
3
|
+
import Feature from 'ol/Feature.js';
|
|
4
|
+
import { isI3SFeature } from '../interaction/featureAtPixelInteraction.js';
|
|
5
|
+
import AbstractAttributeProvider from './abstractAttributeProvider.js';
|
|
6
|
+
import { isProvidedFeature } from './featureProviderSymbols.js';
|
|
7
|
+
import { i3sData } from '../layer/layerSymbols.js';
|
|
8
|
+
export default class I3SAttributeProvider extends AbstractAttributeProvider {
|
|
9
|
+
static get className() {
|
|
10
|
+
return 'I3SAttributeProvider';
|
|
11
|
+
}
|
|
12
|
+
async _getAttributes(_key, feature) {
|
|
13
|
+
if (feature instanceof Cesium3DTileFeature) {
|
|
14
|
+
const id = feature.featureId;
|
|
15
|
+
if (id && feature.content?.tile?.i3sNode) {
|
|
16
|
+
const node = feature.content.tile.i3sNode;
|
|
17
|
+
return node
|
|
18
|
+
.loadFields()
|
|
19
|
+
.then(() => node.getFieldsForFeature(id))
|
|
20
|
+
.catch(() => {
|
|
21
|
+
getLogger(this.className).warning(`Error getting I3S fields for feature with id ${id}`);
|
|
22
|
+
return undefined;
|
|
23
|
+
});
|
|
24
|
+
}
|
|
25
|
+
}
|
|
26
|
+
else if (feature instanceof Feature &&
|
|
27
|
+
feature[isProvidedFeature] &&
|
|
28
|
+
isI3SFeature(feature)) {
|
|
29
|
+
const { i3sNode, cartesianPosition } = feature[i3sData];
|
|
30
|
+
if (i3sNode && cartesianPosition) {
|
|
31
|
+
return i3sNode
|
|
32
|
+
.loadFields()
|
|
33
|
+
.then(() => i3sNode.getFieldsForPickedPosition(cartesianPosition))
|
|
34
|
+
.catch(() => {
|
|
35
|
+
getLogger(this.className).warning('Error getting I3S fields for picked position');
|
|
36
|
+
return undefined;
|
|
37
|
+
});
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
return undefined;
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
//# sourceMappingURL=i3sAttributeProvider.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"i3sAttributeProvider.js","sourceRoot":"","sources":["../../../src/featureProvider/i3sAttributeProvider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,OAAO,MAAM,eAAe,CAAC;AACpC,OAAO,EAAE,YAAY,EAAE,MAAM,6CAA6C,CAAC;AAC3E,OAAO,yBAAyB,MAAM,gCAAgC,CAAC;AACvE,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAEnD,MAAM,CAAC,OAAO,OAAO,oBAAqB,SAAQ,yBAAyB;IACzE,MAAM,KAAK,SAAS;QAClB,OAAO,sBAAsB,CAAC;IAChC,CAAC;IAES,KAAK,CAAC,cAAc,CAC5B,IAAY,EACZ,OAAsC;QAEtC,IAAI,OAAO,YAAY,mBAAmB,EAAE,CAAC;YAC3C,MAAM,EAAE,GAAG,OAAO,CAAC,SAAS,CAAC;YAE7B,IAAI,EAAE,IAAI,OAAO,CAAC,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;gBACzC,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,OAA6B,CAAC;gBAChE,OAAO,IAAI;qBACR,UAAU,EAAE;qBACZ,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,mBAAmB,CAAC,EAAE,CAA4B,CAAC;qBACnE,KAAK,CAAC,GAAG,EAAE;oBACV,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,OAAO,CAC/B,gDAAgD,EAAE,EAAE,CACrD,CAAC;oBACF,OAAO,SAAS,CAAC;gBACnB,CAAC,CAAC,CAAC;YACP,CAAC;QACH,CAAC;aAAM,IACL,OAAO,YAAY,OAAO;YAC1B,OAAO,CAAC,iBAAiB,CAAC;YAC1B,YAAY,CAAC,OAAO,CAAC,EACrB,CAAC;YACD,MAAM,EAAE,OAAO,EAAE,iBAAiB,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;YACxD,IAAI,OAAO,IAAI,iBAAiB,EAAE,CAAC;gBACjC,OAAO,OAAO;qBACX,UAAU,EAAE;qBACZ,IAAI,CACH,GAAG,EAAE,CACH,OAAO,CAAC,0BAA0B,CAAC,iBAAiB,CAGnD,CACJ;qBACA,KAAK,CAAC,GAAG,EAAE;oBACV,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,OAAO,CAC/B,8CAA8C,CAC/C,CAAC;oBACF,OAAO,SAAS,CAAC;gBACnB,CAAC,CAAC,CAAC;YACP,CAAC;QACH,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;CACF"}
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
import AbstractAttributeProvider, { type AbstractAttributeProviderOptions } from './abstractAttributeProvider.js';
|
|
2
|
+
export type JsonAttributeData = {
|
|
3
|
+
features: {
|
|
4
|
+
id: string | number;
|
|
5
|
+
properties: Record<string, unknown>;
|
|
6
|
+
}[];
|
|
7
|
+
};
|
|
8
|
+
export type JsonAttributeProviderOptions = AbstractAttributeProviderOptions & {
|
|
9
|
+
data: string | JsonAttributeData;
|
|
10
|
+
headers?: Record<string, string>;
|
|
11
|
+
};
|
|
12
|
+
export default class JsonAttributeProvider extends AbstractAttributeProvider {
|
|
13
|
+
static get className(): string;
|
|
14
|
+
static getDefaultOptions(): JsonAttributeProviderOptions;
|
|
15
|
+
private _data?;
|
|
16
|
+
private readonly _dataOrUrl;
|
|
17
|
+
private readonly _headers?;
|
|
18
|
+
constructor(options: JsonAttributeProviderOptions);
|
|
19
|
+
private _loadData;
|
|
20
|
+
protected _getAttributes(key: string): Promise<Record<string, unknown> | undefined>;
|
|
21
|
+
protected _getBulkAttributes(bulk: {
|
|
22
|
+
key: string;
|
|
23
|
+
}[]): Promise<(Record<string, unknown> | undefined)[]>;
|
|
24
|
+
toJSON(defaultOptions?: JsonAttributeProviderOptions): JsonAttributeProviderOptions;
|
|
25
|
+
destroy(): void;
|
|
26
|
+
}
|
|
@@ -0,0 +1,73 @@
|
|
|
1
|
+
import { is, oneOf } from '@vcsuite/check';
|
|
2
|
+
import AbstractAttributeProvider from './abstractAttributeProvider.js';
|
|
3
|
+
import { getInitForUrl, requestJson } from '../util/fetch.js';
|
|
4
|
+
export default class JsonAttributeProvider extends AbstractAttributeProvider {
|
|
5
|
+
static get className() {
|
|
6
|
+
return 'JsonAttributeProvider';
|
|
7
|
+
}
|
|
8
|
+
static getDefaultOptions() {
|
|
9
|
+
return {
|
|
10
|
+
...AbstractAttributeProvider.getDefaultOptions(),
|
|
11
|
+
data: '',
|
|
12
|
+
};
|
|
13
|
+
}
|
|
14
|
+
_data;
|
|
15
|
+
_dataOrUrl;
|
|
16
|
+
_headers;
|
|
17
|
+
constructor(options) {
|
|
18
|
+
super(options);
|
|
19
|
+
this._dataOrUrl = is(options.data, Object)
|
|
20
|
+
? structuredClone(options.data)
|
|
21
|
+
: options.data;
|
|
22
|
+
this._headers = options.headers;
|
|
23
|
+
}
|
|
24
|
+
async _loadData() {
|
|
25
|
+
if (this._data) {
|
|
26
|
+
return;
|
|
27
|
+
}
|
|
28
|
+
let serializedData;
|
|
29
|
+
if (is(this._dataOrUrl, String)) {
|
|
30
|
+
const init = getInitForUrl(this._dataOrUrl, this._headers);
|
|
31
|
+
serializedData = await requestJson(this._dataOrUrl, init);
|
|
32
|
+
}
|
|
33
|
+
else {
|
|
34
|
+
serializedData = this._dataOrUrl;
|
|
35
|
+
}
|
|
36
|
+
const data = new Map();
|
|
37
|
+
if (Array.isArray(serializedData.features)) {
|
|
38
|
+
serializedData?.features?.forEach(({ id, properties }) => {
|
|
39
|
+
if (is(id, oneOf(String, Number)) && is(properties, Object)) {
|
|
40
|
+
data.set(String(id), properties);
|
|
41
|
+
}
|
|
42
|
+
});
|
|
43
|
+
}
|
|
44
|
+
this._data = data;
|
|
45
|
+
}
|
|
46
|
+
async _getAttributes(key) {
|
|
47
|
+
await this._loadData();
|
|
48
|
+
return this._data?.get(key);
|
|
49
|
+
}
|
|
50
|
+
async _getBulkAttributes(bulk) {
|
|
51
|
+
await this._loadData();
|
|
52
|
+
return bulk.map(({ key }) => this._data?.get(key));
|
|
53
|
+
}
|
|
54
|
+
toJSON(defaultOptions = JsonAttributeProvider.getDefaultOptions()) {
|
|
55
|
+
const config = super.toJSON(defaultOptions);
|
|
56
|
+
if (is(this._dataOrUrl, Object)) {
|
|
57
|
+
config.data = structuredClone(this._dataOrUrl);
|
|
58
|
+
}
|
|
59
|
+
else {
|
|
60
|
+
config.data = this._dataOrUrl;
|
|
61
|
+
}
|
|
62
|
+
if (this._headers) {
|
|
63
|
+
config.headers = structuredClone(this._headers);
|
|
64
|
+
}
|
|
65
|
+
return config;
|
|
66
|
+
}
|
|
67
|
+
destroy() {
|
|
68
|
+
this._data?.clear();
|
|
69
|
+
this._data = undefined;
|
|
70
|
+
super.destroy();
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
//# sourceMappingURL=jsonAttributeProvider.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"jsonAttributeProvider.js","sourceRoot":"","sources":["../../../src/featureProvider/jsonAttributeProvider.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,18 +2,16 @@ import type { Coordinate } from 'ol/coordinate.js';
|
|
|
2
2
|
import type { Feature } from 'ol/index.js';
|
|
3
3
|
import AbstractFeatureProvider, { type AbstractFeatureProviderOptions } from './abstractFeatureProvider.js';
|
|
4
4
|
import type TileProvider from '../layer/tileProvider/tileProvider.js';
|
|
5
|
+
import type Layer from '../layer/layer.js';
|
|
5
6
|
export type TileProviderFeatureProviderOptions = AbstractFeatureProviderOptions & {
|
|
6
7
|
tileProvider: TileProvider;
|
|
7
8
|
};
|
|
8
9
|
declare class TileProviderFeatureProvider extends AbstractFeatureProvider {
|
|
9
10
|
static get className(): string;
|
|
10
11
|
tileProvider: TileProvider;
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
*/
|
|
15
|
-
constructor(layerName: string, options: TileProviderFeatureProviderOptions);
|
|
16
|
-
getFeaturesByCoordinate(coordinate: Coordinate, resolution: number, headers?: Record<string, string>): Promise<Feature[]>;
|
|
12
|
+
constructor(options: TileProviderFeatureProviderOptions);
|
|
13
|
+
getFeaturesByCoordinate(coordinate: Coordinate, resolution: number, layer: Layer): Promise<Feature[]>;
|
|
14
|
+
toJSON(defaultOptions?: AbstractFeatureProviderOptions): AbstractFeatureProviderOptions;
|
|
17
15
|
destroy(): void;
|
|
18
16
|
}
|
|
19
17
|
export default TileProviderFeatureProvider;
|
|
@@ -1,31 +1,29 @@
|
|
|
1
1
|
import AbstractFeatureProvider from './abstractFeatureProvider.js';
|
|
2
|
-
import { featureProviderClassRegistry } from '../classRegistry.js';
|
|
3
2
|
class TileProviderFeatureProvider extends AbstractFeatureProvider {
|
|
4
3
|
static get className() {
|
|
5
4
|
return 'TileProviderFeatureProvider';
|
|
6
5
|
}
|
|
7
6
|
tileProvider;
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
* @param options
|
|
11
|
-
*/
|
|
12
|
-
constructor(layerName, options) {
|
|
13
|
-
super(layerName, options);
|
|
14
|
-
this.mapTypes = ['CesiumMap'];
|
|
7
|
+
constructor(options) {
|
|
8
|
+
super({ ...options, mapTypes: ['CesiumMap'] });
|
|
15
9
|
this.tileProvider = options.tileProvider;
|
|
16
10
|
}
|
|
17
|
-
async getFeaturesByCoordinate(coordinate, resolution,
|
|
18
|
-
const features = await this.tileProvider.getFeaturesByCoordinate(coordinate, resolution, headers);
|
|
11
|
+
async getFeaturesByCoordinate(coordinate, resolution, layer) {
|
|
12
|
+
const features = await this.tileProvider.getFeaturesByCoordinate(coordinate, resolution, layer.headers);
|
|
19
13
|
const checkShow = (feature) => this.style ? !!this.style.cesiumStyle.show.evaluate(feature) : true;
|
|
20
14
|
return features.filter((feature) => {
|
|
21
15
|
return (this.vectorProperties.getAllowPicking(feature) && checkShow(feature));
|
|
22
16
|
});
|
|
23
17
|
}
|
|
18
|
+
toJSON(defaultOptions = AbstractFeatureProvider.getDefaultOptions()) {
|
|
19
|
+
const options = super.toJSON(defaultOptions);
|
|
20
|
+
delete options.mapTypes;
|
|
21
|
+
return options;
|
|
22
|
+
}
|
|
24
23
|
destroy() {
|
|
25
24
|
this.tileProvider.destroy();
|
|
26
25
|
super.destroy();
|
|
27
26
|
}
|
|
28
27
|
}
|
|
29
28
|
export default TileProviderFeatureProvider;
|
|
30
|
-
featureProviderClassRegistry.registerClass(TileProviderFeatureProvider.className, TileProviderFeatureProvider);
|
|
31
29
|
//# sourceMappingURL=tileProviderFeatureProvider.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tileProviderFeatureProvider.js","sourceRoot":"","sources":["../../../src/featureProvider/tileProviderFeatureProvider.ts"],"names":[],"mappings":"AAEA,OAAO,uBAEN,MAAM,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"tileProviderFeatureProvider.js","sourceRoot":"","sources":["../../../src/featureProvider/tileProviderFeatureProvider.ts"],"names":[],"mappings":"AAEA,OAAO,uBAEN,MAAM,8BAA8B,CAAC;AAStC,MAAM,2BAA4B,SAAQ,uBAAuB;IAC/D,MAAM,KAAK,SAAS;QAClB,OAAO,6BAA6B,CAAC;IACvC,CAAC;IAED,YAAY,CAAe;IAE3B,YAAY,OAA2C;QACrD,KAAK,CAAC,EAAE,GAAG,OAAO,EAAE,QAAQ,EAAE,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;QAE/C,IAAI,CAAC,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC;IAC3C,CAAC;IAED,KAAK,CAAC,uBAAuB,CAC3B,UAAsB,EACtB,UAAkB,EAClB,KAAY;QAEZ,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,uBAAuB,CAC9D,UAAU,EACV,UAAU,EACV,KAAK,CAAC,OAAO,CACd,CAAC;QACF,MAAM,SAAS,GAAG,CAAC,OAAgB,EAAW,EAAE,CAC9C,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QACtE,OAAO,QAAQ,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE;YACjC,OAAO,CACL,IAAI,CAAC,gBAAgB,CAAC,eAAe,CAAC,OAAO,CAAC,IAAI,SAAS,CAAC,OAAO,CAAC,CACrE,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;IAED,MAAM,CACJ,iBAAiD,uBAAuB,CAAC,iBAAiB,EAAE;QAE5F,MAAM,OAAO,GAAG,KAAK,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;QAC7C,OAAO,OAAO,CAAC,QAAQ,CAAC;QACxB,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,OAAO;QACL,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC;QAC5B,KAAK,CAAC,OAAO,EAAE,CAAC;IAClB,CAAC;CACF;AAED,eAAe,2BAA2B,CAAC"}
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
import AbstractAttributeProvider from './abstractAttributeProvider.js';
|
|
2
|
+
import type { VcsObjectOptions } from '../vcsObject.js';
|
|
3
|
+
export type UrlIdAttributeProviderOptions = VcsObjectOptions & {
|
|
4
|
+
urlTemplate: string;
|
|
5
|
+
headers?: Record<string, string>;
|
|
6
|
+
};
|
|
7
|
+
/**
|
|
8
|
+
* Provides attributes for features by fetching data from a URL based on feature IDs.
|
|
9
|
+
* The URL template should contain a {id} placeholder that will be replaced with the encoded feature ID.
|
|
10
|
+
* urlTemplate: 'https://api.example.com/features/{id}'
|
|
11
|
+
* For a feature with ID "123", this would request: https://api.example.com/features/123
|
|
12
|
+
*
|
|
13
|
+
* The backend should return a JSON object with attribute key-value pairs.
|
|
14
|
+
* {
|
|
15
|
+
* "name": "Feature Name",
|
|
16
|
+
* "description": "Feature description",
|
|
17
|
+
* "value": 42
|
|
18
|
+
* }
|
|
19
|
+
* If the request fails or returns invalid data, the provider returns undefined.
|
|
20
|
+
*/
|
|
21
|
+
export default class UrlIdAttributeProvider extends AbstractAttributeProvider {
|
|
22
|
+
static get className(): string;
|
|
23
|
+
private _urlTemplate;
|
|
24
|
+
private _headers?;
|
|
25
|
+
constructor(options: UrlIdAttributeProviderOptions);
|
|
26
|
+
protected _getAttributes(id: string): Promise<Record<string, unknown> | undefined>;
|
|
27
|
+
toJSON(_defaultOptions?: UrlIdAttributeProviderOptions): UrlIdAttributeProviderOptions;
|
|
28
|
+
}
|
|
@@ -0,0 +1,50 @@
|
|
|
1
|
+
import AbstractAttributeProvider from './abstractAttributeProvider.js';
|
|
2
|
+
import { getInitForUrl, requestJson } from '../util/fetch.js';
|
|
3
|
+
import { featureProviderClassRegistry } from '../classRegistry.js';
|
|
4
|
+
/**
|
|
5
|
+
* Provides attributes for features by fetching data from a URL based on feature IDs.
|
|
6
|
+
* The URL template should contain a {id} placeholder that will be replaced with the encoded feature ID.
|
|
7
|
+
* urlTemplate: 'https://api.example.com/features/{id}'
|
|
8
|
+
* For a feature with ID "123", this would request: https://api.example.com/features/123
|
|
9
|
+
*
|
|
10
|
+
* The backend should return a JSON object with attribute key-value pairs.
|
|
11
|
+
* {
|
|
12
|
+
* "name": "Feature Name",
|
|
13
|
+
* "description": "Feature description",
|
|
14
|
+
* "value": 42
|
|
15
|
+
* }
|
|
16
|
+
* If the request fails or returns invalid data, the provider returns undefined.
|
|
17
|
+
*/
|
|
18
|
+
export default class UrlIdAttributeProvider extends AbstractAttributeProvider {
|
|
19
|
+
static get className() {
|
|
20
|
+
return 'UrlIdAttributeProvider';
|
|
21
|
+
}
|
|
22
|
+
_urlTemplate;
|
|
23
|
+
_headers;
|
|
24
|
+
constructor(options) {
|
|
25
|
+
super(options);
|
|
26
|
+
this._urlTemplate = options.urlTemplate;
|
|
27
|
+
this._headers = options.headers
|
|
28
|
+
? structuredClone(options.headers)
|
|
29
|
+
: undefined;
|
|
30
|
+
}
|
|
31
|
+
async _getAttributes(id) {
|
|
32
|
+
const url = this._urlTemplate.replace('{id}', encodeURIComponent(String(id)));
|
|
33
|
+
try {
|
|
34
|
+
return await requestJson(url, getInitForUrl(url, this._headers));
|
|
35
|
+
}
|
|
36
|
+
catch {
|
|
37
|
+
return undefined;
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
toJSON(_defaultOptions) {
|
|
41
|
+
const config = super.toJSON(_defaultOptions);
|
|
42
|
+
config.urlTemplate = this._urlTemplate;
|
|
43
|
+
if (this._headers) {
|
|
44
|
+
config.headers = structuredClone(this._headers);
|
|
45
|
+
}
|
|
46
|
+
return config;
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
featureProviderClassRegistry.registerClass(UrlIdAttributeProvider.className, UrlIdAttributeProvider);
|
|
50
|
+
//# sourceMappingURL=urlIdAttributeProvider.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"urlIdAttributeProvider.js","sourceRoot":"","sources":["../../../src/featureProvider/urlIdAttributeProvider.ts"],"names":[],"mappings":"AAAA,OAAO,yBAAyB,MAAM,gCAAgC,CAAC;AAEvE,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EAAE,4BAA4B,EAAE,MAAM,qBAAqB,CAAC;AAOnE;;;;;;;;;;;;;GAaG;AACH,MAAM,CAAC,OAAO,OAAO,sBAAuB,SAAQ,yBAAyB;IAC3E,MAAM,KAAK,SAAS;QAClB,OAAO,wBAAwB,CAAC;IAClC,CAAC;IAEO,YAAY,CAAS;IAErB,QAAQ,CAAsC;IAEtD,YAAY,OAAsC;QAChD,KAAK,CAAC,OAAO,CAAC,CAAC;QAEf,IAAI,CAAC,YAAY,GAAG,OAAO,CAAC,WAAW,CAAC;QAExC,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,OAAO;YAC7B,CAAC,CAAC,eAAe,CAAC,OAAO,CAAC,OAAO,CAAC;YAClC,CAAC,CAAC,SAAS,CAAC;IAChB,CAAC;IAES,KAAK,CAAC,cAAc,CAC5B,EAAU;QAEV,MAAM,GAAG,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,CACnC,MAAM,EACN,kBAAkB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAC/B,CAAC;QAEF,IAAI,CAAC;YACH,OAAO,MAAM,WAAW,CACtB,GAAG,EACH,aAAa,CAAC,GAAG,EAAE,IAAI,CAAC,QAAQ,CAAC,CAClC,CAAC;QACJ,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,SAAS,CAAC;QACnB,CAAC;IACH,CAAC;IAEQ,MAAM,CACb,eAA+C;QAE/C,MAAM,MAAM,GAA2C,KAAK,CAAC,MAAM,CACjE,eAAe,CAChB,CAAC;QAEF,MAAM,CAAC,WAAW,GAAG,IAAI,CAAC,YAAY,CAAC;QAEvC,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAClB,MAAM,CAAC,OAAO,GAAG,eAAe,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAClD,CAAC;QAED,OAAO,MAAuC,CAAC;IACjD,CAAC;CACF;AAED,4BAA4B,CAAC,aAAa,CACxC,sBAAsB,CAAC,SAAS,EAChC,sBAAsB,CACvB,CAAC"}
|
|
@@ -10,13 +10,14 @@ import type { Coordinate } from 'ol/coordinate.js';
|
|
|
10
10
|
import type { TileWMS } from 'ol/source.js';
|
|
11
11
|
import type FeatureFormat from 'ol/format/Feature.js';
|
|
12
12
|
import WMSGetFeatureInfo from 'ol/format/WMSGetFeatureInfo.js';
|
|
13
|
-
import type
|
|
13
|
+
import { type AbstractFeatureProviderOptions } from './abstractFeatureProvider.js';
|
|
14
14
|
import AbstractFeatureProvider from './abstractFeatureProvider.js';
|
|
15
15
|
import type { ProjectionOptions } from '../util/projection.js';
|
|
16
16
|
import Projection from '../util/projection.js';
|
|
17
17
|
import type { ExtentOptions } from '../util/extent.js';
|
|
18
18
|
import Extent from '../util/extent.js';
|
|
19
19
|
import { TilingScheme } from '../layer/rasterLayer.js';
|
|
20
|
+
import type Layer from '../layer/layer.js';
|
|
20
21
|
export type FormatOptions = GeoJSONOptions & GMLOptions & Record<string, unknown>;
|
|
21
22
|
export type WMSFeatureProviderOptions = AbstractFeatureProviderOptions & {
|
|
22
23
|
/**
|
|
@@ -64,6 +65,10 @@ export type WMSFeatureProviderOptions = AbstractFeatureProviderOptions & {
|
|
|
64
65
|
*/
|
|
65
66
|
version?: string;
|
|
66
67
|
htmlPositionFeatureTitle?: string;
|
|
68
|
+
/**
|
|
69
|
+
* Optional headers to include in GetFeatureInfo requests. Overrides layer headers.
|
|
70
|
+
*/
|
|
71
|
+
headers?: Record<string, string>;
|
|
67
72
|
};
|
|
68
73
|
declare const gmlFormats: {
|
|
69
74
|
GML: typeof GML3;
|
|
@@ -112,12 +117,16 @@ declare class WMSFeatureProvider extends AbstractFeatureProvider {
|
|
|
112
117
|
*/
|
|
113
118
|
projection: Projection | undefined;
|
|
114
119
|
htmlPositionFeatureTitle?: string;
|
|
115
|
-
|
|
120
|
+
/**
|
|
121
|
+
* Optional headers to include in GetFeatureInfo requests.
|
|
122
|
+
*/
|
|
123
|
+
headers?: Record<string, string>;
|
|
124
|
+
constructor(options: WMSFeatureProviderOptions);
|
|
116
125
|
get wmsSource(): TileWMS;
|
|
117
126
|
set wmsSource(source: TileWMS);
|
|
118
127
|
featureResponseCallback(data: Document | Element | ArrayBuffer | any | string, coordinate: Coordinate): Feature[];
|
|
119
|
-
getFeaturesByCoordinate(coordinate: Coordinate, resolution: number,
|
|
120
|
-
toJSON(): WMSFeatureProviderOptions;
|
|
128
|
+
getFeaturesByCoordinate(coordinate: Coordinate, resolution: number, layer: Layer): Promise<Feature[]>;
|
|
129
|
+
toJSON(defaultOptions?: WMSFeatureProviderOptions): WMSFeatureProviderOptions;
|
|
121
130
|
destroy(): void;
|
|
122
131
|
}
|
|
123
132
|
export default WMSFeatureProvider;
|
|
@@ -105,6 +105,7 @@ class WMSFeatureProvider extends AbstractFeatureProvider {
|
|
|
105
105
|
tileSize: [256, 256],
|
|
106
106
|
parameters: {},
|
|
107
107
|
extent: undefined,
|
|
108
|
+
headers: undefined,
|
|
108
109
|
};
|
|
109
110
|
}
|
|
110
111
|
extent = null;
|
|
@@ -136,9 +137,13 @@ class WMSFeatureProvider extends AbstractFeatureProvider {
|
|
|
136
137
|
*/
|
|
137
138
|
projection;
|
|
138
139
|
htmlPositionFeatureTitle;
|
|
139
|
-
|
|
140
|
-
|
|
140
|
+
/**
|
|
141
|
+
* Optional headers to include in GetFeatureInfo requests.
|
|
142
|
+
*/
|
|
143
|
+
headers;
|
|
144
|
+
constructor(options) {
|
|
141
145
|
const defaultOptions = WMSFeatureProvider.getDefaultOptions();
|
|
146
|
+
super({ ...defaultOptions, ...options });
|
|
142
147
|
if (options.extent) {
|
|
143
148
|
if (options.extent instanceof Extent) {
|
|
144
149
|
this.extent = options.extent;
|
|
@@ -167,6 +172,9 @@ class WMSFeatureProvider extends AbstractFeatureProvider {
|
|
|
167
172
|
? new Projection(options.projection)
|
|
168
173
|
: undefined;
|
|
169
174
|
this.htmlPositionFeatureTitle = options.htmlPositionFeatureTitle;
|
|
175
|
+
this.headers = options.headers
|
|
176
|
+
? structuredClone(options.headers)
|
|
177
|
+
: undefined;
|
|
170
178
|
}
|
|
171
179
|
get wmsSource() {
|
|
172
180
|
if (!this._wmsSource) {
|
|
@@ -208,7 +216,7 @@ class WMSFeatureProvider extends AbstractFeatureProvider {
|
|
|
208
216
|
}
|
|
209
217
|
return [];
|
|
210
218
|
}
|
|
211
|
-
async getFeaturesByCoordinate(coordinate, resolution,
|
|
219
|
+
async getFeaturesByCoordinate(coordinate, resolution, layer) {
|
|
212
220
|
if (this.extent?.isValid() &&
|
|
213
221
|
!containsCoordinate(this.extent.getCoordinatesInProjection(mercatorProjection), coordinate)) {
|
|
214
222
|
return [];
|
|
@@ -228,10 +236,10 @@ class WMSFeatureProvider extends AbstractFeatureProvider {
|
|
|
228
236
|
INFO_FORMAT: this.featureInfoResponseType,
|
|
229
237
|
});
|
|
230
238
|
if (this.featureInfoResponseType === 'text/html') {
|
|
231
|
-
return this.featureResponseCallback(null, coordinate).map((f) => this.getProviderFeature(f));
|
|
239
|
+
return this.featureResponseCallback(null, coordinate).map((f) => this.getProviderFeature(f, layer));
|
|
232
240
|
}
|
|
233
241
|
else if (url) {
|
|
234
|
-
const init = getInitForUrl(url, headers);
|
|
242
|
+
const init = getInitForUrl(url, this.headers ?? layer.headers);
|
|
235
243
|
let data;
|
|
236
244
|
try {
|
|
237
245
|
const response = await requestUrl(url, init);
|
|
@@ -241,13 +249,12 @@ class WMSFeatureProvider extends AbstractFeatureProvider {
|
|
|
241
249
|
this.getLogger().error(`Failed fetching WMS FeatureInfo ${url}`);
|
|
242
250
|
return [];
|
|
243
251
|
}
|
|
244
|
-
return this.featureResponseCallback(data, coordinate).map((f) => this.getProviderFeature(f));
|
|
252
|
+
return this.featureResponseCallback(data, coordinate).map((f) => this.getProviderFeature(f, layer));
|
|
245
253
|
}
|
|
246
254
|
return [];
|
|
247
255
|
}
|
|
248
|
-
toJSON() {
|
|
249
|
-
const config = super.toJSON();
|
|
250
|
-
const defaultOptions = WMSFeatureProvider.getDefaultOptions();
|
|
256
|
+
toJSON(defaultOptions = WMSFeatureProvider.getDefaultOptions()) {
|
|
257
|
+
const config = super.toJSON(defaultOptions);
|
|
251
258
|
if (this.featureInfoResponseType !== defaultOptions.responseType) {
|
|
252
259
|
config.responseType = this.featureInfoResponseType;
|
|
253
260
|
}
|
|
@@ -287,6 +294,9 @@ class WMSFeatureProvider extends AbstractFeatureProvider {
|
|
|
287
294
|
if (this.htmlPositionFeatureTitle) {
|
|
288
295
|
config.htmlPositionFeatureTitle = this.htmlPositionFeatureTitle;
|
|
289
296
|
}
|
|
297
|
+
if (this.headers) {
|
|
298
|
+
config.headers = structuredClone(this.headers);
|
|
299
|
+
}
|
|
290
300
|
return config;
|
|
291
301
|
}
|
|
292
302
|
destroy() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wmsFeatureProvider.js","sourceRoot":"","sources":["../../../src/featureProvider/wmsFeatureProvider.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,mBAAmB,CAAC;AAErC,OAAO,GAAG,MAAM,kBAAkB,CAAC;AACnC,OAAO,OAA2C,MAAM,sBAAsB,CAAC;AAC/E,OAAO,IAAI,MAAM,mBAAmB,CAAC;AACrC,OAAO,KAAK,MAAM,oBAAoB,CAAC;AACvC,OAAO,KAAK,MAAM,kBAAkB,CAAC;AACrC,OAAO,EAAE,YAAY,EAAmC,MAAM,YAAY,CAAC;AAE3E,OAAO,EAAE,OAAO,EAAE,MAAM,IAAI,CAAC;AAI7B,OAAO,iBAAiB,MAAM,gCAAgC,CAAC;AAE/D,OAAO,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,OAAO,uBAAuB,MAAM,8BAA8B,CAAC;AAEnE,OAAO,UAAU,EAAE,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAEvE,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAEtD,OAAO,MAAM,MAAM,mBAAmB,CAAC;AACvC,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,EAAE,4BAA4B,EAAE,MAAM,qBAAqB,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"wmsFeatureProvider.js","sourceRoot":"","sources":["../../../src/featureProvider/wmsFeatureProvider.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,11 +8,11 @@ import { windowPositionToImageSpherical } from '../panorama/fieldOfView.js';
|
|
|
8
8
|
const scratchPanoramaCartesian = new Cartesian3();
|
|
9
9
|
async function getCoordinateFromPanoramaMap(map, event) {
|
|
10
10
|
const image = map.currentPanoramaImage;
|
|
11
|
-
|
|
11
|
+
event.ray = map.getCesiumWidget().camera.getPickRay(event.windowPosition);
|
|
12
|
+
let position;
|
|
12
13
|
if (image) {
|
|
13
14
|
const { camera } = map.getCesiumWidget();
|
|
14
15
|
const imageCoordinate = windowPositionToImageSpherical(event.windowPosition, camera, image.invModelMatrix);
|
|
15
|
-
event.positionOrPixel = imageCoordinate;
|
|
16
16
|
if (imageCoordinate) {
|
|
17
17
|
const cartesian = await image.getPositionAtImageCoordinate(imageCoordinate, scratchPanoramaCartesian);
|
|
18
18
|
if (cartesian) {
|
|
@@ -21,6 +21,7 @@ async function getCoordinateFromPanoramaMap(map, event) {
|
|
|
21
21
|
}
|
|
22
22
|
}
|
|
23
23
|
event.position = position;
|
|
24
|
+
event.positionOrPixel = position;
|
|
24
25
|
return event;
|
|
25
26
|
}
|
|
26
27
|
/**
|
|
@@ -56,10 +57,7 @@ class CoordinateAtPixel extends AbstractInteraction {
|
|
|
56
57
|
return Promise.resolve(event);
|
|
57
58
|
}
|
|
58
59
|
const pickResult = scene.globe.pick(event.ray, scene, this._scratchCartesian);
|
|
59
|
-
if (
|
|
60
|
-
event.position = [0, 0, 0];
|
|
61
|
-
}
|
|
62
|
-
else {
|
|
60
|
+
if (pickResult) {
|
|
63
61
|
this._scratchCartographic = Cartographic.fromCartesian(pickResult, scene.globe.ellipsoid, this._scratchCartographic);
|
|
64
62
|
event.position = Projection.wgs84ToMercator([
|
|
65
63
|
CesiumMath.toDegrees(this._scratchCartographic.longitude),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"coordinateAtPixel.js","sourceRoot":"","sources":["../../../src/interaction/coordinateAtPixel.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,UAAU,EACV,IAAI,IAAI,UAAU,GACnB,MAAM,sBAAsB,CAAC;AAG9B,OAAO,mBAEN,MAAM,0BAA0B,CAAC;AAClC,OAAO,UAAU,EAAE,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AACvE,OAAO,EACL,SAAS,EACT,mBAAmB,EACnB,cAAc,GACf,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAI3D,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAE,8BAA8B,EAAE,MAAM,4BAA4B,CAAC;AAE5E,MAAM,wBAAwB,GAAG,IAAI,UAAU,EAAE,CAAC;AAClD,KAAK,UAAU,4BAA4B,CACzC,GAAgB,EAChB,KAAuB;IAEvB,MAAM,KAAK,GAAG,GAAG,CAAC,oBAAoB,CAAC;IACvC,
|
|
1
|
+
{"version":3,"file":"coordinateAtPixel.js","sourceRoot":"","sources":["../../../src/interaction/coordinateAtPixel.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import AbstractInteraction, { type InteractionEvent } from './abstractInteraction.js';
|
|
2
|
+
/**
|
|
3
|
+
* An interaction that ensures events without a position are stopped.
|
|
4
|
+
* It will set event.stopPropagation = true if event.position is undefined.
|
|
5
|
+
* Furthermore, it ensures the integrity of drag events by: a) remembering the last position
|
|
6
|
+
* on DRAGSTART and reusing it on DRAGEND if no position is provided and b) stopping propagation of drag events, if
|
|
7
|
+
* drag start did not provide a position.
|
|
8
|
+
*/
|
|
9
|
+
declare class EnsurePositionInteraction extends AbstractInteraction {
|
|
10
|
+
private _lastDragPosition;
|
|
11
|
+
constructor();
|
|
12
|
+
pipe(event: InteractionEvent): Promise<InteractionEvent>;
|
|
13
|
+
}
|
|
14
|
+
export default EnsurePositionInteraction;
|
|
@@ -0,0 +1,42 @@
|
|
|
1
|
+
import AbstractInteraction from './abstractInteraction.js';
|
|
2
|
+
import { EventType, ModificationKeyType, PointerKeyType, } from './interactionType.js';
|
|
3
|
+
/**
|
|
4
|
+
* An interaction that ensures events without a position are stopped.
|
|
5
|
+
* It will set event.stopPropagation = true if event.position is undefined.
|
|
6
|
+
* Furthermore, it ensures the integrity of drag events by: a) remembering the last position
|
|
7
|
+
* on DRAGSTART and reusing it on DRAGEND if no position is provided and b) stopping propagation of drag events, if
|
|
8
|
+
* drag start did not provide a position.
|
|
9
|
+
*/
|
|
10
|
+
class EnsurePositionInteraction extends AbstractInteraction {
|
|
11
|
+
_lastDragPosition;
|
|
12
|
+
constructor() {
|
|
13
|
+
super(EventType.ALL, ModificationKeyType.ALL, PointerKeyType.ALL);
|
|
14
|
+
this.setActive();
|
|
15
|
+
}
|
|
16
|
+
pipe(event) {
|
|
17
|
+
if (event.type & EventType.DRAGSTART) {
|
|
18
|
+
this._lastDragPosition = event.position?.slice();
|
|
19
|
+
}
|
|
20
|
+
else if (event.type & EventType.DRAG) {
|
|
21
|
+
if (this._lastDragPosition && event.position) {
|
|
22
|
+
this._lastDragPosition = event.position.slice();
|
|
23
|
+
}
|
|
24
|
+
else if (!this._lastDragPosition) {
|
|
25
|
+
event.stopPropagation = true;
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
else if (event.type & EventType.DRAGEND) {
|
|
29
|
+
if (this._lastDragPosition && !event.position) {
|
|
30
|
+
event.position = this._lastDragPosition;
|
|
31
|
+
}
|
|
32
|
+
else if (!this._lastDragPosition) {
|
|
33
|
+
event.stopPropagation = true;
|
|
34
|
+
}
|
|
35
|
+
this._lastDragPosition = undefined;
|
|
36
|
+
}
|
|
37
|
+
event.stopPropagation = event.stopPropagation || !event.position;
|
|
38
|
+
return Promise.resolve(event);
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
export default EnsurePositionInteraction;
|
|
42
|
+
//# sourceMappingURL=ensurePositionInteraction.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ensurePositionInteraction.js","sourceRoot":"","sources":["../../../src/interaction/ensurePositionInteraction.ts"],"names":[],"mappings":"AACA,OAAO,mBAEN,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,SAAS,EACT,mBAAmB,EACnB,cAAc,GACf,MAAM,sBAAsB,CAAC;AAE9B;;;;;;GAMG;AACH,MAAM,yBAA0B,SAAQ,mBAAmB;IACjD,iBAAiB,CAAyB;IAElD;QACE,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE,mBAAmB,CAAC,GAAG,EAAE,cAAc,CAAC,GAAG,CAAC,CAAC;QAElE,IAAI,CAAC,SAAS,EAAE,CAAC;IACnB,CAAC;IAED,IAAI,CAAC,KAAuB;QAC1B,IAAI,KAAK,CAAC,IAAI,GAAG,SAAS,CAAC,SAAS,EAAE,CAAC;YACrC,IAAI,CAAC,iBAAiB,GAAG,KAAK,CAAC,QAAQ,EAAE,KAAK,EAAE,CAAC;QACnD,CAAC;aAAM,IAAI,KAAK,CAAC,IAAI,GAAG,SAAS,CAAC,IAAI,EAAE,CAAC;YACvC,IAAI,IAAI,CAAC,iBAAiB,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;gBAC7C,IAAI,CAAC,iBAAiB,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;YAClD,CAAC;iBAAM,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC;gBACnC,KAAK,CAAC,eAAe,GAAG,IAAI,CAAC;YAC/B,CAAC;QACH,CAAC;aAAM,IAAI,KAAK,CAAC,IAAI,GAAG,SAAS,CAAC,OAAO,EAAE,CAAC;YAC1C,IAAI,IAAI,CAAC,iBAAiB,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;gBAC9C,KAAK,CAAC,QAAQ,GAAG,IAAI,CAAC,iBAAiB,CAAC;YAC1C,CAAC;iBAAM,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC;gBACnC,KAAK,CAAC,eAAe,GAAG,IAAI,CAAC;YAC/B,CAAC;YACD,IAAI,CAAC,iBAAiB,GAAG,SAAS,CAAC;QACrC,CAAC;QAED,KAAK,CAAC,eAAe,GAAG,KAAK,CAAC,eAAe,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC;QACjE,OAAO,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAChC,CAAC;CACF;AAED,eAAe,yBAAyB,CAAC"}
|