Style

Author: stfnkth

src/openlayers/__init__.py

@@ -10,8 +10,8 @@
 from .controls import *
 from .layers import *
 from .map import Map
-from .view import View
 from .styles import FlatStyle
+from .view import View
 
 __version__ = importlib.metadata.version(__package__)
 

src/openlayers/abstracts.py

@@ -1,8 +1,10 @@
 from __future__ import annotations
 
 from abc import ABC, abstractmethod
+
 from pydantic import BaseModel
 
+
 class LayerLike(ABC):
     @property
     @abstractmethod
@@ -15,19 +17,3 @@ def to_dict(self) -> dict:
 
     def model_dump(self) -> dict:
         return super().model_dump(exclude_none=True, by_alias=True)
-
-
-# TODO: check if this class is still needed
-"""
-class BaseType(BaseModel):
-    model_config = ConfigDict(extra="allow")
-
-    def model_dump(self) -> dict:
-        return dict(
-            type=self.type, options=super().model_dump(exclude_none=True, by_alias=True)
-        )
-
-    @property
-    def type(self) -> str:
-        return type(self).__name__
-"""

src/openlayers/colors.py

@@ -3,9 +3,9 @@
 import json
 import os
 import random
+from typing import Any
 
 from pydantic import BaseModel
-from typing import Any
 
 COLOR_SCHEMES = "https://raw.githubusercontent.com/python-visualization/branca/refs/heads/main/branca/_schemes.json"
 

src/openlayers/geopandas.py

@@ -1,16 +1,16 @@
 from __future__ import annotations
 
+from typing import TYPE_CHECKING, Self
+
 import geopandas as gpd
 import pandas as pd
 
-from typing import Self, TYPE_CHECKING
-
 from .anywidget import MapWidget
+from .colors import Color
 from .models.layers import VectorLayer, WebGLVectorLayer
 from .models.sources import VectorSource
 from .models.view import Projection
 from .styles import FlatStyle, default_style
-from .colors import Color
 
 if TYPE_CHECKING:
     from .models.controls import ControlT

src/openlayers/map.py

@@ -4,14 +4,14 @@
 from pathlib import Path
 from typing import Any
 
+from .abstracts import LayerLike
 from .export import HTMLTemplate, write_file
 from .models.controls import ControlT
 from .models.layers import LayerT, TileLayer
 from .models.map_options import MapOptions
 from .models.sources import OSM
 from .models.view import View
 from .styles import FlatStyle
-from .abstracts import LayerLike
 
 
 class Map(object):
@@ -26,10 +26,10 @@ def __init__(
         if layers is None:
             layers = [TileLayer(id="osm", source=OSM())]
 
-        #layers = [
+        # layers = [
         #    layer.model_dump() if isinstance(layer, LayerLike) else layer
         #    for layer in layers
-        #]
+        # ]
         self.map_options = MapOptions(
             view=view, layers=layers, controls=controls
         ).model_dump()

src/openlayers/models/controls.py

@@ -3,7 +3,7 @@
 from typing import Literal, Union
 from uuid import uuid4
 
-from pydantic import Field
+from pydantic import Field, field_validator
 
 from .core import OLBaseModel
 from .layers import LayerT, TileLayer
@@ -12,7 +12,14 @@
 
 # -- Base control
 class Control(OLBaseModel):
-    id: str = Field(default_factory=lambda x: str(uuid4()))
+    id: str | None = None  # = Field(default_factory=lambda x: str(uuid4()))
+
+    @field_validator("id")
+    def validate_id(cls, v) -> str:
+        if v is None:
+            return uuid4().hex[0:10]
+
+        return v
 
 
 # --- Controls

src/openlayers/models/map_options.py

@@ -1,22 +1,27 @@
 from __future__ import annotations
 
-from pydantic import BaseModel, field_validator, ConfigDict
+from pydantic import BaseModel, ConfigDict, field_validator
 
+from ..abstracts import LayerLike
 from .controls import ControlT
 from .layers import LayerT
 from .view import View
-from ..abstracts import LayerLike
+
 
 class MapOptions(BaseModel):
-    model_config = ConfigDict(arbitrary_types_allowed=True) # Needed to support 'LayerLike'
+    model_config = ConfigDict(
+        arbitrary_types_allowed=True
+    )  # Needed to support 'LayerLike'
 
     view: View | None = View()
     controls: list[dict | ControlT] | None = None
     layers: list[dict | LayerT | LayerLike] | None = None
 
     @field_validator("layers")
     def validate_layers(cls, layers) -> list[dict | LayerT]:
-        layers = [layer.model if isinstance(layer, LayerLike) else layer for layer in layers]
+        layers = [
+            layer.model if isinstance(layer, LayerLike) else layer for layer in layers
+        ]
         return layers
 
     def model_dump(self) -> dict:

src/openlayers/styles.py

@@ -32,6 +32,7 @@ def model_dump(self) -> dict:
     def model_dump2(self) -> dict:
         return super().model_dump(exclude_none=True)
 
+
 def default_style() -> FlatStyle:
     return FlatStyle(
         fill_color="rgba(255,255,255,0.4)",