Rework handling of panning to identified features by uclaros · Pull Request #4591 · MerginMaps/mobile

uclaros · 2026-07-10T12:02:14Z

Plan A

This PR is a rework on how we jump to geometries. It was initially just a way to mitigate a GEOS crash when identifying self-overlapping multipart geometries, but quickly evolved!

Plan B

If this is too much for a last minute change, we can avoid hitting the geos bug by slightly modifying the current approach: Perform bounding box intersections instead of geometry intersections.

diff --git a/app/inpututils.cpp b/app/inpututils.cpp
index b5573eb3..02a874e8 100644
--- a/app/inpututils.cpp
+++ b/app/inpututils.cpp
@@ -330,13 +330,12 @@ QPointF InputUtils::relevantGeometryCenterToScreenCoordinates( const QgsGeometry
 
   const QgsRectangle currentExtent = mapSettings->mapSettings().visibleExtent();
 
-  // Cut the geometry to current extent
-  const QgsGeometry currentExtentAsGeom = QgsGeometry::fromRect( currentExtent );
-  const QgsGeometry intersectedGeom = geom.intersection( currentExtentAsGeom );
+  // Cut the geometry extent to current extent
+  const QgsRectangle intersectedExtent = currentExtent.intersect( geom.boundingBox() );
 
-  if ( !intersectedGeom.isEmpty() )
+  if ( !intersectedExtent.isEmpty() )
   {
-    target = QgsPoint( intersectedGeom.boundingBox().center() );
+    target = QgsPoint( intersectedExtent.center() );
   }
   else
   {

This will change the existing behavior, eg identifying C shaped geometry that is partially visible will not recenter the map canvas to the center of the visible part of the geometry, but to the visible part of the geom bbox.

Testing notes:

need to test all Geometries that we support (Points, Lines, Polygons and it's multi variants)

We will use it to jump to the highlighted feature once we know the available area of the map that is not covered by the panel

- Use the renamed previewPanelHeight property instead of signal params

- Move all highlighting and form opening to a identifyFeature()

- Don't pan if whole feature is near visible map center - Center feature to visible map if it fits - Center clicked location to visible map if whole does not fit

- Add method to calculate the map extent required for a geometry to fit the visible part of the map canvas when covered by a drawer - Use animated zoom when identifying features from a list and not on map

Withalion · 2026-07-15T13:27:08Z

might help resolve #3845 as well

Withalion

Nice! It would be great to rebase on current master as well since some time passed.

Withalion · 2026-08-17T09:01:04Z

+  {
+    rendererPrivate.freeze('jumpTo')
+
+    let oldExtent = mapRenderer.mapSettings.visibleExtent


Suggested change

let oldExtent = mapRenderer.mapSettings.visibleExtent

const oldExtent = mapRenderer.mapSettings.visibleExtent

Withalion · 2026-08-17T09:01:54Z

+        let tmpMinX = startMinX - percentage * 0.01 * ( startMinX - endMinX )
+        let tmpMinY = startMinY - percentage * 0.01 * ( startMinY - endMinY )
+        let tmpMaxX = startMaxX - percentage * 0.01 * ( startMaxX - endMaxX )
+        let tmpMaxY = startMaxY - percentage * 0.01 * ( startMaxY - endMaxY )


Suggested change

let tmpMinX = startMinX - percentage * 0.01 * ( startMinX - endMinX )

let tmpMinY = startMinY - percentage * 0.01 * ( startMinY - endMinY )

let tmpMaxX = startMaxX - percentage * 0.01 * ( startMaxX - endMaxX )

let tmpMaxY = startMaxY - percentage * 0.01 * ( startMaxY - endMaxY )

const tmpMinX = startMinX - percentage * 0.01 * ( startMinX - endMinX )

const tmpMinY = startMinY - percentage * 0.01 * ( startMinY - endMinY )

const tmpMaxX = startMaxX - percentage * 0.01 * ( startMaxX - endMaxX )

const tmpMaxY = startMaxY - percentage * 0.01 * ( startMaxY - endMaxY )

Withalion · 2026-08-17T09:06:13Z

+      enabled: jumpExtentAnimator.enabled
+    }
+
+    onPercentageChanged: {


Suggested change

onPercentageChanged: {

onPercentageChanged: () => {

either use lambda or anonymous function

Withalion · 2026-08-17T09:16:09Z


-  signal featureIdentified( var pair )
+  // Holds the map coordinates of the point the user identified. NaN if identify was triggered from list of features
+  property point identifyLocation: Qt.point(NaN, NaN)


wouldn't it be better to just use null here instead, if the location is unknown?

Withalion · 2026-08-17T09:25:02Z

+  // Holds the map coordinates of the point the user identified. NaN if identify was triggered from list of features
+  property point identifyLocation: Qt.point(NaN, NaN)
+
+  signal featureIdentified( var pair, var point )


Suggested change

signal featureIdentified( var pair, var point )

signal featureIdentified( FeatureLayerPair pair, qgsPoint clickedPoint )

It's about time we expose FeatureLayerPair & QgsPoint to QML properly

Withalion · 2026-08-17T10:39:20Z

+
+    // point well inside the unobstructed area -> no pan needed
+    const QgsGeometry visiblePoint = QgsGeometry::fromPointXY( QgsPointXY( 20, 40 ) );
+    pan = mUtils->whereToPanWhenIdentifying( visiblePoint, &ms, bottomOffset, QPointF( 20, 40 ) );


Suggested change

pan = mUtils->whereToPanWhenIdentifying( visiblePoint, &ms, bottomOffset, QPointF( 20, 40 ) );

pan = InputUtils::whereToPanWhenIdentifying( visiblePoint, &ms, bottomOffset, QPointF( 20, 40 ) );

Withalion · 2026-08-17T10:39:44Z

  }
 }

+void TestUtilsFunctions::testWhereToPanWhenIdentifying()


Could we check here that the scale has not changed as well

Withalion · 2026-08-17T10:44:49Z

+  }
+}
+
+void TestUtilsFunctions::testDrawerCompensatedExtent()


As well here I would have case for:

when the map is just panned

when feature is bigger then current extent, so the map zooms out

when feature is smaller then current extent

Withalion · 2026-08-17T10:45:25Z

+    // point geometry -> scale is kept, center shifts down by bottomOffset / 2
+    // in screen space so the point is centered in the unobstructed part
+    const QgsGeometry point = QgsGeometry::fromPointXY( QgsPointXY( 20, 10 ) );
+    QgsRectangle extent = mUtils->drawerCompensatedExtent( point, &ms, bottomOffset );


Suggested change

QgsRectangle extent = mUtils->drawerCompensatedExtent( point, &ms, bottomOffset );

QgsRectangle extent = InputUtils::drawerCompensatedExtent( point, &ms, bottomOffset );

Withalion · 2026-08-17T10:45:39Z

+    // non-empty bounding box -> zoom so the padded bbox fits the part of the
+    // canvas not covered by the drawer, centered in it
+    const QgsGeometry line = QgsGeometry::fromPolylineXY( { QgsPointXY( 10, 10 ), QgsPointXY( 30, 20 ) } );
+    extent = mUtils->drawerCompensatedExtent( line, &ms, bottomOffset );


Suggested change

extent = mUtils->drawerCompensatedExtent( line, &ms, bottomOffset );

extent = InputUtils::drawerCompensatedExtent( line, &ms, bottomOffset );

uclaros added 7 commits July 10, 2026 11:44

Fire a signal when the preview panel height has settled.

3321e9f

We will use it to jump to the highlighted feature once we know the available area of the map that is not covered by the panel

- Use the new doneLoading() signal

436777a

- Use the renamed previewPanelHeight property instead of signal params

- Store identify click point map coords

a63de42

- Move all highlighting and form opening to a identifyFeature()

Update canvas panning logic when identifying:

c5e5d4f

- Don't pan if whole feature is near visible map center - Center feature to visible map if it fits - Center clicked location to visible map if whole does not fit

Fix handling of empty but not null geometries

c9b8b3d

- Add animated zoom to map extent

516683f

- Add method to calculate the map extent required for a geometry to fit the visible part of the map canvas when covered by a drawer - Use animated zoom when identifying features from a list and not on map

Fix test macro

4f45e09

uclaros mentioned this pull request Jul 13, 2026

Use bounding box intersections to avoid geos bug #4595

Merged

Withalion added this to the 2026.4.0 milestone Jul 13, 2026

Withalion assigned uclaros Jul 13, 2026

Withalion reviewed Aug 17, 2026

View reviewed changes

Navigation Menu

Uh oh!

Rework handling of panning to identified features - #4591

Rework handling of panning to identified features#4591
uclaros wants to merge 7 commits into
masterfrom
bugfix/better-jump-to

uclaros commented Jul 10, 2026 •

edited by Withalion

Loading

Uh oh!

Withalion commented Jul 15, 2026

Uh oh!

Withalion left a comment

Uh oh!

Withalion Aug 17, 2026

Uh oh!

Withalion Aug 17, 2026

Uh oh!

Withalion Aug 17, 2026

Uh oh!

Withalion Aug 17, 2026

Uh oh!

Withalion Aug 17, 2026

Uh oh!

Withalion Aug 17, 2026

Uh oh!

Withalion Aug 17, 2026

Uh oh!

Withalion Aug 17, 2026

Uh oh!

Withalion Aug 17, 2026

Uh oh!

Withalion Aug 17, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

	let oldExtent = mapRenderer.mapSettings.visibleExtent
	const oldExtent = mapRenderer.mapSettings.visibleExtent

	signal featureIdentified( var pair, var point )
	signal featureIdentified( FeatureLayerPair pair, qgsPoint clickedPoint )

	pan = mUtils->whereToPanWhenIdentifying( visiblePoint, &ms, bottomOffset, QPointF( 20, 40 ) );
	pan = InputUtils::whereToPanWhenIdentifying( visiblePoint, &ms, bottomOffset, QPointF( 20, 40 ) );

	QgsRectangle extent = mUtils->drawerCompensatedExtent( point, &ms, bottomOffset );
	QgsRectangle extent = InputUtils::drawerCompensatedExtent( point, &ms, bottomOffset );

	extent = mUtils->drawerCompensatedExtent( line, &ms, bottomOffset );
	extent = InputUtils::drawerCompensatedExtent( line, &ms, bottomOffset );

Uh oh!

Conversation

uclaros commented Jul 10, 2026 • edited by Withalion Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Plan A

Plan B

Uh oh!

Withalion commented Jul 15, 2026

Uh oh!

Withalion left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

uclaros commented Jul 10, 2026 •

edited by Withalion

Loading