@reearth/core 0.0.4 → 0.0.5-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reearth/core",
-  "version": "0.0.4",
+  "version": "0.0.5-beta.1",
   "author": "Re:Earth contributors <community@reearth.io>",
   "license": "Apache-2.0",
   "description": "A library that abstracts a map engine as one common API.",
@@ -13,20 +13,23 @@
     "dist"
   ],
   "scripts": {
-    "dev": "vite",
+    "dev": "vite -c vite.config.example.ts",
     "build": "tsc && vite build",
     "lint": "eslint . --ext ts,tsx --report-unused-disable-directives",
     "preview": "vite preview",
     "test": "vitest",
     "storybook": "storybook dev -p 6007",
-    "build-storybook": "storybook build"
+    "build-storybook": "storybook build",
+    "preversion": "yarn test run",
+    "version": "yarn build"
   },
   "engines": {
     "node": ">=20"
   },
   "peerDependencies": {
     "react": "^18.2.0",
-    "react-dom": "^18.2.0"
+    "react-dom": "^18.2.0",
+    "cesium": "1.x"
   },
   "dependencies": {
     "@reearth/cesium-mvt-imagery-provider": "1.5.4",
@@ -108,6 +111,7 @@
     "vite-plugin-cesium": "1.2.22",
     "vite-plugin-dts": "3.8.1",
     "vite-plugin-svgr": "4.2.0",
+    "vite-tsconfig-paths": "^4.3.2",
     "vitest": "1.0.4",
     "web-streams-polyfill": "3.2.1"
   },

package/src/engines/Cesium/Feature/Resource/utils.test.ts

@@ -50,12 +50,6 @@ test("attachProperties()", () => {
     outlineWidth: 100,
     outlineColor: "blue",
   });
-  expect(mockEntity.properties.reearth_originalProperties).toEqual({
-    polygon: {
-      material: toColor("blue"),
-      outlineWidth: 100,
-    },
-  });
 
   // Computed feature should not be changed.
   expect(mockComputedFeature).toEqual({

package/src/engines/Cesium/Feature/Resource/utils.ts

@@ -64,29 +64,26 @@ export function attachProperties<
   }
 
   const tag = getTag(entity);
+  const originalProperties = tag?.originalProperties || {};
+  const isUpdatedInLastUpdate = originalProperties[appearanceName];
 
-  // Backup original properties
-  overrideOriginalProperties(
-    entity,
-    tag,
-    propertyName,
-    Object.keys(propertyMap).reduce(
-      (r, k) => {
-        r[k] = (property as any)[k];
-        return r;
-      },
-      {} as Record<string, any>,
-    ),
-  );
-
+  let isUpdated = false;
   Object.entries(propertyMap).forEach(([entityPropertyKey, appearancePropertyKey]) => {
     const appearanceKeyName = appearancePropertyKey.name;
     const appearanceKeyType = appearancePropertyKey.type as AppearancePropertyKeyType;
 
     let value =
       appearancePropertyKey.override ??
-      (computedFeature?.[appearanceName] as any)?.[appearanceKeyName] ??
-      appearancePropertyKey.default;
+      (computedFeature?.[appearanceName] as any)?.[appearanceKeyName];
+    const isDefaultUsed = value == null && !!appearancePropertyKey.default;
+    value = value == null ? appearancePropertyKey.default : value;
+
+    if ((value == null || isDefaultUsed) && !isUpdatedInLastUpdate) {
+      return;
+    }
+
+    isUpdated = true;
+
     switch (appearanceKeyType) {
       case "color":
         value = toColor(value);
@@ -98,9 +95,14 @@ export function attachProperties<
         value = heightReference(value);
     }
 
+    if (value === (entity[propertyName] as any)[entityPropertyKey]) {
+      return;
+    }
+
     (entity[propertyName] as any)[entityPropertyKey] =
       value ?? (property as any)[entityPropertyKey];
   });
+  overrideOriginalProperties(entity, tag, appearanceName, isUpdated);
 }
 
 const hasAppearance = <
@@ -111,7 +113,7 @@ const hasAppearance = <
   entity: Entity,
   namePair: [appearanceName: AName, propertyName: PName],
 ): boolean => {
-  return !!(extractSimpleLayer(layer)?.[namePair[0]] || entity[namePair[1]]);
+  return !!(extractSimpleLayer(layer)?.[namePair[0]] && entity[namePair[1]]);
 };
 
 export const makeFeatureId = (e: Entity) => String(e.id);

package/src/engines/Cesium/hooks.ts

