Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump geoviews.js version and bokeh requirements #473

Merged
merged 2 commits into from
Sep 21, 2020
Merged

Bump geoviews.js version and bokeh requirements #473

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
edc7d89
Bump GeoViews.js version
philippjfr Sep 21, 2020
690520a
Bump bokeh requirement
philippjfr Sep 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion geoviews/models/clear_tool.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ export class ClearTool extends ActionTool {
static __module__ = "geoviews.models.custom_tools"

static init_ClearTool(): void {
this.prototype.type = "ClearTool"
this.prototype.default_view = ClearToolView

this.define<ClearTool.Props>({
Expand Down
2 changes: 1 addition & 1 deletion geoviews/models/poly_draw.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ export class PolyVertexDrawToolView extends PolyDrawToolView {
_snap_to_vertex(ev: UIEvent, x: number, y: number): [number, number] {
if (this.model.vertex_renderer) {
// If an existing vertex is hit snap to it
const vertex_selected = this._select_event(ev, false, [this.model.vertex_renderer])
const vertex_selected = this._select_event(ev, "replace", [this.model.vertex_renderer])
const point_ds = this.model.vertex_renderer.data_source
// Type once dataspecs are typed
const point_glyph: any = this.model.vertex_renderer.glyph
Expand Down
5 changes: 2 additions & 3 deletions geoviews/models/poly_edit.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,15 +169,14 @@ export class PolyVertexEditToolView extends PolyEditToolView {
this._emit_cds_changes(this._selected_renderer.data_source, true, false, true)
return
}
const append = ev.shiftKey
this._select_event(ev, append, [renderer])
this._select_event(ev, this._select_mode(ev), [renderer])
}

_show_vertices(ev: UIEvent): void {
if (!this.model.active)
return

const renderers = this._select_event(ev, false, this.model.renderers)
const renderers = this._select_event(ev, "replace", this.model.renderers)
if (!renderers.length) {
this._hide_vertices()
this._selected_renderer = null
Expand Down
4 changes: 2 additions & 2 deletions geoviews/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"name": "geoviews",
"version": "0.0.1",
"version": "1.8.2",
"description": "Simple, concise geographical visualization in Python",
"license": "BSD-3-Clause",
"repository": {},
"dependencies": {
"@bokeh/bokehjs": "^2.0.0"
"@bokeh/bokehjs": "^2.1.0"
},
"devDependencies": {}
}
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ def run(self):
### dependencies ###

_required = [
'bokeh >=2.0.0',
'bokeh >=2.1.0',
'cartopy >=0.17.0',
'holoviews >=1.13.0',
'numpy >=1.0',
Expand Down