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

package/src/Map/Geoid/index.tsx

@@ -0,0 +1,68 @@
+import {
+  forwardRef,
+  ForwardRefRenderFunction,
+  useCallback,
+  useImperativeHandle,
+  useRef,
+} from "react";
+
+import { GeoidServer, GeoidRef } from "./types";
+
+export type GeoidProps = {
+  geoidServer?: GeoidServer;
+};
+
+const MAX_GEOID_CACHE_SIZE = 1000;
+
+const Geoid: ForwardRefRenderFunction<GeoidRef, GeoidProps> = ({ geoidServer }, ref) => {
+  const geoidCache = useRef<Map<string, number>>(new Map());
+
+  const getGeoidHeight = useCallback(
+    async (lng?: number, lat?: number): Promise<number | undefined> => {
+      if (!geoidServer?.url || !geoidServer?.geoidProperty) {
+        console.error("Geoid: Server is not set properly");
+        return Promise.resolve(undefined);
+      }
+
+      if (lat === undefined || lng === undefined) {
+        console.error("Geoid: Invalid lat or lng");
+        return Promise.resolve(undefined);
+      }
+
+      const cache = geoidCache.current.get(`${lng},${lat}`);
+      if (cache) return Promise.resolve(cache);
+
+      return fetch(
+        geoidServer.url.replace("${lng}", lng.toString()).replace("${lat}", lat.toString()),
+      )
+        .then(res => {
+          return res.json().then((result: any) => {
+            if (!result) return undefined;
+            const geoid = Number(result[geoidServer?.geoidProperty]);
+            if (!isNaN(geoid)) {
+              const cache = geoidCache.current;
+              if (cache.size > MAX_GEOID_CACHE_SIZE) {
+                const firstKey = cache.keys().next().value;
+                if (firstKey) cache.delete(firstKey);
+              }
+              cache.set(`${lng},${lat}`, geoid);
+              return geoid;
+            }
+            return undefined;
+          });
+        })
+        .catch(e => {
+          console.error("Failed to fetch geoid height", e);
+          return undefined;
+        });
+    },
+    [geoidServer?.url, geoidServer?.geoidProperty],
+  );
+
+  useImperativeHandle(ref, () => ({
+    getGeoidHeight,
+  }));
+  return null;
+};
+
+export default forwardRef(Geoid);

package/src/Map/Geoid/types.ts

@@ -0,0 +1,8 @@
+export type GeoidServer = {
+  url: string; // URL of the geoid server. use ${lat} ${lng} for lat/lng placeholders. Example: "https://mock.com/api/altitude?lat=${lat}&lng=${lng}"
+  geoidProperty: string; // TODO: support json path
+};
+
+export type GeoidRef = {
+  getGeoidHeight: (lat?: number, lng?: number) => Promise<number | undefined>;
+};

package/src/Map/Layer/hooks.ts

@@ -90,7 +90,7 @@ export default function useHooks({
     });
   }, [layer, set]);
 
-  const intervalId = useRef<number>();
+  const intervalId = useRef<number>(undefined);
   useLayoutEffect(() => {
     const data = layer?.type === "simple" ? layer.data : undefined;
 
@@ -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">>(undefined);
   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

@@ -1,4 +1,4 @@
-import { ComponentType } from "react";
+import { ComponentType, type JSX } from "react";
 
 import type {
   DataRange,
@@ -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>;
@@ -136,7 +139,8 @@ export default function useHooks({
     reason: LayerSelectionReason | undefined,
     info: SelectedFeatureInfo | undefined,
   ) => void;
-  engineRef?: RefObject<EngineRef>;
+  engineRef?: RefObject<EngineRef | null>;
+  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>();
@@ -734,7 +751,7 @@ function useSelection({
     reason: LayerSelectionReason | undefined,
     info: SelectedFeatureInfo | undefined,
   ) => void;
-  engineRef?: RefObject<EngineRef>;
+  engineRef?: RefObject<EngineRef | null>;
   updateStyle: (layerId: string) => void;
 }) {
   const [selectedLayer, selectedComputedFeature]: SelectedLayer = useMemo(

package/src/Map/Layers/index.tsx

@@ -38,7 +38,7 @@ export type Props = Omit<ClusteredLayerProps, "atomMap" | "isHidden" | "selected
   hiddenLayers?: string[];
   viewerProperty?: ViewerProperty;
   requestingRenderMode?: MutableRefObject<RequestingRenderMode>;
-  engineRef?: RefObject<EngineRef>;
+  engineRef?: RefObject<EngineRef | null>;
   onLayerSelect?: (
     layerId: string | undefined,
     featureId: string | undefined,
@@ -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