summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2016-10-03 17:13:52 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2016-10-03 17:13:52 +0200
commit3730de457fc67f3fa8ce00ace30c24d6f5e1a4a1 (patch)
tree2a553f5f9de7b7955a4cc3a7e1c278269faab3d8
parentd335b6cb95a5f55ff930c0d35a49f3496406e978 (diff)
downloadChimère-3730de457fc67f3fa8ce00ace30c24d6f5e1a4a1.tar.bz2
Chimère-3730de457fc67f3fa8ce00ace30c24d6f5e1a4a1.zip
JS ol3: deactivat json loading - change ref geometry for popup
-rw-r--r--chimere/static/chimere/js/jquery.chimere.js7
1 files changed, 5 insertions, 2 deletions
diff --git a/chimere/static/chimere/js/jquery.chimere.js b/chimere/static/chimere/js/jquery.chimere.js
index a94b74e..09fe85e 100644
--- a/chimere/static/chimere/js/jquery.chimere.js
+++ b/chimere/static/chimere/js/jquery.chimere.js
@@ -1018,7 +1018,7 @@ jQuery.expr[":"].hovering = function(elem) {
}
// no more cluster feature here: stop zooming
return feature;
- }, duration);
+ }, duration + 200);
},
displayClusterDetail: function(feature){
var feats = feature.getProperties()['features'];
@@ -1052,7 +1052,7 @@ jQuery.expr[":"].hovering = function(elem) {
var radius = Math.max(8, Math.min(size*0.75, 20));
var offset_x = 0.1;
var offset_y = -(radius + radius / 2);
- var geom = feature.getGeometry();
+ var geom = feat.getGeometry();
methods.openPopup(feat, offset_x, offset_y, geom.getCoordinates());
e.stopPropagation();
return false;
@@ -1812,6 +1812,8 @@ jQuery.expr[":"].hovering = function(elem) {
},
// add json layer
addJSON: function(json_url){
+ // TODO ol3 : json
+ /*
var jsonStyle = new OpenLayers.Style({
'strokeWidth':1,
'fillColor':'#BBBBBB',
@@ -1831,6 +1833,7 @@ jQuery.expr[":"].hovering = function(elem) {
settings.map.addLayer(settings.layerJson);
settings.map.setLayerIndex(settings.layerJson, 0);
settings.layerJson.setOpacity(0.4);
+ */
},
// Put a route on the map
addRoute: function(feature) {