Improvement in route display and parsing

3 files changed, 40 insertions, 25 deletions

diff --git a/chimere/static/chimere/css/styles.css b/chimere/static/chimere/css/styles.css
index 188cc3b..ecdd70c 100644
--- a/chimere/static/chimere/css/styles.css
+++ b/chimere/static/chimere/css/styles.css
@@ -26,6 +26,14 @@ h2, h3, th, .action li, .action li a,
     color:#333;
 }
 
+.nominatim-widget{
+    color:#aaa;
+}
+
+#chimere_total_label td.l{
+    color:#000;
+}
+
 /* background-color definition */
 
 body, h2, h3, th,
@@ -46,6 +54,7 @@ fieldset, .action li, #content,
 #welcome, #detail, .detail_footer a,
 #content .olControlLayerSwitcher .layersDiv,
 #content .olControlLayerSwitcher span,
+#chimere_total_label td.l,
 #main-map, .window{
     background-color:#FFF;
 }
@@ -157,7 +166,6 @@ h3{
 
 h4, caption{
     font-weight:normal;
-    font-style:italic;
     margin:0;
     text-align:left;
 }
@@ -433,15 +441,20 @@ ul#share li{
     margin:0.5em;
 }
 
+#total_label_div{
+    margin:5px 0;
+}
+
 .itinerary_label{
     font-size:0.9em;
     padding-top:0.5em;
-     font-style:italic;
+    font-style:italic;
 }
 
-.itinerary_label.label{
-  font-style:normal;
-  font-weight:bold;
+.itinerary_label .label{
+    font-style:normal;
+    font-weight:bold;
+    padding:3px 8px;
 }
 
 
@@ -451,29 +464,19 @@ ul#share li{
     margin-top:10px;
 }
 
-#chimere_itinerary_content table
-{
-    border-collapse:collapse;
-}
-
-#chimere_itinerary_content table td{
-    border:1px solid #333;
-}
-
-#chimere_itinerary_content td.l{
+#chimere_itinerary_content span.l{
     padding:5px;
     width:60px;
 }
 
-#chimere_itinerary_content td.r{
-    font-size:0.8em;
-    padding:0.8em;
-}
-
 #chimere_itinerary_content span.j{
     font-style:italic;
 }
 
+#chimere_itinerary_content .number{
+    font-weight:bold;
+}
+
 #chimere_itinerary_content span.t,
 #chimere_itinerary_content span.b
 {
@@ -518,6 +521,10 @@ ul#share li{
     height:2.8em;
 }
 
+.nominatim-widget{
+    font-style:italic;
+}
+
 .simple #panel{
     top:5px;
 }
diff --git a/chimere/static/chimere/js/jquery.chimere.js b/chimere/static/chimere/js/jquery.chimere.js
index c1d028c..6e0fa25 100644
--- a/chimere/static/chimere/js/jquery.chimere.js
+++ b/chimere/static/chimere/js/jquery.chimere.js
@@ -560,7 +560,10 @@ OpenLayers.Layer.MapQuestOSM = OpenLayers.Class(OpenLayers.Layer.XYZ, {
                                       settings.icon_end);
                 settings.layerRouteMarker.addMarker(settings.routing_end);
             }
-            if (settings.routing_end && settings.routing_start) methods.route();
+            if (settings.routing_end && settings.routing_start
+                && $('#search_routing').length) {
+                $('#search_routing').button('enable');
+            }
         },
 
         // set the start point for routing
@@ -621,11 +624,12 @@ OpenLayers.Layer.MapQuestOSM = OpenLayers.Class(OpenLayers.Layer.XYZ, {
             $('#nominatim_end_lat').val('');
             $('#nominatim_end_label').html('');
             $('#chimere_end_label').html('');
-            $('.nominatim-widget').val('');
+            $('.nominatim-widget').val(default_nominatim_lbl);
             $('#chimere_map_menu').hide();
             $('#map_menu_clear').hide();
             $('#chimere_itinerary').hide();
             $('#chimere_itinerary_form').show();
+            if($('#search_routing').length) $('#search_routing').button('disable');
             settings.layerRoute.removeAllFeatures();
             settings.layerRouteMarker.clearMarkers();
             settings.routing_start = null;
@@ -635,6 +639,7 @@ OpenLayers.Layer.MapQuestOSM = OpenLayers.Class(OpenLayers.Layer.XYZ, {
 
         // display a route
         route: function(){
+            if($('#search_routing').length) $('#search_routing').button('enable');
             if (!settings.routing_start || !settings.routing_end){
                 return;
             }
@@ -666,6 +671,8 @@ OpenLayers.Layer.MapQuestOSM = OpenLayers.Class(OpenLayers.Layer.XYZ, {
                         settings.map.zoomToExtent(
                                 settings.layerRoute.getDataExtent());
                         settings.map.zoomOut();
+                        $('#chimere_total_label').html(
+                                            data.properties.total);
                         $('#chimere_itinerary_content').html(
                                             data.properties.description);
                         $('#chimere_itinerary').show();
diff --git a/chimere/static/chimere/js/nominatim-widget.js b/chimere/static/chimere/js/nominatim-widget.js
index fea654d..e925cf2 100644
--- a/chimere/static/chimere/js/nominatim-widget.js
+++ b/chimere/static/chimere/js/nominatim-widget.js
@@ -1,4 +1,4 @@
-
+var default_nominatim_lbl = '';
 $(function(){
     $(".nominatim-widget").autocomplete({
            source: function (request, response) {
@@ -15,7 +15,8 @@ $(function(){
                                   value: item.display_name,
                                   lat: item.lat,
                                   lon: item.lon
-                              }}));
+                                }
+                              }));
 
                           }
                       })
@@ -27,7 +28,7 @@ $(function(){
                 $('#'+$(this).attr('id')+'_lon').val(ui.item.lon);
                 $('#'+$(this).attr('id')+'_label').html(ui.item.label);
                 $('#chimere_'+$(this).attr('id').substring(10)+'_label').html(ui.item.label);
-                $('#'+$(this).attr('id')).val('');
+                $('#'+$(this).attr('id')).val(default_nominatim_lbl);
                 jQuery("#map").chimere("routingInputChange");
                 return false;
             },