@reearth/core 0.0.7-alpha.21 → 0.0.7-alpha.23

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reearth/core",
-  "version": "0.0.7-alpha.21",
+  "version": "0.0.7-alpha.23",
   "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/Resource/utils.ts

@@ -2,7 +2,7 @@ import { Entity, PointGraphics, BillboardGraphics, JulianDate } from "cesium";
 
 import { EvalFeature } from "../../..";
 import { AppearanceTypes, ComputedFeature, ComputedLayer, Feature } from "../../../../mantle";
-import { heightReference, shadowMode, toColor } from "../../common";
+import { heightReference, shadowMode, toColor, classificationType } from "../../common";
 import { getMarkerCoordinates, getGeometryFromEntity } from "../../helpers/getGeometryFromEntity";
 import { convertEntityDescription, convertEntityProperties } from "../../utils/utils";
 import { attachTag, extractSimpleLayer, getTag, Tag } from "../utils";
@@ -33,7 +33,7 @@ type EntityAppearanceKey<AName extends SupportedAppearanceKey> = AName extends "
   ? keyof Pick<Entity, "point" | "billboard" | "label">
   : keyof Pick<Entity, CesiumEntityAppearanceKey>;
 
-type AppearancePropertyKeyType = "color" | "heightReference" | "shadows";
+type AppearancePropertyKeyType = "color" | "heightReference" | "shadows" | "classificationType";
 
 export function attachProperties<
   AName extends SupportedAppearanceKey,
@@ -87,6 +87,9 @@ export function attachProperties<
         break;
       case "heightReference":
         value = heightReference(value);
+        break;
+      case "classificationType":
+        value = classificationType(value);
     }
 
     if (value === (entity[propertyName] as any)[entityPropertyKey]) {
@@ -160,10 +163,10 @@ export const attachStyle = (
           name: "show",
           ...(computedFeature?.marker?.style
             ? {
-              override:
-                computedFeature?.marker?.style === "point" &&
-                (computedFeature?.marker.show ?? true),
-            }
+                override:
+                  computedFeature?.marker?.style === "point" &&
+                  (computedFeature?.marker.show ?? true),
+              }
             : {}),
         },
         pixelSize: {
@@ -199,10 +202,10 @@ export const attachStyle = (
           name: "show",
           ...(computedFeature?.marker?.style
             ? {
-              override:
-                computedFeature?.marker?.style === "image" &&
-                (computedFeature?.marker.show ?? true),
-            }
+                override:
+                  computedFeature?.marker?.style === "image" &&
+                  (computedFeature?.marker.show ?? true),
+              }
             : {}),
         },
         image: {
@@ -295,6 +298,10 @@ export const attachStyle = (
         clampToGround: {
           name: "clampToGround",
         },
+        classificationType: {
+          name: "classificationType",
+          type: "classificationType",
+        },
       });
     }
     return [feature, computedFeature];
@@ -356,6 +363,10 @@ export const attachStyle = (
         extrudedHeight: {
           name: "extrudedHeight",
         },
+        classificationType: {
+          name: "classificationType",
+          type: "classificationType",
+        },
       });
     }
     return [feature, computedFeature];

package/src/engines/Cesium/core/Imagery.tsx

@@ -113,6 +113,12 @@ export function useImageryProviders({
   const tileKeys = tiles.map(t => t.id).join(",");
   const prevTileKeys = useRef(tileKeys);
   const prevProviders = useRef<Providers>({});
+  const zoomLevels = useMemo(() => tiles.map(t => {
+      if (t.id && t.zoomLevel) return { [t.id]: t.zoomLevel };
+      return
+  }),
+  [tiles]);
+  const prevZoomLevels = useRef(zoomLevels);
 
   // Manage TileProviders so that TileProvider does not need to be recreated each time tiles are updated.
   const { providers, updated } = useMemo(() => {
@@ -174,13 +180,15 @@ export function useImageryProviders({
       !!added.length ||
       !!isCesiumAccessTokenUpdated ||
       !isEqual(prevTileKeys.current, tileKeys) ||
+      !isEqual(prevZoomLevels.current, zoomLevels) ||
       rawProviders.some(p => p.tile && (p.prevType !== p.tile.type || p.prevUrl !== p.tile.url));
 
     prevTileKeys.current = tileKeys;
+    prevZoomLevels.current = zoomLevels;
     prevCesiumIonAccessToken.current = cesiumIonAccessToken;
 
     return { providers, updated };
-  }, [cesiumIonAccessToken, tiles, tileKeys, newTile]);
+  }, [cesiumIonAccessToken, tiles, tileKeys, newTile, zoomLevels]);
 
   prevProviders.current = providers;
   return { providers, updated };