feat: make scale optional (#372)

linz · Feb 28, 2023 · 20218bd · 20218bd
1 parent 8fe8211
commit 20218bd
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 12 deletions.
diff --git a/scripts/files/file_tiff.py b/scripts/files/file_tiff.py
@@ -162,17 +162,18 @@ def check_color_interpretation(self, gdalinfo: GdalInfo) -> None:
             )
 
     def check_tile_and_rename(self, gdalinfo: GdalInfo) -> None:
-        origin = Point(gdalinfo["cornerCoordinates"]["upperLeft"][0], gdalinfo["cornerCoordinates"]["upperLeft"][1])
-        try:
-            tile_name = get_tile_name(origin, self._scale)
-            if not tile_name == get_file_name_from_path(self._path_standardised):
-                new_path = os.path.join(os.path.dirname(self._path_standardised), tile_name + ".tiff")
-                os.rename(self._path_standardised, new_path)
-                get_log().info("renaming_file", path=new_path, old=self._path_standardised)
-                self._path_standardised = new_path
-
-        except TileIndexException as tie:
-            self.add_error(FileTiffErrorType.TILE_ALIGNMENT, error_message=f"{tie}")
+        if self._scale > 0:
+            origin = Point(gdalinfo["cornerCoordinates"]["upperLeft"][0], gdalinfo["cornerCoordinates"]["upperLeft"][1])
+            try:
+                tile_name = get_tile_name(origin, self._scale)
+                if not tile_name == get_file_name_from_path(self._path_standardised):
+                    new_path = os.path.join(os.path.dirname(self._path_standardised), tile_name + ".tiff")
+                    os.rename(self._path_standardised, new_path)
+                    get_log().info("renaming_file", path=new_path, old=self._path_standardised)
+                    self._path_standardised = new_path
+
+            except TileIndexException as tie:
+                self.add_error(FileTiffErrorType.TILE_ALIGNMENT, error_message=f"{tie}")
 
     def validate(self) -> bool:
         gdalinfo = self.get_gdalinfo()

diff --git a/scripts/standardise_validate.py b/scripts/standardise_validate.py
@@ -44,7 +44,11 @@ def main() -> None:
 
     for file in tiff_files:
         file.set_srs(srs)
-        file.set_scale(int(arguments.scale))
+        scale = arguments.scale
+        if scale == "None":
+            file.set_scale(0)
+        else:
+            file.set_scale(int(scale))
 
         # Validate the file
         if not file.validate():