Improve typing after PR review

opendatasoft · Aug 19, 2022 · 96d7281 · 96d7281
1 parent 2a0a57e
commit 96d7281
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/packages/visualizations/src/components/Map/MapRender.svelte b/packages/visualizations/src/components/Map/MapRender.svelte
@@ -8,7 +8,7 @@
         NavigationControl,
         LngLatBoundsLike,
         MapSourceDataEvent,
-        MapMouseEvent,
+        MapLayerMouseEvent,
         LngLatLike,
     } from 'maplibre-gl';
     import { onMount } from 'svelte';
@@ -129,7 +129,9 @@
     function sourceLoadingCallback(e: MapSourceDataEvent) {
         // sourceDataType can be "visibility" or "metadata", in which case it's not about the data itself
         if (e.isSourceLoaded && e.sourceId === sourceId && !e.sourceDataType) {
-            // @ts-ignore // The type forces you to pass a filter parameter in the option, but it's not required by the real code
+            // The type forces you to pass a filter parameter in the option, but it's not required by the real code
+            // https://github.com/maplibre/maplibre-gl-js/issues/1393
+            // @ts-ignore
             const renderedFeatures = map.querySourceFeatures(sourceId, { sourceLayer: layerId });
 
             if (renderedFeatures.length) {
@@ -151,7 +153,7 @@
         }
     }
 
-    function addTooltip(e: MapMouseEvent) {
+    function addTooltip(e: MapLayerMouseEvent) {
         // @ts-ignore // Somehow `features` isn't part of the type, but exists in the object at runtime
         const description = renderTooltip(e.features[0]);
         if (hoverPopup.isOpen()) {

diff --git a/packages/visualizations/src/components/Map/utils.ts b/packages/visualizations/src/components/Map/utils.ts
@@ -19,7 +19,13 @@ export const colorShapes = (
     values: ChoroplethDataValue[],
     colorsScale: ColorsScale,
     emptyValueColor: Color
-) => {
+): {
+    geoJson: FeatureCollection;
+    bounds: {
+        min: number;
+        max: number;
+    };
+} => {
     // Key in the values is "x"
     // Key in the shapes is "key"
     // We add a color property in the JSON
@@ -140,7 +146,7 @@ function mergeBboxFromFeaturesWithSameKey(features: Feature[]) {
 export const computeMaxZoomFromGeoJsonFeatures = (
     mapContainer: HTMLElement,
     features: Feature[]
-) => {
+): number => {
     let maxZoom = 0; // maxZoom lowest value possible
     const filteredBboxes = mergeBboxFromFeaturesWithSameKey(features);
     Object.values(filteredBboxes).forEach((value: any) => {