Routing: add clear - improve icons and styles

14 files changed, 54 insertions, 9 deletions

diff --git a/chimere/static/chimere/css/styles.css b/chimere/static/chimere/css/styles.css
index fd573d4..cdcf437 100644
--- a/chimere/static/chimere/css/styles.css
+++ b/chimere/static/chimere/css/styles.css
@@ -1835,3 +1835,43 @@ span#permalink, .navbar-nav .lbl, #areas-div label, #permalink, #simple_button,
 .ol-ctx-menu-container li.ol-ctx-menu-separator hr{
     margin: 5px;
 }
+
+.ol-ctx-menu-center{
+    background-image: url("../img/icon-center.png");
+}
+
+.ol-ctx-menu-center:hover{
+    background-image: url("../img/icon-center-off.png");
+}
+
+.ol-ctx-menu-to{
+    background-image: url("../img/icon-to.png");
+}
+
+.ol-ctx-menu-to:hover{
+    background-image: url("../img/icon-to-off.png");
+}
+
+.ol-ctx-menu-from{
+    background-image: url("../img/icon-from.png");
+}
+
+.ol-ctx-menu-from:hover{
+    background-image: url("../img/icon-from-off.png");
+}
+
+.ol-ctx-menu-add-step{
+    background-image: url("../img/icon-add-step.png");
+}
+
+.ol-ctx-menu-add-step:hover{
+    background-image: url("../img/icon-add-step-off.png");
+}
+
+.ol-ctx-menu-rout-clean{
+    background-image: url("../img/icon-times.png");
+}
+
+.ol-ctx-menu-rout-clean:hover{
+    background-image: url("../img/icon-times-off.png");
+}
diff --git a/chimere/static/chimere/img/icon-add-step-off.png b/chimere/static/chimere/img/icon-add-step-off.png
new file mode 100644
index 0000000..c76c8c2
--- /dev/null
+++ b/chimere/static/chimere/img/icon-add-step-off.png
diff --git a/chimere/static/chimere/img/icon-add-step.png b/chimere/static/chimere/img/icon-add-step.png
new file mode 100644
index 0000000..0ce96b3
--- /dev/null
+++ b/chimere/static/chimere/img/icon-add-step.png
diff --git a/chimere/static/chimere/img/icon-center-off.png b/chimere/static/chimere/img/icon-center-off.png
new file mode 100644
index 0000000..cd53889
--- /dev/null
+++ b/chimere/static/chimere/img/icon-center-off.png
diff --git a/chimere/static/chimere/img/center.png b/chimere/static/chimere/img/icon-center.png
index fad2f26..fad2f26 100644
--- a/chimere/static/chimere/img/center.png
+++ b/chimere/static/chimere/img/icon-center.png
diff --git a/chimere/static/chimere/img/icon-from-off.png b/chimere/static/chimere/img/icon-from-off.png
new file mode 100644
index 0000000..6eec824
--- /dev/null
+++ b/chimere/static/chimere/img/icon-from-off.png
diff --git a/chimere/static/chimere/img/icon-from.png b/chimere/static/chimere/img/icon-from.png
new file mode 100644
index 0000000..20cc9f3
--- /dev/null
+++ b/chimere/static/chimere/img/icon-from.png
diff --git a/chimere/static/chimere/img/icon-times-off.png b/chimere/static/chimere/img/icon-times-off.png
new file mode 100644
index 0000000..7c08877
--- /dev/null
+++ b/chimere/static/chimere/img/icon-times-off.png
diff --git a/chimere/static/chimere/img/icon-times.png b/chimere/static/chimere/img/icon-times.png
new file mode 100644
index 0000000..5fd2747
--- /dev/null
+++ b/chimere/static/chimere/img/icon-times.png
diff --git a/chimere/static/chimere/img/icon-to-off.png b/chimere/static/chimere/img/icon-to-off.png
new file mode 100644
index 0000000..851d39b
--- /dev/null
+++ b/chimere/static/chimere/img/icon-to-off.png
diff --git a/chimere/static/chimere/img/icon-to.png b/chimere/static/chimere/img/icon-to.png
new file mode 100644
index 0000000..2a0a80e
--- /dev/null
+++ b/chimere/static/chimere/img/icon-to.png
diff --git a/chimere/static/chimere/img/icon_from.png b/chimere/static/chimere/img/icon_from.png
deleted file mode 100644
index 3623e50..0000000
--- a/chimere/static/chimere/img/icon_from.png
+++ /dev/null
diff --git a/chimere/static/chimere/img/icon_to.png b/chimere/static/chimere/img/icon_to.png
deleted file mode 100644
index 6a2bab2..0000000
--- a/chimere/static/chimere/img/icon_to.png
+++ /dev/null
diff --git a/chimere/static/chimere/js/jquery.chimere.js b/chimere/static/chimere/js/jquery.chimere.js
index 181f05f..945b637 100644
--- a/chimere/static/chimere/js/jquery.chimere.js
+++ b/chimere/static/chimere/js/jquery.chimere.js
@@ -22,6 +22,7 @@ var labels = {
     'routing_from': "From",
     'routing_to': "To",
     'routing_add_step': "Add step",
+    'routing_clean': "Delete the route",
     'center_map': "Center map here",
     'zoom_in': "Zoom in",
     'zoom_out': "Zoom out"
@@ -33,6 +34,7 @@ if (typeof language != 'undefined'){
             'routing_from': "En partir",
             'routing_to': "Y aller",
             'routing_add_step': "Ajouter une étape",
+            'routing_clean': "Effacer l'itinéraire",
             'center_map': "Centrer la carte ici",
             'zoom_in': "Zoom avant",
             'zoom_out': "Zoom arrière"
@@ -392,17 +394,22 @@ function transformCoordToLonLat(coord) {
                     {
                       text: labels['routing_from'],
                       callback: methods.routingFrom,
-                      icon: STATIC_URL + 'chimere/img/icon_from.png'
+                      classname: 'ol-ctx-menu-from ol-ctx-menu-icon'
                     },
                     {
                       text: labels['routing_add_step'],
                       callback: methods.routingAddStep,
-                      icon: STATIC_URL + 'chimere/img/icon_add_step.png'
+                      classname: 'ol-ctx-menu-add-step ol-ctx-menu-icon'
                     },
                     {
                       text: labels['routing_to'],
                       callback: methods.routingTo,
-                      icon: STATIC_URL + 'chimere/img/icon_to.png'
+                      classname: 'ol-ctx-menu-to ol-ctx-menu-icon'
+                    },
+                    {
+                      text: labels['routing_clean'],
+                      callback: methods.routingClear,
+                      classname: 'ol-ctx-menu-rout-clean ol-ctx-menu-icon'
                     },
                     '-'];
             }
@@ -410,7 +417,7 @@ function transformCoordToLonLat(coord) {
                 {
                   text: labels['center_map'],
                   callback: methods.mapCenter,
-                  icon: STATIC_URL + 'chimere/img/center.png'
+                  classname: 'ol-ctx-menu-center ol-ctx-menu-icon'
                 },
                 '-',
                 {
@@ -2306,20 +2313,18 @@ function transformCoordToLonLat(coord) {
             $('#nominatim_end_label').html('');
             $('#chimere_end_label').html('');
             $('.nominatim-widget').val(default_nominatim_lbl);
-            $('#chimere_map_menu').hide();
-            $('#map_menu_clear').hide();
             $('#chimere_itinerary').hide();
             $('#chimere_itinerary_form').show();
             $('div[id^="id_step_"]').remove();
             if($('#search_routing').length) $('#search_routing').button('disable');
-            settings.layerRoute.removeAllFeatures();
-            settings.layerRouteMarker.clearMarkers();
             settings.routing_start = null;
             settings.routing_end = null;
             settings.routing_steps = new Array();
             settings.current_itinerary_number = 0;
             settings.current_routes_features = [];
-            settings.permalink.updateLink();
+            settings.routingFeatures.clear();
+            // TODO ol3
+            // settings.permalink.updateLink();
         },
         // display a route
         route: function(){