@vcmap/core 6.0.0-rc.9 → 6.0.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/README.md +4 -1
- package/dist/cesium.d.ts +117 -0
- package/dist/index.d.ts +14 -6
- package/dist/index.js +12 -4
- package/dist/index.js.map +1 -1
- package/dist/ol.d.ts +1 -0
- package/dist/src/cesium/cesium3DTileFeature.d.ts +2 -1
- package/dist/src/cesium/cesium3DTileFeature.js +13 -1
- package/dist/src/cesium/cesium3DTileFeature.js.map +1 -1
- package/dist/src/cesium/cesium3DTilePointFeature.js +2 -0
- package/dist/src/cesium/cesium3DTilePointFeature.js.map +1 -1
- package/dist/src/cesium/entity.js +3 -0
- package/dist/src/cesium/entity.js.map +1 -1
- package/dist/src/interaction/featureAtPixelInteraction.d.ts +4 -12
- package/dist/src/interaction/featureAtPixelInteraction.js +6 -27
- package/dist/src/interaction/featureAtPixelInteraction.js.map +1 -1
- package/dist/src/layer/cesium/openStreetMapCesiumImpl.js +2 -4
- package/dist/src/layer/cesium/openStreetMapCesiumImpl.js.map +1 -1
- package/dist/src/layer/cesium/rasterLayerCesiumImpl.d.ts +4 -0
- package/dist/src/layer/cesium/rasterLayerCesiumImpl.js +15 -0
- package/dist/src/layer/cesium/rasterLayerCesiumImpl.js.map +1 -1
- package/dist/src/layer/cesium/singleImageCesiumImpl.js +2 -6
- package/dist/src/layer/cesium/singleImageCesiumImpl.js.map +1 -1
- package/dist/src/layer/cesium/terrainCesiumImpl.js +3 -0
- package/dist/src/layer/cesium/terrainCesiumImpl.js.map +1 -1
- package/dist/src/layer/cesium/tmsCesiumImpl.js +1 -4
- package/dist/src/layer/cesium/tmsCesiumImpl.js.map +1 -1
- package/dist/src/layer/cesium/vcsTile/vcsChildTile.d.ts +12 -0
- package/dist/src/layer/cesium/vcsTile/vcsChildTile.js +18 -0
- package/dist/src/layer/cesium/vcsTile/vcsChildTile.js.map +1 -0
- package/dist/src/layer/cesium/vcsTile/vcsDebugTile.d.ts +21 -0
- package/dist/src/layer/cesium/vcsTile/vcsDebugTile.js +89 -0
- package/dist/src/layer/cesium/vcsTile/vcsDebugTile.js.map +1 -0
- package/dist/src/layer/cesium/vcsTile/vcsNoDataTile.d.ts +11 -0
- package/dist/src/layer/cesium/vcsTile/vcsNoDataTile.js +17 -0
- package/dist/src/layer/cesium/vcsTile/vcsNoDataTile.js.map +1 -0
- package/dist/src/layer/cesium/vcsTile/vcsQuadtreeTileProvider.d.ts +39 -0
- package/dist/src/layer/cesium/vcsTile/vcsQuadtreeTileProvider.js +192 -0
- package/dist/src/layer/cesium/vcsTile/vcsQuadtreeTileProvider.js.map +1 -0
- package/dist/src/layer/cesium/vcsTile/vcsTileHelpers.d.ts +52 -0
- package/dist/src/layer/cesium/vcsTile/vcsTileHelpers.js +73 -0
- package/dist/src/layer/cesium/vcsTile/vcsTileHelpers.js.map +1 -0
- package/dist/src/layer/cesium/vcsTile/vcsVectorTile.d.ts +23 -0
- package/dist/src/layer/cesium/vcsTile/vcsVectorTile.js +87 -0
- package/dist/src/layer/cesium/vcsTile/vcsVectorTile.js.map +1 -0
- package/dist/src/layer/cesium/vectorCesiumImpl.js +1 -1
- package/dist/src/layer/cesium/vectorCesiumImpl.js.map +1 -1
- package/dist/src/layer/cesium/vectorTileCesiumImpl.d.ts +19 -0
- package/dist/src/layer/cesium/vectorTileCesiumImpl.js +63 -0
- package/dist/src/layer/cesium/vectorTileCesiumImpl.js.map +1 -0
- package/dist/src/layer/cesium/wmsCesiumImpl.js +1 -4
- package/dist/src/layer/cesium/wmsCesiumImpl.js.map +1 -1
- package/dist/src/layer/cesium/wmtsCesiumImpl.js +1 -4
- package/dist/src/layer/cesium/wmtsCesiumImpl.js.map +1 -1
- package/dist/src/layer/layer.d.ts +5 -0
- package/dist/src/layer/layer.js +5 -0
- package/dist/src/layer/layer.js.map +1 -1
- package/dist/src/layer/openStreetMapLayer.d.ts +32 -2
- package/dist/src/layer/openStreetMapLayer.js +35 -1
- package/dist/src/layer/openStreetMapLayer.js.map +1 -1
- package/dist/src/layer/openlayers/openStreetMapOpenlayersImpl.js +2 -0
- package/dist/src/layer/openlayers/openStreetMapOpenlayersImpl.js.map +1 -1
- package/dist/src/layer/openlayers/rasterLayerOpenlayersImpl.d.ts +2 -0
- package/dist/src/layer/openlayers/rasterLayerOpenlayersImpl.js +4 -0
- package/dist/src/layer/openlayers/rasterLayerOpenlayersImpl.js.map +1 -1
- package/dist/src/layer/openlayers/singleImageOpenlayersImpl.js +2 -0
- package/dist/src/layer/openlayers/singleImageOpenlayersImpl.js.map +1 -1
- package/dist/src/layer/openlayers/tmsOpenlayersImpl.js +2 -0
- package/dist/src/layer/openlayers/tmsOpenlayersImpl.js.map +1 -1
- package/dist/src/layer/openlayers/vectorTileOpenlayersImpl.d.ts +1 -7
- package/dist/src/layer/openlayers/vectorTileOpenlayersImpl.js +3 -35
- package/dist/src/layer/openlayers/vectorTileOpenlayersImpl.js.map +1 -1
- package/dist/src/layer/openlayers/wmsOpenlayersImpl.js +4 -0
- package/dist/src/layer/openlayers/wmsOpenlayersImpl.js.map +1 -1
- package/dist/src/layer/openlayers/wmtsOpenlayersImpl.js +2 -0
- package/dist/src/layer/openlayers/wmtsOpenlayersImpl.js.map +1 -1
- package/dist/src/layer/pointCloudLayer.d.ts +0 -1
- package/dist/src/layer/pointCloudLayer.js +2 -3
- package/dist/src/layer/pointCloudLayer.js.map +1 -1
- package/dist/src/layer/rasterLayer.d.ts +44 -3
- package/dist/src/layer/rasterLayer.js +43 -0
- package/dist/src/layer/rasterLayer.js.map +1 -1
- package/dist/src/layer/tileProvider/mvtTileProvider.d.ts +0 -5
- package/dist/src/layer/tileProvider/mvtTileProvider.js +0 -12
- package/dist/src/layer/tileProvider/mvtTileProvider.js.map +1 -1
- package/dist/src/layer/tileProvider/staticFeatureTileProvider.d.ts +14 -0
- package/dist/src/layer/tileProvider/staticFeatureTileProvider.js +44 -0
- package/dist/src/layer/tileProvider/staticFeatureTileProvider.js.map +1 -0
- package/dist/src/layer/tileProvider/tileProvider.d.ts +8 -2
- package/dist/src/layer/tileProvider/tileProvider.js +17 -1
- package/dist/src/layer/tileProvider/tileProvider.js.map +1 -1
- package/dist/src/layer/vectorLayer.d.ts +1 -1
- package/dist/src/layer/vectorLayer.js.map +1 -1
- package/dist/src/layer/vectorTileLayer.d.ts +13 -3
- package/dist/src/layer/vectorTileLayer.js +43 -13
- package/dist/src/layer/vectorTileLayer.js.map +1 -1
- package/dist/src/map/cesiumMap.d.ts +8 -1
- package/dist/src/map/cesiumMap.js +17 -6
- package/dist/src/map/cesiumMap.js.map +1 -1
- package/dist/src/ol/feature.js +7 -0
- package/dist/src/ol/feature.js.map +1 -1
- package/dist/src/style/declarativeStyleItem.js +2 -68
- package/dist/src/style/declarativeStyleItem.js.map +1 -1
- package/dist/src/util/displayQuality/displayQuality.d.ts +1 -0
- package/dist/src/util/displayQuality/displayQuality.js +12 -1
- package/dist/src/util/displayQuality/displayQuality.js.map +1 -1
- package/dist/src/util/editor/createFeatureSession.d.ts +8 -4
- package/dist/src/util/editor/createFeatureSession.js +35 -11
- package/dist/src/util/editor/createFeatureSession.js.map +1 -1
- package/dist/src/util/editor/editGeometrySession.d.ts +2 -1
- package/dist/src/util/editor/editGeometrySession.js +33 -12
- package/dist/src/util/editor/editGeometrySession.js.map +1 -1
- package/dist/src/util/editor/editorHelpers.d.ts +1 -0
- package/dist/src/util/editor/editorHelpers.js +6 -0
- package/dist/src/util/editor/editorHelpers.js.map +1 -1
- package/dist/src/util/editor/editorSessionHelpers.d.ts +1 -6
- package/dist/src/util/editor/editorSessionHelpers.js +5 -16
- package/dist/src/util/editor/editorSessionHelpers.js.map +1 -1
- package/dist/src/util/editor/interactions/editGeometryMouseOverInteraction.js +3 -2
- package/dist/src/util/editor/interactions/editGeometryMouseOverInteraction.js.map +1 -1
- package/dist/src/util/editor/interactions/removeVertexInteraction.d.ts +1 -1
- package/dist/src/util/editor/interactions/removeVertexInteraction.js +2 -2
- package/dist/src/util/editor/interactions/removeVertexInteraction.js.map +1 -1
- package/dist/src/util/editor/interactions/segmentLengthInteraction.d.ts +16 -0
- package/dist/src/util/editor/interactions/segmentLengthInteraction.js +167 -0
- package/dist/src/util/editor/interactions/segmentLengthInteraction.js.map +1 -0
- package/dist/src/util/editor/interactions/translateVertexInteraction.js +2 -6
- package/dist/src/util/editor/interactions/translateVertexInteraction.js.map +1 -1
- package/dist/src/util/editor/interactions/translationSnapping.js +3 -2
- package/dist/src/util/editor/interactions/translationSnapping.js.map +1 -1
- package/dist/src/util/featureconverter/clampedPrimitive.d.ts +2 -2
- package/dist/src/util/featureconverter/clampedPrimitive.js +24 -2
- package/dist/src/util/featureconverter/clampedPrimitive.js.map +1 -1
- package/dist/src/util/featureconverter/convert.js +12 -3
- package/dist/src/util/featureconverter/convert.js.map +1 -1
- package/dist/src/util/geometryHelpers.d.ts +9 -1
- package/dist/src/util/geometryHelpers.js +54 -4
- package/dist/src/util/geometryHelpers.js.map +1 -1
- package/dist/src/util/math.d.ts +12 -0
- package/dist/src/util/math.js +21 -0
- package/dist/src/util/math.js.map +1 -1
- package/dist/src/util/projection.js +1 -1
- package/dist/src/util/projection.js.map +1 -1
- package/dist/src/vcsModule.d.ts +12 -12
- package/dist/src/vcsModule.js +8 -8
- 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/index.ts +26 -2
- package/package.json +3 -3
- package/src/cesium/cesium.d.ts +117 -0
- package/src/cesium/cesium3DTileFeature.ts +20 -1
- package/src/cesium/cesium3DTilePointFeature.ts +3 -0
- package/src/cesium/entity.ts +7 -0
- package/src/interaction/featureAtPixelInteraction.ts +8 -39
- package/src/layer/cesium/openStreetMapCesiumImpl.ts +2 -4
- package/src/layer/cesium/rasterLayerCesiumImpl.ts +19 -0
- package/src/layer/cesium/singleImageCesiumImpl.ts +2 -6
- package/src/layer/cesium/terrainCesiumImpl.ts +3 -0
- package/src/layer/cesium/tmsCesiumImpl.ts +1 -4
- package/src/layer/cesium/vcsTile/vcsChildTile.ts +31 -0
- package/src/layer/cesium/vcsTile/vcsDebugTile.ts +154 -0
- package/src/layer/cesium/vcsTile/vcsNoDataTile.ts +30 -0
- package/src/layer/cesium/vcsTile/vcsQuadtreeTileProvider.ts +290 -0
- package/src/layer/cesium/vcsTile/vcsTileHelpers.ts +134 -0
- package/src/layer/cesium/vcsTile/vcsVectorTile.ts +149 -0
- package/src/layer/cesium/vectorCesiumImpl.ts +1 -1
- package/src/layer/cesium/vectorTileCesiumImpl.ts +91 -0
- package/src/layer/cesium/wmsCesiumImpl.ts +1 -4
- package/src/layer/cesium/wmtsCesiumImpl.ts +1 -4
- package/src/layer/layer.ts +5 -0
- package/src/layer/openStreetMapLayer.ts +64 -2
- package/src/layer/openlayers/openStreetMapOpenlayersImpl.ts +2 -0
- package/src/layer/openlayers/rasterLayerOpenlayersImpl.ts +6 -0
- package/src/layer/openlayers/singleImageOpenlayersImpl.ts +2 -0
- package/src/layer/openlayers/tmsOpenlayersImpl.ts +2 -0
- package/src/layer/openlayers/vectorTileOpenlayersImpl.ts +3 -37
- package/src/layer/openlayers/wmsOpenlayersImpl.ts +4 -0
- package/src/layer/openlayers/wmtsOpenlayersImpl.ts +2 -0
- package/src/layer/pointCloudLayer.ts +2 -3
- package/src/layer/rasterLayer.ts +81 -2
- package/src/layer/tileProvider/mvtTileProvider.ts +0 -18
- package/src/layer/tileProvider/staticFeatureTileProvider.ts +61 -0
- package/src/layer/tileProvider/tileProvider.ts +27 -2
- package/src/layer/vectorLayer.ts +1 -1
- package/src/layer/vectorTileLayer.ts +72 -17
- package/src/map/cesiumMap.ts +28 -6
- package/src/ol/feature.ts +10 -0
- package/src/ol/ol.d.ts +1 -0
- package/src/style/declarativeStyleItem.ts +2 -72
- package/src/util/displayQuality/displayQuality.ts +13 -1
- package/src/util/editor/createFeatureSession.ts +51 -13
- package/src/util/editor/editGeometrySession.ts +41 -10
- package/src/util/editor/editorHelpers.ts +13 -0
- package/src/util/editor/editorSessionHelpers.ts +6 -20
- package/src/util/editor/interactions/editGeometryMouseOverInteraction.ts +4 -4
- package/src/util/editor/interactions/removeVertexInteraction.ts +3 -4
- package/src/util/editor/interactions/segmentLengthInteraction.ts +227 -0
- package/src/util/editor/interactions/translateVertexInteraction.ts +3 -10
- package/src/util/editor/interactions/translationSnapping.ts +4 -4
- package/src/util/featureconverter/clampedPrimitive.ts +53 -5
- package/src/util/featureconverter/convert.ts +18 -2
- package/src/util/geometryHelpers.ts +63 -4
- package/src/util/math.ts +28 -0
- package/src/util/projection.ts +1 -1
- package/src/vcsModule.ts +20 -20
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
import { Circle, LineString, Polygon } from 'ol/geom.js';
|
|
2
|
+
import AbstractInteraction, { InteractionEvent } from '../../../interaction/abstractInteraction.js';
|
|
3
|
+
import type VectorLayer from '../../../layer/vectorLayer.js';
|
|
4
|
+
export default class SegmentLengthInteraction extends AbstractInteraction {
|
|
5
|
+
private _scratchLayer;
|
|
6
|
+
private _geometry;
|
|
7
|
+
private _isCircle;
|
|
8
|
+
private _removeLabels;
|
|
9
|
+
private _vectorPropertiesListener;
|
|
10
|
+
private _is3D;
|
|
11
|
+
creation: boolean;
|
|
12
|
+
constructor(scratchLayer: VectorLayer, creation: boolean);
|
|
13
|
+
pipe(event: InteractionEvent): Promise<InteractionEvent>;
|
|
14
|
+
setGeometry(geometry: LineString | Polygon | Circle): void;
|
|
15
|
+
destroy(): void;
|
|
16
|
+
}
|
|
@@ -0,0 +1,167 @@
|
|
|
1
|
+
import { Circle, LineString, Point, Polygon } from 'ol/geom.js';
|
|
2
|
+
import { Style, Text as OLText } from 'ol/style.js';
|
|
3
|
+
import { Feature } from 'ol';
|
|
4
|
+
import { HeightReference } from '@vcmap-cesium/engine';
|
|
5
|
+
import AbstractInteraction from '../../../interaction/abstractInteraction.js';
|
|
6
|
+
import { EventType, ModificationKeyType, } from '../../../interaction/interactionType.js';
|
|
7
|
+
import { isVertex } from '../editorHelpers.js';
|
|
8
|
+
import { vertexIndexSymbol } from '../editorSymbols.js';
|
|
9
|
+
import { is2DLayout } from '../../geometryHelpers.js';
|
|
10
|
+
import { ecef3DDistance, getMidPoint, spherical2Distance } from '../../math.js';
|
|
11
|
+
import { validityPlaceholder } from './createPolygonInteraction.js';
|
|
12
|
+
import { createSync } from '../../../layer/vectorSymbols.js';
|
|
13
|
+
function getSegmentForCoordinateIndex(geometry, index) {
|
|
14
|
+
if (geometry instanceof Circle) {
|
|
15
|
+
return [geometry.getCoordinates()];
|
|
16
|
+
}
|
|
17
|
+
const flats = geometry.getFlatCoordinates();
|
|
18
|
+
let end;
|
|
19
|
+
let isPolygon = false;
|
|
20
|
+
if (geometry instanceof Polygon) {
|
|
21
|
+
isPolygon = true;
|
|
22
|
+
end = geometry.getEnds()[0];
|
|
23
|
+
}
|
|
24
|
+
else {
|
|
25
|
+
end = flats.length;
|
|
26
|
+
}
|
|
27
|
+
const stride = geometry.getStride();
|
|
28
|
+
const layout = geometry.getLayout();
|
|
29
|
+
if (flats.length < stride * 2) {
|
|
30
|
+
return [];
|
|
31
|
+
}
|
|
32
|
+
let flatIndex = Math.round(index * stride);
|
|
33
|
+
if (index === -1) {
|
|
34
|
+
flatIndex = end - stride;
|
|
35
|
+
}
|
|
36
|
+
if (flats.length < flatIndex + stride) {
|
|
37
|
+
return [];
|
|
38
|
+
}
|
|
39
|
+
const previousIndex = index === 0 ? stride : flatIndex - stride;
|
|
40
|
+
let nextIndex;
|
|
41
|
+
if (isPolygon && !geometry[validityPlaceholder]) {
|
|
42
|
+
if (flatIndex === 0) {
|
|
43
|
+
nextIndex = end - stride;
|
|
44
|
+
}
|
|
45
|
+
else if (flatIndex + stride === end) {
|
|
46
|
+
nextIndex = 0;
|
|
47
|
+
}
|
|
48
|
+
else {
|
|
49
|
+
nextIndex = flatIndex + stride;
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
else if (flatIndex > 0 && flatIndex + stride < end) {
|
|
53
|
+
nextIndex = flatIndex + stride;
|
|
54
|
+
}
|
|
55
|
+
const getCoordinateFromIndex = is2DLayout(layout)
|
|
56
|
+
? (i) => {
|
|
57
|
+
return [flats[i], flats[i + 1]];
|
|
58
|
+
}
|
|
59
|
+
: (i) => {
|
|
60
|
+
return [flats[i], flats[i + 1], flats[i + 2]];
|
|
61
|
+
};
|
|
62
|
+
const segments = [
|
|
63
|
+
[getCoordinateFromIndex(flatIndex), getCoordinateFromIndex(previousIndex)],
|
|
64
|
+
];
|
|
65
|
+
if (nextIndex != null && flats.length >= nextIndex + stride) {
|
|
66
|
+
segments.push([
|
|
67
|
+
getCoordinateFromIndex(flatIndex),
|
|
68
|
+
getCoordinateFromIndex(nextIndex),
|
|
69
|
+
]);
|
|
70
|
+
}
|
|
71
|
+
return segments;
|
|
72
|
+
}
|
|
73
|
+
function createSegmentsLabels(segments, layer, is3D) {
|
|
74
|
+
const features = segments.map((segment) => {
|
|
75
|
+
const midPoint = getMidPoint(segment[0], segment[1]);
|
|
76
|
+
const feature = new Feature({
|
|
77
|
+
geometry: new Point(midPoint),
|
|
78
|
+
});
|
|
79
|
+
const segmentLength = is3D
|
|
80
|
+
? ecef3DDistance(segment[0], segment[1])
|
|
81
|
+
: spherical2Distance(segment[0], segment[1]);
|
|
82
|
+
feature.setStyle(new Style({
|
|
83
|
+
text: new OLText({
|
|
84
|
+
text: `${segmentLength.toFixed(2)} m`,
|
|
85
|
+
font: '16px Helvetica, sans-serif',
|
|
86
|
+
}),
|
|
87
|
+
}));
|
|
88
|
+
feature[createSync] = true;
|
|
89
|
+
return feature;
|
|
90
|
+
});
|
|
91
|
+
layer.addFeatures(features);
|
|
92
|
+
return () => {
|
|
93
|
+
layer.removeFeaturesById(features.map((f) => f.getId()));
|
|
94
|
+
features.splice(0);
|
|
95
|
+
};
|
|
96
|
+
}
|
|
97
|
+
function createSegmentGeometry(segment, layer) {
|
|
98
|
+
const feature = new Feature({
|
|
99
|
+
geometry: new LineString(segment),
|
|
100
|
+
});
|
|
101
|
+
feature[createSync] = true;
|
|
102
|
+
const features = [feature];
|
|
103
|
+
layer.addFeatures(features);
|
|
104
|
+
return () => {
|
|
105
|
+
layer.removeFeaturesById(features.map((f) => f.getId()));
|
|
106
|
+
features.splice(0);
|
|
107
|
+
};
|
|
108
|
+
}
|
|
109
|
+
export default class SegmentLengthInteraction extends AbstractInteraction {
|
|
110
|
+
_scratchLayer;
|
|
111
|
+
_geometry;
|
|
112
|
+
_isCircle = false;
|
|
113
|
+
// eslint-disable-next-line class-methods-use-this
|
|
114
|
+
_removeLabels = () => { };
|
|
115
|
+
// eslint-disable-next-line class-methods-use-this
|
|
116
|
+
_vectorPropertiesListener = () => { };
|
|
117
|
+
_is3D = false;
|
|
118
|
+
creation;
|
|
119
|
+
constructor(scratchLayer, creation) {
|
|
120
|
+
super(creation ? EventType.MOVE : EventType.DRAGEVENTS, ModificationKeyType.CTRL | ModificationKeyType.NONE);
|
|
121
|
+
this._scratchLayer = scratchLayer;
|
|
122
|
+
this._is3D =
|
|
123
|
+
scratchLayer.vectorProperties.altitudeMode === HeightReference.NONE;
|
|
124
|
+
this._vectorPropertiesListener =
|
|
125
|
+
scratchLayer.vectorProperties.propertyChanged.addEventListener(() => {
|
|
126
|
+
this._is3D =
|
|
127
|
+
scratchLayer.vectorProperties.altitudeMode === HeightReference.NONE;
|
|
128
|
+
});
|
|
129
|
+
this.creation = creation;
|
|
130
|
+
}
|
|
131
|
+
pipe(event) {
|
|
132
|
+
this._removeLabels();
|
|
133
|
+
if (this._geometry) {
|
|
134
|
+
let index;
|
|
135
|
+
if (this.creation) {
|
|
136
|
+
index = -1;
|
|
137
|
+
}
|
|
138
|
+
else if (isVertex(event.feature)) {
|
|
139
|
+
index = event.feature[vertexIndexSymbol];
|
|
140
|
+
}
|
|
141
|
+
if (index != null) {
|
|
142
|
+
const segments = getSegmentForCoordinateIndex(this._geometry, index);
|
|
143
|
+
let removeLabels = createSegmentsLabels(segments, this._scratchLayer, this._is3D);
|
|
144
|
+
if (this._isCircle) {
|
|
145
|
+
const removeTextLabels = removeLabels;
|
|
146
|
+
const removeSegment = createSegmentGeometry(segments[0], this._scratchLayer);
|
|
147
|
+
removeLabels = () => {
|
|
148
|
+
removeTextLabels();
|
|
149
|
+
removeSegment();
|
|
150
|
+
};
|
|
151
|
+
}
|
|
152
|
+
this._removeLabels = removeLabels;
|
|
153
|
+
}
|
|
154
|
+
}
|
|
155
|
+
return Promise.resolve(event);
|
|
156
|
+
}
|
|
157
|
+
setGeometry(geometry) {
|
|
158
|
+
this._geometry = geometry;
|
|
159
|
+
this._isCircle = geometry instanceof Circle;
|
|
160
|
+
}
|
|
161
|
+
destroy() {
|
|
162
|
+
this._removeLabels();
|
|
163
|
+
this._vectorPropertiesListener();
|
|
164
|
+
super.destroy();
|
|
165
|
+
}
|
|
166
|
+
}
|
|
167
|
+
//# sourceMappingURL=segmentLengthInteraction.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"segmentLengthInteraction.js","sourceRoot":"","sources":["../../../../../src/util/editor/interactions/segmentLengthInteraction.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import AbstractInteraction from '../../../interaction/abstractInteraction.js';
|
|
2
2
|
import { EventType, ModificationKeyType, } from '../../../interaction/interactionType.js';
|
|
3
|
-
import { vertexSymbol } from '../editorSymbols.js';
|
|
4
3
|
import VcsEvent from '../../../vcsEvent.js';
|
|
4
|
+
import { isVertex } from '../editorHelpers.js';
|
|
5
5
|
import { emptyStyle } from '../../../style/styleHelpers.js';
|
|
6
6
|
/**
|
|
7
7
|
* Class to translate a vertex. Will call the passed in vertex changed event with the changed vertex.
|
|
@@ -26,16 +26,12 @@ class TranslateVertexInteraction extends AbstractInteraction {
|
|
|
26
26
|
this._vertex.setStyle(undefined);
|
|
27
27
|
this._vertex = null;
|
|
28
28
|
}
|
|
29
|
-
event.stopPropagation = true;
|
|
30
29
|
}
|
|
31
|
-
else if (event.type & EventType.DRAGSTART &&
|
|
32
|
-
event.feature &&
|
|
33
|
-
event.feature[vertexSymbol]) {
|
|
30
|
+
else if (event.type & EventType.DRAGSTART && isVertex(event.feature)) {
|
|
34
31
|
this._vertex = event.feature;
|
|
35
32
|
this._vertex.set('olcs_allowPicking', false);
|
|
36
33
|
this._feature.set('olcs_allowPicking', false);
|
|
37
34
|
this._vertex.setStyle(emptyStyle);
|
|
38
|
-
event.stopPropagation = true;
|
|
39
35
|
}
|
|
40
36
|
return Promise.resolve(event);
|
|
41
37
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"translateVertexInteraction.js","sourceRoot":"","sources":["../../../../../src/util/editor/interactions/translateVertexInteraction.ts"],"names":[],"mappings":"AACA,OAAO,mBAEN,MAAM,6CAA6C,CAAC;AACrD,OAAO,EACL,SAAS,EACT,mBAAmB,GACpB,MAAM,yCAAyC,CAAC;AACjD,OAAO,
|
|
1
|
+
{"version":3,"file":"translateVertexInteraction.js","sourceRoot":"","sources":["../../../../../src/util/editor/interactions/translateVertexInteraction.ts"],"names":[],"mappings":"AACA,OAAO,mBAEN,MAAM,6CAA6C,CAAC;AACrD,OAAO,EACL,SAAS,EACT,mBAAmB,GACpB,MAAM,yCAAyC,CAAC;AACjD,OAAO,QAAQ,MAAM,sBAAsB,CAAC;AAC5C,OAAO,EAAE,QAAQ,EAAU,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAE5D;;;GAGG;AACH,MAAM,0BAA2B,SAAQ,mBAAmB;IACjD,aAAa,GAAG,IAAI,QAAQ,EAAU,CAAC;IAExC,OAAO,GAAkB,IAAI,CAAC;IAE9B,QAAQ,CAAU;IAE1B,YAAY,OAAgB;QAC1B,KAAK,CACH,SAAS,CAAC,UAAU,EACpB,mBAAmB,CAAC,IAAI,GAAG,mBAAmB,CAAC,IAAI,CACpD,CAAC;QACF,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;QACxB,IAAI,CAAC,SAAS,EAAE,CAAC;IACnB,CAAC;IAED,IAAI,CAAC,KAA6B;QAChC,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACjB,IAAI,CAAC,OAAO,CAAC,WAAW,EAAG,CAAC,cAAc,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;YAClE,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAE5C,IAAI,KAAK,CAAC,IAAI,GAAG,SAAS,CAAC,OAAO,EAAE,CAAC;gBACnC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;gBACxC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;gBACzC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;gBACjC,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;YACtB,CAAC;QACH,CAAC;aAAM,IAAI,KAAK,CAAC,IAAI,GAAG,SAAS,CAAC,SAAS,IAAI,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;YACvE,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;YAC7B,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,KAAK,CAAC,CAAC;YAC7C,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,mBAAmB,EAAE,KAAK,CAAC,CAAC;YAC9C,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;QACpC,CAAC;QACD,OAAO,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAChC,CAAC;IAED,OAAO;QACL,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,CAAC;QAC7B,KAAK,CAAC,OAAO,EAAE,CAAC;IAClB,CAAC;CACF;AAED,eAAe,0BAA0B,CAAC"}
|
|
@@ -3,7 +3,8 @@ import AbstractInteraction from '../../../interaction/abstractInteraction.js';
|
|
|
3
3
|
import { EventType, ModificationKeyType, } from '../../../interaction/interactionType.js';
|
|
4
4
|
import { getCartesianBearing } from '../../math.js';
|
|
5
5
|
import { getSnappedCoordinateForResults, getAngleSnapResult, setSnappingFeatures, getGeometrySnapResult, snapTypes, } from '../snappingHelpers.js';
|
|
6
|
-
import { vertexIndexSymbol
|
|
6
|
+
import { vertexIndexSymbol } from '../editorSymbols.js';
|
|
7
|
+
import { isVertex } from '../editorHelpers.js';
|
|
7
8
|
import { alreadySnapped, } from '../editorSessionHelpers.js';
|
|
8
9
|
function getBearings(coordinates, isPolygon) {
|
|
9
10
|
const length = isPolygon ? coordinates.length : coordinates.length - 1;
|
|
@@ -101,7 +102,7 @@ export default class TranslationSnapping extends AbstractInteraction {
|
|
|
101
102
|
this._lastCoordinate = undefined;
|
|
102
103
|
}
|
|
103
104
|
else if (event.key !== ModificationKeyType.CTRL &&
|
|
104
|
-
event.feature
|
|
105
|
+
isVertex(event.feature)) {
|
|
105
106
|
const index = event.feature[vertexIndexSymbol];
|
|
106
107
|
if (event.type === EventType.DRAGSTART) {
|
|
107
108
|
this._setCoordinates(index);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"translationSnapping.js","sourceRoot":"","sources":["../../../../../src/util/editor/interactions/translationSnapping.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAElE,OAAO,mBAAmB,MAAM,6CAA6C,CAAC;AAC9E,OAAO,EACL,SAAS,EACT,mBAAmB,GACpB,MAAM,yCAAyC,CAAC;AAEjD,OAAO,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AACpD,OAAO,EACL,8BAA8B,EAC9B,kBAAkB,EAClB,mBAAmB,EAEnB,qBAAqB,EAErB,SAAS,GACV,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,iBAAiB,EAAE,
|
|
1
|
+
{"version":3,"file":"translationSnapping.js","sourceRoot":"","sources":["../../../../../src/util/editor/interactions/translationSnapping.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
import { HeightReference, Model, Primitive, Scene } from '@vcmap-cesium/engine';
|
|
2
|
-
export declare function setupClampedPrimitive(scene: Scene, primitive: Primitive | Model, origin: [number, number], heightReference: HeightReference): void;
|
|
1
|
+
import { ClassificationPrimitive, HeightReference, Model, Primitive, Scene } from '@vcmap-cesium/engine';
|
|
2
|
+
export declare function setupClampedPrimitive(scene: Scene, primitive: Primitive | Model | ClassificationPrimitive, origin: [number, number], heightReference: HeightReference): void;
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Cartesian3, Cartographic, Matrix4, } from '@vcmap-cesium/engine';
|
|
1
|
+
import { Cartesian3, Cartographic, ClassificationPrimitive, Matrix4, } from '@vcmap-cesium/engine';
|
|
2
2
|
import { mercatorToCartographic } from '../math.js';
|
|
3
3
|
const scratchUpdateHeightCartesian = new Cartesian3();
|
|
4
4
|
function getUpdateHeightCallback(primitive, originalPosition) {
|
|
@@ -9,11 +9,33 @@ function getUpdateHeightCallback(primitive, originalPosition) {
|
|
|
9
9
|
primitive.modelMatrix = Matrix4.setTranslation(modelMatrix, scratchUpdateHeightCartesian, new Matrix4());
|
|
10
10
|
};
|
|
11
11
|
}
|
|
12
|
+
function getUpdateClassificationHeightCallback(primitive, originalPosition) {
|
|
13
|
+
return function updatePrimitiveHeight(clampedPosition) {
|
|
14
|
+
Cartographic.toCartesian(clampedPosition, undefined, scratchUpdateHeightCartesian);
|
|
15
|
+
Cartesian3.subtract(scratchUpdateHeightCartesian, originalPosition, scratchUpdateHeightCartesian);
|
|
16
|
+
if (primitive.ready) {
|
|
17
|
+
// eslint-disable-next-line no-underscore-dangle
|
|
18
|
+
const innerPrimitive = primitive._primitive;
|
|
19
|
+
const { modelMatrix } = innerPrimitive;
|
|
20
|
+
innerPrimitive.modelMatrix = Matrix4.setTranslation(modelMatrix, scratchUpdateHeightCartesian, new Matrix4());
|
|
21
|
+
}
|
|
22
|
+
else {
|
|
23
|
+
// eslint-disable-next-line no-underscore-dangle
|
|
24
|
+
primitive._primitiveOptions.modelMatrix = Matrix4.setTranslation(Matrix4.IDENTITY, scratchUpdateHeightCartesian, new Matrix4());
|
|
25
|
+
}
|
|
26
|
+
};
|
|
27
|
+
}
|
|
12
28
|
// eslint-disable-next-line import/prefer-default-export
|
|
13
29
|
export function setupClampedPrimitive(scene, primitive, origin, heightReference) {
|
|
14
30
|
const destroy = primitive.destroy.bind(primitive);
|
|
15
31
|
const originCartographic = mercatorToCartographic(origin);
|
|
16
|
-
|
|
32
|
+
let callback;
|
|
33
|
+
if (primitive instanceof ClassificationPrimitive) {
|
|
34
|
+
callback = getUpdateClassificationHeightCallback(primitive, Cartographic.toCartesian(originCartographic));
|
|
35
|
+
}
|
|
36
|
+
else {
|
|
37
|
+
callback = getUpdateHeightCallback(primitive, Cartographic.toCartesian(originCartographic));
|
|
38
|
+
}
|
|
17
39
|
const callbackHandler = scene.updateHeight(originCartographic, callback, heightReference);
|
|
18
40
|
const height = scene.getHeight(originCartographic, heightReference);
|
|
19
41
|
if (height) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"clampedPrimitive.js","sourceRoot":"","sources":["../../../../src/util/featureconverter/clampedPrimitive.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,YAAY,
|
|
1
|
+
{"version":3,"file":"clampedPrimitive.js","sourceRoot":"","sources":["../../../../src/util/featureconverter/clampedPrimitive.ts"],"names":[],"mappings":"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"}
|
|
@@ -166,11 +166,20 @@ function getPrimitiveBatches(items, feature, vectorProperties, scene) {
|
|
|
166
166
|
});
|
|
167
167
|
return { batches, convertedItems };
|
|
168
168
|
}
|
|
169
|
-
function getClampedPrimitiveBatches(options) {
|
|
169
|
+
function getClampedPrimitiveBatches(options, feature, vectorProperties, scene) {
|
|
170
170
|
const batches = createPrimitiveBatches();
|
|
171
|
+
const classification = vectorProperties.getClassificationType(feature);
|
|
172
|
+
const classificationSupported = ClassificationPrimitive.isSupported(scene);
|
|
171
173
|
options.forEach((item) => {
|
|
172
174
|
if (item.type === 'solid' || item.type === 'fill') {
|
|
173
|
-
|
|
175
|
+
if (classification != null) {
|
|
176
|
+
if (classificationSupported) {
|
|
177
|
+
batches.classificationPrimitive.push(item);
|
|
178
|
+
}
|
|
179
|
+
}
|
|
180
|
+
else {
|
|
181
|
+
batches.solidPrimitive.push(item);
|
|
182
|
+
}
|
|
174
183
|
}
|
|
175
184
|
else if (item.type === 'outline') {
|
|
176
185
|
batches.outlinePrimitive.push(item);
|
|
@@ -203,7 +212,7 @@ function batchPrimitives(batches, feature, style, vectorProperties, scene) {
|
|
|
203
212
|
}
|
|
204
213
|
batches.clampedPrimitives.forEach((options, originHash) => {
|
|
205
214
|
const [x, y, heightReference] = originHash.split(':').map(Number);
|
|
206
|
-
const clampedBatches = getClampedPrimitiveBatches(options);
|
|
215
|
+
const clampedBatches = getClampedPrimitiveBatches(options, feature, vectorProperties, scene);
|
|
207
216
|
const clampedItems = batchPrimitives(clampedBatches, feature, style, vectorProperties, scene);
|
|
208
217
|
clampedItems.forEach(({ item }) => {
|
|
209
218
|
setupClampedPrimitive(scene, item, [x, y], heightReference);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"convert.js","sourceRoot":"","sources":["../../../../src/util/featureconverter/convert.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"convert.js","sourceRoot":"","sources":["../../../../src/util/featureconverter/convert.ts"],"names":[],"mappings":"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"}
|
|
@@ -34,7 +34,15 @@ export declare function from3Dto2DLayout(geometry: Geometry): void;
|
|
|
34
34
|
* @param scene
|
|
35
35
|
* @param heightReference - clamp to ground will use `scene.getHeightMostDetailed`, terrain will use `sampleTerrainMostDetailed` using the scenes terrain provider
|
|
36
36
|
*/
|
|
37
|
-
export declare function
|
|
37
|
+
export declare function placeGeometryOnSurface(geometry: Geometry, scene: Scene, heightReference: HeightReference.CLAMP_TO_GROUND | HeightReference.CLAMP_TO_TERRAIN): Promise<void>;
|
|
38
|
+
/**
|
|
39
|
+
* Drape a geometry on to the ground (or terrain). The geometry is changed in place. This function
|
|
40
|
+
* will set the layout to a respective 3D layout.
|
|
41
|
+
* @param geometry
|
|
42
|
+
* @param scene
|
|
43
|
+
* @param heightReference - clamp to ground will use `scene.getHeightMostDetailed`, terrain will use `sampleTerrainMostDetailed` using the scenes terrain provider
|
|
44
|
+
*/
|
|
45
|
+
export declare function drapeGeometryOnSurface(geometry: Geometry, scene: Scene, heightReference: HeightReference.CLAMP_TO_GROUND | HeightReference.CLAMP_TO_TERRAIN): Promise<void>;
|
|
38
46
|
/**
|
|
39
47
|
* Wil transform a 2D geometry (layout XY XYM) in place to 3D (XYZ XYZM) using the provided scene & height reference.
|
|
40
48
|
* will no apply anything, if the layout is already 3D
|
|
@@ -169,7 +169,52 @@ export function from3Dto2DLayout(geometry) {
|
|
|
169
169
|
* @param scene
|
|
170
170
|
* @param heightReference - clamp to ground will use `scene.getHeightMostDetailed`, terrain will use `sampleTerrainMostDetailed` using the scenes terrain provider
|
|
171
171
|
*/
|
|
172
|
-
export async function
|
|
172
|
+
export async function placeGeometryOnSurface(geometry, scene, heightReference) {
|
|
173
|
+
const layout = geometry.getLayout();
|
|
174
|
+
const coordinates = geometry.getCoordinates();
|
|
175
|
+
const flatCoordinates = getFlatCoordinateReferences(geometry, coordinates);
|
|
176
|
+
const drapedCartographics = flatCoordinates.map((c) => mercatorToCartographic(c));
|
|
177
|
+
if (heightReference === HeightReference.CLAMP_TO_GROUND) {
|
|
178
|
+
await scene.sampleHeightMostDetailed(drapedCartographics);
|
|
179
|
+
}
|
|
180
|
+
else if (scene.terrainProvider.availability) {
|
|
181
|
+
await sampleTerrainMostDetailed(scene.terrainProvider, drapedCartographics);
|
|
182
|
+
}
|
|
183
|
+
else {
|
|
184
|
+
drapedCartographics.forEach((c) => {
|
|
185
|
+
c.height = 0;
|
|
186
|
+
});
|
|
187
|
+
}
|
|
188
|
+
if (layout === 'XY' || layout === 'XYM') {
|
|
189
|
+
const height = Math.max(...drapedCartographics.map((c) => c.height));
|
|
190
|
+
flatCoordinates.forEach((c, index) => {
|
|
191
|
+
if (layout === 'XYM') {
|
|
192
|
+
flatCoordinates[index][3] = c[2];
|
|
193
|
+
}
|
|
194
|
+
flatCoordinates[index][2] = height;
|
|
195
|
+
});
|
|
196
|
+
}
|
|
197
|
+
else {
|
|
198
|
+
const maxDiff = flatCoordinates.reduce((acc, coord, index) => {
|
|
199
|
+
const current = drapedCartographics[index].height - coord[2];
|
|
200
|
+
return Math.max(current, acc);
|
|
201
|
+
}, -Infinity);
|
|
202
|
+
if (Number.isFinite(maxDiff) && maxDiff !== 0) {
|
|
203
|
+
flatCoordinates.forEach((_c, index) => {
|
|
204
|
+
flatCoordinates[index][2] += maxDiff;
|
|
205
|
+
});
|
|
206
|
+
}
|
|
207
|
+
}
|
|
208
|
+
geometry.setCoordinates(coordinates, layout === 'XYM' || layout === 'XYZM' ? 'XYZM' : 'XYZ');
|
|
209
|
+
}
|
|
210
|
+
/**
|
|
211
|
+
* Drape a geometry on to the ground (or terrain). The geometry is changed in place. This function
|
|
212
|
+
* will set the layout to a respective 3D layout.
|
|
213
|
+
* @param geometry
|
|
214
|
+
* @param scene
|
|
215
|
+
* @param heightReference - clamp to ground will use `scene.getHeightMostDetailed`, terrain will use `sampleTerrainMostDetailed` using the scenes terrain provider
|
|
216
|
+
*/
|
|
217
|
+
export async function drapeGeometryOnSurface(geometry, scene, heightReference) {
|
|
173
218
|
const layout = geometry.getLayout();
|
|
174
219
|
const coordinates = geometry.getCoordinates();
|
|
175
220
|
const flatCoordinates = getFlatCoordinateReferences(geometry, coordinates);
|
|
@@ -177,9 +222,14 @@ export async function placeGeometryOnGround(geometry, scene, heightReference) {
|
|
|
177
222
|
if (heightReference === HeightReference.CLAMP_TO_GROUND) {
|
|
178
223
|
await scene.sampleHeightMostDetailed(cartographics);
|
|
179
224
|
}
|
|
180
|
-
else {
|
|
225
|
+
else if (scene.terrainProvider.availability) {
|
|
181
226
|
await sampleTerrainMostDetailed(scene.terrainProvider, cartographics);
|
|
182
227
|
}
|
|
228
|
+
else {
|
|
229
|
+
cartographics.forEach((c) => {
|
|
230
|
+
c.height = 0;
|
|
231
|
+
});
|
|
232
|
+
}
|
|
183
233
|
cartographics.forEach((c, index) => {
|
|
184
234
|
if (layout === 'XYM') {
|
|
185
235
|
flatCoordinates[index][3] = flatCoordinates[index][2];
|
|
@@ -200,7 +250,7 @@ export async function placeGeometryOnGround(geometry, scene, heightReference) {
|
|
|
200
250
|
*/
|
|
201
251
|
export async function from2Dto3DLayout(geometry, scene, heightReference) {
|
|
202
252
|
if (is2DLayout(geometry.getLayout())) {
|
|
203
|
-
await
|
|
253
|
+
await drapeGeometryOnSurface(geometry, scene, heightReference);
|
|
204
254
|
}
|
|
205
255
|
}
|
|
206
256
|
function setZCoordinate(geometry, z) {
|
|
@@ -239,7 +289,7 @@ export async function createAbsoluteFeature(feature, vectorProperties, scene) {
|
|
|
239
289
|
setZCoordinate(geometry, groundLevel);
|
|
240
290
|
}
|
|
241
291
|
else {
|
|
242
|
-
await
|
|
292
|
+
await drapeGeometryOnSurface(geometry, scene, altitudeMode !== HeightReference.CLAMP_TO_TERRAIN
|
|
243
293
|
? HeightReference.CLAMP_TO_GROUND
|
|
244
294
|
: HeightReference.CLAMP_TO_TERRAIN);
|
|
245
295
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"geometryHelpers.js","sourceRoot":"","sources":["../../../src/util/geometryHelpers.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EACf,yBAAyB,GAE1B,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,MAAM,IAAI,YAAY,EAAE,MAAM,cAAc,CAAC;AAEtD,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAEhD,OAAO,EACL,MAAM,EAEN,kBAAkB,EAClB,UAAU,EACV,eAAe,EACf,UAAU,EACV,YAAY,EACZ,KAAK,EACL,OAAO,EACP,cAAc,GACf,MAAM,YAAY,CAAC;AAEpB,OAAO,UAAU,MAAM,iBAAiB,CAAC;AACzC,OAAO,EAAE,sBAAsB,EAAE,MAAM,WAAW,CAAC;AAEnD,OAAO,EACL,aAAa,EACb,wBAAwB,EACxB,yBAAyB,GAG1B,MAAM,wCAAwC,CAAC;AAChD,OAAO,EAAE,+BAA+B,EAAE,MAAM,+BAA+B,CAAC;AAEhF,MAAM,UAAU,oCAAoC,CAClD,QAAwB;IAExB,MAAM,MAAM,GAAG,QAAQ,CAAC,SAAS,EAAE,CAAC;IACpC,MAAM,eAAe,GAAG,QAAQ,CAAC,kBAAkB,EAAE,CAAC;IACtD,IAAI,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC/B,MAAM,mBAAmB,GAAG,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC;QACxE,MAAM,WAAW,GAAiB,IAAI,KAAK,CACzC,mBAAmB,CACJ,CAAC;QAClB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,mBAAmB,EAAE,CAAC,EAAE,EAAE,CAAC;YAC7C,MAAM,SAAS,GAAG,CAAC,GAAG,MAAM,CAAC;YAC7B,WAAW,CAAC,CAAC,CAAC,GAAG,IAAI,KAAK,CAAC,MAAM,CAAe,CAAC;YACjD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;gBAChC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,eAAe,CAAC,SAAS,GAAG,CAAC,CAAC,CAAC;YACrD,CAAC;QACH,CAAC;QACD,OAAO,WAAW,CAAC;IACrB,CAAC;IACD,OAAO,EAAE,CAAC;AACZ,CAAC;AAED,MAAM,UAAU,2BAA2B,CACzC,QAAkB,EAClB,gBAAwB;IAExB,IAAI,CAAC,gBAAgB,IAAI,QAAQ,YAAY,cAAc,EAAE,CAAC;QAC5D,OAAO,oCAAoC,CAAC,QAAQ,CAAC,CAAC;IACxD,CAAC;IACD,MAAM,WAAW,GAAsB,gBAAgB,CAAC;IACxD,IAAI,kBAAkB,GAAG,IAAI,CAAC;IAC9B,IAAI,QAAQ,YAAY,KAAK,EAAE,CAAC;QAC9B,kBAAkB,GAAG,CAAC,WAAW,CAAC,CAAC;IACrC,CAAC;SAAM,IAAI,QAAQ,YAAY,UAAU,EAAE,CAAC;QAC1C,kBAAkB,GAAG,WAAW,CAAC;IACnC,CAAC;SAAM,IAAI,QAAQ,YAAY,OAAO,EAAE,CAAC;QACvC,kBAAkB,GAAG,WAAY,CAAC,MAAM,CACtC,CAAC,OAAqB,EAAE,IAAkB,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CACpD,CAAC;IACpB,CAAC;SAAM,IAAI,QAAQ,YAAY,UAAU,EAAE,CAAC;QAC1C,kBAAkB,GAAG,WAAW,CAAC;IACnC,CAAC;SAAM,IAAI,QAAQ,YAAY,eAAe,EAAE,CAAC;QAC/C,kBAAkB,GAAG,WAAY,CAAC,MAAM,CACtC,CAAC,OAAqB,EAAE,IAAkB,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CACpD,CAAC;IACpB,CAAC;SAAM,IAAI,QAAQ,YAAY,YAAY,EAAE,CAAC;QAC5C,kBAAkB,GAChB,WAAY,CAAC,MAAM,CAAC,CAAC,OAAuB,EAAE,IAAoB,EAAE,EAAE,CACpE,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAEvB,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;IACpD,CAAC;SAAM,IAAI,QAAQ,YAAY,MAAM,EAAE,CAAC;QACtC,kBAAkB,GAAG,WAAW,CAAC;IACnC,CAAC;SAAM,IAAI,QAAQ,YAAY,kBAAkB,EAAE,CAAC;QAClD,kBAAkB,GAAG,QAAQ;aAC1B,aAAa,EAAE;aACf,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,2BAA2B,CAAC,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC,CAAU,CAAC,CAAC;aACxE,MAAM,CAAC,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;IACrD,CAAC;IACD,OAAO,kBAAkC,CAAC;AAC5C,CAAC;AAED,MAAM,UAAU,sBAAsB,CACpC,MAAkB,EAClB,MAAc;IAEd,MAAM,WAAW,GAAG,YAAY,CAC9B,UAAU,CAAC,eAAe,CAAC,MAAM,CAAC,EAClC,MAAM,EACN,IAAI,CAAC,EAAE,GAAG,CAAC,CACZ,CAAC;IACF,MAAM,EAAE,GAAG,UAAU,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC;IACnD,MAAM,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC;IAC7B,MAAM,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC;IAC7B,MAAM,GAAG,GAAG,EAAE,GAAG,EAAE,CAAC;IACpB,MAAM,GAAG,GAAG,EAAE,GAAG,EAAE,CAAC;IACpB,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC,CAAC;IAC7C,OAAO,IAAI,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;AAC7C,CAAC;AAED,MAAM,UAAU,wBAAwB,CAAC,QAAkB;IACzD,IAAI,QAAQ,YAAY,MAAM,EAAE,CAAC;QAC/B,OAAO,UAAU,CAAC,QAAQ,CAAC,CAAC;IAC9B,CAAC;SAAM,IAAI,QAAQ,YAAY,OAAO,EAAE,CAAC;QACvC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;IACjC,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,UAAwB;IAC1D,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,UAAU,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IACzD,IAAI,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,KAAK,IAAI,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,KAAK,CAAC,EAAE,CAAC;QAChE,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC;IACzC,CAAC;AACH,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,UAAwB;IACzD,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,UAAU,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IACzD,IAAI,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,KAAK,IAAI,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,KAAK,EAAE,CAAC;QAC7D,UAAU,CAAC,GAAG,EAAE,CAAC;IACnB,CAAC;AACH,CAAC;AAED,MAAM,UAAU,8BAA8B,CAAC,QAAkB;IAC/D,IAAI,QAAQ,YAAY,OAAO,EAAE,CAAC;QAChC,MAAM,WAAW,GAAG,QAAQ,CAAC,cAAc,EAAE,CAAC;QAC9C,WAAW,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YAC3B,kBAAkB,CAAC,IAAI,CAAC,CAAC;QAC3B,CAAC,CAAC,CAAC;QACH,QAAQ,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;IACvC,CAAC;SAAM,IAAI,QAAQ,YAAY,YAAY,EAAE,CAAC;QAC5C,MAAM,WAAW,GAAG,QAAQ,CAAC,cAAc,EAAE,CAAC;QAC9C,WAAW,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YAC3B,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;gBACpB,kBAAkB,CAAC,IAAI,CAAC,CAAC;YAC3B,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QACH,QAAQ,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;IACvC,CAAC;AACH,CAAC;AAED;;;GAGG;AACH,SAAS,QAAQ,CAAC,IAAkB;IAClC,IAAI,IAAI,GAAG,CAAC,CAAC;IACb,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC;IAE9B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,SAAS,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;QACxC,MAAM,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;QACnB,MAAM,EAAE,GAAG,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QACvB,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC;IACxC,CAAC;IAED,IAAI,IAAI,CAAC,CAAC;IACV,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,gBAAgB,CAAC,IAAkB;IACjD,MAAM,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC5B,IAAI,IAAI,GAAG,CAAC,EAAE,CAAC;QACb,IAAI,CAAC,OAAO,EAAE,CAAC;IACjB,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,UAAU,CAAC,MAAsB;IAC/C,OAAO,MAAM,KAAK,IAAI,IAAI,MAAM,KAAK,KAAK,CAAC;AAC7C,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,gBAAgB,CAAC,QAAkB;IACjD,MAAM,MAAM,GAAG,QAAQ,CAAC,SAAS,EAAE,CAAC;IACpC,IAAI,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;QACvB,OAAO;IACT,CAAC;IACD,MAAM,WAAW,GAAG,QAAQ,CAAC,cAAc,EAAW,CAAC;IACvD,MAAM,eAAe,GAAG,2BAA2B,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;IAC3E,eAAe,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE;QACrC,IAAI,MAAM,KAAK,MAAM,EAAE,CAAC;YACtB,UAAU,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,GAAG,EAAG,CAAC;QACpC,CAAC;aAAM,CAAC;YACN,UAAU,CAAC,GAAG,EAAE,CAAC;QACnB,CAAC;IACH,CAAC,CAAC,CAAC;IACH,QAAQ,CAAC,cAAc,CAAC,WAAW,EAAE,MAAM,KAAK,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;AACzE,CAAC;AAED;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,qBAAqB,CACzC,QAAkB,EAClB,KAAY,EACZ,eAEoC;IAEpC,MAAM,MAAM,GAAG,QAAQ,CAAC,SAAS,EAAE,CAAC;IACpC,MAAM,WAAW,GAAG,QAAQ,CAAC,cAAc,EAAW,CAAC;IACvD,MAAM,eAAe,GAAG,2BAA2B,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;IAC3E,MAAM,aAAa,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC,CAAC;IAC5E,IAAI,eAAe,KAAK,eAAe,CAAC,eAAe,EAAE,CAAC;QACxD,MAAM,KAAK,CAAC,wBAAwB,CAAC,aAAa,CAAC,CAAC;IACtD,CAAC;SAAM,CAAC;QACN,MAAM,yBAAyB,CAAC,KAAK,CAAC,eAAe,EAAE,aAAa,CAAC,CAAC;IACxE,CAAC;IAED,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE;QACjC,IAAI,MAAM,KAAK,KAAK,EAAE,CAAC;YACrB,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;YACtD,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC;QACvC,CAAC;aAAM,CAAC;YACN,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC;QACvC,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,cAAc,CACrB,WAAW,EACX,MAAM,KAAK,KAAK,IAAI,MAAM,KAAK,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CACvD,CAAC;AACJ,CAAC;AAED;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,QAAkB,EAClB,KAAY,EACZ,eAEoC;IAEpC,IAAI,UAAU,CAAC,QAAQ,CAAC,SAAS,EAAE,CAAC,EAAE,CAAC;QACrC,MAAM,qBAAqB,CAAC,QAAQ,EAAE,KAAK,EAAE,eAAe,CAAC,CAAC;IAChE,CAAC;AACH,CAAC;AAED,SAAS,cAAc,CAAC,QAAkB,EAAE,CAAS;IACnD,MAAM,MAAM,GAAG,QAAQ,CAAC,SAAS,EAAE,CAAC;IACpC,MAAM,WAAW,GAAG,QAAQ,CAAC,cAAc,EAAW,CAAC;IACvD,MAAM,eAAe,GAAG,2BAA2B,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;IAE3E,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QAC5B,IAAI,MAAM,KAAK,KAAK,EAAE,CAAC;YACrB,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;YACZ,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;QACX,CAAC;aAAM,CAAC;YACN,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;QACX,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,cAAc,CACrB,WAAW,EACX,MAAM,KAAK,KAAK,IAAI,MAAM,KAAK,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CACvD,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,qBAAqB,CACzC,OAAgB,EAChB,gBAAkC,EAClC,KAAY;IAEZ,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAC9B,MAAM,QAAQ,GAAG,KAAK,CAAC,WAAW,EAAE,CAAC;IACrC,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,YAAY,GAAG,gBAAgB,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;IAC7D,IAAI,WAAW,GAAG,gBAAgB,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;IAEzD,IAAI,YAAY,KAAK,eAAe,CAAC,IAAI,EAAE,CAAC;QAC1C,IAAI,WAAW,IAAI,IAAI,EAAE,CAAC;YACxB,cAAc,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;QACxC,CAAC;aAAM,IAAI,UAAU,CAAC,QAAQ,CAAC,SAAS,EAAE,CAAC,EAAE,CAAC;YAC5C,MAAM,gBAAgB,CAAC,QAAQ,EAAE,KAAK,EAAE,eAAe,CAAC,eAAe,CAAC,CAAC;QAC3E,CAAC;IACH,CAAC;SAAM,IAAI,wBAAwB,CAAC,YAAY,CAAC,EAAE,CAAC;QAClD,IAAI,WAAW,IAAI,IAAI,EAAE,CAAC;YACxB,cAAc,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;QACxC,CAAC;aAAM,CAAC;YACN,MAAM,qBAAqB,CACzB,QAAQ,EACR,KAAK,EACL,YAAY,KAAK,eAAe,CAAC,gBAAgB;gBAC/C,CAAC,CAAC,eAAe,CAAC,eAAe;gBACjC,CAAC,CAAC,eAAe,CAAC,gBAAgB,CACrC,CAAC;QACJ,CAAC;IACH,CAAC;SAAM,IAAI,yBAAyB,CAAC,YAAY,CAAC,EAAE,CAAC;QACnD,MAAM,gBAAgB,GAAG,+BAA+B,CAAC,QAAQ,CAAC,CAAC;QACnE,MAAM,OAAO,CAAC,GAAG,CACf,gBAAgB,CAAC,GAAG,CAAC,KAAK,EAAE,cAAc,EAAE,EAAE;YAC5C,MAAM,UAAU,GAAG,aAAa,CAC9B,KAAK,EACL,cAAc,EACd,gBAAgB,CAC4B,CAAC;YAE/C,CAAC,EAAE,WAAW,EAAE,GAAG,UAAU,CAAC,CAAC;YAC/B,IAAI,UAAU,CAAC,WAAW,EAAE,CAAC;gBAC3B,MAAM,aAAa,GAAG;oBACpB,sBAAsB,CAAC,UAAU,CAAC,WAAW,CAAC;iBAC/C,CAAC;gBACF,IACE,UAAU,CAAC,eAAe,KAAK,eAAe,CAAC,mBAAmB,EAClE,CAAC;oBACD,MAAM,yBAAyB,CAC7B,KAAK,CAAC,eAAe,EACrB,aAAa,CACd,CAAC;gBACJ,CAAC;qBAAM,CAAC;oBACN,MAAM,KAAK,CAAC,wBAAwB,CAAC,aAAa,CAAC,CAAC;gBACtD,CAAC;gBACD,WAAW,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;YACxC,CAAC;YAED,MAAM,WAAW,GAAG,cAAc,CAAC,cAAc,EAAW,CAAC;YAC7D,MAAM,eAAe,GAAG,2BAA2B,CACjD,cAAc,EACd,WAAW,CACZ,CAAC;YACF,MAAM,EAAE,iBAAiB,EAAE,GAAG,UAAU,CAAC;YACzC,MAAM,aAAa,GACjB,iBAAiB,IAAI,IAAI;gBACvB,CAAC,CAAC,CAAC,CAAa,EAAQ,EAAE;oBACtB,CAAC,CAAC,CAAC,CAAC,IAAI,WAAqB,CAAC;gBAChC,CAAC;gBACH,CAAC,CAAC,CAAC,CAAa,EAAQ,EAAE;oBACtB,CAAC,CAAC,CAAC,CAAC,GAAI,WAAsB,GAAG,iBAAiB,CAAC;gBACrD,CAAC,CAAC;YACR,eAAe,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;YACvC,cAAc,CAAC,cAAc,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;QACpD,CAAC,CAAC,CACH,CAAC;QAEF,IAAI,QAAQ,YAAY,UAAU,EAAE,CAAC;YACnC,QAAQ,CAAC,cAAc,CACrB,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,cAAc,EAAgB,CAAC,CAC9D,CAAC;QACJ,CAAC;aAAM,IAAI,QAAQ,YAAY,YAAY,EAAE,CAAC;YAC5C,QAAQ,CAAC,cAAc,CACrB,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,cAAc,EAAoB,CAAC,CAClE,CAAC;QACJ,CAAC;aAAM,IAAI,QAAQ,YAAY,eAAe,EAAE,CAAC;YAC/C,QAAQ,CAAC,cAAc,CACrB,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,cAAc,EAAkB,CAAC,CAChE,CAAC;QACJ,CAAC;aAAM,IAAI,QAAQ,YAAY,kBAAkB,EAAE,CAAC;YAClD,QAAQ,CAAC,aAAa,CAAC,gBAAgB,CAAC,CAAC;QAC3C,CAAC;IACH,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,mBAAmB,EAAE,UAAU,CAAC,CAAC;IAC3C,KAAK,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;IAChC,KAAK,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAC;IAEtC,OAAO,KAAK,CAAC;AACf,CAAC"}
|
|
1
|
+
{"version":3,"file":"geometryHelpers.js","sourceRoot":"","sources":["../../../src/util/geometryHelpers.ts"],"names":[],"mappings":"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"}
|
package/dist/src/util/math.d.ts
CHANGED
|
@@ -47,3 +47,15 @@ export declare function getMidPoint(p1: Coordinate, p2: Coordinate): Coordinate;
|
|
|
47
47
|
*/
|
|
48
48
|
export declare function getCartesianPitch(p1: Coordinate, p2: Coordinate): number;
|
|
49
49
|
export declare function cartesian2Intersection(lineA: [Coordinate, Coordinate], lineB: [Coordinate, Coordinate]): Coordinate | undefined;
|
|
50
|
+
/**
|
|
51
|
+
* calculates the haversine distance between two mercator coordinates.
|
|
52
|
+
* @param p1 - in mercator
|
|
53
|
+
* @param p2 - in mercator
|
|
54
|
+
*/
|
|
55
|
+
export declare function spherical2Distance(p1: Coordinate, p2: Coordinate): number;
|
|
56
|
+
/**
|
|
57
|
+
* calculates the 3D distance in ECEF between two mercator coordinates.
|
|
58
|
+
* @param p1 - in mercator
|
|
59
|
+
* @param p2 - in mercator
|
|
60
|
+
*/
|
|
61
|
+
export declare function ecef3DDistance(p1: Coordinate, p2: Coordinate): number;
|