Skip to content

Remove explicit http usages to make site https ready #50

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nicolashohm wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove explicit http usages to make site https ready #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions js/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
var url="http://overpass-api.de/api/interpreter?";
//var url="http://overpass.osm.rambler.ru/cgi/interpreter?";
var url="//overpass-api.de/api/interpreter?";
//var url="//overpass.osm.rambler.ru/cgi/interpreter?";
var n=false;
var datan=new Date();
(function(i){var e=/iPhone/i,n=/iPod/i,o=/iPad/i,t=/(?=.*\bAndroid\b)(?=.*\bMobile\b)/i,r=/Android/i,d=/BlackBerry/i,s=/Opera Mini/i,a=/IEMobile/i,b=/(?=.*\bFirefox\b)(?=.*\bMobile\b)/i,h=RegExp("(?:Nexus 7|BNTV250|Kindle Fire|Silk|GT-P1000)","i"),c=function(i,e){return i.test(e)},l=function(i){var l=i||navigator.userAgent;this.apple={phone:c(e,l),ipod:c(n,l),tablet:c(o,l),device:c(e,l)||c(n,l)||c(o,l)},this.android={phone:c(t,l),tablet:!c(t,l)&&c(r,l),device:c(t,l)||c(r,l)},this.other={blackberry:c(d,l),opera:c(s,l),windows:c(a,l),firefox:c(b,l),device:c(d,l)||c(s,l)||c(a,l)||c(b,l)},this.seven_inch=c(h,l),this.any=this.apple.device||this.android.device||this.other.device||this.seven_inch},v=i.isMobile=new l;v.Class=l})(window);
Expand Down Expand Up @@ -91,7 +91,7 @@ function showNoteMessage(header,body,callback,lon,lat){
var delta=0.001;
console.log(lon+" :" +lat);
$.ajax({
url: "http://api.openstreetmap.org/api/0.6/notes.json",
url: "//api.openstreetmap.org/api/0.6/notes.json",
data: {bbox: ''+(lon-delta)+','+(lat-delta)+','+(lon+delta)+','+(lat+delta)},
success: function(data){
var n=$msg2Modal.find("#notes-message");
Expand All @@ -105,7 +105,7 @@ function showNoteMessage(header,body,callback,lon,lat){
badge='<span class="badge glyphicon glyphicon-remove-sign" style="background-color:#b94a48;">';
status="danger";
}
html+='<tr class="'+status+'"><td><a href="http://www.openstreetmap.org/browse/note/'+prop.id+'" target="_blank">'+prop.id+'</a></td><td>'+badge+prop.status+'</span></td><td>'+prop.comments[0].html+'</a></td>';
html+='<tr class="'+status+'"><td><a href="//www.openstreetmap.org/browse/note/'+prop.id+'" target="_blank">'+prop.id+'</a></td><td>'+badge+prop.status+'</span></td><td>'+prop.comments[0].html+'</a></td>';
added=1;
});

Expand Down Expand Up @@ -286,7 +286,7 @@ function placeChanged(){


var nominatimQuery = function (){
var url = 'http://nominatim.openstreetmap.org/reverse';
var url = '//nominatim.openstreetmap.org/reverse';
url += '?format=json&lat=' + map.getCenter().lat + '&lon=' + map.getCenter().lng+'&zoom='+map.getZoom()+"&addressdetails=1";

$.ajax({
Expand Down Expand Up @@ -392,8 +392,8 @@ var zoomControl = L.control.zoom({
//modal.modal('show');
$('#mapper').removeAttr("checked");

var attrib = 'ODbL OpenStreetMap, Data: <a href="http://www.overpass-api.de/">OverpassAPI</a>';
var osm = new L.TileLayer('http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {maxZoom: 19, subdomains: 'abc', attribution: attrib, detectRetina: true});
var attrib = 'ODbL OpenStreetMap, Data: <a href="//www.overpass-api.de/">OverpassAPI</a>';
var osm = new L.TileLayer('//{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {maxZoom: 19, subdomains: 'abc', attribution: attrib, detectRetina: true});

/* URL_UPDATE */
map.params_url={};
Expand Down
4 changes: 2 additions & 2 deletions main.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<![endif]-->

<script src="js_lang.php?cache=<?php echo $_SESSION['lang'];?>"></script>
<script src="http://code.jquery.com/jquery-2.0.2.js">{"parsetags": "explicit"}</script>
<script src="//code.jquery.com/jquery-2.0.2.js">{"parsetags": "explicit"}</script>
<script src="js/bootstrap.min.js"></script>
<script src="js/leaflet.js"></script>
<script src="js/leaflet.markercluster.js"></script>
Expand Down Expand Up @@ -605,7 +605,7 @@
<hr/>
</div>
<div class="modal-body">
<img src="http://www.openstreetmap.org/assets/osm_logo-79d71f6a51b0e6a724a570834c07d828.png" alt="OpenStreetMap Logo"/><br/>
<img src="//www.openstreetmap.org/assets/osm_logo-79d71f6a51b0e6a724a570834c07d828.png" alt="OpenStreetMap Logo"/><br/>
<?php echo POPUP_ABOUT_BODY;?>
</div>
<div class="modal-footer">
Expand Down