Adapt template an JS lib for mobile

4 files changed, 21 insertions, 6 deletions

diff --git a/chimere/static/chimere/js/jquery.chimere.js b/chimere/static/chimere/js/jquery.chimere.js
index 39b3b61..274af85 100644
--- a/chimere/static/chimere/js/jquery.chimere.js
+++ b/chimere/static/chimere/js/jquery.chimere.js
@@ -82,10 +82,7 @@ OpenLayers.Layer.MapQuestOSM = OpenLayers.Class(OpenLayers.Layer.XYZ, {
             hide_popup_fx: null,
             // if leave to false every click on the map hide the pop-up
             explicit_popup_hide: false,
-            controls:[new OpenLayers.Control.Navigation(),
-                      new OpenLayers.Control.PanPanel(),
-                      new OpenLayers.Control.ZoomPanel(),
-                      new OpenLayers.Control.ScaleLine()],
+            controls:null,
             popupClass: OpenLayers.Popup.FramedCloud,
             popupContentFull: false, // if true the detail is inside the popup
             category_accordion: true, // category opening behave like an accordion
@@ -117,7 +114,8 @@ OpenLayers.Layer.MapQuestOSM = OpenLayers.Class(OpenLayers.Layer.XYZ, {
             marker_hover_offset: null,
             icon_start: null,
             icon_step: null,
-            icon_end: null
+            icon_end: null,
+            mobile:false
         };
         var settings = {};
     /*
@@ -156,6 +154,21 @@ OpenLayers.Layer.MapQuestOSM = OpenLayers.Class(OpenLayers.Layer.XYZ, {
             }
             settings = $.extend({}, defaults);
             if ( options ) $.extend(settings, options);
+            if (settings.controls == null){
+                if (settings.mobile){
+                    settings.controls = [new OpenLayers.Control.TouchNavigation({
+                        dragPanOptions: {
+                            enableKinetic: true
+                        }
+                    }),
+                    new OpenLayers.Control.Zoom()];
+                } else {
+                    settings.controls = [new OpenLayers.Control.Navigation(),
+                      new OpenLayers.Control.PanPanel(),
+                      new OpenLayers.Control.ZoomPanel(),
+                      new OpenLayers.Control.ScaleLine()];
+                }
+            }
             var map_element = $(this).get(0);
             var map_options = {
                 controls: settings.controls,
@@ -907,6 +920,7 @@ OpenLayers.Layer.MapQuestOSM = OpenLayers.Class(OpenLayers.Layer.XYZ, {
                 OpenLayers.Event.stop(evt);
             };
             marker.events.register('click', feature, markerClick);
+            marker.events.register('touchstart', feature, markerClick);
             marker.events.register('mouseover', feature, markerOver);
             marker.events.register('mouseout', feature, markerOut);
             settings.layerMarkers.addMarker(marker);
diff --git a/chimere/templates/chimere/blocks/head_chimere.html b/chimere/templates/chimere/blocks/head_chimere.html
index 147d05b..e0c2a0b 100644
--- a/chimere/templates/chimere/blocks/head_chimere.html
+++ b/chimere/templates/chimere/blocks/head_chimere.html
@@ -3,7 +3,6 @@
 {% for js_url in OSM_JS_URLS %}
 <script src="{{ js_url }}" type="text/javascript"></script>{% endfor %}
 {% if routing %}<script src="{{ STATIC_URL }}chimere/js/routing-widget.js" type="text/javascript"></script>{% endif %}
-<script src="{{ STATIC_URL }}chimere/js/clustering.js" type="text/javascript"></script>
 <script src="{{ STATIC_URL }}chimere/js/jquery.chimere.js" type="text/javascript"></script>
 <script type="text/javascript">
     /* Global variables */
diff --git a/chimere/templates/chimere/blocks/map.html b/chimere/templates/chimere/blocks/map.html
index e00ff8b..c93dd10 100644
--- a/chimere/templates/chimere/blocks/map.html
+++ b/chimere/templates/chimere/blocks/map.html
@@ -19,6 +19,7 @@
     {% if single_category %}
     $(function() {$('#panel').hide()});{% endif %}
     var chimere_init_options = {};
+    {% if MOBILE %}chimere_init_options["mobile"] = true;{% endif %}
     chimere_init_options["default_icon"] = '{{STATIC_URL}}img/marker-green.png';
     chimere_init_options["map_layers"] = [{{js_map_layers|safe|escape}}];
     chimere_init_options['permalink_label'] = '{%trans "Permalink"%}';
diff --git a/chimere/templatetags/chimere_tags.py b/chimere/templatetags/chimere_tags.py
index 7a3f48e..c4b4c95 100644
--- a/chimere/templatetags/chimere_tags.py
+++ b/chimere/templatetags/chimere_tags.py
@@ -189,6 +189,7 @@ def map(context, map_id='map'):
     context_data['icon_offset_y'] = settings.CHIMERE_ICON_OFFSET_Y
     context_data['icon_width'] = settings.CHIMERE_ICON_WIDTH
     context_data['icon_height'] = settings.CHIMERE_ICON_HEIGHT
+    context_data['MOBILE'] = context['MOBILE']
     context_data['routing'] = 'true' \
         if hasattr(settings, 'CHIMERE_ENABLE_ROUTING') and \
            settings.CHIMERE_ENABLE_ROUTING \