polytope-python 2.1.8__py3-none-any.whl → 2.1.9__py3-none-any.whl

polytope_feature/_version.py

@@ -1,2 +1,2 @@
 # Do not change! Do not track in version control!
-__version__ = "2.1.8"
+__version__ = "2.1.9"

polytope_feature/engine/quadtree_slicer.py

@@ -19,6 +19,7 @@ class QuadTreeSlicer(Engine):
         # TODO: maybe we create the quadtree as soon as we have an unstructured slicer type and return it
         # to the slicer somehow?
         quad_tree = QuadTree()
+        # NOTE: the points here are assumed to be lat/lon implicitly
         points = [tuple(point) for point in points]
         quad_tree.build_point_tree(points)
         self.points = points
@@ -27,17 +28,29 @@ class QuadTreeSlicer(Engine):
     def extract_single(self, datacube, polytope):
         # extract a single polygon
         # if need to find nearest points, then take alternative slicing method using quadtree to find nearest point
+        axes = polytope.axes()
+        assert len(axes) == 2
+        assert "latitude" in axes and "longitude" in axes
+        revert_axes = not (list(axes) == ["latitude", "longitude"])
         if use_rust:
             if len(datacube.nearest_search) == 0:
-                polytope_points = [tuple(point) for point in polytope.points]
+                if revert_axes:
+                    polytope_points = [tuple(reversed(point)) for point in polytope.points]
+                else:
+                    polytope_points = [tuple(point) for point in polytope.points]
                 polygon_points = self.quad_tree.query_polygon(self.points, 0, polytope_points)
             else:
                 k = datacube.nearest_search[tuple(polytope.axes())][1]
-                nn_points = [tuple(pt) for pt in datacube.nearest_search[tuple(polytope.axes())][0]]
+                if revert_axes:
+                    nn_points = [tuple(reversed(pt)) for pt in datacube.nearest_search[tuple(polytope.axes())][0]]
+                else:
+                    nn_points = [tuple(pt) for pt in datacube.nearest_search[tuple(polytope.axes())][0]]
                 polygon_points = []
                 for nn_pt in nn_points:
                     polygon_points.extend(self.quad_tree.k_nearest_neighbor(nn_pt, k, self.points))
         else:
+            if revert_axes:
+                polytope.points = [tuple(reversed(point)) for point in polytope.points]
             polygon_points = self.quad_tree.query_polygon(polytope)
         return polygon_points
 

{polytope_python-2.1.8.dist-info → polytope_python-2.1.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: polytope-python
-Version: 2.1.8
+Version: 2.1.9
 Summary: Polytope datacube feature extraction library
 Author-email: "European Centre for Medium-Range Weather Forecasts (ECMWF)" <software.support@ecmwf.int>
 Maintainer-email: James Hawkes <James.Hawkes@ecmwf.int>, Mathilde Leuridan <Mathilde.Leuridan@ecmwf.int>

{polytope_python-2.1.8.dist-info → polytope_python-2.1.9.dist-info}/RECORD

@@ -1,5 +1,5 @@
 polytope_feature/__init__.py,sha256=1OP0y5Ubza4LaBUhegJvJe24u-8zZGrEzAgwPJVqZlk,58
-polytope_feature/_version.py,sha256=ihCTfvA20gwPoIcNhKAsDkildKDuhkPRooZtPJV1kCE,72
+polytope_feature/_version.py,sha256=oEFCtI2Y8HquU2YgkNAeLFzT2xVV775Uhu-w52G-qTA,72
 polytope_feature/options.py,sha256=sL-LURTJKEE649O4Y15SHqClCxZxwrVJLwjVsy5ZGX8,5467
 polytope_feature/polytope.py,sha256=TM4X4nxAio0fgLC8vjhzXcJjylZRVS5nRTv4LdbPziM,9805
 polytope_feature/shapes.py,sha256=ZhMrHTNEqEgnpMTDU1Rd5zjJeyRBQMYNDRoKqDd2Ejs,16473
@@ -49,7 +49,7 @@ polytope_feature/engine/hullslicer.py,sha256=1B710iKNfe7pjEQdeUGNmSqE7YjUJ-Zyuuy
 polytope_feature/engine/optimised_point_in_polygon_slicer.py,sha256=SOHm-0tQK6AQ62sd7lMCEbryQF2aiuxgNsl_d3V-DBs,5025
 polytope_feature/engine/optimised_quadtree_slicer.py,sha256=ecf5Uhd0bmgCPyQXYZixeE-eZH42wyN_vnWslwqmAu8,3847
 polytope_feature/engine/point_in_polygon_slicer.py,sha256=tnoA-4cMU6WYljq0XVoNDE9ap5ssmSNLjkqVN_of6Zc,4371
-polytope_feature/engine/quadtree_slicer.py,sha256=DA6-ni1YCqwbbABCJUj3hnAizeKmvP9umep6Rk-YeDY,3244
+polytope_feature/engine/quadtree_slicer.py,sha256=-Vs3TWSb6FsdckNqGBOhLVNzMKdpaegfG4NnlOLcFLA,3939
 polytope_feature/engine/slicing_tools.py,sha256=a-bzBgnSbSlJLkd22JrIAntIDuOkUanwhlegp2iwvVQ,5349
 polytope_feature/utility/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 polytope_feature/utility/combinatorics.py,sha256=Vucp-78wpw8wTDiGv889w_kdYbFsHafcCAwgsg2MzYc,1586
@@ -58,8 +58,8 @@ polytope_feature/utility/exceptions.py,sha256=cIgX7YiARpfPsjxax0dGQmkg9vfinEUVj2
 polytope_feature/utility/geometry.py,sha256=DHCYFKJWC7BBbMwnCQlcQVzYp8T_e-RZVuSbKPo7-60,1063
 polytope_feature/utility/list_tools.py,sha256=0WeWCRzm8jHdcM_1BPu1s-yr5D0UUmtQIVe4HHGfRJk,760
 polytope_feature/utility/profiling.py,sha256=PS8z7u6xyiBMlbcddOO5LS6ua8E1CJOzi3CtDaDv7p4,322
-polytope_python-2.1.8.dist-info/licenses/LICENSE,sha256=VtcDVlw8N6T2GAxlk6b-8OvqAG_V751y269wWcv_lEU,11379
-polytope_python-2.1.8.dist-info/METADATA,sha256=100JnJyAWDZg95Xs1e9KALrggn3RfT77cY26SDv5wm8,11616
-polytope_python-2.1.8.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-polytope_python-2.1.8.dist-info/top_level.txt,sha256=4I919dNk-eQpuqcYHdiBpwAZcNrWeMPYuROzfpqmGRk,17
-polytope_python-2.1.8.dist-info/RECORD,,
+polytope_python-2.1.9.dist-info/licenses/LICENSE,sha256=VtcDVlw8N6T2GAxlk6b-8OvqAG_V751y269wWcv_lEU,11379
+polytope_python-2.1.9.dist-info/METADATA,sha256=fqblureXojtRio2jLLmNR2mLGr7u-jW3B5YOVOs2pA8,11616
+polytope_python-2.1.9.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+polytope_python-2.1.9.dist-info/top_level.txt,sha256=4I919dNk-eQpuqcYHdiBpwAZcNrWeMPYuROzfpqmGRk,17
+polytope_python-2.1.9.dist-info/RECORD,,