BUG: Extract _update_collection_limits helper; call from add_collection and relim()

tinezivic · tinezivic · commit 68a6269b9730 · 2026-04-20T21:26:54.000+02:00
Refactor per reviewer feedback (timhoffm): the Collection data-limit logic
in relim() was duplicating code from add_collection(). Extract it into a new
private method _update_collection_limits(), following the existing pattern of
_update_line_limits(), _update_patch_limits(), and _update_image_limits().

Both add_collection() and relim() now call the helper instead of repeating
the get_datalim / minpos-concatenation / contains_branch_separately /
update_datalim block inline.
diff --git a/lib/matplotlib/axes/_base.py b/lib/matplotlib/axes/_base.py
@@ -2410,26 +2410,7 @@ def add_collection(self, collection, autolim=True):
             # Make sure viewLim is not stale (mostly to match
             # pre-lazy-autoscale behavior, which is not really better).
             self._unstale_viewLim()
-            datalim = collection.get_datalim(self.transData)
-            points = datalim.get_points()
-            if not np.isinf(datalim.minpos).all():
-                # By definition, if minpos (minimum positive value) is set
-                # (i.e., non-inf), then min(points) <= minpos <= max(points),
-                # and minpos would be superfluous. However, we add minpos to
-                # the call so that self.dataLim will update its own minpos.
-                # This ensures that log scales see the correct minimum.
-                points = np.concatenate([points, [datalim.minpos]])
-            # only update the dataLim for x/y if the collection uses transData
-            # in this direction.
-            x_is_data, y_is_data = (collection.get_transform()
-                                    .contains_branch_separately(self.transData))
-            ox_is_data, oy_is_data = (collection.get_offset_transform()
-                                      .contains_branch_separately(self.transData))
-            self.update_datalim(
-                points,
-                updatex=x_is_data or ox_is_data,
-                updatey=y_is_data or oy_is_data,
-            )
+            self._update_collection_limits(collection)
             if autolim != "_datalim_only":
                 self._request_autoscale_view()
             # Mark collection as participating in relim() only when autolim
@@ -2602,6 +2583,29 @@ def _update_patch_limits(self, patch):
         xys = trf_to_data.transform(vertices)
         self.update_datalim(xys, updatex=updatex, updatey=updatey)
 
+    def _update_collection_limits(self, collection):
+        """Update the data limits for the given collection."""
+        datalim = collection.get_datalim(self.transData)
+        points = datalim.get_points()
+        if not np.isinf(datalim.minpos).all():
+            # By definition, if minpos (minimum positive value) is set
+            # (i.e., non-inf), then min(points) <= minpos <= max(points),
+            # and minpos would be superfluous. However, we add minpos to
+            # the call so that self.dataLim will update its own minpos.
+            # This ensures that log scales see the correct minimum.
+            points = np.concatenate([points, [datalim.minpos]])
+        # only update the dataLim for x/y if the collection uses transData
+        # in this direction.
+        x_is_data, y_is_data = (collection.get_transform()
+                                 .contains_branch_separately(self.transData))
+        ox_is_data, oy_is_data = (collection.get_offset_transform()
+                                   .contains_branch_separately(self.transData))
+        self.update_datalim(
+            points,
+            updatex=x_is_data or ox_is_data,
+            updatey=y_is_data or oy_is_data,
+        )
+
     def add_table(self, tab):
         """
         Add a `.Table` to the Axes; return the table.
@@ -2662,27 +2666,7 @@ def relim(self, visible_only=False):
                 elif isinstance(artist, mimage.AxesImage):
                     self._update_image_limits(artist)
                 elif isinstance(artist, mcoll.Collection):
-                    datalim = artist.get_datalim(self.transData)
-                    points = datalim.get_points()
-                    if not np.isinf(datalim.minpos).all():
-                        # As in add_collection: include minpos so that
-                        # self.dataLim updates its own minpos, which ensures
-                        # log scales see the correct minimum.
-                        points = np.concatenate([points,
-                                                 [datalim.minpos]])
-                    # Only update dataLim for x/y if the collection uses
-                    # transData in that direction.
-                    x_is_data, y_is_data = (
-                        artist.get_transform()
-                        .contains_branch_separately(self.transData))
-                    ox_is_data, oy_is_data = (
-                        artist.get_offset_transform()
-                        .contains_branch_separately(self.transData))
-                    self.update_datalim(
-                        points,
-                        updatex=x_is_data or ox_is_data,
-                        updatey=y_is_data or oy_is_data,
-                    )
+                    self._update_collection_limits(artist)
 
     def update_datalim(self, xys, updatex=True, updatey=True):
         """
