Merge pull request #274 from mapswipe/osgeo

'import ogr/osr' is deprecated. 'from osgeo import ogr'is now used.

Author: Matthias-Schaub

mapswipe_workers/mapswipe_workers/generate_stats/tasking_manager_geometries.py

@@ -1,7 +1,7 @@
 import csv
 from queue import Queue
 import threading
-import ogr
+from osgeo import ogr
 
 from mapswipe_workers.definitions import logger
 from mapswipe_workers.definitions import DATA_PATH

mapswipe_workers/mapswipe_workers/project_types/build_area/build_area_project.py

@@ -1,6 +1,6 @@
 import os
-import ogr
-import osr
+from osgeo import ogr
+from osgeo import osr
 import json
 
 from mapswipe_workers.definitions import DATA_PATH

mapswipe_workers/mapswipe_workers/project_types/change_detection/change_detection_project.py

@@ -1,6 +1,6 @@
 import os
-import ogr
-import osr
+from osgeo import ogr
+from osgeo import osr
 import json
 
 from mapswipe_workers.definitions import DATA_PATH

mapswipe_workers/mapswipe_workers/project_types/footprint/footprint_project.py

@@ -1,6 +1,6 @@
 import os
 import urllib.request
-import ogr
+from osgeo import ogr
 
 from mapswipe_workers.definitions import DATA_PATH
 from mapswipe_workers.definitions import CustomError

mapswipe_workers/mapswipe_workers/project_types/footprint/footprint_task.py

@@ -1,4 +1,4 @@
-import ogr
+from osgeo import ogr
 
 from mapswipe_workers.base.base_task import BaseTask
 

mapswipe_workers/mapswipe_workers/project_types/footprint/grouping_functions.py

@@ -1,4 +1,4 @@
-import ogr
+from osgeo import ogr
 import argparse
 import json
 

mapswipe_workers/mapswipe_workers/utils/geojson_functions.py

@@ -1,8 +1,10 @@
 import json
 import os
 import subprocess
-import osr
-import ogr
+
+from osgeo import ogr
+from osgeo import osr
+
 from mapswipe_workers.definitions import logger
 
 

mapswipe_workers/mapswipe_workers/utils/tile_functions.py

@@ -1,5 +1,5 @@
 import math
-import ogr
+from osgeo import ogr
 
 
 class Point:

mapswipe_workers/mapswipe_workers/utils/tile_grouping_functions.py

@@ -1,5 +1,5 @@
 import math
-import ogr
+from osgeo import ogr
 
 from mapswipe_workers.definitions import logger
 from mapswipe_workers.utils import tile_functions as t