@reearth/core 0.0.7-alpha.5 → 0.0.7-alpha.51

package/src/Visualizer/context.tsx

@@ -2,11 +2,11 @@ import { FC, PropsWithChildren, RefObject, createContext, useContext, useMemo }
 
 import { MapRef } from "../Map";
 
-const context = createContext<RefObject<MapRef> | undefined>(undefined);
+const context = createContext<RefObject<MapRef | null> | undefined>(undefined);
 
-export type Context = RefObject<MapRef>;
+export type Context = RefObject<MapRef | null>;
 
-export const useVisualizer = (): RefObject<MapRef> => {
+export const useVisualizer = (): RefObject<MapRef | null> => {
   const value = useContext(context);
   if (!value) {
     throw new Error("Visualizer is not declared. You have to use this hook inside of Visualizer");
@@ -14,11 +14,11 @@ export const useVisualizer = (): RefObject<MapRef> => {
   return value;
 };
 
-const filterMapRefToContext = (mapRef: RefObject<MapRef>): Context => {
+const filterMapRefToContext = (mapRef: RefObject<MapRef | null>): Context => {
   return mapRef as Context;
 };
 
-export const VisualizerProvider: FC<PropsWithChildren<{ mapRef: RefObject<MapRef> }>> = ({
+export const VisualizerProvider: FC<PropsWithChildren<{ mapRef: RefObject<MapRef | null> }>> = ({
   mapRef,
   children,
 }) => {

package/src/Visualizer/coreContext.tsx

@@ -26,6 +26,8 @@ type CoreContext = {
   handleCameraForceHorizontalRollChange?: (enable?: boolean) => void;
   handleInteractionModeChange?: (mode?: InteractionModeType | undefined) => void;
   onSketchPluginFeatureCreate?: (cb: SketchEventCallback) => void;
+  onSketchPluginFeatureUpdate?: (cb: SketchEventCallback) => void;
+  onSketchPluginFeatureDelete?: (cb: SketchEventCallback) => void;
   onSketchTypeChange?: (cb: (type: SketchType | undefined) => void) => void;
   onLayerVisibility?: (cb: (e: LayerVisibilityEvent) => void) => void;
   onLayerLoad?: (cb: (e: LayerLoadEvent) => void) => void;

package/src/Visualizer/hooks.ts

@@ -7,7 +7,6 @@ import type {
   Camera,
   ComputedLayer,
   LayerEditEvent,
-  CursorType,
   LayerVisibilityEvent,
   LayerLoadEvent,
   LayerSelectWithRectStart,
@@ -56,7 +55,7 @@ export default function useHooks(
 ) {
   const mapRef = useRef<MapRef>(null);
 
-  useImperativeHandle(ref, () => mapRef.current, []);
+  useImperativeHandle(ref, () => mapRef.current as MapRef, []);
 
   const wrapperRef = useRef<HTMLDivElement>(null);
 
@@ -82,12 +81,24 @@ export default function useHooks(
       reason: LayerSelectionReason | undefined,
       info: SelectedFeatureInfo | undefined,
     ) => {
-      if (selectedLayer.layerId === layerId && selectedLayer.featureId === featureId) return;
+      const isSketchLayer =
+        selectedLayer.layer?.layer?.type === "simple" &&
+        selectedLayer.layer?.layer?.data?.isSketchLayer;
+      // Sketch layer feature has a fixed featureId, we need to exclude it from the skip condition
+      if (
+        selectedLayer.layerId === layerId &&
+        selectedLayer.featureId === featureId &&
+        !isSketchLayer
+      )
+        return;
 
       const computedLayer = await layer?.();
       const computedFeature =
         layerId && featureId
-          ? mapRef.current?.engine.findComputedFeatureById?.(layerId, featureId) ?? info?.feature
+          ? (isSketchLayer
+              ? computedLayer?.features?.find(f => f.id === featureId)
+              : mapRef.current?.engine.findComputedFeatureById?.(layerId, featureId)) ??
+            info?.feature
           : undefined;
 
       selectFeature(
@@ -108,7 +119,7 @@ export default function useHooks(
     [selectedLayer, onLayerSelect],
   );
 
-  const timelineManagerRef: TimelineManagerRef = useRef();
+  const timelineManagerRef: TimelineManagerRef = useRef(undefined);
 
   // camera
   const [camera, changeCamera] = useValue(initialCamera, onCameraChange);
@@ -119,24 +130,22 @@ export default function useHooks(
   }, []);
 
   // interaction mode
-  const [_interactionMode, changeInteractionMode] = useValue(
-    initialInteractionMode,
+  const [interactionMode, changeInteractionMode] = useValue(
+    initialInteractionMode || "default",
     onInteractionModeChange,
   );
-  const interactionMode = _interactionMode || "default";
 
-  const [cursor, setCursor] = useState<CursorType>("auto");
   useEffect(() => {
-    setCursor(
-      interactionMode === "sketch" ? "crosshair" : interactionMode === "move" ? "grab" : "auto",
-    );
+    if (interactionMode === "default") {
+      mapRef?.current?.engine?.setCursor("auto");
+    }
   }, [interactionMode]);
 
   // feature flags
-  const featureFlags = INTERACTION_MODES[interactionMode];
+  const featureFlags = INTERACTION_MODES[interactionMode ?? "default"];
 
   // layer edit
-  const onLayerEditRef = useRef<(e: LayerEditEvent) => void>();
+  const onLayerEditRef = useRef<(e: LayerEditEvent) => void>(undefined);
   const onLayerEdit = useCallback((cb: (e: LayerEditEvent) => void) => {
     onLayerEditRef.current = cb;
   }, []);
@@ -145,7 +154,7 @@ export default function useHooks(
   }, []);
 
   // layer visiblity
-  const onLayerVisibilityRef = useRef<(e: LayerVisibilityEvent) => void>();
+  const onLayerVisibilityRef = useRef<(e: LayerVisibilityEvent) => void>(undefined);
   const onLayerVisibility = useCallback((cb: (e: LayerVisibilityEvent) => void) => {
     onLayerVisibilityRef.current = cb;
   }, []);
@@ -154,7 +163,7 @@ export default function useHooks(
   }, []);
 
   // layer load
-  const onLayerLoadRef = useRef<(e: LayerLoadEvent) => void>();
+  const onLayerLoadRef = useRef<(e: LayerLoadEvent) => void>(undefined);
   const onLayerLoad = useCallback((cb: (e: LayerLoadEvent) => void) => {
     onLayerLoadRef.current = cb;
   }, []);
@@ -163,21 +172,21 @@ export default function useHooks(
   }, []);
 
   // multiple feature selection
-  const onLayerSelectWithRectStartRef = useRef<(e: LayerSelectWithRectStart) => void>();
+  const onLayerSelectWithRectStartRef = useRef<(e: LayerSelectWithRectStart) => void>(undefined);
   const onLayerSelectWithRectStart = useCallback((cb: (e: LayerSelectWithRectStart) => void) => {
     onLayerSelectWithRectStartRef.current = cb;
   }, []);
   const handleLayerSelectWithRectStart = useCallback((e: LayerSelectWithRectStart) => {
     onLayerSelectWithRectStartRef.current?.(e);
   }, []);
-  const onLayerSelectWithRectMoveRef = useRef<(e: LayerSelectWithRectMove) => void>();
+  const onLayerSelectWithRectMoveRef = useRef<(e: LayerSelectWithRectMove) => void>(undefined);
   const onLayerSelectWithRectMove = useCallback((cb: (e: LayerSelectWithRectMove) => void) => {
     onLayerSelectWithRectMoveRef.current = cb;
   }, []);
   const handleLayerSelectWithRectMove = useCallback((e: LayerSelectWithRectMove) => {
     onLayerSelectWithRectMoveRef.current?.(e);
   }, []);
-  const onLayerSelectWithRectEndRef = useRef<(e: LayerSelectWithRectEnd) => void>();
+  const onLayerSelectWithRectEndRef = useRef<(e: LayerSelectWithRectEnd) => void>(undefined);
   const onLayerSelectWithRectEnd = useCallback((cb: (e: LayerSelectWithRectEnd) => void) => {
     onLayerSelectWithRectEndRef.current = cb;
   }, []);
@@ -194,6 +203,25 @@ export default function useHooks(
     onSketchPluginFeatureCreateCallbacksRef.current.forEach(fn => fn(props));
   }, []);
 
+  const onSketchPluginFeatureUpdateCallbacksRef = useRef<SketchEventCallback[]>([]);
+  const onSketchPluginFeatureUpdate = useCallback((cb: SketchEventCallback) => {
+    onSketchPluginFeatureUpdateCallbacksRef.current.push(cb);
+  }, []);
+  const handleSketchPluginFeatureUpdate = useCallback((props: SketchEventProps) => {
+    onSketchPluginFeatureUpdateCallbacksRef.current.forEach(fn => fn(props));
+  }, []);
+
+  const onSketchPluginFeatureDeleteCallbacksRef = useRef<SketchEventCallback[]>([]);
+  const onSketchPluginFeatureDelete = useCallback((cb: SketchEventCallback) => {
+    onSketchPluginFeatureDeleteCallbacksRef.current.push(cb);
+  }, []);
+  const handleSketchPluginFeatureDelete = useCallback(
+    (props: { layerId: string; featureId: string }) => {
+      onSketchPluginFeatureDeleteCallbacksRef.current.forEach(fn => fn(props));
+    },
+    [],
+  );
+
   const onSketchTypeChangeCallbacksRef = useRef<((type: SketchType | undefined) => void)[]>([]);
   const onSketchTypeChange = useCallback((cb: (type: SketchType | undefined) => void) => {
     onSketchTypeChangeCallbacksRef.current.push(cb);
@@ -244,6 +272,8 @@ export default function useHooks(
       handleCameraForceHorizontalRollChange,
       handleInteractionModeChange: changeInteractionMode,
       onSketchPluginFeatureCreate,
+      onSketchPluginFeatureUpdate,
+      onSketchPluginFeatureDelete,
       onSketchTypeChange,
       onLayerVisibility,
       onLayerLoad,
@@ -261,6 +291,8 @@ export default function useHooks(
       handleCameraForceHorizontalRollChange,
       onLayerEdit,
       onSketchPluginFeatureCreate,
+      onSketchPluginFeatureUpdate,
+      onSketchPluginFeatureDelete,
       onSketchTypeChange,
       onLayerVisibility,
       onLayerLoad,
@@ -290,10 +322,10 @@ export default function useHooks(
     featureFlags,
     isLayerDragging,
     timelineManagerRef,
-    cursor,
     cameraForceHorizontalRoll,
     coreContextValue,
     containerStyle,
+    overriddenInteractionMode: interactionMode,
     handleLayerSelect,
     handleLayerDrag,
     handleLayerDrop,
@@ -301,6 +333,8 @@ export default function useHooks(
     handleCameraChange: changeCamera,
     handleInteractionModeChange: changeInteractionMode,
     handleSketchPluginFeatureCreate,
+    handleSketchPluginFeatureUpdate,
+    handleSketchPluginFeatureDelete,
     handleSketchTypeChange,
     handleLayerVisibility,
     handleLayerLoad,

package/src/Visualizer/index.tsx

@@ -12,6 +12,7 @@ import {
   type LatLng,
   type Cluster,
   type ComputedLayer,
+  type Credits,
 } from "../Map";
 import { SketchFeature, SketchType } from "../Map/Sketch/types";
 
@@ -46,6 +47,7 @@ export type CoreVisualizerProps = {
   ready?: boolean;
   hiddenLayers?: string[];
   zoomedLayerId?: string;
+  displayCredits?: boolean;
   onCameraChange?: (camera: Camera) => void;
   onLayerDrop?: (layerId: string, propertyKey: string, position: LatLng | undefined) => void;
   onLayerSelect?: (
@@ -58,7 +60,11 @@ export type CoreVisualizerProps = {
   onMount?: () => void;
   onSketchTypeChangeProp?: (type: SketchType | undefined) => void;
   onSketchFeatureCreate?: (feature: SketchFeature | null) => void;
+  onSketchFeatureUpdate?: (feature: SketchFeature | null) => void;
+  onSketchFeatureDelete?: (layerId: string, featureId: string) => void;
   onInteractionModeChange?: (mode: InteractionModeType) => void;
+  onAPIReady?: () => void;
+  onCreditsUpdate?: (credits?: Credits) => void;
 };
 
 export const CoreVisualizer = memo(
@@ -79,6 +85,7 @@ export const CoreVisualizer = memo(
         interactionMode,
         shouldRender,
         meta,
+        displayCredits = true,
         style,
         zoomedLayerId,
         children,
@@ -90,6 +97,10 @@ export const CoreVisualizer = memo(
         onMount,
         onSketchTypeChangeProp,
         onSketchFeatureCreate,
+        onSketchFeatureUpdate,
+        onSketchFeatureDelete,
+        onAPIReady,
+        onCreditsUpdate,
       },
       ref: Ref<MapRef | null>,
     ) => {
@@ -101,10 +112,10 @@ export const CoreVisualizer = memo(
         featureFlags,
         isLayerDragging,
         timelineManagerRef,
-        cursor,
         cameraForceHorizontalRoll,
         coreContextValue,
         containerStyle,
+        overriddenInteractionMode,
         handleLayerSelect,
         handleLayerDrag,
         handleLayerDrop,
@@ -112,6 +123,8 @@ export const CoreVisualizer = memo(
         handleCameraChange,
         handleInteractionModeChange,
         handleSketchPluginFeatureCreate,
+        handleSketchPluginFeatureUpdate,
+        handleSketchPluginFeatureDelete,
         handleSketchTypeChange,
         handleLayerVisibility,
         handleLayerLoad,
@@ -152,6 +165,7 @@ export const CoreVisualizer = memo(
                 isLayerDragging={isLayerDragging}
                 isLayerDraggable={isEditable}
                 meta={meta}
+                displayCredits={displayCredits}
                 style={style}
                 featureFlags={featureFlags}
                 shouldRender={shouldRender}
@@ -160,9 +174,8 @@ export const CoreVisualizer = memo(
                 small={small}
                 ready={ready}
                 timelineManagerRef={timelineManagerRef}
-                interactionMode={interactionMode}
+                interactionMode={overriddenInteractionMode}
                 selectedFeature={selectedFeature}
-                cursor={cursor}
                 onCameraChange={handleCameraChange}
                 onLayerDrag={handleLayerDrag}
                 onLayerDrop={handleLayerDrop}
@@ -171,6 +184,10 @@ export const CoreVisualizer = memo(
                 overrideInteractionMode={handleInteractionModeChange}
                 onSketchFeatureCreate={onSketchFeatureCreate}
                 onSketchPluginFeatureCreate={handleSketchPluginFeatureCreate}
+                onSketchFeatureUpdate={onSketchFeatureUpdate}
+                onSketchPluginFeatureUpdate={handleSketchPluginFeatureUpdate}
+                onSketchFeatureDelete={onSketchFeatureDelete}
+                onSketchPluginFeatureDelete={handleSketchPluginFeatureDelete}
                 onSketchTypeChange={handleSketchTypeChange}
                 onMount={onMount}
                 onLayerVisibility={handleLayerVisibility}
@@ -178,6 +195,8 @@ export const CoreVisualizer = memo(
                 onLayerSelectWithRectStart={handleLayerSelectWithRectStart}
                 onLayerSelectWithRectMove={handleLayerSelectWithRectMove}
                 onLayerSelectWithRectEnd={handleLayerSelectWithRectEnd}
+                onAPIReady={onAPIReady}
+                onCreditsUpdate={onCreditsUpdate}
               />
               <coreContext.Provider value={coreContextValue}>{children}</coreContext.Provider>
             </div>

package/src/Visualizer/interactionMode.ts

@@ -1,6 +1,6 @@
 import { FEATURE_FLAGS } from "./featureFlags";
 
-export type InteractionModeType = "default" | "move" | "selection" | "sketch";
+export type InteractionModeType = "default" | "move" | "selection" | "sketch" | "spatialId";
 
 // If you would like enable a feature in a specific mode,
 // just set the feature's flag here to that mode.
@@ -22,4 +22,5 @@ export const INTERACTION_MODES: Record<InteractionModeType, number> = {
     FEATURE_FLAGS.CAMERA_ZOOM |
     FEATURE_FLAGS.CAMERA_TILT,
   sketch: FEATURE_FLAGS.SKETCH | FEATURE_FLAGS.CAMERA_ZOOM | FEATURE_FLAGS.CAMERA_TILT,
+  spatialId: FEATURE_FLAGS.CAMERA_ZOOM | FEATURE_FLAGS.CAMERA_TILT,
 };

package/src/Visualizer/useViewport.ts

@@ -10,7 +10,7 @@ export type Viewport = {
 };
 
 type Props = {
-  wrapperRef: RefObject<HTMLDivElement>;
+  wrapperRef: RefObject<HTMLDivElement | null>;
 };
 
 export default ({ wrapperRef }: Props) => {

package/src/engines/Cesium/Feature/Box/hooks/box.ts

@@ -127,7 +127,7 @@ export const useHooks = ({
   );
 
   // ScalePoint event handlers
-  const currentPointIndex = useRef<number>();
+  const currentPointIndex = useRef<number>(undefined);
   const handlePointMouseDown: PointEventCallback = useCallback(
     (_, { index }) => {
       if (!viewer) {
@@ -138,7 +138,7 @@ export const useHooks = ({
     },
     [viewer],
   );
-  const prevMousePosition2dForPoint = useRef<Cartesian2>();
+  const prevMousePosition2dForPoint = useRef<Cartesian2>(undefined);
   const handlePointMouseMove: PointEventCallback = useCallback(
     (e, { position, oppositePosition, pointLocal, index, layerId }) => {
       if (
@@ -282,7 +282,7 @@ export const useHooks = ({
   }, [viewer]);
 
   // Edge event handlers
-  const currentEdgeIndex = useRef<number>();
+  const currentEdgeIndex = useRef<number>(undefined);
   const handleEdgeMouseDown: EdgeEventCallback = useCallback(
     (_, { index }) => {
       if (!viewer) {
@@ -293,7 +293,7 @@ export const useHooks = ({
     },
     [viewer],
   );
-  const prevMouseXAxisForEdge = useRef<number>();
+  const prevMouseXAxisForEdge = useRef<number>(undefined);
   const handleEdgeMouseMove: EdgeEventCallback = useCallback(
     (e, { index, layerId }) => {
       if (currentEdgeIndex.current !== index) {

package/src/engines/Cesium/Feature/HeatMap/HeatmapMesh.tsx

@@ -62,7 +62,7 @@ export const HeatmapMesh = memo(
     ) => {
       const { scene } = useCesium();
       const groundPrimitives = scene?.groundPrimitives;
-      const primitiveRef = useRef<GroundPrimitive>();
+      const primitiveRef = useRef<GroundPrimitive>(undefined);
 
       const material = useConstant(() =>
         createHeatmapMeshMaterial({

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/PhotoOverlay/hooks.ts

@@ -34,7 +34,7 @@ export default function ({ isSelected, camera }: { isSelected?: boolean; camera?
   cameraRef.current = camera;
   const storytelling = useRef(false);
   storytelling.current = selectionReason?.reason === "storytelling";
-  const prevCamera = useRef<Camera>();
+  const prevCamera = useRef<Camera>(undefined);
 
   // camera flight
   useEffect(() => {

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

@@ -120,7 +120,9 @@ export default function PhotoOverlay({
             alignItems: "center",
             transition:
               photoOverlayImageTransiton === "entering" || photoOverlayImageTransiton === "exiting"
-                ? `all ${photoOverlayImageTransiton === "exiting" ? photoExitDuration : photoDuration}s ease`
+                ? `all ${
+                    photoOverlayImageTransiton === "exiting" ? photoExitDuration : photoDuration
+                  }s ease`
                 : undefined,
             opacity:
               photoOverlayImageTransiton === "entering" || photoOverlayImageTransiton === "entered"

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

@@ -54,6 +54,7 @@ export default function Polygon({
     fillColor,
     strokeColor,
     strokeWidth = 1,
+    height,
     heightReference: hr,
     shadows,
     extrudedHeight,
@@ -83,7 +84,7 @@ export default function Polygon({
       coordiantes && stroke && !disableWorkaround
         ? coordiantes.flatMap(hole => [
             // bottom
-            hole.map(c => Cartesian3.fromDegrees(c[0], c[1], c[2] ?? 0)),
+            hole.map(c => Cartesian3.fromDegrees(c[0], c[1], c[2] ?? height)),
             ...(extrudedHeight
               ? [
                   // top
@@ -92,14 +93,14 @@ export default function Polygon({
                   ...hole
                     .slice(0, -1)
                     .map(c => [
-                      Cartesian3.fromDegrees(c[0], c[1], 0),
+                      Cartesian3.fromDegrees(c[0], c[1], height ?? 0),
                       Cartesian3.fromDegrees(c[0], c[1], extrudedHeight),
                     ]),
                 ]
               : []),
           ])
         : [],
-    [coordiantes, stroke, disableWorkaround],
+    [coordiantes, stroke, disableWorkaround, height, extrudedHeight],
   );
 
   const memoStrokeColor = useMemo(
@@ -127,7 +128,7 @@ export default function Polygon({
   );
 
   const extrudedHeightProperty: { extrudedHeight: number } | undefined = useMemo(
-    () => (extrudedHeight ? { extrudedHeight } : undefined),
+    () => (extrudedHeight !== undefined ? { extrudedHeight } : undefined),
     [extrudedHeight],
   );
 
@@ -152,6 +153,7 @@ export default function Polygon({
           outline={!!memoStrokeColor}
           outlineColor={memoStrokeColor}
           outlineWidth={strokeWidth}
+          height={height}
           heightReference={heightReference(hr)}
           shadows={shadowMode(shadows)}
           distanceDisplayCondition={distanceDisplayCondition}

package/src/engines/Cesium/Feature/Raster/mvt.ts

@@ -1,6 +1,7 @@
-import { MVTImageryProvider } from "@reearth/cesium-mvt-imagery-provider";
 import { useMemo } from "react";
 
+import { MVTImageryProvider } from "@reearth/cesium-mvt-imagery-provider";
+
 import { extractSimpleLayer } from "../utils";
 
 import { useData, useImageryProvider } from "./hooks";