@holoviz/geoviews 1.12.0-a.2 → 1.12.0-a.3

package/dist/geoviews.js

@@ -1,5 +1,6 @@
+'use strict';
 /*!
- * Copyright (c) 2012 - 2023, Anaconda, Inc., and Bokeh Contributors
+ * Copyright (c) Anaconda, Inc., and Bokeh Contributors
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without modification,
@@ -33,11 +34,11 @@
 })(this, function(Bokeh, version) {
   let define;
   return (function(modules, entry, aliases, externals) {
-    const bokeh = typeof Bokeh !== "undefined" && (version != null ? Bokeh[version] : Bokeh);
+    const bokeh = typeof Bokeh !== "undefined" ? (version != null ? Bokeh[version] : Bokeh) : null;
     if (bokeh != null) {
       return bokeh.register_plugin(modules, entry, aliases);
     } else {
-      throw new Error("Cannot find Bokeh " + version + ". You have to load it prior to loading plugins.");
+      throw new Error("Cannot find Bokeh" + (version != null ? " " + version : "") + ". You have to load it prior to loading plugins.");
     }
   })
 ({
@@ -51,20 +52,21 @@
 },
 "b4555bea44": /* models/index.js */ function _(require, module, exports, __esModule, __esExport) {
     __esModule();
-    var checkpoint_tool_1 = require("1d7c6c8516") /* ./checkpoint_tool */;
+    var checkpoint_tool_1 = require("443ddb828d") /* ./checkpoint_tool */;
     __esExport("CheckpointTool", checkpoint_tool_1.CheckpointTool);
-    var clear_tool_1 = require("1c15765006") /* ./clear_tool */;
+    var clear_tool_1 = require("2942ff039e") /* ./clear_tool */;
     __esExport("ClearTool", clear_tool_1.ClearTool);
-    var poly_draw_1 = require("cddc7627cc") /* ./poly_draw */;
+    var poly_draw_1 = require("3557d74ee0") /* ./poly_draw */;
     __esExport("PolyVertexDrawTool", poly_draw_1.PolyVertexDrawTool);
-    var poly_edit_1 = require("8837add128") /* ./poly_edit */;
+    var poly_edit_1 = require("238deef1f5") /* ./poly_edit */;
     __esExport("PolyVertexEditTool", poly_edit_1.PolyVertexEditTool);
-    var restore_tool_1 = require("92294e6ad2") /* ./restore_tool */;
+    var restore_tool_1 = require("7d18037934") /* ./restore_tool */;
     __esExport("RestoreTool", restore_tool_1.RestoreTool);
 },
