@reearth/core 0.0.7-alpha.30 → 0.0.7-alpha.32

package/src/Map/index.tsx

@@ -30,8 +30,6 @@ export type { TimelineCommitter, TimelineManagerRef } from "./useTimelineManager
 
 export type { MapRef } from "./hooks";
 
-export type CursorType = "auto" | "grab" | "crosshair";
-
 export type Props = {
   engines?: Record<string, Engine>;
   engine?: string;
@@ -46,9 +44,7 @@ export type Props = {
   | "viewerProperty"
 > &
   Omit<EngineProps, "onLayerSelect" | "layerSelectionReason" | "selectedLayerId"> &
-  Omit<SketchProps, "layersRef" | "engineRef" | "SketchComponent"> & {
-    cursor?: CursorType;
-  };
+  Omit<SketchProps, "layersRef" | "engineRef" | "SketchComponent">;
 
 function MapFn(
   {
@@ -63,7 +59,6 @@ function MapFn(
     timelineManagerRef,
     interactionMode,
     selectedFeature,
-    cursor,
     onLayerSelect,
     overrideInteractionMode,
     onSketchTypeChange,
@@ -100,7 +95,6 @@ function MapFn(
   } = useHooks({
     ref,
     timelineManagerRef,
-    cursor,
     onLayerSelect,
     onMount,
     onAPIReady,

package/src/Visualizer/hooks.ts

@@ -7,7 +7,6 @@ import type {
   Camera,
   ComputedLayer,
   LayerEditEvent,
-  CursorType,
   LayerVisibilityEvent,
   LayerLoadEvent,
   LayerSelectWithRectStart,
@@ -131,21 +130,19 @@ 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>();
@@ -325,7 +322,6 @@ export default function useHooks(
     featureFlags,
     isLayerDragging,
     timelineManagerRef,
-    cursor,
     cameraForceHorizontalRoll,
     coreContextValue,
     containerStyle,

package/src/Visualizer/index.tsx

@@ -112,7 +112,6 @@ export const CoreVisualizer = memo(
         featureFlags,
         isLayerDragging,
         timelineManagerRef,
-        cursor,
         cameraForceHorizontalRoll,
         coreContextValue,
         containerStyle,
@@ -177,7 +176,6 @@ export const CoreVisualizer = memo(
                 timelineManagerRef={timelineManagerRef}
                 interactionMode={overriddenInteractionMode}
                 selectedFeature={selectedFeature}
-                cursor={cursor}
                 onCameraChange={handleCameraChange}
                 onLayerDrag={handleLayerDrag}
                 onLayerDrop={handleLayerDrop}

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

@@ -128,7 +128,7 @@ export default function Polygon({
   );
 
   const extrudedHeightProperty: { extrudedHeight: number } | undefined = useMemo(
-    () => (extrudedHeight ? { extrudedHeight } : undefined),
+    () => (extrudedHeight !== undefined ? { extrudedHeight } : undefined),
     [extrudedHeight],
   );
 

package/src/engines/Cesium/SpatialId/CoordinateIndicator.tsx

@@ -0,0 +1,28 @@
+import { ClassificationType, Color, Rectangle } from "cesium";
+import { FC, memo, useMemo } from "react";
+import { Entity } from "resium";
+
+type SpatialIdComponentProps = {
+  wsen: [number, number, number, number];
+  color: string;
+};
+
+export const CoordinateIndicator: FC<SpatialIdComponentProps> = memo(({ wsen, color }) => {
+  const options = useMemo(
+    () => ({
+      rectangle: {
+        coordinates: Rectangle.fromDegrees(...wsen),
+        clampToGround: true,
+        fill: true,
+        outline: false,
+        material: Color.fromCssColorString(color),
+        classificationType: ClassificationType.BOTH,
+      },
+    }),
+    [wsen, color],
+  );
+
+  return <Entity {...options} />;
+});
+
+CoordinateIndicator.displayName = "SpatialIdSpace";

package/src/engines/Cesium/SpatialId/SpatialIdSpace.tsx

@@ -0,0 +1,33 @@
+import { ClassificationType, Color, HeightReference, Rectangle } from "cesium";
+import { FC, memo, useMemo } from "react";
+import { Entity } from "resium";
+
+import { SpatialIdSpaceType } from "../../../Map/SpatialId/types";
+
+type SpatialIdComponentProps = {
+  space: SpatialIdSpaceType;
+};
+
+export const SpatialIdSpace: FC<SpatialIdComponentProps> = memo(({ space }) => {
+  const options = useMemo(
+    () => ({
+      rectangle: {
+        coordinates: Rectangle.fromDegrees(...space.wsen),
+        height: space.height,
+        heightReference: HeightReference.NONE,
+        extrudedHeight: space.extrudedHeight,
+        clampToGround: false,
+        fill: true,
+        outline: true,
+        outlineColor: Color.fromCssColorString(space.outlineColor ?? ""),
+        material: Color.fromCssColorString(space.color ?? ""),
+        classificationType: ClassificationType.TERRAIN,
+      },
+    }),
+    [space],
+  );
+
+  return <Entity id={space.id} {...options} />;
+});
+
+SpatialIdSpace.displayName = "SpatialIdSpace";

package/src/engines/Cesium/SpatialId/VerticalSpaceIndicator.tsx

@@ -0,0 +1,32 @@
+import { ClassificationType, Color, Rectangle } from "cesium";
+import { FC, memo, useMemo } from "react";
+import { Entity } from "resium";
+
+import { VerticalSpaceIndicatorType } from "../../../Map/SpatialId/types";
+
+type VerticalSpaceIndicatorProps = {
+  indicator: VerticalSpaceIndicatorType;
+};
+
+export const VerticalSpaceIndicator: FC<VerticalSpaceIndicatorProps> = memo(({ indicator }) => {
+  const options = useMemo(
+    () => ({
+      rectangle: {
+        coordinates: Rectangle.fromDegrees(...indicator.wsen),
+        height: indicator.height,
+        extrudedHeight: indicator.extrudedHeight,
+        clampToGround: false,
+        fill: true,
+        outline: true,
+        outlineColor: Color.fromCssColorString(indicator.outlineColor),
+        material: Color.fromCssColorString(indicator.color),
+        classificationType: ClassificationType.TERRAIN,
+      },
+    }),
+    [indicator],
+  );
+
+  return <Entity {...options} />;
+});
+
+VerticalSpaceIndicator.displayName = "VerticalSpaceIndicator";

package/src/engines/Cesium/SpatialId/index.ts

@@ -0,0 +1,3 @@
+export * from "./SpatialIdSpace";
+export * from "./CoordinateIndicator";
+export * from "./VerticalSpaceIndicator";

package/src/engines/Cesium/SpatialId/index.tsx

@@ -1,42 +0,0 @@
-import { ClassificationType, Color, HeightReference, Rectangle } from "cesium";
-import { FC, memo, useMemo } from "react";
-import { Entity } from "resium";
-
-import { SpatialIdSpaceType } from "../../../Map/SpatialId/types";
-
-const DEFAULT_COLOR = "#00bebe";
-
-type SpatialIdComponentProps = {
-  space: SpatialIdSpaceType;
-};
-
-const SpatialIdSpace: FC<SpatialIdComponentProps> = memo(({ space }) => {
-  const options = useMemo(
-    () => ({
-      rectangle: {
-        coordinates: Rectangle.fromDegrees(...space.wsen),
-        height: space.type === "coordinate" ? undefined : space.height,
-        heightReference: space.type === "coordinate" ? undefined : HeightReference.NONE,
-        extrudedHeight: space.type === "coordinate" ? undefined : space.extrudedHeight,
-        clampToGround: space.type === "coordinate",
-        fill: true,
-        outline: space.type !== "coordinate",
-        outlineColor: Color.fromCssColorString(space.color ?? DEFAULT_COLOR).withAlpha(
-          space.type === "floor" ? 0.5 : 1,
-        ),
-        material: Color.fromCssColorString(space.color ?? DEFAULT_COLOR).withAlpha(
-          space.type === "floor" ? 0.05 : 0.2,
-        ),
-        classificationType:
-          space.type === "coordinate" ? ClassificationType.BOTH : ClassificationType.TERRAIN,
-      },
-    }),
-    [space],
-  );
-
-  return <Entity id={space.id} {...options} />;
-});
-
-SpatialIdSpace.displayName = "SpatialIdSpace";
-
-export default SpatialIdSpace;