Move projection/transformation related files to core/proj

Minor cleanup
qgis · May 7, 2021 · 31d1df3 · 31d1df3
1 parent 0ee3de2
commit 31d1df3
Show file tree

Hide file tree

Showing 31 changed files with 47 additions and 43 deletions.
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
@@ -75,6 +75,7 @@ if(WITH_APIDOC)
       ${CMAKE_SOURCE_DIR}/src/core/numericformats
       ${CMAKE_SOURCE_DIR}/src/core/pal
       ${CMAKE_SOURCE_DIR}/src/core/processing
+      ${CMAKE_SOURCE_DIR}/src/core/proj
       ${CMAKE_SOURCE_DIR}/src/core/pointcloud
       ${CMAKE_SOURCE_DIR}/src/core/project
       ${CMAKE_SOURCE_DIR}/src/core/providers

diff --git a/...rated/qgscoordinatereferencesystem.sip.in → .../proj/qgscoordinatereferencesystem.sip.in b/...rated/qgscoordinatereferencesystem.sip.in → .../proj/qgscoordinatereferencesystem.sip.in
@@ -1,7 +1,7 @@
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *
- * src/core/qgscoordinatereferencesystem.h                              *
+ * src/core/proj/qgscoordinatereferencesystem.h                         *
  *                                                                      *
  * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
  ************************************************************************/
@@ -946,7 +946,7 @@ that outdated CRS objects are not created.
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *
- * src/core/qgscoordinatereferencesystem.h                              *
+ * src/core/proj/qgscoordinatereferencesystem.h                         *
  *                                                                      *
  * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
  ************************************************************************/
diff --git a/...scoordinatereferencesystemregistry.sip.in → ...scoordinatereferencesystemregistry.sip.in b/...scoordinatereferencesystemregistry.sip.in → ...scoordinatereferencesystemregistry.sip.in
@@ -1,7 +1,7 @@
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *
- * src/core/qgscoordinatereferencesystemregistry.h                      *
+ * src/core/proj/qgscoordinatereferencesystemregistry.h                 *
  *                                                                      *
  * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
  ************************************************************************/
@@ -158,7 +158,7 @@ user-defined CRS) to change.
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *
- * src/core/qgscoordinatereferencesystemregistry.h                      *
+ * src/core/proj/qgscoordinatereferencesystemregistry.h                 *
  *                                                                      *
  * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
  ************************************************************************/
diff --git a/...o_generated/qgscoordinatetransform.sip.in → ...erated/proj/qgscoordinatetransform.sip.in b/...o_generated/qgscoordinatetransform.sip.in → ...erated/proj/qgscoordinatetransform.sip.in
@@ -1,7 +1,7 @@
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *
- * src/core/qgscoordinatetransform.h                                    *
+ * src/core/proj/qgscoordinatetransform.h                               *
  *                                                                      *
  * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
  ************************************************************************/
@@ -587,7 +587,7 @@ sourceUnits * scaleFactor = destinationUnits
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *
- * src/core/qgscoordinatetransform.h                                    *
+ * src/core/proj/qgscoordinatetransform.h                               *
  *                                                                      *
  * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
  ************************************************************************/
diff --git a/...ated/qgscoordinatetransformcontext.sip.in → ...proj/qgscoordinatetransformcontext.sip.in b/...ated/qgscoordinatetransformcontext.sip.in → ...proj/qgscoordinatetransformcontext.sip.in
@@ -1,7 +1,7 @@
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *
- * src/core/qgscoordinatetransformcontext.h                             *
+ * src/core/proj/qgscoordinatetransformcontext.h                        *
  *                                                                      *
  * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
  ************************************************************************/
@@ -302,7 +302,7 @@ Write the context's state to application settings.
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *
- * src/core/qgscoordinatetransformcontext.h                             *
+ * src/core/proj/qgscoordinatetransformcontext.h                        *
  *                                                                      *
  * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
  ************************************************************************/
