Fix pydantic types

Author: Stefan Kuethe

src/openlayers/models/controls.py

@@ -17,6 +17,7 @@ class Control(OLBaseModel):
     id: str | None = None
 
     @field_validator("id")
+    @classmethod
     def validate_id(cls, v) -> str:
         if v is None:
             return uuid4().hex[0:10]
@@ -83,11 +84,7 @@ class ZoomToExtentControl(Control):
     Provides a button that changes the map view to a specific extent when clicked.
     """
 
-    extent: (
-        tuple[float | float | float | float]
-        | list[float | float | float | float]
-        | None
-    ) = None
+    extent: tuple[float, float, float, float] | list[float] | None = None
 
 
 # --- MapTiler

src/openlayers/models/map_options.py

@@ -18,6 +18,7 @@ class MapOptions(BaseModel):
     layers: list[dict | LayerT | LayerLike] | None = None
 
     @field_validator("layers")
+    @classmethod
     def validate_layers(cls, layers) -> list[dict | LayerT]:
         layers = [
             layer.model if isinstance(layer, LayerLike) else layer for layer in layers

src/openlayers/models/view.py

@@ -36,8 +36,6 @@ class View(OLBaseModel):
     zoom: float | int | None = 0
     projection: str | None = Projection.WEB_MERCATOR
     rotation: float | int | None = None
-    extent: (
-        tuple[float, float, float, float] | list[float, float, float, float] | None
-    ) = None
+    extent: tuple[float, float, float, float] | list[float] | None = None
     min_zoom: int | float | None = Field(None, serialization_alias="minZoom")
     max_zoom: int | float | None = Field(None, serialization_alias="maxZoom")