summaryrefslogtreecommitdiff
path: root/settings.py
diff options
context:
space:
mode:
Diffstat (limited to 'settings.py')
-rw-r--r--settings.py58
1 files changed, 9 insertions, 49 deletions
diff --git a/settings.py b/settings.py
index 87e7b16..f29c799 100644
--- a/settings.py
+++ b/settings.py
@@ -29,7 +29,6 @@ JQUERY_JS_URLS = ('/javascript/jquery/jquery.js',
'/javascript/jquery-ui/jquery-ui.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
@@ -61,8 +60,8 @@ CHIMERE_DIRECTORY = True
CHIMERE_ICON_WIDTH = 21
CHIMERE_ICON_HEIGHT = 25
-CHIMERE_ICON_OFFSET_X = -10
-CHIMERE_ICON_OFFSET_Y = -25
+CHIMERE_ICON_OFFSET_X = 10
+CHIMERE_ICON_OFFSET_Y = 25
# display picture inside the description by default or inside a galery?
CHIMERE_MINIATURE_BY_DEFAULT = False
@@ -331,55 +330,16 @@ if 'CHIMERE_SHARE_NETWORKS' not in globals():
STATIC_URL + 'chimere/img/identica.png'),
)
-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",
- STATIC_URL + "chimere/js/jquery.chimere-ol.js"
- ],
- 'leaflet':[
- STATIC_URL + "leaflet/leaflet.js",
- STATIC_URL + "chimere/js/jquery.chimere-leaflet.js",
- "http://maps.stamen.com/js/tile.stamen.js?v1.2.1"
- ]
- }
- if DEBUG:
- MAP_JS_URLS['leaflet'][0] = STATIC_URL + "leaflet/leaflet-src.js"
- if CHIMERE_ENABLE_CLUSTERING:
- MAP_JS_URLS['leaflet'] += [
- STATIC_URL + "leaflet-markercluster/leaflet.markercluster.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-markercluster/MarkerCluster.css",
- STATIC_URL + "leaflet-markercluster/MarkerCluster.Default.css",
- ]
- }
- # key: [(url, condition)]
- MAP_CONDITIONNAL_CSS_URLS = {
- 'openlayers':[("http://www.openlayers.org/api/theme/default/style.css",
- None)],
- 'leaflet':[
- (STATIC_URL + "leaflet/leaflet.css", None),
- (STATIC_URL + "leaflet/leaflet.ie.css", 'lte IE 8'),
- (STATIC_URL + "leaflet-markercluster/MarkerCluster.css", None),
- (STATIC_URL + "leaflet-markercluster/MarkerCluster.Default.css", None),
- (STATIC_URL + "leaflet-markercluster/MarkerCluster.Default.ie.css",
- 'lte IE 8'),
- ]
- }
+ MAP_CSS_URLS = [STATIC_URL + "ol3/ol.css"]
-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
+ if DEBUG:
+ MAP_JS_URLS = [STATIC_URL + "ol3/ol-debug.js"]
+ else:
+ MAP_JS_URLS = [STATIC_URL + "ol3/ol.js"]
if 'OSM_MOBILE_JS_URLS' not in globals():
global OSM_MOBILE_URLS
OSM_JS_MOBILE_URLS = [STATIC_URL + "openlayers/OpenLayers.mobile.js",