JS: fixes in the map display - add transport information to result routing

1 files changed, 18 insertions, 2 deletions

diff --git a/chimere/static/chimere/js/jquery.chimere.js b/chimere/static/chimere/js/jquery.chimere.js
index ae74d6b..99809fb 100644
--- a/chimere/static/chimere/js/jquery.chimere.js
+++ b/chimere/static/chimere/js/jquery.chimere.js
@@ -527,7 +527,6 @@ OpenLayers.Layer.MapQuestOSM = OpenLayers.Class(OpenLayers.Layer.XYZ, {
                 $('#chimere_map_menu').css('left', offsetX);
             }
         },
-
         /*
         * Load markers and route from DB
         */
@@ -816,6 +815,8 @@ OpenLayers.Layer.MapQuestOSM = OpenLayers.Class(OpenLayers.Layer.XYZ, {
             };
             var markerOver = function (evt) {
                 document.body.style.cursor='pointer';
+                if (settings.current_feature && settings.current_feature.popup
+                    && settings.current_feature.popup.visible()) return;
                 var marker = evt.object;
                 if (marker.icon_hover_url){
                     marker.setUrl(marker.icon_hover_url);
@@ -1126,6 +1127,10 @@ OpenLayers.Layer.MapQuestOSM = OpenLayers.Class(OpenLayers.Layer.XYZ, {
                         settings.map.zoomToExtent(
                                 settings.layerRoute.getDataExtent());
                         settings.map.zoomOut();
+                        $('#id_transport_it').find('span'
+                                                    ).removeClass('selected');
+                        $('#id_transport_it_'+data.properties.transport
+                                                    ).addClass('selected');
                         $('#chimere_total_label').html(
                                             data.properties.total);
                         $('#chimere_itinerary_content').html(
@@ -1401,6 +1406,7 @@ OpenLayers.Layer.MapQuestOSM = OpenLayers.Class(OpenLayers.Layer.XYZ, {
             if (bounds) settings.map.zoomToExtent(bounds);
         },
         hidePopup: function (evt) {
+            $('#marker_hover').hide();
             if (settings.hide_popup_fx) {
                 settings.hide_popup_fx(evt, settings)
             }
@@ -1412,6 +1418,17 @@ OpenLayers.Layer.MapQuestOSM = OpenLayers.Class(OpenLayers.Layer.XYZ, {
                     }
                     if (settings.current_popup.visible()){
                         settings.current_popup.hide();
+
+
+/*
+var evtPx = {xy: settings.map.getPixelFromLonLat(
+ /*   settings.map.getLonLatFromViewPortPx(evt.xy))};
+evtPx.type = 'click';*/
+                        settings.map.events.triggerEvent('click',
+                              {xy: settings.map.minPx});
+                             /*   {xy: settings.map.getPixelFromLonLat(
+    settings.map.getLonLatFromViewPortPx(evt.xy))});*/
+
                         return true;
                     }
                 }
@@ -1595,7 +1612,6 @@ OpenLayers.Layer.MapQuestOSM = OpenLayers.Class(OpenLayers.Layer.XYZ, {
         else {
             $.error( 'Method ' +  thing + ' does not exist on jQuery.chimere' );
         }
-            
         return this;
     };
 })( jQuery );