summaryrefslogtreecommitdiff
path: root/templates/chimere/blocks/map.html
diff options
context:
space:
mode:
Diffstat (limited to 'templates/chimere/blocks/map.html')
-rw-r--r--templates/chimere/blocks/map.html23
1 files changed, 13 insertions, 10 deletions
diff --git a/templates/chimere/blocks/map.html b/templates/chimere/blocks/map.html
index 9e37b3f..6273576 100644
--- a/templates/chimere/blocks/map.html
+++ b/templates/chimere/blocks/map.html
@@ -7,7 +7,7 @@ $(function(){
$('#cluster_list').dialog({'autoOpen':false,
'resizable':false,
'width':340,
- 'dialogClass':'no-titlebar'});
+ 'dialogClass':'no-titlebar-small'});
});
// -->
</script>
@@ -27,16 +27,15 @@ $(function(){
<!--
//LIB iOS
var connectWebViewJavascriptBridge = function(callback) {
- if (window.WebViewJavascriptBridge) {
- callback(WebViewJavascriptBridge);
- } else {
- document.addEventListener('WebViewJavascriptBridgeReady', function() {
- callback(WebViewJavascriptBridge);
- }, false);
- }
+ if (window.WebViewJavascriptBridge) {
+ callback(WebViewJavascriptBridge);
+ } else {
+ document.addEventListener('WebViewJavascriptBridgeReady', function() {
+ callback(WebViewJavascriptBridge);
+ }, false);
+ }
};
//fin lib ios
-
var routing_panel_open = function(){
$('#frm_categories').hide();
$('#chimere_itinerary_panel').show();
@@ -125,7 +124,7 @@ $(function(){
'{{STATIC_URL}}saclay/images/routing_step.png',
new OpenLayers.Size(37, 42),
new OpenLayers.Pixel(-(37/2), -42));
- var numZoomLevels = 6;
+ var numZoomLevels = 7;
var maxZoomLevel = 19;
var resolutions;
var zoomOffset;
@@ -155,6 +154,8 @@ $(function(){
{% if p_routing_end_lon %}chimere_init_options["routing_end_lon"] = {{ p_routing_end_lon }};{% endif %}
{% if p_routing_end_lat %}chimere_init_options["routing_end_lat"] = {{ p_routing_end_lat }};{% endif %}
{% if p_routing_steps %}chimere_init_options["routing_steps_lonlat"] = [{{ p_routing_steps }}];{% endif %}
+ {% if p_routing_transport %}chimere_init_options["routing_transport"] = "{{ p_routing_transport }}";{% endif %}
+ {% if p_routing_speed %}chimere_init_options["routing_speed"] = "{{ p_routing_speed }}";{% endif %}
chimere_init_options["icon_offset"] = new OpenLayers.Pixel({{icon_offset_x}},
{{icon_offset_y}});
chimere_init_options['marker_hover_offset'] = new OpenLayers.Pixel(7, 20);
@@ -176,6 +177,8 @@ $(function(){
$('#maps').chimere('zoom', {'area':{{zoom}} });
{% endif %}
+ $('#{{map_id}}').chimere('addJSON', "{{STATIC_URL}}saclay/json/limites.json");
+
// init layer selection
$(function() {
{% for layer_name, js, def in map_layers %}