fix: remove copyLazyLayer on reearth/core (#519)

fix: remove copyLazyLayer
reearth · Mar 7, 2023 · e172186 · e172186
1 parent 4a5ba4b
commit e172186
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 48 deletions.
diff --git a/src/core/Crust/Plugins/api.ts b/src/core/Crust/Plugins/api.ts
@@ -1,13 +1,11 @@
 import type { Tag } from "@reearth/core/mantle/compat";
 import {
-  copyLazyLayer,
   Events,
   Layer,
   LayerSelectionReason,
   LayersRef,
   NaiveLayer,
   LazyLayer,
-  copyLazyLayers,
 } from "@reearth/core/Map";
 import { merge } from "@reearth/util/object";
 
@@ -484,7 +482,7 @@ export function commonReearth({
         return !!layers()?.isLayer;
       },
       get layers() {
-        return copyLazyLayers(layers()?.layers()) ?? [];
+        return layers()?.layers() ?? [];
       },
       get tags() {
         return tags();
@@ -505,29 +503,27 @@ export function commonReearth({
         return selectedFeature();
       },
       get findById() {
-        return (id: string) => copyLazyLayer(layers()?.findById(id));
+        return (id: string) => layers()?.findById(id);
       },
       get findByIds() {
         return (...args: string[]) =>
-          copyLazyLayers(
-            layers()
-              ?.findByIds(...args)
-              ?.filter((l): l is LazyLayer => !!l),
-          );
+          layers()
+            ?.findByIds(...args)
+            ?.filter((l): l is LazyLayer => !!l);
       },
       get findByTags() {
-        return (...args: string[]) => copyLazyLayers(layers()?.findByTags(...args));
+        return (...args: string[]) => layers()?.findByTags(...args);
       },
       get findByTagLabels() {
-        return (...args: string[]) => copyLazyLayers(layers()?.findByTagLabels(...args));
+        return (...args: string[]) => layers()?.findByTagLabels(...args);
       },
       get find() {
         return (cb: (layer: LazyLayer, index: number, parents: LazyLayer[]) => boolean) =>
-          copyLazyLayer(layers()?.find(cb));
+          layers()?.find(cb);
       },
       get findAll() {
         return (cb: (layer: LazyLayer, index: number, parents: LazyLayer[]) => boolean) =>
-          copyLazyLayers(layers()?.findAll(cb));
+          layers()?.findAll(cb);
       },
       get override() {
         return layers()?.override;

diff --git a/src/core/Map/Layers/index.tsx b/src/core/Map/Layers/index.tsx
@@ -27,7 +27,6 @@ export type {
   ClusterProperty,
   Cluster,
 } from "../ClusteredLayers";
-export { copyLazyLayers, copyLazyLayer } from "./utils";
 
 export type Props = Omit<ClusteredLayerProps, "atomMap" | "isHidden"> & {
   hiddenLayers?: string[];

diff --git a/src/core/Map/Layers/utils.ts b/src/core/Map/Layers/utils.ts
@@ -1,8 +1,5 @@
 import { isArray, isObject } from "lodash-es";
 
-import { LazyLayer } from "./hooks";
-import { layerKeys, computedLayerKeys } from "./keys";
-
 export const deepAssign = <O extends Record<string, any>>(obj: O, src: O) => {
   return Object.fromEntries(
     Object.entries({ ...src, ...obj })
@@ -38,33 +35,3 @@ export const deepAssign = <O extends Record<string, any>>(obj: O, src: O) => {
       .filter((v): v is [string, any] => !!v),
   ) as O;
 };
-
-export const copyLazyLayers = (layers: LazyLayer[] | undefined) => {
-  return layers?.map(l => {
-    return copyLazyLayer(l);
-  });
-};
-
-export const copyLazyLayer = (l: LazyLayer | undefined) => {
-  return layerKeys.reduce((res, key) => {
-    if (key === "computed") {
-      res = {
-        ...res,
-        get [key]() {
-          return computedLayerKeys.reduce((computedRes, computedKey) => {
-            computedRes[computedKey] = l?.[key as keyof LazyLayer]?.[computedKey];
-            return computedRes;
-          }, {} as Record<string, any>);
-        },
-      };
-      return res;
-    }
-    res[key] = {
-      ...res,
-      get [key]() {
-        return l?.[key as keyof LazyLayer];
-      },
-    };
-    return res;
-  }, {} as Record<string, any>) as LazyLayer;
-};
diff --git a/src/core/Map/index.tsx b/src/core/Map/index.tsx
@@ -6,7 +6,6 @@ import type { Engine, EngineProps } from "./types";
 
 export * from "./types";
 export { useGet, type WrappedRef, type Undefinable, useOverriddenProperty } from "./utils";
-export { copyLazyLayers, copyLazyLayer } from "./Layers";
 
 export type {
   NaiveLayer,