diff --git a/python/core/auto_generated/qgsdatums.sip.in → ...core/auto_generated/proj/qgsdatums.sip.in b/python/core/auto_generated/qgsdatums.sip.in → ...core/auto_generated/proj/qgsdatums.sip.in
@@ -1,7 +1,7 @@
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *
- * src/core/qgsdatums.h                                                 *
+ * src/core/proj/qgsdatums.h                                            *
  *                                                                      *
  * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
  ************************************************************************/
@@ -146,7 +146,7 @@ Contains a list of members of the ensemble.
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *
- * src/core/qgsdatums.h                                                 *
+ * src/core/proj/qgsdatums.h                                            *
  *                                                                      *
  * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
  ************************************************************************/
diff --git a/...e/auto_generated/qgsdatumtransform.sip.in → ...o_generated/proj/qgsdatumtransform.sip.in b/...e/auto_generated/qgsdatumtransform.sip.in → ...o_generated/proj/qgsdatumtransform.sip.in
@@ -1,7 +1,7 @@
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *
- * src/core/qgsdatumtransform.h                                         *
+ * src/core/proj/qgsdatumtransform.h                                    *
  *                                                                      *
  * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
  ************************************************************************/
@@ -200,7 +200,7 @@ If ``datumTransformId`` was not a valid transform ID, a TransformInfo with Trans
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *
- * src/core/qgsdatumtransform.h                                         *
+ * src/core/proj/qgsdatumtransform.h                                    *
  *                                                                      *
  * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
  ************************************************************************/
diff --git a/...e/auto_generated/qgsellipsoidutils.sip.in → ...o_generated/proj/qgsellipsoidutils.sip.in b/...e/auto_generated/qgsellipsoidutils.sip.in → ...o_generated/proj/qgsellipsoidutils.sip.in
@@ -1,7 +1,7 @@
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *
- * src/core/qgsellipsoidutils.h                                         *
+ * src/core/proj/qgsellipsoidutils.h                                    *
  *                                                                      *
  * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
  ************************************************************************/
@@ -70,7 +70,7 @@ ellipsoid database.
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *
- * src/core/qgsellipsoidutils.h                                         *
+ * src/core/proj/qgsellipsoidutils.h                                    *
  *                                                                      *
  * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
  ************************************************************************/
diff --git a/...n/core/auto_generated/qgsprojutils.sip.in → ...e/auto_generated/proj/qgsprojutils.sip.in b/...n/core/auto_generated/qgsprojutils.sip.in → ...e/auto_generated/proj/qgsprojutils.sip.in
@@ -1,7 +1,7 @@
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *
- * src/core/qgsprojutils.h                                              *
+ * src/core/proj/qgsprojutils.h                                         *
  *                                                                      *
  * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
  ************************************************************************/
@@ -98,7 +98,7 @@ Returns the current list of Proj file search paths.
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *
- * src/core/qgsprojutils.h                                              *
+ * src/core/proj/qgsprojutils.h                                         *
  *                                                                      *
  * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
  ************************************************************************/
diff --git a/python/core/core_auto.sip b/python/core/core_auto.sip
@@ -30,10 +30,6 @@
 %Include auto_generated/qgsconditionalstyle.sip
 %Include auto_generated/qgsconnectionregistry.sip
 %Include auto_generated/qgscoordinateformatter.sip
-%Include auto_generated/qgscoordinatereferencesystem.sip
-%Include auto_generated/qgscoordinatereferencesystemregistry.sip
-%Include auto_generated/qgscoordinatetransform.sip
-%Include auto_generated/qgscoordinatetransformcontext.sip
 %Include auto_generated/qgscredentials.sip
 %Include auto_generated/qgsdartmeasurement.sip
 %Include auto_generated/qgsdatabaseschemamodel.sip
@@ -46,15 +42,12 @@
 %Include auto_generated/qgsdataprovidertemporalcapabilities.sip
 %Include auto_generated/qgsdatasourceuri.sip
 %Include auto_generated/qgsdatetimestatisticalsummary.sip
