Merge pull request #15 from KNMI/int-axis

Axis can be number (float) or str

pyproject.toml

@@ -19,7 +19,7 @@ classifiers = [
     "Topic :: Scientific/Engineering :: GIS",
     "Typing :: Typed",
 ]
-version = "0.2.1"
+version = "0.3.0"
 dependencies = ["pydantic>=2.3,<3"]
 
 [project.optional-dependencies]

src/covjson_pydantic/domain.py

@@ -56,9 +56,9 @@ class DomainType(str, Enum):
 
 
 class Axes(CovJsonBaseModel):
-    x: Optional[Union[ValuesAxis[float], CompactAxis]] = None
-    y: Optional[Union[ValuesAxis[float], CompactAxis]] = None
-    z: Optional[Union[ValuesAxis[float], CompactAxis]] = None
+    x: Optional[Union[ValuesAxis[float], ValuesAxis[str], CompactAxis]] = None
+    y: Optional[Union[ValuesAxis[float], ValuesAxis[str], CompactAxis]] = None
+    z: Optional[Union[ValuesAxis[float], ValuesAxis[str], CompactAxis]] = None
     t: Optional[ValuesAxis[AwareDatetime]] = None
     composite: Optional[ValuesAxis[Tuple]] = None
 

tests/test_coverage.py

@@ -16,6 +16,7 @@
 
 happy_cases = [
     ("spec-axes.json", Axes),
+    ("str-axes.json", Axes),
     ("coverage-json.json", Coverage),
     ("doc-example-coverage.json", Coverage),
     ("spec-vertical-profile-coverage.json", Coverage),
@@ -60,6 +61,8 @@ def test_happy_cases(file_name, object_type):
         + "domain must contain a single value.",
     ),
     ("point-series-domain-no-t.json", Domain, r"A 'PointSeries' must have a 't'-axis."),
+    ("mixed-type-axes.json", Axes, r"Input should be a valid number"),
+    ("mixed-type-axes-2.json", Axes, r"Input should be a valid string"),
 ]
 
 

tests/test_data/mixed-type-axes-2.json

@@ -0,0 +1,8 @@
+{
+    "x": {
+        "values": [
+            "foo",
+            42.0
+        ]
+    }
+}

tests/test_data/mixed-type-axes.json

@@ -0,0 +1,8 @@
+{
+    "x": {
+        "values": [
+            42.0,
+            "foo"
+        ]
+    }
+}

tests/test_data/str-axes.json

@@ -0,0 +1,8 @@
+{
+    "x": {
+        "values": [
+            "foo",
+            "bar"
+        ]
+    }
+}