diff --git a/README.rst b/README.rst index 6783d3cf5c3f322760f52d68c3f9123903f95c22..e54dbdb8819df4dc96dc1a1d04a5ca7152f23e29 100644 --- a/README.rst +++ b/README.rst @@ -1,7 +1,7 @@ -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 diff --git a/sen2chain/automatization.py b/sen2chain/automatization.py index eb6c051b5b80372047a25ca789a994ae01627060..2ec7357bf416f870e3367370b9718ad9c88c0b8a 100644 --- a/sen2chain/automatization.py +++ b/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]: """ diff --git a/sen2chain/cloud_mask.py b/sen2chain/cloud_mask.py index 40c8f6b6a5ce200e47c39d4ca06382e8d2460a02..5525ad63a7c4225222071ba033c74e1f4de62943 100755 --- a/sen2chain/cloud_mask.py +++ b/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 diff --git a/sen2chain/indices_functions.py b/sen2chain/indices_functions.py index a376b6bbeebdf4d127c70e531b7459554b2545d1..cd96f4765f662d67277f967a156e9f3aaef20ec1 100644 --- a/sen2chain/indices_functions.py +++ b/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)