-%Include auto_generated/qgsdatums.sip
-%Include auto_generated/qgsdatumtransform.sip
 %Include auto_generated/qgsdbfilterproxymodel.sip
 %Include auto_generated/qgsdefaultvalue.sip
 %Include auto_generated/qgsdiagramrenderer.sip
 %Include auto_generated/qgsdistancearea.sip
 %Include auto_generated/qgseditorwidgetsetup.sip
 %Include auto_generated/qgselevationutils.sip
-%Include auto_generated/qgsellipsoidutils.sip
 %Include auto_generated/qgserror.sip
 %Include auto_generated/qgsexpressioncontext.sip
 %Include auto_generated/qgsexpressioncontextgenerator.sip
@@ -150,7 +143,6 @@
 %Include auto_generated/qgspointlocator.sip
 %Include auto_generated/qgspointxy.sip
 %Include auto_generated/qgspostgresstringutils.sip
-%Include auto_generated/qgsprojutils.sip
 %Include auto_generated/qgsproperty.sip
 %Include auto_generated/qgspropertycollection.sip
 %Include auto_generated/qgspropertytransformer.sip
@@ -436,6 +428,14 @@
 %Include auto_generated/pointcloud/qgspointcloudrenderer.sip
 %Include auto_generated/pointcloud/qgspointcloudrendererregistry.sip
 %Include auto_generated/pointcloud/qgspointcloudrgbrenderer.sip
