summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2016-08-01 19:17:43 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2016-08-01 19:17:43 +0200
commit078c1045613f45f596bcfa4cb49d1529802d0cf9 (patch)
treec6eb251e6e5189854c93650ca1346ed6d08e109b
parent862f795c2a2067510d10fdabdaec7c2e491a78ed (diff)
downloadChimère-078c1045613f45f596bcfa4cb49d1529802d0cf9.tar.bz2
Chimère-078c1045613f45f596bcfa4cb49d1529802d0cf9.zip
JS: recenter on the click for zoom on aggregated
-rw-r--r--chimere/static/chimere/js/jquery.chimere.js22
1 files changed, 14 insertions, 8 deletions
diff --git a/chimere/static/chimere/js/jquery.chimere.js b/chimere/static/chimere/js/jquery.chimere.js
index a1490ef..ca918e0 100644
--- a/chimere/static/chimere/js/jquery.chimere.js
+++ b/chimere/static/chimere/js/jquery.chimere.js
@@ -503,6 +503,19 @@ function transform(obj) {
if (!settings.edition){
if (feature) {
$(settings.popup_item).popover('destroy');
+
+ // zoom on aggregated
+ var key = feature.get('key');
+ if (key.length > 3 && key.substring(0, 3) == 'agg' &&
+ settings._zoom_need_reload){
+ var current_zoom = settings.map.getView().getZoom();
+ if (current_zoom < settings._zoom_need_reload){
+ settings.map.getView().setZoom(settings._zoom_need_reload);
+ settings.map.getView().setCenter(evt.coordinate);
+ }
+ return
+ }
+
var geom = feature.getGeometry();
if (geom.getType() == 'Point'){
settings.popup.setPosition(geom.getCoordinates());
@@ -524,7 +537,7 @@ function transform(obj) {
'content': feature.get('name')
});
$(settings.popup_item).popover('show');
- methods.display_feature_detail(feature.get('key'));
+ methods.display_feature_detail(key);
} else {
$(settings.popup_item).popover('destroy');
}
@@ -2096,13 +2109,6 @@ function transform(obj) {
* update current detail panel with an AJAX request
*/
var uri = extra_url
- if (key.length > 3 && key.substring(0, 3) == 'agg' && settings._zoom_need_reload){
- var current_zoom = settings.map.getView().getZoom();
- if (current_zoom < settings._zoom_need_reload){
- settings.map.getView().setZoom(settings._zoom_need_reload);
- }
- return
- }
if (settings.area_id) uri += settings.area_id + "/"
uri += "getDetail/" + key;
var params = {}