diff options
| -rw-r--r-- | chimere/static/chimere/js/jquery.chimere.js | 20 | ||||
| -rw-r--r-- | chimere/templatetags/chimere_tags.py | 6 | ||||
| -rw-r--r-- | chimere/views.py | 10 |
3 files changed, 28 insertions, 8 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 ); diff --git a/chimere/templatetags/chimere_tags.py b/chimere/templatetags/chimere_tags.py index a1df004..c2d66b4 100644 --- a/chimere/templatetags/chimere_tags.py +++ b/chimere/templatetags/chimere_tags.py @@ -164,7 +164,8 @@ def map_menu(context): @register.inclusion_tag('chimere/blocks/routing.html', takes_context=True) def routing(context): context_data = {'routing':settings.CHIMERE_ENABLE_ROUTING, - 'itinerary_form':context['itinerary_form']} + 'itinerary_form':context['itinerary_form'], + 'routing_transport':context['routing_transport']} context_data['STATIC_URL'] = settings.STATIC_URL return context_data @@ -276,9 +277,10 @@ def get_tinyfied_url(marker, area_name=''): @register.inclusion_tag('chimere/blocks/share_bar.html', takes_context=True) -def share_bar(context, name=''): +def share_bar(context, name='', email_only=False): context['STATIC_URL'] = settings.STATIC_URL context['name'] = name + context['email_only'] = email_only context['share_networks'] = [(defaultfilters.slugify(name), url, icon) for name, url, icon in settings.CHIMERE_SHARE_NETWORKS] return context diff --git a/chimere/views.py b/chimere/views.py index 03f75a6..28f1605 100644 --- a/chimere/views.py +++ b/chimere/views.py @@ -154,6 +154,7 @@ def index(request, area_name=None, default_area=None, simple=False): zoomout = None if settings.CHIMERE_ENABLE_ROUTING: response_dct['itinerary_form'] = RoutingForm() + response_dct['routing_transport'] = settings.CHIMERE_ROUTING_TRANSPORT response_dct.update({ 'actions':actions(response_dct['area_name']), 'action_selected':('view',), @@ -745,7 +746,7 @@ def route(request, area_name, lon1, lat1, lonlat_steps, lon2, lat2, route = GEOSGeometry(jsons[0]) except OGRException: return HttpResponse(_(u"Bad geometry"), status=500) - cats = SubCategory.objects.filter(routing_warn=True, routing_available=True) + cats = SubCategory.objects.filter(routing_warn=True) message = '' if cats.count(): points = [(m.point, m.categories.all()[0].icon) @@ -770,9 +771,10 @@ def route(request, area_name, lon1, lat1, lonlat_steps, lon2, lat2, "<p>%s</p>" % _(message)) else: message = '' - data = '{"properties":{"total":%s, "description":%s}, '\ - '"type": "FeatureCollection", "features":[%s]%s}' % (total, desc, - ",".join(jsons), message) + data = '{"properties":{"transport":%s, "total":%s, "description":%s}, '\ + '"type": "FeatureCollection", "features":[%s]%s}' % ( + jsonencoder.encode(transport), total, desc, ",".join(jsons), + message) return HttpResponse(data) def rss(request, area_name=''): |