diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-05-08 19:09:26 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-05-08 19:09:26 +0200 |
| commit | ebf421edb7d14ed87b24b723f9d8f5326b155ddf (patch) | |
| tree | 9fc7f52e812090373e3e7dce71d7efd56f29e0d1 | |
| parent | b8d986eed9e82469d775b139b55c3b0fdb98770b (diff) | |
| download | Chimère-ebf421edb7d14ed87b24b723f9d8f5326b155ddf.tar.bz2 Chimère-ebf421edb7d14ed87b24b723f9d8f5326b155ddf.zip | |
Fix zoom on current map
| -rw-r--r-- | chimere/static/chimere/js/jquery.chimere.js | 7 | ||||
| -rw-r--r-- | chimere/templates/chimere/blocks/footer.html | 2 |
2 files changed, 2 insertions, 7 deletions
diff --git a/chimere/static/chimere/js/jquery.chimere.js b/chimere/static/chimere/js/jquery.chimere.js index bf68002..4852edf 100644 --- a/chimere/static/chimere/js/jquery.chimere.js +++ b/chimere/static/chimere/js/jquery.chimere.js @@ -2114,12 +2114,7 @@ function transform(obj) { var bottom = Math.round(coords[1] * 1000) / 1000; var right = Math.round(coords[2] * 1000) / 1000; var top = Math.round(coords[3] * 1000) / 1000; - //var bounds = new OpenLayers.Bounds(left, bottom, right, top); - // bounds.transform(EPSG_DISPLAY_PROJECTION, EPSG_PROJECTION); - // var bounds = new ol.proj.transformExtent( - // [], EPSG_DISPLAY_PROJECTION, EPSG_PROJECTION); - //settings.map.zoomToExtent(bounds, true); - settings.view.fit(transform([left, top, right, bottom]), + settings.view.fit(transformExtent([left, top, right, bottom]), settings.map.getSize()); if (settings.dynamic_categories) { methods.loadCategories(); diff --git a/chimere/templates/chimere/blocks/footer.html b/chimere/templates/chimere/blocks/footer.html index f5830ed..d656e7b 100644 --- a/chimere/templates/chimere/blocks/footer.html +++ b/chimere/templates/chimere/blocks/footer.html @@ -1,3 +1,3 @@ {% load i18n %} -{% trans "This site uses Chimère"%} <img src="{{STATIC_URL}}chimere/img/copyleft.png" alt="copyleft"/> 2008-2015 <a href='http://www.chymeres.net/'>Chimère project</a> - {% trans "Map"%} <img src="{{STATIC_URL}}chimere/img/copyleft.png" alt="copyleft"/> <a href='http://openstreetmap.org/'>OpenStreetMap</a> +{% trans "This site uses Chimère"%} <img src="{{STATIC_URL}}chimere/img/copyleft.png" alt="copyleft"/> 2008-2016 <a href='http://www.chymeres.net/'>Chimère project</a> - {% trans "Map"%} <img src="{{STATIC_URL}}chimere/img/copyleft.png" alt="copyleft"/> <a href='http://openstreetmap.org/'>OpenStreetMap</a> |