adapt to new proj6 syntax

Author: BuddyVolly

ost/generic/ts_extent.py

@@ -2,75 +2,24 @@
 # -*- coding: utf-8 -*-
 
 import json
-import shutil
 import logging
-from pathlib import Path
-from tempfile import TemporaryDirectory
 
 try:
     import gdal
 except ModuleNotFoundError as e:
-    from osgeo import gdal
-except ModuleNotFoundError as e:
-    raise e
+    try:
+        from osgeo import gdal
+    except ModuleNotFoundError:
+        raise e
 
 import geopandas as gpd
 from retrying import retry
 
-from ost.helpers import raster as ras, vector as vec
+from ost.helpers import vector as vec
 
 logger = logging.getLogger(__name__)
 
 
-@retry(stop_max_attempt_number=3, wait_fixed=1)
-def mt_extent_old(list_of_scenes, config_file):
-
-    with open(config_file) as file:
-        config_dict = json.load(file)
-        temp_dir = Path(config_dict['temp_dir'])
-        aoi = config_dict['aoi']
-
-    # get track/burst dir from first scene
-    target_dir = Path(list_of_scenes[0]).parent.parent.parent
-    out_file = target_dir.joinpath(f'{target_dir.name}.extent.gpkg')
-
-    logger.info(f'Creating common extent mask for track {target_dir.name}.')
-    # get out directory
-    out_dir = out_file.parent
-
-    temp_extent = out_dir.joinpath('extent.vrt')
-    # build vrt stack from all scenes
-    gdal.BuildVRT(
-        str(temp_extent),
-        list_of_scenes,
-        options=gdal.BuildVRTOptions(srcNodata=0, separate=True)
-    )
-
-    with TemporaryDirectory(prefix=f'{temp_dir}/') as temp:
-
-        # create namespace for temp file
-        temp = Path(temp)
-        image_bounds = temp.joinpath(out_file.name)
-        exterior = temp.joinpath(out_file.name + '_ext')
-
-        # create outline
-        ras.outline(temp_extent, image_bounds, 0, False)
-
-        # create exterior ring and write out
-        vec.exterior(image_bounds, exterior, -0.0018)
-
-        # intersect with aoi
-        if config_dict['processing']['mosaic']['cut_to_aoi']:
-            try:
-                vec.aoi_intersection(aoi, exterior, out_file)
-            except ValueError:
-                shutil.move(exterior, out_file)
-        else:
-            shutil.move(exterior, out_file)
-
-    return target_dir.name, list_of_scenes, out_file
-
-
 @retry(stop_max_attempt_number=3, wait_fixed=1)
 def mt_extent(list_of_extents, config_file):
 
@@ -114,7 +63,7 @@ def mt_extent(list_of_extents, config_file):
             aoi_df = vec.wkt_to_gdf(config_dict['aoi'])
             df = gpd.overlay(aoi_df, df1, how='intersection')
             df.to_file(out_file, driver='GPKG')
-        except ValueError as e:
+        except ValueError:
             df1.to_file(out_file, driver='GeoJSON')
     else:
         df1.to_file(out_file, driver='GeoJSON')

ost/helpers/vector.py

@@ -61,9 +61,9 @@ def aoi_to_wkt(aoi):
             if Path(aoi).exists():
                 try:
                     gdf = gpd.GeoDataFrame.from_file(aoi)
-                    if gdf.crs != {'init': 'epsg:4326'}:
+                    if gdf.crs != {'epsg:4326'}:
                         try:
-                            gdf = gdf.geometry.to_crs({'init': 'epsg:4326'})
+                            gdf = gdf.geometry.to_crs({'epsg:4326'})
                         except:
                             raise ValueError('No valid OST AOI definition.')
                     # return AOI as single vector object
