fix: size & opacity

Kanaries · Oct 27, 2023 · a57f414 · a57f414
1 parent a3c90f9
commit a57f414
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/packages/graphic-walker/src/components/leafletRenderer/encodings.ts b/packages/graphic-walker/src/components/leafletRenderer/encodings.ts
@@ -196,8 +196,8 @@ export const useSizeScale = (data: IRow[], field: IViewField | null | undefined,
             if (isNaN(val)) {
                 return defaultSize;
             }
-            const size = (val - domainMin) / (domainMax - domainMin);
-            return minSize + Math.sqrt(size) * (maxSize - minSize);
+            const percent = Math.max(Math.min((val - domainMin) / (domainMax - domainMin), 1), 0);
+            return minSize + Math.sqrt(percent) * (maxSize - minSize);
         },
         [key, domainMin, domainMax, minSize, maxSize, defaultAggregate]
     );
@@ -219,8 +219,8 @@ export const useOpacityScale = (data: IRow[], field: IViewField | null | undefin
     }, [field, defaultAggregate]);
 
     const resolvedScale = useMemo(() => {
-        if (!field || !scaleConfig.size) return undefined;
-        return resolveScale(scaleConfig.size, field, data, 'light');
+        if (!field || !scaleConfig.opacity) return undefined;
+        return resolveScale(scaleConfig.opacity, field, data, 'light');
     }, [scaleConfig, data, field]);
 
     const [domainMin, domainMax] = useDomain(key, data, resolvedScale);
@@ -236,8 +236,8 @@ export const useOpacityScale = (data: IRow[], field: IViewField | null | undefin
             if (isNaN(val)) {
                 return 0;
             }
-            const size = (val - domainMin) / (domainMax - domainMin);
-            return minOpacity + size * (maxOpacity - minOpacity);
+            const percent = Math.max(Math.min((val - domainMin) / (domainMax - domainMin), 1), 0);
+            return minOpacity + percent * (maxOpacity - minOpacity);
         },
         [key, domainMin, domainMax, minOpacity, maxOpacity, defaultAggregate]
     );

diff --git a/packages/graphic-walker/src/vis/spec/view.ts b/packages/graphic-walker/src/vis/spec/view.ts
@@ -90,6 +90,7 @@ export function resolveScale<T extends Object>(scale: T | ((info: IFieldInfos) =
             values,
         });
     }
+    return scale;
 }
 
 export function resolveScales(scale: IChannelScales, view: any, data: readonly IRow[], theme: 'dark' | 'light') {
-Original file line number
+Diff line change
@@ Expand Up @@
                 values,
             });
         }
+        return scale;
     }
     export function resolveScales(scale: IChannelScales, view: any, data: readonly IRow[], theme: 'dark' | 'light') {
@@ Expand Down @@