Return feature objects

Author: Stefan Kuethe

notebooks/modify-interaction.ipynb

@@ -30,7 +30,8 @@ class MapWidget(Map, AnyWidget):
     metadata = traitlets.Dict().tag(sync=True)
 
     # TODO: Move to features as well
-    features_selected = traitlets.List().tag(sync=True)
+    # features_selected = traitlets.List().tag(sync=True)
+    
     features = traitlets.Dict().tag(sync=True)
 
     def __init__(

src/openlayers/anywidget.py

@@ -1,6 +1,6 @@
 import { DrawControl } from "./custom-controls/draw";
 
-import MapWidget from "./map";
+import type MapWidget from "./map";
 
 function filter(obj: any): any {
     let objFiltered: any = {}

src/openlayers/js/openlayers.anywidget.js

@@ -70,7 +70,7 @@ export default class MapWidget {
   _container: HTMLElement;
   _map: Map;
   _metadata: Metadata = { layers: [], controls: [] };
-  _features: Features = {};
+  // _features: Features = {};
   _model: AnyModel | undefined;
 
   constructor(mapElement: HTMLElement, mapOptions: MyMapOptions, model?: AnyModel | undefined) {
@@ -279,8 +279,9 @@ export default class MapWidget {
           const feature = featureToGeoJSON(e.feature);
           console.log("feature changed", feature);
           if (this._model) {
-            this._features[layerId] = [feature];
-            this._model.set("features", this._features);
+            // this._features[layerId] = [feature];
+            // this._model.set("features", this._features);
+            this._model.set("features", { [layerId]: [feature] });
             this._model.save_changes();
           }
         }

src/openlayers/js/openlayers.standalone.js

@@ -33,6 +33,7 @@ function addSelectFeaturesToMap(map: Map, model?: AnyModel): void {
 
             // console.log("isVectorLayer", isVectorLayer);
             const f = feature as Feature;
+            f.set("layer", layer.get("id"));
             const selIndex = selected.indexOf(f);
             if (selIndex < 0) {
                 console.log("push");
@@ -49,7 +50,8 @@ function addSelectFeaturesToMap(map: Map, model?: AnyModel): void {
         const output = selected.map(f => featureToGeoJSON(f));
         // console.log("model", model);
         if (model) {
-            model.set("features_selected", output);
+            // model.set("features_selected", output);
+            model.set("features", { selected: output });
             model.save_changes();
         } else
             console.log(output);

srcjs/ipywidget-ts/events.ts

@@ -36,7 +36,7 @@ function getFeatureProperties(feature: FeatureLike): FeatureProps {
 }
 
 function featureToGeoJSON(feature: Feature): any {
-    return new GeoJSON().writeFeature(feature);
+    return new GeoJSON().writeFeatureObject(feature);
 }
 
 export { parseClickEvent, getFeatureProperties, parseView, featureToGeoJSON }