@reearth/core 0.0.7-alpha.37 → 0.0.7-alpha.39

package/dist/index.d.ts

@@ -368,13 +368,21 @@ export declare type CoreVisualizerProps = {
     onSketchFeatureDelete?: (layerId: string, featureId: string) => void;
     onInteractionModeChange?: (mode: InteractionModeType) => void;
     onAPIReady?: () => void;
-    onCreditsUpdate?: (credits: Credit[]) => void;
+    onCreditsUpdate?: (credits?: Credits) => void;
 };
 
-export declare type Credit = {
+export declare type CreditItem = {
     html?: string;
 };
 
+export declare type Credits = {
+    engine: {
+        cesium?: CreditItem;
+    };
+    lightbox: CreditItem[];
+    screen: CreditItem[];
+};
+
 declare type CursorType = "default" | "auto" | "help" | "pointer" | "grab" | "crosshair" | "wait";
 
 export declare type Data = {
@@ -518,7 +526,7 @@ export declare type EngineProps = {
     onLayerSelectWithRectStart?: (e: LayerSelectWithRectStart) => void;
     onLayerSelectWithRectMove?: (e: LayerSelectWithRectMove) => void;
     onLayerSelectWithRectEnd?: (e: LayerSelectWithRectEnd) => void;
-    onCreditsUpdate?: (credits: Credit[]) => void;
+    onCreditsUpdate?: (credits?: Credits) => void;
 };
 
 export declare type EngineRef = {
@@ -607,7 +615,7 @@ export declare type EngineRef = {
     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];
-    getCredits: () => Credit[] | undefined;
+    getCredits: () => Credits | undefined;
 } & MouseEventHandles;
 
 export declare const engines: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reearth/core",
-  "version": "0.0.7-alpha.37",
+  "version": "0.0.7-alpha.39",
   "author": "Re:Earth contributors <community@reearth.io>",
   "license": "Apache-2.0",
   "description": "A library that abstracts a map engine as one common API.",

package/src/Map/types/index.ts

@@ -212,7 +212,7 @@ export type EngineRef = {
     p2: Position3d,
     p3: Position3d,
   ) => [p1: Position3d, p2: Position3d, p3: Position3d];
-  getCredits: () => Credit[] | undefined;
+  getCredits: () => Credits | undefined;
 } & MouseEventHandles;
 
 export type EngineProps = {
@@ -261,7 +261,7 @@ export type EngineProps = {
   onLayerSelectWithRectStart?: (e: LayerSelectWithRectStart) => void;
   onLayerSelectWithRectMove?: (e: LayerSelectWithRectMove) => void;
   onLayerSelectWithRectEnd?: (e: LayerSelectWithRectEnd) => void;
-  onCreditsUpdate?: (credits: Credit[]) => void;
+  onCreditsUpdate?: (credits?: Credits) => void;
 };
 
 export type LayerEditEvent = {
@@ -386,6 +386,14 @@ export type SketchRef = {
   onEditFeatureChange: (cb: SketchEditFeatureChangeCb) => void;
 };
 
-export type Credit = {
+export type CreditItem = {
   html?: string;
 };
+
+export type Credits = {
+  engine: {
+    cesium?: CreditItem;
+  };
+  lightbox: CreditItem[];
+  screen: CreditItem[];
+};

package/src/Visualizer/index.tsx

@@ -12,7 +12,7 @@ import {
   type LatLng,
   type Cluster,
   type ComputedLayer,
-  type Credit,
+  type Credits,
 } from "../Map";
 import { SketchFeature, SketchType } from "../Map/Sketch/types";
 
@@ -64,7 +64,7 @@ export type CoreVisualizerProps = {
   onSketchFeatureDelete?: (layerId: string, featureId: string) => void;
   onInteractionModeChange?: (mode: InteractionModeType) => void;
   onAPIReady?: () => void;
-  onCreditsUpdate?: (credits: Credit[]) => void;
+  onCreditsUpdate?: (credits?: Credits) => void;
 };
 
 export const CoreVisualizer = memo(

package/src/engines/Cesium/common.ts

@@ -42,6 +42,7 @@ import { MutableRefObject, useMemo } from "react";
 
 import type { Camera, Clock } from "..";
 import { ClassificationType } from "../../mantle";
+import { Credits } from "../../Map";
 import type {
   CameraOptions,
   FlyToDestination,
@@ -57,6 +58,7 @@ import { DEFAULT_SCREEN_SPACE_CAMERA_ASSIGNMENTS } from "./constants";
 export const layerIdField = `__reearth_layer_id`;
 
 const defaultImageSize = 50;
+const emptyCredites: Credits = { engine: {}, lightbox: [], screen: [] };
 
 const drawIcon = (
   image: HTMLImageElement | undefined,
@@ -903,7 +905,7 @@ export function getExtrudedHeight(
 }
 
 export function getCredits(viewer: Viewer) {
-  if (!viewer) return;
+  if (!viewer) return emptyCredites;
   const creditDisplay = viewer.creditDisplay as
     | (CreditDisplay & {
         _currentFrameCredits: {
@@ -914,22 +916,22 @@ export function getCredits(viewer: Viewer) {
       })
     | undefined;
 
-  if (!creditDisplay) return;
+  if (!creditDisplay) return emptyCredites;
 
   const { lightboxCredits, screenCredits } = creditDisplay?._currentFrameCredits || {};
   const cesiumCredits = creditDisplay._currentCesiumCredit;
 
-  const credits: {
-    html?: string;
-  }[] = [
-    ...(cesiumCredits?.html ? [{ html: cesiumCredits.html }] : []),
-    ...Array.from(lightboxCredits?._array ?? []).map(c => ({
+  const credits: Credits = {
+    engine: {
+      cesium: cesiumCredits?.html ? { html: cesiumCredits.html } : undefined,
+    },
+    lightbox: Array.from(lightboxCredits?._array ?? []).map(c => ({
       html: c?.credit?.html,
     })),
-    ...Array.from(screenCredits?._array ?? []).map(c => ({
+    screen: Array.from(screenCredits?._array ?? []).map(c => ({
       html: c?.credit?.html,
     })),
-  ];
+  };
 
   return credits;
 }

package/src/engines/Cesium/hooks.ts

@@ -27,7 +27,7 @@ import type {
 import { e2eAccessToken, setE2ECesiumViewer } from "../../e2eConfig";
 import { ComputedFeature, DataType, SelectedFeatureInfo, LatLng, Camera } from "../../mantle";
 import {
-  Credit,
+  Credits,
   LayerLoadEvent,
   LayerSelectWithRectEnd,
   LayerSelectWithRectMove,
@@ -130,7 +130,7 @@ export default ({
   onLayerLoad?: (e: LayerLoadEvent) => void;
   onCameraChange?: (camera: Camera) => void;
   onMount?: () => void;
-  onCreditsUpdate?: (credits: Credit[]) => void;
+  onCreditsUpdate?: (credits: Credits) => void;
 }) => {
   const cesium = useRef<CesiumComponentRef<CesiumViewer>>(null);
 
@@ -665,7 +665,7 @@ export default ({
       if (!onCreditsUpdateRef.current) return;
       const viewer = cesium.current?.cesiumElement;
       if (!viewer || viewer.isDestroyed()) return;
-      const credits: Credit[] = getCredits(viewer) ?? [];
+      const credits = getCredits(viewer);
       onCreditsUpdateRef.current(credits);
     }, 3000);
   }, []);

package/src/mantle/evaluator/simple/expression/expression.test.ts

@@ -26,6 +26,14 @@ describe("replaceDefines", () => {
     });
     expect(result).toBe("(value1) + (value2)");
   });
+
+  test("should handle Japanese text with multiple variables", () => {
+    const result = replaceDefines("${住所} (${人数}人)", {
+      住所: "東京都渋谷区",
+      人数: "5",
+    });
+    expect(result).toBe("(東京都渋谷区) ((5)人)");
+  });
 });
 
 describe("removeBackslashes", () => {
@@ -40,6 +48,70 @@ describe("removeBackslashes", () => {
   });
 });
 
+describe("Expression evaluation", () => {
+  test("should evaluate Japanese expression with feature properties as string literal", () => {
+    const expressionString = '"${住所} (${人数}人)"';
+    const feature = {
+      properties: {
+        住所: "緑町",
+        人数: 2,
+      },
+    } as Feature;
+
+    const expression = new Expression(expressionString, feature);
+    const result = expression.evaluate();
+
+    expect(result).toBe("緑町 (2人)");
+  });
+
+  test("should evaluate Japanese expression with two spaces - user observation", () => {
+    const expressionString = '"${住所}  (${人数}人)"';
+    const feature = {
+      properties: {
+        住所: "緑町",
+        人数: 2,
+      },
+    } as Feature;
+
+    const expression = new Expression(expressionString, feature);
+    const result = expression.evaluate();
+
+    expect(result).toBe("緑町  (2人)");
+  });
+
+  test("should evaluate expression with multiple variables", () => {
+    const expressionString = '"${name}: ${住所} (${人数}人) - ${status}"';
+    const feature = {
+      properties: {
+        name: "太郎",
+        住所: "緑町",
+        人数: 2,
+        status: "完了",
+      },
+    } as Feature;
+
+    const expression = new Expression(expressionString, feature);
+    const result = expression.evaluate();
+
+    expect(result).toBe("太郎: 緑町 (2人) - 完了");
+  });
+
+  test("should evaluate Japanese expression without quotes - shows the issue", () => {
+    const expressionString = "${住所} (${人数}人)";
+    const feature = {
+      properties: {
+        住所: "緑町",
+        人数: 2,
+      },
+    } as Feature;
+
+    expect(() => {
+      const expression = new Expression(expressionString, feature);
+      expression.evaluate();
+    }).toThrow('Unexpected function call "czm_住所"');
+  });
+});
+
 describe("expression caches", () => {
   beforeEach(() => {
     EXPRESSION_CACHES.clear();

package/src/mantle/evaluator/simple/expression/node.ts

@@ -175,18 +175,16 @@ export class Node {
   }
   _evaluateVariableString(feature?: Feature) {
     const variableRegex = /\${(.*?)}/g;
-    let result = this._value;
-    let match = variableRegex.exec(result);
-    while (match !== null) {
-      const placeholder = match[0];
-      const variableName = match[1];
-      let property = feature?.properties[variableName];
-      if (typeof property === "undefined") {
-        property = "";
-      }
-      result = result.replace(placeholder, property);
-      match = variableRegex.exec(result);
-    }
+    const result = this._value.replace(
+      variableRegex,
+      (_placeholder: string, variableName: string) => {
+        let property = feature?.properties[variableName];
+        if (typeof property === "undefined") {
+          property = "";
+        }
+        return property;
+      },
+    );
     return result;
   }
   _evaluateVariable(feature?: Feature) {