diff --git a/package-lock.json b/package-lock.json index d1d719534..874effaec 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "deepscatter", - "version": "3.0.0-next.9", + "version": "3.0.0-next.10", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "deepscatter", - "version": "3.0.0-next.9", + "version": "3.0.0-next.10", "license": "CC BY-NC-SA 4.0", "dependencies": { "d3-array": "^3.2.4", diff --git a/package.json b/package.json index 870bdd956..adf531a80 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "deepscatter", "type": "module", - "version": "3.0.0-next.9", + "version": "3.0.0-next.10", "description": "Fast, animated zoomable scatterplots scaling to billions of points", "files": [ "dist" diff --git a/src/Deeptable.ts b/src/Deeptable.ts index 4131deef7..e79d2fcad 100644 --- a/src/Deeptable.ts +++ b/src/Deeptable.ts @@ -273,13 +273,13 @@ export class Deeptable { ); } - static from_quadfeather(url: string, plot: Scatterplot | null): Deeptable { - const options: Partial = {}; - if (plot.tileProxy) { - options['tileProxy'] = plot.tileProxy; - } + static from_quadfeather( + url: string, + plot: Scatterplot | null, + tileProxy: DS.TileProxy | undefined, + ): Deeptable { return new Deeptable({ - tileProxy: plot.tileProxy ? plot.tileProxy : undefined, + tileProxy, baseUrl: url, rootKey: '0/0/0', plot, diff --git a/src/scatterplot.ts b/src/scatterplot.ts index 46ca4d52a..90e2cb9b4 100644 --- a/src/scatterplot.ts +++ b/src/scatterplot.ts @@ -54,7 +54,6 @@ export class Scatterplot { public _root?: Deeptable; public elements?: Selection[]; public secondary_renderers: Record = {}; - // public tileProxy?: DS.TileProxy; public div?: Selection; public bound: boolean; // d3 : Object; @@ -370,9 +369,10 @@ export class Scatterplot { arrow_table, arrow_buffer, deeptable, + tileProxy, }: DS.DataSpec): Promise { if (source_url !== undefined) { - this._root = Deeptable.from_quadfeather(source_url, this); + this._root = Deeptable.from_quadfeather(source_url, this, tileProxy); } else if (arrow_table !== undefined) { this._root = Deeptable.fromArrowTable(arrow_table, this); } else if (arrow_buffer !== undefined) {