Change settings according to chimere library

1 files changed, 25 insertions, 8 deletions

diff --git a/settings.py b/settings.py
index ca2b460..658a251 100644
--- a/settings.py
+++ b/settings.py
@@ -23,8 +23,6 @@ JQUERY_JS_URLS = ('/javascript/jquery/jquery.js',
 JQUERY_CSS_URLS = ('/javascript/jquery-ui/css/smoothness/jquery-ui.css',
                    '/javascript/jquery-ui-themes/base/jquery.ui.all.css')
 
-OSM_CSS_URLS = ["http://www.openlayers.org/api/theme/default/style.css"]
-
 GPSBABEL = '/usr/bin/gpsbabel'
 GPSBABEL_OPTIONS = 'simplify,crosstrack,error=0.005k' # simplify with an error of 5 meters
 #GPSBABEL_OPTIONS = 'simplify,count=100'
@@ -147,7 +145,7 @@ TEMPLATE_DIRS = [
     # Always use forward slashes, even on Windows.
     # Don't forget to use absolute paths, not relative paths.
     ROOT_PATH + 'templates',
-    ROOT_PATH + '../chimere/templates',
+    #ROOT_PATH + '../chimere/templates',
 ]
 
 TEMPLATE_CONTEXT_PROCESSORS = (
@@ -190,6 +188,9 @@ INSTALLED_APPS += [
 
 LOG_PATH = '/var/log/django/'
 
+CHIMERE_VIEW_RENDERER = 'openlayers' # 'openlayers' or 'leaflet'
+CHIMERE_EDIT_RENDERER = 'openlayers' # 'openlayers'
+
 try:
     from local_settings import *
 except ImportError, e:
@@ -253,9 +254,25 @@ if 'CHIMERE_SHARE_NETWORKS' not in globals():
                  STATIC_URL + 'chimere/img/identica.png'),
     )
 
-if 'OSM_JS_URLS' not in globals():
-    global OSM_JS_URLS
-    OSM_JS_URLS = [STATIC_URL + "openlayers/OpenLayers.js",
-                   STATIC_URL + "openlayers/SimplePanZoom.js",
-                   "http://www.openstreetmap.org/openlayers/OpenStreetMap.js"]
+if 'MAP_JS_URLS' not in globals():
+    global MAP_JS_URLS
+    MAP_JS_URLS = {
+        'openlayers':[
+            STATIC_URL + "openlayers/OpenLayers.js",
+            STATIC_URL + "openlayers/SimplePanZoom.js",
+            "http://www.openstreetmap.org/openlayers/OpenStreetMap.js"],
+        'leaflet':[
+            STATIC_URL + "leaflet/leaflet.js"
+            ]
+    }
+
+if 'MAP_CSS_URLS' not in globals():
+    global MAP_CSS_URLS
+    MAP_CSS_URLS = {
+        'openlayers':["http://www.openlayers.org/api/theme/default/style.css"],
+        'leaflet':[
+            STATIC_URL + "leaflet/leaflet.css",
+            STATIC_URL + "leaflet/leaflet.ie.css"
+        ]
+    }