From 0cfd3c9a9ba90142266a28e46d757bfe76960f18 Mon Sep 17 00:00:00 2001
From: Piero Toffanin <pt@masseranolabs.com>
Date: Sat, 14 Aug 2021 11:39:24 +0200
Subject: [PATCH] Force proj db version 6, remove PROJ_LIB setting

---
 run.py              | 6 ------
 snap/snapcraft.yaml | 1 +
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/run.py b/run.py
index 207049e6..88f30b9c 100755
--- a/run.py
+++ b/run.py
@@ -6,13 +6,7 @@ if sys.version_info.major < 3:
     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
index 93b9e42f..c4cb0e4b 100644
--- 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