CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-02-14 01:33:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix sourcetag regression

Browse Source
This commit is contained in:
Tom MacWright
2013-02-06 17:34:41 -05:00
parent e868c071ac
commit 4b5dcd054e
3 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
css/app.css
View File

@@ -93,7 +93,6 @@ a:hover {
color:#597be7;
}
textarea,
input[type=text] {
background-color: white;

5
js/id/ui.js
View File

@@ -161,8 +161,9 @@ iD.ui = function(context) {
var imagery = linkList.append('li').attr('id', 'attribution');
imagery.append('span').text('imagery');
imagery.append('a').attr('target', '_blank')
.attr('href', 'http://opengeodata.org/microsoft-imagery-details').text(' provided by bing');
imagery
.append('span')
.attr('class', 'provided-by');
linkList.append('li').attr('class', 'source-switch').append('a').attr('href', '#')
.text('dev')

24
js/id/ui/layerswitcher.js
View File

@@ -38,7 +38,7 @@ iD.ui.layerswitcher = function(context) {
selection.on('click.layerswitcher-inside', function() {
return d3.event.stopPropagation();
});
d3.select('body').on('click.layerswitcher-outside', hide);
context.container().on('click.layerswitcher-outside', hide);
}
var opa = content
@@ -76,16 +76,28 @@ iD.ui.layerswitcher = function(context) {
.style('opacity', String);
// Make sure there is an active selection by default
d3.select('.opacity-options li:nth-child(2)').classed('selected', true);
opa.select('.opacity-options li:nth-child(2)').classed('selected', true);
function selectLayer(d) {
content.selectAll('a.layer')
.classed('selected', function(d) {
return d === context.background().source();
});
d3.select('#attribution a')
.attr('href', d.data.link)
.text('provided by ' + d.data.name);
var provided_by = context.container().select('#attribution .provided-by')
.html('');
if (d.data.terms_url) {
provided_by.append('a')
.attr('href', (d.data.terms_url || ''))
.classed('disabled', !d.data.terms_url)
.text(' provided by ' + (d.data.sourcetag || d.data.name));
} else {
provided_by
.text(' provided by ' + (d.data.sourcetag || d.data.name));
}
}
function clickSetSource(d) {
@@ -96,7 +108,7 @@ iD.ui.layerswitcher = function(context) {
d = configured;
}
context.background().source(d);
context.history().imagery_used(d.name);
context.history().imagery_used(d.data.sourcetag || d.data.name);
context.redraw();
selectLayer(d);
}