rabbit test improvement

MIERUNE · Jun 18, 2024 · d3a0d7d · d3a0d7d
1 parent bf23d2d
commit d3a0d7d
Showing 1 changed file with 7 additions and 8 deletions.
diff --git a/elevation_tile_tools/elevation_tile_converter.py b/elevation_tile_tools/elevation_tile_converter.py
@@ -154,17 +154,16 @@ def create_geotiff(self):
         # どっちもプラス、マイナスなら、絶対値の大きい方から小さい方を引く
         pixel_size_x = None
         pixel_size_y = None
-        if upper_right_XY[0] >= 0 and lower_left_XY[0] >= 0:
-            pixel_size_x = (abs(upper_right_XY[0]) - abs(lower_left_XY[0])) / x_length
-            pixel_size_y = -(abs(upper_right_XY[1]) - abs(lower_left_XY[1])) / y_length
-        elif upper_right_XY[0] <= 0 and lower_left_XY[0] <= 0:
+
+        if (upper_right_XY[0] >= 0 and lower_left_XY[0] >= 0) or (
+            upper_right_XY[0] <= 0 and lower_left_XY[0] <= 0
+        ):
             pixel_size_x = (abs(upper_right_XY[0]) - abs(lower_left_XY[0])) / x_length
             pixel_size_y = -(abs(upper_right_XY[1]) - abs(lower_left_XY[1])) / y_length
         # 片方がプラスなら絶対値を足す
-        elif upper_right_XY[0] <= 0 <= lower_left_XY[0]:
-            pixel_size_x = (abs(upper_right_XY[0]) + abs(lower_left_XY[0])) / x_length
-            pixel_size_y = -(abs(upper_right_XY[1]) + abs(lower_left_XY[1])) / y_length
-        elif upper_right_XY[0] >= 0 >= lower_left_XY[0]:
+        elif (upper_right_XY[0] <= 0 <= lower_left_XY[0]) or (
+            upper_right_XY[0] >= 0 >= lower_left_XY[0]
+        ):
             pixel_size_x = (abs(upper_right_XY[0]) + abs(lower_left_XY[0])) / x_length
             pixel_size_y = -(abs(upper_right_XY[1]) + abs(lower_left_XY[1])) / y_length