@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
|
@@ -334,7 +334,7 @@ export function addPrimitivesToContext(feature, style, geometries, vectorPropert
|
|
|
334
334
|
const hasStroke = !!style.getStroke();
|
|
335
335
|
let groundPrimitive = false;
|
|
336
336
|
geometries.forEach((geometry) => {
|
|
337
|
-
const geometryOptions = geometryFactory.getGeometryOptions(geometry, heightInfo.heightAboveGroundAdjustment);
|
|
337
|
+
const geometryOptions = geometryFactory.getGeometryOptions(geometry, heightInfo.heightAboveGroundAdjustment, heightInfo.perPositionHeight, heightInfo.groundLevel);
|
|
338
338
|
const storeyOptions = getStoreyOptions(heightInfo.storeyHeightsAboveGround, heightInfo.groundLevel);
|
|
339
339
|
getStoreyOptions(heightInfo.storeyHeightsBelowGround, heightInfo.groundLevel, true, storeyOptions);
|
|
340
340
|
if (hasFill) {
|
|
@@ -373,7 +373,7 @@ export function addPrimitivesToContext(feature, style, geometries, vectorPropert
|
|
|
373
373
|
lineGeometries.push(...geometryFactory.createGroundLineGeometries(geometryOptions, style));
|
|
374
374
|
}
|
|
375
375
|
else {
|
|
376
|
-
lineGeometries.push(...geometryFactory.createLineGeometries(geometryOptions, style
|
|
376
|
+
lineGeometries.push(...geometryFactory.createLineGeometries(geometryOptions, style));
|
|
377
377
|
}
|
|
378
378
|
}
|
|
379
379
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"featureconverterHelper.js","sourceRoot":"","sources":["../../../../src/util/featureconverter/featureconverterHelper.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"featureconverterHelper.js","sourceRoot":"","sources":["../../../../src/util/featureconverter/featureconverterHelper.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,9 +20,11 @@ export declare function createLineGeometries(options: LineGeometryOptions, style
|
|
|
20
20
|
* Creates the positions array for PolylineGeometry
|
|
21
21
|
* @param geometry
|
|
22
22
|
* @param positionHeightAdjustment
|
|
23
|
+
* @param perPositionHeight
|
|
24
|
+
* @param groundLevelOrMinHeight
|
|
23
25
|
* @private
|
|
24
26
|
*/
|
|
25
|
-
export declare function getGeometryOptions(geometry: LineString, positionHeightAdjustment: number): LineGeometryOptions;
|
|
27
|
+
export declare function getGeometryOptions(geometry: LineString, positionHeightAdjustment: number, perPositionHeight: boolean, groundLevelOrMinHeight: number): LineGeometryOptions;
|
|
26
28
|
export declare function getCoordinates(geometries: LineString[]): Coordinate[];
|
|
27
29
|
/**
|
|
28
30
|
* validates if a lineString is renderable
|
|
@@ -99,13 +99,18 @@ export function createLineGeometries(options, style) {
|
|
|
99
99
|
* Creates the positions array for PolylineGeometry
|
|
100
100
|
* @param geometry
|
|
101
101
|
* @param positionHeightAdjustment
|
|
102
|
+
* @param perPositionHeight
|
|
103
|
+
* @param groundLevelOrMinHeight
|
|
102
104
|
* @private
|
|
103
105
|
*/
|
|
104
|
-
export function getGeometryOptions(geometry, positionHeightAdjustment) {
|
|
106
|
+
export function getGeometryOptions(geometry, positionHeightAdjustment, perPositionHeight, groundLevelOrMinHeight) {
|
|
105
107
|
const coords = geometry.getCoordinates();
|
|
106
108
|
const positions = coords.map((coord) => {
|
|
107
109
|
const wgs84Coords = Projection.mercatorToWgs84(coord);
|
|
108
|
-
if (
|
|
110
|
+
if (!perPositionHeight && groundLevelOrMinHeight) {
|
|
111
|
+
wgs84Coords[2] = groundLevelOrMinHeight;
|
|
112
|
+
}
|
|
113
|
+
else if (wgs84Coords[2] != null) {
|
|
109
114
|
wgs84Coords[2] += positionHeightAdjustment;
|
|
110
115
|
}
|
|
111
116
|
return Cartesian3.fromDegrees(wgs84Coords[0], wgs84Coords[1], wgs84Coords[2]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lineStringToCesium.js","sourceRoot":"","sources":["../../../../src/util/featureconverter/lineStringToCesium.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"lineStringToCesium.js","sourceRoot":"","sources":["../../../../src/util/featureconverter/lineStringToCesium.ts"],"names":[],"mappings":"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"}
|
|
@@ -168,7 +168,7 @@ export function getCartesian3AndWGS84FromCoordinates(coordinates, heightInfo) {
|
|
|
168
168
|
wgs84Positions[index] = Projection.mercatorToWgs84(coord, true);
|
|
169
169
|
let height = null;
|
|
170
170
|
if (heightInfo.heightReference === HeightReference.RELATIVE_TO_GROUND) {
|
|
171
|
-
height = heightInfo.heightAboveGroundAdjustment;
|
|
171
|
+
height = heightValue + heightInfo.heightAboveGroundAdjustment;
|
|
172
172
|
}
|
|
173
173
|
else {
|
|
174
174
|
height = heightValue;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pointToCesium.js","sourceRoot":"","sources":["../../../../src/util/featureconverter/pointToCesium.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"pointToCesium.js","sourceRoot":"","sources":["../../../../src/util/featureconverter/pointToCesium.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,10 +10,10 @@ export type PolylineGeometryOptions = ConstructorParameters<typeof PolylineGeome
|
|
|
10
10
|
export declare function createSolidGeometries(options: PolygonGeometryOptions, height: number, perPositionHeight: boolean, extrudedHeight?: number): PolygonGeometry[];
|
|
11
11
|
export declare function createOutlineGeometries(options: PolygonGeometryOptions, height: number, perPositionHeight: boolean, extrudedHeight?: number): PolygonOutlineGeometry[];
|
|
12
12
|
export declare function createFillGeometries(options: PolygonGeometryOptions, height: number, perPositionHeight: boolean): PolygonGeometry[];
|
|
13
|
-
export declare function getLineGeometryOptions(options: PolygonGeometryOptions, style: Style
|
|
13
|
+
export declare function getLineGeometryOptions(options: PolygonGeometryOptions, style: Style): PolylineGeometryOptions[];
|
|
14
14
|
export declare function createGroundLineGeometries(options: PolygonGeometryOptions, style: Style): GroundPolylineGeometry[];
|
|
15
|
-
export declare function createLineGeometries(options: PolygonGeometryOptions, style: Style
|
|
16
|
-
export declare function getGeometryOptions(geometry: Polygon, positionHeightAdjustment: number): PolygonGeometryOptions;
|
|
15
|
+
export declare function createLineGeometries(options: PolygonGeometryOptions, style: Style): PolylineGeometry[];
|
|
16
|
+
export declare function getGeometryOptions(geometry: Polygon, positionHeightAdjustment: number, perPositionHeight: boolean, groundLevelOrMinHeight: number): PolygonGeometryOptions;
|
|
17
17
|
export declare function getCoordinates(geometries: Polygon[]): Coordinate[];
|
|
18
18
|
/**
|
|
19
19
|
* TODO maybe add validation Functions to OpenlayersMap
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Cartesian3, PolygonGeometry, PerInstanceColorAppearance, PolygonOutlineGeometry, GroundPolylineGeometry, PolygonHierarchy, PolylineGeometry,
|
|
1
|
+
import { Cartesian3, PolygonGeometry, PerInstanceColorAppearance, PolygonOutlineGeometry, GroundPolylineGeometry, PolygonHierarchy, PolylineGeometry, } from '@vcmap-cesium/engine';
|
|
2
2
|
import { parseNumber } from '@vcsuite/parsers';
|
|
3
3
|
import { addPrimitivesToContext } from './featureconverterHelper.js';
|
|
4
4
|
import Projection from '../projection.js';
|
|
@@ -28,7 +28,7 @@ export function createOutlineGeometries(options, height, perPositionHeight, extr
|
|
|
28
28
|
export function createFillGeometries(options, height, perPositionHeight) {
|
|
29
29
|
return createSolidGeometries(options, height, perPositionHeight, undefined);
|
|
30
30
|
}
|
|
31
|
-
export function getLineGeometryOptions(options, style
|
|
31
|
+
export function getLineGeometryOptions(options, style) {
|
|
32
32
|
const width = parseNumber(style.getStroke().getWidth(), 1.0);
|
|
33
33
|
const geometryOptions = [];
|
|
34
34
|
geometryOptions.push({
|
|
@@ -41,15 +41,6 @@ export function getLineGeometryOptions(options, style, groundLevel) {
|
|
|
41
41
|
width,
|
|
42
42
|
});
|
|
43
43
|
});
|
|
44
|
-
if (groundLevel) {
|
|
45
|
-
geometryOptions.forEach((polylineOptions) => {
|
|
46
|
-
polylineOptions.positions = polylineOptions.positions.map((c) => {
|
|
47
|
-
const geographic = Cartographic.fromCartesian(c);
|
|
48
|
-
geographic.height = groundLevel;
|
|
49
|
-
return Cartographic.toCartesian(geographic);
|
|
50
|
-
});
|
|
51
|
-
});
|
|
52
|
-
}
|
|
53
44
|
return geometryOptions;
|
|
54
45
|
}
|
|
55
46
|
export function createGroundLineGeometries(options, style) {
|
|
@@ -57,12 +48,12 @@ export function createGroundLineGeometries(options, style) {
|
|
|
57
48
|
return new GroundPolylineGeometry(option);
|
|
58
49
|
});
|
|
59
50
|
}
|
|
60
|
-
export function createLineGeometries(options, style
|
|
61
|
-
return getLineGeometryOptions(options, style
|
|
51
|
+
export function createLineGeometries(options, style) {
|
|
52
|
+
return getLineGeometryOptions(options, style).map((option) => {
|
|
62
53
|
return new PolylineGeometry(option);
|
|
63
54
|
});
|
|
64
55
|
}
|
|
65
|
-
export function getGeometryOptions(geometry, positionHeightAdjustment) {
|
|
56
|
+
export function getGeometryOptions(geometry, positionHeightAdjustment, perPositionHeight, groundLevelOrMinHeight) {
|
|
66
57
|
let hieraryPositions;
|
|
67
58
|
const holes = [];
|
|
68
59
|
const rings = geometry.getLinearRings();
|
|
@@ -70,7 +61,10 @@ export function getGeometryOptions(geometry, positionHeightAdjustment) {
|
|
|
70
61
|
const coords = rings[i].getCoordinates();
|
|
71
62
|
const positions = coords.map((coord) => {
|
|
72
63
|
const wgs84Coords = Projection.mercatorToWgs84(coord);
|
|
73
|
-
if (
|
|
64
|
+
if (!perPositionHeight && groundLevelOrMinHeight) {
|
|
65
|
+
wgs84Coords[2] = groundLevelOrMinHeight;
|
|
66
|
+
}
|
|
67
|
+
else if (wgs84Coords[2] != null) {
|
|
74
68
|
wgs84Coords[2] += positionHeightAdjustment;
|
|
75
69
|
}
|
|
76
70
|
return Cartesian3.fromDegrees(wgs84Coords[0], wgs84Coords[1], wgs84Coords[2]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"polygonToCesium.js","sourceRoot":"","sources":["../../../../src/util/featureconverter/polygonToCesium.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,eAAe,EACf,0BAA0B,EAC1B,sBAAsB,EACtB,sBAAsB,EACtB,gBAAgB,EAChB,gBAAgB,
|
|
1
|
+
{"version":3,"file":"polygonToCesium.js","sourceRoot":"","sources":["../../../../src/util/featureconverter/polygonToCesium.ts"],"names":[],"mappings":"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"}
|
package/dist/src/util/fetch.d.ts
CHANGED
|
@@ -1,3 +1,5 @@
|
|
|
1
1
|
export declare function requestUrl(url: string, init?: RequestInit): Promise<Response>;
|
|
2
2
|
export declare function requestJson<T>(url: string, init?: RequestInit): Promise<T>;
|
|
3
3
|
export declare function requestArrayBuffer(url: string, init?: RequestInit): Promise<ArrayBuffer>;
|
|
4
|
+
export declare function requestObjectUrl(url: string, init?: RequestInit): Promise<string>;
|
|
5
|
+
export declare function getInitForUrl(url: string, headers?: Record<string, string>): RequestInit;
|
package/dist/src/util/fetch.js
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { TrustedServers } from '@vcmap-cesium/engine';
|
|
1
2
|
export async function requestUrl(url, init) {
|
|
2
3
|
const response = await fetch(url, init);
|
|
3
4
|
if (!response.ok) {
|
|
@@ -13,4 +14,19 @@ export async function requestArrayBuffer(url, init) {
|
|
|
13
14
|
const response = await requestUrl(url, init);
|
|
14
15
|
return response.arrayBuffer();
|
|
15
16
|
}
|
|
17
|
+
export async function requestObjectUrl(url, init) {
|
|
18
|
+
const response = await requestUrl(url, init);
|
|
19
|
+
const blob = await response.blob();
|
|
20
|
+
return URL.createObjectURL(blob);
|
|
21
|
+
}
|
|
22
|
+
export function getInitForUrl(url, headers) {
|
|
23
|
+
const init = {};
|
|
24
|
+
if (headers) {
|
|
25
|
+
init.headers = headers;
|
|
26
|
+
}
|
|
27
|
+
if (TrustedServers.contains(url)) {
|
|
28
|
+
init.credentials = 'include';
|
|
29
|
+
}
|
|
30
|
+
return init;
|
|
31
|
+
}
|
|
16
32
|
//# sourceMappingURL=fetch.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetch.js","sourceRoot":"","sources":["../../../src/util/fetch.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,KAAK,UAAU,UAAU,CAC9B,GAAW,EACX,IAAkB;IAElB,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IACxC,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE;QAChB,MAAM,IAAI,KAAK,CACb,uBAAuB,GAAG,iBAAiB,QAAQ,CAAC,MAAM,EAAE,CAC7D,CAAC;KACH;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,GAAW,EACX,IAAkB;IAElB,MAAM,QAAQ,GAAG,MAAM,UAAU,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAC7C,OAAO,QAAQ,CAAC,IAAI,EAAgB,CAAC;AACvC,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,GAAW,EACX,IAAkB;IAElB,MAAM,QAAQ,GAAG,MAAM,UAAU,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAC7C,OAAO,QAAQ,CAAC,WAAW,EAAE,CAAC;AAChC,CAAC"}
|
|
1
|
+
{"version":3,"file":"fetch.js","sourceRoot":"","sources":["../../../src/util/fetch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEtD,MAAM,CAAC,KAAK,UAAU,UAAU,CAC9B,GAAW,EACX,IAAkB;IAElB,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IACxC,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE;QAChB,MAAM,IAAI,KAAK,CACb,uBAAuB,GAAG,iBAAiB,QAAQ,CAAC,MAAM,EAAE,CAC7D,CAAC;KACH;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,GAAW,EACX,IAAkB;IAElB,MAAM,QAAQ,GAAG,MAAM,UAAU,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAC7C,OAAO,QAAQ,CAAC,IAAI,EAAgB,CAAC;AACvC,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,GAAW,EACX,IAAkB;IAElB,MAAM,QAAQ,GAAG,MAAM,UAAU,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAC7C,OAAO,QAAQ,CAAC,WAAW,EAAE,CAAC;AAChC,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,GAAW,EACX,IAAkB;IAElB,MAAM,QAAQ,GAAG,MAAM,UAAU,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAC7C,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;IACnC,OAAO,GAAG,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;AACnC,CAAC;AAED,MAAM,UAAU,aAAa,CAC3B,GAAW,EACX,OAAgC;IAEhC,MAAM,IAAI,GAAgB,EAAE,CAAC;IAC7B,IAAI,OAAO,EAAE;QACX,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;KACxB;IACD,IAAI,cAAc,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;QAChC,IAAI,CAAC,WAAW,GAAG,SAAS,CAAC;KAC9B;IACD,OAAO,IAAI,CAAC;AACd,CAAC"}
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
import type { Feature as GeojsonFeature, Point as GeojsonPoint } from 'geojson';
|
|
2
|
+
import { type Coordinate } from 'ol/coordinate.js';
|
|
3
|
+
import VcsEvent from '../../vcsEvent.js';
|
|
4
|
+
import Viewpoint from '../viewpoint.js';
|
|
5
|
+
type FlightAnchorFeatureProperties = {
|
|
6
|
+
heading: number;
|
|
7
|
+
pitch: number;
|
|
8
|
+
roll: number;
|
|
9
|
+
duration: number;
|
|
10
|
+
title?: string;
|
|
11
|
+
};
|
|
12
|
+
export type FlightAnchorGeojsonFeature = GeojsonFeature<GeojsonPoint, FlightAnchorFeatureProperties>;
|
|
13
|
+
export type FlightAnchor = FlightAnchorFeatureProperties & {
|
|
14
|
+
readonly changed: VcsEvent<void>;
|
|
15
|
+
readonly name: string;
|
|
16
|
+
coordinate: Coordinate;
|
|
17
|
+
destroy(): void;
|
|
18
|
+
};
|
|
19
|
+
export declare function anchorFromViewpoint(viewpoint: Viewpoint): FlightAnchor | undefined;
|
|
20
|
+
export declare function anchorFromGeojsonFeature(feature: FlightAnchorGeojsonFeature): FlightAnchor | undefined;
|
|
21
|
+
export declare function anchorToViewpoint(anchor: FlightAnchor): Viewpoint;
|
|
22
|
+
export declare function anchorToGeojsonFeature(anchor: FlightAnchor): FlightAnchorGeojsonFeature;
|
|
23
|
+
export {};
|
|
@@ -0,0 +1,152 @@
|
|
|
1
|
+
import { check, is, maybe } from '@vcsuite/check';
|
|
2
|
+
import { v4 as uuidv4 } from 'uuid';
|
|
3
|
+
import { equals as coordinateEquals } from 'ol/coordinate.js';
|
|
4
|
+
import VcsEvent from '../../vcsEvent.js';
|
|
5
|
+
import Viewpoint from '../viewpoint.js';
|
|
6
|
+
const flightAnchorOptionsPattern = {
|
|
7
|
+
name: String,
|
|
8
|
+
coordinate: [Number],
|
|
9
|
+
heading: Number,
|
|
10
|
+
pitch: Number,
|
|
11
|
+
roll: Number,
|
|
12
|
+
duration: Number,
|
|
13
|
+
title: maybe(String),
|
|
14
|
+
};
|
|
15
|
+
function isOptions(options) {
|
|
16
|
+
return (is(options, flightAnchorOptionsPattern) && options.coordinate.length === 3);
|
|
17
|
+
}
|
|
18
|
+
function fromOptions(options) {
|
|
19
|
+
check(options, flightAnchorOptionsPattern);
|
|
20
|
+
const changed = new VcsEvent();
|
|
21
|
+
const { name } = options;
|
|
22
|
+
let { title, heading, pitch, roll, coordinate, duration } = options;
|
|
23
|
+
coordinate = coordinate.slice();
|
|
24
|
+
return {
|
|
25
|
+
get changed() {
|
|
26
|
+
return changed;
|
|
27
|
+
},
|
|
28
|
+
get name() {
|
|
29
|
+
return name;
|
|
30
|
+
},
|
|
31
|
+
get coordinate() {
|
|
32
|
+
return coordinate;
|
|
33
|
+
},
|
|
34
|
+
set coordinate(value) {
|
|
35
|
+
check(value, [Number]);
|
|
36
|
+
check(value.length, 3);
|
|
37
|
+
if (!coordinateEquals(coordinate, value)) {
|
|
38
|
+
coordinate = value.slice();
|
|
39
|
+
changed.raiseEvent();
|
|
40
|
+
}
|
|
41
|
+
},
|
|
42
|
+
get heading() {
|
|
43
|
+
return heading;
|
|
44
|
+
},
|
|
45
|
+
set heading(value) {
|
|
46
|
+
check(value, Number);
|
|
47
|
+
if (heading !== value) {
|
|
48
|
+
heading = value;
|
|
49
|
+
changed.raiseEvent();
|
|
50
|
+
}
|
|
51
|
+
},
|
|
52
|
+
get pitch() {
|
|
53
|
+
return pitch;
|
|
54
|
+
},
|
|
55
|
+
set pitch(value) {
|
|
56
|
+
check(value, Number);
|
|
57
|
+
if (pitch !== value) {
|
|
58
|
+
pitch = value;
|
|
59
|
+
changed.raiseEvent();
|
|
60
|
+
}
|
|
61
|
+
},
|
|
62
|
+
get roll() {
|
|
63
|
+
return roll;
|
|
64
|
+
},
|
|
65
|
+
set roll(value) {
|
|
66
|
+
check(value, Number);
|
|
67
|
+
if (roll !== value) {
|
|
68
|
+
roll = value;
|
|
69
|
+
changed.raiseEvent();
|
|
70
|
+
}
|
|
71
|
+
},
|
|
72
|
+
get duration() {
|
|
73
|
+
return duration;
|
|
74
|
+
},
|
|
75
|
+
set duration(value) {
|
|
76
|
+
check(value, Number);
|
|
77
|
+
if (duration !== value) {
|
|
78
|
+
duration = value;
|
|
79
|
+
changed.raiseEvent();
|
|
80
|
+
}
|
|
81
|
+
},
|
|
82
|
+
get title() {
|
|
83
|
+
return title;
|
|
84
|
+
},
|
|
85
|
+
set title(value) {
|
|
86
|
+
check(value, maybe(String));
|
|
87
|
+
if (title !== value) {
|
|
88
|
+
title = value;
|
|
89
|
+
changed.raiseEvent();
|
|
90
|
+
}
|
|
91
|
+
},
|
|
92
|
+
destroy() {
|
|
93
|
+
changed.destroy();
|
|
94
|
+
},
|
|
95
|
+
};
|
|
96
|
+
}
|
|
97
|
+
export function anchorFromViewpoint(viewpoint) {
|
|
98
|
+
if (!viewpoint.cameraPosition) {
|
|
99
|
+
return undefined;
|
|
100
|
+
}
|
|
101
|
+
return fromOptions({
|
|
102
|
+
...viewpoint,
|
|
103
|
+
coordinate: viewpoint.cameraPosition,
|
|
104
|
+
duration: viewpoint.duration ?? 1,
|
|
105
|
+
title: viewpoint.properties.title,
|
|
106
|
+
});
|
|
107
|
+
}
|
|
108
|
+
export function anchorFromGeojsonFeature(feature) {
|
|
109
|
+
const options = {
|
|
110
|
+
...feature.properties,
|
|
111
|
+
name: String(feature.id) || uuidv4(),
|
|
112
|
+
coordinate: feature.geometry.coordinates,
|
|
113
|
+
};
|
|
114
|
+
if (isOptions(options)) {
|
|
115
|
+
return fromOptions(options);
|
|
116
|
+
}
|
|
117
|
+
return undefined;
|
|
118
|
+
}
|
|
119
|
+
export function anchorToViewpoint(anchor) {
|
|
120
|
+
return new Viewpoint({
|
|
121
|
+
name: anchor.name,
|
|
122
|
+
cameraPosition: anchor.coordinate.slice(),
|
|
123
|
+
heading: anchor.heading,
|
|
124
|
+
pitch: anchor.pitch,
|
|
125
|
+
roll: anchor.roll,
|
|
126
|
+
duration: anchor.duration,
|
|
127
|
+
properties: {
|
|
128
|
+
title: anchor.title,
|
|
129
|
+
},
|
|
130
|
+
});
|
|
131
|
+
}
|
|
132
|
+
export function anchorToGeojsonFeature(anchor) {
|
|
133
|
+
const properties = {
|
|
134
|
+
heading: anchor.heading,
|
|
135
|
+
pitch: anchor.pitch,
|
|
136
|
+
roll: anchor.roll,
|
|
137
|
+
duration: anchor.duration,
|
|
138
|
+
};
|
|
139
|
+
if (anchor.title) {
|
|
140
|
+
properties.title = anchor.title;
|
|
141
|
+
}
|
|
142
|
+
return {
|
|
143
|
+
type: 'Feature',
|
|
144
|
+
id: anchor.name,
|
|
145
|
+
geometry: {
|
|
146
|
+
type: 'Point',
|
|
147
|
+
coordinates: anchor.coordinate.slice(),
|
|
148
|
+
},
|
|
149
|
+
properties,
|
|
150
|
+
};
|
|
151
|
+
}
|
|
152
|
+
//# sourceMappingURL=flightAnchor.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"flightAnchor.js","sourceRoot":"","sources":["../../../../src/util/flight/flightAnchor.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
import Collection from '../collection.js';
|
|
2
|
+
import { FlightPlayer } from './flightPlayer.js';
|
|
3
|
+
import VcsEvent from '../../vcsEvent.js';
|
|
4
|
+
import FlightInstance from './flightInstance.js';
|
|
5
|
+
import type VcsApp from '../../vcsApp.js';
|
|
6
|
+
/**
|
|
7
|
+
* A collection of flights. Provides playFlight API, which returns a FlightPlayer.
|
|
8
|
+
* Emits playerChanged event, whenever another flight is played.
|
|
9
|
+
*/
|
|
10
|
+
declare class FlightCollection extends Collection<FlightInstance> {
|
|
11
|
+
private readonly _app;
|
|
12
|
+
private _player;
|
|
13
|
+
playerChanged: VcsEvent<FlightPlayer | undefined>;
|
|
14
|
+
private _playerDestroyedListener;
|
|
15
|
+
constructor(app: VcsApp);
|
|
16
|
+
get player(): FlightPlayer | undefined;
|
|
17
|
+
remove(item: FlightInstance): void;
|
|
18
|
+
/**
|
|
19
|
+
* Creates a FlightPlayer for a flight instance, if not already existing for provided instance
|
|
20
|
+
* @param flight
|
|
21
|
+
*/
|
|
22
|
+
setPlayerForFlight(flight: FlightInstance): Promise<FlightPlayer | undefined>;
|
|
23
|
+
destroy(): void;
|
|
24
|
+
}
|
|
25
|
+
export default FlightCollection;
|
|
@@ -0,0 +1,63 @@
|
|
|
1
|
+
import Collection from '../collection.js';
|
|
2
|
+
import { createFlightPlayer } from './flightPlayer.js';
|
|
3
|
+
import VcsEvent from '../../vcsEvent.js';
|
|
4
|
+
/**
|
|
5
|
+
* A collection of flights. Provides playFlight API, which returns a FlightPlayer.
|
|
6
|
+
* Emits playerChanged event, whenever another flight is played.
|
|
7
|
+
*/
|
|
8
|
+
class FlightCollection extends Collection {
|
|
9
|
+
_app;
|
|
10
|
+
_player;
|
|
11
|
+
playerChanged;
|
|
12
|
+
_playerDestroyedListener;
|
|
13
|
+
constructor(app) {
|
|
14
|
+
super();
|
|
15
|
+
this._app = app;
|
|
16
|
+
this._player = undefined;
|
|
17
|
+
this.playerChanged = new VcsEvent();
|
|
18
|
+
this._playerDestroyedListener = () => { };
|
|
19
|
+
}
|
|
20
|
+
get player() {
|
|
21
|
+
return this._player;
|
|
22
|
+
}
|
|
23
|
+
remove(item) {
|
|
24
|
+
if (this._player?.flightInstanceName === item.name) {
|
|
25
|
+
this._player.stop();
|
|
26
|
+
this._player.destroy();
|
|
27
|
+
}
|
|
28
|
+
super.remove(item);
|
|
29
|
+
}
|
|
30
|
+
/**
|
|
31
|
+
* Creates a FlightPlayer for a flight instance, if not already existing for provided instance
|
|
32
|
+
* @param flight
|
|
33
|
+
*/
|
|
34
|
+
async setPlayerForFlight(flight) {
|
|
35
|
+
if (this._player?.flightInstanceName === flight.name) {
|
|
36
|
+
return this._player;
|
|
37
|
+
}
|
|
38
|
+
else if (this._player) {
|
|
39
|
+
this._playerDestroyedListener();
|
|
40
|
+
this._player.stop();
|
|
41
|
+
this._player.destroy();
|
|
42
|
+
}
|
|
43
|
+
this._player = await createFlightPlayer(flight, this._app);
|
|
44
|
+
this.playerChanged.raiseEvent(this._player);
|
|
45
|
+
this._playerDestroyedListener = this._player.destroyed.addEventListener(() => {
|
|
46
|
+
this._player = undefined;
|
|
47
|
+
this.playerChanged.raiseEvent(undefined);
|
|
48
|
+
});
|
|
49
|
+
return this._player;
|
|
50
|
+
}
|
|
51
|
+
destroy() {
|
|
52
|
+
if (this._player) {
|
|
53
|
+
this._player.stop();
|
|
54
|
+
this._player.destroy();
|
|
55
|
+
this._player = undefined;
|
|
56
|
+
}
|
|
57
|
+
this.playerChanged.destroy();
|
|
58
|
+
this._playerDestroyedListener();
|
|
59
|
+
super.destroy();
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
export default FlightCollection;
|
|
63
|
+
//# sourceMappingURL=flightCollection.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"flightCollection.js","sourceRoot":"","sources":["../../../../src/util/flight/flightCollection.ts"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,kBAAkB,EAAgB,MAAM,mBAAmB,CAAC;AACrE,OAAO,QAAQ,MAAM,mBAAmB,CAAC;AAIzC;;;GAGG;AACH,MAAM,gBAAiB,SAAQ,UAA0B;IACtC,IAAI,CAAS;IAEtB,OAAO,CAA2B;IAE1C,aAAa,CAAqC;IAE1C,wBAAwB,CAAa;IAE7C,YAAY,GAAW;QACrB,KAAK,EAAE,CAAC;QAER,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC;QAChB,IAAI,CAAC,OAAO,GAAG,SAAS,CAAC;QACzB,IAAI,CAAC,aAAa,GAAG,IAAI,QAAQ,EAA4B,CAAC;QAC9D,IAAI,CAAC,wBAAwB,GAAG,GAAS,EAAE,GAAE,CAAC,CAAC;IACjD,CAAC;IAED,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAED,MAAM,CAAC,IAAoB;QACzB,IAAI,IAAI,CAAC,OAAO,EAAE,kBAAkB,KAAK,IAAI,CAAC,IAAI,EAAE;YAClD,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;YACpB,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;SACxB;QACD,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACrB,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,kBAAkB,CACtB,MAAsB;QAEtB,IAAI,IAAI,CAAC,OAAO,EAAE,kBAAkB,KAAK,MAAM,CAAC,IAAI,EAAE;YACpD,OAAO,IAAI,CAAC,OAAO,CAAC;SACrB;aAAM,IAAI,IAAI,CAAC,OAAO,EAAE;YACvB,IAAI,CAAC,wBAAwB,EAAE,CAAC;YAChC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;YACpB,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;SACxB;QACD,IAAI,CAAC,OAAO,GAAG,MAAM,kBAAkB,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QAC3D,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC5C,IAAI,CAAC,wBAAwB,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,gBAAgB,CACrE,GAAG,EAAE;YACH,IAAI,CAAC,OAAO,GAAG,SAAS,CAAC;YACzB,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;QAC3C,CAAC,CACF,CAAC;QACF,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAED,OAAO;QACL,IAAI,IAAI,CAAC,OAAO,EAAE;YAChB,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;YACpB,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;YACvB,IAAI,CAAC,OAAO,GAAG,SAAS,CAAC;SAC1B;QACD,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,CAAC;QAC7B,IAAI,CAAC,wBAAwB,EAAE,CAAC;QAChC,KAAK,CAAC,OAAO,EAAE,CAAC;IAClB,CAAC;CACF;AAED,eAAe,gBAAgB,CAAC"}
|