useFitLayerBounds.tsx new structure

Author: jannik brack

src/hooks/useFitLayerBounds.tsx

@@ -1,32 +1,43 @@
-
 import useMap from "./useMap";
-import { bbox } from '@turf/turf';
+import { bbox, AllGeoJSON } from '@turf/turf';
 import { LngLatBoundsLike, FitBoundsOptions, GeoJSONSource } from 'maplibre-gl';
 
-
 export interface useFitLayerBoundsPros {
-	layerId: string,
-	type: "geojson"| "wms" | "vt",
-	fitBoundsOptions?: FitBoundsOptions
+	layerId: string;
+	type: "geojson" | "wms" | "vt";
+	fitBoundsOptions?: FitBoundsOptions;
 }
- function useFitLayerBounds(props: useFitLayerBoundsPros){
 
+function useFitLayerBounds(props: useFitLayerBoundsPros) {
 	const mapHook = useMap({ mapId: undefined });
-	const layerSource = props.layerId ? mapHook?.map?.getLayer?.(props.layerId)?.source : undefined;
-	const geojson = layerSource && (mapHook.map?.getSource(layerSource) as GeoJSONSource)._data;
-	const _geojson = layerSource && {
-		type: 'FeatureCollection',
-		features: mapHook.map?.querySourceFeatures(layerSource)
-	};
 
+	const layerSource = props.layerId ? mapHook?.map?.getLayer?.(props.layerId)?.source : undefined;
 
 	if (!layerSource) {
 		return;
 	}
 
-	mapHook.map?.fitBounds(typeof geojson === 'string' ? bbox(_geojson) as LngLatBoundsLike : bbox(geojson) as LngLatBoundsLike,
-		props.fitBoundsOptions
+	const source = mapHook.map?.getSource(layerSource);
+	let geojson: AllGeoJSON | undefined;
+
+	if (source && (source as GeoJSONSource)._data) {
+		geojson = (source as GeoJSONSource)._data as AllGeoJSON;
+	} else if (layerSource) {
+		const features = mapHook.map?.querySourceFeatures(layerSource);
+		if (features && features.length > 0) {
+			geojson = {
+				type: 'FeatureCollection',
+				features,
+			} as AllGeoJSON;
+		}
+	}
+
+	if (geojson) {
+		mapHook.map?.fitBounds(
+			bbox(geojson) as LngLatBoundsLike,
+			props.fitBoundsOptions
 		);
+	}
 }
 
 export default useFitLayerBounds;