CR + floor quadbin spatialFiltersResolution

CartoDB · Sep 5, 2024 · debeec3 · debeec3
1 parent cdeb4cf
commit debeec3
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/packages/react-api/src/api/model.js b/packages/react-api/src/api/model.js
@@ -73,7 +73,7 @@ export function executeModel(props) {
 
     if (!spatialDataType || !spatialDataColumn) {
       if (source.geoColumn) {
-        const parsedGeoColumn = source.geoColumn ? source.geoColumn.split(':') : [];
+        const parsedGeoColumn = source.geoColumn.split(':');
         if (parsedGeoColumn.length === 2) {
           spatialDataType = parsedGeoColumn[0];
           spatialDataColumn = parsedGeoColumn[1];
@@ -82,7 +82,7 @@ export function executeModel(props) {
           spatialDataType = 'geo';
         }
         if (spatialDataType === 'geom') {
-          // fallback if for some reason someone provided old `geom:whatever`
+          // fallback if for some reason someone provided old `geom:$column`
           spatialDataType = 'geo';
         }
       } else {

diff --git a/packages/react-api/src/types.d.ts b/packages/react-api/src/types.d.ts
@@ -43,7 +43,7 @@ export type SourceProps = {
   type: MapTypesType['QUERY'] | MapTypesType['TABLE'] | MapTypesType['TILESET'];
   connection: string;
   geoColumn?: string;
-  dataResoultion?: number;
+  dataResolution?: number;
   spatialDataType?: string;
   spatialDataColumn?: string;
   spatialFiltersResolution?: number;
@@ -77,4 +77,3 @@ export type UseCartoLayerFilterProps = {
 };
 
 export type ExecuteSQLResponse<Response = FeatureCollection | {}[]> = Promise<Response>;
-
diff --git a/packages/react-widgets/src/hooks/useWidgetFetch.js b/packages/react-widgets/src/hooks/useWidgetFetch.js
@@ -107,12 +107,13 @@ export default function useWidgetFetch(
     [global, viewport, spatialFilter]
   );
 
-  const source2 = useMemo(() => {
+  const enrichedSource = useMemo(() => {
     if (
       !source ||
       !geometryToIntersect ||
-      !source.dataResolution ||
-      source.spatialDataType === 'geo'
+      source.spatialDataType === 'geo' ||
+      source.spatialFiltersResolution !== undefined ||
+      !source.dataResolution
     ) {
       return source;
     }
@@ -128,7 +129,7 @@ export default function useWidgetFetch(
       };
     }
     if (source.spatialDataType === 'quadbin') {
-      const quadsResolution = viewState.zoom;
+      const quadsResolution = Math.floor(viewState.zoom);
       return {
         ...source,
         spatialFiltersResolution: Math.min(source.dataResolution, quadsResolution)
@@ -150,7 +151,7 @@ export default function useWidgetFetch(
       onStateChange?.({ state: WidgetStateType.Loading });
 
       modelFn({
-        source: source2,
+        source: enrichedSource,
         ...params,
         global,
         remoteCalculation,
@@ -185,7 +186,7 @@ export default function useWidgetFetch(
     },
     [
       params,
-      source2,
+      enrichedSource,
       onError,
       isSourceReady,
       global,