summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2016-11-20 17:57:51 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2016-11-21 10:16:14 +0100
commit3a9bf04cd8696508856d6fd879249e34b978cfd1 (patch)
tree61c5eb8ff4cfca7996fef9f93403f8231f32ebf0
parentff63f61e88e50a0d1018d24d01221e0edcb693a7 (diff)
downloadChimère-3a9bf04cd8696508856d6fd879249e34b978cfd1.tar.bz2
Chimère-3a9bf04cd8696508856d6fd879249e34b978cfd1.zip
ol3: permalink refresh
-rw-r--r--chimere/static/chimere/js/base.js4
-rw-r--r--chimere/static/chimere/js/jquery.chimere.js11
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 132b3f1..7ff5101 100644
--- a/chimere/static/chimere/js/jquery.chimere.js
+++ b/chimere/static/chimere/js/jquery.chimere.js
@@ -910,10 +910,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,
@@ -925,6 +921,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(':');
@@ -1001,6 +1001,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 != ""