@reearth/core 0.0.7-alpha.33 → 0.0.7-alpha.35

package/dist/index.d.ts

@@ -160,6 +160,7 @@ export declare type CameraProperty = {
 
 export declare type Cesium3DTilesAppearance = {
     show?: boolean;
+    height?: number;
     color?: string;
     styleUrl?: string;
     shadows?: "disabled" | "enabled" | "cast_only" | "receive_only";
@@ -1163,6 +1164,7 @@ export declare type ModelAppearance = {
     model?: string;
     url?: string;
     heightReference?: "none" | "clamp" | "relative";
+    height?: number;
     heading?: number;
     pitch?: number;
     roll?: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reearth/core",
-  "version": "0.0.7-alpha.33",
+  "version": "0.0.7-alpha.35",
   "author": "Re:Earth contributors <community@reearth.io>",
   "license": "Apache-2.0",
   "description": "A library that abstracts a map engine as one common API.",

package/src/engines/Cesium/Feature/Model/index.tsx

@@ -32,9 +32,7 @@ export type Props = FeatureProps<Property>;
 
 export type Property = ModelAppearance & {
   location?: { lat: number; lng: number };
-  height?: number;
 };
-
 export default function Model({
   id,
   isVisible,
@@ -50,7 +48,9 @@ export default function Model({
   const coordinates = useMemo(
     () =>
       geometry?.type === "Point"
-        ? geometry.coordinates
+        ? property?.height === undefined
+          ? geometry.coordinates
+          : [...geometry.coordinates.slice(0, 2), property.height]
         : property?.location
           ? [property.location.lng, property.location.lat, property.height ?? 0]
           : undefined,

package/src/engines/Cesium/Feature/Tileset/hooks.ts

@@ -92,15 +92,14 @@ const makeFeatureId = (
   }
   const featureId = getBuiltinFeatureId(tileFeature);
   return generateIDWithMD5(
-    `${coordinates.x}-${coordinates.y}-${coordinates.z}-${featureId}-${
-      !(tileFeature instanceof Model)
-        ? JSON.stringify(
-            // Read only root properties.
-            Object.entries(convertCesium3DTileFeatureProperties(tileFeature))
-              .filter((_k, v) => typeof v === "string" || typeof v === "number")
-              .map(([k, v]) => `${k}${v}`),
-          )
-        : ""
+    `${coordinates.x}-${coordinates.y}-${coordinates.z}-${featureId}-${!(tileFeature instanceof Model)
+      ? JSON.stringify(
+        // Read only root properties.
+        Object.entries(convertCesium3DTileFeatureProperties(tileFeature))
+          .filter((_k, v) => typeof v === "string" || typeof v === "number")
+          .map(([k, v]) => `${k}${v}`),
+      )
+      : ""
     }`,
   );
 };
@@ -732,8 +731,15 @@ export const useHooks = ({
 
     const loadTileset = async () => {
       try {
-        const tileset = await createGooglePhotorealistic3DTileset(googleMapApiKey);
-        return tileset.resource;
+        if (googleMapApiKey) {
+          const tileset = await createGooglePhotorealistic3DTileset(googleMapApiKey);
+          return tileset.resource;
+        } else {
+          const resource = IonResource.fromAssetId(2275207, {
+            accessToken: meta?.cesiumIonAccessToken as string | undefined,
+          });
+          return resource;
+        }
       } catch (error) {
         console.error(`Error loading Photorealistic 3D Tiles tileset: ${error}`);
         throw error;
@@ -741,13 +747,13 @@ export const useHooks = ({
     };
 
     return loadTileset();
-  }, [type, isVisible, googleMapApiKey]);
+  }, [type, isVisible, googleMapApiKey, meta?.cesiumIonAccessToken]);
 
   const tilesetUrl = useMemo(() => {
     return type === "osm-buildings" && isVisible
       ? IonResource.fromAssetId(96188, {
-          accessToken: meta?.cesiumIonAccessToken as string | undefined,
-        }) // https://github.com/CesiumGS/cesium/blob/main/packages/engine/Source/Scene/createOsmBuildings.js#L53
+        accessToken: meta?.cesiumIonAccessToken as string | undefined,
+      }) // https://github.com/CesiumGS/cesium/blob/main/packages/engine/Source/Scene/createOsmBuildings.js#L53
       : googleMapPhotorealisticResource && isVisible
         ? googleMapPhotorealisticResource
         : type === "3dtiles" && isVisible
@@ -772,7 +778,7 @@ export const useHooks = ({
       property?.imageBasedLightIntensity ?? viewerProperty?.scene?.imageBasedLighting?.intensity;
     const sphericalHarmonicCoefficients = arrayToCartecian3(
       property?.sphericalHarmonicCoefficients ??
-        viewerProperty?.scene?.imageBasedLighting?.sphericalHarmonicCoefficients,
+      viewerProperty?.scene?.imageBasedLighting?.sphericalHarmonicCoefficients,
       imageBasedLightIntensity,
     );
 

package/src/mantle/types/appearance.ts

@@ -60,14 +60,14 @@ export type MarkerAppearance = {
   label?: boolean;
   labelText?: string;
   labelPosition?:
-    | "left"
-    | "right"
-    | "top"
-    | "bottom"
-    | "lefttop"
-    | "leftbottom"
-    | "righttop"
-    | "rightbottom";
+  | "left"
+  | "right"
+  | "top"
+  | "bottom"
+  | "lefttop"
+  | "leftbottom"
+  | "righttop"
+  | "rightbottom";
   labelTypography?: Typography;
   labelBackground?: boolean;
   labelBackgroundColor?: string;
@@ -157,6 +157,7 @@ export type ModelAppearance = {
   model?: string; // For compat
   url?: string;
   heightReference?: "none" | "clamp" | "relative";
+  height?: number;
   heading?: number;
   pitch?: number;
   roll?: number;
@@ -192,6 +193,7 @@ export type FrustumAppearance = {
 
 export type Cesium3DTilesAppearance = {
   show?: boolean;
+  height?: number;
   color?: string;
   styleUrl?: string;
   shadows?: "disabled" | "enabled" | "cast_only" | "receive_only";