Rename map_options to options

Author: stfnkth

examples/standalone/icons.py

@@ -35,5 +35,5 @@
 m = ol.Map(layers=[BasemapLayer.carto(), icon_layer])
 m.add_tooltip()
 m.add_control(ol.controls.OverviewMapControl())
-print(m.map_options)
+print(m.options)
 m.save()

src/openlayers/anywidget.py

@@ -24,11 +24,10 @@ class MapWidget(Map, AnyWidget):
     height = traitlets.Unicode().tag(sync=True)
     calls = traitlets.List().tag(sync=True)
     created = traitlets.Bool().tag(sync=True)
-    map_options = traitlets.Dict().tag(sync=True)
-    # map_clicked = traitlets.Dict().tag(sync=True)
+    options = traitlets.Dict().tag(sync=True)
+    # clicked = traitlets.Dict().tag(sync=True)
     view_state = traitlets.Dict().tag(sync=True)
     metadata = traitlets.Dict().tag(sync=True)
-    # debug_data = traitlets.Dict().tag(sync=True)
 
     def __init__(
         self,

src/openlayers/js/openlayers.anywidget.js

@@ -35,7 +35,7 @@ def __init__(
         if layers is None:
             layers = [TileLayer(id="osm", source=OSM())]
 
-        self.map_options = MapOptions(
+        self.options = MapOptions(
             view=view, layers=layers, controls=controls
         ).model_dump()
 
@@ -180,7 +180,7 @@ def set_style(self, layer_id: str, style: FlatStyle | dict) -> None:
 
     def to_html(self, **kwargs) -> str:
         """Render map to HTML"""
-        data = self.map_options | dict(calls=self.calls)
+        data = self.options | dict(calls=self.calls)
         return HTMLTemplate().render(data=data, **kwargs)
 
     def save(self, path: Path | str = None, preview: bool = True, **kwargs) -> str:

src/openlayers/map.py

@@ -30,7 +30,7 @@ function render({ model, el }: { model: AnyModel; el: HTMLElement }): void {
   mapElement.id = "ol-map-widget";
   mapElement.style.height = height;
   // ...
-  const mapOptions = model.get("map_options");
+  const mapOptions = model.get("options");
   console.log("mapOptions", mapOptions);
   const mapWidget = (window as any).anywidgetMapWidget = new MapWidget(mapElement, mapOptions, model);
 
@@ -58,7 +58,7 @@ function render({ model, el }: { model: AnyModel; el: HTMLElement }): void {
   map.on("click", (e) => {
     const info = parseClickEvent(e);
     console.log(info);
-    model.set("map_clicked", info);
+    model.set("clicked", info);
     model.save_changes();
   });
   */

srcjs/ipywidget-ts/anywidget.ts

@@ -6,12 +6,11 @@ import { MyMapOptions } from ".";
 const MAP_CONTAINER = "map";
 
 (window as any).renderOLMapWidget = (mapOptions: MyMapOptions) => {
-    // mapOptions.viewOptions = mapOptions.viewOptions || { center: [0, 0] };
     console.log("render OL-MapWidget", mapOptions);
     const mapElement = document.getElementById(MAP_CONTAINER) || document.createElement("div");
     console.log("el", mapElement);
     const mapWidget = (window as any).olMapWidget = new MapWidget(mapElement, mapOptions);
-    const map = mapWidget.getMap();
+    // const map = mapWidget.getMap();
 
     console.log("calls", mapOptions.calls);
     if (mapOptions.calls) {

srcjs/ipywidget-ts/standalone.ts

@@ -20,6 +20,6 @@ def test_to_html() -> None:
 
 def _test_save_html() -> None:
     m = Map(View())
-    print(m.map_options)
+    print(m.options)
     path = m.save(preview=True)
     print("path", path)

tests/test_export.py

@@ -10,7 +10,7 @@ def test_map() -> None:
     m = Map(view)
 
     # Assert
-    print(m.map_options)
-    assert m.map_options["view"] == view.model_dump()
+    print(m.options)
+    assert m.options["view"] == view.model_dump()
 
     assert m.initial_view.center == (2, 2)