fix: Dynamically compute default zoom/center for map traces

draftlogs/7884_fix.md

@@ -0,0 +1 @@
+ - Fix `scattermap`, `densitymap` traces not showing all points by dynamically computing `center`, `zoom` values [[#7884](https://github.com/plotly/plotly.js/pull/7884)], with thanks to @palmerusaf and @DhruvGarg111 for the contributions!

src/plots/map/constants.js

@@ -70,17 +70,15 @@ var styleValuesMap = sortObjectKeys(stylesMap);
 
 module.exports = {
     styleValueDflt: 'basic',
-    stylesMap: stylesMap,
-    styleValuesMap: styleValuesMap,
-
+    stylesMap,
+    styleValuesMap,
     traceLayerPrefix: 'plotly-trace-layer-',
     layoutLayerPrefix: 'plotly-layout-layer-',
-
     missingStyleErrorMsg: [
         'No valid maplibre style found, please set `map.style` to one of:',
         styleValuesMap.join(', '),
         'or use a tile service.'
     ].join('\n'),
-
-    mapOnErrorMsg: 'Map error.'
+    mapOnErrorMsg: 'Map error.',
+    fitBoundsPadding: 20
 };

src/plots/map/get_map_fit_bounds.ts

@@ -0,0 +1,76 @@
+import { getFitboundsLonRange } from '../../lib/geo_location_utils';
+import type { MapLayout, ScattermapData } from '../../types/generated/schema';
+
+// Same shape as the user-facing `map.bounds` attribute, but with all fields required
+type LonLatBox = Required<NonNullable<MapLayout['bounds']>>;
+
+// Minimal shape of the fullData entries this helper reads
+interface FitBoundsTrace extends Pick<ScattermapData, 'subplot' | 'visible'> {
+    // Tighten lat/lon to be more specific than default
+    lat?: ArrayLike<number>;
+    lon?: ArrayLike<number>;
+    // Broaden type since this could run against multiple trace types
+    type?: string;
+}
+
+/**
+ * Compute a lon/lat bounding box from lonlat-bearing traces (`scattermap`,
+ * `densitymap`) on the given map subplot.
+ *
+ * Returns null when:
+ *   - no fittable data exists on the subplot;
+ *   - a location-based trace (`choroplethmap`) is present — those carry
+ *     `locations`/`geojson`, not raw lon/lat, and need geojson bbox handling
+ *     that isn't implemented here.
+ *
+ * @param fullData - The full data array (post supply-defaults)
+ * @param subplotId - e.g. `'map'`, `'map2'`
+ */
+export function getMapFitBounds(fullData: FitBoundsTrace[], subplotId: string): LonLatBox | null {
+    const validLons: number[] = [];
+    let minLon = Infinity;
+    let maxLon = -Infinity;
+    let minLat = Infinity;
+    let maxLat = -Infinity;
+
+    for (const trace of fullData) {
+        if (trace.subplot !== subplotId || trace.visible !== true) continue;
+
+        // choroplethmap traces carry locations/geojson, not raw lon/lat; bail
+        // out rather than frame around a subset of the subplot's data.
+        if (trace.type === 'choroplethmap') return null;
+
+        const { lat, lon } = trace;
+        if (!lon || !lat) continue;
+
+        const len = Math.min(lon.length, lat.length);
+        for (let j = 0; j < len; j++) {
+            const lo = lon[j];
+            const la = lat[j];
+            if (Number.isFinite(lo) && Number.isFinite(la)) {
+                validLons.push(lo);
+                // Track longitude bounds
+                if (lo < minLon) minLon = lo;
+                if (lo > maxLon) maxLon = lo;
+                // Track latitude bounds
+                if (la < minLat) minLat = la;
+                if (la > maxLat) maxLat = la;
+            }
+        }
+    }
+
+    if (!validLons.length) return null;
+
+    let west = minLon;
+    let east = maxLon;
+    // Only handle antimeridian if it actually gets crossed
+    if (maxLon - minLon > 180) {
+        const lonRange = getFitboundsLonRange(validLons);
+        if (lonRange) {
+            west = lonRange[0];
+            east = lonRange[1];
+        }
+    }
+
+    return { west, east, south: minLat, north: maxLat };
+}

src/plots/map/index.js

@@ -55,15 +55,6 @@ exports.plot = function plot(gd) {
             fullLayout[id]._subplot = map;
         }
 
-        if(!map.viewInitial) {
-            map.viewInitial = {
-                center: Lib.extendFlat({}, opts.center),
-                zoom: opts.zoom,
-                bearing: opts.bearing,
-                pitch: opts.pitch
-            };
-        }
-
         map.plot(subplotCalcData, fullLayout, gd._promises);
     }
 };

