comment

Author: Shastick

NEXT_RELEASE_NOTES.md

@@ -65,7 +65,7 @@ Can be straightforwardly replaced with:
 ```yaml
 planning_area:
   $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json
-  resource_type: resources.PlanningAreaResource
+  resource_type: resources.VolumeResource
   specification:
     template:
       outline_polygon:

monitoring/monitorlib/geo.py

@@ -422,6 +422,18 @@ def from_f3548v21(vol: f3548v21.Volume3D | dict) -> Volume3D:
     def to_f3548v21(self) -> f3548v21.Volume3D:
         return ImplicitDict.parse(self, f3548v21.Volume3D)
 
+    def s2_vertices(self) -> list[s2sphere.LatLng]:
+        """Returns the vertices of the 2D area represented by this volume. If the underlying volume is a Polygon, its
+        original vertices are returned. If it is a Circle, the vertices of the bounding rectangle are returned.
+        """
+        if (
+            self.outline_polygon is not None
+            and self.outline_polygon.vertices is not None
+        ):
+            return [v.as_s2sphere() for v in self.outline_polygon.vertices]
+        else:
+            return get_latlngrect_vertices(make_latlng_rect(self))
+
 
 def make_latlng_rect(area) -> s2sphere.LatLngRect:
     """Make an S2 LatLngRect from the provided input.

monitoring/uss_qualifier/configurations/dev/library/resources.yaml

@@ -156,17 +156,19 @@ zurich_planning_area:
 
 zurich_problematically_big_area: # A huge (as in "too big") area for checks around area sizes
   $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json
-  resource_type: resources.VerticesResource
+  resource_type: resources.VolumeResource
   specification:
-    vertices:
-      - lat: 48
-        lng: 9
-      - lat: 47
-        lng: 9
-      - lat: 47
-        lng: 8
-      - lat: 48
-        lng: 8
+    template:
+      outline_polygon:
+        vertices:
+          - lat: 48
+            lng: 9
+          - lat: 47
+            lng: 9
+          - lat: 47
+            lng: 8
+          - lat: 48
+            lng: 8
 
 # ===== NetRID flights data =====
 

monitoring/uss_qualifier/resources/volume.py

@@ -3,9 +3,6 @@
 
 from monitoring.monitorlib.geo import (
     LatLngPoint,
-    Volume3D,
-    get_latlngrect_vertices,
-    make_latlng_rect,
 )
 from monitoring.monitorlib.geotemporal import Volume4DTemplate
 from monitoring.uss_qualifier.resources.resource import Resource
@@ -20,22 +17,14 @@ class VolumeSpecification(ImplicitDict):
     template: Volume4DTemplate
 
     def s2_vertices(self) -> list[s2sphere.LatLng]:
-        """Returns the vertices of the 2D area represented by this volume specification. If the underlying volume is a Polygon, its
-        original vertices are returned. If it is a Circle, the vertices of the bounding rectangle are returned.
+        """Returns the vertices of the 2D area represented by this volume specification, after application of the template's transformations.
+        Note that if the underlying volume contains a Circle, the vertices of its bounding rectangle are returned.
         """
-        if (
-            self.template.outline_polygon is not None
-            and self.template.outline_polygon.vertices is not None
-        ):
-            return [v.as_s2sphere() for v in self.template.outline_polygon.vertices]
-        else:
-            return get_latlngrect_vertices(
-                make_latlng_rect(Volume3D(outline_circle=self.template.outline_circle))
-            )
+        return self.template.resolve({}).volume.s2_vertices()
 
     def vertices(self) -> list[LatLngPoint]:
-        """Returns the vertices of the 2D area represented by this volume specification. If the underlying volume is a Polygon, its
-        original vertices are returned. If it is a Circle, the vertices of the bounding rectangle are returned.
+        """Returns the vertices of the 2D area represented by this volume specification, after application of the template's transformations.
+        Note that if the underlying volume contains a Circle, the vertices of its bounding rectangle are returned.
         """
         return [LatLngPoint.from_s2(v) for v in self.s2_vertices()]