nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #4968 from taratatach/4967-use-https-for-osm-locator

Browse source 
Use https to load the location from OSM
This commit is contained in:
Jonne Haß 2014-05-26 20:10:14 +02:00
commit 553a5258a8
3 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -55,6 +55,7 @@ Read more in [#4249](https://github.com/diaspora/diaspora/pull/4249) and [#4883]
* Redirect to the stream when switching the mobile publisher to desktop [#4806](https://github.com/diaspora/diaspora/issues/4806) * Redirect to the stream when switching the mobile publisher to desktop [#4806](https://github.com/diaspora/diaspora/issues/4806)
* Parsing mention witch contain in username special characters [#4919](https://github.com/diaspora/diaspora/pull/4919) * Parsing mention witch contain in username special characters [#4919](https://github.com/diaspora/diaspora/pull/4919)
* Do not show your own hovercard [#4724](https://github.com/diaspora/diaspora/issues/4724) * Do not show your own hovercard [#4724](https://github.com/diaspora/diaspora/issues/4724)
* Hit Nominatim via https [#4967](https://github.com/diaspora/diaspora/issues/4967)
## Features ## Features
* You can report a single post or comment by clicking the correct icon in the controler section [#4517](https://github.com/diaspora/diaspora/pull/4517) [#4781](https://github.com/diaspora/diaspora/pull/4781) * You can report a single post or comment by clicking the correct icon in the controler section [#4517](https://github.com/diaspora/diaspora/pull/4517) [#4781](https://github.com/diaspora/diaspora/pull/4781)

2
app/assets/javascripts/osmlocator.js
View file

@ -6,7 +6,7 @@ OSM.Locator = function(){
navigator.geolocation.getCurrentPosition(function(position) { navigator.geolocation.getCurrentPosition(function(position) {
lat=position.coords.latitude; lat=position.coords.latitude;
lon=position.coords.longitude; lon=position.coords.longitude;
var display_name =$.getJSON("http://nominatim.openstreetmap.org/reverse?format=json&lat="+lat+"&lon="+lon+"&addressdetails=3", function(data){ var display_name =$.getJSON("https://nominatim.openstreetmap.org/reverse?format=json&lat="+lat+"&lon="+lon+"&addressdetails=3", function(data){
return callback(data.display_name, position.coords); return callback(data.display_name, position.coords);
}); });
},errorGettingPosition); },errorGettingPosition);

2
spec/javascripts/osmlocator-spec.js
View file

@ -7,7 +7,7 @@ describe("Locator", function(){
}; };
$.getJSON = function(url, myCallback){ $.getJSON = function(url, myCallback){
if(url == "http://nominatim.openstreetmap.org/reverse?format=json&lat=1&lon=2&addressdetails=3") if(url == "https://nominatim.openstreetmap.org/reverse?format=json&lat=1&lon=2&addressdetails=3")
{ {
return myCallback({ display_name: 'locator address' }) return myCallback({ display_name: 'locator address' })
} }