cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Avoid mixed content warnings when routing queries Nominatim

Browse source
This commit is contained in:
Tom Hughes 2015-02-16 21:46:54 +00:00
parent 250bb47cc2
commit 098f8e98f2
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/index/directions.js.erb
View file

@ -73,7 +73,7 @@ OSM.Directions = function (map) {
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) {

4
app/controllers/geocoder_controller.rb
View file

@ -145,7 +145,7 @@ class GeocoderController < ApplicationController
end
# ask nominatim
response = fetch_xml("#{NOMINATIM_URL}search?format=xml&q=#{escape_query(query)}#{viewbox}#{exclude}&accept-language=#{http_accept_language.user_preferred_languages.join(',')}")
response = fetch_xml("http:#{NOMINATIM_URL}search?format=xml&q=#{escape_query(query)}#{viewbox}#{exclude}&accept-language=#{http_accept_language.user_preferred_languages.join(',')}")
# extract the results from the response
results = response.elements["searchresults"]
@ -236,7 +236,7 @@ class GeocoderController < ApplicationController
@results = Array.new
# ask nominatim
response = fetch_xml("#{NOMINATIM_URL}reverse?lat=#{lat}&lon=#{lon}&zoom=#{zoom}&accept-language=#{http_accept_language.user_preferred_languages.join(',')}")
response = fetch_xml("http:#{NOMINATIM_URL}reverse?lat=#{lat}&lon=#{lon}&zoom=#{zoom}&accept-language=#{http_accept_language.user_preferred_languages.join(',')}")
# parse the response
response.elements.each("reversegeocode/result") do |result|