fix: better clear cache detection

sgratzl · sgratzl · commit c03fb096a382 · 2024-12-16T19:30:39.000-05:00
closes #239
diff --git a/samples/geo.html b/samples/geo.html
@@ -6,7 +6,7 @@
   </head>
 
   <body>
-    <div>
+    <div style="width: 90vw; height: 90vh">
       <canvas id="canvas"></canvas>
     </div>
     <script>
@@ -31,7 +31,8 @@
               ],
             },
             options: {
-              lscales: {
+              // responsive: true,
+              scales: {
                 projection: {
                   axis: 'x',
                   projection: 'albersUsa',
diff --git a/src/controllers/ChoroplethController.ts b/src/controllers/ChoroplethController.ts
@@ -68,10 +68,13 @@ export class ChoroplethController extends GeoController<'choropleth', GeoFeature
     for (let i = start; i < start + count; i += 1) {
       const elem = elems[i];
       elem.projectionScale = scale;
-      elem.feature = (this as any)._data[i].feature;
-      elem.center = (this as any)._data[i].center;
-      elem.pixelRatio = this.chart.currentDevicePixelRatio;
-      const center = elem.getCenterPoint();
+      const center = elem.updateExtras({
+        scale,
+        feature: (this as any)._data[i].feature,
+        center: (this as any)._data[i].center,
+        pixelRatio: this.chart.currentDevicePixelRatio,
+        mode,
+      });
 
       const properties: IGeoFeatureProps & { options?: PointOptions } = {
         x: center.x,
diff --git a/src/controllers/GeoController.ts b/src/controllers/GeoController.ts
@@ -98,7 +98,7 @@ export class GeoController<
     const meta = this.getMeta();
 
     const scale = this.getProjectionScale();
-    const dirtyCache = scale.updateBounds();
+    const dirtyCache = scale.updateBounds() || mode === 'resize' || mode === 'reset';
 
     if (this.showOutline()) {
       const elem = meta.dataset!;
@@ -122,10 +122,10 @@ export class GeoController<
       (meta as any).graticule = patchDatasetElementOptions(this.resolveDatasetElementOptions(mode));
     }
 
-    this.updateElements(meta.data, 0, meta.data.length, mode);
     if (dirtyCache) {
       meta.data.forEach((elem) => delete (elem as any).cache);
     }
+    this.updateElements(meta.data, 0, meta.data.length, mode);
   }
 
   resolveOutline(): any {
diff --git a/src/elements/GeoFeature.ts b/src/elements/GeoFeature.ts
@@ -8,6 +8,7 @@ import {
   ScriptableAndArrayOptions,
   CommonHoverOptions,
   ScriptableContext,
+  UpdateMode,
 } from 'chart.js';
 import { geoContains, GeoPath, GeoProjection } from 'd3-geo';
 import type { ProjectionScale } from '../scales';
@@ -103,6 +104,37 @@ export class GeoFeature extends Element<IGeoFeatureProps, IGeoFeatureOptions> im
    */
   pixelRatio?: number;
 
+  updateExtras({
+    scale,
+    feature,
+    center,
+    pixelRatio,
+    mode,
+  }: {
+    scale: ProjectionScale;
+    feature: Feature;
+    center?: { longitude: number; latitude: number };
+    pixelRatio: number;
+    mode: UpdateMode;
+  }): Point {
+    const changed =
+      mode === 'resize' ||
+      mode === 'reset' ||
+      this.projectionScale !== scale ||
+      this.feature !== feature ||
+      this.center?.longitude !== center?.longitude ||
+      this.center?.latitude !== center?.latitude ||
+      this.pixelRatio !== pixelRatio;
+    this.projectionScale = scale;
+    this.feature = feature;
+    this.center = center;
+    this.pixelRatio = pixelRatio;
+    if (changed) {
+      this.cache = undefined;
+    }
+    return this.getCenterPoint();
+  }
+
   /**
    * @hidden
    */

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ export class GeoController<`
`98`	`98`	`const meta = this.getMeta();`
`99`	`99`
`100`	`100`	`const scale = this.getProjectionScale();`
`101`		`- const dirtyCache = scale.updateBounds();`
	`101`	`+ const dirtyCache = scale.updateBounds() \|\| mode === 'resize' \|\| mode === 'reset';`
`102`	`102`
`103`	`103`	`if (this.showOutline()) {`
`104`	`104`	`const elem = meta.dataset!;`
`@@ -122,10 +122,10 @@ export class GeoController<`
`122`	`122`	`(meta as any).graticule = patchDatasetElementOptions(this.resolveDatasetElementOptions(mode));`
`123`	`123`	`}`
`124`	`124`
`125`		`- this.updateElements(meta.data, 0, meta.data.length, mode);`
`126`	`125`	`if (dirtyCache) {`
`127`	`126`	`meta.data.forEach((elem) => delete (elem as any).cache);`
`128`	`127`	`}`
	`128`	`+ this.updateElements(meta.data, 0, meta.data.length, mode);`
`129`	`129`	`}`
`130`	`130`
`131`	`131`	`resolveOutline(): any {`