@@ -174,7 +174,7 @@ def geodesic_point_buffer(lat, lon, meters, envelope=False):
     """
 
     # get WGS 84 proj
-    proj_wgs84 = pyproj.Proj(init='epsg:4326')
+    proj_wgs84 = pyproj.Proj('epsg:4326')
 
     # Azimuthal equidistant projection
     aeqd_proj = '+proj=aeqd +lat_0={lat} +lon_0={lon} +x_0=0 +y_0=0'
@@ -352,9 +352,7 @@ def wkt_to_gdf(wkt):
     # polygon wkt
     elif geometry.geom_type == 'Polygon':
         data = {'id': ['1'], 'geometry': loads(wkt)}
-        gdf = gpd.GeoDataFrame(
-            data, crs={'init': 'epsg:4326',  'no_defs': True}
-        )
+        gdf = gpd.GeoDataFrame(data, crs='epsg:4326')
 
     # geometry collection of single multiploygon
     elif (
@@ -363,9 +361,7 @@ def wkt_to_gdf(wkt):
     ):
 
         data = {'id': ['1'], 'geometry': geometry}
-        gdf = gpd.GeoDataFrame(
-            data, crs={'init': 'epsg:4326',  'no_defs': True}
-        )
+        gdf = gpd.GeoDataFrame(data, crs='epsg:4326')
 
         ids, feats = [], []
         for i, feat in enumerate(gdf.geometry.values[0]):
@@ -383,9 +379,7 @@ def wkt_to_gdf(wkt):
 
         data = {'id': ['1'],
                 'geometry': geometry}
-        gdf = gpd.GeoDataFrame(
-            data, crs={'init': 'epsg:4326',  'no_defs': True}
-        )
+        gdf = gpd.GeoDataFrame(data, crs='epsg:4326')
 
     # everything else
     else:
@@ -396,10 +390,7 @@ def wkt_to_gdf(wkt):
             geoms.append(geom)
             i += 1
 
-        gdf = gpd.GeoDataFrame(
-            {'id': ids, 'geometry': geoms},
-            crs={'init': 'epsg:4326',  'no_defs': True}
-        )
+        gdf = gpd.GeoDataFrame({'id': ids, 'geometry': geoms}, crs='epsg:4326')
 
     return gdf
 
@@ -421,7 +412,7 @@ def exterior(infile, outfile, buffer=None):
     :param buffer:
     :return:
     """
-    gdf = gpd.read_file(infile, crs={'init': 'EPSG:4326'})
+    gdf = gpd.read_file(infile, crs='epsg:4326')
     gdf.geometry = gdf.geometry.apply(lambda row: Polygon(row.exterior))
     gdf_clean = gdf[gdf.geometry.area >= 1.0e-6]
 

ost/s1/burst_inventory.py

@@ -144,7 +144,7 @@ def burst_inventory(inventory_df, outfile, download_dir=os.getenv('HOME'),
                     'AnxTime', 'BurstNr', 'geometry']
 
     # crs for empty dataframe
-    crs = {'init': 'epsg:4326', 'no_defs': True}
+    crs = 'epsg:4326'
     # create empty dataframe
     gdf_full = gpd.GeoDataFrame(columns=column_names, crs=crs)
 
@@ -238,7 +238,7 @@ def refine_burst_inventory(aoi, burst_gdf, outfile, coverages=None):
     # turn aoi into a geodataframe
     aoi_gdf = gpd.GeoDataFrame(vec.wkt_to_gdf(aoi).buffer(0.05))
     aoi_gdf.columns = ['geometry']
-    aoi_gdf.crs = {'init': 'epsg:4326', 'no_defs': True}
+    aoi_gdf.crs = 'epsg:4326'
 
     # get columns of input dataframe for later return function
     cols = burst_gdf.columns
@@ -282,10 +282,7 @@ def prepare_burst_inventory(burst_gdf, config_file):
     ]
 
     # create empty geodataframe
-    proc_burst_gdf = gpd.GeoDataFrame(
-        columns=cols, geometry='geometry',
-        crs={'init': 'epsg:4326', 'no_defs': True}
-    )
+    proc_burst_gdf = gpd.GeoDataFrame(columns=cols, geometry='geometry', crs='epsg:4326')
 
     # load relevant config parameters
     with open(config_file, 'r') as file:

ost/s1/refine_inventory.py

@@ -455,10 +455,7 @@ def _backward_search(aoi_gdf, inventory_df, datelist, area_reduce=0):
             if intersect_area >= aoi_area - area_reduce:
                 break
 
-    return gpd.GeoDataFrame(
-        out_frame, geometry='geometry',
-        crs={'init': 'epsg:4326', 'no_defs': True}
-    )
+    return gpd.GeoDataFrame(out_frame, geometry='geometry', crs='epsg:4326')
 
 
 def search_refinement(

ost/s1/s1scene.py

@@ -509,7 +509,7 @@ def zip_annotation_get(self, download_dir, data_mount=None):
                         'BurstNr', 'geometry']
 
         # crs for empty dataframe
-        crs = {'init': 'epsg:4326'}
+        crs = 'epsg:4326'
         gdf_final = gpd.GeoDataFrame(columns=column_names, crs=crs)
 
         file = self.get_path(download_dir, data_mount)

ost/s1/search.py

@@ -161,7 +161,7 @@ def _query_scihub(opener, query):
         'geometry'
     ]
 
-    crs = {'init': 'epsg:4326'}
+    crs = 'epsg:4326'
     geo_df = gpd.GeoDataFrame(columns=columns, crs=crs)
 
     # we need this for the paging