Merge pull request #14161 from CartoDB/fix-set-view

Improve zoom transitions from the +, - buttons
CartoDB · Jul 13, 2018 · 21da3b0 · 21da3b0
2 parents 5e6278a + 03998cd
commit 21da3b0
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 13 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -17,6 +17,7 @@ This release introduces a new API Key system. In order to migrate existing users
 * New rake to fix inconsistent permissions (`bundle exec rake cartodb:permissions:fix_permission_acl`)
 
 ### Bug fixes / enhancements
+* Use setView instead of flyTo to improve zoom transitions (https://github.com/CartoDB/carto.js/pull/2178)
 * Fix torque layers when filter analysis is added (https://github.com/CartoDB/support/issues/1038)
 * Copyright symbol not appearing on exported image (https://github.com/CartoDB/cartodb/issues/13411)
 * Keep selected popup tab after fetch (https://github.com/CartoDB/support/issues/1396)

diff --git a/lib/build/tasks/webpack/webpack.config.js b/lib/build/tasks/webpack/webpack.config.js
@@ -45,7 +45,7 @@ module.exports = {
               path.resolve(path.resolve('.'), 'lib/assets/javascripts/dashboard'),
               path.resolve(path.resolve('.'), 'lib/assets/test/spec/dashboard'),
               path.resolve(path.resolve('.'), 'lib/assets/test/spec/fixtures'),
-              path.resolve(path.resolve('.'), 'lib/assets/javascripts/dashboard')
+              path.resolve(path.resolve('.'), 'node_modules/internal-carto.js')
             ],
             options: {
               presets: [

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
diff --git a/package.json b/package.json
@@ -33,7 +33,7 @@
     "d3-queue": "^3.0.7",
     "fastclick": "^1.0.6",
     "html-webpack-plugin": "^3.2.0",
-    "internal-carto.js": "CartoDB/carto.js#v4.0.18-0",
+    "internal-carto.js": "CartoDB/carto.js#v4.1.1-0",
     "jquery": "2.1.4",
     "leaflet": "CartoDB/Leaflet#v1.3.1-carto1",
     "moment": "2.18.1",