fix: overridden layers api on reearth/core (#477)

* fix: overridden layers api on reearth/core * test: fix
reearth · Feb 21, 2023 · abaade1 · abaade1
1 parent 1058abd
commit abaade1
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 11 deletions.
diff --git a/src/core/Crust/Plugins/api.ts b/src/core/Crust/Plugins/api.ts
@@ -293,7 +293,6 @@ export function commonReearth({
   selectedLayer,
   selectedFeature,
   layerSelectionReason,
-  layerOverriddenProperties,
   selectLayer,
   showLayer,
   hideLayer,
@@ -334,7 +333,6 @@ export function commonReearth({
   selectedLayer: () => GlobalThis["reearth"]["layers"]["selected"];
   selectedFeature: () => GlobalThis["reearth"]["layers"]["selectedFeature"];
   layerSelectionReason: () => GlobalThis["reearth"]["layers"]["selectionReason"];
-  layerOverriddenProperties?: () => GlobalThis["reearth"]["layers"]["overriddenProperties"];
   selectLayer: LayersRef["select"];
   layersInViewport: GlobalThis["reearth"]["layers"]["layersInViewport"];
   showLayer: GlobalThis["reearth"]["layers"]["show"];
@@ -459,8 +457,16 @@ export function commonReearth({
       get hide() {
         return hideLayer;
       },
+      // For compat
       get overriddenProperties() {
-        return layerOverriddenProperties?.();
+        return layers()
+          ?.overriddenLayers?.()
+          ?.reduce((res, v) => {
+            return {
+              ...res,
+              [v.id]: v.compat?.property,
+            };
+          }, {} as { [id: string]: any });
       },
       get overrideProperty() {
         return overrideLayerProperty;
@@ -510,6 +516,9 @@ export function commonReearth({
       get override() {
         return layers()?.override;
       },
+      get overridden() {
+        return layers()?.overriddenLayers?.();
+      },
       get replace() {
         return layers()?.replace;
       },

diff --git a/src/core/Crust/Plugins/hooks.ts b/src/core/Crust/Plugins/hooks.ts
@@ -268,10 +268,6 @@ export default function ({
     [layersRef],
   );
 
-  const layerOverriddenProperties = useCallback(() => {
-    return layersRef?.overriddenLayers();
-  }, [layersRef]);
-
   const value = useMemo<Context>(
     () => ({
       reearth: commonReearth({
@@ -288,7 +284,6 @@ export default function ({
         selectedLayer: getSelectedLayer,
         selectedFeature: getSelectedFeature,
         layerSelectionReason: getLayerSelectionReason,
-        layerOverriddenProperties,
         showLayer,
         hideLayer,
         addLayer,
@@ -367,7 +362,6 @@ export default function ({
       showLayer,
       zoomIn,
       zoomOut,
-      layerOverriddenProperties,
     ],
   );
 

diff --git a/src/core/Crust/Plugins/plugin_types.ts b/src/core/Crust/Plugins/plugin_types.ts
@@ -71,8 +71,9 @@ export type Reearth = {
       | "overriddenLayers"
     > & {
       readonly layersInViewport?: () => LazyLayer[] | undefined;
-      readonly overriddenProperties?: OverriddenLayer[];
+      readonly overriddenProperties?: { [id: string]: any };
       readonly overrideProperty?: (properties: LayerSimple["properties"] | undefined) => void;
+      readonly overridden?: OverriddenLayer[];
       readonly add?: (layer: NaiveLayer) => string | undefined;
       readonly delete?: WrappedRef<LayersRef>["deleteLayer"];
       readonly select?: (

diff --git a/src/core/Map/Layers/hooks.test.ts b/src/core/Map/Layers/hooks.test.ts
@@ -654,6 +654,7 @@ test("compat", () => {
     default: {
       location: { lat: 1, lng: 2 },
       pointSize: 10,
+      pointColor: "yellow",
     },
   });
 

diff --git a/src/core/Map/Layers/hooks.ts b/src/core/Map/Layers/hooks.ts
@@ -327,7 +327,7 @@ export default function useHooks({
         rawLayer.data.value.id = id;
       }
 
-      const layer2 = { id, ...omit(rawLayer, "id", "type", "children", "compat") };
+      const layer2 = { id, ...omit(rawLayer, "id", "type", "children") };
       setOverridenLayers(layers => {
         const i = layers.findIndex(l => l.id === id);
         if (i < 0) return [...layers, layer2];