diff --git a/TimeSeries/s2sen2cor.py b/TimeSeries/s2sen2cor.py index 01de7aca13e6ac0886626b55b0d32315e97b3a86..442be95c7aca8d3bb611e8bd876809e0da203643 100644 --- a/TimeSeries/s2sen2cor.py +++ b/TimeSeries/s2sen2cor.py @@ -1,12 +1,3 @@ -import gdal -import otbApplication as otb -from otb_numpy_proc import to_otb_pipeline -import glob -import os -import sys -import zipfile -import osr -import datetime from s2theia import * class S2Sen2CorTilePipeline(S2TheiaTilePipeline): diff --git a/TimeSeries/s2theia.py b/TimeSeries/s2theia.py index 9d2b7d940b63e89d237ecca5bb4074fc101f478c..982d321089d994a4f63d02c23c9c2f5ac147fc55 100644 --- a/TimeSeries/s2theia.py +++ b/TimeSeries/s2theia.py @@ -1,16 +1,15 @@ -import sys import warnings -import gdal +from osgeo import gdal import otbApplication as otb -from otb_numpy_proc import to_otb_pipeline +from Common.otb_numpy_proc import to_otb_pipeline import numpy as np import glob import os import xml.etree.ElementTree as et import zipfile -import osr +from osgeo import osr import datetime import uuid import shutil diff --git a/VHR/segmentation.py b/VHR/segmentation.py index dfc7ddec72ea9811d4debc8c91ef4e4d0955550e..fcdd61b28bce64aab1f99b1ab549d05e1feb9253 100644 --- a/VHR/segmentation.py +++ b/VHR/segmentation.py @@ -1,6 +1,4 @@ import sys -sys.path.append('../Common') - from Common.otb_numpy_proc import to_otb_pipeline import os.path import otbApplication as otb diff --git a/VHR/vhrbase.py b/VHR/vhrbase.py index 175bf091840d81a78a10ad69e3223661a97b4092..f0fb61a452a88cc4202834ec4dba66130bb0f0fa 100644 --- a/VHR/vhrbase.py +++ b/VHR/vhrbase.py @@ -1,10 +1,10 @@ import otbApplication as otb -from otb_numpy_proc import to_otb_pipeline +from Common.otb_numpy_proc import to_otb_pipeline import os import glob from pathlib import Path import re -import ogr +from osgeo import ogr class SPOT67RasterPipeline: # BEGIN SPOT6/7 VHR PROTOTYPE