Add comments to config for polygon rules, add more logging

polytope_mars/api.py

@@ -56,6 +56,8 @@ def __init__(self, config=None, log_context=None):
 
     def extract(self, request):
         # request expected in JSON or dict
+        start = time.time()
+        logging.debug(f"{self.id}: Gribjump/setup time start: {start}")  # noqa: E501
         if not isinstance(request, dict):
             try:
                 request = json.loads(request)
@@ -106,6 +108,11 @@ def extract(self, request):
             options=self.conf.options.model_dump(),
         )
 
+        end = time.time()
+        delta = end - start
+        logging.debug(f"{self.id}: Gribjump/setup time start: {end}")  # noqa: E501
+        logging.debug(f"{self.id}: Gribjump/setup time start: {delta}")  # noqa: E501
+
         logging.debug(
             f"{self.id}: The request we give polytope from polytope-mars is: {preq}"  # noqa: E501
         )
@@ -123,7 +130,7 @@ def extract(self, request):
         logging.debug(f"{self.id}: Polytope time end: {end}")  # noqa: E501
         logging.debug(f"{self.id}: Polytope time taken: {delta}")  # noqa: E501
         start = time.time()
-        logging.debug(f"{self.id}: Polytope time start: {start}")  # noqa: E501
+        logging.debug(f"{self.id}: Covjson time start: {start}")  # noqa: E501
         encoder = Covjsonkit(self.conf.coverageconfig.model_dump()).encode(
             "CoverageCollection", feature_type
         )  # noqa: E501
@@ -153,10 +160,6 @@ def _create_base_shapes(self, request: dict) -> List[shapes.Shape]:
             raise NotImplementedError(
                 "Currently only one time is supported"
             )  # noqa: E501
-        # if str(time).split("/") != 1:
-        #   time = str(time).split("/")
-        # else:
-        #   time = [time]
 
         # TODO: not restricting certain keywords:
         #   * AREA, GRID

polytope_mars/config.py

@@ -14,7 +14,11 @@ class CovjsonKitConfig(ConfigModel):
 
 
 class PolygonRulesConfig(ConfigModel):
+    # Max points is the max number of points in all polygons requested allowed
     max_points: int = 1000
+    # Max area is the max area of all polygons requested that is allowed.
+    # Area is in abstract units as a projection would otherwise be required
+    # to calculate the area
     max_area: float = 1000.0
 
 

polytope_mars/features/polygon.py

@@ -58,10 +58,10 @@ def get_shapes(self):
         return [shapes.Union(["latitude", "longitude"], *polygons)]
 
     def incompatible_keys(self):
-        return ["levellist"]
+        return []
 
     def coverage_type(self):
-        return "wkt"
+        return "MultiPoint"
 
     def name(self):
-        return "Wkt"
+        return "Polygon"