feat: support json properties on reearth/core (#412)

* feat: support json properties * fix: copy
reearth · Feb 1, 2023 · ac79868 · ac79868
1 parent 07a9359
commit ac79868
Show file tree

Hide file tree

Showing 3 changed files with 77 additions and 7 deletions.
diff --git a/src/core/mantle/evaluator/simple/index.test.ts b/src/core/mantle/evaluator/simple/index.test.ts
@@ -41,6 +41,54 @@ test("evalSimpleLayer", async () => {
   });
 });
 
+test("evaluate json properties", async () => {
+  expect(
+    await evalSimpleLayer(
+      {
+        id: "x",
+        type: "simple",
+        data: {
+          type: "geojson",
+          jsonProperties: ["key1", "key2"],
+        },
+      },
+      {
+        getAllFeatures: async () => [
+          {
+            type: "feature",
+            id: "a",
+          },
+          {
+            type: "feature",
+            id: "b",
+            properties: {
+              key1: `["hoge", "fuga"]`,
+              key2: "abc",
+            },
+          },
+        ],
+        getFeatures: async () => undefined,
+      },
+    ),
+  ).toEqual({
+    layer: {},
+    features: [
+      {
+        type: "computedFeature",
+        id: "a",
+      },
+      {
+        type: "computedFeature",
+        id: "b",
+        properties: {
+          key1: ["hoge", "fuga"],
+          key2: "abc",
+        },
+      },
+    ],
+  });
+});
+
 describe("Conditional styling", () => {
   test("conditions with variables from properties, members and Strictly Equals", () => {
     expect(

diff --git a/src/core/mantle/evaluator/simple/index.ts b/src/core/mantle/evaluator/simple/index.ts
@@ -23,19 +23,16 @@ export async function evalSimpleLayer(
   const appearances: Partial<LayerAppearanceTypes> = pick(layer, appearanceKeys);
   return {
     layer: evalLayerAppearances(appearances, layer),
-    features: features?.map(f => ({
-      ...f,
-      ...evalLayerAppearances(appearances, layer, f),
-      type: "computedFeature",
-    })),
+    features: features?.map(f => evalSimpleLayerFeature(layer, f)),
   };
 }
 
 export const evalSimpleLayerFeature = (layer: LayerSimple, feature: Feature): ComputedFeature => {
   const appearances: Partial<LayerAppearanceTypes> = pick(layer, appearanceKeys);
+  const nextFeature = evalJsonProperties(layer, feature);
   return {
-    ...feature,
-    ...evalLayerAppearances(appearances, layer, feature),
+    ...nextFeature,
+    ...evalLayerAppearances(appearances, layer, nextFeature),
     type: "computedFeature",
   };
 };
@@ -77,3 +74,27 @@ function evalExpression(expressionContainer: any, layer: LayerSimple, feature?:
   }
   return expressionContainer;
 }
+
+function evalJsonProperties(layer: LayerSimple, feature: Feature): Feature {
+  const keys = layer.data?.jsonProperties;
+  if (!feature.properties || !keys || !keys.length) {
+    return feature;
+  }
+
+  const next = {
+    ...feature,
+    ...(feature?.properties ? { properties: { ...feature.properties } } : {}),
+  };
+  keys.forEach(k => {
+    next.properties[k] = (() => {
+      const p = next.properties[k];
+      try {
+        return JSON.parse(p);
+      } catch {
+        return p;
+      }
+    })();
+  });
+
+  return next;
+}
diff --git a/src/core/mantle/types/index.ts b/src/core/mantle/types/index.ts
@@ -62,6 +62,7 @@ export type Data = {
   url?: string;
   value?: any;
   layers?: string | string[];
+  jsonProperties?: string[];
   csv?: {
     idColumn?: string | number;
     latColumn?: string | number;