Don't consider negative domain as valid in log/sqrt scale

Author: axelboc

packages/app/src/providers/mock/mock-file.ts

@@ -137,6 +137,7 @@ export function makeMockFile(): GroupWithChildren {
           valueId: 'twoD',
           attributes: [scalar('_FillValue', 400)],
         }),
+        array('twoD_neg'),
         array('twoD_bigint'),
         array('twoD_cplx'),
         array('twoD_compound', {

packages/lib/src/vis/shared/ViewportCenterer.tsx

@@ -17,9 +17,14 @@ function ViewportCenterer() {
   });
 
   useEffect(() => {
+    // On resize, move camera to the latest saved viewport center coordinates
     if (viewportCenter.current) {
-      // On resize, move camera to the latest saved viewport center coordinates
-      moveCameraTo(dataToWorld(viewportCenter.current));
+      const newPos = dataToWorld(viewportCenter.current);
+
+      // Ignore previous center if no longer valid with current scale
+      if (Number.isFinite(newPos.x) && Number.isFinite(newPos.y)) {
+        moveCameraTo(newPos);
+      }
     }
   }, [viewportCenter, moveCameraTo, dataToWorld, camera]);
 

packages/shared/src/mock-values.ts

@@ -174,6 +174,7 @@ export const mockValues = {
       [20, 41],
     );
   },
+  twoD_neg: () => ndarray(range(-10, 0), [1, 10]),
   threeD,
   threeD_cplx: () =>
     ndarray(

packages/shared/src/vis-utils.ts

@@ -167,16 +167,17 @@ export function getValidDomainForScale(
   }
 
   const { min, max, positiveMin, strictPositiveMin } = bounds;
-  if (scaleType === ScaleType.Log && min * max <= 0) {
-    // Clamp domain minimum to first positive value,
-    // or return `undefined` if domain is not unsupported: `[-x, 0]`
+
+  if (scaleType === ScaleType.Log && min <= 0) {
     return Number.isFinite(strictPositiveMin)
-      ? [strictPositiveMin, max]
-      : undefined;
+      ? [strictPositiveMin, max] // clamp min to first strictly positive value, if any
+      : undefined; // can't make valid domain - e.g. [-5, -2], [-10, 0]
   }
 
-  if (scaleType === ScaleType.Sqrt && min * max < 0) {
-    return [positiveMin, max];
+  if (scaleType === ScaleType.Sqrt && min < 0) {
+    return Number.isFinite(positiveMin)
+      ? [positiveMin, max] // clamp min to first positive value, if any
+      : undefined; // can't make valid domain - e.g. [-5, -2]
   }
 
   return [min, max];