Merge pull request #4144 from rouault/proj_context_set_user_writable_…

…directory

API: add proj_context_set_user_writable_directory()

docs/source/resource_files.rst

@@ -44,6 +44,9 @@ The following paths are checked in order:
     * on other platforms (Linux), ``${XDG_DATA_HOME}/proj`` if
       :envvar:`XDG_DATA_HOME` is defined. Else ``${HOME}/.local/share/proj``
 
+  Applications may also customize the user writable directory using
+  :cpp:func:`proj_context_set_user_writable_directory` (since 9.5)
+
 - Path(s) set with by the environment variable :envvar:`PROJ_DATA`.
   Prior to PROJ 9.1, this environment variable was called :envvar:`PROJ_LIB`.
   This older name is still supported in PROJ 9.1 as a fallback, but support for it

scripts/reference_exported_symbols.txt

@@ -817,7 +817,6 @@ pj_approx_3D_trans(PJconsts*, PJ_DIRECTION, PJ_COORD)
 pj_atof(char const*)
 pj_chomp(char*)
 pj_context_get_grid_cache_filename(pj_ctx*)
-pj_context_set_user_writable_directory(pj_ctx*, std::string const&)
 pj_ell_set(pj_ctx*, ARG_list*, double*, double*)
 pj_fwd(PJ_LP, PJconsts*)
 pj_get_datums_ref()
@@ -875,6 +874,7 @@ proj_context_set(PJconsts*, pj_ctx*)
 proj_context_set_search_paths
 proj_context_set_sqlite3_vfs_name
 proj_context_set_url_endpoint
+proj_context_set_user_writable_directory
 proj_context_use_proj4_init_rules
 proj_convert_conversion_to_other_method
 proj_coord

src/apps/projsync.cpp

@@ -242,7 +242,7 @@ int main(int argc, char *argv[]) {
         }
 
         // This is used by projsync() to determine where to write files.
