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.

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

Fix/map zoom #6835

Merged
merged 14 commits into from
May 27, 2016
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'upstream/master' into fix/map-zoom
  • Loading branch information
panda01 committed Apr 14, 2016
commit 5c7ee7dd26ab941ba73af2540b7d758c6c8e0d68
4 changes: 2 additions & 2 deletions src/ui/public/vislib/visualizations/tile_map.js
Original file line number Diff line number Diff line change
@@ -98,7 +98,7 @@ export default function TileMapFactory(Private) {
* @param selection {Object} d3 selection
*/
TileMap.prototype._appendMap = function (selection) {
var container = $(selection).addClass('tilemap');
const container = $(selection).addClass('tilemap');
// Lol couldn't think of another way to access this object...
const uiStateParams = {
mapCenter: this.handler.vis.uiState.get('vis.params.mapCenter'),
@@ -109,7 +109,7 @@ export default function TileMapFactory(Private) {

// this.handler.vis.uiState

var map = new TileMapMap(container, this._chartData, {
const map = new TileMapMap(container, this._chartData, {
center: params.mapCenter,
zoom: params.mapZoom,
events: this.events,
You are viewing a condensed version of this merge commit. You can view the full changes here.