Convert icon to base64 automatically

Author: Stefan Kuethe

src/openlayers/styles.py

@@ -1,6 +1,11 @@
 from __future__ import annotations
 
-from pydantic import BaseModel, ConfigDict, Field
+import os
+
+from pathlib import Path
+from pydantic import BaseModel, ConfigDict, Field, field_validator
+
+from .utils import create_icon_src_from_file
 
 
 def fix_keys(d: dict) -> dict:
@@ -29,10 +34,18 @@ class FlatStyle(BaseModel):
     circle_stroke_width: float | int | list | None = None
     circle_stroke_color: str | list | None = None
 
-    icon_src: str | list | None = None
+    icon_src: str | Path | list | None = None
+    icon_scale: float | int | None = None
     icon_color: str | list | None = None
     icon_opacity: float | int | None = Field(None, gt=0, le=1)
 
+    @field_validator("icon_src")
+    def validate_icon_src(cls, v) -> str:
+        if os.path.isfile(v):
+            return create_icon_src_from_file(v)
+
+        return v
+
     def model_dump(self) -> dict:
         return fix_keys(super().model_dump(exclude_none=True))
 
@@ -54,7 +67,7 @@ def default_style(**kwargs) -> FlatStyle:
     ).model_copy(update=kwargs)
 
 
-class CircleStyle(FlatStyle): ...
+# class CircleStyle(FlatStyle): ...
 
 
 class IconStyle(FlatStyle):
@@ -64,4 +77,4 @@ class IconStyle(FlatStyle):
     icon_scale: float | int | None = None
 
 
-class FillStyle(FlatStyle): ...
+# class FillStyle(FlatStyle): ...

tests/data/icon.png

@@ -1,3 +1,5 @@
+from pathlib import Path
+
 from openlayers.styles import default_style, FlatStyle
 
 def test_default_vector_style() -> None:
@@ -8,9 +10,34 @@ def test_default_vector_style() -> None:
 
     assert json_def["stroke-color"] == "#3399CC"
 
-def test_updates() -> None:
-    update = dict(fill_color="green")
-    style = default_style().model_copy(update=update)
+def test_update_default_style() -> None:
+    # update = dict(fill_color="green")
+    # style = default_style().model_copy(update=update)
+
+    style = default_style(fill_color="green")
 
     print(style.model_dump())
     print(style)
+
+def test_icon_style() -> None:
+    icon_url = "http://xyz.de/icon.png"
+
+    style = FlatStyle(
+        icon_src=icon_url
+    )
+
+    dumped_style = style.model_dump()
+
+    print(dumped_style)
+    assert dumped_style["icon-src"] == icon_url
+
+def test_icon_from_file() -> None:
+    icon_path = Path(__file__).parent / "data" / "icon.png" 
+    print(icon_path)
+
+    style = FlatStyle(icon_src=icon_path)
+    dumped_style = style.model_dump()
+
+    print(type(style.icon_src))
+
+    print(dumped_style)