Rename choroplethColors to choropleth

CodeForAfrica · Aug 23, 2024 · 929d778 · 929d778
1 parent 704e9a3
commit 929d778
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 11 deletions.
diff --git a/apps/climatemappedafrica/src/lib/hurumap/index.js b/apps/climatemappedafrica/src/lib/hurumap/index.js
@@ -20,7 +20,7 @@ export async function fetchProfile() {
     locations,
     preferredChildren: configuration.preferred_children,
     mapType: configuration?.map_type ?? "default",
-    choroplethColors: configuration?.choropleth ?? null,
+    choropleth: configuration?.choropleth ?? null,
   };
 }
 

diff --git a/apps/climatemappedafrica/src/pages/explore/[[...slug]].js b/apps/climatemappedafrica/src/pages/explore/[[...slug]].js
@@ -190,7 +190,7 @@ export async function getStaticProps({ params }) {
       ghostkitSR: "",
     },
   };
-  const { locations, preferredChildren, mapType, choroplethColors } =
+  const { locations, preferredChildren, mapType, choropleth } =
     await fetchProfile();
   const [originalCode] = params?.slug || [""];
   const code = originalCode.trim().toLowerCase();
@@ -240,7 +240,7 @@ export async function getStaticProps({ params }) {
     props: {
       ...props,
       blocks,
-      choroplethColors,
+      choropleth,
       locations,
       mapType,
       profile,

diff --git a/packages/hurumap-next/src/Map/LazyMap.js b/packages/hurumap-next/src/Map/LazyMap.js
@@ -13,7 +13,7 @@ import "leaflet/dist/leaflet.css";
 const LazyMap = React.forwardRef(function LazyMap(props, ref) {
   const {
     center,
-    choroplethColors,
+    choropleth: choroplethProps,
     geography,
     geometries,
     isPinOrCompare,
@@ -51,7 +51,7 @@ const LazyMap = React.forwardRef(function LazyMap(props, ref) {
   );
 
   const { choropleth, legend } = generateChoropleth(
-    choroplethColors,
+    choroplethProps,
     locations,
     mapType,
   );

diff --git a/packages/hurumap-next/src/Map/utils.js b/packages/hurumap-next/src/Map/utils.js
@@ -62,7 +62,7 @@ const generateLegend = (
   return legend;
 };
 
-export const generateChoropleth = (choroplethColors, locations, mapType) => {
+export const generateChoropleth = (colors, locations, mapType) => {
   if (mapType !== "choropleth") return null;
 
   const filteredLocations = locations.filter(({ count }) => count !== null);
@@ -75,14 +75,13 @@ export const generateChoropleth = (choroplethColors, locations, mapType) => {
   const roundedMaxCount = Math.ceil(maxCount);
 
   const negativeColorRange =
-    choroplethColors?.negative_color_range ||
+    colors?.negative_color_range ||
     defaultChoroplethStyles.negative_color_range;
   const positiveColorRange =
-    choroplethColors?.positive_color_range ||
+    colors?.positive_color_range ||
     defaultChoroplethStyles.positive_color_range;
-  const zeroColor =
-    choroplethColors?.zero_color || defaultChoroplethStyles.zero_color;
-  const opacity = choroplethColors?.opacity || defaultChoroplethStyles.opacity;
+  const zeroColor = colors?.zero_color || defaultChoroplethStyles.zero_color;
+  const opacity = colors?.opacity || defaultChoroplethStyles.opacity;
 
   const positiveThresholds = hasPositiveValues
     ? calculateThresholds(