fix(locationMap): colorpalette max index + infinite loading

aphp · Jul 2, 2024 · 4faf1fc · 4faf1fc
1 parent 416171c
commit 4faf1fc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/components/Dashboard/Preview/LocationMap/index.tsx b/src/components/Dashboard/Preview/LocationMap/index.tsx
@@ -13,7 +13,6 @@ import {
   _explodeBoundsIntoMesh,
   colorize,
   computeNearFilter,
-  explodeBoundsIntoMesh,
   isBoundCovered,
   parseShape,
   uncoveredBoundMeshUnits
@@ -162,6 +161,9 @@ const IrisZones = (props: IrisZonesProps) => {
               )
               // update the loaded bounds
               setLoadedBounds((prevLoadedBounds) => {
+                if (prevLoadedBounds.some((b) => b.equals(bounds))) {
+                  return prevLoadedBounds
+                }
                 return prevLoadedBounds.concat(bounds)
               })
 

diff --git a/src/components/Dashboard/Preview/LocationMap/utils.ts b/src/components/Dashboard/Preview/LocationMap/utils.ts
@@ -1,5 +1,4 @@
 import L, { LatLngBounds, LatLngTuple } from 'leaflet'
-import { map } from 'lodash'
 
 /**
  * Transform the string polygon description retrieved by FHIR (POLYGON((lat lng, lat lng, ...))) into an array of LatLngTuple
@@ -99,7 +98,7 @@ export const uncoveredBoundMeshUnits = (map: L.Map, bounds: LatLngBounds, loaded
 export const colorize = (colorPalette: string[], count: number, maxCount: number): string => {
   const step = maxCount / colorPalette.length
   const colorIndex = Math.floor(count / step)
-  if (colorIndex > colorPalette.length) {
+  if (colorIndex >= colorPalette.length) {
     return colorPalette[colorPalette.length - 1]
   }
   return colorPalette[colorIndex]