Make data projection explicit

bokeh · mattpap · Jul 9, 2020 · Jun 14, 2020 · Jun 26, 2020 · Jun 26, 2020
commit 6d1242126a3de55f844d9bbd75a69c0d632082d8
diff --git a/bokehjs/src/lib/core/util/projections.ts b/bokehjs/src/lib/core/util/projections.ts
@@ -46,17 +46,35 @@ export function in_bounds(value: number, dimension: LatLon): boolean {
   return min < value && value < max
 }
 
+export namespace inplace {
+  export function project_xy(x: Arrayable<number>, y: Arrayable<number>, merc_x?: Arrayable<number>, merc_y?: Arrayable<number>): void {
+    const n = min(x.length, y.length)
+    merc_x = merc_x ?? x
+    merc_y = merc_y ?? y
+    for (let i = 0; i < n; i++) {
+      const xi = x[i]
+      const yi = y[i]
+      const [merc_xi, merc_yi] = wgs84_mercator.compute(xi, yi)
+      merc_x[i] = merc_xi
+      merc_y[i] = merc_yi
+    }
+  }
+
+  export function project_xsys(xs: Arrayable<number>[], ys: Arrayable<number>[], merc_xs?: Arrayable<number>[], merc_ys?: Arrayable<number>[]): void {
+    const n = min(xs.length, ys.length)
+    merc_xs = merc_xs ?? xs
+    merc_ys = merc_ys ?? ys
+    for (let i = 0; i < n; i++) {
+      project_xy(xs[i], ys[i], merc_xs[i], merc_ys[i])
+    }
+  }
+}
+
 export function project_xy(x: Arrayable<number>, y: Arrayable<number>): [NumberArray, NumberArray] {
   const n = min(x.length, y.length)
   const merc_x = new NumberArray(n)
   const merc_y = new NumberArray(n)
-  for (let i = 0; i < n; i++) {
-    const xi = x[i]
-    const yi = y[i]
-    const [merc_xi, merc_yi] = wgs84_mercator.compute(xi, yi)
-    merc_x[i] = merc_xi
-    merc_y[i] = merc_yi
-  }
+  inplace.project_xy(x, y, merc_x, merc_y)
   return [merc_x, merc_y]
 }
 

diff --git a/bokehjs/src/lib/models/glyphs/bezier.ts b/bokehjs/src/lib/models/glyphs/bezier.ts
@@ -5,6 +5,7 @@ import {SpatialIndex} from "core/util/spatial"
 import {Context2d} from "core/util/canvas"
 import {Glyph, GlyphView, GlyphData} from "./glyph"
 import {generic_line_legend} from "./utils"
+import {inplace} from "core/util/projections"
 import * as p from "core/properties"
 
 // algorithm adapted from http://stackoverflow.com/a/14429749/3406693