-"1d7c6c8516": /* models/checkpoint_tool.js */ function _(require, module, exports, __esModule, __esExport) {
-    __esModule();
+"443ddb828d": /* models/checkpoint_tool.js */ function _(require, module, exports, __esModule, __esExport) {
     var _a;
+    __esModule();
+    const object_1 = require("@bokehjs/core/util/object");
     const array_1 = require("@bokehjs/core/util/array");
     const action_tool_1 = require("@bokehjs/models/tools/actions/action_tool");
     const column_data_source_1 = require("@bokehjs/models/sources/column_data_source");
@@ -73,15 +75,14 @@
         doit() {
             const sources = this.model.sources;
             for (const source of sources) {
-                if (!source.buffer) {
+                if (source.buffer == null) {
                     source.buffer = [];
                 }
-                let data_copy = {};
-                for (const key in source.data) {
-                    const column = source.data[key];
+                const data_copy = {};
+                for (const [key, column] of (0, object_1.entries)(source.data)) {
                     const new_column = [];
                     for (const arr of column) {
-                        if (Array.isArray(arr) || (ArrayBuffer.isView(arr))) {
+                        if (Array.isArray(arr) || ArrayBuffer.isView(arr)) {
                             new_column.push((0, array_1.copy)(arr));
                         }
                         else {
@@ -114,20 +115,16 @@
         }));
     })();
 },
-"1c15765006": /* models/clear_tool.js */ function _(require, module, exports, __esModule, __esExport) {
-    __esModule();
+"2942ff039e": /* models/clear_tool.js */ function _(require, module, exports, __esModule, __esExport) {
     var _a;
+    __esModule();
     const action_tool_1 = require("@bokehjs/models/tools/actions/action_tool");
     const column_data_source_1 = require("@bokehjs/models/sources/column_data_source");
     const icons_css_1 = require("@bokehjs/styles/icons.css");
     class ClearToolView extends action_tool_1.ActionToolView {
         doit() {
-            for (var source of this.model.sources) {
-                for (const column in source.data) {
-                    source.data[column] = [];
-                }
-                source.change.emit();
-                source.properties.data.change.emit();
+            for (const source of this.model.sources) {
+                source.clear();
             }
         }
     }
@@ -151,16 +148,17 @@
         }));
     })();
 },
-"cddc7627cc": /* models/poly_draw.js */ function _(require, module, exports, __esModule, __esExport) {
-    __esModule();
+"3557d74ee0": /* models/poly_draw.js */ function _(require, module, exports, __esModule, __esExport) {
     var _a;
+    __esModule();
+    const vectorization_1 = require("@bokehjs/core/vectorization");
     const object_1 = require("@bokehjs/core/util/object");
     const types_1 = require("@bokehjs/core/util/types");
+    const assert_1 = require("@bokehjs/core/util/assert");
     const poly_draw_tool_1 = require("@bokehjs/models/tools/edit/poly_draw_tool");
     class PolyVertexDrawToolView extends poly_draw_tool_1.PolyDrawToolView {
         _split_path(x, y) {
-            for (let r = 0; r < this.model.renderers.length; r++) {
-                const renderer = this.model.renderers[r];
+            for (const renderer of this.model.renderers) {
                 const glyph = renderer.glyph;
                 const cds = renderer.data_source;
                 const [xkey, ykey] = [glyph.xs.field, glyph.ys.field];
@@ -184,8 +182,9 @@
                             xs.splice(i + 1);
                             ys.splice(i + 1);
                             for (const column of cds.columns()) {
-                                if ((column !== xkey) && (column != ykey))
+                                if ((column !== xkey) && (column != ykey)) {
                                     cds.data[column].splice(index + 1, 0, cds.data[column][index]);
+                                }
                             }
                             return;
                         }
@@ -194,55 +193,65 @@
             }
         }
         _snap_to_vertex(ev, x, y) {
-            if (this.model.vertex_renderer) {
+            const { vertex_renderer } = this.model;
+            if (vertex_renderer != null) {
                 // If an existing vertex is hit snap to it
-                const vertex_selected = this._select_event(ev, "replace", [this.model.vertex_renderer]);
-                const point_ds = this.model.vertex_renderer.data_source;
+                const vertex_selected = this._select_event(ev, "replace", [vertex_renderer]);
+                const point_ds = vertex_renderer.data_source;
                 // Type once dataspecs are typed
-                const point_glyph = this.model.vertex_renderer.glyph;
+                const point_glyph = vertex_renderer.glyph;
                 const [pxkey, pykey] = [point_glyph.x.field, point_glyph.y.field];
-                if (vertex_selected.length) {
+                if (vertex_selected.length > 0) {
                     // If existing vertex is hit split path at that location
                     // converting to feature vertex
                     const index = point_ds.selected.indices[0];
-                    if (pxkey)
-                        x = point_ds.data[pxkey][index];
-                    if (pykey)
-                        y = point_ds.data[pykey][index];
-                    if (ev.type != 'mousemove')
+                    if (pxkey) {
+                        x = point_ds.get(pxkey)[index];
+                    }
+                    if (pykey) {
+                        y = point_ds.get(pykey)[index];
+                    }
+                    if (ev.type != "move") {
                         this._split_path(x, y);
+                    }
                     point_ds.selection_manager.clear();
                 }
             }
             return [x, y];
         }
         _set_vertices(xs, ys, styles) {
-            if (this.model.vertex_renderer == null)
+            const { vertex_renderer } = this.model;
+            if (vertex_renderer == null) {
                 return;
-            const point_glyph = this.model.vertex_renderer.glyph;
-            const point_cds = this.model.vertex_renderer.data_source;
+            }
+            const point_glyph = vertex_renderer.glyph;
+            const point_cds = vertex_renderer.data_source;
             const [pxkey, pykey] = [point_glyph.x.field, point_glyph.y.field];
             if (pxkey) {
-                if ((0, types_1.isArray)(xs))
-                    point_cds.data[pxkey] = xs;
-                else
+                if ((0, types_1.isArray)(xs)) {
+                    point_cds.set(pxkey, xs);
+                }
+                else {
                     point_glyph.x = { value: xs };
+                }
             }
             if (pykey) {
-                if ((0, types_1.isArray)(ys))
-                    point_cds.data[pykey] = ys;
-                else
+                if ((0, types_1.isArray)(ys)) {
+                    point_cds.set(pykey, ys);
+                }
+                else {
                     point_glyph.y = { value: ys };
+                }
             }
             if (styles != null) {
                 for (const key of (0, object_1.keys)(styles)) {
-                    point_cds.data[key] = styles[key];
+                    point_cds.set(key, styles[key]);
                     point_glyph[key] = { field: key };
                 }
             }
             else {
                 for (const col of point_cds.columns()) {
-                    point_cds.data[col] = [];
+                    point_cds.set(col, []);
                 }
             }
             this._emit_cds_changes(point_cds, true, true, false);
@@ -251,36 +260,44 @@
             if (!this.model.active) {
                 return;
             }
+            const { renderers, node_style, end_style } = this.model;
             const xs = [];
             const ys = [];
             const styles = {};
-            for (const key of (0, object_1.keys)(this.model.end_style))
+            for (const key of (0, object_1.keys)(end_style)) {
                 styles[key] = [];
-            for (let i = 0; i < this.model.renderers.length; i++) {
-                const renderer = this.model.renderers[i];
+            }
+            for (let i = 0; i < renderers.length; i++) {
+                const renderer = renderers[i];
                 const cds = renderer.data_source;
                 const glyph = renderer.glyph;
                 const [xkey, ykey] = [glyph.xs.field, glyph.ys.field];
                 for (const array of cds.get_array(xkey)) {
-                    Array.prototype.push.apply(xs, array);
-                    for (const key of (0, object_1.keys)(this.model.end_style))
-                        styles[key].push(this.model.end_style[key]);
-                    for (const key of (0, object_1.keys)(this.model.node_style)) {
-                        for (let index = 0; index < (array.length - 2); index++) {
-                            styles[key].push(this.model.node_style[key]);
+                    (0, assert_1.assert)((0, types_1.isArray)(array));
+                    xs.push(...array);
+                    for (const [key, val] of (0, object_1.entries)(end_style)) {
+                        styles[key].push(val);
+                    }
+                    for (const [key, val] of (0, object_1.entries)(node_style)) {
+                        for (let index = 0; index < array.length - 2; index++) {
+                            styles[key].push(val);
                         }
                     }
-                    for (const key of (0, object_1.keys)(this.model.end_style))
-                        styles[key].push(this.model.end_style[key]);
+                    for (const [key, val] of (0, object_1.entries)(end_style)) {
+                        styles[key].push(val);
+                    }
+                }
+                for (const array of cds.get_array(ykey)) {
+                    (0, assert_1.assert)((0, types_1.isArray)(array));
+                    ys.push(...array);
                 }
-                for (const array of cds.get_array(ykey))
-                    Array.prototype.push.apply(ys, array);
-                if (this._drawing && (i == (this.model.renderers.length - 1))) {
+                if (this._drawing && i == renderers.length - 1) {
                     // Skip currently drawn vertex
                     xs.splice(xs.length - 1, 1);
                     ys.splice(ys.length - 1, 1);
-                    for (const key of (0, object_1.keys)(styles))
-                        styles[key].splice(styles[key].length - 1, 1);
+                    for (const [_, array] of (0, object_1.entries)(styles)) {
+                        array.splice(array.length - 1, 1);
+                    }
                 }
             }
             this._set_vertices(xs, ys, styles);
@@ -289,20 +306,25 @@
             const renderer = this.model.renderers[0];
             const cds = renderer.data_source;
             const glyph = renderer.glyph;
-            const [xkey, ykey] = [glyph.xs.field, glyph.ys.field];
-            if (xkey) {
-                const xidx = cds.data[xkey].length - 1;
-                const xs = cds.get_array(xkey)[xidx];
+            if ((0, vectorization_1.isField)(glyph.xs)) {
+                const xkey = glyph.xs.field;
+                const array = cds.get_array(xkey);
+                const xidx = array.length - 1;
+                const xs = array[xidx];
                 xs.splice(xs.length - 1, 1);
-                if (xs.length == 1)
-                    cds.data[xkey].splice(xidx, 1);
+                if (xs.length == 1) {
+                    array.splice(xidx, 1);
+                }
             }
-            if (ykey) {
-                const yidx = cds.data[ykey].length - 1;
-                const ys = cds.get_array(ykey)[yidx];
+            if ((0, vectorization_1.isField)(glyph.ys)) {
+                const ykey = glyph.ys.field;
+                const array = cds.get_array(ykey);
+                const yidx = array.length - 1;
+                const ys = array[yidx];
                 ys.splice(ys.length - 1, 1);
-                if (ys.length == 1)
-                    cds.data[ykey].splice(yidx, 1);
+                if (ys.length == 1) {
+                    array.splice(yidx, 1);
+                }
             }
             this._emit_cds_changes(cds);
             this._drawing = false;
@@ -322,22 +344,22 @@
     PolyVertexDrawTool.__module__ = "geoviews.models.custom_tools";
     (() => {
         _a.prototype.default_view = PolyVertexDrawToolView;
-        _a.define(({ Any }) => ({
-            end_style: [Any, {}],
-            node_style: [Any, {}],
+        _a.define(({ Dict, Unknown }) => ({
+            end_style: [Dict(Unknown), {}],
+            node_style: [Dict(Unknown), {}],
         }));
     })();
 },
-"8837add128": /* models/poly_edit.js */ function _(require, module, exports, __esModule, __esExport) {
-    __esModule();
+"238deef1f5": /* models/poly_edit.js */ function _(require, module, exports, __esModule, __esExport) {
     var _a;
+    __esModule();
     const object_1 = require("@bokehjs/core/util/object");
     const types_1 = require("@bokehjs/core/util/types");
     const poly_edit_tool_1 = require("@bokehjs/models/tools/edit/poly_edit_tool");
     class PolyVertexEditToolView extends poly_edit_tool_1.PolyEditToolView {
         deactivate() {
             this._hide_vertices();
-            if (!this._selected_renderer) {
+            if (this._selected_renderer == null) {
                 return;
             }
             else if (this._drawing) {
@@ -347,31 +369,35 @@
             this._emit_cds_changes(this._selected_renderer.data_source, false, true, false);
         }
         _pan(ev) {
-            if (this._basepoint == null || this.model.vertex_renderer == null)
+            if (this._basepoint == null || this.model.vertex_renderer == null) {
                 return;
+            }
             const points = this._drag_points(ev, [this.model.vertex_renderer]);
             if (!ev.modifiers.shift) {
                 this._move_linked(points);
             }
-            if (this._selected_renderer)
+            if (this._selected_renderer != null) {
                 this._selected_renderer.data_source.change.emit();
+            }
         }
         _pan_end(ev) {
-            if (this._basepoint == null || this.model.vertex_renderer == null)
+            if (this._basepoint == null || this.model.vertex_renderer == null) {
                 return;
+            }
             const points = this._drag_points(ev, [this.model.vertex_renderer]);
             if (!ev.modifiers.shift) {
                 this._move_linked(points);
             }
             this._emit_cds_changes(this.model.vertex_renderer.data_source, false, true, true);
-            if (this._selected_renderer) {
+            if (this._selected_renderer != null) {
                 this._emit_cds_changes(this._selected_renderer.data_source);
             }
             this._basepoint = null;
         }
         _drag_points(ev, renderers) {
-            if (this._basepoint == null)
+            if (this._basepoint == null) {
                 return [];
+            }
             const [bx, by] = this._basepoint;
             const points = [];
             for (const renderer of renderers) {
@@ -390,12 +416,14 @@
                 for (const index of cds.selected.indices) {
                     const point = [];
                     if (xkey) {
-                        point.push(cds.data[xkey][index]);
-                        cds.data[xkey][index] += dx;
+                        const xs = cds.get(xkey);
+                        point.push(xs[index]);
+                        xs[index] += dx;
                     }
                     if (ykey) {
-                        point.push(cds.data[ykey][index]);
-                        cds.data[ykey][index] += dy;
+                        const ys = cds.get(ykey);
+                        point.push(ys[index]);
+                        ys[index] += dy;
                     }
                     point.push(dx);
                     point.push(dy);
@@ -407,39 +435,45 @@
             return points;
         }
         _set_vertices(xs, ys, styles) {
-            if (this.model.vertex_renderer == null)
+            if (this.model.vertex_renderer == null) {
                 return;
+            }
             const point_glyph = this.model.vertex_renderer.glyph;
             const point_cds = this.model.vertex_renderer.data_source;
             const [pxkey, pykey] = [point_glyph.x.field, point_glyph.y.field];
             if (pxkey) {
-                if ((0, types_1.isArray)(xs))
-                    point_cds.data[pxkey] = xs;
-                else
+                if ((0, types_1.isArray)(xs)) {
+                    point_cds.set(pxkey, xs);
+                }
+                else {
                     point_glyph.x = { value: xs };
+                }
             }
             if (pykey) {
-                if ((0, types_1.isArray)(ys))
-                    point_cds.data[pykey] = ys;
-                else
+                if ((0, types_1.isArray)(ys)) {
+                    point_cds.set(pykey, ys);
+                }
+                else {
                     point_glyph.y = { value: ys };
+                }
             }
             if (styles != null) {
-                for (const key of (0, object_1.keys)(styles)) {
-                    point_cds.data[key] = styles[key];
+                for (const [key, array] of (0, object_1.entries)(styles)) {
+                    point_cds.set(key, array);
                     point_glyph[key] = { field: key };
                 }
             }
             else {
                 for (const col of point_cds.columns()) {
-                    point_cds.data[col] = [];
+                    point_cds.set(col, []);
                 }
             }
             this._emit_cds_changes(point_cds, true, true, false);
         }
         _move_linked(points) {
-            if (!this._selected_renderer)
+            if (this._selected_renderer == null) {
                 return;
+            }
             const renderer = this._selected_renderer;
             const glyph = renderer.glyph;
             const cds = renderer.data_source;
@@ -461,13 +495,15 @@
             }
         }
         _tap(ev) {
-            if (this.model.vertex_renderer == null)
+            if (this.model.vertex_renderer == null) {
                 return;
+            }
             const renderer = this.model.vertex_renderer;
             const point = this._map_drag(ev.sx, ev.sy, renderer);
-            if (point == null)
+            if (point == null) {
                 return;
-            else if (this._drawing && this._selected_renderer) {
+            }
+            else if (this._drawing && this._selected_renderer != null) {
                 let [x, y] = point;
                 const cds = renderer.data_source;
                 // Type once dataspecs are typed
@@ -496,10 +532,11 @@
             this._select_event(ev, this._select_mode(ev), [renderer]);
         }
         _show_vertices(ev) {
-            if (!this.model.active)
+            if (!this.model.active) {
                 return;
+            }
             const renderers = this._select_event(ev, "replace", this.model.renderers);
-            if (!renderers.length) {
+            if (renderers.length === 0) {
                 this._hide_vertices();
                 this._selected_renderer = null;
                 this._drawing = false;
@@ -513,31 +550,36 @@
             let xs;
             let ys;
             if (xkey) {
-                xs = cds.data[xkey][index];
-                if (!(0, types_1.isArray)(xs))
-                    cds.data[xkey][index] = xs = Array.from(xs);
+                xs = cds.get(xkey)[index];
+                if (!(0, types_1.isArray)(xs)) {
+                    cds.get(xkey)[index] = xs = Array.from(xs);
+                }
             }
             else {
                 xs = glyph.xs.value;
             }
             if (ykey) {
-                ys = cds.data[ykey][index];
-                if (!(0, types_1.isArray)(ys))
-                    cds.data[ykey][index] = ys = Array.from(ys);
+                ys = cds.get(ykey)[index];
+                if (!(0, types_1.isArray)(ys)) {
+                    cds.get(ykey)[index] = ys = Array.from(ys);
+                }
             }
             else {
                 ys = glyph.ys.value;
             }
+            const { end_style, node_style } = this.model;
             const styles = {};
-            for (const key of (0, object_1.keys)(this.model.end_style))
-                styles[key] = [this.model.end_style[key]];
-            for (const key of (0, object_1.keys)(this.model.node_style)) {
-                for (let index = 0; index < (xs.length - 2); index++) {
-                    styles[key].push(this.model.node_style[key]);
+            for (const [key, val] of (0, object_1.entries)(end_style)) {
+                styles[key] = [val];
+            }
+            for (const [key, val] of (0, object_1.entries)(node_style)) {
+                for (let index = 0; index < xs.length - 2; index++) {
+                    styles[key].push(val);
                 }
             }
-            for (const key of (0, object_1.keys)(this.model.end_style))
-                styles[key].push(this.model.end_style[key]);
+            for (const [key, val] of (0, object_1.entries)(end_style)) {
+                styles[key].push(val);
+            }
             this._selected_renderer = renderer;
             this._set_vertices(xs, ys, styles);
         }
@@ -555,15 +597,15 @@
     PolyVertexEditTool.__module__ = "geoviews.models.custom_tools";
     (() => {
         _a.prototype.default_view = PolyVertexEditToolView;
-        _a.define(({ Any }) => ({
-            end_style: [Any, {}],
-            node_style: [Any, {}],
+        _a.define(({ Dict, Unknown }) => ({
+            end_style: [Dict(Unknown), {}],
+            node_style: [Dict(Unknown), {}],
         }));
     })();
 },
-"92294e6ad2": /* models/restore_tool.js */ function _(require, module, exports, __esModule, __esExport) {
-    __esModule();
+"7d18037934": /* models/restore_tool.js */ function _(require, module, exports, __esModule, __esExport) {
     var _a;
+    __esModule();
     const action_tool_1 = require("@bokehjs/models/tools/actions/action_tool");
     const column_data_source_1 = require("@bokehjs/models/sources/column_data_source");
     const icons_css_1 = require("@bokehjs/styles/icons.css");
@@ -571,10 +613,11 @@
         doit() {
             const sources = this.model.sources;
             for (const source of sources) {
-                if (!source.buffer || (source.buffer.length == 0)) {
+                const new_data = source.buffer?.pop();
+                if (new_data == null) {
                     continue;
                 }
-                source.data = source.buffer.pop();
+                source.data = new_data;
                 source.change.emit();
                 source.properties.data.change.emit();
             }
@@ -600,5 +643,5 @@
         }));
     })();
 },
-}, "c764d38756", {"index":"c764d38756","models/index":"b4555bea44","models/checkpoint_tool":"1d7c6c8516","models/clear_tool":"1c15765006","models/poly_draw":"cddc7627cc","models/poly_edit":"8837add128","models/restore_tool":"92294e6ad2"}, {});});
+}, "c764d38756", {"index":"c764d38756","models/index":"b4555bea44","models/checkpoint_tool":"443ddb828d","models/clear_tool":"2942ff039e","models/poly_draw":"3557d74ee0","models/poly_edit":"238deef1f5","models/restore_tool":"7d18037934"}, {});});
 //# sourceMappingURL=geoviews.js.map