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

Add configurable image path

Browse Source
This commit is contained in:
John Firebaugh
2013-04-16 17:18:17 -07:00
parent 7403b9b9e8
commit 77ce20c8c1
12 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/id/id.js
+8
View File
@@ -155,6 +155,14 @@ window.iD = function () {
return context;
};
var imagePath = 'img/';
context.imagePath = function(_) {
if (!arguments.length) return imagePath;
if (/\.(png|gif|svg)$/.test(_)) return imagePath + _;
imagePath = _;
return context;
};
return d3.rebind(context, dispatch, 'on');
};
js/id/renderer/map.js
+1 -1
View File
@@ -48,7 +48,7 @@ iD.Map = function(context) {
if (resetTransform()) redraw();
})
.attr('id', 'surface')
.call(iD.svg.Surface());
.call(iD.svg.Surface(context));
map.size(selection.size());
map.surface = surface;
js/id/svg/surface.js
+4 -4
View File
@@ -1,4 +1,4 @@
iD.svg.Surface = function() {
iD.svg.Surface = function(context) {
function findStylesheet(name) {
return _.find(document.styleSheets, function(stylesheet) {
return stylesheet.href && stylesheet.href.indexOf(name) > 0;
@@ -88,7 +88,7 @@ iD.svg.Surface = function() {
width: 32,
height: 32
})
.attr('xlink:href', function(d) { return 'img/pattern/' + d[1] + '.png'; });
.attr('xlink:href', function(d) { return context.imagePath('pattern/' + d[1] + '.png'); });
defs.selectAll()
.data([12, 18, 20])
@@ -102,7 +102,7 @@ iD.svg.Surface = function() {
defs.append('image')
.attr('id', 'sprite')
.attr('xlink:href', 'img/sprite.svg')
.attr('xlink:href', context.imagePath('sprite.svg'))
.call(autosize);
defs.selectAll()
@@ -114,7 +114,7 @@ iD.svg.Surface = function() {
defs.append('image')
.attr('id', 'maki-sprite')
.attr('xlink:href', 'img/feature-icons.png')
.attr('xlink:href', context.imagePath('feature-icons.png'))
.call(autosize);
defs.selectAll()
js/id/ui/attribution.js
+1 -1
View File
@@ -17,7 +17,7 @@ iD.ui.Attribution = function(context) {
var source = d.data.sourcetag || d.data.name;
if (d.data.logo) {
source = '<img class="source-image" src="img/' + d.data.logo + '">';
source = '<img class="source-image" src="' + context.imagePath(d.data.logo) + '">';
}
if (d.data.terms_url) {
js/id/ui/loading.js
+1 -1
View File
@@ -8,7 +8,7 @@ iD.ui.loading = function(selection, message, blocking) {
loadertext.append('img')
.attr('class', 'loader')
.attr('src', 'img/loader-white.gif');
.attr('src', context.imagePath('loader-white.gif'));
loadertext.append('h3')
.text(message || '');
js/id/ui/spinner.js
+1 -1
View File
@@ -3,7 +3,7 @@ iD.ui.Spinner = function(context) {
return function(selection) {
var img = selection.append('img')
.attr('src', 'img/loader-black.gif')
.attr('src', context.imagePath('loader-black.gif'))
.style('opacity', 0);
connection.on('loading.spinner', function() {
test/rendering.html
+4 -4
View File
@@ -123,7 +123,7 @@
.attr('width', 30)
.attr('height', 40)
.attr('data-zoom', function (d) { return d.zoom; })
.call(iD.svg.Surface())
.call(iD.svg.Surface(context))
.each(function (d) {
var n = node.update({tags: d}),
graph = iD.Graph([n]);
@@ -191,7 +191,7 @@
.attr('width', 30)
.attr('height', 30)
.attr('data-zoom', function (d) { return d.zoom; })
.call(iD.svg.Surface())
.call(iD.svg.Surface(context))
.each(function (d) {
var n = node.update({tags: d.tags}),
graph = iD.Graph([n, way]);
@@ -279,7 +279,7 @@
.attr('width', 200)
.attr('height', 30)
.attr('data-zoom', function (d) { return d.zoom; })
.call(iD.svg.Surface())
.call(iD.svg.Surface(context))
.each(function (d) {
var highway = way.update({tags: d.tags}),
graph = iD.Graph([a, b, highway]);
@@ -340,7 +340,7 @@
.append('svg')
.attr('width', 100)
.attr('height', 100)
.call(iD.svg.Surface())
.call(iD.svg.Surface(context))
.each(function (datum) {
var area = way.update({tags: datum.tags}),
graph = iD.Graph([a, b, c, d, area]);
test/spec/svg/areas.js
+1 -1
View File
@@ -5,7 +5,7 @@ describe("iD.svg.Areas", function () {
beforeEach(function () {
surface = d3.select(document.createElementNS('http://www.w3.org/2000/svg', 'svg'))
.call(iD.svg.Surface());
.call(iD.svg.Surface(iD()));
});
it("adds way and area classes", function () {
test/spec/svg/lines.js
+1 -1
View File
@@ -6,7 +6,7 @@ describe("iD.svg.Lines", function () {
beforeEach(function () {
surface = d3.select(document.createElementNS('http://www.w3.org/2000/svg', 'svg'))
.call(iD.svg.Surface());
.call(iD.svg.Surface(iD()));
});
it("adds way and area classes", function () {
test/spec/svg/midpoints.js
+1 -1
View File
@@ -5,7 +5,7 @@ describe("iD.svg.Midpoints", function () {
beforeEach(function () {
surface = d3.select(document.createElementNS('http://www.w3.org/2000/svg', 'svg'))
.call(iD.svg.Surface());
.call(iD.svg.Surface(iD()));
});
it("finds the location of the midpoints", function () {
test/spec/svg/points.js
+1 -1
View File
@@ -7,7 +7,7 @@ describe("iD.svg.Points", function () {
beforeEach(function () {
context = iD();
surface = d3.select(document.createElementNS('http://www.w3.org/2000/svg', 'svg'))
.call(iD.svg.Surface());
.call(iD.svg.Surface(iD()));
});
it("adds tag classes", function () {
test/spec/svg/vertices.js
+1 -1
View File
@@ -7,7 +7,7 @@ describe("iD.svg.Vertices", function () {
beforeEach(function () {
context = iD();
surface = d3.select(document.createElementNS('http://www.w3.org/2000/svg', 'svg'))
.call(iD.svg.Surface());
.call(iD.svg.Surface(iD()));
});
it("adds tag classes", function () {