Refactor

Author: Stefan Kuethe

examples/standalone/layers/geojson_vector_layer.py

@@ -20,8 +20,8 @@
 m.add_control(zoom_slider)
 m.add_layer(geojson_layer)
 m.add_tooltip()
-# m.add_control(ol.DrawControl())
+m.add_control(ol.DrawControl())
 # m.remove_control(zoom_slider.id)
 # m.add_call("addModifyInteraction", geojson_layer.id)
-m.add_modify_interaction(geojson_layer.id)
+# m.add_modify_interaction(geojson_layer.id)
 m.save("/tmp/ol-example.html")

src/openlayers/js/openlayers.standalone.js

@@ -59,10 +59,6 @@ function createSelectElement(): HTMLSelectElement {
 }
 
 function toggleDrawInteraction(map: Map, select: HTMLSelectElement): void {
-    // let draw: Draw;
-    // let snap: Snap;
-
-    // const modify = new Modify({ source: source });
     map.addInteraction(modify);
 
     function addInteraction() {

srcjs/ipywidget-ts/custom-controls/draw.ts

@@ -26,7 +26,6 @@ const drawSource = new VectorSource({ wrapX: false });
 const drawVectorLayer = new VectorLayer({
     source: drawSource
 });
-drawVectorLayer.set("id", "draw-features");
-drawVectorLayer.set("type", "VectorLayer");
+drawVectorLayer.setProperties({ id: "draw", type: "VectorLayer" });
 
-export { layerCatalog, drawSource, drawVectorLayer };
+export { layerCatalog, drawVectorLayer };

srcjs/ipywidget-ts/layers.ts

@@ -2,7 +2,6 @@ import { Map, View } from "ol";
 // import { defaults as defaultControls } from 'ol/control/defaults.js';
 import GeoJSON from "ol/format/GeoJSON";
 import Overlay from "ol/Overlay";
-import Draw from 'ol/interaction/Draw.js';
 import { useGeographic } from "ol/proj";
 import { isEmpty } from "ol/extent";
 import Modify from "ol/interaction/Modify";
@@ -19,9 +18,6 @@ import { addEventListernersToMapWidget } from "./events";
 import { addSelectFeaturesToMap } from "./select-features";
 import { addDragAndDropToMap as addDragAndDropVectorLayersToMap } from "./drag-and-drop";
 
-// TODO: Remove draw from here
-import { drawSource, drawVectorLayer } from "./layers";
-
 // --- Types
 import type Layer from "ol/layer/Layer";
 import type Control from "ol/control/Control";
@@ -33,7 +29,6 @@ import type { FlatStyle } from "ol/style/flat";
 import type { MyMapOptions } from ".";
 
 import type { AnyModel } from "@anywidget/types";
-import type { Type as GeomType } from "ol/geom/Geometry";
 
 type Metadata = {
   layers: any[];
@@ -69,7 +64,6 @@ export default class MapWidget {
   _container: HTMLElement;
   _map: Map;
   _metadata: Metadata = { layers: [], controls: [] };
-  _draw: Draw | undefined;
   _model: AnyModel | undefined;
 
   constructor(mapElement: HTMLElement, mapOptions: MyMapOptions, model?: AnyModel | undefined) {
@@ -272,20 +266,4 @@ export default class MapWidget {
       this._map.addInteraction(modify);
     }
   }
-
-  // See https://openlayers.org/en/latest/examples/draw-and-modify-features.html
-  // TODO: Remove: Use DrawControl instead
-  addDrawInteraction(type: GeomType): void {
-    if (this._draw)
-      this._map.removeInteraction(this._draw);
-    else
-      this._map.addLayer(drawVectorLayer);
-
-    this._draw = new Draw({
-      source: drawSource,
-      type: type
-    });
-    this._map.addInteraction(this._draw);
-    console.log("draw interaction added", type);
-  }
 }