diff --git a/scenes/drs.py b/scenes/drs.py index e9c23b0a6da0cb878cfeb8a8f9acfe29504a070a..8fad14ec23e1591e42ccedae40f8554d6e479088 100644 --- a/scenes/drs.py +++ b/scenes/drs.py @@ -1,9 +1,8 @@ """ A set of utils to deal with DRS products """ -import scenes.spot as spot import tqdm -import scenes.utils as utils +from scenes import spot, utils def find_all_dimaps(pth): diff --git a/scenes/raster_manips.py b/scenes/raster_manips.py index 7b1be60b3be924b4f0f2685372bbd964dea80b91..7218037423e3fee692eda5f14abd20170f58a66b 100644 --- a/scenes/raster_manips.py +++ b/scenes/raster_manips.py @@ -2,7 +2,7 @@ Raster manipulation """ import osr -import scenes.utils as utils +from scenes import utils import pyotb diff --git a/scenes/spot.py b/scenes/spot.py index 7508afbe7985437b7e1a1e4224bf4cfe36ff7a42..aa9be9a4d0f1581605c6d2ee92cc68910a2f772e 100644 --- a/scenes/spot.py +++ b/scenes/spot.py @@ -4,7 +4,7 @@ Spot 6/7 root_scene class import datetime import xml.etree.ElementTree as ET import gdal -import scenes.utils as utils +from scenes import utils import pyotb diff --git a/test/drs_import.py b/test/drs_import.py index 5980f69944491454c27865d507fa2753c2726e61..1cfad67b8523480d42a1ab536ce3143bdd9d953b 100644 --- a/test/drs_import.py +++ b/test/drs_import.py @@ -1,5 +1,5 @@ import argparse -import scenes.drs as drs +from scenes import drs # Arguments parser = argparse.ArgumentParser(description="Test",) diff --git a/test/drs_search.py b/test/drs_search.py index eba59c205fcd2438c800caeb840308f587374930..a076d4f4d7ddf24ae3a2bf564d255ff2b8218dcc 100644 --- a/test/drs_search.py +++ b/test/drs_search.py @@ -1,8 +1,7 @@ import argparse import scenes.indexation as indexation import gdal -import scenes.utils as utils -import scenes.drs as drs +from scenes import utils, drs # Arguments parser = argparse.ArgumentParser(description="Test",) diff --git a/test/drs_stack.py b/test/drs_stack.py index 7dff596041c4369a5323c786138f22e3c1dc2940..7e65e7eea49c59165f3533e256233ba132ff7372 100644 --- a/test/drs_stack.py +++ b/test/drs_stack.py @@ -1,9 +1,7 @@ import argparse -import scenes.indexation as indexation import gdal -import scenes.utils as utils -import scenes.drs as drs import pyotb +from scenes import utils, drs, indexation # Arguments parser = argparse.ArgumentParser(description="Test",) diff --git a/test/imagery_test.py b/test/imagery_test.py index 2a88ed6502c3f94133ce44d03b73f458b6c4f1ae..2df8f48b327fcc7e4945bad8b110eb02ec833812 100644 --- a/test/imagery_test.py +++ b/test/imagery_test.py @@ -1,19 +1,18 @@ # -*- coding: utf-8 -*- import scenes_test_base -import scenes.spot as spot +from scenes import spot class ImageryTest(scenes_test_base.ScenesTestBase): def clip_from_img(self): - dimap_xs = "input/ROI_1_Bundle_Ortho_GSD2015/PROD_SPOT6_001/VOL_SPOT6_001_A/IMG_SPOT6_MS_001_A/" \ - "DIM_SPOT6_MS_201503261014386_ORT_SPOT6_20170524_1422391k0ha487979cy_1.XML" - dimap_pan = "input/ROI_1_Bundle_Ortho_GSD2015/PROD_SPOT6_001/VOL_SPOT6_001_A/IMG_SPOT6_P_001_A/" \ - "DIM_SPOT6_P_201503261014386_ORT_SPOT6_20170524_1422391k0ha487979cy_1.XML" + dimap_xs = self.get_path("input/ROI_1_Bundle_Ortho_GSD2015/PROD_SPOT6_001/VOL_SPOT6_001_A/IMG_SPOT6_MS_001_A/" + "DIM_SPOT6_MS_201503261014386_ORT_SPOT6_20170524_1422391k0ha487979cy_1.XML") + dimap_pan = self.get_path("input/ROI_1_Bundle_Ortho_GSD2015/PROD_SPOT6_001/VOL_SPOT6_001_A/IMG_SPOT6_P_001_A/" + "DIM_SPOT6_P_201503261014386_ORT_SPOT6_20170524_1422391k0ha487979cy_1.XML") - spot_scene = spot.Scene(dimap_file_xs=self.get_path(dimap_xs), - dimap_file_pan=self.get_path(dimap_pan)) + spot_scene = spot.Scene(dimap_file_xs=dimap_xs, dimap_file_pan=dimap_pan) imagery = spot_scene.get_imagery() xs = imagery.get_xs() - # self.compare_images("/tmp/dem_prepare.tif", "decloud_data/baseline/PREPARE/DEM_PREPARE/T31TEJ.tif") + self.compare_images(xs, dimap_xs)