Merge branch 'master' of framagit.org:espace-dev/sen2chain

README.rst

-sen2chain
+Sen2Chain
 =========
 
-Sen2chain is a simple utility to download and process Sentinel-2 images.
+Sen2Chain is a simple utility to download and process Sentinel-2 images.
 
 It uses the `sentinelsat <https://github.com/sentinelsat/sentinelsat>`_ and `peps_download <https://github.com/olivierhagolle/peps_download>`_ packages to find and download data, and ESA's `Sen2Cor <http://step.esa.int/main/third-party-plugins-2/sen2cor/>`_ processor to perform atmospheric, terrain and cirrus correction.
 
@@ -20,18 +20,18 @@ Contributing
 
 Scientific projects :
 
-* TOSCA S2-Malaria project, funded by CNES (TOSCA 2017-2019); 
+* TOSCA S2-Malaria project, funded by CNES (TOSCA 2017-2020); 
 * INTERREG Renovrisk-impact project (2018-2020).
 
 Development and improvment :
 
-* Charlotte Wolff;
-* Jérémy Commins;
+* Charlotte Wolff ;
+* Jérémy Commins ;
 * Pascal Mouquet.
 
 Conceptualization and Coordination :
 
-* Vincent Herbreteau;
+* Vincent Herbreteau ;
 * Christophe Révillion.
 
 .. image:: docs/source/esdev.png

sen2chain/automatization.py

@@ -39,8 +39,10 @@ class Automatization:
         self._products_list = {"hubs": {}, "aws": {}}
 
         if not self._csv_path.exists():
+            logger.info("Creating tiles_to_watch file")
             self._init()
         else:
+            logger.info("tiles_to_watch found")
             self._read_csv()
             self._update_df()
 
@@ -218,8 +220,8 @@ class Automatization:
             failed = prods.failed_products
             if failed:
                 print(failed)
-            self._update_df()
-            self._save_csv()
+        self._update_df()
+        self._save_csv()
 
     def get_tiles_from_tags(self, tags: Sequence[str] = ()) -> Set[str]:
         """

sen2chain/cloud_mask.py

@@ -17,7 +17,8 @@ from rasterio.features import shapes, rasterize
 import numpy as np
 from scipy import ndimage
 from typing import Sequence, List, Dict, Union
-import gdal
+from osgeo import gdal
+# import gdal
 import os
 # type annotations
 

sen2chain/indices_functions.py

@@ -12,7 +12,8 @@ import rasterio
 from rasterio.warp import reproject, Resampling
 import numpy as np
 from typing import Union
-import gdal
+from osgeo import gdal
+# import gdal
 
 logger = logging.getLogger(__name__)
 logging.basicConfig(level=logging.INFO)