Better management of map JS files

1 files changed, 10 insertions, 6 deletions

diff --git a/chimere/settings.sample.py b/chimere/settings.sample.py
index c8fdb91..2e5ad40 100644
--- a/chimere/settings.sample.py
+++ b/chimere/settings.sample.py
@@ -1,7 +1,8 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-# This file is an example of settings.py for a Chimère project
+# Don't edit this file:
+# overload all theses settings in your local_settings.py file
 
 import os
 _ = lambda s: s
@@ -68,13 +69,13 @@ CHIMERE_OSM_API_URL = 'api06.dev.openstreetmap.org' # test URL
 CHIMERE_OSM_USER = 'test'
 CHIMERE_OSM_PASSWORD = 'test'
 
+# encoding for shapefile import
+CHIMERE_SHAPEFILE_ENCODING = 'ISO-8859-1'
+
 # as the web server need to be reloaded when property models are changed
 # it could be a good idea to hide it to an admin who could'nt do that
 CHIMERE_HIDE_PROPERTYMODEL = False
 
-# encoding for shapefile import
-CHIMERE_SHAPEFILE_ENCODING = 'ISO-8859-1'
-
 # enable routing in Chimère
 CHIMERE_ENABLE_ROUTING = False
 
@@ -288,9 +289,11 @@ if 'MAP_JS_URLS' not in globals():
         'openlayers':[
             STATIC_URL + "openlayers/OpenLayers.js",
             STATIC_URL + "openlayers/SimplePanZoom.js",
-            "http://www.openstreetmap.org/openlayers/OpenStreetMap.js"],
+            "http://www.openstreetmap.org/openlayers/OpenStreetMap.js",
+            STATIC_URL + "chimere/js/jquery.chimere-ol.js"],
         'leaflet':[
-            STATIC_URL + "leaflet/leaflet.js"
+            STATIC_URL + "leaflet/leaflet.js",
+            STATIC_URL + "chimere/js/jquery.chimere-leaflet.js"
             ]
     }
 
@@ -303,3 +306,4 @@ if 'MAP_CSS_URLS' not in globals():
             STATIC_URL + "leaflet/leaflet.ie.css"
         ]
     }
+