@@ -372,11 +372,15 @@ export default ({
     | GroundPrimitive
     | ImageryLayer
   >();
+  const prevSelectedImageryFeatureId = useRef<string | undefined>();
+
   // manage layer selection
   useEffect(() => {
     const viewer = cesium.current?.cesiumElement;
     if (!viewer || viewer.isDestroyed()) return;
 
+    if (prevSelectedImageryFeatureId.current === selectedLayerId?.featureId) return;
+
     const prevTag = getTag(prevSelectedEntity.current);
     if (
       (!prevTag?.featureId &&
@@ -571,11 +575,7 @@ export default ({
       const viewer = cesium.current?.cesiumElement;
       if (!viewer || viewer.isDestroyed()) return;
 
-      if (!target || typeof target === "undefined" || !("id" in target && target.id)) {
-        viewer.selectedEntity = undefined;
-        onLayerSelect?.();
-        return;
-      }
+      prevSelectedImageryFeatureId.current = undefined;
 
       const entity =
         findEntity(viewer, undefined, selectedLayerId?.featureId) ||
@@ -685,63 +685,60 @@ export default ({
           const l = await scene.imageryLayers.pickImageryLayerFeatures(pickRay, scene);
 
           // NOTE: For now we only send the first selected feature to onLayerSelect instead of sending all of them: @pyshx
-          if (!l) return;
-          const f = l[0];
+          const f = l?.[0];
+
+          const appearanceType = f?.data?.appearanceType;
+
+          if (appearanceType && f?.data?.feature?.[appearanceType]?.show !== false) {
+            const tag = getTag(f.imageryLayer);
+
+            const pos = f.position;
+            if (pos) {
+              // NOTE: Instantiate temporal Cesium.Entity to display indicator.
+              // Although we want to use `viewer.selectionIndicator.viewModel.position` and `animateAppear`, Cesium reset selection position if `viewer.selectedEntity` is not set.
+              // ref: https://github.com/CesiumGS/cesium/blob/9295450e64c3077d96ad579012068ea05f97842c/packages/widgets/Source/Viewer/Viewer.js#L1843-L1876
+              // issue: https://github.com/CesiumGS/cesium/issues/7965
+              requestAnimationFrame(() => {
+                if (!tag?.hideIndicator) {
+                  viewer.selectedEntity = new Entity({
+                    position: Cartographic.toCartesian(pos),
+                  });
+                }
+              });
+            }
 
-          const appearanceType = f.data?.appearanceType;
-          if (appearanceType && f.data?.feature?.[appearanceType]?.show === false) {
-            return;
-          }
+            const layer = tag?.layerId
+              ? layersRef?.current?.overriddenLayers().find(l => l.id === tag.layerId) ??
+                layersRef?.current?.findById(tag.layerId)
+              : undefined;
+            const content = getEntityContent(
+              f.data.feature ?? f,
+              viewer.clock.currentTime ?? new JulianDate(),
+              tag?.layerId ? layer?.infobox?.property?.defaultContent : undefined,
+            );
+            prevSelectedImageryFeatureId.current = f.data.featureId;
+            onLayerSelect?.(
+              f.data.layerId,
+              f.data.featureId,
+              content.value.length
+                ? {
+                    defaultInfobox: {
+                      title: layer?.title ?? f.name,
+                      content,
+                    },
+                  }
+                : undefined,
+              {
+                feature: f.data.feature,
+              },
+            );
 
-          const tag = getTag(f.imageryLayer);
-
-          const pos = f.position;
-          if (pos) {
-            // NOTE: Instantiate temporal Cesium.Entity to display indicator.
-            // Although we want to use `viewer.selectionIndicator.viewModel.position` and `animateAppear`, Cesium reset selection position if `viewer.selectedEntity` is not set.
-            // ref: https://github.com/CesiumGS/cesium/blob/9295450e64c3077d96ad579012068ea05f97842c/packages/widgets/Source/Viewer/Viewer.js#L1843-L1876
-            // issue: https://github.com/CesiumGS/cesium/issues/7965
-            requestAnimationFrame(() => {
-              if (!tag?.hideIndicator) {
-                viewer.selectedEntity = new Entity({
-                  position: Cartographic.toCartesian(pos),
-                });
-              }
-            });
+            return;
           }
-
-          const layer = tag?.layerId
-            ? layersRef?.current?.overriddenLayers().find(l => l.id === tag.layerId) ??
-              layersRef?.current?.findById(tag.layerId)
-            : undefined;
-          const content = getEntityContent(
-            f.data.feature ?? f,
-            viewer.clock.currentTime ?? new JulianDate(),
-            tag?.layerId ? layer?.infobox?.property?.defaultContent : undefined,
-          );
-          onLayerSelect?.(
-            f.data.layerId,
-            f.data.featureId,
-            content.value.length
-              ? {
-                  defaultInfobox: {
-                    title: layer?.title ?? f.name,
-                    content,
-                  },
-                }
-              : undefined,
-            {
-              feature: f.data.feature,
-            },
-          );
-
-          return;
         }
       }
 
-      if (!entity || (entity instanceof Entity && tag?.hideIndicator)) {
-        viewer.selectedEntity = undefined;
-      }
+      viewer.selectedEntity = undefined;
       onLayerSelect?.();
     },
     [