diff --git a/js/id/renderer/background_source.js b/js/id/renderer/background_source.js index f7ed5a13d17..609eaacc434 100644 --- a/js/id/renderer/background_source.js +++ b/js/id/renderer/background_source.js @@ -117,7 +117,7 @@ iD.BackgroundSource.Bing = function(data, dispatch) { }; bing.logo = 'bing_maps.png'; - bing.terms_url = 'http://opengeodata.org/microsoft-imagery-details'; + bing.terms_url = 'https://blog.openstreetmap.org/2010/11/30/microsoft-imagery-details'; return bing; }; diff --git a/js/id/renderer/mapillary_layer.js b/js/id/renderer/mapillary_layer.js index 463ec0988ba..437b89f1534 100644 --- a/js/id/renderer/mapillary_layer.js +++ b/js/id/renderer/mapillary_layer.js @@ -16,7 +16,7 @@ iD.MapillaryLayer = function (context) { .attr('src', 'https://d1cuyjsrcm0gby.cloudfront.net/' + image.key + '/thumb-320.jpg'); div.selectAll('a') - .attr('href', 'http://mapillary.com/map/im/' + image.key); + .attr('href', 'https://mapillary.com/map/im/' + image.key); } function hide() { diff --git a/js/id/ui.js b/js/id/ui.js index 986decc6400..36e847793fa 100644 --- a/js/id/ui.js +++ b/js/id/ui.js @@ -123,7 +123,7 @@ iD.ui = function(context) { .append('a') .attr('target', '_blank') .attr('tabindex', -1) - .attr('href', 'http://github.com/openstreetmap/iD') + .attr('href', '//github.com/openstreetmap/iD') .text(iD.version); var issueLinks = aboutList.append('li'); diff --git a/js/id/ui/feature_list.js b/js/id/ui/feature_list.js index ba1c8e3db40..cf3b8eef511 100644 --- a/js/id/ui/feature_list.js +++ b/js/id/ui/feature_list.js @@ -245,7 +245,7 @@ iD.ui.FeatureList = function(context) { function geocode() { var searchVal = encodeURIComponent(search.property('value')); - d3.json('http://nominatim.openstreetmap.org/search/' + searchVal + '?limit=10&format=json', function(err, resp) { + d3.json('https://nominatim.openstreetmap.org/search/' + searchVal + '?limit=10&format=json', function(err, resp) { geocodeResults = resp || []; drawList(); }); diff --git a/js/id/ui/preset/wikipedia.js b/js/id/ui/preset/wikipedia.js index ecae01cfaa8..4b069cc2b51 100644 --- a/js/id/ui/preset/wikipedia.js +++ b/js/id/ui/preset/wikipedia.js @@ -128,13 +128,13 @@ iD.ui.preset.wikipedia = function(field, context) { anchor = anchor.replace(/ /g, '_'); } } - link.attr('href', 'http://' + m[1] + '.wikipedia.org/wiki/' + + link.attr('href', 'https://' + m[1] + '.wikipedia.org/wiki/' + m[2].replace(/ /g, '_') + (anchor ? ('#' + anchor) : '')); // unrecognized value format } else { title.value(value); - link.attr('href', 'http://en.wikipedia.org/wiki/Special:Search?search=' + value); + link.attr('href', 'https://en.wikipedia.org/wiki/Special:Search?search=' + value); } }; diff --git a/js/id/ui/tag_reference.js b/js/id/ui/tag_reference.js index 2d686004963..2e027f81173 100644 --- a/js/id/ui/tag_reference.js +++ b/js/id/ui/tag_reference.js @@ -69,7 +69,7 @@ iD.ui.TagReference = function(tag, context) { body .append('a') .attr('target', '_blank') - .attr('href', 'http://wiki.openstreetmap.org/wiki/' + docs.title) + .attr('href', 'https://wiki.openstreetmap.org/wiki/' + docs.title) .call(iD.svg.Icon('#icon-out-link', 'inline')) .append('span') .text(t('inspector.reference')); diff --git a/test/spec/ui/preset/wikipedia.js b/test/spec/ui/preset/wikipedia.js index e74757e1040..f90ab6e09e1 100644 --- a/test/spec/ui/preset/wikipedia.js +++ b/test/spec/ui/preset/wikipedia.js @@ -12,7 +12,7 @@ describe('iD.ui.preset.wikipedia', function() { wikipedia.tags({wikipedia: 'en:Title'}); expect(selection.selectAll('.wiki-lang').value()).to.equal('English'); expect(selection.selectAll('.wiki-title').value()).to.equal('Title'); - expect(selection.selectAll('.wiki-link').attr('href')).to.equal('http://en.wikipedia.org/wiki/Title'); + expect(selection.selectAll('.wiki-link').attr('href')).to.equal('https://en.wikipedia.org/wiki/Title'); }); it('sets a new value', function() {