Force proj db version 6, remove PROJ_LIB setting

ForestryAILab · Aug 14, 2021 · 0cfd3c9 · 0cfd3c9
1 parent 48f08d5
commit 0cfd3c9
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/run.py b/run.py
@@ -6,13 +6,7 @@
     print("Ups! ODM needs to run with Python 3. It seems you launched it with Python 2. Try using: python3 run.py ... ")
     sys.exit(1)
 
-# Set PROJ_LIB explicitly unless already set to fix Fiona imports
-# when multiple versions of the proj database are installed
 import os
-import pyproj
-if os.environ.get('PROJ_LIB') is None:
-    os.environ['PROJ_LIB'] = pyproj.datadir.get_data_dir()
-
 from opendm import log
 from opendm import config
 from opendm import system

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
@@ -61,6 +61,7 @@ parts:
       - libspqr2
       - libssl1.1
       - libusb-1.0-0
+      - proj-data=6*
       - procps
       - python3
       - python3-distutils