From 940bb7447647631676b90b03431aa88cb88fdd2d Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sun, 17 Nov 2019 20:03:29 +0100
Subject: findsOpsInRegistryWithIntermediate(): tune it to be able to research
 operations that belong to different authorities. Should make the concept of
 geodetic_datum_preferred_hub introduced some time ago obsolete

---
 include/proj/io.hpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'include')

diff --git a/include/proj/io.hpp b/include/proj/io.hpp
index 17f0fea5..060ab128 100644
--- a/include/proj/io.hpp
+++ b/include/proj/io.hpp
@@ -1064,6 +1064,8 @@ class PROJ_GCC_DLL AuthorityFactory {
         const std::vector<std::pair<std::string, std::string>>
             &intermediateCRSAuthCodes,
         ObjectType allowedIntermediateObjectType = ObjectType::CRS,
+        const std::vector<std::string> &allowedAuthorities =
+            std::vector<std::string>(),
         const metadata::ExtentPtr &intersectingExtent1 = nullptr,
         const metadata::ExtentPtr &intersectingExtent2 = nullptr) const;
 
-- 
cgit v1.2.3


From a8c1588d43fccdbc3b65448f2c7af6472fa6519b Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sun, 17 Nov 2019 20:11:17 +0100
Subject: createOperations(): remove the concept of
 geodetic_datum_preferred_hub

This was introduced in 63857c92b271bbcd10df0a032304982011acb2a9. Due to
the fix done in the previous commit, we can mostly revert the above commit.
We just keep the added tests and the custom WGS 84<-->WGS 84 (Gxxxx) null
transformations.
---
 include/proj/io.hpp | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'include')

diff --git a/include/proj/io.hpp b/include/proj/io.hpp
index 060ab128..52ffebad 100644
--- a/include/proj/io.hpp
+++ b/include/proj/io.hpp
@@ -1116,10 +1116,6 @@ class PROJ_GCC_DLL AuthorityFactory {
     createCoordinateReferenceSystem(const std::string &code,
                                     bool allowCompound) const;
 
-    PROJ_INTERNAL std::list<datum::GeodeticReferenceFrameNNPtr>
-    getPreferredHubGeodeticReferenceFrames(
-        const std::string &geodeticReferenceFrameCode) const;
-
     PROJ_INTERNAL std::vector<operation::CoordinateOperationNNPtr>
     getTransformationsForGeoid(const std::string &geoidName,
                                bool usePROJAlternativeGridNames) const;
-- 
cgit v1.2.3