diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2021-03-18 15:18:48 +0100 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2021-03-18 15:18:48 +0100 |
| commit | 862cb97c22d5ddab3b91f44a4d1b2267c234bd0f (patch) | |
| tree | 437756ba4bff7f0ae3b1ff98c5dbb16e87f327a5 /src | |
| parent | 1e4ad55fbe8f34228f0fd2bbab2e9dc57910621d (diff) | |
| download | PROJ-862cb97c22d5ddab3b91f44a4d1b2267c234bd0f.tar.gz PROJ-862cb97c22d5ddab3b91f44a4d1b2267c234bd0f.zip | |
createFromCRSCodesWithIntermediates(): improve perf when no match
createFromCRSCodesWithIntermediates() runs a rather costly self-join.
Only run it if the source and target CRS are the source/target of a
coordinate operation. This helps for the performance of
proj_create_crs_to_crs() when run on projected CRS for example that are
extremely unlikely to be the source/target of an operation (except
currently the Finish ones). For the EPSG:26915 to EPSG:3857 case of
https://github.com/OSGeo/gdal/issues/3470, this helps decreasing the
time of proj_create_crs_to_crs() from 18 ms to 10 ms.
Diffstat (limited to 'src')
| -rw-r--r-- | src/iso19111/factory.cpp | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/src/iso19111/factory.cpp b/src/iso19111/factory.cpp index 421cdb88..1ec741e1 100644 --- a/src/iso19111/factory.cpp +++ b/src/iso19111/factory.cpp @@ -6081,6 +6081,22 @@ AuthorityFactory::createFromCRSCodesWithIntermediates( return listTmp; } + const auto CheckIfHasOperations = [=](const std::string &auth_name, + const std::string &code) { + return !(d->run("SELECT 1 FROM coordinate_operation_view WHERE " + "(source_crs_auth_name = ? AND source_crs_code = ?) OR " + "(target_crs_auth_name = ? AND target_crs_code = ?)", + {auth_name, code, auth_name, code}) + .empty()); + }; + + // If the source or target CRS are not the source or target of an operation, + // do not run the next costly requests. + if (!CheckIfHasOperations(sourceCRSAuthName, sourceCRSCode) || + !CheckIfHasOperations(targetCRSAuthName, targetCRSCode)) { + return listTmp; + } + const std::string sqlProlog( discardSuperseded ? |
