diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2010-11-17 13:05:24 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2010-11-17 13:05:24 +0100 |
| commit | 19ed00e09e1f87f629666e4a37f51de25d173a57 (patch) | |
| tree | 8d4cddbbd8db927d8dd91319faaeb880e6ec7d87 | |
| parent | c98c05c0f5312973347af7d07700e960e81ee4af (diff) | |
| parent | 04033a2e48e78686f350319b82e82bf5d44d621e (diff) | |
| download | Chimère-19ed00e09e1f87f629666e4a37f51de25d173a57.tar.bz2 Chimère-19ed00e09e1f87f629666e4a37f51de25d173a57.zip | |
Merge branch 'v1.0'
| -rw-r--r-- | chimere/static/edit_route_map.js | 6 | ||||
| -rw-r--r-- | chimere/static/main_map.js | 2 |
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; |