+%Include auto_generated/proj/qgscoordinatereferencesystem.sip
+%Include auto_generated/proj/qgscoordinatereferencesystemregistry.sip
+%Include auto_generated/proj/qgscoordinatetransform.sip
+%Include auto_generated/proj/qgscoordinatetransformcontext.sip
+%Include auto_generated/proj/qgsdatums.sip
+%Include auto_generated/proj/qgsdatumtransform.sip
+%Include auto_generated/proj/qgsellipsoidutils.sip
+%Include auto_generated/proj/qgsprojutils.sip
 %Include auto_generated/metadata/qgsabstractmetadatabase.sip
 %Include auto_generated/metadata/qgslayermetadata.sip
 %Include auto_generated/metadata/qgslayermetadataformatter.sip

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -286,11 +286,6 @@ set(QGIS_CORE_SRCS
   qgsconditionalstyle.cpp
   qgsconnectionregistry.cpp
   qgscoordinateformatter.cpp
-  qgscoordinatereferencesystem.cpp
-  qgscoordinatereferencesystemregistry.cpp
-  qgscoordinatetransform.cpp
-  qgscoordinatetransform_p.cpp
-  qgscoordinatetransformcontext.cpp
   qgscoordinateutils.cpp
   qgscplhttpfetchoverrider.cpp
   qgscredentials.cpp
@@ -305,13 +300,11 @@ set(QGIS_CORE_SRCS
   qgsdataprovider.cpp
   qgsdataprovidertemporalcapabilities.cpp
   qgsdatetimestatisticalsummary.cpp
-  qgsdatumtransform.cpp
   qgsdbfilterproxymodel.cpp
   qgsdefaultvalue.cpp
   qgsdiagramrenderer.cpp
   qgsdistancearea.cpp
   qgselevationutils.cpp
-  qgsellipsoidutils.cpp
   qgserror.cpp
   qgseventtracing.cpp
   qgsexpressioncontext.cpp
@@ -406,7 +399,6 @@ set(QGIS_CORE_SRCS
   qgspointlocatorinittask.cpp
   qgsqueryresultmodel.cpp
   qgssnappingconfig.cpp
-  qgsprojutils.cpp
   qgsproperty.cpp
   qgspropertycollection.cpp
   qgspropertytransformer.cpp
@@ -555,6 +547,15 @@ set(QGIS_CORE_SRCS
   pal/problem.cpp
   pal/util.cpp
 
+  proj/qgscoordinatereferencesystem.cpp
+  proj/qgscoordinatereferencesystemregistry.cpp
+  proj/qgscoordinatetransform.cpp
+  proj/qgscoordinatetransform_p.cpp
+  proj/qgscoordinatetransformcontext.cpp
+  proj/qgsdatumtransform.cpp
+  proj/qgsellipsoidutils.cpp
+  proj/qgsprojutils.cpp
+
   project/qgsproject.cpp
   project/qgsprojectbadlayerhandler.cpp
   project/qgsprojectfiletransform.cpp
@@ -880,10 +881,6 @@ set(QGIS_CORE_HDRS
   qgsconnectionpool.h
   qgsconnectionregistry.h
   qgscoordinateformatter.h
-  qgscoordinatereferencesystem.h
-  qgscoordinatereferencesystemregistry.h
-  qgscoordinatetransform.h
-  qgscoordinatetransformcontext.h
   qgscoordinateutils.h
   qgscredentials.h
   qgsdartmeasurement.h
@@ -897,15 +894,12 @@ set(QGIS_CORE_HDRS
   qgsdataprovidertemporalcapabilities.h
   qgsdatasourceuri.h
   qgsdatetimestatisticalsummary.h
-  qgsdatums.h
-  qgsdatumtransform.h
   qgsdbfilterproxymodel.h
   qgsdefaultvalue.h
   qgsdiagramrenderer.h
   qgsdistancearea.h
   qgseditorwidgetsetup.h
   qgselevationutils.h
-  qgsellipsoidutils.h
   qgserror.h
   qgseventtracing.h
   qgsexception.h
@@ -1014,7 +1008,6 @@ set(QGIS_CORE_HDRS
   qgspointlocatorinittask.h
   qgspointxy.h
   qgspostgresstringutils.h
-  qgsprojutils.h
   qgsproperty.h
   qgspropertycollection.h
   qgspropertytransformer.h
@@ -1364,6 +1357,15 @@ set(QGIS_CORE_HDRS
   pointcloud/qgspointcloudrendererregistry.h
   pointcloud/qgspointcloudrgbrenderer.h
 
+  proj/qgscoordinatereferencesystem.h
+  proj/qgscoordinatereferencesystemregistry.h
+  proj/qgscoordinatetransform.h
+  proj/qgscoordinatetransformcontext.h
+  proj/qgsdatums.h
+  proj/qgsdatumtransform.h
+  proj/qgsellipsoidutils.h
+  proj/qgsprojutils.h
+
   metadata/qgsabstractmetadatabase.h
   metadata/qgslayermetadata.h
   metadata/qgslayermetadataformatter.h
@@ -1618,9 +1620,6 @@ set(QGIS_CORE_HDRS
 )
 
 set(QGIS_CORE_PRIVATE_HDRS
-  qgscoordinatereferencesystem_p.h
-  qgscoordinatetransformcontext_p.h
-  qgscoordinatetransform_p.h
   qgsfeature_p.h
   qgsfield_p.h
   qgsfields_p.h
@@ -1629,6 +1628,9 @@ set(QGIS_CORE_PRIVATE_HDRS
   qgsspatialindexkdbush_p.h
 
   editform/qgseditformconfig_p.h
+  proj/qgscoordinatereferencesystem_p.h
+  proj/qgscoordinatetransformcontext_p.h
+  proj/qgscoordinatetransform_p.h
   textrenderer/qgstextrenderer_p.h
 )
 
@@ -1818,6 +1820,7 @@ target_include_directories(qgis_core PUBLIC
   pointcloud
   processing
   processing/models
+  proj
   project
   providers
   providers/arcgis

diff --git a/src/core/qgscoordinatereferencesystem.cpp → ...ore/proj/qgscoordinatereferencesystem.cpp b/src/core/qgscoordinatereferencesystem.cpp → ...ore/proj/qgscoordinatereferencesystem.cpp
diff --git a/src/core/qgscoordinatereferencesystem.h → src/core/proj/qgscoordinatereferencesystem.h b/src/core/qgscoordinatereferencesystem.h → src/core/proj/qgscoordinatereferencesystem.h
diff --git a/...ore/qgscoordinatereferencesystem_legacy.h → ...roj/qgscoordinatereferencesystem_legacy.h b/...ore/qgscoordinatereferencesystem_legacy.h → ...roj/qgscoordinatereferencesystem_legacy.h
diff --git a/src/core/qgscoordinatereferencesystem_p.h → ...ore/proj/qgscoordinatereferencesystem_p.h b/src/core/qgscoordinatereferencesystem_p.h → ...ore/proj/qgscoordinatereferencesystem_p.h
diff --git a/.../qgscoordinatereferencesystemregistry.cpp → .../qgscoordinatereferencesystemregistry.cpp b/.../qgscoordinatereferencesystemregistry.cpp → .../qgscoordinatereferencesystemregistry.cpp
diff --git a/...re/qgscoordinatereferencesystemregistry.h → ...oj/qgscoordinatereferencesystemregistry.h b/...re/qgscoordinatereferencesystemregistry.h → ...oj/qgscoordinatereferencesystemregistry.h
diff --git a/src/core/qgscoordinatetransform.cpp → src/core/proj/qgscoordinatetransform.cpp b/src/core/qgscoordinatetransform.cpp → src/core/proj/qgscoordinatetransform.cpp
diff --git a/src/core/qgscoordinatetransform.h → src/core/proj/qgscoordinatetransform.h b/src/core/qgscoordinatetransform.h → src/core/proj/qgscoordinatetransform.h
diff --git a/src/core/qgscoordinatetransform_p.cpp → src/core/proj/qgscoordinatetransform_p.cpp b/src/core/qgscoordinatetransform_p.cpp → src/core/proj/qgscoordinatetransform_p.cpp
diff --git a/src/core/qgscoordinatetransform_p.h → src/core/proj/qgscoordinatetransform_p.h b/src/core/qgscoordinatetransform_p.h → src/core/proj/qgscoordinatetransform_p.h
diff --git a/src/core/qgscoordinatetransformcontext.cpp → ...re/proj/qgscoordinatetransformcontext.cpp b/src/core/qgscoordinatetransformcontext.cpp → ...re/proj/qgscoordinatetransformcontext.cpp
diff --git a/src/core/qgscoordinatetransformcontext.h → ...core/proj/qgscoordinatetransformcontext.h b/src/core/qgscoordinatetransformcontext.h → ...core/proj/qgscoordinatetransformcontext.h
diff --git a/src/core/qgscoordinatetransformcontext_p.h → ...re/proj/qgscoordinatetransformcontext_p.h b/src/core/qgscoordinatetransformcontext_p.h → ...re/proj/qgscoordinatetransformcontext_p.h
diff --git a/src/core/qgsdatums.h → src/core/proj/qgsdatums.h b/src/core/qgsdatums.h → src/core/proj/qgsdatums.h
diff --git a/src/core/qgsdatumtransform.cpp → src/core/proj/qgsdatumtransform.cpp b/src/core/qgsdatumtransform.cpp → src/core/proj/qgsdatumtransform.cpp
diff --git a/src/core/qgsdatumtransform.h → src/core/proj/qgsdatumtransform.h b/src/core/qgsdatumtransform.h → src/core/proj/qgsdatumtransform.h
diff --git a/src/core/qgsellipsoidutils.cpp → src/core/proj/qgsellipsoidutils.cpp b/src/core/qgsellipsoidutils.cpp → src/core/proj/qgsellipsoidutils.cpp
diff --git a/src/core/qgsellipsoidutils.h → src/core/proj/qgsellipsoidutils.h b/src/core/qgsellipsoidutils.h → src/core/proj/qgsellipsoidutils.h
diff --git a/src/core/qgsprojutils.cpp → src/core/proj/qgsprojutils.cpp b/src/core/qgsprojutils.cpp → src/core/proj/qgsprojutils.cpp
diff --git a/src/core/qgsprojutils.h → src/core/proj/qgsprojutils.h b/src/core/qgsprojutils.h → src/core/proj/qgsprojutils.h