From ac47c0b01f857d1da49805f4e683de984c01ed5d Mon Sep 17 00:00:00 2001 From: Valérie-Emma Leroux Date: Fri, 25 Mar 2016 10:53:09 +0100 Subject: Update of copyright dates --- chimere/actions.py | 2 +- chimere/admin.py | 2 +- chimere/forms.py | 2 +- chimere/locale/fr/LC_MESSAGES/django.po | 3 +-- chimere/static/chimere/js/edit_area.js | 2 +- chimere/static/chimere/js/edit_route_map.js | 2 +- chimere/static/chimere/js/jquery.chimere.js | 2 +- chimere/templates/chimere/blocks/footer.html | 2 +- chimere/urls.py | 2 +- chimere/views.py | 2 +- chimere/widgets.py | 2 +- 11 files changed, 11 insertions(+), 12 deletions(-) diff --git a/chimere/actions.py b/chimere/actions.py index e83d8c3..8ce3e2a 100644 --- a/chimere/actions.py +++ b/chimere/actions.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (C) 2008-2010 Étienne Loks +# Copyright (C) 2008-2016 Étienne Loks # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as diff --git a/chimere/admin.py b/chimere/admin.py index 686a656..66816bc 100644 --- a/chimere/admin.py +++ b/chimere/admin.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (C) 2008-2015 Étienne Loks +# Copyright (C) 2008-2016 Étienne Loks # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as diff --git a/chimere/forms.py b/chimere/forms.py index 2cfa0ed..b62859c 100644 --- a/chimere/forms.py +++ b/chimere/forms.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (C) 2008-2014 Étienne Loks +# Copyright (C) 2008-2016 Étienne Loks # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as diff --git a/chimere/locale/fr/LC_MESSAGES/django.po b/chimere/locale/fr/LC_MESSAGES/django.po index 0c5e884..75049e3 100644 --- a/chimere/locale/fr/LC_MESSAGES/django.po +++ b/chimere/locale/fr/LC_MESSAGES/django.po @@ -1,7 +1,6 @@ # Chimère -# Copyright (C) 2008-2015 +# Copyright (C) 2008-2016 Étienne Loks # This file is distributed under the same license as the Chimère package. -# Étienne Loks , 2008-2011. # msgid "" msgstr "" diff --git a/chimere/static/chimere/js/edit_area.js b/chimere/static/chimere/js/edit_area.js index c2faa11..019ed39 100644 --- a/chimere/static/chimere/js/edit_area.js +++ b/chimere/static/chimere/js/edit_area.js @@ -1,4 +1,4 @@ -/* Copyright (C) 2008-2012 Étienne Loks +/* Copyright (C) 2008-2016 Étienne Loks This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/chimere/static/chimere/js/edit_route_map.js b/chimere/static/chimere/js/edit_route_map.js index 3428e90..b177f71 100644 --- a/chimere/static/chimere/js/edit_route_map.js +++ b/chimere/static/chimere/js/edit_route_map.js @@ -1,4 +1,4 @@ -/* Copyright (C) 2008-2012 Étienne Loks +/* Copyright (C) 2008-2016 Étienne Loks This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/chimere/static/chimere/js/jquery.chimere.js b/chimere/static/chimere/js/jquery.chimere.js index 07cf160..b0c6fa9 100644 --- a/chimere/static/chimere/js/jquery.chimere.js +++ b/chimere/static/chimere/js/jquery.chimere.js @@ -1,4 +1,4 @@ -/* Copyright (C) 2008-2015 Étienne Loks +/* Copyright (C) 2008-2016 Étienne Loks This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/chimere/templates/chimere/blocks/footer.html b/chimere/templates/chimere/blocks/footer.html index f5830ed..d656e7b 100644 --- a/chimere/templates/chimere/blocks/footer.html +++ b/chimere/templates/chimere/blocks/footer.html @@ -1,3 +1,3 @@ {% load i18n %} -{% trans "This site uses Chimère"%} copyleft 2008-2015 Chimère project - {% trans "Map"%} copyleft OpenStreetMap +{% trans "This site uses Chimère"%} copyleft 2008-2016 Chimère project - {% trans "Map"%} copyleft OpenStreetMap diff --git a/chimere/urls.py b/chimere/urls.py index b9ec380..913abe1 100644 --- a/chimere/urls.py +++ b/chimere/urls.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (C) 2008-2014 Étienne Loks +# Copyright (C) 2008-2016 Étienne Loks # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as diff --git a/chimere/views.py b/chimere/views.py index 88619ce..306e062 100644 --- a/chimere/views.py +++ b/chimere/views.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (C) 2008-2015 Étienne Loks +# Copyright (C) 2008-2016 Étienne Loks # # RSS : Copyright (C) 2010 Pierre Clarenc , # Samuel Renard , diff --git a/chimere/widgets.py b/chimere/widgets.py index e7d104a..f501e23 100644 --- a/chimere/widgets.py +++ b/chimere/widgets.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (C) 2008-2013 Étienne Loks +# Copyright (C) 2008-2016 Étienne Loks # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as -- cgit v1.2.3 From 43d2437c85ff85de2adfbef90ccd7b768d41c5bb Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Sat, 4 Jun 2016 23:53:37 +0200 Subject: Mobile adaptations --- chimere/static/chimere/js/jquery.chimere.js | 227 ++++++++++++++++++++++++++-- 1 file changed, 217 insertions(+), 10 deletions(-) diff --git a/chimere/static/chimere/js/jquery.chimere.js b/chimere/static/chimere/js/jquery.chimere.js index b0c6fa9..9e89920 100644 --- a/chimere/static/chimere/js/jquery.chimere.js +++ b/chimere/static/chimere/js/jquery.chimere.js @@ -117,8 +117,8 @@ OpenLayers.Layer.MapQuestOSM = OpenLayers.Class(OpenLayers.Layer.XYZ, { icon_start: null, icon_step: null, icon_end: null, - mobile:false, - input_id:'id_point' + mobile: false, + input_id: 'id_point' }; var settings = {}; /* @@ -552,6 +552,14 @@ OpenLayers.Layer.MapQuestOSM = OpenLayers.Class(OpenLayers.Layer.XYZ, { settings.map.setCenter(settings.current_position); }, + // center from the lon lat + mapCenterOnLonLat: function(options){ + settings.current_position = new OpenLayers.LonLat(options["lon"], options["lat"]); + settings.current_position = settings.current_position.transform(EPSG_DISPLAY_PROJECTION, + settings.map.getProjectionObject()); + settings.map.setCenter(settings.current_position); + }, + // set current position setCurrentPosition: function(lonlat){ settings.current_position = lonlat; @@ -1044,6 +1052,19 @@ OpenLayers.Layer.MapQuestOSM = OpenLayers.Class(OpenLayers.Layer.XYZ, { return feature; }, + + //LIB iOS + connectWebViewJavascriptBridge: function(callback) { + if (window.WebViewJavascriptBridge) { + callback(WebViewJavascriptBridge); + } else { + document.addEventListener('WebViewJavascriptBridgeReady', function() { + callback(WebViewJavascriptBridge); + }, false); + } + }, + //fin lib ios + cleanRoute: function(){ settings.layerVectors.removeAllFeatures(); }, @@ -1164,8 +1185,10 @@ OpenLayers.Layer.MapQuestOSM = OpenLayers.Class(OpenLayers.Layer.XYZ, { // set the start point for routing routingFrom: function(){ $('#chimere_map_menu').hide(); - settings.routing_panel_open(); - $('#map_menu_clear').show(); + if (!settings.mobile){ + settings.routing_panel_open(); + $('#map_menu_clear').show(); + } settings.routing_start = new OpenLayers.Marker( settings.current_position.clone(), settings.icon_start); @@ -1177,12 +1200,86 @@ OpenLayers.Layer.MapQuestOSM = OpenLayers.Class(OpenLayers.Layer.XYZ, { 'start_label'); } if (settings.routing_end) methods.route(); + // Added for mobile - START // + //iOS + methods.connectWebViewJavascriptBridge( + function(bridge) { + if(!bridge){ + bridge.init(function(message, responseCallback) { + if (responseCallback) { + responseCallback("Right back atcha"); + } + }); + } + bridge.send('openRouteFrom'); + }); + //android + window.JSInterface.openRouteFrom(); + // Added for mobile - END // + }, + // Added for mobile - START // + // set the start point for current Position + routingFromMyPosition: function(options){ + $('#chimere_map_menu').hide(); + settings.current_position = new OpenLayers.LonLat(options["lon"], options["lat"]); + settings.current_position = settings.current_position.transform(EPSG_DISPLAY_PROJECTION, + settings.map.getProjectionObject()); + settings.routing_start = new OpenLayers.Marker( + settings.current_position.clone(), + settings.icon_start); + settings.layerRouteMarker.addMarker(settings.routing_start); + if (nominatim_url){ + helpers.updateNominatimName(settings.current_position.clone() + .transform(settings.map.getProjectionObject(), + EPSG_DISPLAY_PROJECTION), + 'start_label'); + } + if (settings.routing_end) methods.route(); + + // Added for mobile - START // + //iOS + methods.connectWebViewJavascriptBridge( + function(bridge) { + if(!bridge){ + bridge.init(function(message, responseCallback) { + if (responseCallback) { + responseCallback("Right back atcha"); + } + }); + } + bridge.send('openRouteFrom'); + }); + //android + window.JSInterface.openRouteFrom(); + // Added for mobile - END // + }, + + updateMyCurrentPosition: function(options){ + + if (settings.current_position_marker) { + settings.layerMarkers.removeMarker(settings.current_position_marker) + } + + var tmp_position = new OpenLayers.LonLat(options["lon"], options["lat"]); + tmp_position = tmp_position.transform(EPSG_DISPLAY_PROJECTION, + + + settings.map.getProjectionObject()); + settings.current_position_marker = new OpenLayers.Marker( + tmp_position.clone(), + settings.icon_current_position); + settings.layerRouteMarker.addMarker(settings.current_position_marker); }, + + // Added for mobile - END // + // add a step point for routing routingAddStep: function(){ $('#chimere_map_menu').hide(); - settings.routing_panel_open(); - $('#map_menu_clear').show(); + if (!settings.mobile){ + settings.routing_panel_open(); + $('#map_menu_clear').show(); + } settings.routing_steps.push(new OpenLayers.Marker( settings.current_position.clone(), settings.icon_step.clone())); @@ -1241,8 +1338,10 @@ OpenLayers.Layer.MapQuestOSM = OpenLayers.Class(OpenLayers.Layer.XYZ, { // set the finish point for routing routingTo: function(){ $('#chimere_map_menu').hide(); - settings.routing_panel_open(); - $('#map_menu_clear').show(); + if (!settings.mobile){ + settings.routing_panel_open(); + $('#map_menu_clear').show(); + } settings.routing_end = new OpenLayers.Marker( settings.current_position.clone(), settings.icon_end); @@ -1254,8 +1353,64 @@ OpenLayers.Layer.MapQuestOSM = OpenLayers.Class(OpenLayers.Layer.XYZ, { 'end_label'); } if (settings.routing_start) methods.route(); + + // Added for mobile - START // + //iOS + methods.connectWebViewJavascriptBridge( + function(bridge) { + if(!bridge){ + bridge.init(function(message, responseCallback) { + if (responseCallback) { + responseCallback("Right back atcha"); + } + }); + } + bridge.send('openRouteTo'); + }); + //Android + window.JSInterface.openRouteTo(); + // Added for mobile - END // + }, + // set the finish point for current Position + routingToPosition: function(options){ + $('#chimere_map_menu').hide(); + if (!settings.mobile){ + settings.routing_panel_open(); + $('#map_menu_clear').show(); + } + settings.current_position = new OpenLayers.LonLat(options["lon"], options["lat"]); + settings.current_position = settings.current_position.transform(EPSG_DISPLAY_PROJECTION, + settings.map.getProjectionObject()); + settings.routing_end = new OpenLayers.Marker( + settings.current_position.clone(), + settings.icon_end); + settings.layerRouteMarker.addMarker(settings.routing_end); + if (nominatim_url){ + helpers.updateNominatimName(settings.current_position.clone() + .transform(settings.map.getProjectionObject(), + EPSG_DISPLAY_PROJECTION), + 'end_label'); + } + if (settings.routing_start) methods.route(); + // Added for mobile - START // + //iOS + methods.connectWebViewJavascriptBridge( + function(bridge) { + if(!bridge){ + bridge.init(function(message, responseCallback) { + if (responseCallback) { + responseCallback("Right back atcha"); + } + }); + } + bridge.send('openRouteTo'); + }); + //Android + window.JSInterface.openRouteTo(); + // Added for mobile - END // }, + // clear the current itinerary routingClear: function(){ $('#nominatim_start_lon').val(''); @@ -1361,11 +1516,30 @@ OpenLayers.Layer.MapQuestOSM = OpenLayers.Class(OpenLayers.Layer.XYZ, { data.properties.description); $('#chimere_itinerary').show(); if(!settings.edition_type_is_route){ - $('#chimere_itinerary_form').hide(); - settings.routing_panel_open(); + if (!settings.mobile){ + $('#chimere_itinerary_form').hide(); + settings.routing_panel_open(); + } } else { methods.updateRoutingInput(); } + // Added for mobile - START // + //iOS + methods.connectWebViewJavascriptBridge( + function(bridge) { + if(!bridge){ + bridge.init(function(message, responseCallback) { + if (responseCallback) { + responseCallback("Right back atcha"); + } + }); + } + bridge.send('routeCalculated:'+data.properties.total); + bridge.send('routeCalculatedDetail:'+data.properties.description); + }); + //android + window.JSInterface.routeCalculated(data.properties.total, data.properties.description); + // Added for mobile - START // }, error: function (jqXHR, textStatus, errorThrown) { methods.redrawRoutingIcons(); @@ -1855,6 +2029,39 @@ OpenLayers.Layer.MapQuestOSM = OpenLayers.Class(OpenLayers.Layer.XYZ, { $('#'+response_id).html(vals.display_name); $('#nominatim_'+response_id).html(vals.display_name); $('#chimere_'+response_id).html(vals.display_name); + // Added for mobile - START // + if (response_id === 'start_label') { + //iOS + methods.connectWebViewJavascriptBridge( + function(bridge) { + if(!bridge){ + bridge.init(function(message, responseCallback) { + if (responseCallback) { + responseCallback("Right back atcha"); + } + }); + } + bridge.send('updateFrom:'+vals.display_name); + }); + //android + window.JSInterface.updateFrom(vals.display_name); + } else if (response_id === 'end_label') { + //iOS + methods.connectWebViewJavascriptBridge( + function(bridge) { + if(!bridge){ + bridge.init(function(message, responseCallback) { + if (responseCallback) { + responseCallback("Right back atcha"); + } + }); + } + bridge.send('updateTo:'+vals.display_name); + }); + //android + window.JSInterface.updateTo(vals.display_name); + } + // Added for mobile - END // } }); } -- cgit v1.2.3 From 48e705e7ce868a55086794932dda92c060c228e8 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Wed, 15 Jun 2016 01:09:24 +0200 Subject: Imports: manage explicit start_date and end_date in XML --- chimere/utils.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/chimere/utils.py b/chimere/utils.py index 1240914..1ee5bc7 100644 --- a/chimere/utils.py +++ b/chimere/utils.py @@ -1211,6 +1211,10 @@ class HtmlXsltManager(ImportManager): dct['description'] = item.get('description', '') if 'date' in item: dct.update(self.parse_date(item['date'])) + if "start_date" in item and item["start_date"]: + dct['start_date'] = item["start_date"] + if "end_date" in item and item["end_date"]: + dct['end_date'] = item["end_date"] key = item['key'] it, updated, created = self.create_or_update_item(cls, dct, key, category=category) -- cgit v1.2.3