Merge pull request #213 from snowman2/pyproj_data

Update data directory functionality

Author: snowman2

appveyor.yml

@@ -123,10 +123,12 @@ after_test:
   # If tests are successful, create binary packages for the project.
   - mkdir pyproj\proj_dir\share\proj
   - copy %PROJ_LIB%\* pyproj\proj_dir\share\proj
-  - mkdir pyproj\proj_dir\lib
-  - copy %PROJ_DIR%\lib\* pyproj\proj_dir\lib
-  - copy c:\tools\vcpkg\installed\"%platform%"-windows\bin\sqlite3.dll pyproj\proj_dir\lib
-  - set PROJ_LIBDIR=proj_dir\lib
+  - mkdir pyproj\.lib
+  - mkdir .lib
+  - copy %PROJ_DIR%\lib\* pyproj\.lib
+  - copy %PROJ_DIR%\lib\* .lib
+  - copy c:\tools\vcpkg\installed\"%platform%"-windows\bin\sqlite3.dll pyproj\.lib
+  - set PROJ_LIBDIR=.lib
   - set PROJ_WHEEL=true
   - "%CMD_IN_ENV% python setup.py bdist_wheel"
   # - "%CMD_IN_ENV% python setup.py bdist_wininst"

pyproj/_crs.pyx

@@ -1,5 +1,5 @@
 from pyproj.compat import cstrencode, pystrdecode
-from pyproj.datadir import get_data_dir
+from pyproj._datadir cimport get_pyproj_context
 from pyproj.exceptions import CRSError
 
 def is_wkt(proj_string):
@@ -303,12 +303,7 @@ cdef class _CRS:
         self._area_of_use = None
         self._prime_meridian = None
         # setup the context
-        self.projctx = proj_context_create()
-        py_data_dir = cstrencode(get_data_dir())
-        cdef const char* data_dir = py_data_dir
-        proj_context_set_search_paths(self.projctx, 1, &data_dir)
-        proj_context_use_proj4_init_rules(self.projctx, 1)
-
+        self.projctx = get_pyproj_context()
         # setup proj initialization string.
         if not is_wkt(projstring) \
                 and not projstring.lower().startswith("epsg")\

pyproj/_datadir.pxd

@@ -0,0 +1,4 @@
+include "proj.pxi"
+
+
+cdef PJ_CONTEXT* get_pyproj_context()

pyproj/_datadir.pyx

@@ -0,0 +1,26 @@
+
+from libc.stdlib cimport malloc, free
+
+from pyproj.compat import cstrencode
+from pyproj.datadir import get_data_dir
+
+
+cdef PJ_CONTEXT* get_pyproj_context():
+    data_dir = get_data_dir()
+    data_dir_list = data_dir.split(";")
+    cdef PJ_CONTEXT* pyproj_context = NULL
+    cdef char **c_data_dir = <char **>malloc(len(data_dir_list) * sizeof(char*))
+    try:
+        pyproj_context = proj_context_create()
+        for iii in range(len(data_dir_list)):
+            b_data_dir = cstrencode(data_dir_list[iii])
+            c_data_dir[iii] = b_data_dir
+        proj_context_set_search_paths(pyproj_context, len(data_dir_list), c_data_dir)
+        proj_context_use_proj4_init_rules(pyproj_context, 1)
+    except:
+        if pyproj_context != NULL:
+            proj_context_destroy(pyproj_context)
+        raise
+    finally:
+        free(c_data_dir)
+    return pyproj_context

pyproj/_proj.pyx

@@ -1,7 +1,7 @@
 include "base.pxi"
 
 from pyproj.compat import cstrencode, pystrdecode
-from pyproj.datadir import get_data_dir
+from pyproj._datadir cimport get_pyproj_context
 from pyproj.exceptions import ProjError
 
 
@@ -20,11 +20,7 @@ cdef class Proj:
     def __init__(self, const char *projstring):
         self.srs = pystrdecode(projstring)
         # setup the context
-        self.projctx = proj_context_create()
-        py_data_dir = cstrencode(get_data_dir())
-        cdef const char* data_dir = py_data_dir
-        proj_context_set_search_paths(self.projctx, 1, &data_dir)
-        proj_context_use_proj4_init_rules(self.projctx, 1)
+        self.projctx = get_pyproj_context()
         # initialize projection
         self.projpj = proj_create(self.projctx, projstring)
         if self.projpj is NULL:

pyproj/_transformer.pyx

@@ -3,7 +3,7 @@ include "base.pxi"
 from pyproj.crs import CRS
 from pyproj.proj import Proj
 from pyproj.compat import cstrencode, pystrdecode
