Rename call.method to call.method_name

Author: Stefan Kuethe

examples/standalone/gpd_multiple_layers.py

@@ -1,5 +1,5 @@
 import openlayers as ol
-from openlayers.basemaps import BasemapLayer
+from openlayers.basemaps import CartoBasemapLayer
 from openlayers.styles import FlatStyle
 
 # url = "https://openlayers.org/en/v4.6.5/examples/data/geojson/countries.geojson"
@@ -12,6 +12,6 @@
 # countries_layer = gpd.ol.to_layer(style=style, opacity=0.5)
 countries_layer = gpd.ol.color_category("name").to_layer(opacity=0.5, webgl=False)
 
-m = ol.Map(layers=[BasemapLayer.carto()])
+m = ol.Map(layers=[CartoBasemapLayer()])
 m.add_layer(countries_layer)
 m.save()

src/openlayers/anywidget.py

@@ -49,7 +49,7 @@ def __init__(
         AnyWidget.__init__(self, height=height, **kwargs)
 
     def add_call(self, method_name: str, *args: Any) -> None:
-        call = dict(method=method_name, args=args)
+        call = dict(method_name=method_name, args=args)
         if self.created:
             return self.send(call)
 

src/openlayers/js/openlayers.anywidget.js

@@ -45,16 +45,16 @@ def initial_view_state(self):
 
     # 'apply_call_to_map'
     def add_call(self, method_name: str, *args: Any) -> None:
-        call = dict(method=method_name, args=args)
+        call = dict(method_name=method_name, args=args)
         self.calls.append(call)
 
     # 'apply_call_to_layer'
     def add_layer_call(self, layer_id: str, method_name: str, *args: Any):
-        layer_call = dict(method=method_name, args=args)
+        layer_call = dict(method_name=method_name, args=args)
         self.add_call("applyCallToLayer", layer_id, layer_call)
 
     def add_view_call(self, method_name: str, *args: Any) -> None:
-        view_call = dict(method=method_name, args=args)
+        view_call = dict(method_name=method_name, args=args)
         self.add_call("applyCallToView", view_call)
 
     def fit_bounds(self, bounds: tuple[float, float, float, float]) -> None:

src/openlayers/js/openlayers.standalone.js

@@ -37,7 +37,7 @@ function render({ model, el }: { model: AnyModel; el: HTMLElement }): void {
   for (let call of calls) {
 
     // @ts-expect-error
-    mapWidget[call.method](...call.args);
+    mapWidget[call.method_name](...call.args);
   }
 
   const map = mapWidget.getMap();
@@ -61,7 +61,7 @@ function render({ model, el }: { model: AnyModel; el: HTMLElement }): void {
 
     try {
       // @ts-expect-error
-      mapWidget[msg.method](...msg.args);
+      mapWidget[msg.method_name](...msg.args);
     } catch (error) {
       console.log("error in anywidget msg call", error);
     }

src/openlayers/map.py

@@ -161,7 +161,7 @@ export default class MapWidget {
     console.log("run view method", view);
 
     // @ts-expect-error
-    view[call.method](...call.args)
+    view[call.method_name](...call.args)
   }
 
   // --- Layer methods
@@ -204,7 +204,7 @@ export default class MapWidget {
     const layer = this.getLayer(layerId);
 
     // @ts-expect-error
-    layer[call.method](...call.args)
+    layer[call.method_name](...call.args)
   }
 
   setSource(layerId: string, sourceDef: JSONDef): void {

srcjs/ipywidget-ts/anywidget.ts

@@ -16,7 +16,7 @@ const MAP_CONTAINER = "map";
     if (mapOptions.calls) {
         for (let call of mapOptions.calls as OLAnyWidgetCall[]) {
             // @ts-expect-error
-            mapWidget[call.method](...call.args);
+            mapWidget[call.method_name](...call.args);
         }
     }
 };

srcjs/ipywidget-ts/map.ts

@@ -40,6 +40,6 @@ type TypeCatalogKey = keyof TypeCatalog;
 
 // ...
 type OLAnyWidgetCall = {
-    method: string;
+    method_name: string;
     args: any[];
 }