From: Tom Hughes <tom@compton.nu>
Date: Mon, 16 Feb 2015 08:30:29 +0000 (+0000)
Subject: Merge remote-tracking branch 'systemed/routing'
X-Git-Tag: live~4870
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/250bb47cc2723c7af6fac0a6e9e900c1a50f9292?hp=-c

Merge remote-tracking branch 'systemed/routing'
---

250bb47cc2723c7af6fac0a6e9e900c1a50f9292
diff --combined Vendorfile
index 2d31a3cbd,7da31ce46..ae46dc171
--- a/Vendorfile
+++ b/Vendorfile
@@@ -33,6 -33,10 +33,10 @@@ folder 'vendor/assets' d
      from 'git://github.com/jfirebaugh/leaflet-osm.git' do
        file 'leaflet.osm.js', 'leaflet-osm.js'
      end
+ 
+     from 'git://github.com/jieter/Leaflet.encoded.git' do
+       file 'leaflet.polyline.js', 'Polyline.encoded.js'
+     end
    end
  
    folder 'ohauth' do
@@@ -49,8 -53,6 +53,8 @@@
          rewrite(path) { |content| content.gsub(/url\('?(img\/[^')]+)'?\)/, 'url(<%= asset_path("iD/\1") %>)') }
        end
        file 'iD.js', 'dist/iD.js'
 +      file 'presets.js', 'dist/presets.js'
 +      file 'imagery.js', 'dist/imagery.js'
      end
    end
  
diff --combined app/assets/stylesheets/common.scss
index e08b9ab87,740305cd3..cbc721b3f
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@@ -907,13 -907,15 +907,15 @@@ nav.secondary 
    }
  }
  
- /* Rules for the search box */
+ /* Rules for the search and direction forms */
  
- header .search_form {
+ header .search_forms,
+ .directions_form {
    display: none;
  }
  
- .search_form {
+ .search_form,
+ .directions_form {
    position: relative;
    padding: $lineheight/2;
    background-color: $lightgrey;
@@@ -927,23 -929,37 +929,37 @@@
    input[type=text] {
      width: 100%;
      height: 30px;
-     border-right: none;
- 
      transition: 300ms linear;
    }
  
+   input[type=text].overflow {
+     border-right: none;
+   }
+ 
    input:focus {
      outline: none;
      box-shadow: 0px 0px 7px #9ED485;
    }
  
-   input[type=submit] {
+   input[type=submit].float {
      float: right;
      width: auto;
      min-width: 0;
      border-radius: 0 2px 2px 0;
    }
  
+   select {
+     /* this next line is to polyfill the vertical alignment of text within a select element,
+      * which is different between firefox and chrome. */
+     padding: 0.3em 0;
+   }
+ 
+   .query_options {
+     text-align: right;
+     font-size: 10px;
+     color: $blue;
+   }
+ 
    .describe_location {
      position: absolute;
      top: 6px;
@@@ -951,6 -967,38 +967,38 @@@
      font-size: 10px;
      color: $blue;
    }
+ 
+   .switch_link {
+     float: right;
+     width: auto;
+     min-width: 0;
+     margin-left: 6px;
+   }
+ 
+   img.button {
+     display: block;
+   }
+ 
+   span.force_width {
+     width: 100%;
+     padding-right: 25px;
+     display: block;
+   }
+ 
+   select.routing_engines {
+     min-height: 30px;
+     margin: 0px 0px 5px 25px;
+   }
+ 
+   input.routing_go {
+     min-width: 100px;
+     float: right;
+   }
+ 
+   div.line {
+     width: 100%;
+     margin: 0px 0px 5px 0px;
+   }
  }
  
  /* Rules for the map key which appears in the popout sidebar */
@@@ -973,7 -1021,7 +1021,7 @@@
      border-bottom: $keyline;
      cursor: pointer;
      &:first-child { border-top: $keyline; }
-     &.selected { background: #FFFFE6; }
+     &.selected { background: $list-highlight; }
    }
  
    .search_details {
@@@ -989,6 -1037,47 +1037,47 @@@
    color: #f00;
  }
  
+ /* Rules for routing */
+ 
+ #sidebar_content>table {
+     padding: 5px 20px 10px 15px;
+     width: 100%;
+     border-collapse: separate;
+ }
+ 
+ div.direction {
+   background-image: image-url('routing-sprite.png');
+   width: 20px;
+   height: 20px;
+   background-repeat: no-repeat;
+ }
+ @for $i from 1 through 17 {
+ div.direction.i#{$i} { background-position: #{($i)*-20+20}px 0px; }
+ }
+ 
+ p#routing_summary {
+     padding: 0 $lineheight $lineheight/4;
+ }
+ 
+ td.instruction, td.distance {
+     padding-top: $lineheight/5;
+     padding-bottom: $lineheight/5;
+     border-bottom: 1px solid #DDD;
+ }
+ td.distance {
+     color: #BBB;
+     text-align: right;
+     font-size: x-small;
+ }
+ tr.turn {
+     cursor: pointer;
+ }
+ tr.turn:hover {
+     background: $list-highlight;
+ }
+ .routing_engines, #route_from, #route_to { margin-left: 25px; }
+ .routing_marker { width: 15px; position: absolute; }
+ 
  /* Rules for entity history */
  
  #sidebar_content {
@@@ -1010,7 -1099,7 +1099,7 @@@
      border-bottom: 1px solid #ddd;
      cursor: pointer;
  
-     &.selected { background: #FFFFE6; }
+     &.selected { background: $list-highlight; }
      /* color is derived from changeset bbox fillColor in history.js */
    }
  
@@@ -1167,7 -1256,7 +1256,7 @@@
          }
  
          &.selected {
-           background: #FFFFE6;
+           background: $list-highlight;
          }
        }
      }
@@@ -1228,6 -1317,15 +1317,15 @@@
    }
  }
  
+ /* Rules for the routing sidebar */
+ 
+ #sidebar_content {
+   #routing_credit {
+     text-align: center;
+     padding: 0.5em;
+   }
+ }
+ 
  /* Rules for edit pages */
  
  .site-edit {
@@@ -1746,26 -1844,19 +1844,26 @@@
  
  /* Rules for "flash" notice boxes shown at the top of the content area */
  
 -.error {
 +.flash {
    padding: $lineheight;
 -  background-color: #ff7070;
 -}
  
 -.warning {
 -  padding: $lineheight;
 -  background-color: #ffe0cc;
 -}
 +  &.error {
 +    background-color: #ff7070;
 +  }
  
 -.notice {
 -  padding: $lineheight;
 -  background-color: #CBEEA7;
 +  &.warning {
 +    background-color: #ffe0cc;
 +  }
 +
 +  &.notice {
 +    background-color: #CBEEA7;
 +  }
 +
 +  div.message {
 +    display: inline-block;
 +    margin-left: $lineheight / 2;
 +    vertical-align: middle;
 +  }
  }
  
  /* Rules for highlighting fields with rails validation errors */