src/plots/map/layout_defaults.js

@@ -5,18 +5,19 @@ var Lib = require('../../lib');
 var handleSubplotDefaults = require('../subplot_defaults');
 var handleArrayContainerDefaults = require('../array_container_defaults');
 var layoutAttributes = require('./layout_attributes');
-
+const { getMapFitBounds } = require('./get_map_fit_bounds');
 
 module.exports = function supplyLayoutDefaults(layoutIn, layoutOut, fullData) {
     handleSubplotDefaults(layoutIn, layoutOut, fullData, {
         type: 'map',
         attributes: layoutAttributes,
-        handleDefaults: handleDefaults,
-        partition: 'y'
+        handleDefaults,
+        partition: 'y',
+        fullData
     });
 };
 
-function handleDefaults(containerIn, containerOut, coerce) {
+function handleDefaults(containerIn, containerOut, coerce, opts) {
     coerce('style');
     coerce('center.lon');
     coerce('center.lat');
@@ -28,12 +29,7 @@ function handleDefaults(containerIn, containerOut, coerce) {
     var east = coerce('bounds.east');
     var south = coerce('bounds.south');
     var north = coerce('bounds.north');
-    if(
-        west === undefined ||
-        east === undefined ||
-        south === undefined ||
-        north === undefined
-    ) {
+    if (west === undefined || east === undefined || south === undefined || north === undefined) {
         delete containerOut.bounds;
     }
 
@@ -42,6 +38,12 @@ function handleDefaults(containerIn, containerOut, coerce) {
         handleItemDefaults: handleLayerDefaults
     });
 
+    // Auto-frame the initial view to the data
+    if (containerIn.center === undefined && containerIn.zoom === undefined) {
+        const fitBounds = getMapFitBounds(opts.fullData, opts.id);
+        if (fitBounds) containerOut._fitBounds = fitBounds;
+    }
+
     // copy ref to input container to update 'center' and 'zoom' on map move
     containerOut._input = containerIn;
 }
@@ -52,27 +54,27 @@ function handleLayerDefaults(layerIn, layerOut) {
     }
 
     var visible = coerce('visible');
-    if(visible) {
+    if (visible) {
         var sourceType = coerce('sourcetype');
         var mustBeRasterLayer = sourceType === 'raster' || sourceType === 'image';
 
         coerce('source');
         coerce('sourceattribution');
 
-        if(sourceType === 'vector') {
+        if (sourceType === 'vector') {
             coerce('sourcelayer');
         }
 
-        if(sourceType === 'image') {
+        if (sourceType === 'image') {
             coerce('coordinates');
         }
 
         var typeDflt;
-        if(mustBeRasterLayer) typeDflt = 'raster';
+        if (mustBeRasterLayer) typeDflt = 'raster';
 
         var type = coerce('type', typeDflt);
 
-        if(mustBeRasterLayer && type !== 'raster') {
+        if (mustBeRasterLayer && type !== 'raster') {
             type = layerOut.type = 'raster';
             Lib.log('Source types *raster* and *image* must drawn *raster* layer type.');
         }
@@ -83,20 +85,20 @@ function handleLayerDefaults(layerIn, layerOut) {
         coerce('minzoom');
         coerce('maxzoom');
 
-        if(type === 'circle') {
+        if (type === 'circle') {
             coerce('circle.radius');
         }
 
-        if(type === 'line') {
+        if (type === 'line') {
             coerce('line.width');
             coerce('line.dash');
         }
 
-        if(type === 'fill') {
+        if (type === 'fill') {
             coerce('fill.outlinecolor');
         }
 
-        if(type === 'symbol') {
+        if (type === 'symbol') {
             coerce('symbol.icon');
             coerce('symbol.iconsize');
 
@@ -105,7 +107,7 @@ function handleLayerDefaults(layerIn, layerOut) {
                 noFontVariant: true,
                 noFontShadow: true,
                 noFontLineposition: true,
-                noFontTextcase: true,
+                noFontTextcase: true
             });
             coerce('symbol.textposition');
             coerce('symbol.placement');