Rationalize function add test case

Author: ValentinBuira

app/inpututils.cpp

@@ -303,60 +303,40 @@ void InputUtils::setExtentToFeature( const FeatureLayerPair &pair, InputMapSetti
   mapSettings->setExtent( currentExtent );
 }
 
-QPointF InputUtils::geometryCenterToScreenCoordinates( const QgsGeometry &geom, InputMapSettings *mapSettings )
+QPointF InputUtils::onScreenGeometryCenterToScreenCoordinates( const QgsGeometry &geom, InputMapSettings *mapSettings )
 {
   QPointF screenPoint;
-
+  QgsPoint target;
   if ( !mapSettings || geom.isNull() || !geom.constGet() )
     return screenPoint;
 
-  QgsRectangle bbox = geom.boundingBox();
-  screenPoint = mapSettings->coordinateToScreen( QgsPoint( bbox.center() ) );
-
-  return screenPoint;
-}
-/**
- * Returns true if the geometry \a geom is fully contain within the current map extent
- *
- * Nota Bene: Assume geometry and map canvas CRS are the same
- */
-bool InputUtils::extentContainGeometry( const QgsGeometry &geom, InputMapSettings *mapSettings )
-{
-  if ( !mapSettings || geom.isNull() || !geom.constGet() )
-    return false;
-
   QgsRectangle currentExtent = mapSettings->mapSettings().visibleExtent();
   QgsRectangle geomBbox = geom.boundingBox();
 
-  return currentExtent.contains( geomBbox );
-}
+  qDebug() << "currentExtent:" << currentExtent.xMinimum()<<","
+                               << currentExtent.yMinimum()<<","
+                               << currentExtent.xMaximum()<<","
+                               << currentExtent.yMaximum();
+  qDebug() << "geom:" << geom.asWkt();
 
 
-/**
- * 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::onScreenGeometryCenterToScreenCoordinates( const QgsGeometry &geom, InputMapSettings *mapSettings )
-{
-  QPointF screenPoint;
-  if ( !mapSettings || geom.isNull() || !geom.constGet() )
-    return screenPoint;
-
-  QgsRectangle currentExtent = mapSettings->mapSettings().visibleExtent();
-  QgsGeometry currentExtentAsGeom = QgsGeometry::fromRect( currentExtent );
-
-  QgsGeometry intersectedGeom = currentExtentAsGeom.intersection( geom );
-
-  QgsRectangle bbox = intersectedGeom.boundingBox();
-  QgsPoint target = QgsPoint( bbox.center().x(), bbox.center().y() );
+  if (currentExtent.contains( geomBbox )){
+    // Keep the geometry as is
+    target = QgsPoint( geomBbox.center() );
+  }
+  else{
+    // Cut the geometry to current extent
+    QgsGeometry currentExtentAsGeom = QgsGeometry::fromRect( currentExtent );
+    QgsGeometry intersectedGeom = geom.intersection( currentExtentAsGeom );
+    QgsRectangle bbox = intersectedGeom.boundingBox();
+    target = QgsPoint( bbox.center() );
+  }
 
   screenPoint = mapSettings->coordinateToScreen( target );
-
+  qDebug() << "screenPoint:" << screenPoint;
   return screenPoint;
 }
 
-
 double InputUtils::convertCoordinateString( const QString &rationalValue )
 {
   QStringList values = rationalValue.split( "," );

app/inpututils.h

@@ -84,17 +84,10 @@ class InputUtils: public QObject
     Q_INVOKABLE void setExtentToFeature( const FeatureLayerPair &pair, InputMapSettings *mapSettings );
 
     /**
-     * Returns the screen coordinates for a geometry's bounding box centroid
-     * Geometry must be in canvas CRS
-     */
-    Q_INVOKABLE QPointF geometryCenterToScreenCoordinates( const QgsGeometry &geom, InputMapSettings *mapSettings );
-
-
-    /**
-     * Returns the true if the geometry could fully be contained in the current screen otherwise false
-     * Geometry must be in canvas CRS
+     * Returns the center point of the \a geom currently displayed on screen
+     *
+     * Nota Bene: Assume geometry and map canvas CRS are the same
      */
-    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

app/qml/map/MMMapController.qml

@@ -1210,13 +1210,7 @@ Item {
   function jumpToHighlighted( mapOffset ) {
     if ( identifyHighlight.geometry === null )
       return
-    let screenPt
-    if ( __inputUtils.extentContainGeometry( identifyHighlight.geometry, mapCanvas.mapSettings ) ){
-      screenPt = __inputUtils.geometryCenterToScreenCoordinates( identifyHighlight.geometry, mapCanvas.mapSettings )
-    }
-    else{
-      screenPt = __inputUtils.onScreenGeometryCenterToScreenCoordinates( identifyHighlight.geometry, mapCanvas.mapSettings )
-    }
+    let screenPt = __inputUtils.onScreenGeometryCenterToScreenCoordinates( identifyHighlight.geometry, mapCanvas.mapSettings )
 
     screenPt.y += mapOffset / 2
     mapCanvas.jumpTo( screenPt )

app/test/testutilsfunctions.cpp

@@ -946,3 +946,17 @@ void TestUtilsFunctions::testFormatAreaInProjectUnit()
   area2str = mUtils->formatAreaInProjectUnit( 7000, 1, project );
   QVERIFY( area2str == "1.7 ac" );
 }
+
+void TestUtilsFunctions::testOnScreenGeometryCenterToScreenCoordinates()
+{
+  InputMapSettings ms;
+  ms.setDestinationCrs( QgsCoordinateReferenceSystem::fromEpsgId( 3857 ) );
+  ms.setExtent( QgsRectangle( 603472 , 5.39034e+06 , 654803 , 5.4641e+06 ) );
+  ms.setOutputSize( QSize( 1000, 500 ) );
+
+  QgsGeometry geom = QgsGeometry::fromWkt( "LineString (605540.02427726075984538 5422974.88796170614659786, 618450.11232534842565656 5430064.85434877127408981, 631042.73919192561879754 5418953.71299590915441513, 652418.458746955730021 5431228.87868097703903913)");
+
+  QVERIFY( mUtils->onScreenGeometryCenterToScreenCoordinates(geom, &ms) ==  QPointF(161.5,247) );
+
+
+}

app/test/testutilsfunctions.h

@@ -50,6 +50,7 @@ class TestUtilsFunctions: public QObject
     void testParsePositionUpdates();
     void testFormatDistanceInProjectUnit();
     void testFormatAreaInProjectUnit();
+    void testOnScreenGeometryCenterToScreenCoordinates();
 
   private:
     void testFormatDuration( const QDateTime &t0, qint64 diffSecs, const QString &expectedResult );