Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/diaspora/diaspora.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog.md1
-rw-r--r--app/assets/javascripts/osmlocator.js2
-rw-r--r--spec/javascripts/osmlocator-spec.js2
3 files changed, 3 insertions, 2 deletions
diff --git a/Changelog.md b/Changelog.md
index 6efe13f51..d0a835888 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -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)
* 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)
+* Hit Nominatim via https [#4967](https://github.com/diaspora/diaspora/issues/4967)
## 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)
diff --git a/app/assets/javascripts/osmlocator.js b/app/assets/javascripts/osmlocator.js
index 1ff766294..509413f9d 100644
--- a/app/assets/javascripts/osmlocator.js
+++ b/app/assets/javascripts/osmlocator.js
@@ -6,7 +6,7 @@ OSM.Locator = function(){
navigator.geolocation.getCurrentPosition(function(position) {
lat=position.coords.latitude;
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);
});
},errorGettingPosition);
diff --git a/spec/javascripts/osmlocator-spec.js b/spec/javascripts/osmlocator-spec.js
index 5cd22fa69..173ea4a5b 100644
--- a/spec/javascripts/osmlocator-spec.js
+++ b/spec/javascripts/osmlocator-spec.js
@@ -7,7 +7,7 @@ describe("Locator", function(){
};
$.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' })
}