From e1a62aa82a6fc6f26d41db6590d552f7489f88a3 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@peacefrogs.net>
Date: Mon, 15 Nov 2010 12:17:40 +0100
Subject: Better .gitignore

---
 .gitignore         | 5 +++++
 chimere/.gitignore | 5 -----
 2 files changed, 5 insertions(+), 5 deletions(-)
 create mode 100644 .gitignore
 delete mode 100644 chimere/.gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..a02a417
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+*.pyc
+*.swp
+chimere/settings.py
+chimere/static/icons/*
+chimere/static/upload/*
diff --git a/chimere/.gitignore b/chimere/.gitignore
deleted file mode 100644
index 282a255..0000000
--- a/chimere/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-settings.py
-*.pyc
-*.swp
-static/icons/*
-static/upload/*
-- 
cgit v1.2.3


From 04033a2e48e78686f350319b82e82bf5d44d621e Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@peacefrogs.net>
Date: Wed, 17 Nov 2010 12:57:54 +0100
Subject: Correct bug on restricted extents for edit route pages

---
 chimere/static/edit_route_map.js | 6 +++++-
 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;
-- 
cgit v1.2.3