@@ -101,6 +102,11 @@ export class BezierView extends GlyphView {
   model: Bezier
   visuals: Bezier.Visuals
 
+  protected _project_data(): void {
+    inplace.project_xy(this._x0, this._y0)
+    inplace.project_xy(this._x1, this._y1)
+  }
+
   protected _index_data(index: SpatialIndex): void {
     const {data_size} = this
 

diff --git a/bokehjs/src/lib/models/glyphs/glyph.ts b/bokehjs/src/lib/models/glyphs/glyph.ts
@@ -1,7 +1,6 @@
 import {HitTestResult} from "core/hittest"
 import * as p from "core/properties"
 import * as bbox from "core/util/bbox"
-import * as proj from "core/util/projections"
 import * as visuals from "core/visuals"
 import * as geometry from "core/geometry"
 import {Context2d} from "core/util/canvas"
@@ -238,6 +237,8 @@ export abstract class GlyphView extends View {
     return new Selection({indices})
   }
 
+  protected _project_data(): void {}
+
   set_data(source: ColumnarDataSource, indices: number[], indices_to_update: number[] | null): void {
     let data = this.model.materialize_dataspecs(source)
 
@@ -269,17 +270,7 @@ export abstract class GlyphView extends View {
     // TODO (bev) Should really probably delegate computing projected
     // coordinates to glyphs, instead of centralizing here in one place.
     if (this.renderer.plot_view.model.use_map) {
-      if (self._x != null)
-        [self._x, self._y] = proj.project_xy(self._x, self._y)
-
-      if (self._xs != null)
-        [self._xs, self._ys] = proj.project_xsys(self._xs, self._ys)
-
-      if (self._x0 != null)
-        [self._x0, self._y0] = proj.project_xy(self._x0, self._y0)
-
-      if (self._x1 != null)
-        [self._x1, self._y1] = proj.project_xy(self._x1, self._y1)
+      this._project_data()
     }
 
     function num_array(array: Arrayable<number>): NumberArray {

diff --git a/bokehjs/src/lib/models/glyphs/hex_tile.ts b/bokehjs/src/lib/models/glyphs/hex_tile.ts
@@ -9,6 +9,7 @@ import {Context2d} from "core/util/canvas"
 import {SpatialIndex} from "core/util/spatial"
 import {Line, Fill} from "core/visuals"
 import {HexTileOrientation} from "core/enums"
+import {inplace} from "core/util/projections"
 
 import {generic_area_legend} from "./utils"
 import {Selection} from "../selections/selection"
@@ -45,7 +46,6 @@ export class HexTileView extends GlyphView {
     return [scx, scy]
   }
 
-
   protected _set_data(): void {
     const n = this._q.length
 
@@ -68,6 +68,10 @@ export class HexTileView extends GlyphView {
     }
   }
 
+  protected _project_data(): void {
+    inplace.project_xy(this._x, this._y)
+  }
+
   protected _index_data(index: SpatialIndex): void {
     let ysize = this.model.size
     let xsize = Math.sqrt(3)*ysize/2

diff --git a/bokehjs/src/lib/models/glyphs/multi_line.ts b/bokehjs/src/lib/models/glyphs/multi_line.ts
@@ -1,4 +1,5 @@
 import {SpatialIndex} from "core/util/spatial"
+import {inplace} from "core/util/projections"
 import {PointGeometry, SpanGeometry} from "core/geometry"
 import {LineVector} from "core/property_mixins"
 import {Line} from "core/visuals"
@@ -26,6 +27,10 @@ export class MultiLineView extends GlyphView {
   model: MultiLine
   visuals: MultiLine.Visuals
 
+  protected _project_data(): void {
+    inplace.project_xsys(this._xs, this._ys)
+  }
+
   protected _index_data(index: SpatialIndex): void {
     const {data_size} = this
 

diff --git a/bokehjs/src/lib/models/glyphs/multi_polygons.ts b/bokehjs/src/lib/models/glyphs/multi_polygons.ts
@@ -30,6 +30,10 @@ export class MultiPolygonsView extends GlyphView {
 
   protected _hole_index: SpatialIndex
 
+  protected _project_data(): void {
+    // TODO
+  }
+
   protected _index_data(index: SpatialIndex): void {
     const {min, max} = Math
     const {data_size} = this

diff --git a/bokehjs/src/lib/models/glyphs/patches.ts b/bokehjs/src/lib/models/glyphs/patches.ts
@@ -11,6 +11,7 @@ import * as hittest from "core/hittest"
 import * as p from "core/properties"
 import {Selection} from "../selections/selection"
 import {unreachable} from "core/util/assert"
+import {inplace} from "core/util/projections"
 
 export interface PatchesData extends GlyphData {
   _xs: NumberArray[]
@@ -26,6 +27,10 @@ export class PatchesView extends GlyphView {
   model: Patches
   visuals: Patches.Visuals
 
+  protected _project_data(): void {
+    inplace.project_xsys(this._xs, this._ys)
+  }
+
   protected _index_data(index: SpatialIndex): void {
     const {data_size} = this
 

diff --git a/bokehjs/src/lib/models/glyphs/quadratic.ts b/bokehjs/src/lib/models/glyphs/quadratic.ts
@@ -2,6 +2,7 @@ import {LineVector} from "core/property_mixins"
 import {Line} from "core/visuals"
 import {Rect, NumberArray} from "core/types"
 import {SpatialIndex} from "core/util/spatial"
+import {inplace} from "core/util/projections"
 import {Context2d} from "core/util/canvas"
 import {Glyph, GlyphView, GlyphData} from "./glyph"
 import {generic_line_legend} from "./utils"
@@ -49,6 +50,11 @@ export class QuadraticView extends GlyphView {
   model: Quadratic
   visuals: Quadratic.Visuals
 
+  protected _project_data(): void {
+    inplace.project_xy(this._x0, this._y0)
+    inplace.project_xy(this._x1, this._y1)
+  }
+
   protected _index_data(index: SpatialIndex): void {
     const {data_size} = this
 

diff --git a/bokehjs/src/lib/models/glyphs/segment.ts b/bokehjs/src/lib/models/glyphs/segment.ts
@@ -5,6 +5,7 @@ import {LineVector} from "core/property_mixins"
 import {Line} from "core/visuals"
 import {Arrayable, Rect, NumberArray} from "core/types"
 import {SpatialIndex} from "core/util/spatial"
+import {inplace} from "core/util/projections"
 import {Context2d} from "core/util/canvas"
 import {Glyph, GlyphView, GlyphData} from "./glyph"
 import {generic_line_legend} from "./utils"
@@ -28,6 +29,11 @@ export class SegmentView extends GlyphView {
   model: Segment
   visuals: Segment.Visuals
 
+  protected _project_data(): void {
+    inplace.project_xy(this._x0, this._y0)
+    inplace.project_xy(this._x1, this._y1)
+  }
+
   protected _index_data(index: SpatialIndex): void {
     const {min, max} = Math
     const {data_size} = this

diff --git a/bokehjs/src/lib/models/glyphs/xy_glyph.ts b/bokehjs/src/lib/models/glyphs/xy_glyph.ts
@@ -1,5 +1,6 @@
 import {NumberArray} from "core/types"
 import {SpatialIndex} from "core/util/spatial"
+import {inplace} from "core/util/projections"
 import * as p from "core/properties"
 import {Glyph, GlyphView, GlyphData} from "./glyph"
 
@@ -17,6 +18,10 @@ export abstract class XYGlyphView extends GlyphView {
   model: XYGlyph
   visuals: XYGlyph.Visuals
 
+  protected _project_data(): void {
+    inplace.project_xy(this._x, this._y)
+  }
+
   protected _index_data(index: SpatialIndex): void {
     const {data_size} = this