@vcmap/core 5.0.2 → 5.1.0-rc.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cesium.d.ts +257 -0
- package/dist/geojson.d.ts +27 -0
- package/dist/index.d.ts +15 -2
- package/dist/index.js +9 -1
- package/dist/index.js.map +1 -1
- package/dist/ol.d.ts +138 -0
- package/dist/src/classRegistry.js +2 -2
- package/dist/src/classRegistry.js.map +1 -1
- package/dist/src/featureProvider/abstractFeatureProvider.d.ts +2 -1
- package/dist/src/featureProvider/abstractFeatureProvider.js +2 -1
- package/dist/src/featureProvider/abstractFeatureProvider.js.map +1 -1
- package/dist/src/featureProvider/tileProviderFeatureProvider.d.ts +1 -1
- package/dist/src/featureProvider/tileProviderFeatureProvider.js +2 -2
- package/dist/src/featureProvider/tileProviderFeatureProvider.js.map +1 -1
- package/dist/src/featureProvider/wmsFeatureProvider.d.ts +1 -1
- package/dist/src/featureProvider/wmsFeatureProvider.js +4 -3
- package/dist/src/featureProvider/wmsFeatureProvider.js.map +1 -1
- package/dist/src/interaction/eventHandler.js +3 -3
- package/dist/src/interaction/eventHandler.js.map +1 -1
- package/dist/src/interaction/featureProviderInteraction.js +1 -1
- package/dist/src/interaction/featureProviderInteraction.js.map +1 -1
- package/dist/src/layer/cesium/cesiumTilesetCesiumImpl.d.ts +4 -1
- package/dist/src/layer/cesium/cesiumTilesetCesiumImpl.js +31 -2
- package/dist/src/layer/cesium/cesiumTilesetCesiumImpl.js.map +1 -1
- package/dist/src/layer/cesium/resourceHelper.d.ts +2 -0
- package/dist/src/layer/cesium/resourceHelper.js +12 -0
- package/dist/src/layer/cesium/resourceHelper.js.map +1 -0
- package/dist/src/layer/cesium/singleImageCesiumImpl.js +2 -1
- package/dist/src/layer/cesium/singleImageCesiumImpl.js.map +1 -1
- package/dist/src/layer/cesium/terrainCesiumImpl.js +1 -1
- package/dist/src/layer/cesium/terrainCesiumImpl.js.map +1 -1
- package/dist/src/layer/cesium/tmsCesiumImpl.js +2 -1
- package/dist/src/layer/cesium/tmsCesiumImpl.js.map +1 -1
- package/dist/src/layer/cesium/vectorRasterTileCesiumImpl.js +1 -0
- package/dist/src/layer/cesium/vectorRasterTileCesiumImpl.js.map +1 -1
- package/dist/src/layer/cesium/vectorTileImageryProvider.d.ts +2 -0
- package/dist/src/layer/cesium/vectorTileImageryProvider.js +3 -1
- package/dist/src/layer/cesium/vectorTileImageryProvider.js.map +1 -1
- package/dist/src/layer/cesium/wmsCesiumImpl.js +2 -1
- package/dist/src/layer/cesium/wmsCesiumImpl.js.map +1 -1
- package/dist/src/layer/cesium/wmtsCesiumImpl.js +2 -1
- package/dist/src/layer/cesium/wmtsCesiumImpl.js.map +1 -1
- package/dist/src/layer/cesiumTilesetLayer.d.ts +5 -1
- package/dist/src/layer/cesiumTilesetLayer.js +17 -7
- package/dist/src/layer/cesiumTilesetLayer.js.map +1 -1
- package/dist/src/layer/czmlLayer.js +2 -1
- package/dist/src/layer/czmlLayer.js.map +1 -1
- package/dist/src/layer/featureLayer.js +2 -2
- package/dist/src/layer/featureLayer.js.map +1 -1
- package/dist/src/layer/featureStoreLayer.js +8 -5
- package/dist/src/layer/featureStoreLayer.js.map +1 -1
- package/dist/src/layer/featureStoreLayerChanges.d.ts +20 -8
- package/dist/src/layer/featureStoreLayerChanges.js +26 -26
- package/dist/src/layer/featureStoreLayerChanges.js.map +1 -1
- package/dist/src/layer/featureStoreLayerState.d.ts +1 -5
- package/dist/src/layer/featureStoreLayerState.js +0 -9
- package/dist/src/layer/featureStoreLayerState.js.map +1 -1
- package/dist/src/layer/geojsonLayer.js +3 -2
- package/dist/src/layer/geojsonLayer.js.map +1 -1
- package/dist/src/layer/layer.d.ts +15 -0
- package/dist/src/layer/layer.js +30 -4
- package/dist/src/layer/layer.js.map +1 -1
- package/dist/src/layer/layerImplementation.d.ts +1 -0
- package/dist/src/layer/layerImplementation.js +2 -0
- package/dist/src/layer/layerImplementation.js.map +1 -1
- package/dist/src/layer/oblique/vectorObliqueImpl.js +9 -6
- package/dist/src/layer/oblique/vectorObliqueImpl.js.map +1 -1
- package/dist/src/layer/openlayers/loadFunctionHelpers.d.ts +2 -0
- package/dist/src/layer/openlayers/loadFunctionHelpers.js +20 -0
- package/dist/src/layer/openlayers/loadFunctionHelpers.js.map +1 -0
- package/dist/src/layer/openlayers/singleImageOpenlayersImpl.js +25 -1
- package/dist/src/layer/openlayers/singleImageOpenlayersImpl.js.map +1 -1
- package/dist/src/layer/openlayers/tmsOpenlayersImpl.js +9 -1
- package/dist/src/layer/openlayers/tmsOpenlayersImpl.js.map +1 -1
- package/dist/src/layer/openlayers/vectorTileOpenlayersImpl.js +1 -1
- package/dist/src/layer/openlayers/vectorTileOpenlayersImpl.js.map +1 -1
- package/dist/src/layer/openlayers/wmsOpenlayersImpl.d.ts +4 -1
- package/dist/src/layer/openlayers/wmsOpenlayersImpl.js +20 -1
- package/dist/src/layer/openlayers/wmsOpenlayersImpl.js.map +1 -1
- package/dist/src/layer/openlayers/wmtsOpenlayersImpl.js +9 -1
- package/dist/src/layer/openlayers/wmtsOpenlayersImpl.js.map +1 -1
- package/dist/src/layer/pointCloudLayer.js +2 -2
- package/dist/src/layer/pointCloudLayer.js.map +1 -1
- package/dist/src/layer/terrainHelpers.d.ts +3 -3
- package/dist/src/layer/terrainHelpers.js +12 -7
- package/dist/src/layer/terrainHelpers.js.map +1 -1
- package/dist/src/layer/terrainLayer.js +1 -1
- package/dist/src/layer/terrainLayer.js.map +1 -1
- package/dist/src/layer/tileProvider/mvtTileProvider.d.ts +1 -1
- package/dist/src/layer/tileProvider/mvtTileProvider.js +4 -3
- package/dist/src/layer/tileProvider/mvtTileProvider.js.map +1 -1
- package/dist/src/layer/tileProvider/staticGeojsonTileProvider.d.ts +1 -1
- package/dist/src/layer/tileProvider/staticGeojsonTileProvider.js +4 -3
- package/dist/src/layer/tileProvider/staticGeojsonTileProvider.js.map +1 -1
- package/dist/src/layer/tileProvider/tileProvider.d.ts +14 -11
- package/dist/src/layer/tileProvider/tileProvider.js +23 -20
- package/dist/src/layer/tileProvider/tileProvider.js.map +1 -1
- package/dist/src/layer/tileProvider/urlTemplateTileProvider.d.ts +1 -1
- package/dist/src/layer/tileProvider/urlTemplateTileProvider.js +4 -3
- package/dist/src/layer/tileProvider/urlTemplateTileProvider.js.map +1 -1
- package/dist/src/layer/vectorLayer.d.ts +1 -2
- package/dist/src/layer/vectorLayer.js +3 -3
- package/dist/src/layer/vectorLayer.js.map +1 -1
- package/dist/src/layer/vectorProperties.d.ts +11 -16
- package/dist/src/layer/vectorProperties.js +16 -13
- package/dist/src/layer/vectorProperties.js.map +1 -1
- package/dist/src/layer/wfsLayer.js +9 -6
- package/dist/src/layer/wfsLayer.js.map +1 -1
- package/dist/src/layer/wmsHelpers.d.ts +10 -0
- package/dist/src/layer/wmsHelpers.js +53 -12
- package/dist/src/layer/wmsHelpers.js.map +1 -1
- package/dist/src/layer/wmsLayer.d.ts +6 -0
- package/dist/src/layer/wmsLayer.js +5 -2
- package/dist/src/layer/wmsLayer.js.map +1 -1
- package/dist/src/map/cameraLimiter.d.ts +5 -0
- package/dist/src/map/cameraLimiter.js +11 -4
- package/dist/src/map/cameraLimiter.js.map +1 -1
- package/dist/src/map/cesiumMap.d.ts +20 -1
- package/dist/src/map/cesiumMap.js +51 -2
- package/dist/src/map/cesiumMap.js.map +1 -1
- package/dist/src/map/vcsMap.js +2 -2
- package/dist/src/map/vcsMap.js.map +1 -1
- package/dist/src/oblique/helpers.d.ts +1 -1
- package/dist/src/oblique/helpers.js +5 -9
- package/dist/src/oblique/helpers.js.map +1 -1
- package/dist/src/oblique/obliqueCollection.d.ts +1 -0
- package/dist/src/oblique/obliqueCollection.js +1 -1
- package/dist/src/oblique/obliqueCollection.js.map +1 -1
- package/dist/src/oblique/obliqueDataSet.d.ts +3 -1
- package/dist/src/oblique/obliqueDataSet.js +13 -6
- package/dist/src/oblique/obliqueDataSet.js.map +1 -1
- package/dist/src/oblique/obliqueImageMeta.d.ts +2 -0
- package/dist/src/oblique/obliqueImageMeta.js +2 -0
- package/dist/src/oblique/obliqueImageMeta.js.map +1 -1
- package/dist/src/oblique/obliqueView.d.ts +1 -0
- package/dist/src/oblique/obliqueView.js +12 -2
- package/dist/src/oblique/obliqueView.js.map +1 -1
- package/dist/src/oblique/parseImageJson.d.ts +6 -5
- package/dist/src/oblique/parseImageJson.js +7 -5
- package/dist/src/oblique/parseImageJson.js.map +1 -1
- package/dist/src/ol/geom/circle.js.map +1 -1
- package/dist/src/style/declarativeStyleItem.js +10 -2
- package/dist/src/style/declarativeStyleItem.js.map +1 -1
- package/dist/src/style/styleFactory.js +2 -2
- package/dist/src/style/styleFactory.js.map +1 -1
- package/dist/src/style/styleHelpers.js +13 -3
- package/dist/src/style/styleHelpers.js.map +1 -1
- package/dist/src/style/vectorStyleItem.js +29 -16
- package/dist/src/style/vectorStyleItem.js.map +1 -1
- package/dist/src/util/clipping/clippingPlaneHelper.js +3 -3
- package/dist/src/util/clipping/clippingPlaneHelper.js.map +1 -1
- package/dist/src/util/editor/createFeatureSession.d.ts +2 -2
- package/dist/src/util/editor/createFeatureSession.js +2 -2
- package/dist/src/util/editor/createFeatureSession.js.map +1 -1
- package/dist/src/util/editor/editFeaturesSession.d.ts +2 -2
- package/dist/src/util/editor/editGeometrySession.d.ts +2 -2
- package/dist/src/util/editor/editorSessionHelpers.d.ts +2 -2
- package/dist/src/util/editor/selectFeaturesSession.d.ts +2 -2
- package/dist/src/util/editor/selectFeaturesSession.js +2 -2
- package/dist/src/util/editor/selectFeaturesSession.js.map +1 -1
- package/dist/src/util/featureconverter/arcToCesium.d.ts +1 -1
- package/dist/src/util/featureconverter/arcToCesium.js +5 -2
- package/dist/src/util/featureconverter/arcToCesium.js.map +1 -1
- package/dist/src/util/featureconverter/circleToCesium.d.ts +4 -2
- package/dist/src/util/featureconverter/circleToCesium.js +8 -3
- package/dist/src/util/featureconverter/circleToCesium.js.map +1 -1
- package/dist/src/util/featureconverter/extent3D.js.map +1 -1
- package/dist/src/util/featureconverter/featureconverterHelper.js +2 -2
- package/dist/src/util/featureconverter/featureconverterHelper.js.map +1 -1
- package/dist/src/util/featureconverter/lineStringToCesium.d.ts +3 -1
- package/dist/src/util/featureconverter/lineStringToCesium.js +7 -2
- package/dist/src/util/featureconverter/lineStringToCesium.js.map +1 -1
- package/dist/src/util/featureconverter/pointToCesium.js +1 -1
- package/dist/src/util/featureconverter/pointToCesium.js.map +1 -1
- package/dist/src/util/featureconverter/polygonToCesium.d.ts +3 -3
- package/dist/src/util/featureconverter/polygonToCesium.js +9 -15
- package/dist/src/util/featureconverter/polygonToCesium.js.map +1 -1
- package/dist/src/util/fetch.d.ts +2 -0
- package/dist/src/util/fetch.js +16 -0
- package/dist/src/util/fetch.js.map +1 -1
- package/dist/src/util/flight/flightAnchor.d.ts +23 -0
- package/dist/src/util/flight/flightAnchor.js +152 -0
- package/dist/src/util/flight/flightAnchor.js.map +1 -0
- package/dist/src/util/flight/flightCollection.d.ts +25 -0
- package/dist/src/util/flight/flightCollection.js +63 -0
- package/dist/src/util/flight/flightCollection.js.map +1 -0
- package/dist/src/util/flight/flightHelpers.d.ts +29 -0
- package/dist/src/util/flight/flightHelpers.js +134 -0
- package/dist/src/util/flight/flightHelpers.js.map +1 -0
- package/dist/src/util/flight/flightInstance.d.ts +57 -0
- package/dist/src/util/flight/flightInstance.js +166 -0
- package/dist/src/util/flight/flightInstance.js.map +1 -0
- package/dist/src/util/flight/flightPlayer.d.ts +30 -0
- package/dist/src/util/flight/flightPlayer.js +247 -0
- package/dist/src/util/flight/flightPlayer.js.map +1 -0
- package/dist/src/util/flight/flightVisualizer.d.ts +18 -0
- package/dist/src/util/flight/flightVisualizer.js +151 -0
- package/dist/src/util/flight/flightVisualizer.js.map +1 -0
- package/dist/src/util/hiddenObjects.d.ts +8 -0
- package/dist/src/util/hiddenObjects.js +17 -0
- package/dist/src/util/hiddenObjects.js.map +1 -0
- package/dist/src/util/mapCollection.js +2 -2
- package/dist/src/util/mapCollection.js.map +1 -1
- package/dist/src/util/overrideCollection.d.ts +8 -3
- package/dist/src/util/overrideCollection.js +17 -0
- package/dist/src/util/overrideCollection.js.map +1 -1
- package/dist/src/util/projection.js +5 -2
- package/dist/src/util/projection.js.map +1 -1
- package/dist/src/util/viewpoint.d.ts +1 -0
- package/dist/src/util/viewpoint.js +24 -7
- package/dist/src/util/viewpoint.js.map +1 -1
- package/dist/src/vcsApp.d.ts +10 -3
- package/dist/src/vcsApp.js +34 -15
- package/dist/src/vcsApp.js.map +1 -1
- package/dist/src/vcsModule.d.ts +4 -0
- package/dist/src/vcsModule.js.map +1 -1
- package/dist/tests/unit/helpers/cesiumHelpers.d.ts +2 -2
- package/dist/tests/unit/helpers/cesiumHelpers.js +2 -1
- package/dist/tests/unit/helpers/cesiumHelpers.js.map +1 -1
- package/dist/tests/unit/helpers/terrain/terrainData.d.ts +7 -0
- package/dist/tests/unit/helpers/terrain/terrainData.js +2 -2
- package/dist/tests/unit/helpers/terrain/terrainData.js.map +1 -1
- package/index.ts +39 -1
- package/package.json +4 -2
- package/src/classRegistry.ts +2 -2
- package/src/featureProvider/abstractFeatureProvider.ts +2 -0
- package/src/featureProvider/tileProviderFeatureProvider.ts +2 -0
- package/src/featureProvider/wmsFeatureProvider.ts +4 -2
- package/src/interaction/eventHandler.ts +3 -3
- package/src/interaction/featureProviderInteraction.ts +1 -0
- package/src/layer/cesium/cesiumTilesetCesiumImpl.ts +44 -5
- package/src/layer/cesium/resourceHelper.ts +15 -0
- package/src/layer/cesium/singleImageCesiumImpl.ts +2 -1
- package/src/layer/cesium/terrainCesiumImpl.ts +2 -1
- package/src/layer/cesium/tmsCesiumImpl.ts +2 -1
- package/src/layer/cesium/vectorRasterTileCesiumImpl.ts +1 -0
- package/src/layer/cesium/vectorTileImageryProvider.ts +10 -1
- package/src/layer/cesium/wmsCesiumImpl.ts +2 -1
- package/src/layer/cesium/wmtsCesiumImpl.ts +4 -2
- package/src/layer/cesiumTilesetLayer.ts +25 -7
- package/src/layer/czmlLayer.ts +2 -1
- package/src/layer/featureLayer.ts +2 -2
- package/src/layer/featureStoreLayer.ts +8 -8
- package/src/layer/featureStoreLayerChanges.ts +63 -45
- package/src/layer/featureStoreLayerState.ts +6 -5
- package/src/layer/geojsonLayer.ts +3 -3
- package/src/layer/layer.ts +41 -4
- package/src/layer/layerImplementation.ts +3 -0
- package/src/layer/oblique/vectorObliqueImpl.ts +9 -8
- package/src/layer/openlayers/loadFunctionHelpers.ts +24 -0
- package/src/layer/openlayers/singleImageOpenlayersImpl.ts +25 -1
- package/src/layer/openlayers/tmsOpenlayersImpl.ts +8 -1
- package/src/layer/openlayers/vectorTileOpenlayersImpl.ts +1 -0
- package/src/layer/openlayers/wmsOpenlayersImpl.ts +23 -2
- package/src/layer/openlayers/wmtsOpenlayersImpl.ts +8 -1
- package/src/layer/pointCloudLayer.ts +2 -2
- package/src/layer/terrainHelpers.ts +19 -6
- package/src/layer/terrainLayer.ts +8 -4
- package/src/layer/tileProvider/mvtTileProvider.ts +9 -3
- package/src/layer/tileProvider/staticGeojsonTileProvider.ts +9 -3
- package/src/layer/tileProvider/tileProvider.ts +49 -13
- package/src/layer/tileProvider/urlTemplateTileProvider.ts +10 -3
- package/src/layer/vectorLayer.ts +9 -9
- package/src/layer/vectorProperties.ts +46 -22
- package/src/layer/wfsLayer.ts +9 -6
- package/src/layer/wmsHelpers.ts +78 -10
- package/src/layer/wmsLayer.ts +11 -2
- package/src/map/cameraLimiter.ts +21 -2
- package/src/map/cesiumMap.ts +67 -2
- package/src/map/vcsMap.ts +2 -2
- package/src/oblique/helpers.ts +5 -13
- package/src/oblique/obliqueCollection.ts +2 -0
- package/src/oblique/obliqueDataSet.ts +16 -2
- package/src/oblique/obliqueImageMeta.ts +4 -0
- package/src/oblique/obliqueView.ts +12 -2
- package/src/oblique/parseImageJson.ts +7 -4
- package/src/ol/geojson.d.ts +1 -2
- package/src/ol/geom/circle.ts +1 -1
- package/src/style/declarativeStyleItem.ts +10 -2
- package/src/style/styleFactory.ts +2 -2
- package/src/style/styleHelpers.ts +13 -4
- package/src/style/vectorStyleItem.ts +32 -20
- package/src/util/clipping/clippingPlaneHelper.ts +3 -3
- package/src/util/editor/createFeatureSession.ts +9 -8
- package/src/util/editor/editFeaturesSession.ts +1 -1
- package/src/util/editor/editGeometrySession.ts +1 -1
- package/src/util/editor/editorSessionHelpers.ts +2 -2
- package/src/util/editor/selectFeaturesSession.ts +3 -3
- package/src/util/featureconverter/arcToCesium.ts +5 -1
- package/src/util/featureconverter/circleToCesium.ts +8 -2
- package/src/util/featureconverter/extent3D.ts +1 -1
- package/src/util/featureconverter/featureconverterHelper.ts +3 -5
- package/src/util/featureconverter/lineStringToCesium.ts +8 -1
- package/src/util/featureconverter/pointToCesium.ts +1 -1
- package/src/util/featureconverter/polygonToCesium.ts +6 -15
- package/src/util/fetch.ts +25 -0
- package/src/util/flight/flightAnchor.ts +195 -0
- package/src/util/flight/flightCollection.ts +78 -0
- package/src/util/flight/flightHelpers.ts +208 -0
- package/src/util/flight/flightInstance.ts +240 -0
- package/src/util/flight/flightPlayer.ts +326 -0
- package/src/util/flight/flightVisualizer.ts +202 -0
- package/src/util/hiddenObjects.ts +35 -0
- package/src/util/mapCollection.ts +2 -2
- package/src/util/overrideCollection.ts +26 -3
- package/src/util/projection.ts +5 -2
- package/src/util/viewpoint.ts +27 -7
- package/src/vcsApp.ts +56 -15
- package/src/vcsModule.ts +4 -0
|
@@ -44,10 +44,15 @@ export type LayerOptions = VcsObjectOptions & {
|
|
|
44
44
|
* to other sources of data.
|
|
45
45
|
*/
|
|
46
46
|
datasourceId?: string;
|
|
47
|
+
/**
|
|
48
|
+
* Optional Request Headers which will be sent with each request.
|
|
49
|
+
*/
|
|
50
|
+
headers?: Record<string, string>;
|
|
47
51
|
};
|
|
48
52
|
export type LayerImplementationOptions = {
|
|
49
53
|
name: string;
|
|
50
54
|
url: string;
|
|
55
|
+
headers?: Record<string, string>;
|
|
51
56
|
};
|
|
52
57
|
/**
|
|
53
58
|
* Abstract base class for Layers.
|
|
@@ -97,6 +102,7 @@ declare class Layer<I extends LayerImplementation<VcsMap> = LayerImplementation<
|
|
|
97
102
|
*/
|
|
98
103
|
featureProvider: AbstractFeatureProvider | undefined;
|
|
99
104
|
private _locale;
|
|
105
|
+
protected _headers?: Record<string, string>;
|
|
100
106
|
/**
|
|
101
107
|
* Optional Id to synchronize with the vcPublisher Datasources. This can also be used to track a connection
|
|
102
108
|
* to other sources of data.
|
|
@@ -132,6 +138,15 @@ declare class Layer<I extends LayerImplementation<VcsMap> = LayerImplementation<
|
|
|
132
138
|
set exclusiveGroups(groups: (string | symbol)[]);
|
|
133
139
|
get zIndex(): number;
|
|
134
140
|
set zIndex(index: number);
|
|
141
|
+
/**
|
|
142
|
+
* directly manipulating the headers Object will not trigger a reload. Reload the data via layer.reload() manually.
|
|
143
|
+
*/
|
|
144
|
+
get headers(): Record<string, string> | undefined;
|
|
145
|
+
/**
|
|
146
|
+
*
|
|
147
|
+
* @param headers
|
|
148
|
+
*/
|
|
149
|
+
set headers(headers: Record<string, string> | undefined);
|
|
135
150
|
/**
|
|
136
151
|
* returns the currently set locale. Can be used to provide locale specific URLs.
|
|
137
152
|
*/
|
package/dist/src/layer/layer.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import
|
|
1
|
+
import deepEqual from 'fast-deep-equal';
|
|
2
|
+
import { check, maybe, oneOf, optional, recordOf } from '@vcsuite/check';
|
|
2
3
|
import { parseBoolean, parseInteger } from '@vcsuite/parsers';
|
|
3
4
|
import VcsObject from '../vcsObject.js';
|
|
4
5
|
import Extent from '../util/extent.js';
|
|
@@ -28,6 +29,7 @@ class Layer extends VcsObject {
|
|
|
28
29
|
hiddenObjectIds: [],
|
|
29
30
|
copyright: undefined,
|
|
30
31
|
datasourceId: undefined,
|
|
32
|
+
headers: undefined,
|
|
31
33
|
};
|
|
32
34
|
}
|
|
33
35
|
extent;
|
|
@@ -69,6 +71,7 @@ class Layer extends VcsObject {
|
|
|
69
71
|
*/
|
|
70
72
|
featureProvider;
|
|
71
73
|
_locale;
|
|
74
|
+
_headers;
|
|
72
75
|
/**
|
|
73
76
|
* Optional Id to synchronize with the vcPublisher Datasources. This can also be used to track a connection
|
|
74
77
|
* to other sources of data.
|
|
@@ -103,6 +106,7 @@ class Layer extends VcsObject {
|
|
|
103
106
|
this.featureProvider = undefined;
|
|
104
107
|
this._locale = 'en';
|
|
105
108
|
this.datasourceId = options.datasourceId || defaultOptions.datasourceId;
|
|
109
|
+
this._headers = structuredClone(options.headers);
|
|
106
110
|
}
|
|
107
111
|
/**
|
|
108
112
|
* True if this layer has been initialized, typically after its first activation.
|
|
@@ -141,7 +145,7 @@ class Layer extends VcsObject {
|
|
|
141
145
|
return '';
|
|
142
146
|
}
|
|
143
147
|
set url(url) {
|
|
144
|
-
check(url,
|
|
148
|
+
check(url, oneOf(String, recordOf(String)));
|
|
145
149
|
if (this._url !== url) {
|
|
146
150
|
const currentValue = this._url;
|
|
147
151
|
this._url = url;
|
|
@@ -166,7 +170,7 @@ class Layer extends VcsObject {
|
|
|
166
170
|
return this._globalHider;
|
|
167
171
|
}
|
|
168
172
|
setGlobalHider(globalHider) {
|
|
169
|
-
|
|
173
|
+
check(globalHider, maybe(GlobalHider));
|
|
170
174
|
if (globalHider && this.active) {
|
|
171
175
|
globalHider.hideObjects(this.hiddenObjectIds);
|
|
172
176
|
}
|
|
@@ -185,7 +189,7 @@ class Layer extends VcsObject {
|
|
|
185
189
|
return this._exclusiveGroups.slice();
|
|
186
190
|
}
|
|
187
191
|
set exclusiveGroups(groups) {
|
|
188
|
-
check(groups, [
|
|
192
|
+
check(groups, [oneOf(String, Symbol)]);
|
|
189
193
|
if (groups.length !== this._exclusiveGroups.length ||
|
|
190
194
|
!groups.every((g) => this._exclusiveGroups.includes(g))) {
|
|
191
195
|
this._exclusiveGroups = groups.slice();
|
|
@@ -202,6 +206,24 @@ class Layer extends VcsObject {
|
|
|
202
206
|
this.zIndexChanged.raiseEvent(index);
|
|
203
207
|
}
|
|
204
208
|
}
|
|
209
|
+
/**
|
|
210
|
+
* directly manipulating the headers Object will not trigger a reload. Reload the data via layer.reload() manually.
|
|
211
|
+
*/
|
|
212
|
+
get headers() {
|
|
213
|
+
return this._headers;
|
|
214
|
+
}
|
|
215
|
+
/**
|
|
216
|
+
*
|
|
217
|
+
* @param headers
|
|
218
|
+
*/
|
|
219
|
+
set headers(headers) {
|
|
220
|
+
check(headers, optional(recordOf(String)));
|
|
221
|
+
if (!deepEqual(this._headers, headers)) {
|
|
222
|
+
this._headers = structuredClone(headers);
|
|
223
|
+
// eslint-disable-next-line no-void
|
|
224
|
+
void this.reload();
|
|
225
|
+
}
|
|
226
|
+
}
|
|
205
227
|
/**
|
|
206
228
|
* returns the currently set locale. Can be used to provide locale specific URLs.
|
|
207
229
|
*/
|
|
@@ -260,6 +282,7 @@ class Layer extends VcsObject {
|
|
|
260
282
|
return {
|
|
261
283
|
name: this.name,
|
|
262
284
|
url: this.url,
|
|
285
|
+
headers: this.headers,
|
|
263
286
|
};
|
|
264
287
|
}
|
|
265
288
|
/**
|
|
@@ -468,6 +491,9 @@ class Layer extends VcsObject {
|
|
|
468
491
|
if (this.datasourceId !== defaultOptions.datasourceId) {
|
|
469
492
|
config.datasourceId = this.datasourceId;
|
|
470
493
|
}
|
|
494
|
+
if (!deepEqual(this._headers, defaultOptions.headers)) {
|
|
495
|
+
config.headers = structuredClone(this._headers);
|
|
496
|
+
}
|
|
471
497
|
return config;
|
|
472
498
|
}
|
|
473
499
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"layer.js","sourceRoot":"","sources":["../../../src/layer/layer.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"layer.js","sourceRoot":"","sources":["../../../src/layer/layer.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,6 +11,7 @@ declare class LayerImplementation<M extends VcsMap> extends VcsObject {
|
|
|
11
11
|
url: string | undefined;
|
|
12
12
|
protected _state: LayerState;
|
|
13
13
|
private _initialized;
|
|
14
|
+
headers?: Record<string, string>;
|
|
14
15
|
constructor(map: M, options: LayerImplementationOptions);
|
|
15
16
|
get map(): M;
|
|
16
17
|
/**
|
|
@@ -11,10 +11,12 @@ class LayerImplementation extends VcsObject {
|
|
|
11
11
|
url;
|
|
12
12
|
_state = LayerState.INACTIVE;
|
|
13
13
|
_initialized = false;
|
|
14
|
+
headers;
|
|
14
15
|
constructor(map, options) {
|
|
15
16
|
super(options);
|
|
16
17
|
this._map = map;
|
|
17
18
|
this.url = options.url;
|
|
19
|
+
this.headers = options.headers;
|
|
18
20
|
}
|
|
19
21
|
get map() {
|
|
20
22
|
if (!this._map) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"layerImplementation.js","sourceRoot":"","sources":["../../../src/layer/layerImplementation.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,iBAAiB,CAAC;AACxC,OAAO,UAAU,MAAM,iBAAiB,CAAC;AAIzC;;GAEG;AACH,MAAM,mBAAsC,SAAQ,SAAS;IAC3D,MAAM,KAAK,SAAS;QAClB,OAAO,qBAAqB,CAAC;IAC/B,CAAC;IAEO,IAAI,CAAgB;IAE5B,GAAG,CAAqB;IAEd,MAAM,GAAe,UAAU,CAAC,QAAQ,CAAC;IAE3C,YAAY,GAAG,KAAK,CAAC;IAE7B,YAAY,GAAM,EAAE,OAAmC;QACrD,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC;QAChB,IAAI,CAAC,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;
|
|
1
|
+
{"version":3,"file":"layerImplementation.js","sourceRoot":"","sources":["../../../src/layer/layerImplementation.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,iBAAiB,CAAC;AACxC,OAAO,UAAU,MAAM,iBAAiB,CAAC;AAIzC;;GAEG;AACH,MAAM,mBAAsC,SAAQ,SAAS;IAC3D,MAAM,KAAK,SAAS;QAClB,OAAO,qBAAqB,CAAC;IAC/B,CAAC;IAEO,IAAI,CAAgB;IAE5B,GAAG,CAAqB;IAEd,MAAM,GAAe,UAAU,CAAC,QAAQ,CAAC;IAE3C,YAAY,GAAG,KAAK,CAAC;IAE7B,OAAO,CAA0B;IAEjC,YAAY,GAAM,EAAE,OAAmC;QACrD,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC;QAChB,IAAI,CAAC,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;QACvB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IACjC,CAAC;IAED,IAAI,GAAG;QACL,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE;YACd,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;SACvD;QACD,OAAO,IAAI,CAAC,IAAI,CAAC;IACnB,CAAC;IAED;;OAEG;IACH,IAAI,WAAW;QACb,OAAO,IAAI,CAAC,YAAY,CAAC;IAC3B,CAAC;IAED,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,MAAM,KAAK,UAAU,CAAC,MAAM,CAAC;IAC3C,CAAC;IAED,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,MAAM,KAAK,UAAU,CAAC,OAAO,CAAC;IAC5C,CAAC;IAED;;;OAGG;IACH,UAAU;QACR,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;QACzB,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,QAAQ;QACZ,IAAI,IAAI,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;YACnC,IAAI,CAAC,MAAM,GAAG,UAAU,CAAC,OAAO,CAAC;YACjC,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;YACxB,IAAI,IAAI,CAAC,OAAO,EAAE;gBAChB,IAAI,CAAC,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;aACjC;SACF;IACH,CAAC;IAED;;OAEG;IACH,UAAU;QACR,IAAI,CAAC,MAAM,GAAG,UAAU,CAAC,QAAQ,CAAC;IACpC,CAAC;IAED;;OAEG;IACH,OAAO;QACL,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC;QAC1B,IAAI,CAAC,MAAM,GAAG,UAAU,CAAC,QAAQ,CAAC;QAClC,IAAI,CAAC,IAAI,GAAG,SAAS,CAAC;QACtB,KAAK,CAAC,OAAO,EAAE,CAAC;IAClB,CAAC;CACF;AAED,eAAe,mBAAmB,CAAC"}
|
|
@@ -109,7 +109,7 @@ class VectorObliqueImpl extends LayerObliqueImpl {
|
|
|
109
109
|
}
|
|
110
110
|
}
|
|
111
111
|
}
|
|
112
|
-
addFeature(originalFeature) {
|
|
112
|
+
async addFeature(originalFeature) {
|
|
113
113
|
if (!this.active) {
|
|
114
114
|
this.fetchedFeaturesForImageName = null;
|
|
115
115
|
}
|
|
@@ -122,7 +122,7 @@ class VectorObliqueImpl extends LayerObliqueImpl {
|
|
|
122
122
|
}
|
|
123
123
|
return Promise.resolve();
|
|
124
124
|
}
|
|
125
|
-
if (this.obliqueSource.getFeatureById(id)) {
|
|
125
|
+
if (this.obliqueSource.getFeatureById(id) || this._updatingOblique[id]) {
|
|
126
126
|
return Promise.resolve();
|
|
127
127
|
}
|
|
128
128
|
const obliqueFeature = new Feature({});
|
|
@@ -131,9 +131,8 @@ class VectorObliqueImpl extends LayerObliqueImpl {
|
|
|
131
131
|
setNewGeometry(originalFeature, obliqueFeature);
|
|
132
132
|
obliqueFeature.setStyle(originalFeature.getStyle());
|
|
133
133
|
this._setFeatureListeners(originalFeature, obliqueFeature);
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
});
|
|
134
|
+
await this._convertToOblique(originalFeature, obliqueFeature);
|
|
135
|
+
this.obliqueSource.addFeature(obliqueFeature);
|
|
137
136
|
}
|
|
138
137
|
return Promise.resolve();
|
|
139
138
|
}
|
|
@@ -186,14 +185,18 @@ class VectorObliqueImpl extends LayerObliqueImpl {
|
|
|
186
185
|
const vectorGeometry = originalFeature.getGeometry();
|
|
187
186
|
const imageGeometry = obliqueFeature.getGeometry();
|
|
188
187
|
this._updatingOblique[id] = true;
|
|
188
|
+
let promise;
|
|
189
189
|
if (!vectorGeometry[alreadyTransformedToImage]) {
|
|
190
|
-
|
|
190
|
+
promise = mercatorGeometryToImageGeometry(vectorGeometry, imageGeometry, this.map.currentImage);
|
|
191
191
|
}
|
|
192
192
|
else {
|
|
193
193
|
obliqueFeature
|
|
194
194
|
.getGeometry()
|
|
195
195
|
.setCoordinates(vectorGeometry.getCoordinates());
|
|
196
|
+
// we MUST wait for a promise, otherwise this is sync and you can add a feature twice
|
|
197
|
+
promise = Promise.resolve();
|
|
196
198
|
}
|
|
199
|
+
await promise;
|
|
197
200
|
this._updatingOblique[id] = null;
|
|
198
201
|
}
|
|
199
202
|
updateObliqueGeometry(originalFeature, obliqueFeature) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vectorObliqueImpl.js","sourceRoot":"","sources":["../../../../src/layer/oblique/vectorObliqueImpl.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"vectorObliqueImpl.js","sourceRoot":"","sources":["../../../../src/layer/oblique/vectorObliqueImpl.ts"],"names":[],"mappings":"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"}
|
|
@@ -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,
|