cesium-alpha-earth 1.0.87 → 1.0.89
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/index.js +35 -13
- package/dist/types/core/CesiumAlphaGeoJsonLayer/index.js +11 -4
- package/dist/types/core/CesiumAlphaGeoJsonLayer/index.js.map +1 -1
- package/dist/types/core/CesiumAlphaGeoJsonLayer/method/createGraphic.js +16 -11
- package/dist/types/core/CesiumAlphaGeoJsonLayer/method/createGraphic.js.map +1 -1
- package/dist/types/core/CesiumAlphaGeoJsonLayer/type.d.ts +1 -1
- package/dist/types/util/deepMearge/index.d.ts +1 -0
- package/dist/types/util/deepMearge/index.js +16 -0
- package/dist/types/util/deepMearge/index.js.map +1 -0
- package/package.json +1 -1
package/dist/index.js
CHANGED
|
@@ -269021,13 +269021,17 @@ function unkinkPolygon(geojson) {
|
|
|
269021
269021
|
return featureCollection(features);
|
|
269022
269022
|
}
|
|
269023
269023
|
function createPoint(geoJsonLayer, geoJson, feature2, options) {
|
|
269024
|
-
var _a3, _b, _c, _d, _e, _f, _g, _h, _i;
|
|
269024
|
+
var _a3, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o;
|
|
269025
269025
|
let noid = nanoid$1();
|
|
269026
269026
|
let position = crsFunction(feature2.geometry.coordinates);
|
|
269027
269027
|
let distanceDisplayCondition;
|
|
269028
269028
|
if ((_a3 = options.point) == null ? void 0 : _a3.distanceDisplayCondition) {
|
|
269029
269029
|
distanceDisplayCondition = new DistanceDisplayCondition(options.point.distanceDisplayCondition[0], options.point.distanceDisplayCondition[1]);
|
|
269030
269030
|
}
|
|
269031
|
+
let pixelOffset = new Cartesian2();
|
|
269032
|
+
if ((_c = (_b = options.point) == null ? void 0 : _b.label) == null ? void 0 : _c.pixelOffset) {
|
|
269033
|
+
pixelOffset = new Cartesian2((_e = (_d = options.point) == null ? void 0 : _d.label) == null ? void 0 : _e.pixelOffset[0], (_g = (_f = options.point) == null ? void 0 : _f.label) == null ? void 0 : _g.pixelOffset[1]);
|
|
269034
|
+
}
|
|
269031
269035
|
geoJsonLayer.addPoint({
|
|
269032
269036
|
type: "Point",
|
|
269033
269037
|
position,
|
|
@@ -269037,16 +269041,17 @@ function createPoint(geoJsonLayer, geoJson, feature2, options) {
|
|
|
269037
269041
|
height: Cartographic.fromCartesian(position).height
|
|
269038
269042
|
},
|
|
269039
269043
|
style: {
|
|
269040
|
-
image: ((
|
|
269041
|
-
width: ((
|
|
269042
|
-
height: ((
|
|
269043
|
-
disableDepthTestDistance: ((
|
|
269044
|
+
image: ((_h = options.point) == null ? void 0 : _h.image) || defaultImg,
|
|
269045
|
+
width: ((_i = options.point) == null ? void 0 : _i.width) || 20,
|
|
269046
|
+
height: ((_j = options.point) == null ? void 0 : _j.height) || 20,
|
|
269047
|
+
disableDepthTestDistance: ((_k = options.point) == null ? void 0 : _k.disableDepthTestDistance) || 0,
|
|
269044
269048
|
distanceDisplayCondition,
|
|
269045
|
-
scale: ((
|
|
269046
|
-
sizeInMeters: ((
|
|
269047
|
-
rotation: ((
|
|
269048
|
-
color: Color$3.fromCssColorString(((
|
|
269049
|
-
verticalOrigin: VerticalOrigin$1.
|
|
269049
|
+
scale: ((_l = options.point) == null ? void 0 : _l.scale) || 1,
|
|
269050
|
+
sizeInMeters: ((_m = options.point) == null ? void 0 : _m.sizeInMeters) || false,
|
|
269051
|
+
rotation: ((_n = options.point) == null ? void 0 : _n.rotation) || 0,
|
|
269052
|
+
color: Color$3.fromCssColorString(((_o = options.point) == null ? void 0 : _o.color) || ""),
|
|
269053
|
+
verticalOrigin: VerticalOrigin$1.TOP,
|
|
269054
|
+
pixelOffset
|
|
269050
269055
|
},
|
|
269051
269056
|
layer: geoJsonLayer,
|
|
269052
269057
|
properties: feature2.properties,
|
|
@@ -269354,6 +269359,17 @@ function splitArrayIntoGroups(array, groupSize) {
|
|
|
269354
269359
|
}
|
|
269355
269360
|
return result;
|
|
269356
269361
|
}
|
|
269362
|
+
function deepMerge(target, source) {
|
|
269363
|
+
const result = { ...target };
|
|
269364
|
+
for (const key2 in source) {
|
|
269365
|
+
if (source[key2] instanceof Object && !Array.isArray(source[key2]) && result[key2] instanceof Object) {
|
|
269366
|
+
result[key2] = deepMerge(result[key2], source[key2]);
|
|
269367
|
+
} else {
|
|
269368
|
+
result[key2] = source[key2];
|
|
269369
|
+
}
|
|
269370
|
+
}
|
|
269371
|
+
return result;
|
|
269372
|
+
}
|
|
269357
269373
|
let defaultLabelOption = {
|
|
269358
269374
|
fieldKey: "INDEXNAME",
|
|
269359
269375
|
distanceDisplayCondition: [0, Number.POSITIVE_INFINITY],
|
|
@@ -269413,7 +269429,8 @@ class CesiumAlphaGeoJsonLayer {
|
|
|
269413
269429
|
this._cluster = void 0;
|
|
269414
269430
|
this._viewer = option.viewer;
|
|
269415
269431
|
let defaultOptionDeep = lodashExports.cloneDeep(defaultOption);
|
|
269416
|
-
|
|
269432
|
+
let setOptionDeep = lodashExports.cloneDeep(option);
|
|
269433
|
+
this.option = deepMerge(defaultOptionDeep, setOptionDeep);
|
|
269417
269434
|
this.uid = option.uid || nanoid$1();
|
|
269418
269435
|
this._labelCollection = new LabelCollection({
|
|
269419
269436
|
scene: ((_a3 = option.viewer) == null ? void 0 : _a3.scene) || void 0
|
|
@@ -269551,7 +269568,7 @@ class CesiumAlphaGeoJsonLayer {
|
|
|
269551
269568
|
});
|
|
269552
269569
|
if (this.option.point) {
|
|
269553
269570
|
if (this.option && this.option.point.label && this.option.point.height) {
|
|
269554
|
-
this.option.point.label.pixelOffset = this.option.point.label.pixelOffset ||
|
|
269571
|
+
this.option.point.label.pixelOffset = this.option.point.label.pixelOffset || [0, -this.option.point.height - 5];
|
|
269555
269572
|
this.addLabel(item, this.option.point.label);
|
|
269556
269573
|
this.addFeatureItem(item);
|
|
269557
269574
|
}
|
|
@@ -269591,6 +269608,11 @@ class CesiumAlphaGeoJsonLayer {
|
|
|
269591
269608
|
if (labelOption.distanceDisplayCondition) {
|
|
269592
269609
|
distanceDisplayCondition = new DistanceDisplayCondition(labelOption.distanceDisplayCondition[0], labelOption.distanceDisplayCondition[1]);
|
|
269593
269610
|
}
|
|
269611
|
+
let pixelOffset = new Cartesian2(0, 0);
|
|
269612
|
+
if (labelOption.pixelOffset) {
|
|
269613
|
+
pixelOffset.x = labelOption.pixelOffset[0];
|
|
269614
|
+
pixelOffset.y = labelOption.pixelOffset[1];
|
|
269615
|
+
}
|
|
269594
269616
|
this._labelCollection.add({
|
|
269595
269617
|
position: item.center.cartesian3,
|
|
269596
269618
|
//@ts-ignore
|
|
@@ -269602,7 +269624,7 @@ class CesiumAlphaGeoJsonLayer {
|
|
|
269602
269624
|
fillColor: Color$3.fromCssColorString(color2 || "rgb(255,0,0)"),
|
|
269603
269625
|
verticalOrigin: VerticalOrigin$1.BOTTOM,
|
|
269604
269626
|
horizontalOrigin: HorizontalOrigin$1.CENTER,
|
|
269605
|
-
pixelOffset
|
|
269627
|
+
pixelOffset
|
|
269606
269628
|
});
|
|
269607
269629
|
}
|
|
269608
269630
|
addFeatureItem(item) {
|
|
@@ -8,11 +8,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
8
8
|
});
|
|
9
9
|
};
|
|
10
10
|
import { BillboardCollection, Cartesian2, Color, defined, DeveloperError, DistanceDisplayCondition, HorizontalOrigin, LabelCollection, LabelStyle, PrimitiveCollection, Resource, RuntimeError, VerticalOrigin, } from "cesium";
|
|
11
|
-
import { cloneDeep
|
|
11
|
+
import { cloneDeep } from "lodash";
|
|
12
12
|
import { nanoid } from "nanoid";
|
|
13
13
|
import { geoJsonObjectTypes } from "./method/geojson-util";
|
|
14
14
|
import { createPoiylineInstence, createPolygonInstence, } from "./method/createGraphic";
|
|
15
15
|
import { polygonBatchFun, polygonGroundBatchFun, polylineBatchFun, polylineGroundBatchFun, } from "./method/batchFun";
|
|
16
|
+
import { deepMerge } from "@/util/deepMearge";
|
|
16
17
|
let defaultLabelOption = {
|
|
17
18
|
fieldKey: 'INDEXNAME',
|
|
18
19
|
distanceDisplayCondition: [0, Number.POSITIVE_INFINITY],
|
|
@@ -96,7 +97,8 @@ export default class CesiumAlphaGeoJsonLayer {
|
|
|
96
97
|
this._cluster = undefined;
|
|
97
98
|
this._viewer = option.viewer;
|
|
98
99
|
let defaultOptionDeep = cloneDeep(defaultOption);
|
|
99
|
-
|
|
100
|
+
let setOptionDeep = cloneDeep(option);
|
|
101
|
+
this.option = deepMerge(defaultOptionDeep, setOptionDeep);
|
|
100
102
|
this.uid = option.uid || nanoid();
|
|
101
103
|
this._labelCollection = new LabelCollection({
|
|
102
104
|
scene: ((_a = option.viewer) === null || _a === void 0 ? void 0 : _a.scene) || undefined,
|
|
@@ -206,7 +208,7 @@ export default class CesiumAlphaGeoJsonLayer {
|
|
|
206
208
|
if (this.option && this.option.point.label && this.option.point.height) {
|
|
207
209
|
this.option.point.label.pixelOffset =
|
|
208
210
|
this.option.point.label.pixelOffset ||
|
|
209
|
-
|
|
211
|
+
[0, -this.option.point.height - 5];
|
|
210
212
|
this.addLabel(item, this.option.point.label);
|
|
211
213
|
this.addFeatureItem(item);
|
|
212
214
|
}
|
|
@@ -256,6 +258,11 @@ export default class CesiumAlphaGeoJsonLayer {
|
|
|
256
258
|
if (labelOption.distanceDisplayCondition) {
|
|
257
259
|
distanceDisplayCondition = new DistanceDisplayCondition(labelOption.distanceDisplayCondition[0], labelOption.distanceDisplayCondition[1]);
|
|
258
260
|
}
|
|
261
|
+
let pixelOffset = new Cartesian2(0, 0);
|
|
262
|
+
if (labelOption.pixelOffset) {
|
|
263
|
+
pixelOffset.x = labelOption.pixelOffset[0];
|
|
264
|
+
pixelOffset.y = labelOption.pixelOffset[1];
|
|
265
|
+
}
|
|
259
266
|
this._labelCollection.add({
|
|
260
267
|
position: item.center.cartesian3,
|
|
261
268
|
//@ts-ignore
|
|
@@ -267,7 +274,7 @@ export default class CesiumAlphaGeoJsonLayer {
|
|
|
267
274
|
fillColor: Color.fromCssColorString(color || "rgb(255,0,0)"),
|
|
268
275
|
verticalOrigin: VerticalOrigin.BOTTOM,
|
|
269
276
|
horizontalOrigin: HorizontalOrigin.CENTER,
|
|
270
|
-
pixelOffset:
|
|
277
|
+
pixelOffset: pixelOffset,
|
|
271
278
|
});
|
|
272
279
|
}
|
|
273
280
|
addFeatureItem(item) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/core/CesiumAlphaGeoJsonLayer/index.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAEL,mBAAmB,EAEnB,UAAU,EAGV,KAAK,EACL,OAAO,EACP,cAAc,EACd,wBAAwB,EAKxB,gBAAgB,EAChB,eAAe,EACf,UAAU,EAKV,mBAAmB,EACnB,QAAQ,EACR,YAAY,EACZ,cAAc,GAEf,MAAM,QAAQ,CAAC;AAChB,OAAO,EAAE,SAAS,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/core/CesiumAlphaGeoJsonLayer/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,17 +1,21 @@
|
|
|
1
|
-
import { ArcType, Cartographic, Color, ColorGeometryInstanceAttribute, DistanceDisplayCondition, GeometryInstance, GroundPolylineGeometry, PerInstanceColorAppearance, PolygonGeometry, PolygonHierarchy, PolylineGeometry, PolylineMaterialAppearance, VerticalOrigin, } from "cesium";
|
|
1
|
+
import { ArcType, Cartesian2, Cartographic, Color, ColorGeometryInstanceAttribute, DistanceDisplayCondition, GeometryInstance, GroundPolylineGeometry, PerInstanceColorAppearance, PolygonGeometry, PolygonHierarchy, PolylineGeometry, PolylineMaterialAppearance, VerticalOrigin, } from "cesium";
|
|
2
2
|
//@ts-ignore
|
|
3
3
|
import defaultImg from "../../../../public/assets/icon/position.svg";
|
|
4
4
|
import { crsFunction } from "./crsUtil";
|
|
5
5
|
import { nanoid } from "nanoid";
|
|
6
6
|
import { along, centerOfMass, length } from "@turf/turf";
|
|
7
7
|
export function createPoint(geoJsonLayer, geoJson, feature, options) {
|
|
8
|
-
var _a, _b, _c, _d, _e, _f, _g, _h, _j;
|
|
8
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
|
|
9
9
|
let noid = nanoid();
|
|
10
10
|
let position = crsFunction(feature.geometry.coordinates);
|
|
11
11
|
let distanceDisplayCondition;
|
|
12
12
|
if ((_a = options.point) === null || _a === void 0 ? void 0 : _a.distanceDisplayCondition) {
|
|
13
13
|
distanceDisplayCondition = new DistanceDisplayCondition(options.point.distanceDisplayCondition[0], options.point.distanceDisplayCondition[1]);
|
|
14
14
|
}
|
|
15
|
+
let pixelOffset = new Cartesian2();
|
|
16
|
+
if ((_c = (_b = options.point) === null || _b === void 0 ? void 0 : _b.label) === null || _c === void 0 ? void 0 : _c.pixelOffset) {
|
|
17
|
+
pixelOffset = new Cartesian2((_e = (_d = options.point) === null || _d === void 0 ? void 0 : _d.label) === null || _e === void 0 ? void 0 : _e.pixelOffset[0], (_g = (_f = options.point) === null || _f === void 0 ? void 0 : _f.label) === null || _g === void 0 ? void 0 : _g.pixelOffset[1]);
|
|
18
|
+
}
|
|
15
19
|
const billboard = geoJsonLayer.addPoint({
|
|
16
20
|
type: "Point",
|
|
17
21
|
position: position,
|
|
@@ -21,16 +25,17 @@ export function createPoint(geoJsonLayer, geoJson, feature, options) {
|
|
|
21
25
|
height: Cartographic.fromCartesian(position).height,
|
|
22
26
|
},
|
|
23
27
|
style: {
|
|
24
|
-
image: ((
|
|
25
|
-
width: ((
|
|
26
|
-
height: ((
|
|
27
|
-
disableDepthTestDistance: ((
|
|
28
|
+
image: ((_h = options.point) === null || _h === void 0 ? void 0 : _h.image) || defaultImg,
|
|
29
|
+
width: ((_j = options.point) === null || _j === void 0 ? void 0 : _j.width) || 20,
|
|
30
|
+
height: ((_k = options.point) === null || _k === void 0 ? void 0 : _k.height) || 20,
|
|
31
|
+
disableDepthTestDistance: ((_l = options.point) === null || _l === void 0 ? void 0 : _l.disableDepthTestDistance) || 0,
|
|
28
32
|
distanceDisplayCondition: distanceDisplayCondition,
|
|
29
|
-
scale: ((
|
|
30
|
-
sizeInMeters: ((
|
|
31
|
-
rotation: ((
|
|
32
|
-
color: Color.fromCssColorString(((
|
|
33
|
-
verticalOrigin: VerticalOrigin.
|
|
33
|
+
scale: ((_m = options.point) === null || _m === void 0 ? void 0 : _m.scale) || 1,
|
|
34
|
+
sizeInMeters: ((_o = options.point) === null || _o === void 0 ? void 0 : _o.sizeInMeters) || false,
|
|
35
|
+
rotation: ((_p = options.point) === null || _p === void 0 ? void 0 : _p.rotation) || 0,
|
|
36
|
+
color: Color.fromCssColorString(((_q = options.point) === null || _q === void 0 ? void 0 : _q.color) || ''),
|
|
37
|
+
verticalOrigin: VerticalOrigin.TOP,
|
|
38
|
+
pixelOffset: pixelOffset
|
|
34
39
|
},
|
|
35
40
|
layer: geoJsonLayer,
|
|
36
41
|
properties: feature.properties,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createGraphic.js","sourceRoot":"","sources":["../../../../../src/core/CesiumAlphaGeoJsonLayer/method/createGraphic.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,
|
|
1
|
+
{"version":3,"file":"createGraphic.js","sourceRoot":"","sources":["../../../../../src/core/CesiumAlphaGeoJsonLayer/method/createGraphic.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export declare function deepMerge(target: any, source: any): any;
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
// 深度合并对象
|
|
2
|
+
export function deepMerge(target, source) {
|
|
3
|
+
const result = Object.assign({}, target);
|
|
4
|
+
for (const key in source) {
|
|
5
|
+
// 如果两个都是对象，递归合并
|
|
6
|
+
if (source[key] instanceof Object && !Array.isArray(source[key]) && result[key] instanceof Object) {
|
|
7
|
+
result[key] = deepMerge(result[key], source[key]);
|
|
8
|
+
}
|
|
9
|
+
else {
|
|
10
|
+
// 否则直接覆盖
|
|
11
|
+
result[key] = source[key];
|
|
12
|
+
}
|
|
13
|
+
}
|
|
14
|
+
return result;
|
|
15
|
+
}
|
|
16
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/util/deepMearge/index.ts"],"names":[],"mappings":"AAAA,SAAS;AACT,MAAM,UAAU,SAAS,CAAC,MAAU,EAAE,MAAU;IAC9C,MAAM,MAAM,qBAAQ,MAAM,CAAE,CAAC;IAC7B,KAAK,MAAM,GAAG,IAAI,MAAM,EAAE,CAAC;QACzB,gBAAgB;QAChB,IAAI,MAAM,CAAC,GAAG,CAAC,YAAY,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,YAAY,MAAM,EAAE,CAAC;YAClG,MAAM,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;QACpD,CAAC;aAAM,CAAC;YACN,SAAS;YACT,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;QAC5B,CAAC;IACH,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC"}
|