Refactor formats and import in init

Author: Stefan Kuethe

src/openlayers/__init__.py

@@ -6,11 +6,11 @@
 except ImportError as e:
     ...
 
-from . import controls, layers
+from . import controls, layers, formats
 from .controls import *
 from .layers import *
 from .map import Map
-from .models import formats
+from .formats import *
 from .sources import *
 from .styles import FlatStyle
 from .view import View

src/openlayers/basemaps.py

@@ -1,15 +1,14 @@
 from __future__ import annotations
 
 import os
-
 from enum import Enum
 
 from pydantic import BaseModel, Field
 
 from .abstracts import LayerLike
+from .constants import MAPTILER_API_KEY_ENV_VAR
 from .models.layers import TileLayer
 from .models.sources import OSM, ImageTileSource, TileJSONSource
-from .constants import MAPTILER_API_KEY_ENV_VAR
 
 # --- OSM
 

src/openlayers/formats.py

@@ -0,0 +1,3 @@
+from .models.formats import GPX, KML, MVT, GeoJSON, TopoJSON
+
+__all__ = ["GeoJSON", "TopoJSON", "GPX", "KML", "MVT"]

src/openlayers/layers.py

@@ -2,6 +2,7 @@
 
 from .basemaps import BasemapLayer
 from .models.layers import (
+    HeatmapLayer,
     Layer,
     LayerT,
     TileLayer,
@@ -11,7 +12,6 @@
     WebGLTileLayer,
     WebGLVectorLayer,
     WebGLVectorTileLayer,
-    HeatmapLayer,
 )
 
 __all__ = [

src/openlayers/models/controls.py

@@ -6,10 +6,10 @@
 
 from pydantic import Field, field_validator
 
+from ..constants import MAPTILER_API_KEY_ENV_VAR
 from .core import OLBaseModel
 from .layers import LayerT, TileLayer
 from .sources import OSM
-from ..constants import MAPTILER_API_KEY_ENV_VAR
 
 
 # -- Base control

src/openlayers/models/formats.py

@@ -12,20 +12,34 @@ class Format(OLBaseModel): ...
 
 
 # --- Formats
-class GeoJSON(Format): ...
+class GeoJSON(Format):
+    """GeoJSON format"""
 
+    ...
 
-class TopoJSON(Format): ...
+
+class TopoJSON(Format):
+    """TopoJSON format"""
+
+    ...
 
 
 class KML(Format):
+    """KML format"""
+
     extract_styles: bool = Field(True, serialization_alias="extractStyles")
 
 
-class GPX(Format): ...
+class GPX(Format):
+    """GPX format"""
+
+    ...
+
 
+class MVT(Format):
+    """MVT format"""
 
-class MVT(Format): ...
+    ...
 
 
 # --- Format type