Add ZoomToExtentControl

Stefan Kuethe · Stefan Kuethe · commit c57916847c62 · 2025-05-16T00:26:59.000+02:00
diff --git a/docs/api/layers.md b/docs/api/layers.md
@@ -1,2 +1,15 @@
 # Layers
 
+::: openlayers.layers.Layer
+
+::: openlayers.layers.VectorLayer
+
+::: openlayers.layers.VectorTileLayer
+
+::: openlayers.layers.TileLayer
+
+::: openlayers.layers.WebGLVectorLayer
+
+::: openlayers.layers.WebGLVectorTileLayer
+
+::: openlayers.layers.WebGLTileLayer
diff --git a/examples/standalone/layers/image_vector_layer.py b/examples/standalone/layers/image_vector_layer.py
@@ -0,0 +1,2 @@
+# See https://openlayers.org/en/latest/examples/image-vector-layer.html
+# data: https://openlayers.org/data/vector/ecoregions.json
diff --git a/examples/standalone/polygons.py b/examples/standalone/polygons.py
@@ -14,4 +14,5 @@
 m.add_control(ol.controls.InfoBox(
     html="PyOL",
     css_text="right: .5em; top: .5em; background: white; padding: 5px;"))
+m.add_control(ol.controls.ZoomToExtentControl())
 m.save()
diff --git a/src/openlayers/__future__/sources.py b/src/openlayers/__future__/sources.py
@@ -0,0 +1,7 @@
+from ..models.sources import VectorSource
+
+
+class GeoJSONSource(VectorSource):
+    @property
+    def type(self) -> str:
+        return "VectorSource"
diff --git a/src/openlayers/controls.py b/src/openlayers/controls.py
@@ -11,6 +11,7 @@
     ZoomSliderControl,
     ZoomControl,
     RotateControl,
+    ZoomToExtentControl,
     DrawControl
 )
 
diff --git a/src/openlayers/express.py b/src/openlayers/express.py
@@ -34,15 +34,6 @@ def to_map(self, *args, **kwargs) -> Map:
         return m
 
 
-# class VectorLayer(LayerLike): ...
-
-# class GPXLayer(VectorLayer): ...
-
-# class GeoJSONLayer(VectorLayer): ...
-
-# class TopoJSONLayer(VectorLayer): ...
-
-
 class Vector(LayerLike):
     def __init__(
         self,
diff --git a/src/openlayers/js/openlayers.anywidget.js b/src/openlayers/js/openlayers.anywidget.js
diff --git a/src/openlayers/js/openlayers.standalone.js b/src/openlayers/js/openlayers.standalone.js
diff --git a/src/openlayers/layers.py b/src/openlayers/layers.py
@@ -18,4 +18,6 @@
     "WebGLTileLayer",
     "WebGLVectorLayer",
     "BasemapLayer",
+    "VectorTileLayer",
+    "WebGLVectorTileLayer"
 ]
diff --git a/src/openlayers/models/controls.py b/src/openlayers/models/controls.py
@@ -12,7 +12,7 @@
 
 # -- Base control
 class Control(OLBaseModel):
-    id: str | None = None  # = Field(default_factory=lambda x: str(uuid4()))
+    id: str | None = None
 
     @field_validator("id")
     def validate_id(cls, v) -> str:
@@ -52,13 +52,22 @@ class ZoomControl(Control):
 class RotateControl(Control): ...
 
 
+class ZoomToExtentControl(Control):
+    extent: (
+        tuple[float | float | float | float]
+        | list[float | float | float | float]
+        | None
+    ) = None
+
+
 # --- Custom controls
 class InfoBox(Control):
     html: str
     css_text: str = Field(
         "top: 65px; left: .5em; padding: 5px;", serialization_alias="cssText"
     )
 
+
 class DrawControl(Control): ...
 
 
@@ -71,6 +80,7 @@ class DrawControl(Control): ...
     OverviewMapControl,
     ZoomControl,
     RotateControl,
+    ZoomToExtentControl,
     InfoBox,
-    DrawControl
+    DrawControl,
 ]
diff --git a/src/openlayers/models/layers.py b/src/openlayers/models/layers.py
@@ -66,5 +66,5 @@ class WebGLTileLayer(Layer):
 
 # --- Layer type
 LayerT = Union[
-    Layer, TileLayer, VectorLayer, WebGLVectorLayer, WebGLTileLayer, VectorTileLayer
+    Layer, TileLayer, VectorLayer, WebGLVectorLayer, WebGLTileLayer, VectorTileLayer, WebGLVectorTileLayer
 ]
diff --git a/srcjs/ipywidget-ts/controls.ts b/srcjs/ipywidget-ts/controls.ts
@@ -6,6 +6,7 @@ import OverviewMapControl from 'ol/control/OverviewMap.js';
 import Zoom from 'ol/control/Zoom';
 import Rotate from 'ol/control/Rotate';
 import Attribution from 'ol/control/Attribution.js';
+import ZoomToExtent from 'ol/control/ZoomToExtent.js';
 
 import { InfoBox } from './custom-controls/info-box';
 import { DrawControl } from './custom-controls/draw';
@@ -31,7 +32,8 @@ const controlCatalog: ControlCatalog = {
     RotateControl: Rotate,
     AttributionControl: Attribution,
     InfoBox: InfoBox,
-    DrawControl: DrawControl
+    DrawControl: DrawControl,
+    ZoomToExtentControl: ZoomToExtent
 };
 
 export { controlCatalog, defaultControls };
diff --git a/srcjs/ipywidget-ts/layers.ts b/srcjs/ipywidget-ts/layers.ts
@@ -3,6 +3,9 @@ import TileLayer from "ol/layer/Tile";
 import VectorTileLayer from "ol/layer/VectorTile";
 
 import ImageLayer from "ol/layer/Image";
+import VectorImageLayer from "ol/layer/VectorImage";
+
+import HeatmapLayer from 'ol/layer/Heatmap.js';
 
 // WebGL
 import WebGLVectorLayer from 'ol/layer/WebGLVector.js';
@@ -18,14 +21,18 @@ const layerCatalog: LayerCatalog = {
     WebGLTileLayer: WebGLTileLayer,
     VectorTileLayer: VectorTileLayer,
     WebGLVectorTileLayer: WebGLVectorTileLayer,
-    ImageLayer: ImageLayer
+    ImageLayer: ImageLayer,
+    VectorImageLayer: VectorImageLayer,
+    HeatmapLayer: HeatmapLayer
 };
 
 // Draw interaction
+/*
 const drawSource = new VectorSource({ wrapX: false });
 const drawVectorLayer = new VectorLayer({
     source: drawSource
 });
 drawVectorLayer.setProperties({ id: "draw", type: "VectorLayer" });
+*/
 
-export { layerCatalog, drawVectorLayer };
+export { layerCatalog };

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+# See https://openlayers.org/en/latest/examples/image-vector-layer.html`
	`2`	`+# data: https://openlayers.org/data/vector/ecoregions.json`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`	`ZoomSliderControl,`
`12`	`12`	`ZoomControl,`
`13`	`13`	`RotateControl,`
	`14`	`+ ZoomToExtentControl,`
`14`	`15`	`DrawControl`
`15`	`16`	`)`
`16`	`17`
Original file line number	Diff line number	Diff line change
`@@ -18,4 +18,6 @@`
`18`	`18`	`"WebGLTileLayer",`
`19`	`19`	`"WebGLVectorLayer",`
`20`	`20`	`"BasemapLayer",`
	`21`	`+ "VectorTileLayer",`
	`22`	`+ "WebGLVectorTileLayer"`
`21`	`23`	`]`