Use proj to get crs bounds under proj 6

qgis · May 24, 2019 · 0b7e399 · 0b7e399
1 parent 3814086
commit 0b7e399
Showing 1 changed file with 24 additions and 1 deletion.
diff --git a/src/core/qgscoordinatereferencesystem.cpp b/src/core/qgscoordinatereferencesystem.cpp
@@ -1258,6 +1258,29 @@ QgsRectangle QgsCoordinateReferenceSystem::bounds() const
   if ( !d->mIsValid )
     return QgsRectangle();
 
+#if PROJ_VERSION_MAJOR>=6
+  if ( !d->mPj )
+    return QgsRectangle();
+
+  double westLon = 0;
+  double southLat = 0;
+  double eastLon = 0;
+  double northLat = 0;
+
+  if ( !proj_get_area_of_use( QgsProjContext::get(), d->mPj.get(),
+                              &westLon, &southLat, &eastLon, &northLat, nullptr ) )
+    return QgsRectangle();
+
+
+  // don't use the constructor which normalizes!
+  QgsRectangle rect;
+  rect.setXMinimum( westLon );
+  rect.setYMinimum( southLat );
+  rect.setXMaximum( eastLon );
+  rect.setYMaximum( northLat );
+  return rect;
+
+#else
   //check the db is available
   QString databaseFileName = QgsApplication::srsDatabaseFilePath();
 
@@ -1291,8 +1314,8 @@ QgsRectangle QgsCoordinateReferenceSystem::bounds() const
       rect.setYMaximum( north );
     }
   }
-
   return rect;
+#endif
 }