fix: GeoJSON with resource appearance on reearth/core (#432)

fix: geojson on resource
reearth · Feb 7, 2023 · 464d67f · 464d67f
1 parent 0d4e0bf
commit 464d67f
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/core/engines/Cesium/Feature/Resource/index.tsx b/src/core/engines/Cesium/Feature/Resource/index.tsx
@@ -6,7 +6,7 @@ import {
 import { useCallback, useMemo } from "react";
 import { KmlDataSource, CzmlDataSource, GeoJsonDataSource, useCesium } from "resium";
 
-import { evalFeature } from "@reearth/core/mantle";
+import { DataType, evalFeature } from "@reearth/core/mantle";
 
 import type { ResourceAppearance, AppearanceTypes } from "../../..";
 import { extractSimpleLayerData, type FeatureComponentConfig, type FeatureProps } from "../utils";
@@ -33,13 +33,18 @@ const delegatingAppearance: Record<keyof typeof comps, (keyof AppearanceTypes)[]
   czml: ["marker", "polyline", "polygon"],
 };
 
+const DataTypeListAllowsOnlyProperty: DataType[] = ["geojson"];
+
 export default function Resource({ isVisible, property, layer }: Props) {
   const { clampToGround } = property ?? {};
   const [type, url] = useMemo((): [ResourceAppearance["type"], string | undefined] => {
     const data = extractSimpleLayerData(layer);
     const type = property?.type;
     const url = property?.url;
-    return [type ?? (data?.type as ResourceAppearance["type"]), url ?? data?.url];
+    return [
+      type ?? (data?.type as ResourceAppearance["type"]),
+      url ?? (data && !DataTypeListAllowsOnlyProperty.includes(data.type) ? data?.url : undefined),
+    ];
   }, [property, layer]);
   const { viewer } = useCesium();