Update variables and types

app/scripts/components/common/mapbox/index.tsx

@@ -419,7 +419,7 @@ function MapboxMapComponent(
                 id={`base-${baseLayerResolvedData.id}`}
                 stacCol={baseLayerResolvedData.stacCol}
                 mapInstance={mapRef.current}
-                urlPosition={initialPosition}
+                isPositionSet={!!initialPosition}
                 date={date}
                 sourceParams={baseLayerResolvedData.sourceParams}
                 zoomExtent={baseLayerResolvedData.zoomExtent}

app/scripts/components/common/mapbox/layers/raster-timeseries.tsx

@@ -46,6 +46,7 @@ export interface MapLayerRasterTimeseriesProps {
   onStatusChange?: (result: { status: ActionStatus; id: string }) => void;
   isHidden?: boolean;
   idSuffix?: string;
+  isPositionSet?: boolean;
 }
 
 export interface StacFeature {
@@ -76,7 +77,7 @@ export function MapLayerRasterTimeseries(props: MapLayerRasterTimeseriesProps) {
     onStatusChange,
     isHidden,
     idSuffix = '',
-    urlPosition
+    isPositionSet
   } = props;
 
   const theme = useTheme();
@@ -472,7 +473,7 @@ export function MapLayerRasterTimeseries(props: MapLayerRasterTimeseriesProps) {
     () => (stacCollection.length ? getMergedBBox(stacCollection) : undefined),
     [stacCollection]
   );
-  useFitBbox(mapInstance, urlPosition, bounds, layerBounds);
+  useFitBbox(mapInstance, !!isPositionSet, bounds, layerBounds);
 
   return null;
 }

app/scripts/components/common/mapbox/layers/utils.ts

@@ -435,21 +435,23 @@ export function useLayerInteraction({
 type OptionalBbox = number[] | undefined | null;
 
 /**
- * Centers on the given bounds if the current position is not within the bounds.
- * Gives preference to the layer defined bounds over the STAC collection bounds.
+ * Centers on the given bounds if the current position is not within the bounds,
+ * and there's no user defined position (via user initiated map movement). Gives
+ * preference to the layer defined bounds over the STAC collection bounds.
  *
  * @param mapInstance Mapbox instance
+ * @param isUserPositionSet Whether the user has set a position
  * @param initialBbox Bounding box from the layer
  * @param stacBbox Bounds from the STAC collection
  */
 export function useFitBbox(
   mapInstance: MapboxMap,
-  urlPosition: any,
+  isUserPositionSet: boolean,
   initialBbox: OptionalBbox,
   stacBbox: OptionalBbox
 ) {
   useEffect(() => {
-    if (urlPosition) return;
+    if (isUserPositionSet) return;
 
     // Prefer layer defined bounds to STAC collection bounds.
     const bounds = (initialBbox ?? stacBbox) as
@@ -459,5 +461,5 @@ export function useFitBbox(
     if (bounds?.length && checkFitBoundsFromLayer(bounds, mapInstance)) {
       mapInstance.fitBounds(bounds, { padding: FIT_BOUNDS_PADDING });
     }
-  }, [mapInstance, urlPosition, initialBbox, stacBbox]);
+  }, [mapInstance, isUserPositionSet, initialBbox, stacBbox]);
 }

app/scripts/components/common/mapbox/layers/vector-timeseries.tsx

@@ -30,6 +30,7 @@ export interface MapLayerVectorTimeseriesProps {
   onStatusChange?: (result: { status: ActionStatus; id: string }) => void;
   isHidden?: boolean;
   idSuffix?: string;
+  isPositionSet?: boolean;
 }
 
 export function MapLayerVectorTimeseries(props: MapLayerVectorTimeseriesProps) {
@@ -44,7 +45,7 @@ export function MapLayerVectorTimeseries(props: MapLayerVectorTimeseriesProps) {
     onStatusChange,
     isHidden,
     idSuffix = '',
-    urlPosition
+    isPositionSet
   } = props;
 
   const theme = useTheme();
@@ -285,7 +286,7 @@ export function MapLayerVectorTimeseries(props: MapLayerVectorTimeseriesProps) {
   //
   // FitBounds when needed
   //
-  useFitBbox(mapInstance, urlPosition, bounds, featuresBbox);
+  useFitBbox(mapInstance, !!isPositionSet, bounds, featuresBbox);
 
   return null;
 }

app/scripts/components/datasets/s-explore/index.tsx

@@ -570,6 +570,8 @@ function DatasetsExplore() {
               isComparing={isComparing}
               initialPosition={mapPosition ?? undefined}
               onPositionChange={(v) => {
+                // Only store the map position if the change was initiated by
+                // the user.
                 if (v.userInitiated) {
                   setMapPosition(v);
                 }