aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlan D. Snow <alansnow21@gmail.com>2021-04-18 05:34:29 -0500
committerGitHub <noreply@github.com>2021-04-18 12:34:29 +0200
commite4e2991b174ea48b67e9b41c8f356a9cf1bba081 (patch)
treed523f7534caf2662f1b97d5e8e40b5d16886c998 /src
parent3d1c573dc9d9f56ced597554ad9fa1643f0a0ae9 (diff)
downloadPROJ-e4e2991b174ea48b67e9b41c8f356a9cf1bba081.tar.gz
PROJ-e4e2991b174ea48b67e9b41c8f356a9cf1bba081.zip
Added proj_get_celestial_body_list_from_database (#2674)
Closes #2667
Diffstat (limited to 'src')
-rw-r--r--src/iso19111/c_api.cpp70
-rw-r--r--src/iso19111/factory.cpp37
-rw-r--r--src/proj.h23
3 files changed, 130 insertions, 0 deletions
diff --git a/src/iso19111/c_api.cpp b/src/iso19111/c_api.cpp
index c9eaf46a..cb44151a 100644
--- a/src/iso19111/c_api.cpp
+++ b/src/iso19111/c_api.cpp
@@ -2674,6 +2674,76 @@ PROJ_STRING_LIST proj_get_codes_from_database(PJ_CONTEXT *ctx,
// ---------------------------------------------------------------------------
+/** \brief Enumerate celestial bodies from the database.
+ *
+ * The returned object is an array of PROJ_CELESTIAL_BODY_INFO* pointers, whose last
+ * entry is NULL. This array should be freed with proj_celestial_body_list_destroy()
+ *
+ * @param ctx PROJ context, or NULL for default context
+ * @param auth_name Authority name, used to restrict the search.
+ * Or NULL for all authorities.
+ * @param out_result_count Output parameter pointing to an integer to receive
+ * the size of the result list. Might be NULL
+ * @return an array of PROJ_CELESTIAL_BODY_INFO* pointers to be freed with
+ * proj_celestial_body_list_destroy(), or NULL in case of error.
+ * @since 8.1
+ */
+PROJ_CELESTIAL_BODY_INFO **proj_get_celestial_body_list_from_database(PJ_CONTEXT *ctx,
+ const char *auth_name,
+ int *out_result_count) {
+ SANITIZE_CTX(ctx);
+ PROJ_CELESTIAL_BODY_INFO **ret = nullptr;
+ int i = 0;
+ try {
+ auto factory = AuthorityFactory::create(getDBcontext(ctx),
+ auth_name ? auth_name : "");
+ auto list = factory->getCelestialBodyList();
+ ret = new PROJ_CELESTIAL_BODY_INFO *[list.size() + 1];
+ for (const auto &info : list) {
+ ret[i] = new PROJ_CELESTIAL_BODY_INFO;
+ ret[i]->auth_name = pj_strdup(info.authName.c_str());
+ ret[i]->name = pj_strdup(info.name.c_str());
+ i++;
+ }
+ ret[i] = nullptr;
+ if (out_result_count)
+ *out_result_count = i;
+ ctx->safeAutoCloseDbIfNeeded();
+ return ret;
+ } catch (const std::exception &e) {
+ proj_log_error(ctx, __FUNCTION__, e.what());
+ if (ret) {
+ ret[i + 1] = nullptr;
+ proj_celestial_body_list_destroy(ret);
+ }
+ if (out_result_count)
+ *out_result_count = 0;
+ }
+ ctx->safeAutoCloseDbIfNeeded();
+ return nullptr;
+}
+
+// ---------------------------------------------------------------------------
+
+/** \brief Destroy the result returned by
+ * proj_get_celestial_body_list_from_database().
+ *
+ * @since 8.1
+ */
+void proj_celestial_body_list_destroy(PROJ_CELESTIAL_BODY_INFO **list) {
+ if (list) {
+ for (int i = 0; list[i] != nullptr; i++) {
+ free(list[i]->auth_name);
+ free(list[i]->name);
+ delete list[i];
+ }
+ delete[] list;
+ }
+}
+
+
+// ---------------------------------------------------------------------------
+
/** Free a list of NULL terminated strings. */
void proj_string_list_destroy(PROJ_STRING_LIST list) {
if (list) {
diff --git a/src/iso19111/factory.cpp b/src/iso19111/factory.cpp
index 19db111b..088289c5 100644
--- a/src/iso19111/factory.cpp
+++ b/src/iso19111/factory.cpp
@@ -7465,6 +7465,14 @@ AuthorityFactory::UnitInfo::UnitInfo()
deprecated{} {}
//! @endcond
+
+// ---------------------------------------------------------------------------
+
+//! @cond Doxygen_Suppress
+AuthorityFactory::CelestialBodyInfo::CelestialBodyInfo() : authName{}, name{} {}
+//! @endcond
+
+
// ---------------------------------------------------------------------------
/** \brief Return the list of units.
@@ -7517,6 +7525,35 @@ std::list<AuthorityFactory::UnitInfo> AuthorityFactory::getUnitList() const {
// ---------------------------------------------------------------------------
+/** \brief Return the list of celestial bodies.
+ * @throw FactoryException
+ *
+ * @since 8.1
+ */
+std::list<AuthorityFactory::CelestialBodyInfo>
+AuthorityFactory::getCelestialBodyList() const {
+ std::string sql = "SELECT auth_name, name FROM celestial_body";
+ ListOfParams params;
+ if (d->hasAuthorityRestriction()) {
+ sql += " WHERE auth_name = ?";
+ params.emplace_back(d->authority());
+ }
+ sql += " ORDER BY auth_name, name";
+
+ auto sqlRes = d->run(sql, params);
+ std::list<AuthorityFactory::CelestialBodyInfo> res;
+ for (const auto &row : sqlRes) {
+ AuthorityFactory::CelestialBodyInfo info;
+ info.authName = row[0];
+ info.name = row[1];
+ res.emplace_back(info);
+ }
+ return res;
+}
+
+
+// ---------------------------------------------------------------------------
+
/** \brief Gets the official name from a possibly alias name.
*
* @param aliasedName Alias name.
diff --git a/src/proj.h b/src/proj.h
index f32e26b7..49bf991c 100644
--- a/src/proj.h
+++ b/src/proj.h
@@ -1028,6 +1028,22 @@ typedef struct
int deprecated;
} PROJ_UNIT_INFO;
+/** \brief Structure given description of a celestial body.
+ *
+ * This structure may grow over time, and should not be directly allocated by
+ * client code.
+ * @since 8.1
+ */
+typedef struct
+{
+ /** Authority name. */
+ char* auth_name;
+
+ /** Object name. For example "Earth" */
+ char* name;
+
+} PROJ_CELESTIAL_BODY_INFO;
+
/**@}*/
@@ -1183,6 +1199,13 @@ PROJ_STRING_LIST PROJ_DLL proj_get_codes_from_database(PJ_CONTEXT *ctx,
PJ_TYPE type,
int allow_deprecated);
+PROJ_CELESTIAL_BODY_INFO PROJ_DLL **proj_get_celestial_body_list_from_database(
+ PJ_CONTEXT *ctx,
+ const char *auth_name,
+ int *out_result_count);
+
+void PROJ_DLL proj_celestial_body_list_destroy(PROJ_CELESTIAL_BODY_INFO** list);
+
PROJ_CRS_LIST_PARAMETERS PROJ_DLL *proj_get_crs_list_parameters_create(void);
void PROJ_DLL proj_get_crs_list_parameters_destroy(