Refactor inheritance

Author: Stefan Kuethe

src/openlayers/layers.py

@@ -9,7 +9,7 @@
     WebGLTileLayer,
     WebGLVectorLayer,
     VectorTileLayer,
-    WebGLVectorTileLayer
+    WebGLVectorTileLayer,
 )
 
 __all__ = [
@@ -19,5 +19,5 @@
     "WebGLVectorLayer",
     "BasemapLayer",
     "VectorTileLayer",
-    "WebGLVectorTileLayer"
+    "WebGLVectorTileLayer",
 ]

src/openlayers/models/layers.py

@@ -12,6 +12,7 @@
 
 # --- Base layer
 class Layer(OLBaseModel):
+    """A base class for creating OL layers"""
     id: str | None = None
     source: dict | SourceT
     background: str | None = None
@@ -31,10 +32,8 @@ def validate_id(cls, v) -> str:
 class TileLayer(Layer): ...
 
 
-# TODO: Inherit from `VectorTileLayer`
-class VectorLayer(Layer):
+class VectorTileLayer(Layer):
     style: dict | FlatStyle | None = default_style()
-    fit_bounds: bool = Field(False, serialization_alias="fitBounds")
 
     @field_validator("style")
     def validate_style(cls, v):
@@ -43,19 +42,24 @@ def validate_style(cls, v):
 
         return v
 
+# TODO: Inherit from `VectorTileLayer`
+class VectorLayer(VectorTileLayer):
+    """A layer for rendering vector sources"""
+    #style: dict | FlatStyle | None = default_style()
+    fit_bounds: bool = Field(False, serialization_alias="fitBounds")
 
-class WebGLVectorLayer(VectorLayer): ...
-
-
-class VectorTileLayer(Layer):
-    style: dict | FlatStyle | None = None
-
+    """
     @field_validator("style")
     def validate_style(cls, v):
         if isinstance(v, FlatStyle):
             return v.model_dump()
 
         return v
+    """
+
+class WebGLVectorLayer(VectorLayer):
+    """A layer for rendering vector sources using WebGL"""
+    ...
 
 
 class WebGLVectorTileLayer(VectorTileLayer): ...