Merge branch 'python3' of https://gitlab.irstea.fr/raffaele.gaetano/moringa into tensorflow

getS2THEIAFromShp.py

@@ -60,7 +60,7 @@ def main(argv):
     extent = getShapefileExtent_WGS84(shp_file)
 
     cmd = ['python', theia_folder+'/theia_download.py', '-a', id_file, '-w', output_folder, '-c', collection,
-    	'--lonmin', str(extent[0]), '--lonmax',  str(extent[2]), '--latmin', str(extent[3]), '--latmax', str(extent[1])]
+    	'--lonmin', str(extent[0]), '--lonmax',  str(extent[2]), '--latmin', str(extent[3]), '--latmax', str(extent[1]), '--level', 'LEVEL2A']
     if date_beg != None :
         cmd += ['-d', date_beg]
     if date_end != None:

preprocess.py

@@ -7,8 +7,9 @@ import sys
 from mtdUtils import setNoDataValue
 
 
-def getSizeFromOTBInfo(str):
-    str_lines = str.split('\n')
+def getSizeFromOTBInfo(string):
+    string = str(string)
+    str_lines = string.split('\\n')
     line = None
     W, H = -1, -1
     for x in str_lines: