diff options
author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-11-20 17:57:51 +0100 |
---|---|---|
committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-11-20 17:57:51 +0100 |
commit | cbce137c4508712bdcc2d820ef7361d4d318ff5f (patch) | |
tree | fb2d3bf36f3a319f2cd47c27940d45bd9bd337a6 | |
parent | 4552da64e3da96a17af2b31c91df2cd458c2c564 (diff) | |
download | Chimère-cbce137c4508712bdcc2d820ef7361d4d318ff5f.tar.bz2 Chimère-cbce137c4508712bdcc2d820ef7361d4d318ff5f.zip |
ol3: permalink refresh
-rw-r--r-- | chimere/static/chimere/js/base.js | 4 | ||||
-rw-r--r-- | chimere/static/chimere/js/jquery.chimere.js | 11 |
2 files changed, 9 insertions, 6 deletions
diff --git a/chimere/static/chimere/js/base.js b/chimere/static/chimere/js/base.js index 00acadd..e790623 100644 --- a/chimere/static/chimere/js/base.js +++ b/chimere/static/chimere/js/base.js @@ -134,10 +134,10 @@ function share_link_update(){ var initialized = false; $.ajax({url: url, dataType: "html", - success: function (url) { + success: function (res_url) { if(!initialized){ initialized = true; - window.open(url); + window.open(res_url); } return false; }, diff --git a/chimere/static/chimere/js/jquery.chimere.js b/chimere/static/chimere/js/jquery.chimere.js index 5d17e89..e8bda49 100644 --- a/chimere/static/chimere/js/jquery.chimere.js +++ b/chimere/static/chimere/js/jquery.chimere.js @@ -843,10 +843,6 @@ function transformCoordToLonLat(coord) { var view = settings.map.getView(); /* zoom & center */ - var zoom = items[0]; - if (zoom){ - view.setZoom(zoom); - } if (items[1]){ var center = items[1].split(':'); center = [Math.round(center[0] * 1000) / 1000, @@ -858,6 +854,10 @@ function transformCoordToLonLat(coord) { //methods._set_animation(); view.setCenter(center); } + var zoom = items[0]; + if (zoom){ + view.setZoom(zoom); + } /* layers */ if (items[2]){ var layers = items[2].split(':'); @@ -934,6 +934,9 @@ function transformCoordToLonLat(coord) { if (current_feature){ methods.showPopup(current_feature); } + settings.layerDbFeatures.dispatchEvent('change'); + settings.clusterLayer.dispatchEvent('change'); + settings.map.render(); } if (current_feature != "" || routing_start != "" |