-        pj_context_set_user_writable_directory(ctx, targetDir);
+        proj_context_set_user_writable_directory(ctx, targetDir.c_str(), true);
     }
 
     if (!endpoint.empty() && endpoint.back() == '/') {

src/filemanager.cpp

@@ -1130,13 +1130,15 @@ void proj_context_set_sqlite3_vfs_name(PJ_CONTEXT *ctx, const char *name) {
 
 // ---------------------------------------------------------------------------
 
-/** Get the PROJ user writable directory for datumgrid files.
+/** Get the PROJ user writable directory for downloadable resource files, such
+ * as datum shift grids.
  *
  * @param ctx PROJ context, or NULL
  * @param create If set to TRUE, create the directory if it does not exist
  * already.
  * @return The path to the PROJ user writable directory.
  * @since 7.1
+ * @see proj_context_set_user_writable_directory()
  */
 
 const char *proj_context_get_user_writable_directory(PJ_CONTEXT *ctx,
@@ -1211,6 +1213,40 @@ const char *proj_context_get_user_writable_directory(PJ_CONTEXT *ctx,
     return ctx->user_writable_directory.c_str();
 }
 
+// ---------------------------------------------------------------------------
+
+/** Set the PROJ user writable directory for downloadable resource files, such
+ * as datum shift grids.
+ *
+ * If not explicitly set, the following locations are used:
+ * <ul>
+ * <li>on Windows, ${LOCALAPPDATA}/proj</li>
+ * <li>on macOS, ${HOME}/Library/Application Support/proj</li>
+ * <li>on other platforms (Linux), ${XDG_DATA_HOME}/proj if XDG_DATA_HOME is
+ * defined. Else ${HOME}/.local/share/proj</li>
+ * </ul>
+ *
+ * @param ctx PROJ context, or NULL
+ * @param path Path to the PROJ user writable directory. If set to NULL, the
+ *             default location will be used.
+ * @param create If set to TRUE, create the directory if it does not exist
+ * already.
+ * @since 9.5
+ * @see proj_context_get_user_writable_directory()
+ */
+
+void proj_context_set_user_writable_directory(PJ_CONTEXT *ctx, const char *path,
+                                              int create) {
+    if (!ctx)
+        ctx = pj_get_default_ctx();
+    ctx->user_writable_directory = path ? path : "";
+    if (!path || create) {
+        proj_context_get_user_writable_directory(ctx, create);
+    }
+}
+
+// ---------------------------------------------------------------------------
+
 /** Get the URL endpoint to query for remote grids.
  *
  * @param ctx PROJ context, or NULL
@@ -1235,15 +1271,6 @@ const char *proj_context_get_url_endpoint(PJ_CONTEXT *ctx) {
 
 // ---------------------------------------------------------------------------
 
-void pj_context_set_user_writable_directory(PJ_CONTEXT *ctx,
-                                            const std::string &path) {
-    if (!ctx)
-        ctx = pj_get_default_ctx();
-    ctx->user_writable_directory = path;
-}
-
-// ---------------------------------------------------------------------------
-
 #ifdef WIN32
 static const char dir_chars[] = "/\\";
 #else

src/proj.h

@@ -563,6 +563,10 @@ const char PROJ_DLL *proj_context_get_url_endpoint(PJ_CONTEXT *ctx);
 const char PROJ_DLL *proj_context_get_user_writable_directory(PJ_CONTEXT *ctx,
                                                               int create);
 
+void PROJ_DLL proj_context_set_user_writable_directory(PJ_CONTEXT *ctx,
+                                                       const char *path,
+                                                       int create);
+
 void PROJ_DLL proj_grid_cache_set_enable(PJ_CONTEXT *ctx, int enabled);
 
 void PROJ_DLL proj_grid_cache_set_filename(PJ_CONTEXT *ctx,

src/proj_internal.h

@@ -950,8 +950,6 @@ void pj_load_ini(PJ_CONTEXT *ctx);
 std::string PROJ_DLL pj_context_get_grid_cache_filename(PJ_CONTEXT *ctx);
 
 // For use by projsync
-void PROJ_DLL pj_context_set_user_writable_directory(PJ_CONTEXT *ctx,
-                                                     const std::string &path);
 std::string PROJ_DLL pj_get_relative_share_proj(PJ_CONTEXT *ctx);
 
 std::vector<PJCoordOperation>

src/proj_symbol_rename.h

@@ -72,11 +72,14 @@
 #define proj_context_set_sqlite3_vfs_name                                      \
     internal_proj_context_set_sqlite3_vfs_name
 #define proj_context_set_url_endpoint internal_proj_context_set_url_endpoint
+#define proj_context_set_user_writable_directory                               \
+    internal_proj_context_set_user_writable_directory
 #define proj_context_use_proj4_init_rules                                      \
     internal_proj_context_use_proj4_init_rules
 #define proj_convert_conversion_to_other_method                                \
     internal_proj_convert_conversion_to_other_method
 #define proj_coord internal_proj_coord
+#define proj_coordinate_metadata_create internal_proj_coordinate_metadata_create
 #define proj_coordinate_metadata_get_epoch                                     \
     internal_proj_coordinate_metadata_get_epoch
 #define proj_coordoperation_create_inverse                                     \
@@ -163,6 +166,8 @@
     internal_proj_create_conversion_lambert_azimuthal_equal_area
 #define proj_create_conversion_lambert_conic_conformal_1sp                     \
     internal_proj_create_conversion_lambert_conic_conformal_1sp
+#define proj_create_conversion_lambert_conic_conformal_1sp_variant_b           \
+    internal_proj_create_conversion_lambert_conic_conformal_1sp_variant_b
 #define proj_create_conversion_lambert_conic_conformal_2sp                     \
     internal_proj_create_conversion_lambert_conic_conformal_2sp
 #define proj_create_conversion_lambert_conic_conformal_2sp_belgium             \
@@ -278,6 +283,8 @@
 #define proj_crs_get_geodetic_crs internal_proj_crs_get_geodetic_crs
 #define proj_crs_get_horizontal_datum internal_proj_crs_get_horizontal_datum
 #define proj_crs_get_sub_crs internal_proj_crs_get_sub_crs
+#define proj_crs_has_point_motion_operation                                    \
+    internal_proj_crs_has_point_motion_operation
 #define proj_crs_info_list_destroy internal_proj_crs_info_list_destroy
 #define proj_crs_is_derived internal_proj_crs_is_derived
 #define proj_crs_promote_to_3D internal_proj_crs_promote_to_3D
@@ -305,6 +312,7 @@
 #define proj_factors internal_proj_factors
 #define proj_geod internal_proj_geod
 #define proj_get_area_of_use internal_proj_get_area_of_use
+#define proj_get_area_of_use_ex internal_proj_get_area_of_use_ex
 #define proj_get_authorities_from_database                                     \
     internal_proj_get_authorities_from_database
 #define proj_get_celestial_body_list_from_database                             \
@@ -317,6 +325,7 @@
     internal_proj_get_crs_list_parameters_create
 #define proj_get_crs_list_parameters_destroy                                   \
     internal_proj_get_crs_list_parameters_destroy
+#define proj_get_domain_count internal_proj_get_domain_count
 #define proj_get_ellipsoid internal_proj_get_ellipsoid
 #define proj_get_geoid_models_from_database                                    \
     internal_proj_get_geoid_models_from_database
@@ -328,6 +337,7 @@
 #define proj_get_prime_meridian internal_proj_get_prime_meridian
 #define proj_get_remarks internal_proj_get_remarks
 #define proj_get_scope internal_proj_get_scope
+#define proj_get_scope_ex internal_proj_get_scope_ex
 #define proj_get_source_crs internal_proj_get_source_crs
 #define proj_get_suggested_operation internal_proj_get_suggested_operation
 #define proj_get_target_crs internal_proj_get_target_crs

test/unit/proj_context_test.cpp

@@ -151,6 +151,30 @@ TEST(proj_context, proj_context_set_search_paths) {
 
 // ---------------------------------------------------------------------------
 
+TEST(proj_context, proj_context_set_user_writable_directory) {
+
+    auto ctx = proj_context_create();
+    auto default_path =
+        std::string(proj_context_get_user_writable_directory(ctx, false));
+    EXPECT_TRUE(!default_path.empty());
+
+    auto new_path = default_path + DIR_CHAR + "temp_proj_dic4";
+    proj_context_set_user_writable_directory(ctx, new_path.c_str(), true);
+
+    EXPECT_STREQ(proj_context_get_user_writable_directory(ctx, false),
+                 new_path.c_str());
+
+    proj_context_set_user_writable_directory(ctx, nullptr, false);
+
+    EXPECT_STREQ(proj_context_get_user_writable_directory(ctx, false),
+                 default_path.c_str());
+
+    proj_context_destroy(ctx);
+    MyUnlink(new_path);
+}
+
+// ---------------------------------------------------------------------------
+
 TEST(proj_context, read_grid_from_user_writable_directory) {
 
     auto ctx = proj_context_create();