@reearth/core 0.0.7-alpha.6 → 0.0.7-alpha.61

package/src/Map/Sketch/sketchMachine.typegen.ts

@@ -13,7 +13,8 @@ export interface Typegen0 {
     services: never;
   };
   eventsCausingActions: {
-    clearDrawing: "ABORT" | "CANCEL" | "CREATE";
+    catchControlPoint: "CATCH";
+    clearDrawing: "ABORT" | "CANCEL" | "CREATE" | "EXIT_EDIT";
     createCircle: "CIRCLE";
     createExtrudedCircle: "EXTRUDED_CIRCLE";
     createExtrudedPolygon: "EXTRUDED_POLYGON";
@@ -22,8 +23,20 @@ export interface Typegen0 {
     createPolygon: "POLYGON";
     createPolyline: "POLYLINE";
     createRectangle: "RECTANGLE";
+    editCircle: "EDIT_CIRCLE";
+    editExtrudedCircle: "EDIT_EXTRUDED_CIRCLE";
+    editExtrudedPolygon: "EDIT_EXTRUDED_POLYGON";
+    editExtrudedRectangle: "EDIT_EXTRUDED_RECTANGLE";
+    editMarker: "EDIT_MARKER";
+    editPolygon: "EDIT_POLYGON";
+    editPolyline: "EDIT_POLYLINE";
+    editRectangle: "EDIT_RECTANGLE";
+    moveControlPoint: "MOVE";
     popPosition: "CANCEL";
     pushPosition: "EXTRUDE" | "NEXT";
+    recordOriginalControlPoint: "NEXT";
+    releaseControlPoint: "RELEASE";
+    updateControlPoints: "UPDATE";
   };
   eventsCausingDelays: {};
   eventsCausingGuards: {
@@ -47,6 +60,31 @@ export interface Typegen0 {
     | "drawing.polyline.vertex"
     | "drawing.rectangle"
     | "drawing.rectangle.vertex"
+    | "editing"
+    | "editing.circle"
+    | "editing.circle.moving"
+    | "editing.circle.waiting"
+    | "editing.extrudedCircle"
+    | "editing.extrudedCircle.moving"
+    | "editing.extrudedCircle.waiting"
+    | "editing.extrudedPolygon"
+    | "editing.extrudedPolygon.moving"
+    | "editing.extrudedPolygon.waiting"
+    | "editing.extrudedRectangle"
+    | "editing.extrudedRectangle.moving"
+    | "editing.extrudedRectangle.waiting"
+    | "editing.marker"
+    | "editing.marker.moving"
+    | "editing.marker.waiting"
+    | "editing.polygon"
+    | "editing.polygon.moving"
+    | "editing.polygon.waiting"
+    | "editing.polyline"
+    | "editing.polyline.moving"
+    | "editing.polyline.waiting"
+    | "editing.rectangle"
+    | "editing.rectangle.moving"
+    | "editing.rectangle.waiting"
     | "extruding"
     | "idle"
     | {
@@ -67,6 +105,25 @@ export interface Typegen0 {
               polyline?: "vertex";
               rectangle?: "vertex";
             };
+        editing?:
+          | "circle"
+          | "extrudedCircle"
+          | "extrudedPolygon"
+          | "extrudedRectangle"
+          | "marker"
+          | "polygon"
+          | "polyline"
+          | "rectangle"
+          | {
+              circle?: "moving" | "waiting";
+              extrudedCircle?: "moving" | "waiting";
+              extrudedPolygon?: "moving" | "waiting";
+              extrudedRectangle?: "moving" | "waiting";
+              marker?: "moving" | "waiting";
+              polygon?: "moving" | "waiting";
+              polyline?: "moving" | "waiting";
+              rectangle?: "moving" | "waiting";
+            };
       };
   tags: never;
 }

package/src/Map/Sketch/types.ts

@@ -1,27 +1,10 @@
 import { Feature as GeojsonFeature, MultiPolygon, Polygon, Point, LineString } from "geojson";
 import { ComponentType } from "react";
-import { RequireExactlyOne } from "type-fest";
 
-import { LayerAppearanceTypes } from "../../mantle";
+import { SketchComponentProps } from "../../engines/Cesium/Sketch";
+import { ComputedFeature, LayerAppearanceTypes } from "../../mantle";
 import { Position3d } from "../../types";
 
-type GeometryOptions = {
-  type: SketchType;
-  controlPoints: readonly Position3d[];
-};
-
-type SketchComponentProps = RequireExactlyOne<
-  {
-    geometry?: LineString | Polygon | MultiPolygon | null;
-    geometryOptions?: GeometryOptions | null;
-    extrudedHeight?: number;
-    disableShadow?: boolean;
-    enableRelativeHeight?: boolean;
-    color?: string;
-  },
-  "geometry" | "geometryOptions"
->;
-
 export type SketchComponentType = ComponentType<SketchComponentProps>;
 
 export type SketchType =
@@ -39,9 +22,9 @@ export type SketchOptions = {
   appearance?: SketchAppearance;
   dataOnly?: boolean;
   disableShadow?: boolean;
-  enableRelativeHeight?: boolean;
   rightClickToAbort?: boolean;
   autoResetInteractionMode?: boolean;
+  useCentroidExtrudedHeight?: boolean;
 };
 
 export type GeometryOptionsXYZ = {
@@ -81,3 +64,10 @@ export function isSketchType(value: unknown): value is SketchType {
     value === "extrudedPolygon"
   );
 }
+
+export type SketchEditingFeature = {
+  layerId: string;
+  feature: ComputedFeature;
+};
+
+export type SketchEditFeatureChangeCb = (feature: SketchEditingFeature | undefined) => void;

package/src/Map/Sketch/usePluginSketchLayer.ts

@@ -0,0 +1,105 @@
+import { Feature as GeojsonFeature } from "geojson";
+import { RefObject, useCallback } from "react";
+
+import { ComputedFeature } from "../Layer";
+import { LayerSimple, LazyLayer } from "../Layers";
+import { LayersRef } from "../types";
+
+import { SketchFeature, SketchOptions } from "./types";
+
+export default ({
+  layersRef,
+  sketchOptions,
+}: {
+  layersRef: RefObject<LayersRef | null>;
+  sketchOptions: SketchOptions;
+}) => {
+  const pluginSketchLayerCreate = useCallback(
+    (feature: SketchFeature) => {
+      const newLayer = layersRef.current?.add({
+        type: "simple",
+        data: {
+          type: "geojson",
+          isSketchLayer: true,
+          value: {
+            type: "FeatureCollection",
+            features: [{ ...feature, id: feature.properties.id }],
+          },
+          idProperty: "id",
+        },
+        ...sketchOptions.appearance,
+      });
+      return { layerId: newLayer?.id, featureId: feature.properties.id };
+    },
+    [layersRef, sketchOptions.appearance],
+  );
+
+  const pluginSketchLayerFeatureAdd = useCallback(
+    (layer: LazyLayer, feature: SketchFeature) => {
+      if (layer.type !== "simple") return {};
+      layersRef.current?.override(layer.id, {
+        data: {
+          ...layer.data,
+          type: "geojson",
+          value: {
+            type: "FeatureCollection",
+            features: [
+              ...((layer.computed?.layer as LayerSimple)?.data?.value?.features ?? []),
+              { ...feature, id: feature.properties.id },
+            ],
+          },
+        },
+      });
+      return { layerId: layer.id, featureId: feature.properties.id };
+    },
+    [layersRef],
+  );
+
+  const pluginSketchLayerFeatureUpdate = useCallback(
+    (layer: LazyLayer, feature: SketchFeature) => {
+      if (layer.type !== "simple") return {};
+      layersRef.current?.override(layer.id, {
+        data: {
+          ...layer.data,
+          type: "geojson",
+          value: {
+            type: "FeatureCollection",
+            features: (layer.computed?.layer as LayerSimple)?.data?.value?.features?.map(
+              (f: ComputedFeature) => (f.id === feature.id ? feature : f),
+            ),
+          },
+        },
+      });
+      return { layerId: layer.id, featureId: feature.properties.id };
+    },
+    [layersRef],
+  );
+
+  const pluginSketchLayerFeatureRemove = useCallback(
+    (layer: LazyLayer, featureId: string) => {
+      if (layer.type !== "simple" || layer.computed?.layer.type !== "simple") return;
+      layersRef.current?.override(layer.id, {
+        data: {
+          ...layer.data,
+          type: "geojson",
+          value: {
+            type: "FeatureCollection",
+            features: [
+              ...(layer.computed?.layer?.data?.value?.features ?? []).filter(
+                (feature: GeojsonFeature) => feature.id !== featureId,
+              ),
+            ],
+          },
+        },
+      });
+    },
+    [layersRef],
+  );
+
+  return {
+    pluginSketchLayerCreate,
+    pluginSketchLayerFeatureAdd,
+    pluginSketchLayerFeatureUpdate,
+    pluginSketchLayerFeatureRemove,
+  };
+};