Avoid mixed content warnings when routing queries Nominatim

[rails.git] / app / assets / javascripts / index / directions.js.erb

diff --git a/app/assets/javascripts/index/directions.js.erb b/app/assets/javascripts/index/directions.js.erb
index 93767612bba5654624e3e3a6ae8e438a2098cab5..faa9226358f6ca1471f98a7b8788dc386359defe 100644 (file)
--- a/app/assets/javascripts/index/directions.js.erb
+++ b/app/assets/javascripts/index/directions.js.erb
@@ -1,5 +1,5 @@
 //= require_self
 //= require_self

-//= require_tree ./directions_engines
+//= require_tree ./directions

 
 OSM.Directions = function (map) {
   var awaitingGeocode; // true if the user has requested a route, but we're waiting on a geocode result
 
 OSM.Directions = function (map) {
   var awaitingGeocode; // true if the user has requested a route, but we're waiting on a geocode result


@@ -55,12 +55,13 @@ OSM.Directions = function (map) {
       // make text the same in both text boxes
       var value = e.target.value;
       endpoint.setValue(value)
       // make text the same in both text boxes
       var value = e.target.value;
       endpoint.setValue(value)

-      endpoint.getGeocode();

     });
 
     endpoint.setValue = function(value) {
       endpoint.value = value;
     });
 
     endpoint.setValue = function(value) {
       endpoint.value = value;

+      delete endpoint.latlng;

       input.val(value);
       input.val(value);

+      endpoint.getGeocode();

     }
 
     endpoint.getGeocode = function() {
     }
 
     endpoint.getGeocode = function() {


@@ -72,7 +73,7 @@ OSM.Directions = function (map) {
 
       endpoint.awaitingGeocode = true;
 
 
       endpoint.awaitingGeocode = true;
 

-      $.getJSON('<%= NOMINATIM_URL %>search?q=' + encodeURIComponent(endpoint.value) + '&format=json', function (json) {
+      $.getJSON(document.location.protocol + '<%= NOMINATIM_URL %>search?q=' + encodeURIComponent(endpoint.value) + '&format=json', function (json) {

         endpoint.awaitingGeocode = false;
         endpoint.hasGeocode = true;
         if (json.length == 0) {
         endpoint.awaitingGeocode = false;
         endpoint.hasGeocode = true;
         if (json.length == 0) {


@@ -162,6 +163,7 @@ OSM.Directions = function (map) {
         d = endpoints[1].latlng;
 
     if (!o || !d) return;
         d = endpoints[1].latlng;
 
     if (!o || !d) return;

+    $("header").addClass("closed");

 
     var precision = OSM.zoomPrecision(map.getZoom());
 
 
     var precision = OSM.zoomPrecision(map.getZoom());
 


@@ -294,7 +296,6 @@ OSM.Directions = function (map) {
 
   $(".directions_form").on("submit", function(e) {
     e.preventDefault();
 
   $(".directions_form").on("submit", function(e) {
     e.preventDefault();

-    $("header").addClass("closed");

     getRoute();
   });
 
     getRoute();
   });
 


@@ -338,6 +339,10 @@ OSM.Directions = function (map) {
 
     if (params.from) {
       endpoints[0].setValue(params.from);
 
     if (params.from) {
       endpoints[0].setValue(params.from);

+      endpoints[1].setValue("");
+    } else {
+      endpoints[0].setValue("");
+      endpoints[1].setValue("");

     }
 
     var o = route[0] && L.latLng(route[0].split(',')),
     }
 
     var o = route[0] && L.latLng(route[0].split(',')),