-from pyproj.datadir import get_data_dir
+from pyproj._datadir cimport get_pyproj_context
 from pyproj.exceptions import ProjError
 
 cdef class _Transformer:
@@ -21,11 +21,7 @@ cdef class _Transformer:
 
     def __init__(self):
         # set up the context
-        self.projctx = proj_context_create()
-        py_data_dir = cstrencode(get_data_dir())
-        cdef const char* data_dir = py_data_dir
-        proj_context_set_search_paths(self.projctx, 1, &data_dir)
-        proj_context_use_proj4_init_rules(self.projctx, 1)
+        self.projctx = get_pyproj_context()
 
     def __dealloc__(self):
         """destroy projection definition"""

pyproj/datadir.py

@@ -2,10 +2,12 @@
 Set the datadir path to the local data directory
 """
 import os
+from distutils.spawn import find_executable
 
 from pyproj.exceptions import DataDirError
 
 _USER_PROJ_DATA = None
+_VALIDATED_PROJ_DATA = None
 
 
 def set_data_dir(proj_data_dir):
@@ -18,7 +20,22 @@ def set_data_dir(proj_data_dir):
         The path to rhe PROJ.4 data directory.
     """
     global _USER_PROJ_DATA
+    global _VALIDATED_PROJ_DATA
     _USER_PROJ_DATA = proj_data_dir
+    # set to none to re-validate
+    _VALIDATED_PROJ_DATA = None
+
+
+def append_data_dir(proj_data_dir):
+    """
+    Add an additional data directory for PROJ.4 to use.
+
+    Parameters
+    ----------
+    proj_data_dir: str
+        The path to rhe PROJ.4 data directory.
+    """
+    set_data_dir(";".join([get_data_dir(), proj_data_dir]))
 
 
 def get_data_dir():
@@ -27,17 +44,24 @@ def get_data_dir():
 
     1. The one set by pyproj.datadir.set_data_dir (if exists & valid)
     2. The internal proj directory (if exists & valid)
-    3. The directory in PROJ_LIB
+    3. The directory in PROJ_LIB (if exists & valid)
+    4. The directory on the PATH (if exists & valid)
 
     Returns
     -------
     str: The valid data directory.
 
     """
+    # to avoid re-validating
+    global _VALIDATED_PROJ_DATA
+    if _VALIDATED_PROJ_DATA is not None:
+        return _VALIDATED_PROJ_DATA
+
     global _USER_PROJ_DATA
     internal_datadir = os.path.join(
         os.path.dirname(os.path.abspath(__file__)), "proj_dir", "share", "proj"
     )
+    proj_lib_dirs = os.environ.get("PROJ_LIB", "")
 
     def valid_data_dir(potential_data_dir):
         if potential_data_dir is not None and os.path.exists(
@@ -46,21 +70,34 @@ def valid_data_dir(potential_data_dir):
             return True
         return False
 
-    proj_data_dir = None
-    if valid_data_dir(_USER_PROJ_DATA):
-        proj_data_dir = _USER_PROJ_DATA
+    def valid_data_dirs(potential_data_dirs):
+        if potential_data_dirs is None:
+            return False
+        for proj_data_dir in potential_data_dirs.split(";"):
+            if valid_data_dir(proj_data_dir):
+                return True
+                break
+        return None
+
+    if valid_data_dirs(_USER_PROJ_DATA):
+        _VALIDATED_PROJ_DATA = _USER_PROJ_DATA
     elif valid_data_dir(internal_datadir):
-        proj_data_dir = internal_datadir
+        _VALIDATED_PROJ_DATA = internal_datadir
+    elif valid_data_dirs(proj_lib_dirs):
+        _VALIDATED_PROJ_DATA = proj_lib_dirs
     else:
-        proj_lib_dirs = os.environ.get("PROJ_LIB", "")
-        for proj_lib_dir in proj_lib_dirs.split(";"):
-            if valid_data_dir(proj_lib_dir):
-                proj_data_dir = proj_lib_dir
-                break
-    if proj_data_dir is None:
+        proj_exe = find_executable("proj")
+        if proj_exe is not None:
+            system_proj_dir = os.path.join(
+                os.path.dirname(os.path.dirname(proj_exe)), "share", "proj"
+            )
+            if valid_data_dir(system_proj_dir):
+                _VALIDATED_PROJ_DATA = system_proj_dir
+
+    if _VALIDATED_PROJ_DATA is None:
         raise DataDirError(
             "Valid PROJ.4 data directory not found."
             "Either set the path using the environmental variable PROJ_LIB or "
             "with `pyproj.datadir.set_data_dir`."
         )
-    return proj_data_dir
+    return _VALIDATED_PROJ_DATA