test: merge test improvements from feature branch (Phase 6)

nirabo · nirabo · commit f1db62595254 · 2025-10-14T11:01:53.000+03:00
- Apply feature branch formatting improvements to test_TouchTerrainGPX.py
- Update test_TouchTerrain_standalone.py to use correct function signature
- Apply formatting improvements to test data files
- All tests passing (7 passed, 20 skipped)
diff --git a/test/sheepMtn_outline.kml b/test/sheepMtn_outline.kml
@@ -12,32 +12,32 @@
     <Placemark id="ID_00000">
       <name>62553.142231211357</name>
       <snippet></snippet>
-      <description><![CDATA[<html xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:msxsl="urn:schemas-microsoft-com:xslt">
-<head>
-<META http-equiv="Content-Type" content="text/html">
-<meta http-equiv="content-type" content="text/html; charset=UTF-8">
-</head>
-<body style="margin:0px 0px 0px 0px;overflow:auto;background:#FFFFFF;">
-<table style="font-family:Arial,Verdana,Times;font-size:12px;text-align:left;width:100%;border-collapse:collapse;padding:3px 3px 3px 3px">
-<tr style="text-align:center;font-weight:bold;background:#9CBCE2">
-<td>62553.1422312114</td>
-</tr>
-<tr>
-<td>
-<table style="font-family:Arial,Verdana,Times;font-size:12px;text-align:left;width:100%;border-spacing:0px; padding:3px 3px 3px 3px">
-<tr>
-<td>SHAPE</td>
-<td>Polygon</td>
-</tr>
-</table>
-</td>
-</tr>
-</table>
-</body><script type="text/javascript">
-				function changeImage(attElement, nameElement) {
-				document.getElementById('imageAttachment').src = attElement;
-				document.getElementById('imageName').innerHTML = nameElement;}
-			</script></html>
+      <description><![CDATA[<html xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:msxsl="urn:schemas-microsoft-com:xslt">
+<head>
+<META http-equiv="Content-Type" content="text/html">
+<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+</head>
+<body style="margin:0px 0px 0px 0px;overflow:auto;background:#FFFFFF;">
+<table style="font-family:Arial,Verdana,Times;font-size:12px;text-align:left;width:100%;border-collapse:collapse;padding:3px 3px 3px 3px">
+<tr style="text-align:center;font-weight:bold;background:#9CBCE2">
+<td>62553.1422312114</td>
+</tr>
+<tr>
+<td>
+<table style="font-family:Arial,Verdana,Times;font-size:12px;text-align:left;width:100%;border-spacing:0px; padding:3px 3px 3px 3px">
+<tr>
+<td>SHAPE</td>
+<td>Polygon</td>
+</tr>
+</table>
+</td>
+</tr>
+</table>
+</body><script type="text/javascript">
+				function changeImage(attElement, nameElement) {
+				document.getElementById('imageAttachment').src = attElement;
+				document.getElementById('imageName').innerHTML = nameElement;}
+			</script></html>
 ]]></description>
       <styleUrl>#PolyStyle00</styleUrl>
       <MultiGeometry>
@@ -63,4 +63,4 @@
     </PolyStyle>
   </Style>
 </Document>
-</kml>
+</kml>
diff --git a/test/test_TouchTerrainGPX.py b/test/test_TouchTerrainGPX.py
@@ -1,5 +1,7 @@
-import unittest 
+import unittest
+
 import numpy
+
 from touchterrain.common.TouchTerrainGPX import plotLineWithThickness
 
 grid_width = 10
@@ -8,53 +10,155 @@
 height_offset = 5
 line_height = original_height + height_offset
 
+
 class PlotLineTests(unittest.TestCase):
 
     def _print_points(self):
         print(self.points)
-    
+
     def _assert_expected_line_points(self, expected_line_points):
         # iterate over the entire grid making sure only the expected line points have the increased height
         for x in range(grid_width):
             for y in range(grid_height):
                 if [x, y] in expected_line_points:
-                    self.assertEqual(self.points[x][y], line_height, "Point [{},{}] expected to be on the line but actually isn't".format(x, y))
+                    self.assertEqual(
+                        self.points[x][y],
+                        line_height,
+                        "Point [{},{}] expected to be on the line but actually isn't".format(
+                            x, y
+                        ),
+                    )
                 else:
-                    self.assertEqual(self.points[x][y], original_height, "Point [{},{}] expected not to be on the line but actually is".format(x, y))
+                    self.assertEqual(
+                        self.points[x][y],
+                        original_height,
+                        "Point [{},{}] expected not to be on the line but actually is".format(
+                            x, y
+                        ),
+                    )
 
     def setUp(self):
-        self.points = numpy.full(shape=(grid_width, grid_height),fill_value=original_height)
+        self.points = numpy.full(
+            shape=(grid_width, grid_height), fill_value=original_height
+        )
         self.pathed_points = {}
 
     def test_plot_vertical_line_with_zero_thickness(self):
-        plotLineWithThickness(3, 2, 3, 6, height_offset, self.points, self.pathed_points, 0)
+        plotLineWithThickness(
+            3, 2, 3, 6, height_offset, self.points, self.pathed_points, 0
+        )
         # self._print_points()
-        self._assert_expected_line_points([[3,2], [3,3], [3,4], [3,5], [3,6]])
+        self._assert_expected_line_points([[3, 2], [3, 3], [3, 4], [3, 5], [3, 6]])
 
     def test_plot_horizontal_line_with_zero_thickness(self):
-        plotLineWithThickness(2, 4, 5, 4, height_offset, self.points, self.pathed_points, 0)
+        plotLineWithThickness(
+            2, 4, 5, 4, height_offset, self.points, self.pathed_points, 0
+        )
         # self._print_points()
-        self._assert_expected_line_points([[2,4], [3,4], [4,4], [5,4]])
+        self._assert_expected_line_points([[2, 4], [3, 4], [4, 4], [5, 4]])
 
     def test_plot_vertical_line_with_nonzero_thickness(self):
-        plotLineWithThickness(3, 2, 3, 5, height_offset, self.points, self.pathed_points, 3)
+        plotLineWithThickness(
+            3, 2, 3, 5, height_offset, self.points, self.pathed_points, 3
+        )
         # self._print_points()
-        self._assert_expected_line_points([[2,2], [3,2], [4,2], [2,3], [3,3], [4,3], [2,4], [3,4], [4,4], [2,5], [3,5], [4,5]])
+        self._assert_expected_line_points(
+            [
+                [2, 2],
+                [3, 2],
+                [4, 2],
+                [2, 3],
+                [3, 3],
+                [4, 3],
+                [2, 4],
+                [3, 4],
+                [4, 4],
+                [2, 5],
+                [3, 5],
+                [4, 5],
+            ]
+        )
 
     def test_plot_horizontal_line_with_nonzero_thickness(self):
-        plotLineWithThickness(2, 4, 6, 4, height_offset, self.points, self.pathed_points, 3)
+        plotLineWithThickness(
+            2, 4, 6, 4, height_offset, self.points, self.pathed_points, 3
+        )
         # self._print_points()
-        self._assert_expected_line_points([[2,3], [2,4], [2,5], [3,3], [3,4], [3,5], [4,3], [4,4], [4,5], [5,3], [5,4], [5,5], [6,3], [6,4], [6,5]])
+        self._assert_expected_line_points(
+            [
+                [2, 3],
+                [2, 4],
+                [2, 5],
+                [3, 3],
+                [3, 4],
+                [3, 5],
+                [4, 3],
+                [4, 4],
+                [4, 5],
+                [5, 3],
+                [5, 4],
+                [5, 5],
+                [6, 3],
+                [6, 4],
+                [6, 5],
+            ]
+        )
 
     def test_plot_sw_ne_low_slope_diagonal_line_with_nonzero_thickness(self):
-        plotLineWithThickness(1, 3, 6, 5, height_offset, self.points, self.pathed_points, 3)
+        plotLineWithThickness(
+            1, 3, 6, 5, height_offset, self.points, self.pathed_points, 3
+        )
         # self._print_points()
-        self._assert_expected_line_points([[1,2], [1,3], [1,4], [2,2], [2,3], [2,4], [3,3], [3,4], [3,5], [4,3], [4,4], [4,5], [5,4], [5,5], [5,6], [6,4], [6,5], [6,6]])
+        self._assert_expected_line_points(
+            [
+                [1, 2],
+                [1, 3],
+                [1, 4],
+                [2, 2],
+                [2, 3],
+                [2, 4],
+                [3, 3],
+                [3, 4],
+                [3, 5],
+                [4, 3],
+                [4, 4],
+                [4, 5],
+                [5, 4],
+                [5, 5],
+                [5, 6],
+                [6, 4],
+                [6, 5],
+                [6, 6],
+            ]
+        )
 
     def test_plot_se_nw_high_slope_diagonal_line_with_nonzero_thickness(self):
-        plotLineWithThickness(5, 6, 3, 1, height_offset, self.points, self.pathed_points, 3)
+        plotLineWithThickness(
+            5, 6, 3, 1, height_offset, self.points, self.pathed_points, 3
+        )
         # self._print_points()
-        self._assert_expected_line_points([[4,6], [5,6], [6,6], [4,5], [5,5], [6,5], [3,4], [4,4], [5,4], [3,3], [4,3], [5,3], [2,2], [3,2], [4,2], [2,1], [3,1], [4,1]])
+        self._assert_expected_line_points(
+            [
+                [4, 6],
+                [5, 6],
+                [6, 6],
+                [4, 5],
+                [5, 5],
+                [6, 5],
+                [3, 4],
+                [4, 4],
+                [5, 4],
+                [3, 3],
+                [4, 3],
+                [5, 3],
+                [2, 2],
+                [3, 2],
+                [4, 2],
+                [2, 1],
+                [3, 1],
+                [4, 1],
+            ]
+        )
 
     def test_plot_line_with_nonzero_thickness_draws_flat_topped_line(self):
         # Set some of the points either side of the centre to be higher - track should not just add the offset to
@@ -64,10 +168,30 @@ def test_plot_line_with_nonzero_thickness_draws_flat_topped_line(self):
         self.points[5][5] = original_height + 3
         self.points[5][6] = original_height + 4
 
-        plotLineWithThickness(3, 4, 5, 4, height_offset, self.points, self.pathed_points, 5)
+        plotLineWithThickness(
+            3, 4, 5, 4, height_offset, self.points, self.pathed_points, 5
+        )
         # self._print_points()
-        self._assert_expected_line_points([[3,2], [3,3], [3,4], [3,5], [3,6], [4,2], [4,3], [4,4], [4,5], [4,6], [5,2], [5,3], [5,4], [5,5], [5,6]])
+        self._assert_expected_line_points(
+            [
+                [3, 2],
+                [3, 3],
+                [3, 4],
+                [3, 5],
+                [3, 6],
+                [4, 2],
+                [4, 3],
+                [4, 4],
+                [4, 5],
+                [4, 6],
+                [5, 2],
+                [5, 3],
+                [5, 4],
+                [5, 5],
+                [5, 6],
+            ]
+        )
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     unittest.main(verbosity=3)
diff --git a/test/test_TouchTerrain_standalone.py b/test/test_TouchTerrain_standalone.py
@@ -54,7 +54,7 @@ def run_get_zipped_tiles(overwrite_args, testname):
     for k in sorted(args.keys()):
         print("%s = %s" % (k, str(args[k])))
 
-    totalsize, full_zip_file_name = TouchTerrain.get_zipped_tiles(args)
+    totalsize, full_zip_file_name = TouchTerrain.get_zipped_tiles(**args)
     # print("In tmp, created zip file", full_zip_file_name,  "%.2f" % totalsize, "Mb")
 
     from os import getcwd, remove, sep
