From e01d2e611ff26fa448177b7382010a89fd4965b5 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Thu, 21 Mar 2013 12:23:57 -0700 Subject: [PATCH] Display Bing copyrights --- js/id/id.js | 8 +++++++- js/id/renderer/background.js | 5 ++++- js/id/renderer/background_source.js | 12 ++++++++---- js/id/ui.js | 1 - js/id/ui/attribution.js | 26 ++++++++++++++++++++++---- js/id/ui/background.js | 16 +++++----------- 6 files changed, 46 insertions(+), 22 deletions(-) diff --git a/js/id/id.js b/js/id/id.js index d6696ca02..8048175e9 100644 --- a/js/id/id.js +++ b/js/id/id.js @@ -102,7 +102,13 @@ window.iD = function () { context.zoomOut = map.zoomOut; /* Background */ - var backgroundSources = iD.data.imagery.map(iD.BackgroundSource.template); + var backgroundSources = iD.data.imagery.map(function(source) { + if (source.sourcetag === 'Bing') { + return iD.BackgroundSource.Bing(source, context.background().dispatch); + } else { + return iD.BackgroundSource.template(source); + } + }); backgroundSources.push(iD.BackgroundSource.Custom); context.backgroundSources = function() { diff --git a/js/id/renderer/background.js b/js/id/renderer/background.js index 9fe8a7378..83ffc31a8 100644 --- a/js/id/renderer/background.js +++ b/js/id/renderer/background.js @@ -168,14 +168,17 @@ iD.Background = function() { } } + background.dispatch = d3.dispatch('change'); + background.source = function(_) { if (!arguments.length) return source; source = _; cache = {}; tile.scaleExtent((source.data && source.data.scaleExtent) || [1, 20]); setHash(source); + background.dispatch.change(); return background; }; - return background; + return d3.rebind(background, background.dispatch, 'on'); }; diff --git a/js/id/renderer/background_source.js b/js/id/renderer/background_source.js index fc644e3ff..d0d3f1197 100644 --- a/js/id/renderer/background_source.js +++ b/js/id/renderer/background_source.js @@ -29,20 +29,22 @@ iD.BackgroundSource.template = function(data) { } generator.data = data; + generator.copyrightNotices = function() {}; return generator; }; -iD.BackgroundSource.Bing = function(data) { +iD.BackgroundSource.Bing = function(data, dispatch) { // http://msdn.microsoft.com/en-us/library/ff701716.aspx // http://msdn.microsoft.com/en-us/library/ff701701.aspx var bing = iD.BackgroundSource.template(data), key = 'Arzdiw4nlOJzRwOz__qailc8NiR31Tt51dN2D7cm57NrnceZnCpgOkmJhNpGoppU', // Same as P2 and JOSM - url = 'http://dev.virtualearth.net/REST/v1/Imagery/Metadata/Aerial?include=ImageryProviders&key=' + key + '&jsonp={callback}'; + url = 'http://dev.virtualearth.net/REST/v1/Imagery/Metadata/Aerial?include=ImageryProviders&key=' + key + '&jsonp={callback}', + providers = []; d3.jsonp(url, function(json) { - bing.providers = json.resourceSets[0].resources[0].imageryProviders.map(function(provider) { + providers = json.resourceSets[0].resources[0].imageryProviders.map(function(provider) { return { attribution: provider.attribution, areas: provider.coverageAreas.map(function(area) { @@ -53,10 +55,12 @@ iD.BackgroundSource.Bing = function(data) { }) }; }); + dispatch.change(); }); bing.copyrightNotices = function(zoom, extent) { - return bing.providers.filter(function(provider) { + zoom = Math.min(zoom, 21); + return providers.filter(function(provider) { return _.any(provider.areas, function(area) { return extent.intersects(area.extent) && area.zoom[0] <= zoom && diff --git a/js/id/ui.js b/js/id/ui.js index 9ecefa26b..b9e73fabd 100644 --- a/js/id/ui.js +++ b/js/id/ui.js @@ -100,7 +100,6 @@ iD.ui = function(context) { linkList.append('li') .attr('class', 'attribution') .attr('tabindex', -1) - .data([context.background().source()]) .call(iD.ui.Attribution(context)); linkList.append('li') diff --git a/js/id/ui/attribution.js b/js/id/ui/attribution.js index c986206c6..4cc50b48c 100644 --- a/js/id/ui/attribution.js +++ b/js/id/ui/attribution.js @@ -1,6 +1,8 @@ iD.ui.Attribution = function(context) { - return function attribution(selection) { - var d = selection.data()[0]; + var selection; + + function update() { + var d = context.background().source(); var provided_by = selection .html('') @@ -10,13 +12,11 @@ iD.ui.Attribution = function(context) { if (!d) return; var source = d.data.sourcetag || d.data.name; - if (d.data.logo) { source = '' } var desc = t('imagery.provided_by', {source: source}); - if (d.data.terms_url) { provided_by.append('a') .attr('href', d.data.terms_url) @@ -25,5 +25,23 @@ iD.ui.Attribution = function(context) { } else { provided_by.text(desc); } + + var copyright = d.copyrightNotices(context.map().zoom(), context.map().extent()); + if (copyright) { + provided_by.append('span') + .text(copyright); + } + } + + return function(select) { + selection = select; + + context.background() + .on('change.attribution', update); + + context.map() + .on('move.attribution', _.throttle(update, 400)); + + update(); }; }; diff --git a/js/id/ui/background.js b/js/id/ui/background.js index b97ff1274..2e92ba0c0 100644 --- a/js/id/ui/background.js +++ b/js/id/ui/background.js @@ -1,6 +1,5 @@ iD.ui.Background = function(context) { - var event = d3.dispatch('cancel', 'save'), - key = 'b', + var key = 'b', opacities = [1, 0.5, 0], directions = [ ['left', [1, 0]], @@ -57,16 +56,11 @@ iD.ui.Background = function(context) { } } - function selectLayer(d) { + function selectLayer() { content.selectAll('a.layer') .classed('selected', function(d) { return d.data.name === context.background().source().data.name; }); - - context.container() - .select('.attribution') - .data([d]) - .call(iD.ui.Attribution(context)); } function clickSetSource(d) { @@ -85,7 +79,7 @@ iD.ui.Background = function(context) { .imagery_used(d.data.sourcetag || d.data.name); } context.redraw(); - selectLayer(d); + selectLayer(); } function clickGpx(d) { @@ -139,7 +133,7 @@ iD.ui.Background = function(context) { layerLinks.exit() .remove(); - selectLayer(context.background().source()); + selectLayer(); } function clickNudge(d) { @@ -289,5 +283,5 @@ iD.ui.Background = function(context) { .call(keybinding); } - return d3.rebind(background, event, 'on'); + return background; };