earthsdk3-ol 3.11.2 → 3.11.3

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.
@@ -1,5 +1,5 @@
1
1
  import { ESOlViewer } from '../../../../ESOlViewer';
2
2
  import { DoublePointsModifyEditing } from './DoublePointsModifyEditing';
3
3
  export declare class HeightModifyEditing extends DoublePointsModifyEditing {
4
- constructor(czmViewer: ESOlViewer);
4
+ constructor(olViewer: ESOlViewer);
5
5
  }
@@ -1,7 +1,8 @@
1
- import { ReactivePropsToNativePropsAndChanged, ReactiveVariable, ESJVector3D, ESJVector4D } from 'earthsdk3';
1
+ import { Event, ReactivePropsToNativePropsAndChanged, ReactiveVariable, ESJVector3D, ESJVector4D } from 'earthsdk3';
2
2
  import { PointEditing } from '..';
3
3
  import { ESOlViewer } from '../../../../ESOlViewer';
4
4
  export declare class TranslationEditing extends PointEditing {
5
+ readonly dragStarted: Event<[]>;
5
6
  private _opInfo;
6
7
  static defaults: {
7
8
  heading: number;
@@ -24,7 +24,7 @@ export declare class GeoAreaMeasurement extends Destroyable {
24
24
  get id(): SceneObjectKey;
25
25
  set id(value: SceneObjectKey);
26
26
  get idChanged(): Listener<[string, string]>;
27
- constructor(czmViewer: ESOlViewer, id?: SceneObjectKey);
27
+ constructor(olViewer: ESOlViewer, id?: SceneObjectKey);
28
28
  }
29
29
  export declare namespace GeoAreaMeasurement {
30
30
  const createDefaultProps: () => {
@@ -18,7 +18,6 @@ export interface OlFlyToOptions {
18
18
  export declare function olFlyTo(olViewer: ESOlViewer, options: OlFlyToOptions): Promise<boolean> | undefined;
19
19
  /**
20
20
  *
21
- * @param czmCamera cesium的Camera
22
21
  * @param position 目标位置, 形式如:[经度, 纬度, 高度] 其中经纬度的单位是弧度,高度的单位是米。
23
22
  * @param viewDistance 距离目标多远距离时停下,默认为0,即直接飞到目标点处,单位是米。
24
23
  * @param rotation 相机飞入后的姿态控制,从什么角度观察目标,形式如: [偏航角, 俯仰角, 翻转角], 单位是弧度。
@@ -1,29 +1,14 @@
1
1
  import { default as Map } from 'ol/Map';
2
2
  import { Destroyable } from 'earthsdk3';
3
3
  /**
4
- * 将 Cesium 相机高度转换为 OpenLayers 缩放等级:
5
- * 逻辑:
6
- * 1、从Cesium中距离目标的高度+相机视野角度(相似三角形计算)计算=>实际地表覆盖宽度
7
- * 相机(视点)
8
- * *
9
- * /|\
10
- * / | \
11
- * / | \ flyToParam.distance(斜边)
12
- * / | \
13
- * *----|----*
14
- * 地图中心点 地面覆盖宽度
15
- * 2、从实际地表覆盖宽度计算分辨率=>地理覆盖宽度/open layers地图容器的像素宽度=>像素分辨率
16
- * 3、从像素分辨率计算---》对应openlayes的对应等级zoom,
17
- * 4、分辨率为二三维的桥梁!!
18
- * @param {number} cesiumCameraHeight Cesium 相机距地面的高度 (米)
19
- * @param {ESJVector2D} targetLonLat 目标点的经纬度 [longitude, latitude]
20
- * @param {number} mapPixelWidth OpenLayers 地图容器的像素宽度
21
- * @param {number} [horizontalFovDegrees=60] Cesium 相机的水平视野角度 (度), 默认为 60 度
22
- * @returns {number} 对应的 OpenLayers 缩放等级
4
+ * 根据 Cesium 相机高度估算 OpenLayers 缩放等级。
5
+ * @param height - 相机高度(米)。
6
+ * @returns 缩放等级。
23
7
  */
24
8
  export declare function getOlZoomFromCesiumHeight(height: number): number;
25
9
  export declare function olZoomToCesiumHeight(zoom: number): number;
26
10
  export declare function cesiumHeightToOlZoom(height: number): number;
11
+ export { getOlZoomFromCesiumHeight as getOlZoomFromCameraHeight, olZoomToCesiumHeight as olZoomToCameraHeight, cesiumHeightToOlZoom as cameraHeightToOlZoom, };
27
12
  export declare class FPSMonitor extends Destroyable {
28
13
  private lastTime;
29
14
  private frameCount;
@@ -1,4 +1,34 @@
1
- import * as Cesium from 'cesium';
2
- export declare function getQuaternionWithYForwardZUp(rotation: [number, number, number], result?: Cesium.Quaternion): Cesium.Quaternion;
3
- export declare function getQuaternionWithXForwardZUp(rotation: [number, number, number], result?: Cesium.Quaternion): Cesium.Quaternion;
4
- export declare function getQuaternion(rotation: [number, number, number], forwardAxis: Cesium.Cartesian3, upAxis: Cesium.Cartesian3, rightAxis: Cesium.Cartesian3, result?: Cesium.Quaternion): Cesium.Quaternion;
1
+ type Axis = {
2
+ x: number;
3
+ y: number;
4
+ z: number;
5
+ };
6
+ type Quaternion = Axis & {
7
+ w: number;
8
+ };
9
+ type Rotation = [number, number, number];
10
+ export declare function getQuaternionWithYForwardZUp(rotation: Rotation, result?: Quaternion): Axis & {
11
+ w: number;
12
+ } & {
13
+ x: number;
14
+ y: number;
15
+ z: number;
16
+ w: number;
17
+ };
18
+ export declare function getQuaternionWithXForwardZUp(rotation: Rotation, result?: Quaternion): Axis & {
19
+ w: number;
20
+ } & {
21
+ x: number;
22
+ y: number;
23
+ z: number;
24
+ w: number;
25
+ };
26
+ export declare function getQuaternion([heading, pitch, roll]: Rotation, forwardAxis: Axis, upAxis: Axis, rightAxis: Axis, result?: Quaternion): Axis & {
27
+ w: number;
28
+ } & {
29
+ x: number;
30
+ y: number;
31
+ z: number;
32
+ w: number;
33
+ };
34
+ export {};
@@ -1,32 +1,79 @@
1
- import * as Cesium from 'cesium';
2
- export declare function positionToCartesian(position: [number, number, number], result?: Cesium.Cartesian3): Cesium.Cartesian3;
3
- export declare function positionFromCartesian(cartesian: Cesium.Cartesian3, result?: [number, number, number]): [number, number, number] | undefined;
4
- export declare function toCartesian2(value: [number, number], result?: Cesium.Cartesian2): Cesium.Cartesian2;
5
- export declare function fromCartesian2(cartesian: Cesium.Cartesian2, result?: [number, number]): [number, number];
6
- export declare function toCartesian3(value: [number, number, number], result?: Cesium.Cartesian3): Cesium.Cartesian3;
7
- export declare function fromCartesian3(cartesian: Cesium.Cartesian3, result?: [number, number, number]): [number, number, number];
8
- export declare function toCartesian4(value: [number, number, number, number], result?: Cesium.Cartesian4): Cesium.Cartesian4;
9
- export declare function fromCartesian4(cartesian: Cesium.Cartesian4, result?: [number, number, number, number]): [number, number, number, number];
10
- export declare function toCartesian(value: [number, number], result?: Cesium.Cartesian2): Cesium.Cartesian2;
11
- export declare function toCartesian(value: [number, number, number], result?: Cesium.Cartesian3): Cesium.Cartesian3;
12
- export declare function toCartesian(value: [number, number, number, number], result?: Cesium.Cartesian4): Cesium.Cartesian4;
13
- export declare function fromCartesian(cartesian: Cesium.Cartesian2, result?: [number, number]): [number, number];
14
- export declare function fromCartesian(cartesian: Cesium.Cartesian3, result?: [number, number, number]): [number, number, number];
15
- export declare function fromCartesian(cartesian: Cesium.Cartesian4, result?: [number, number, number, number]): [number, number, number, number];
16
- export declare function toCartographic(position: [number, number, number], result?: Cesium.Cartographic): Cesium.Cartographic;
17
- export declare function fromCartographic(carto: Cesium.Cartographic, result?: [number, number, number]): [number, number, number];
18
- export declare function toColor(color: [number, number, number, number], result?: Cesium.Color): Cesium.Color;
19
- export declare function fromColor(czmColor: Cesium.Color, result?: [number, number, number, number]): [number, number, number, number];
20
- export declare function toNearFarScalar(NearFarScalar: [number, number, number, number], result?: Cesium.NearFarScalar): Cesium.NearFarScalar;
21
- export declare function fromNearFarScalar(NearFarScalar: Cesium.NearFarScalar, result?: [number, number, number, number]): [number, number, number, number];
22
- export declare function toHeadingPitchRoll(hpr: [number, number, number], result?: Cesium.HeadingPitchRoll): Cesium.HeadingPitchRoll;
23
- export declare function fromHeadingPitchRoll(czmHpr: Cesium.HeadingPitchRoll, result?: [number, number, number]): [number, number, number];
24
- export declare function toDistanceDisplayCondition(distanceDisplayCondition: [number, number], result?: Cesium.DistanceDisplayCondition): Cesium.DistanceDisplayCondition;
25
- export declare function fromDistanceDisplayCondition(czmDistanceDisplayCondition: Cesium.DistanceDisplayCondition, result?: [number, number]): [number, number];
26
- export declare function toQuaternion(quat: [number, number, number, number], result?: Cesium.Quaternion): Cesium.Quaternion;
27
- export declare function fromQuaternion(czmQuat: Cesium.Quaternion, result?: [number, number, number, number]): [number, number, number, number];
28
- export declare function positionAndRotationToQuaternion(position: [number, number, number], rotation: [number, number, number], result: Cesium.Quaternion): Cesium.Quaternion;
29
- export declare function toRectangle(rectangle: [number, number, number, number], result?: Cesium.Rectangle): Cesium.Rectangle;
30
- export declare function fromRectangle(czmRectangle: Cesium.Rectangle, result?: [number, number, number, number]): [number, number, number, number];
31
- export declare function toEllipsoid(ellipsoid: [x: number, y: number, z: number], result?: Cesium.Ellipsoid): Cesium.Ellipsoid;
32
- export declare function fromEllipsoid(czmEllipsoid: Cesium.Ellipsoid, result?: [x: number, y: number, z: number]): [x: number, y: number, z: number];
1
+ import { Cartesian3 } from './olGeodesy';
2
+ export { positionToCartesian, positionFromCartesian } from './olGeodesy';
3
+ type Cartesian2 = {
4
+ x: number;
5
+ y: number;
6
+ };
7
+ type Cartesian4 = {
8
+ x: number;
9
+ y: number;
10
+ z: number;
11
+ w: number;
12
+ };
13
+ type Cartographic = {
14
+ longitude: number;
15
+ latitude: number;
16
+ height: number;
17
+ };
18
+ type Color = {
19
+ red: number;
20
+ green: number;
21
+ blue: number;
22
+ alpha: number;
23
+ };
24
+ type NearFarScalar = {
25
+ near: number;
26
+ nearValue: number;
27
+ far: number;
28
+ farValue: number;
29
+ };
30
+ type HeadingPitchRoll = {
31
+ heading: number;
32
+ pitch: number;
33
+ roll: number;
34
+ };
35
+ type DistanceDisplayCondition = {
36
+ near: number;
37
+ far: number;
38
+ };
39
+ type Rectangle = {
40
+ west: number;
41
+ south: number;
42
+ east: number;
43
+ north: number;
44
+ };
45
+ type Quaternion = Cartesian4;
46
+ type Ellipsoid = {
47
+ radii: Cartesian3;
48
+ };
49
+ export declare function toCartesian2(value: [number, number], result?: Cartesian2): Cartesian2;
50
+ export declare function fromCartesian2(cartesian: Cartesian2, result?: [number, number]): [number, number];
51
+ export declare function toCartesian3(value: [number, number, number], result?: Cartesian3): Cartesian3;
52
+ export declare function fromCartesian3(cartesian: Cartesian3, result?: [number, number, number]): [number, number, number];
53
+ export declare function toCartesian4(value: [number, number, number, number], result?: Cartesian4): Cartesian4;
54
+ export declare function fromCartesian4(cartesian: Cartesian4, result?: [number, number, number, number]): [number, number, number, number];
55
+ export declare function toCartesian(value: [number, number], result?: Cartesian2): Cartesian2;
56
+ export declare function toCartesian(value: [number, number, number], result?: Cartesian3): Cartesian3;
57
+ export declare function toCartesian(value: [number, number, number, number], result?: Cartesian4): Cartesian4;
58
+ export declare function fromCartesian(cartesian: Cartesian4, result?: [number, number, number, number]): [number, number, number, number];
59
+ export declare function fromCartesian(cartesian: Cartesian3, result?: [number, number, number]): [number, number, number];
60
+ export declare function fromCartesian(cartesian: Cartesian2, result?: [number, number]): [number, number];
61
+ export declare function toCartographic(position: [number, number, number], result?: Cartographic): Cartographic;
62
+ export declare function fromCartographic(carto: Cartographic, result?: [number, number, number]): [number, number, number];
63
+ export declare function toColor(color: [number, number, number, number], result?: Color): Color;
64
+ export declare function fromColor(color: Color, result?: [number, number, number, number]): [number, number, number, number];
65
+ export declare function toNearFarScalar(NearFarScalar: [number, number, number, number], result?: NearFarScalar): NearFarScalar;
66
+ export declare function fromNearFarScalar(NearFarScalar: NearFarScalar, result?: [number, number, number, number]): [number, number, number, number];
67
+ export declare function toHeadingPitchRoll(hpr: [number, number, number], result?: HeadingPitchRoll): HeadingPitchRoll;
68
+ export declare function fromHeadingPitchRoll(hpr: HeadingPitchRoll, result?: [number, number, number]): [number, number, number];
69
+ export declare function toDistanceDisplayCondition(distanceDisplayCondition: [number, number], result?: DistanceDisplayCondition): DistanceDisplayCondition;
70
+ export declare function fromDistanceDisplayCondition(condition: DistanceDisplayCondition, result?: [number, number]): [number, number];
71
+ export declare function toQuaternion(quat: [number, number, number, number], result?: Quaternion): Cartesian4;
72
+ export declare function fromQuaternion(quaternion: Quaternion, result?: [number, number, number, number]): [number, number, number, number];
73
+ export declare function positionAndRotationToQuaternion(position: [number, number, number], rotation: [number, number, number], result?: Quaternion): Cartesian3 & {
74
+ w: number;
75
+ };
76
+ export declare function toRectangle(rectangle: [number, number, number, number], result?: Rectangle): Rectangle;
77
+ export declare function fromRectangle(rectangle: Rectangle, result?: [number, number, number, number]): [number, number, number, number];
78
+ export declare function toEllipsoid(ellipsoid: [x: number, y: number, z: number], result?: Ellipsoid): Ellipsoid;
79
+ export declare function fromEllipsoid(ellipsoid: Ellipsoid, result?: [x: number, y: number, z: number]): [x: number, y: number, z: number];
@@ -0,0 +1,17 @@
1
+ export type Cartesian3 = {
2
+ x: number;
3
+ y: number;
4
+ z: number;
5
+ };
6
+ type Position = [number, number, number];
7
+ type Quaternion = Cartesian3 & {
8
+ w: number;
9
+ };
10
+ export declare function positionToCartesian(position: Position, result?: Cartesian3): Cartesian3;
11
+ export declare function positionFromCartesian({ x, y, z }: Cartesian3, result?: Position): import('earthsdk3').ESJVector3D | undefined;
12
+ export declare function worldQuaternion(origin: Cartesian3, hpr: {
13
+ heading: number;
14
+ pitch: number;
15
+ roll: number;
16
+ }, result?: Quaternion): Quaternion;
17
+ export {};
@@ -1,14 +1,15 @@
1
1
  import { NativeNumber16Type } from './numberTypes';
2
+ type Position = [number, number, number];
2
3
  export type RotationModeType = 'YForwardZUp' | 'XForwardZUp';
3
4
  export declare function getModelMatrixFromPosition(options: {
4
- position?: [number, number, number];
5
- rotation?: [number, number, number];
5
+ position?: Position;
6
+ rotation?: Position;
6
7
  initialRotationMode?: RotationModeType;
7
- scale?: [number, number, number];
8
+ scale?: Position;
8
9
  }, result?: NativeNumber16Type): NativeNumber16Type;
9
- export declare function getInverseModelMatrix(modelMatrix: NativeNumber16Type, result?: NativeNumber16Type): NativeNumber16Type;
10
- export declare function positionToLocalPosition(inverseModelMatrix: NativeNumber16Type, position: [number, number, number], result?: [number, number, number]): [number, number, number];
11
- export declare function localPositionToPosition(modelMatrix: NativeNumber16Type, localPosition: [number, number, number], result?: [number, number, number]): [number, number, number];
10
+ export declare function getInverseModelMatrix(matrix: NativeNumber16Type, result?: NativeNumber16Type): NativeNumber16Type;
11
+ export declare function positionToLocalPosition(inverseModelMatrix: NativeNumber16Type, position: Position, result?: Position): Position;
12
+ export declare function localPositionToPosition(modelMatrix: NativeNumber16Type, localPosition: Position, result?: Position): import('earthsdk3').ESJVector3D;
12
13
  export declare function positionsToLocalPositions(options: {
13
14
  originPosition?: [number, number, number];
14
15
  originRotation?: [number, number, number];
@@ -21,3 +22,4 @@ export declare function localPositionsToPositions(options: {
21
22
  initialRotationMode?: RotationModeType;
22
23
  originScale?: [number, number, number];
23
24
  }, localPositons: [number, number, number][]): [positons: [number, number, number][], modelMatrix: NativeNumber16Type];
25
+ export {};
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "earthsdk3-ol",
3
- "version": "3.11.2",
3
+ "version": "3.11.3",
4
4
  "description": "地球可视化实验室 (EarthSDK&CesiumLab) https://www.bjxbsj.cn",
5
5
  "private": false,
6
6
  "type": "module",