@vcmap/core 5.0.3 → 5.1.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/geojson.d.ts +27 -0
- package/dist/index.d.ts +14 -4
- package/dist/index.js +9 -1
- package/dist/index.js.map +1 -1
- package/dist/src/classRegistry.js +2 -2
- package/dist/src/classRegistry.js.map +1 -1
- package/dist/src/featureProvider/abstractFeatureProvider.d.ts +2 -1
- package/dist/src/featureProvider/abstractFeatureProvider.js +2 -1
- package/dist/src/featureProvider/abstractFeatureProvider.js.map +1 -1
- package/dist/src/featureProvider/tileProviderFeatureProvider.d.ts +1 -1
- package/dist/src/featureProvider/tileProviderFeatureProvider.js +2 -2
- package/dist/src/featureProvider/tileProviderFeatureProvider.js.map +1 -1
- package/dist/src/featureProvider/wmsFeatureProvider.d.ts +1 -1
- package/dist/src/featureProvider/wmsFeatureProvider.js +4 -3
- package/dist/src/featureProvider/wmsFeatureProvider.js.map +1 -1
- package/dist/src/interaction/eventHandler.js +3 -3
- package/dist/src/interaction/eventHandler.js.map +1 -1
- package/dist/src/interaction/featureProviderInteraction.js +1 -1
- package/dist/src/interaction/featureProviderInteraction.js.map +1 -1
- package/dist/src/layer/cesium/cesiumTilesetCesiumImpl.d.ts +4 -1
- package/dist/src/layer/cesium/cesiumTilesetCesiumImpl.js +31 -2
- package/dist/src/layer/cesium/cesiumTilesetCesiumImpl.js.map +1 -1
- package/dist/src/layer/cesium/resourceHelper.d.ts +2 -0
- package/dist/src/layer/cesium/resourceHelper.js +12 -0
- package/dist/src/layer/cesium/resourceHelper.js.map +1 -0
- package/dist/src/layer/cesium/singleImageCesiumImpl.js +2 -1
- package/dist/src/layer/cesium/singleImageCesiumImpl.js.map +1 -1
- package/dist/src/layer/cesium/terrainCesiumImpl.js +1 -1
- package/dist/src/layer/cesium/terrainCesiumImpl.js.map +1 -1
- package/dist/src/layer/cesium/tmsCesiumImpl.js +2 -1
- package/dist/src/layer/cesium/tmsCesiumImpl.js.map +1 -1
- package/dist/src/layer/cesium/vectorRasterTileCesiumImpl.js +1 -0
- package/dist/src/layer/cesium/vectorRasterTileCesiumImpl.js.map +1 -1
- package/dist/src/layer/cesium/vectorTileImageryProvider.d.ts +2 -0
- package/dist/src/layer/cesium/vectorTileImageryProvider.js +3 -1
- package/dist/src/layer/cesium/vectorTileImageryProvider.js.map +1 -1
- package/dist/src/layer/cesium/wmsCesiumImpl.js +2 -1
- package/dist/src/layer/cesium/wmsCesiumImpl.js.map +1 -1
- package/dist/src/layer/cesium/wmtsCesiumImpl.js +2 -1
- package/dist/src/layer/cesium/wmtsCesiumImpl.js.map +1 -1
- package/dist/src/layer/cesiumTilesetLayer.d.ts +5 -1
- package/dist/src/layer/cesiumTilesetLayer.js +17 -7
- package/dist/src/layer/cesiumTilesetLayer.js.map +1 -1
- package/dist/src/layer/czmlLayer.js +2 -1
- package/dist/src/layer/czmlLayer.js.map +1 -1
- package/dist/src/layer/featureLayer.js +2 -2
- package/dist/src/layer/featureLayer.js.map +1 -1
- package/dist/src/layer/featureStoreLayer.js +8 -5
- package/dist/src/layer/featureStoreLayer.js.map +1 -1
- package/dist/src/layer/featureStoreLayerChanges.d.ts +20 -8
- package/dist/src/layer/featureStoreLayerChanges.js +26 -26
- package/dist/src/layer/featureStoreLayerChanges.js.map +1 -1
- package/dist/src/layer/featureStoreLayerState.d.ts +1 -5
- package/dist/src/layer/featureStoreLayerState.js +0 -9
- package/dist/src/layer/featureStoreLayerState.js.map +1 -1
- package/dist/src/layer/geojsonLayer.js +3 -2
- package/dist/src/layer/geojsonLayer.js.map +1 -1
- package/dist/src/layer/layer.d.ts +15 -0
- package/dist/src/layer/layer.js +30 -4
- package/dist/src/layer/layer.js.map +1 -1
- package/dist/src/layer/layerImplementation.d.ts +1 -0
- package/dist/src/layer/layerImplementation.js +2 -0
- package/dist/src/layer/layerImplementation.js.map +1 -1
- package/dist/src/layer/oblique/vectorObliqueImpl.js +17 -7
- package/dist/src/layer/oblique/vectorObliqueImpl.js.map +1 -1
- package/dist/src/layer/openlayers/loadFunctionHelpers.d.ts +2 -0
- package/dist/src/layer/openlayers/loadFunctionHelpers.js +20 -0
- package/dist/src/layer/openlayers/loadFunctionHelpers.js.map +1 -0
- package/dist/src/layer/openlayers/singleImageOpenlayersImpl.js +25 -1
- package/dist/src/layer/openlayers/singleImageOpenlayersImpl.js.map +1 -1
- package/dist/src/layer/openlayers/tmsOpenlayersImpl.js +9 -1
- package/dist/src/layer/openlayers/tmsOpenlayersImpl.js.map +1 -1
- package/dist/src/layer/openlayers/vectorTileOpenlayersImpl.js +1 -1
- package/dist/src/layer/openlayers/vectorTileOpenlayersImpl.js.map +1 -1
- package/dist/src/layer/openlayers/wmsOpenlayersImpl.d.ts +4 -1
- package/dist/src/layer/openlayers/wmsOpenlayersImpl.js +20 -1
- package/dist/src/layer/openlayers/wmsOpenlayersImpl.js.map +1 -1
- package/dist/src/layer/openlayers/wmtsOpenlayersImpl.js +9 -1
- package/dist/src/layer/openlayers/wmtsOpenlayersImpl.js.map +1 -1
- package/dist/src/layer/pointCloudLayer.js +2 -2
- package/dist/src/layer/pointCloudLayer.js.map +1 -1
- package/dist/src/layer/terrainHelpers.d.ts +3 -3
- package/dist/src/layer/terrainHelpers.js +12 -7
- package/dist/src/layer/terrainHelpers.js.map +1 -1
- package/dist/src/layer/terrainLayer.js +1 -1
- package/dist/src/layer/terrainLayer.js.map +1 -1
- package/dist/src/layer/tileProvider/mvtTileProvider.d.ts +1 -1
- package/dist/src/layer/tileProvider/mvtTileProvider.js +4 -3
- package/dist/src/layer/tileProvider/mvtTileProvider.js.map +1 -1
- package/dist/src/layer/tileProvider/staticGeojsonTileProvider.d.ts +1 -1
- package/dist/src/layer/tileProvider/staticGeojsonTileProvider.js +4 -3
- package/dist/src/layer/tileProvider/staticGeojsonTileProvider.js.map +1 -1
- package/dist/src/layer/tileProvider/tileProvider.d.ts +14 -11
- package/dist/src/layer/tileProvider/tileProvider.js +23 -20
- package/dist/src/layer/tileProvider/tileProvider.js.map +1 -1
- package/dist/src/layer/tileProvider/urlTemplateTileProvider.d.ts +1 -1
- package/dist/src/layer/tileProvider/urlTemplateTileProvider.js +4 -3
- package/dist/src/layer/tileProvider/urlTemplateTileProvider.js.map +1 -1
- package/dist/src/layer/vectorLayer.d.ts +1 -2
- package/dist/src/layer/vectorLayer.js +3 -3
- package/dist/src/layer/vectorLayer.js.map +1 -1
- package/dist/src/layer/vectorProperties.d.ts +11 -16
- package/dist/src/layer/vectorProperties.js +16 -13
- package/dist/src/layer/vectorProperties.js.map +1 -1
- package/dist/src/layer/wfsLayer.js +9 -6
- package/dist/src/layer/wfsLayer.js.map +1 -1
- package/dist/src/layer/wmsHelpers.d.ts +10 -0
- package/dist/src/layer/wmsHelpers.js +53 -12
- package/dist/src/layer/wmsHelpers.js.map +1 -1
- package/dist/src/layer/wmsLayer.d.ts +6 -0
- package/dist/src/layer/wmsLayer.js +5 -2
- package/dist/src/layer/wmsLayer.js.map +1 -1
- package/dist/src/map/cameraLimiter.d.ts +5 -0
- package/dist/src/map/cameraLimiter.js +11 -4
- package/dist/src/map/cameraLimiter.js.map +1 -1
- package/dist/src/map/cesiumMap.d.ts +20 -1
- package/dist/src/map/cesiumMap.js +51 -2
- package/dist/src/map/cesiumMap.js.map +1 -1
- package/dist/src/map/vcsMap.js +2 -2
- package/dist/src/map/vcsMap.js.map +1 -1
- package/dist/src/oblique/helpers.d.ts +1 -1
- package/dist/src/oblique/helpers.js +5 -9
- package/dist/src/oblique/helpers.js.map +1 -1
- package/dist/src/oblique/obliqueCollection.d.ts +1 -0
- package/dist/src/oblique/obliqueCollection.js +1 -1
- package/dist/src/oblique/obliqueCollection.js.map +1 -1
- package/dist/src/oblique/obliqueDataSet.d.ts +3 -1
- package/dist/src/oblique/obliqueDataSet.js +13 -6
- package/dist/src/oblique/obliqueDataSet.js.map +1 -1
- package/dist/src/oblique/obliqueImageMeta.d.ts +2 -0
- package/dist/src/oblique/obliqueImageMeta.js +2 -0
- package/dist/src/oblique/obliqueImageMeta.js.map +1 -1
- package/dist/src/oblique/obliqueView.d.ts +1 -0
- package/dist/src/oblique/obliqueView.js +12 -2
- package/dist/src/oblique/obliqueView.js.map +1 -1
- package/dist/src/oblique/parseImageJson.d.ts +6 -5
- package/dist/src/oblique/parseImageJson.js +7 -5
- package/dist/src/oblique/parseImageJson.js.map +1 -1
- package/dist/src/ol/geom/circle.js.map +1 -1
- package/dist/src/style/declarativeStyleItem.js +10 -2
- package/dist/src/style/declarativeStyleItem.js.map +1 -1
- package/dist/src/style/styleFactory.js +2 -2
- package/dist/src/style/styleFactory.js.map +1 -1
- package/dist/src/style/styleHelpers.js +13 -3
- package/dist/src/style/styleHelpers.js.map +1 -1
- package/dist/src/style/vectorStyleItem.js +29 -16
- package/dist/src/style/vectorStyleItem.js.map +1 -1
- package/dist/src/util/clipping/clippingPlaneHelper.js +3 -3
- package/dist/src/util/clipping/clippingPlaneHelper.js.map +1 -1
- package/dist/src/util/editor/createFeatureSession.d.ts +2 -2
- package/dist/src/util/editor/createFeatureSession.js +2 -2
- package/dist/src/util/editor/createFeatureSession.js.map +1 -1
- package/dist/src/util/editor/editFeaturesSession.d.ts +2 -2
- package/dist/src/util/editor/editGeometrySession.d.ts +2 -2
- package/dist/src/util/editor/editorSessionHelpers.d.ts +2 -2
- package/dist/src/util/editor/selectFeaturesSession.d.ts +2 -2
- package/dist/src/util/editor/selectFeaturesSession.js +2 -2
- package/dist/src/util/editor/selectFeaturesSession.js.map +1 -1
- package/dist/src/util/featureconverter/arcToCesium.d.ts +1 -1
- package/dist/src/util/featureconverter/arcToCesium.js +5 -2
- package/dist/src/util/featureconverter/arcToCesium.js.map +1 -1
- package/dist/src/util/featureconverter/circleToCesium.d.ts +4 -2
- package/dist/src/util/featureconverter/circleToCesium.js +8 -3
- package/dist/src/util/featureconverter/circleToCesium.js.map +1 -1
- package/dist/src/util/featureconverter/extent3D.js.map +1 -1
- package/dist/src/util/featureconverter/featureconverterHelper.js +2 -2
- package/dist/src/util/featureconverter/featureconverterHelper.js.map +1 -1
- package/dist/src/util/featureconverter/lineStringToCesium.d.ts +3 -1
- package/dist/src/util/featureconverter/lineStringToCesium.js +7 -2
- package/dist/src/util/featureconverter/lineStringToCesium.js.map +1 -1
- package/dist/src/util/featureconverter/pointToCesium.js +1 -1
- package/dist/src/util/featureconverter/pointToCesium.js.map +1 -1
- package/dist/src/util/featureconverter/polygonToCesium.d.ts +3 -3
- package/dist/src/util/featureconverter/polygonToCesium.js +9 -15
- package/dist/src/util/featureconverter/polygonToCesium.js.map +1 -1
- package/dist/src/util/fetch.d.ts +2 -0
- package/dist/src/util/fetch.js +16 -0
- package/dist/src/util/fetch.js.map +1 -1
- package/dist/src/util/flight/flightAnchor.d.ts +23 -0
- package/dist/src/util/flight/flightAnchor.js +152 -0
- package/dist/src/util/flight/flightAnchor.js.map +1 -0
- package/dist/src/util/flight/flightCollection.d.ts +25 -0
- package/dist/src/util/flight/flightCollection.js +63 -0
- package/dist/src/util/flight/flightCollection.js.map +1 -0
- package/dist/src/util/flight/flightHelpers.d.ts +29 -0
- package/dist/src/util/flight/flightHelpers.js +134 -0
- package/dist/src/util/flight/flightHelpers.js.map +1 -0
- package/dist/src/util/flight/flightInstance.d.ts +57 -0
- package/dist/src/util/flight/flightInstance.js +166 -0
- package/dist/src/util/flight/flightInstance.js.map +1 -0
- package/dist/src/util/flight/flightPlayer.d.ts +30 -0
- package/dist/src/util/flight/flightPlayer.js +247 -0
- package/dist/src/util/flight/flightPlayer.js.map +1 -0
- package/dist/src/util/flight/flightVisualizer.d.ts +18 -0
- package/dist/src/util/flight/flightVisualizer.js +151 -0
- package/dist/src/util/flight/flightVisualizer.js.map +1 -0
- package/dist/src/util/hiddenObjects.d.ts +8 -0
- package/dist/src/util/hiddenObjects.js +17 -0
- package/dist/src/util/hiddenObjects.js.map +1 -0
- package/dist/src/util/mapCollection.js +2 -2
- package/dist/src/util/mapCollection.js.map +1 -1
- package/dist/src/util/overrideCollection.d.ts +8 -3
- package/dist/src/util/overrideCollection.js +17 -0
- package/dist/src/util/overrideCollection.js.map +1 -1
- package/dist/src/util/projection.js +5 -2
- package/dist/src/util/projection.js.map +1 -1
- package/dist/src/util/viewpoint.d.ts +1 -0
- package/dist/src/util/viewpoint.js +24 -7
- package/dist/src/util/viewpoint.js.map +1 -1
- package/dist/src/vcsApp.d.ts +10 -3
- package/dist/src/vcsApp.js +34 -15
- package/dist/src/vcsApp.js.map +1 -1
- package/dist/src/vcsModule.d.ts +4 -0
- package/dist/src/vcsModule.js.map +1 -1
- package/dist/tests/unit/helpers/cesiumHelpers.d.ts +2 -2
- package/dist/tests/unit/helpers/cesiumHelpers.js +2 -1
- package/dist/tests/unit/helpers/cesiumHelpers.js.map +1 -1
- package/dist/tests/unit/helpers/terrain/terrainData.d.ts +7 -0
- package/dist/tests/unit/helpers/terrain/terrainData.js +2 -2
- package/dist/tests/unit/helpers/terrain/terrainData.js.map +1 -1
- package/index.ts +39 -1
- package/package.json +3 -2
- package/src/classRegistry.ts +2 -2
- package/src/featureProvider/abstractFeatureProvider.ts +2 -0
- package/src/featureProvider/tileProviderFeatureProvider.ts +2 -0
- package/src/featureProvider/wmsFeatureProvider.ts +4 -2
- package/src/interaction/eventHandler.ts +3 -3
- package/src/interaction/featureProviderInteraction.ts +1 -0
- package/src/layer/cesium/cesiumTilesetCesiumImpl.ts +44 -5
- package/src/layer/cesium/resourceHelper.ts +15 -0
- package/src/layer/cesium/singleImageCesiumImpl.ts +2 -1
- package/src/layer/cesium/terrainCesiumImpl.ts +2 -1
- package/src/layer/cesium/tmsCesiumImpl.ts +2 -1
- package/src/layer/cesium/vectorRasterTileCesiumImpl.ts +1 -0
- package/src/layer/cesium/vectorTileImageryProvider.ts +10 -1
- package/src/layer/cesium/wmsCesiumImpl.ts +2 -1
- package/src/layer/cesium/wmtsCesiumImpl.ts +4 -2
- package/src/layer/cesiumTilesetLayer.ts +25 -7
- package/src/layer/czmlLayer.ts +2 -1
- package/src/layer/featureLayer.ts +2 -2
- package/src/layer/featureStoreLayer.ts +8 -8
- package/src/layer/featureStoreLayerChanges.ts +63 -45
- package/src/layer/featureStoreLayerState.ts +6 -5
- package/src/layer/geojsonLayer.ts +3 -3
- package/src/layer/layer.ts +41 -4
- package/src/layer/layerImplementation.ts +3 -0
- package/src/layer/oblique/vectorObliqueImpl.ts +18 -12
- package/src/layer/openlayers/loadFunctionHelpers.ts +24 -0
- package/src/layer/openlayers/singleImageOpenlayersImpl.ts +25 -1
- package/src/layer/openlayers/tmsOpenlayersImpl.ts +8 -1
- package/src/layer/openlayers/vectorTileOpenlayersImpl.ts +1 -0
- package/src/layer/openlayers/wmsOpenlayersImpl.ts +23 -2
- package/src/layer/openlayers/wmtsOpenlayersImpl.ts +8 -1
- package/src/layer/pointCloudLayer.ts +2 -2
- package/src/layer/terrainHelpers.ts +19 -6
- package/src/layer/terrainLayer.ts +8 -4
- package/src/layer/tileProvider/mvtTileProvider.ts +9 -3
- package/src/layer/tileProvider/staticGeojsonTileProvider.ts +9 -3
- package/src/layer/tileProvider/tileProvider.ts +49 -13
- package/src/layer/tileProvider/urlTemplateTileProvider.ts +10 -3
- package/src/layer/vectorLayer.ts +9 -9
- package/src/layer/vectorProperties.ts +46 -22
- package/src/layer/wfsLayer.ts +9 -6
- package/src/layer/wmsHelpers.ts +78 -10
- package/src/layer/wmsLayer.ts +11 -2
- package/src/map/cameraLimiter.ts +21 -2
- package/src/map/cesiumMap.ts +67 -2
- package/src/map/vcsMap.ts +2 -2
- package/src/oblique/helpers.ts +5 -13
- package/src/oblique/obliqueCollection.ts +2 -0
- package/src/oblique/obliqueDataSet.ts +16 -2
- package/src/oblique/obliqueImageMeta.ts +4 -0
- package/src/oblique/obliqueView.ts +12 -2
- package/src/oblique/parseImageJson.ts +7 -4
- package/src/ol/geojson.d.ts +1 -2
- package/src/ol/geom/circle.ts +1 -1
- package/src/style/declarativeStyleItem.ts +10 -2
- package/src/style/styleFactory.ts +2 -2
- package/src/style/styleHelpers.ts +13 -4
- package/src/style/vectorStyleItem.ts +32 -20
- package/src/util/clipping/clippingPlaneHelper.ts +3 -3
- package/src/util/editor/createFeatureSession.ts +9 -8
- package/src/util/editor/editFeaturesSession.ts +1 -1
- package/src/util/editor/editGeometrySession.ts +1 -1
- package/src/util/editor/editorSessionHelpers.ts +2 -2
- package/src/util/editor/selectFeaturesSession.ts +3 -3
- package/src/util/featureconverter/arcToCesium.ts +5 -1
- package/src/util/featureconverter/circleToCesium.ts +8 -2
- package/src/util/featureconverter/extent3D.ts +1 -1
- package/src/util/featureconverter/featureconverterHelper.ts +3 -5
- package/src/util/featureconverter/lineStringToCesium.ts +8 -1
- package/src/util/featureconverter/pointToCesium.ts +1 -1
- package/src/util/featureconverter/polygonToCesium.ts +6 -15
- package/src/util/fetch.ts +25 -0
- package/src/util/flight/flightAnchor.ts +195 -0
- package/src/util/flight/flightCollection.ts +78 -0
- package/src/util/flight/flightHelpers.ts +208 -0
- package/src/util/flight/flightInstance.ts +240 -0
- package/src/util/flight/flightPlayer.ts +326 -0
- package/src/util/flight/flightVisualizer.ts +202 -0
- package/src/util/hiddenObjects.ts +35 -0
- package/src/util/mapCollection.ts +2 -2
- package/src/util/overrideCollection.ts +26 -3
- package/src/util/projection.ts +5 -2
- package/src/util/viewpoint.ts +27 -7
- package/src/vcsApp.ts +56 -15
- package/src/vcsModule.ts +4 -0
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
import TileState from 'ol/TileState.js';
|
|
2
|
+
import { getInitForUrl, requestObjectUrl } from '../../util/fetch.js';
|
|
3
|
+
// eslint-disable-next-line import/prefer-default-export
|
|
4
|
+
export function getTileLoadFunction(headers) {
|
|
5
|
+
return function tileLoadFunction(imageTile, src) {
|
|
6
|
+
const image = imageTile.getImage();
|
|
7
|
+
const init = getInitForUrl(src, headers);
|
|
8
|
+
requestObjectUrl(src, init)
|
|
9
|
+
.then((blobUrl) => {
|
|
10
|
+
image.src = blobUrl;
|
|
11
|
+
image.onload = () => {
|
|
12
|
+
URL.revokeObjectURL(blobUrl);
|
|
13
|
+
};
|
|
14
|
+
})
|
|
15
|
+
.catch(() => {
|
|
16
|
+
imageTile.setState(TileState.ERROR);
|
|
17
|
+
});
|
|
18
|
+
};
|
|
19
|
+
}
|
|
20
|
+
//# sourceMappingURL=loadFunctionHelpers.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"loadFunctionHelpers.js","sourceRoot":"","sources":["../../../../src/layer/openlayers/loadFunctionHelpers.ts"],"names":[],"mappings":"AAEA,OAAO,SAAS,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAEtE,wDAAwD;AACxD,MAAM,UAAU,mBAAmB,CACjC,OAA+B;IAE/B,OAAO,SAAS,gBAAgB,CAAC,SAAS,EAAE,GAAG;QAC7C,MAAM,KAAK,GAAI,SAAuB,CAAC,QAAQ,EAAsB,CAAC;QACtE,MAAM,IAAI,GAAG,aAAa,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QACzC,gBAAgB,CAAC,GAAG,EAAE,IAAI,CAAC;aACxB,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE;YAChB,KAAK,CAAC,GAAG,GAAG,OAAO,CAAC;YACpB,KAAK,CAAC,MAAM,GAAG,GAAS,EAAE;gBACxB,GAAG,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;YAC/B,CAAC,CAAC;QACJ,CAAC,CAAC;aACD,KAAK,CAAC,GAAG,EAAE;YACV,SAAS,CAAC,QAAQ,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QACtC,CAAC,CAAC,CAAC;IACP,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
import ImageLayer from 'ol/layer/Image.js';
|
|
2
|
+
import { TrustedServers } from '@vcmap-cesium/engine';
|
|
2
3
|
import ImageStatic from 'ol/source/ImageStatic.js';
|
|
3
4
|
import RasterLayerOpenlayersImpl from './rasterLayerOpenlayersImpl.js';
|
|
4
5
|
import { wgs84Projection } from '../../util/projection.js';
|
|
5
6
|
import { isSameOrigin } from '../../util/urlHelpers.js';
|
|
7
|
+
import { getInitForUrl, requestObjectUrl } from '../../util/fetch.js';
|
|
6
8
|
/**
|
|
7
9
|
* represents a specific OpenLayers SingleImageLayer Layer class.
|
|
8
10
|
*/
|
|
@@ -25,9 +27,31 @@ class SingleImageOpenlayersImpl extends RasterLayerOpenlayersImpl {
|
|
|
25
27
|
projection: 'EPSG:4326',
|
|
26
28
|
imageExtent: this.extent.getCoordinatesInProjection(wgs84Projection),
|
|
27
29
|
};
|
|
28
|
-
if (
|
|
30
|
+
if (TrustedServers.contains(options.url)) {
|
|
31
|
+
options.crossOrigin = 'use-credentials';
|
|
32
|
+
}
|
|
33
|
+
else if (!isSameOrigin(this.url)) {
|
|
29
34
|
options.crossOrigin = 'anonymous';
|
|
30
35
|
}
|
|
36
|
+
if (this.headers) {
|
|
37
|
+
options.imageLoadFunction = (imageWrapper, src) => {
|
|
38
|
+
const init = getInitForUrl(src, this.headers);
|
|
39
|
+
requestObjectUrl(src, init)
|
|
40
|
+
.then((blobUrl) => {
|
|
41
|
+
const image = imageWrapper.getImage();
|
|
42
|
+
image.src = blobUrl;
|
|
43
|
+
image.onload = () => {
|
|
44
|
+
URL.revokeObjectURL(blobUrl);
|
|
45
|
+
};
|
|
46
|
+
})
|
|
47
|
+
.catch(() => {
|
|
48
|
+
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
49
|
+
// @ts-ignore
|
|
50
|
+
// eslint-disable-next-line @typescript-eslint/no-unsafe-call,no-underscore-dangle
|
|
51
|
+
imageWrapper.handleImageError_();
|
|
52
|
+
});
|
|
53
|
+
};
|
|
54
|
+
}
|
|
31
55
|
return new ImageLayer({
|
|
32
56
|
source: new ImageStatic(options),
|
|
33
57
|
opacity: this.opacity,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"singleImageOpenlayersImpl.js","sourceRoot":"","sources":["../../../../src/layer/openlayers/singleImageOpenlayersImpl.ts"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,mBAAmB,CAAC;AAC3C,OAAO,WAEN,MAAM,0BAA0B,CAAC;AAClC,OAAO,yBAAyB,MAAM,gCAAgC,CAAC;AACvE,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"singleImageOpenlayersImpl.js","sourceRoot":"","sources":["../../../../src/layer/openlayers/singleImageOpenlayersImpl.ts"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,WAEN,MAAM,0BAA0B,CAAC;AAClC,OAAO,yBAAyB,MAAM,gCAAgC,CAAC;AACvE,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAGxD,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAEtE;;GAEG;AACH,MAAM,yBAA0B,SAAQ,yBAAyB;IAC/D,MAAM,KAAK,SAAS;QAClB,OAAO,2BAA2B,CAAC;IACrC,CAAC;IAED,MAAM,CAAqB;IAE3B,YAAY,GAAkB,EAAE,OAAyC;QACvE,KAAK,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QACpB,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAC/B,CAAC;IAED;;OAEG;IACH,UAAU;QACR,MAAM,OAAO,GAAuB;YAClC,YAAY,EAAE,IAAI,CAAC,MAAM;YACzB,GAAG,EAAE,IAAI,CAAC,GAAa;YACvB,UAAU,EAAE,WAAW;YACvB,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC,0BAA0B,CAAC,eAAe,CAAC;SACrE,CAAC;QACF,IAAI,cAAc,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YACxC,OAAO,CAAC,WAAW,GAAG,iBAAiB,CAAC;SACzC;aAAM,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,GAAa,CAAC,EAAE;YAC5C,OAAO,CAAC,WAAW,GAAG,WAAW,CAAC;SACnC;QAED,IAAI,IAAI,CAAC,OAAO,EAAE;YAChB,OAAO,CAAC,iBAAiB,GAAG,CAAC,YAAY,EAAE,GAAG,EAAQ,EAAE;gBACtD,MAAM,IAAI,GAAG,aAAa,CAAC,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;gBAC9C,gBAAgB,CAAC,GAAG,EAAE,IAAI,CAAC;qBACxB,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE;oBAChB,MAAM,KAAK,GAAG,YAAY,CAAC,QAAQ,EAAsB,CAAC;oBAC1D,KAAK,CAAC,GAAG,GAAG,OAAO,CAAC;oBACpB,KAAK,CAAC,MAAM,GAAG,GAAS,EAAE;wBACxB,GAAG,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;oBAC/B,CAAC,CAAC;gBACJ,CAAC,CAAC;qBACD,KAAK,CAAC,GAAG,EAAE;oBACV,6DAA6D;oBAC7D,aAAa;oBACb,kFAAkF;oBAClF,YAAY,CAAC,iBAAiB,EAAE,CAAC;gBACnC,CAAC,CAAC,CAAC;YACP,CAAC,CAAC;SACH;QAED,OAAO,IAAI,UAAU,CAAC;YACpB,MAAM,EAAE,IAAI,WAAW,CAAC,OAAO,CAAC;YAChC,OAAO,EAAE,IAAI,CAAC,OAAO;SACtB,CAAC,CAAC;IACL,CAAC;CACF;AAED,eAAe,yBAAyB,CAAC"}
|
|
@@ -1,9 +1,11 @@
|
|
|
1
|
+
import { TrustedServers } from '@vcmap-cesium/engine';
|
|
1
2
|
import XYZ from 'ol/source/XYZ.js';
|
|
2
3
|
import Tile from 'ol/layer/Tile.js';
|
|
3
4
|
import { mercatorProjection } from '../../util/projection.js';
|
|
4
5
|
import RasterLayerOpenlayersImpl from './rasterLayerOpenlayersImpl.js';
|
|
5
6
|
import { TilingScheme } from '../rasterLayer.js';
|
|
6
7
|
import { isSameOrigin } from '../../util/urlHelpers.js';
|
|
8
|
+
import { getTileLoadFunction } from './loadFunctionHelpers.js';
|
|
7
9
|
/**
|
|
8
10
|
* TmsLayer implementation for {@link OpenlayersMap}.
|
|
9
11
|
*/
|
|
@@ -34,12 +36,18 @@ class TmsOpenlayersImpl extends RasterLayerOpenlayersImpl {
|
|
|
34
36
|
maxZoom: this.maxLevel,
|
|
35
37
|
wrapX: false,
|
|
36
38
|
};
|
|
37
|
-
if (
|
|
39
|
+
if (TrustedServers.contains(this.url)) {
|
|
40
|
+
sourceOptions.crossOrigin = 'use-credentials';
|
|
41
|
+
}
|
|
42
|
+
else if (!isSameOrigin(this.url)) {
|
|
38
43
|
sourceOptions.crossOrigin = 'anonymous';
|
|
39
44
|
}
|
|
40
45
|
if (this.tilingSchema === TilingScheme.GEOGRAPHIC) {
|
|
41
46
|
sourceOptions.projection = 'EPSG:4326';
|
|
42
47
|
}
|
|
48
|
+
if (this.headers) {
|
|
49
|
+
sourceOptions.tileLoadFunction = getTileLoadFunction(this.headers);
|
|
50
|
+
}
|
|
43
51
|
const tileOptions = {
|
|
44
52
|
source: new XYZ(sourceOptions),
|
|
45
53
|
opacity: this.opacity,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tmsOpenlayersImpl.js","sourceRoot":"","sources":["../../../../src/layer/openlayers/tmsOpenlayersImpl.ts"],"names":[],"mappings":"AAAA,OAAO,GAAmC,MAAM,kBAAkB,CAAC;AACnE,OAAO,IAAI,MAAM,kBAAkB,CAAC;AAGpC,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,yBAAyB,MAAM,gCAAgC,CAAC;AACvE,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"tmsOpenlayersImpl.js","sourceRoot":"","sources":["../../../../src/layer/openlayers/tmsOpenlayersImpl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,GAAmC,MAAM,kBAAkB,CAAC;AACnE,OAAO,IAAI,MAAM,kBAAkB,CAAC;AAGpC,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,yBAAyB,MAAM,gCAAgC,CAAC;AACvE,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAGxD,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAE/D;;GAEG;AACH,MAAM,iBAAkB,SAAQ,yBAAyB;IACvD,MAAM,KAAK,SAAS;QAClB,OAAO,mBAAmB,CAAC;IAC7B,CAAC;IAED,MAAM,CAAS;IAEf,QAAQ,CAAO;IAEf;;;OAGG;IACH,YAAY,GAAkB,EAAE,OAAiC;QAC/D,KAAK,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QACpB,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;QAC7B,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;IACnC,CAAC;IAED,UAAU;QACR,MAAM,aAAa,GAAe;YAChC,eAAe,EAAE,CAAC,SAAS,EAAE,EAAE;gBAC7B,MAAM,OAAO,GAAG,IAAI,CAAC,GAAI,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;gBAC7C,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;gBACjD,OAAO,GAAG,OAAO,IAAI,SAAS,CAAC,CAAC,CAAC,IAAI,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YAC1E,CAAC;YACD,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,OAAO,EAAE,IAAI,CAAC,QAAQ;YACtB,OAAO,EAAE,IAAI,CAAC,QAAQ;YACtB,KAAK,EAAE,KAAK;SACb,CAAC;QACF,IAAI,cAAc,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAa,CAAC,EAAE;YAC/C,aAAa,CAAC,WAAW,GAAG,iBAAiB,CAAC;SAC/C;aAAM,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,GAAa,CAAC,EAAE;YAC5C,aAAa,CAAC,WAAW,GAAG,WAAW,CAAC;SACzC;QACD,IAAI,IAAI,CAAC,YAAY,KAAK,YAAY,CAAC,UAAU,EAAE;YACjD,aAAa,CAAC,UAAU,GAAG,WAAW,CAAC;SACxC;QACD,IAAI,IAAI,CAAC,OAAO,EAAE;YAChB,aAAa,CAAC,gBAAgB,GAAG,mBAAmB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;SACpE;QAED,MAAM,WAAW,GAAqB;YACpC,MAAM,EAAE,IAAI,GAAG,CAAC,aAAa,CAAC;YAC9B,OAAO,EAAE,IAAI,CAAC,OAAO;SACtB,CAAC;QACF,IAAI,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE;YACxC,WAAW,CAAC,MAAM;gBAChB,IAAI,CAAC,MAAM,CAAC,0BAA0B,CAAC,kBAAkB,CAAC,CAAC;SAC9D;QACD,OAAO,IAAI,IAAI,CAAC,WAAW,CAAC,CAAC;IAC/B,CAAC;CACF;AAED,eAAe,iBAAiB,CAAC"}
|
|
@@ -38,7 +38,7 @@ class VectorTileOpenlayersImpl extends LayerOpenlayersImpl {
|
|
|
38
38
|
// @ts-ignore
|
|
39
39
|
// eslint-disable-next-line @typescript-eslint/no-misused-promises
|
|
40
40
|
tileLoadFunction: async (tile) => {
|
|
41
|
-
const features = await this.tileProvider.getFeaturesForTile(tile.tileCoord[1], tile.tileCoord[2], tile.tileCoord[0]);
|
|
41
|
+
const features = await this.tileProvider.getFeaturesForTile(tile.tileCoord[1], tile.tileCoord[2], tile.tileCoord[0], this.headers);
|
|
42
42
|
if (features.length > 0) {
|
|
43
43
|
tile.setFeatures(features);
|
|
44
44
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vectorTileOpenlayersImpl.js","sourceRoot":"","sources":["../../../../src/layer/openlayers/vectorTileOpenlayersImpl.ts"],"names":[],"mappings":"AAAA,OAAO,iBAAiB,MAAM,wBAAwB,CAAC;AACvD,OAAO,gBAAgB,MAAM,yBAAyB,CAAC;AACvD,OAAO,SAAS,MAAM,iBAAiB,CAAC;AAGxC,OAAO,mBAAmB,MAAM,0BAA0B,CAAC;AAC3D,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAU9D;;GAEG;AACH,MAAM,wBACJ,SAAQ,mBAAmB;IAG3B,MAAM,KAAK,SAAS;QAClB,OAAO,0BAA0B,CAAC;IACpC,CAAC;IAED,YAAY,CAAe;IAE3B,MAAM,GAAiC,SAAS,CAAC;IAEjD,QAAQ,CAAO;IAEf;;OAEG;IACK,cAAc,GAAgB,IAAI,GAAG,EAAE,CAAC;IAExC,cAAc,GAAuB,SAAS,CAAC;IAEvD,QAAQ,CAAqB;IAE7B,QAAQ,CAAqB;IAE7B,MAAM,CAAqB;IAE3B,YAAY,GAAkB,EAAE,OAAwC;QACtE,KAAK,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QAEpB,IAAI,CAAC,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC;QACzC,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;QACjC,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;QACjC,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;QACjC,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAC/B,CAAC;IAED,UAAU;QACR,IAAI,CAAC,MAAM,GAAG,IAAI,gBAAgB,CAAC;YACjC,OAAO,EAAE,CAAC;YACV,OAAO,EAAE,EAAE;YACX,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,6DAA6D;YAC7D,aAAa;YACb,kEAAkE;YAClE,gBAAgB,EAAE,KAAK,EAAE,IAAgB,EAAiB,EAAE;gBAC1D,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,kBAAkB,CACzD,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,EACjB,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,EACjB,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"vectorTileOpenlayersImpl.js","sourceRoot":"","sources":["../../../../src/layer/openlayers/vectorTileOpenlayersImpl.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import Tile from 'ol/layer/Tile.js';
|
|
2
2
|
import type { Size } from 'ol/size.js';
|
|
3
3
|
import type TileWMS from 'ol/source/TileWMS.js';
|
|
4
|
+
import ImageWMS from 'ol/source/ImageWMS.js';
|
|
5
|
+
import ImageLayer from 'ol/layer/Image.js';
|
|
4
6
|
import RasterLayerOpenlayersImpl from './rasterLayerOpenlayersImpl.js';
|
|
5
7
|
import type { WMSImplementationOptions } from '../wmsLayer.js';
|
|
6
8
|
import type OpenlayersMap from '../../map/openlayersMap.js';
|
|
@@ -12,7 +14,8 @@ declare class WmsOpenlayersImpl extends RasterLayerOpenlayersImpl {
|
|
|
12
14
|
parameters: Record<string, string>;
|
|
13
15
|
version: string;
|
|
14
16
|
tileSize: Size;
|
|
17
|
+
singleImage2d: boolean;
|
|
15
18
|
constructor(map: OpenlayersMap, options: WMSImplementationOptions);
|
|
16
|
-
getOLLayer(): Tile<TileWMS>;
|
|
19
|
+
getOLLayer(): Tile<TileWMS> | ImageLayer<ImageWMS>;
|
|
17
20
|
}
|
|
18
21
|
export default WmsOpenlayersImpl;
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import Tile from 'ol/layer/Tile.js';
|
|
2
|
+
import ImageLayer from 'ol/layer/Image.js';
|
|
2
3
|
import RasterLayerOpenlayersImpl from './rasterLayerOpenlayersImpl.js';
|
|
3
|
-
import { getWMSSource } from '../wmsHelpers.js';
|
|
4
|
+
import { getImageWMSSource, getWMSSource } from '../wmsHelpers.js';
|
|
5
|
+
import { mercatorProjection } from '../../util/projection.js';
|
|
4
6
|
/**
|
|
5
7
|
* represents a specific Cesium WmsOpenlayersImpl Layer class.
|
|
6
8
|
*/
|
|
@@ -11,13 +13,29 @@ class WmsOpenlayersImpl extends RasterLayerOpenlayersImpl {
|
|
|
11
13
|
parameters;
|
|
12
14
|
version;
|
|
13
15
|
tileSize;
|
|
16
|
+
singleImage2d;
|
|
14
17
|
constructor(map, options) {
|
|
15
18
|
super(map, options);
|
|
16
19
|
this.parameters = options.parameters;
|
|
17
20
|
this.version = options.version;
|
|
18
21
|
this.tileSize = options.tileSize;
|
|
22
|
+
this.singleImage2d = options.singleImage2d;
|
|
19
23
|
}
|
|
20
24
|
getOLLayer() {
|
|
25
|
+
if (this.singleImage2d) {
|
|
26
|
+
return new ImageLayer({
|
|
27
|
+
extent: this.extent.getCoordinatesInProjection(mercatorProjection),
|
|
28
|
+
visible: false,
|
|
29
|
+
source: getImageWMSSource({
|
|
30
|
+
url: this.url,
|
|
31
|
+
parameters: this.parameters,
|
|
32
|
+
tilingSchema: this.tilingSchema,
|
|
33
|
+
version: this.version,
|
|
34
|
+
headers: this.headers,
|
|
35
|
+
}),
|
|
36
|
+
opacity: this.opacity,
|
|
37
|
+
});
|
|
38
|
+
}
|
|
21
39
|
return new Tile({
|
|
22
40
|
visible: false,
|
|
23
41
|
source: getWMSSource({
|
|
@@ -29,6 +47,7 @@ class WmsOpenlayersImpl extends RasterLayerOpenlayersImpl {
|
|
|
29
47
|
minLevel: this.minLevel,
|
|
30
48
|
maxLevel: this.maxLevel,
|
|
31
49
|
tilingSchema: this.tilingSchema,
|
|
50
|
+
headers: this.headers,
|
|
32
51
|
}),
|
|
33
52
|
opacity: this.opacity,
|
|
34
53
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wmsOpenlayersImpl.js","sourceRoot":"","sources":["../../../../src/layer/openlayers/wmsOpenlayersImpl.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"wmsOpenlayersImpl.js","sourceRoot":"","sources":["../../../../src/layer/openlayers/wmsOpenlayersImpl.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,kBAAkB,CAAC;AAIpC,OAAO,UAAU,MAAM,mBAAmB,CAAC;AAC3C,OAAO,yBAAyB,MAAM,gCAAgC,CAAC;AACvE,OAAO,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAGnE,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAE9D;;GAEG;AACH,MAAM,iBAAkB,SAAQ,yBAAyB;IACvD,MAAM,KAAK,SAAS;QAClB,OAAO,mBAAmB,CAAC;IAC7B,CAAC;IAED,UAAU,CAAyB;IAEnC,OAAO,CAAS;IAEhB,QAAQ,CAAO;IAEf,aAAa,CAAU;IAEvB,YAAY,GAAkB,EAAE,OAAiC;QAC/D,KAAK,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QACpB,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;QACrC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;QAC/B,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;QACjC,IAAI,CAAC,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;IAC7C,CAAC;IAED,UAAU;QACR,IAAI,IAAI,CAAC,aAAa,EAAE;YACtB,OAAO,IAAI,UAAU,CAAC;gBACpB,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,0BAA0B,CAAC,kBAAkB,CAAC;gBAClE,OAAO,EAAE,KAAK;gBACd,MAAM,EAAE,iBAAiB,CAAC;oBACxB,GAAG,EAAE,IAAI,CAAC,GAAa;oBACvB,UAAU,EAAE,IAAI,CAAC,UAAU;oBAC3B,YAAY,EAAE,IAAI,CAAC,YAAY;oBAC/B,OAAO,EAAE,IAAI,CAAC,OAAO;oBACrB,OAAO,EAAE,IAAI,CAAC,OAAO;iBACtB,CAAC;gBACF,OAAO,EAAE,IAAI,CAAC,OAAO;aACtB,CAAC,CAAC;SACJ;QACD,OAAO,IAAI,IAAI,CAAC;YACd,OAAO,EAAE,KAAK;YACd,MAAM,EAAE,YAAY,CAAC;gBACnB,GAAG,EAAE,IAAI,CAAC,GAAa;gBACvB,UAAU,EAAE,IAAI,CAAC,UAAU;gBAC3B,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,QAAQ,EAAE,IAAI,CAAC,QAAQ;gBACvB,QAAQ,EAAE,IAAI,CAAC,QAAQ;gBACvB,QAAQ,EAAE,IAAI,CAAC,QAAQ;gBACvB,YAAY,EAAE,IAAI,CAAC,YAAY;gBAC/B,OAAO,EAAE,IAAI,CAAC,OAAO;aACtB,CAAC;YACF,OAAO,EAAE,IAAI,CAAC,OAAO;SACtB,CAAC,CAAC;IACL,CAAC;CACF;AAED,eAAe,iBAAiB,CAAC"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { TrustedServers } from '@vcmap-cesium/engine';
|
|
1
2
|
import { getTopLeft, getWidth } from 'ol/extent.js';
|
|
2
3
|
import WMTSTileGrid from 'ol/tilegrid/WMTS.js';
|
|
3
4
|
import Tile from 'ol/layer/Tile.js';
|
|
@@ -6,6 +7,7 @@ import { wgs84Projection, mercatorProjection } from '../../util/projection.js';
|
|
|
6
7
|
import RasterLayerOpenlayersImpl from './rasterLayerOpenlayersImpl.js';
|
|
7
8
|
import { TilingScheme } from '../rasterLayer.js';
|
|
8
9
|
import { isSameOrigin } from '../../util/urlHelpers.js';
|
|
10
|
+
import { getTileLoadFunction } from './loadFunctionHelpers.js';
|
|
9
11
|
/**
|
|
10
12
|
* WmtsLayer implementation for {@link OpenlayersMap}.
|
|
11
13
|
*/
|
|
@@ -82,12 +84,18 @@ class WmtsOpenlayersImpl extends RasterLayerOpenlayersImpl {
|
|
|
82
84
|
matrixSet: this.tileMatrixSetID,
|
|
83
85
|
url: this.url,
|
|
84
86
|
};
|
|
85
|
-
if (
|
|
87
|
+
if (TrustedServers.contains(this.url)) {
|
|
88
|
+
wmtsOptions.crossOrigin = 'use-credentials';
|
|
89
|
+
}
|
|
90
|
+
else if (!isSameOrigin(this.url)) {
|
|
86
91
|
wmtsOptions.crossOrigin = 'anonymous';
|
|
87
92
|
}
|
|
88
93
|
if (this.tilingSchema === TilingScheme.GEOGRAPHIC) {
|
|
89
94
|
wmtsOptions.projection = 'EPSG:4326';
|
|
90
95
|
}
|
|
96
|
+
if (this.headers) {
|
|
97
|
+
wmtsOptions.tileLoadFunction = getTileLoadFunction(this.headers);
|
|
98
|
+
}
|
|
91
99
|
Object.assign(wmtsOptions, this.openlayersOptions);
|
|
92
100
|
return new Tile({
|
|
93
101
|
opacity: this.opacity,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wmtsOpenlayersImpl.js","sourceRoot":"","sources":["../../../../src/layer/openlayers/wmtsOpenlayersImpl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AACpD,OAAO,YAEN,MAAM,qBAAqB,CAAC;AAC7B,OAAO,IAAI,MAAM,kBAAkB,CAAC;AACpC,OAAO,UAA6C,MAAM,mBAAmB,CAAC;AAE9E,OAAO,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAC/E,OAAO,yBAAyB,MAAM,gCAAgC,CAAC;AACvE,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"wmtsOpenlayersImpl.js","sourceRoot":"","sources":["../../../../src/layer/openlayers/wmtsOpenlayersImpl.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { check, maybe, oneOf } from '@vcsuite/check';
|
|
2
2
|
import CesiumTilesetLayer from './cesiumTilesetLayer.js';
|
|
3
3
|
import DeclarativeStyleItem from '../style/declarativeStyleItem.js';
|
|
4
4
|
import VectorStyleItem from '../style/vectorStyleItem.js';
|
|
@@ -45,7 +45,7 @@ class PointCloudLayer extends CesiumTilesetLayer {
|
|
|
45
45
|
return this._pointSize;
|
|
46
46
|
}
|
|
47
47
|
set pointSize(size) {
|
|
48
|
-
|
|
48
|
+
check(size, maybe(oneOf(Number, String)));
|
|
49
49
|
this._pointSize = size;
|
|
50
50
|
this.style.pointSize = size?.toString();
|
|
51
51
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pointCloudLayer.js","sourceRoot":"","sources":["../../../src/layer/pointCloudLayer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"pointCloudLayer.js","sourceRoot":"","sources":["../../../src/layer/pointCloudLayer.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,11 +5,11 @@ export type TerrainProviderOptions = {
|
|
|
5
5
|
requestVertexNormals?: boolean;
|
|
6
6
|
requestWaterMask?: boolean;
|
|
7
7
|
};
|
|
8
|
+
export declare function getTerrainProviderForUrl(url: string, options: TerrainProviderOptions, headers?: Record<string, string>): Promise<CesiumTerrainProvider>;
|
|
8
9
|
/**
|
|
9
|
-
*
|
|
10
|
-
* @param options
|
|
10
|
+
* cleans the terrainProvider Cache, used for testing
|
|
11
11
|
*/
|
|
12
|
-
export declare function
|
|
12
|
+
export declare function cleanCachedTerrainProviders(): void;
|
|
13
13
|
/**
|
|
14
14
|
* changes input coordinate Array in place, new height can also be accessed by coordinates[x][2]
|
|
15
15
|
* @param terrainProvider
|
|
@@ -1,14 +1,11 @@
|
|
|
1
1
|
import { CesiumTerrainProvider, Cartographic, Cartesian2, sampleTerrainMostDetailed, } from '@vcmap-cesium/engine';
|
|
2
2
|
import { getTransform } from 'ol/proj.js';
|
|
3
3
|
import { wgs84Projection } from '../util/projection.js';
|
|
4
|
+
import { getResourceOrUrl } from './cesium/resourceHelper.js';
|
|
4
5
|
const terrainProviders = {};
|
|
5
|
-
|
|
6
|
-
* @param url
|
|
7
|
-
* @param options
|
|
8
|
-
*/
|
|
9
|
-
export async function getTerrainProviderForUrl(url, options) {
|
|
6
|
+
export async function getTerrainProviderForUrl(url, options, headers) {
|
|
10
7
|
if (!terrainProviders[url]) {
|
|
11
|
-
terrainProviders[url] = await CesiumTerrainProvider.fromUrl(url, options);
|
|
8
|
+
terrainProviders[url] = await CesiumTerrainProvider.fromUrl(getResourceOrUrl(url, headers), options);
|
|
12
9
|
return terrainProviders[url];
|
|
13
10
|
}
|
|
14
11
|
let terrainProvider = terrainProviders[url];
|
|
@@ -16,11 +13,19 @@ export async function getTerrainProviderForUrl(url, options) {
|
|
|
16
13
|
terrainProvider.requestVertexNormals !== options.requestVertexNormals) ||
|
|
17
14
|
(options.requestWaterMask !== undefined &&
|
|
18
15
|
terrainProvider.requestWaterMask !== options.requestWaterMask)) {
|
|
19
|
-
terrainProviders[url] = await CesiumTerrainProvider.fromUrl(url, options);
|
|
16
|
+
terrainProviders[url] = await CesiumTerrainProvider.fromUrl(getResourceOrUrl(url, headers), options);
|
|
20
17
|
terrainProvider = terrainProviders[url];
|
|
21
18
|
}
|
|
22
19
|
return terrainProvider;
|
|
23
20
|
}
|
|
21
|
+
/**
|
|
22
|
+
* cleans the terrainProvider Cache, used for testing
|
|
23
|
+
*/
|
|
24
|
+
export function cleanCachedTerrainProviders() {
|
|
25
|
+
Object.keys(terrainProviders).forEach((key) => {
|
|
26
|
+
delete terrainProviders[key];
|
|
27
|
+
});
|
|
28
|
+
}
|
|
24
29
|
/**
|
|
25
30
|
* changes input coordinate Array in place, new height can also be accessed by coordinates[x][2]
|
|
26
31
|
* @param terrainProvider
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terrainHelpers.js","sourceRoot":"","sources":["../../../src/layer/terrainHelpers.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,qBAAqB,EACrB,YAAY,EACZ,UAAU,EACV,yBAAyB,GAC1B,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC1C,OAAmB,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"terrainHelpers.js","sourceRoot":"","sources":["../../../src/layer/terrainHelpers.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,qBAAqB,EACrB,YAAY,EACZ,UAAU,EACV,yBAAyB,GAC1B,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC1C,OAAmB,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACpE,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAO9D,MAAM,gBAAgB,GAA0C,EAAE,CAAC;AAEnE,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAC5C,GAAW,EACX,OAA+B,EAC/B,OAAgC;IAEhC,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,EAAE;QAC1B,gBAAgB,CAAC,GAAG,CAAC,GAAG,MAAM,qBAAqB,CAAC,OAAO,CACzD,gBAAgB,CAAC,GAAG,EAAE,OAAO,CAAC,EAC9B,OAAO,CACR,CAAC;QACF,OAAO,gBAAgB,CAAC,GAAG,CAAC,CAAC;KAC9B;IACD,IAAI,eAAe,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC;IAC5C,IACE,CAAC,OAAO,CAAC,oBAAoB,KAAK,SAAS;QACzC,eAAe,CAAC,oBAAoB,KAAK,OAAO,CAAC,oBAAoB,CAAC;QACxE,CAAC,OAAO,CAAC,gBAAgB,KAAK,SAAS;YACrC,eAAe,CAAC,gBAAgB,KAAK,OAAO,CAAC,gBAAgB,CAAC,EAChE;QACA,gBAAgB,CAAC,GAAG,CAAC,GAAG,MAAM,qBAAqB,CAAC,OAAO,CACzD,gBAAgB,CAAC,GAAG,EAAE,OAAO,CAAC,EAC9B,OAAO,CACR,CAAC;QACF,eAAe,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC;KACzC;IACD,OAAO,eAAe,CAAC;AACzB,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,2BAA2B;IACzC,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QAC5C,OAAO,gBAAgB,CAAC,GAAG,CAAC,CAAC;IAC/B,CAAC,CAAC,CAAC;AACL,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,4BAA4B,CAC1C,eAAsC,EACtC,WAAyB,EACzB,mBAAgC,EAChC,MAAqB;IAErB,MAAM,iBAAiB,GAAG,mBAAmB;QAC3C,CAAC,CAAC,YAAY,CAAC,mBAAmB,CAAC,IAAI,EAAE,eAAe,CAAC,IAAI,CAAC;QAC9D,CAAC,CAAC,IAAI,CAAC;IAET,MAAM,SAAS,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;QAC1C,MAAM,KAAK,GAAG,iBAAiB;YAC7B,CAAC,CAAC,iBAAiB,CAAC,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,EAAE,KAAK,CAAC,MAAM,CAAC;YACvD,CAAC,CAAC,KAAK,CAAC;QACV,OAAO,YAAY,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IACtD,CAAC,CAAC,CAAC;IAEH,MAAM,QAAQ,GAAG,MAAM,IAAI,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC;IAC7D,OAAO,yBAAyB,CAAC,eAAe,EAAE,SAAS,CAAC,CAAC,IAAI,CAC/D,CAAC,gBAAgB,EAAE,EAAE;QACnB,gBAAgB,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,KAAK,EAAE,EAAE;YAC3C,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,MAAM,IAAI,CAAC,CAAC;QAC5C,CAAC,CAAC,CAAC;QACH,OAAO,QAAQ,CAAC;IAClB,CAAC,CACF,CAAC;AACJ,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,sBAAsB,CACpC,eAAsC,EACtC,KAAa,EACb,QAAsB;IAEtB,MAAM,MAAM,GAAG,eAAe,CAAC,YAAY,CAAC,gBAAgB,CAC1D,QAAQ,EACR,KAAK,EACL,IAAI,UAAU,EAAE,CACjB,CAAC;IACF,OAAO,CAAC,CAAC,eAAe,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;AAC3E,CAAC"}
|
|
@@ -48,7 +48,7 @@ class TerrainLayer extends Layer {
|
|
|
48
48
|
const terrainProvider = await getTerrainProviderForUrl(this.url, {
|
|
49
49
|
requestVertexNormals: this.requestVertexNormals,
|
|
50
50
|
requestWaterMask: this.requestWaterMask,
|
|
51
|
-
});
|
|
51
|
+
}, this.headers);
|
|
52
52
|
return getHeightFromTerrainProvider(terrainProvider, coords, undefined, coords);
|
|
53
53
|
}
|
|
54
54
|
toJSON() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terrainLayer.js","sourceRoot":"","sources":["../../../src/layer/terrainLayer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD,OAAO,KAAmD,MAAM,YAAY,CAAC;AAC7E,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;AAazD;;GAEG;AACH,MAAM,YAAa,SAAQ,KAAwB;IACjD,MAAM,KAAK,SAAS;QAClB,OAAO,cAAc,CAAC;IACxB,CAAC;IAED,MAAM,CAAC,iBAAiB;QACtB,OAAO;YACL,GAAG,KAAK,CAAC,iBAAiB,EAAE;YAC5B,oBAAoB,EAAE,IAAI;YAC1B,gBAAgB,EAAE,KAAK;SACxB,CAAC;IACJ,CAAC;IAES,cAAc,GAAG,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;IAEjD,oBAAoB,CAAU;IAE9B,gBAAgB,CAAU;IAE1B,YAAY,OAAuB;QACjC,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,MAAM,cAAc,GAAG,YAAY,CAAC,iBAAiB,EAAE,CAAC;QAExD,IAAI,CAAC,oBAAoB,GAAG,YAAY,CACtC,OAAO,CAAC,oBAAoB,EAC5B,cAAc,CAAC,oBAAoB,CACpC,CAAC;QACF,IAAI,CAAC,gBAAgB,GAAG,YAAY,CAClC,OAAO,CAAC,gBAAgB,EACxB,cAAc,CAAC,gBAAgB,CAChC,CAAC;IACJ,CAAC;IAED,wBAAwB;QACtB,OAAO;YACL,GAAG,KAAK,CAAC,wBAAwB,EAAE;YACnC,oBAAoB,EAAE,IAAI,CAAC,oBAAoB;YAC/C,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;SACxC,CAAC;IACJ,CAAC;IAED,2BAA2B,CAAC,GAAW;QACrC,IAAI,GAAG,YAAY,SAAS,EAAE;YAC5B,OAAO,CAAC,IAAI,iBAAiB,CAAC,GAAG,EAAE,IAAI,CAAC,wBAAwB,EAAE,CAAC,CAAC,CAAC;SACtE;QACD,OAAO,EAAE,CAAC;IACZ,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,4BAA4B,CAChC,MAAoB;QAEpB,MAAM,eAAe,GAAG,MAAM,wBAAwB,
|
|
1
|
+
{"version":3,"file":"terrainLayer.js","sourceRoot":"","sources":["../../../src/layer/terrainLayer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD,OAAO,KAAmD,MAAM,YAAY,CAAC;AAC7E,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;AAazD;;GAEG;AACH,MAAM,YAAa,SAAQ,KAAwB;IACjD,MAAM,KAAK,SAAS;QAClB,OAAO,cAAc,CAAC;IACxB,CAAC;IAED,MAAM,CAAC,iBAAiB;QACtB,OAAO;YACL,GAAG,KAAK,CAAC,iBAAiB,EAAE;YAC5B,oBAAoB,EAAE,IAAI;YAC1B,gBAAgB,EAAE,KAAK;SACxB,CAAC;IACJ,CAAC;IAES,cAAc,GAAG,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;IAEjD,oBAAoB,CAAU;IAE9B,gBAAgB,CAAU;IAE1B,YAAY,OAAuB;QACjC,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,MAAM,cAAc,GAAG,YAAY,CAAC,iBAAiB,EAAE,CAAC;QAExD,IAAI,CAAC,oBAAoB,GAAG,YAAY,CACtC,OAAO,CAAC,oBAAoB,EAC5B,cAAc,CAAC,oBAAoB,CACpC,CAAC;QACF,IAAI,CAAC,gBAAgB,GAAG,YAAY,CAClC,OAAO,CAAC,gBAAgB,EACxB,cAAc,CAAC,gBAAgB,CAChC,CAAC;IACJ,CAAC;IAED,wBAAwB;QACtB,OAAO;YACL,GAAG,KAAK,CAAC,wBAAwB,EAAE;YACnC,oBAAoB,EAAE,IAAI,CAAC,oBAAoB;YAC/C,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;SACxC,CAAC;IACJ,CAAC;IAED,2BAA2B,CAAC,GAAW;QACrC,IAAI,GAAG,YAAY,SAAS,EAAE;YAC5B,OAAO,CAAC,IAAI,iBAAiB,CAAC,GAAG,EAAE,IAAI,CAAC,wBAAwB,EAAE,CAAC,CAAC,CAAC;SACtE;QACD,OAAO,EAAE,CAAC;IACZ,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,4BAA4B,CAChC,MAAoB;QAEpB,MAAM,eAAe,GAAG,MAAM,wBAAwB,CACpD,IAAI,CAAC,GAAG,EACR;YACE,oBAAoB,EAAE,IAAI,CAAC,oBAAoB;YAC/C,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;SACxC,EACD,IAAI,CAAC,OAAO,CACb,CAAC;QACF,OAAO,4BAA4B,CACjC,eAAe,EACf,MAAM,EACN,SAAS,EACT,MAAM,CACP,CAAC;IACJ,CAAC;IAED,MAAM;QACJ,MAAM,MAAM,GAAmB,KAAK,CAAC,MAAM,EAAE,CAAC;QAC9C,MAAM,cAAc,GAAG,YAAY,CAAC,iBAAiB,EAAE,CAAC;QAExD,IAAI,IAAI,CAAC,oBAAoB,KAAK,cAAc,CAAC,oBAAoB,EAAE;YACrE,MAAM,CAAC,oBAAoB,GAAG,IAAI,CAAC,oBAAoB,CAAC;SACzD;QACD,IAAI,IAAI,CAAC,gBAAgB,KAAK,cAAc,CAAC,gBAAgB,EAAE;YAC7D,MAAM,CAAC,gBAAgB,GAAG,IAAI,CAAC,gBAAgB,CAAC;SACjD;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;CACF;AAED,kBAAkB,CAAC,aAAa,CAAC,YAAY,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;AACvE,eAAe,YAAY,CAAC"}
|
|
@@ -25,7 +25,7 @@ declare class MVTTileProvider extends TileProvider {
|
|
|
25
25
|
* sets the locale and clears the Cache if the URL is a locale aware Object.
|
|
26
26
|
*/
|
|
27
27
|
set locale(value: string);
|
|
28
|
-
loader(x: number, y: number, z: number): Promise<Feature[]>;
|
|
28
|
+
loader(x: number, y: number, z: number, headers?: Record<string, string>): Promise<Feature[]>;
|
|
29
29
|
toJSON(): MVTTileProviderOptions;
|
|
30
30
|
}
|
|
31
31
|
export default MVTTileProvider;
|
|
@@ -3,7 +3,7 @@ import Feature from 'ol/Feature.js';
|
|
|
3
3
|
import { getCenter } from 'ol/extent.js';
|
|
4
4
|
import TileProvider, { rectangleToExtent, } from './tileProvider.js';
|
|
5
5
|
import { getURL } from './urlTemplateTileProvider.js';
|
|
6
|
-
import { requestArrayBuffer } from '../../util/fetch.js';
|
|
6
|
+
import { getInitForUrl, requestArrayBuffer } from '../../util/fetch.js';
|
|
7
7
|
import { tileProviderClassRegistry } from '../../classRegistry.js';
|
|
8
8
|
/**
|
|
9
9
|
* Loads the pbf tiles
|
|
@@ -43,12 +43,13 @@ class MVTTileProvider extends TileProvider {
|
|
|
43
43
|
}
|
|
44
44
|
}
|
|
45
45
|
}
|
|
46
|
-
async loader(x, y, z) {
|
|
46
|
+
async loader(x, y, z, headers) {
|
|
47
47
|
const rectangle = this.tilingScheme.tileXYToRectangle(x, y, z);
|
|
48
48
|
const url = getURL(this.url, x, y, z, rectangle, this.locale);
|
|
49
49
|
const extent = rectangleToExtent(rectangle);
|
|
50
50
|
const center = getCenter(extent);
|
|
51
|
-
const
|
|
51
|
+
const init = getInitForUrl(this.url, headers);
|
|
52
|
+
const data = await requestArrayBuffer(url, init);
|
|
52
53
|
const features = this._MVTFormat.readFeatures(data);
|
|
53
54
|
const sx = (extent[2] - extent[0]) / 4096;
|
|
54
55
|
const sy = -((extent[3] - extent[1]) / 4096);
|
|
@@ -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;AAEzC,OAAO,YAAY,EAAE,EACnB,iBAAiB,GAElB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC;AACtD,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"mvtTileProvider.js","sourceRoot":"","sources":["../../../../src/layer/tileProvider/mvtTileProvider.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,7 +11,7 @@ declare class StaticGeoJSONTileProvider extends TileProvider {
|
|
|
11
11
|
static getDefaultOptions(): StaticGeoJSONTileProviderOptions;
|
|
12
12
|
url: string;
|
|
13
13
|
constructor(options: StaticGeoJSONTileProviderOptions);
|
|
14
|
-
loader(_x: number, _y: number, _z: number): Promise<Feature[]>;
|
|
14
|
+
loader(_x: number, _y: number, _z: number, headers?: Record<string, string>): Promise<Feature[]>;
|
|
15
15
|
toJSON(): StaticGeoJSONTileProviderOptions;
|
|
16
16
|
}
|
|
17
17
|
export default StaticGeoJSONTileProvider;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { parseGeoJSON } from '../geojsonHelpers.js';
|
|
2
2
|
import TileProvider from './tileProvider.js';
|
|
3
|
-
import { requestJson } from '../../util/fetch.js';
|
|
3
|
+
import { getInitForUrl, requestJson } from '../../util/fetch.js';
|
|
4
4
|
import { tileProviderClassRegistry } from '../../classRegistry.js';
|
|
5
5
|
/**
|
|
6
6
|
* Loads the provided geojson url and tiles the content in memory, data is only requested once
|
|
@@ -24,8 +24,9 @@ class StaticGeoJSONTileProvider extends TileProvider {
|
|
|
24
24
|
this.url = options.url || defaultOptions.url;
|
|
25
25
|
}
|
|
26
26
|
// eslint-disable-next-line no-unused-vars
|
|
27
|
-
async loader(_x, _y, _z) {
|
|
28
|
-
const
|
|
27
|
+
async loader(_x, _y, _z, headers) {
|
|
28
|
+
const init = getInitForUrl(this.url, headers);
|
|
29
|
+
const data = await requestJson(this.url, init);
|
|
29
30
|
const { features } = parseGeoJSON(data, { dynamicStyle: true });
|
|
30
31
|
return features;
|
|
31
32
|
}
|
|
@@ -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;AACpD,OAAO,YAAqC,MAAM,mBAAmB,CAAC;AACtE,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"staticGeojsonTileProvider.js","sourceRoot":"","sources":["../../../../src/layer/tileProvider/staticGeojsonTileProvider.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,YAAqC,MAAM,mBAAmB,CAAC;AACtE,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,OAAO,CAAC,UAAU,GAAG,cAAc,CAAC,UAAU,CAAC;QAC/C,KAAK,CAAC,OAAO,CAAC,CAAC;QAEf,IAAI,CAAC,GAAG,GAAG,OAAO,CAAC,GAAG,IAAI,cAAc,CAAC,GAAG,CAAC;IAC/C,CAAC;IAED,0CAA0C;IAC1C,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;QACJ,MAAM,MAAM,GAA8C,KAAK,CAAC,MAAM,EAAE,CAAC;QACzE,OAAO,MAAM,CAAC,UAAU,CAAC;QAEzB,IAAI,IAAI,CAAC,GAAG,EAAE;YACZ,MAAM,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC;SACvB;QACD,OAAO,MAA0C,CAAC;IACpD,CAAC;CACF;AAED,eAAe,yBAAyB,CAAC;AACzC,yBAAyB,CAAC,aAAa,CACrC,yBAAyB,CAAC,SAAS,EACnC,yBAAyB,CAC1B,CAAC"}
|
|
@@ -118,23 +118,26 @@ declare class TileProvider extends VcsObject {
|
|
|
118
118
|
/**
|
|
119
119
|
* returns the features intersecting this coordinate. Depending on the resolution a buffer around the coordinate is requested.
|
|
120
120
|
* The Buffer has the size of the resolution.
|
|
121
|
-
* @param
|
|
122
|
-
* @param
|
|
121
|
+
* @param coordinate in mercator
|
|
122
|
+
* @param resolution in m per pixel
|
|
123
|
+
* @param headers optional request headers to be sent with the server request
|
|
123
124
|
*/
|
|
124
|
-
getFeaturesByCoordinate(coordinate: Coordinate, resolution: number): Promise<Feature[]>;
|
|
125
|
+
getFeaturesByCoordinate(coordinate: Coordinate, resolution: number, headers?: Record<string, string>): Promise<Feature[]>;
|
|
125
126
|
/**
|
|
126
127
|
* returns features for the requested Tile.
|
|
127
|
-
* @param
|
|
128
|
-
* @param
|
|
129
|
-
* @param
|
|
128
|
+
* @param x
|
|
129
|
+
* @param y
|
|
130
|
+
* @param level - if the level is not a base level, will use the closest match
|
|
131
|
+
* @param headers optional request headers to be sent with the server request
|
|
130
132
|
*/
|
|
131
|
-
getFeaturesForTile(x: number, y: number, level: number): Promise<Feature[]>;
|
|
133
|
+
getFeaturesForTile(x: number, y: number, level: number, headers?: Record<string, string>): Promise<Feature[]>;
|
|
132
134
|
/**
|
|
133
135
|
* Retrieves all features which intersect the given extent. Will load all intersecting tiles.
|
|
134
|
-
* @param
|
|
135
|
-
* @param
|
|
136
|
+
* @param extent
|
|
137
|
+
* @param level - Optional level to request. Will use highest level if omitted. If the provided level is not a base level, will use the closest match.
|
|
138
|
+
* @param headers Optional request headers to be sent with the server request
|
|
136
139
|
*/
|
|
137
|
-
getFeaturesForExtent(extent: Extent, level?: number): Promise<Feature[]>;
|
|
140
|
+
getFeaturesForExtent(extent: Extent, level?: number, headers?: Record<string, string>): Promise<Feature[]>;
|
|
138
141
|
/**
|
|
139
142
|
* calls the given Function for Each feature currently in the cache
|
|
140
143
|
* @param callback
|
|
@@ -163,7 +166,7 @@ declare class TileProvider extends VcsObject {
|
|
|
163
166
|
* return features;
|
|
164
167
|
* });
|
|
165
168
|
*/
|
|
166
|
-
loader(_x: number, _y: number, _z: number): Promise<Feature[]>;
|
|
169
|
+
loader(_x: number, _y: number, _z: number, _headers?: Record<string, string>): Promise<Feature[]>;
|
|
167
170
|
toJSON(): TileProviderOptions;
|
|
168
171
|
/**
|
|
169
172
|
* clears the cache and removes all entries
|