cleanup for review

Author: ValentinBuira

app/inpututils.cpp

@@ -320,7 +320,7 @@ QPointF InputUtils::geometryCenterToScreenCoordinates( const QgsGeometry &geom,
  * 
  * Nota Bene: Assume geometry and map canvas CRS are the same
  */
-bool InputUtils::canExtentContainGeometry( const QgsGeometry &geom, InputMapSettings *mapSettings )
+bool InputUtils::extentContainGeometry( const QgsGeometry &geom, InputMapSettings *mapSettings )
 {
   QPointF screenPoint;
 
@@ -329,54 +329,32 @@ bool InputUtils::canExtentContainGeometry( const QgsGeometry &geom, InputMapSett
 
   QgsRectangle currentExtent = mapSettings->mapSettings().visibleExtent();
   QgsRectangle geomBbox = geom.boundingBox();
-  qDebug() << "canExtentContainGeometry:geomBbox: " << QgsGeometry::fromRect(geomBbox).asWkt();
-  QgsRectangle currentExtent = mapSettings->mapSettings().extent();
-  qDebug() << "canExtentContainGeometry:currentExtent: " << QgsGeometry::fromRect(currentExtent).asWkt();
 
   return currentExtent.contains(geomBbox);
 }
 
 
 /**
- * Returns true if the geometry \a geom is fully contain within the current map extent
+ * Returns the center point of the \a geom currently display on screen
  *
  * Nota Bene: Assume geometry and map canvas CRS are the same
  */
-QPointF InputUtils::centerOnScreenHighligtedGeom( const QgsGeometry &geom, InputMapSettings *mapSettings )
+QPointF InputUtils::onScreenGeometryCenterToScreenCoordinates( const QgsGeometry &geom, InputMapSettings *mapSettings )
 {
-
     QPointF screenPoint;
     if ( !mapSettings || geom.isNull() || !geom.constGet() )
-        // return screenPoint;
         return screenPoint;
-        // return false;
-
 
     QgsRectangle currentExtent = mapSettings->mapSettings().visibleExtent();
     QgsGeometry currentExtentAsGeom = QgsGeometry::fromRect(currentExtent);
 
-     qDebug() << "geomExtend: " << currentExtentAsGeom.asWkt();
-
-    QgsGeometry intersected_geom = currentExtentAsGeom.intersection(geom);
-
-     qDebug() << "inter sected_geom: " << intersected_geom.asWkt();
-
-
-
-    // QgsPoint centroid = QgsPoint( intersected_geom.centroid().asPoint() );
-
-
-    QgsRectangle bbox = intersected_geom.boundingBox();
-
+    QgsGeometry intersectedGeom = currentExtentAsGeom.intersection(geom);
 
+    QgsRectangle bbox = intersectedGeom.boundingBox();
     QgsPoint target = QgsPoint(bbox.center().x(), bbox.center().y());
 
-    QPoint pt = QPoint(bbox.center().x(), bbox.yMaximum());
-
     screenPoint = mapSettings->coordinateToScreen( target );
 
-
-    // return screenPoint.y();
     return screenPoint;
 }
 

app/inpututils.h

@@ -94,8 +94,8 @@ class InputUtils: public QObject
      * Returns the true if the geometry could fully be contained in the current screen otherwise false
      * Geometry must be in canvas CRS
      */
-    Q_INVOKABLE bool canExtentContainGeometry( const QgsGeometry &geom, InputMapSettings *mapSettings );
-    Q_INVOKABLE QPointF centerOnScreenHighligtedGeom( const QgsGeometry &geom, InputMapSettings *mapSettings );
+    Q_INVOKABLE bool extentContainGeometry( const QgsGeometry &geom, InputMapSettings *mapSettings );
+    Q_INVOKABLE QPointF onScreenGeometryCenterToScreenCoordinates( const QgsGeometry &geom, InputMapSettings *mapSettings );
 
     // utility functions to extract information from map settings
     // (in theory this data should be directly available from .MapTransform

app/qml/map/MMMapController.qml

@@ -1202,37 +1202,16 @@ Item {
   function jumpToHighlighted( mapOffset ) {
     if ( identifyHighlight.geometry === null )
       return
-
-    if ( __inputUtils.canExtentContainGeometry( identifyHighlight.geometry, mapCanvas.mapSettings ) ){
-      let screenPt = __inputUtils.geometryCenterToScreenCoordinates( identifyHighlight.geometry, mapCanvas.mapSettings )
-      screenPt.y += mapOffset / 2
-      mapCanvas.jumpTo( screenPt )
+    let screenPt
+    if ( __inputUtils.extentContainGeometry( identifyHighlight.geometry, mapCanvas.mapSettings ) ){
+      screenPt = __inputUtils.geometryCenterToScreenCoordinates( identifyHighlight.geometry, mapCanvas.mapSettings )
     }
     else{
-       console.log("EXTENT CANNOT CONTAIN GEOMETRY");
-
-      // let distanceBottom = __inputUtils.centerOnScreenHighligtedGeom( identifyHighlight.geometry, mapCanvas.mapSettings )
-      let screenPt = __inputUtils.centerOnScreenHighligtedGeom( identifyHighlight.geometry, mapCanvas.mapSettings )
-      // console.log("distanceBottom")
-      // console.log(distanceBottom)
-
-      console.log("offset")
-      console.log((mapOffset / 2) )
-
-        //very bad
-      // let screenPt = Qt.point( Screen.width / 2 - width / 2 , Screen.height / 2 - height / 2 )
-
-      // if (distanceBottom > (mapOffset / 2) ) {
-      //   return
-      // }
-
-      // screenPt.y += (mapOffset / 2) - distanceBottom
-      screenPt.y += mapOffset / 2
-      mapCanvas.jumpTo( screenPt )
-
+      screenPt = __inputUtils.onScreenGeometryCenterToScreenCoordinates( identifyHighlight.geometry, mapCanvas.mapSettings )
     }
 
-
+    screenPt.y += mapOffset / 2
+    mapCanvas.jumpTo( screenPt )
   }
 
   function highlightPair( pair ) {