summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@peacefrogs.net>2010-11-17 12:57:54 +0100
committerÉtienne Loks <etienne.loks@peacefrogs.net>2010-11-17 12:57:54 +0100
commit04033a2e48e78686f350319b82e82bf5d44d621e (patch)
tree555ac733c574fc7da74dda92f37b78201b026466
parente1a62aa82a6fc6f26d41db6590d552f7489f88a3 (diff)
downloadChimère-1.0.2.tar.bz2
Chimère-1.0.2.zip
Correct bug on restricted extents for edit route pagesv1.0.2
-rw-r--r--chimere/static/edit_route_map.js6
-rw-r--r--chimere/static/main_map.js2
2 files changed, 6 insertions, 2 deletions
diff --git a/chimere/static/edit_route_map.js b/chimere/static/edit_route_map.js
index 69a24aa..486724d 100644
--- a/chimere/static/edit_route_map.js
+++ b/chimere/static/edit_route_map.js
@@ -97,7 +97,11 @@ function init(){
projection: epsg_projection,
displayProjection: epsg_display_projection
};
- if (restricted_extent){options['restrictedExtent'] = restricted_extent;}
+ if (restricted_extent){
+ restricted_extent.transform(epsg_display_projection, epsg_projection);
+ options['restrictedExtent'] = restricted_extent;
+ }
+
map = new OpenLayers.Map('map_edit', options);
vectors.setOpacity(0.5);
diff --git a/chimere/static/main_map.js b/chimere/static/main_map.js
index 470f055..808b9cd 100644
--- a/chimere/static/main_map.js
+++ b/chimere/static/main_map.js
@@ -371,7 +371,7 @@ function putMarker(layer, mark) {
clicked = true;
updateDetail(feature.pk);
map.setCenter(feature.lonlat, 17);
- loadCategories();
+ updateCategories();
p_current_feature = null;
}
return feature;