@reearth/core 0.0.7-alpha.13 → 0.0.7-alpha.15

package/dist/index.d.ts

@@ -17,7 +17,6 @@ import { PropsWithoutRef } from 'react';
 import { ReactNode } from 'react';
 import { RefAttributes } from 'react';
 import { RefObject } from 'react';
-import { RequireExactlyOne } from 'type-fest';
 import { WritableAtom } from 'jotai';
 
 export declare type AmbientOcclusionProperty = {
@@ -278,6 +277,7 @@ declare type CommonProps = {
     isHidden?: boolean;
     isSelected?: boolean;
     meta?: Record<string, unknown>;
+    sketchEditingFeature?: SketchEditingFeature;
 };
 
 export declare function computeAtom(cache?: typeof globalDataFeaturesCache): WritableAtom<ComputedLayer | undefined, Command, void>;
@@ -299,6 +299,8 @@ export declare type ConditionsExpression = {
     conditions: [string, string][];
 };
 
+declare type ControlPointMouseEventHandler = (index: number, isExtrudedPoint: boolean, type: "mousedown" | "click") => void;
+
 export declare function convertLayer(l: Layer): LegacyLayer | undefined;
 
 export declare function convertLegacyCluster(clusters: LegacyCluster[]): Cluster[];
@@ -320,6 +322,8 @@ declare 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;
@@ -359,7 +363,10 @@ export declare 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;
 };
 
 export declare type CursorType = "auto" | "grab" | "crosshair";
