fix: some ts error

hongfaqiu · Sep 6, 2024 · f9b33f6 · f9b33f6
1 parent 0d7b68a
commit f9b33f6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/packages/geojson-render/src/primitiveRender.ts b/packages/geojson-render/src/primitiveRender.ts
@@ -151,10 +151,10 @@ export const primitiveGeoJsonRender = async (
         }
         break;
     }
-    if (label?.paint.text) {
+    if (label?.paint.text && feature.center) {
       primitiveLayer.addLabel({
         type: 'Label',
-        position: feature.center?.cartesian3,
+        position: feature.center.cartesian3,
         style: {
           font: `bold 20px Arial`,
           outlineWidth: 4,

diff --git a/packages/primitive-geojson/src/GeoJsonPrimitiveLayer.ts b/packages/primitive-geojson/src/GeoJsonPrimitiveLayer.ts
@@ -1,5 +1,6 @@
 import {
   ArcType,
+  Billboard,
   BillboardCollection,
   BlendOption,
   BlendingState,
@@ -10,6 +11,7 @@ import {
   DeveloperError,
   Event,
   GeometryInstance,
+  Label,
   LabelCollection,
   PerInstanceColorAppearance,
   PinBuilder,
@@ -253,8 +255,8 @@ export class GeoJsonPrimitiveLayer extends BasicGraphicLayer {
     const id = this._generateId();
     const instance = this._billboardCollection.add({
       id,
+      ...(style as Billboard.ConstructorOptions),
       position,
-      ...style,
     });
     this.addFeatureItem({
       ...item,
@@ -270,8 +272,8 @@ export class GeoJsonPrimitiveLayer extends BasicGraphicLayer {
     const id = this._generateId();
     const instance = this._labelCollection.add({
       id,
+      ...(style as Label.ConstructorOptions),
       position,
-      ...style,
     });
     return instance;
   }

diff --git a/packages/primitive-geojson/src/typings.ts b/packages/primitive-geojson/src/typings.ts
@@ -79,7 +79,7 @@ export type BillboardPrimitiveItem = {
 
 export type LabelPrimitiveItem = {
   type: 'Label';
-  position?: Cartesian3;
+  position: Cartesian3;
   style?: LabelGraphics.ConstructorOptions;
   instance?: Label;
 } & GeoJsonFeatureItem;