@@ -532,6 +539,7 @@ export declare type EngineRef = {
     setView: (camera: CameraPosition) => void;
     toWindowPosition: (position: [x: number, y: number, z: number]) => [x: number, y: number] | undefined;
     getExtrudedHeight: (position: [x: number, y: number, z: number], windowPosition: [x: number, y: number]) => number | undefined;
+    getExtrudedPoint: (position: [x: number, y: number, z: number], extrutedHeight: number) => Position3d | undefined;
     getSurfaceDistance: (point1: Cartesian3, point2: Cartesian3) => number | undefined;
     equalsEpsilon2d: (point1: Position2d, point2: Position2d, relativeEpsilon: number | undefined, absoluteEpsilon: number | undefined) => boolean;
     equalsEpsilon3d: (point1: Position3d, point2: Position3d, relativeEpsilon: number | undefined, absoluteEpsilon: number | undefined) => boolean;
@@ -589,6 +597,7 @@ export declare type EngineRef = {
     selectFeatures: (layerId: string, featureId: string[]) => void;
     unselectFeatures: (layerId: string, featureId: string[]) => void;
     pickManyFromViewport: (windowPosition: [x: number, y: number], windowWidth: number, windowHeight: number, condition?: (f: PickedFeature) => boolean) => PickedFeature[] | undefined;
+    calcRectangleControlPoint: (p1: Position3d, p2: Position3d, p3: Position3d) => [p1: Position3d, p2: Position3d, p3: Position3d];
 } & MouseEventHandles;
 
 export declare const engines: {
@@ -747,11 +756,6 @@ export declare type FrustumAppearance = {
 
 export declare type Geometry = Point | LineString | Polygon_2 | MultiPoint | MultiLineString | MultiPolygon;
 
-declare type GeometryOptions = {
-    type: SketchType;
-    controlPoints: readonly Position3d[];
-};
-
 export declare type GeometryOptionsXYZ = {
     type: SketchType;
     controlPoints: Position3d[];
@@ -955,6 +959,7 @@ export declare type LayersRef = {
     deleteLayer: (...ids: string[]) => void;
     isLayer: (obj: any) => obj is LazyLayer;
     isComputedLayer: (obj: any) => obj is ComputedLayer;
+    isTempLayer: (layerId?: string) => boolean;
     layers: () => LazyLayer[];
     walk: <T>(fn: (layer: LazyLayer, index: number, parents: LazyLayer[]) => T | void) => T | undefined;
     find: (fn: (layer: LazyLayer, index: number, parents: LazyLayer[]) => boolean) => LazyLayer | undefined;
@@ -985,6 +990,7 @@ export declare type LayerVisibilityEvent = {
  */
 export declare type LazyLayer = Readonly<Layer> & {
     computed?: Readonly<ComputedLayer>;
+    isTempLayer?: boolean;
     pluginId?: string;
     extensionId?: string;
     property?: any;
@@ -1075,7 +1081,8 @@ export declare type LUT = readonly ColorTuple[];
 declare const Map_2: ForwardRefExoticComponent<    {
 engines?: Record<string, Engine> | undefined;
 engine?: string | undefined;
-} & Omit<Props_2, "Feature" | "viewerProperty" | "selectionReason" | "delegatedDataTypes" | "clusterComponent" | "selectedLayerId"> & Omit<EngineProps, "onLayerSelect" | "selectedLayerId" | "layerSelectionReason"> & Omit<SketchProps, "engineRef" | "layersRef" | "SketchComponent"> & {
+onAPIReady?: (() => void) | undefined;
+} & Omit<Props_2, "Feature" | "viewerProperty" | "selectionReason" | "delegatedDataTypes" | "clusterComponent" | "selectedLayerId"> & Omit<EngineProps, "onLayerSelect" | "selectedLayerId" | "layerSelectionReason"> & Omit<SketchProps, "engineRef" | "SketchComponent" | "layersRef"> & {
 cursor?: CursorType | undefined;
 } & RefAttributes<MapRef>>;
 export { Map_2 as Map }
@@ -1317,6 +1324,7 @@ declare type PropertyItem<T> = {
 export declare type Props = {
     engines?: Record<string, Engine>;
     engine?: string;
+    onAPIReady?: () => void;
 } & Omit<Props_2, "Feature" | "clusterComponent" | "selectionReason" | "delegatedDataTypes" | "selectedLayerId" | "viewerProperty"> & Omit<EngineProps, "onLayerSelect" | "layerSelectionReason" | "selectedLayerId"> & Omit<SketchProps, "layersRef" | "engineRef" | "SketchComponent"> & {
     cursor?: CursorType;
 };
@@ -1332,6 +1340,7 @@ declare type Props_2 = Omit<Props_3, "atomMap" | "isHidden" | "selectedLayerId">
     requestingRenderMode?: MutableRefObject<RequestingRenderMode>;
     engineRef?: RefObject<EngineRef>;
     onLayerSelect?: (layerId: string | undefined, featureId: string | undefined, layer: (() => Promise<ComputedLayer | undefined>) | undefined, reason: LayerSelectionReason | undefined, info: SelectedFeatureInfo | undefined) => void;
+    onMount?: () => void;
 };
 
 declare type Props_3 = {
@@ -1459,17 +1468,34 @@ export declare type ShadowProperty = {
 
 export declare type SketchAppearance = Partial<LayerAppearanceTypes>;
 
-declare type SketchComponentProps = RequireExactlyOne<{
-    geometry?: LineString | Polygon_2 | MultiPolygon | null;
-    geometryOptions?: GeometryOptions | null;
+declare type SketchComponentProps = {
+    geometryOptions?: {
+        type: SketchType;
+        controlPoints: readonly Position3d[];
+    } | null;
     extrudedHeight?: number;
+    extrudedPoint?: Position3d;
+    centroidBasePoint?: Position3d;
+    centroidExtrudedPoint?: Position3d;
     disableShadow?: boolean;
-    enableRelativeHeight?: boolean;
     color?: string;
-}, "geometry" | "geometryOptions">;
+    isEditing?: boolean;
+    catchedControlPointIndex?: number;
+    catchedExtrudedPoint?: boolean;
+    selectedControlPointIndex?: number;
+    handleControlPointMouseEvent?: ControlPointMouseEventHandler;
+    handleAddControlPoint?: (position: Position3d, index: number) => void;
+};
 
 export declare type SketchComponentType = ComponentType<SketchComponentProps>;
 
+export declare type SketchEditFeatureChangeCb = (feature: SketchEditingFeature | undefined) => void;
+
+export declare type SketchEditingFeature = {
+    layerId: string;
+    feature: ComputedFeature;
+};
+
 export declare type SketchEventCallback = (event: SketchEventProps) => void;
 
 export declare type SketchEventProps = {
@@ -1490,9 +1516,9 @@ export declare type SketchOptions = {
     appearance?: SketchAppearance;
     dataOnly?: boolean;
     disableShadow?: boolean;
-    enableRelativeHeight?: boolean;
     rightClickToAbort?: boolean;
     autoResetInteractionMode?: boolean;
+    useCentroidExtrudedHeight?: boolean;
 };
 
 export declare type SketchProps = {
@@ -1505,7 +1531,17 @@ export declare type SketchProps = {
     onSketchTypeChange?: (type: SketchType | undefined, from?: "editor" | "plugin") => void;
     onSketchFeatureCreate?: (feature: SketchFeature | null) => void;
     onSketchPluginFeatureCreate?: (props: SketchEventProps) => void;
+    onSketchFeatureUpdate?: (feature: SketchFeature | null) => void;
+    onSketchPluginFeatureUpdate?: (props: SketchEventProps) => void;
+    onSketchFeatureDelete?: (layerId: string, featureId: string) => void;
+    onSketchPluginFeatureDelete?: (props: {
+        layerId: string;
+        featureId: string;
+    }) => void;
     onLayerSelect?: OnLayerSelectType;
+    sketchEditingFeature?: SketchEditingFeature;
+    onSketchEditFeature?: (feature: SketchEditingFeature | undefined) => void;
+    onMount?: () => void;
 };
 
 export declare type SketchRef = {
@@ -1513,6 +1549,11 @@ export declare type SketchRef = {
     setType: (type: SketchType | undefined, from?: "editor" | "plugin") => void;
     getOptions: () => SketchOptions;
     overrideOptions: (options: SketchOptions) => void;
+    editFeature: (feature: SketchEditingFeature | undefined) => void;
+    cancelEdit: (ignoreAutoReSelect?: boolean) => void;
+    applyEdit: () => void;
+    deleteFeature: (layerId: string, featureId: string) => void;
+    onEditFeatureChange: (cb: SketchEditFeatureChangeCb) => void;
 };
 
 export declare type SketchType = "marker" | "polyline" | "circle" | "rectangle" | "polygon" | "extrudedCircle" | "extrudedRectangle" | "extrudedPolygon";
@@ -1581,6 +1622,8 @@ export declare type TileLabelProperty = {
     id: string;
     labelType: "japan_gsi_optimal_bvmap";
     style: Record<string, any>;
+    near?: number;
+    far?: number;
 };
 
 export declare type TileProperty = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reearth/core",
-  "version": "0.0.7-alpha.13",
+  "version": "0.0.7-alpha.15",
   "author": "Re:Earth contributors <community@reearth.io>",
   "license": "Apache-2.0",
   "description": "A library that abstracts a map engine as one common API.",
@@ -21,7 +21,8 @@
     "storybook": "storybook dev -p 6007",
     "build-storybook": "storybook build",
     "preversion": "yarn test run",
-    "version": "yarn build"
+    "version": "yarn build",
+    "sketch-typegen": "xstate typegen src/**/sketchMachine.ts"
   },
   "engines": {
     "node": ">=20"
@@ -33,12 +34,13 @@
   },
   "dependencies": {
     "@radix-ui/react-checkbox": "1.1.1",
-    "@radix-ui/react-select": "2.1.1",
-    "@radix-ui/react-separator": "1.1.0",
-    "@radix-ui/react-switch": "1.1.0",
     "@radix-ui/react-dialog": "1.1.1",
     "@radix-ui/react-icons": "1.3.0",
+    "@radix-ui/react-select": "2.1.1",
+    "@radix-ui/react-separator": "1.1.0",
     "@radix-ui/react-slot": "1.1.0",
+    "@radix-ui/react-switch": "1.1.0",
+    "@radix-ui/react-toggle": "1.1.0",
     "@reearth/cesium-mvt-imagery-provider": "1.5.4",
     "@rot1024/use-transition": "1.0.0",
     "@seznam/compose-react-refs": "1.0.6",
@@ -106,6 +108,7 @@
     "@typescript-eslint/eslint-plugin": "7.2.0",
     "@typescript-eslint/parser": "7.2.0",
     "@vitejs/plugin-react": "4.2.1",
+    "@xstate/cli": "0.5.17",
     "autoprefixer": "10.4.20",
     "cesium": "1.118.0",
     "class-variance-authority": "0.7.0",

package/src/Map/Layer/hooks.ts

@@ -107,12 +107,15 @@ export default function useHooks({
     };
   }, [layer, forceUpdateFeatures]);
 
-  const prevForceUpdatableData = useRef<Pick<Data, "csv" | "jsonProperties">>();
+  const prevForceUpdatableData = useRef<Pick<Data, "csv" | "jsonProperties" | "value">>();
   useLayoutEffect(() => {
     const data = layer?.type === "simple" ? layer.data : undefined;
-    const forceUpdatableData = pick(data, "csv", "jsonProperties");
+    const forceUpdatableData = pick(data, "csv", "jsonProperties", "value");
 
-    if (isEqual(forceUpdatableData, prevForceUpdatableData.current) || !data?.url) {
+    if (
+      isEqual(forceUpdatableData, prevForceUpdatableData.current) ||
+      (!data?.url && !data?.value)
+    ) {
       return;
     }
 

package/src/Map/Layer/index.tsx

@@ -9,6 +9,7 @@ import type {
   ComputedFeature,
   LayerSimple,
 } from "../../mantle";
+import { SketchEditingFeature } from "../Sketch";
 import { ViewerProperty } from "../types";
 
 import useHooks, { type Atom, type EvalFeature } from "./hooks";
@@ -25,6 +26,7 @@ export type CommonProps = {
   isHidden?: boolean;
   isSelected?: boolean;
   meta?: Record<string, unknown>;
+  sketchEditingFeature?: SketchEditingFeature;
 };
 
 export type FeatureComponentProps = {

package/src/Map/Layers/hooks.ts

@@ -35,6 +35,7 @@ export type { Layer, NaiveLayer } from "../../mantle";
  */
 export type LazyLayer = Readonly<Layer> & {
   computed?: Readonly<ComputedLayer>;
+  isTempLayer?: boolean;
   // compat
   pluginId?: string;
   extensionId?: string;
@@ -53,6 +54,7 @@ export type Ref = {
   deleteLayer: (...ids: string[]) => void;
   isLayer: (obj: any) => obj is LazyLayer;
   isComputedLayer: (obj: any) => obj is ComputedLayer;
+  isTempLayer: (layerId?: string) => boolean;
   layers: () => LazyLayer[];
   walk: <T>(
     fn: (layer: LazyLayer, index: number, parents: LazyLayer[]) => T | void,
@@ -119,6 +121,7 @@ export default function useHooks({
   requestingRenderMode,
   onLayerSelect,
   engineRef,
+  onMount,
 }: {
   layers?: Layer[];
   ref?: ForwardedRef<Ref>;
@@ -137,6 +140,7 @@ export default function useHooks({
     info: SelectedFeatureInfo | undefined,
   ) => void;
   engineRef?: RefObject<EngineRef>;
+  onMount?: () => void;
 }) {
   const layerMap = useMemo(() => new Map<string, Layer>(), []);
   const [overriddenLayers, setOverridenLayers] = useState<OverriddenLayer[]>([]);
@@ -456,6 +460,13 @@ export default function useHooks({
     [lazyLayerPrototype],
   );
 
+  const isTempLayer = useCallback(
+    (layerId?: string) => {
+      return tempLayersRef.current.some(l => l.id === layerId);
+    },
+    [tempLayersRef],
+  );
+
   const isComputedLayer = useCallback(
     (obj: any): obj is ComputedLayer => {
       return typeof obj === "object" && Object.getPrototypeOf(obj) === lazyComputedLayerPrototype;
@@ -560,6 +571,7 @@ export default function useHooks({
       findByIds,
       isLayer,
       isComputedLayer,
+      isTempLayer,
       layers: rootLayers,
       walk,
       find,
@@ -585,6 +597,7 @@ export default function useHooks({
       findByIds,
       isLayer,
       isComputedLayer,
+      isTempLayer,
       rootLayers,
       walk,
       find,
@@ -602,6 +615,10 @@ export default function useHooks({
     ],
   );
 
+  useEffect(() => {
+    onMount?.();
+  }, [onMount]);
+
   const prevLayers = useRef<Layer[] | undefined>([]);
   useLayoutEffect(() => {
     const ids = new Set<string>();

package/src/Map/Layers/index.tsx

@@ -46,10 +46,20 @@ export type Props = Omit<ClusteredLayerProps, "atomMap" | "isHidden" | "selected
     reason: LayerSelectionReason | undefined,
     info: SelectedFeatureInfo | undefined,
   ) => void;
+  onMount?: () => void;
 };
 
 const Layers: ForwardRefRenderFunction<Ref, Props> = (
-  { layers, selectedLayer, hiddenLayers, requestingRenderMode, engineRef, onLayerSelect, ...props },
+  {
+    layers,
+    selectedLayer,
+    hiddenLayers,
+    requestingRenderMode,
+    engineRef,
+    onLayerSelect,
+    onMount,
+    ...props
+  },
   ref,
 ) => {
   const { atomMap, flattenedLayers, isHidden } = useHooks({
@@ -60,6 +70,7 @@ const Layers: ForwardRefRenderFunction<Ref, Props> = (
     requestingRenderMode,
     engineRef,
     onLayerSelect,
+    onMount,
   });
 
   return (

package/src/Map/Layers/keys.ts

@@ -18,6 +18,7 @@ export const layerKeys = objKeys<
   computed: 1,
   defines: 1,
   layerStyleId: 1,
+  isTempLayer: 1,
   // appearance
   ...appearanceKeyObj,
   // legacy layer