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

Namespace various internal SVG ids under ideditor (re: #7445)

Browse Source
This commit is contained in:
Quincy Morgan
2020-03-22 14:39:40 -07:00
parent 1b3f4e0470
commit e391edcc5c
9 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
css/80_app.css
+1 -1
View File
@@ -54,7 +54,7 @@ body {
transition-duration: 200ms;
}
#defs {
#ideditor-defs {
/* Can't be display: none or the clippaths are ignored. */
position: absolute;
width: 0;
modules/svg/areas.js
+3 -3
View File
@@ -12,7 +12,7 @@ export function svgAreas(projection, context) {
function getPatternStyle(tags) {
var imageID = svgTagPattern(tags);
if (imageID) {
return 'url("#' + imageID + '")';
return 'url("#ideditor-' + imageID + '")';
}
return '';
}
@@ -134,7 +134,7 @@ export function svgAreas(projection, context) {
var clipPathsEnter = clipPaths.enter()
.append('clipPath')
.attr('class', 'clipPath-osm')
.attr('id', function(entity) { return entity.id + '-clippath'; });
.attr('id', function(entity) { return 'ideditor-' + entity.id + '-clippath'; });
clipPathsEnter
.append('path');
@@ -183,7 +183,7 @@ export function svgAreas(projection, context) {
this.setAttribute('class', entity.type + ' area ' + layer + ' ' + entity.id);
if (layer === 'fill') {
this.setAttribute('clip-path', 'url(#' + entity.id + '-clippath)');
this.setAttribute('clip-path', 'url(#ideditor-' + entity.id + '-clippath)');
this.style.fill = this.style.stroke = getPatternStyle(entity.tags);
}
})
modules/svg/data.js
+1 -1
View File
@@ -150,7 +150,7 @@ export function svgData(projection, context, dispatch) {
function clipPathID(d) {
return 'data-' + d.__featurehash__ + '-clippath';
return 'ideditor-data-' + d.__featurehash__ + '-clippath';
}
modules/svg/defs.js
+6 -6
View File
@@ -16,7 +16,7 @@ export function svgDefs(context) {
// add markers
defs
.append('marker')
.attr('id', 'oneway-marker')
.attr('id', 'ideditor-oneway-marker')
.attr('viewBox', '0 0 10 5')
.attr('refX', 2.5)
.attr('refY', 2.5)
@@ -39,7 +39,7 @@ export function svgDefs(context) {
function addSidedMarker(name, color, offset) {
defs
.append('marker')
.attr('id', 'sided-marker-' + name)
.attr('id', 'ideditor-sided-marker-' + name)
.attr('viewBox', '0 0 2 2')
.attr('refX', 1)
.attr('refY', -offset)
@@ -66,7 +66,7 @@ export function svgDefs(context) {
defs
.append('marker')
.attr('id', 'viewfield-marker')
.attr('id', 'ideditor-viewfield-marker')
.attr('viewBox', '0 0 16 16')
.attr('refX', 8)
.attr('refY', 16)
@@ -85,7 +85,7 @@ export function svgDefs(context) {
defs
.append('marker')
.attr('id', 'viewfield-marker-wireframe')
.attr('id', 'ideditor-viewfield-marker-wireframe')
.attr('viewBox', '0 0 16 16')
.attr('refX', 8)
.attr('refY', 16)
@@ -137,7 +137,7 @@ export function svgDefs(context) {
])
.enter()
.append('pattern')
.attr('id', function (d) { return 'pattern-' + d[0]; })
.attr('id', function (d) { return 'ideditor-pattern-' + d[0]; })
.attr('width', 32)
.attr('height', 32)
.attr('patternUnits', 'userSpaceOnUse');
@@ -165,7 +165,7 @@ export function svgDefs(context) {
.data([12, 18, 20, 32, 45])
.enter()
.append('clipPath')
.attr('id', function (d) { return 'clip-square-' + d; })
.attr('id', function (d) { return 'ideditor-clip-square-' + d; })
.append('rect')
.attr('x', 0)
.attr('y', 0)
modules/svg/labels.js
+2 -2
View File
@@ -111,7 +111,7 @@ export function svgLabels(projection, context) {
paths.enter()
.append('path')
.style('stroke-width', get(labels, 'font-size'))
.attr('id', function(d) { return 'labelpath-' + d.id; })
.attr('id', function(d) { return 'ideditor-labelpath-' + d.id; })
.attr('class', classes)
.merge(paths)
.attr('d', get(labels, 'lineString'));
@@ -140,7 +140,7 @@ export function svgLabels(projection, context) {
.filter(filter)
.data(entities, osmEntity.key)
.attr('startOffset', '50%')
.attr('xlink:href', function(d) { return '#labelpath-' + d.id; })
.attr('xlink:href', function(d) { return '#ideditor-labelpath-' + d.id; })
.text(utilDisplayNameForPath);
}
modules/svg/lines.js
+2 -2
View File
@@ -306,11 +306,11 @@ export function svgLines(projection, context) {
layergroup.selectAll('g.line-stroke-highlighted')
.call(drawLineGroup, 'stroke', true);
addMarkers(layergroup, 'oneway', 'onewaygroup', onewaydata, 'url(#oneway-marker)');
addMarkers(layergroup, 'oneway', 'onewaygroup', onewaydata, 'url(#ideditor-oneway-marker)');
addMarkers(layergroup, 'sided', 'sidedgroup', sideddata,
function marker(d) {
var category = graph.entity(d.id).sidednessIdentifier();
return 'url(#sided-marker-' + category + ')';
return 'url(#ideditor-sided-marker-' + category + ')';
}
);
});
modules/svg/vertices.js
+1 -1
View File
@@ -192,7 +192,7 @@ export function svgVertices(projection, context) {
.attr('class', 'viewfield')
.attr('d', 'M0,0H0')
.merge(viewfields)
.attr('marker-start', 'url(#viewfield-marker' + (wireframe ? '-wireframe' : '') + ')')
.attr('marker-start', 'url(#ideditor-viewfield-marker' + (wireframe ? '-wireframe' : '') + ')')
.attr('transform', function(d) { return 'rotate(' + d + ')'; });
}
modules/ui/init.js
+1 -1
View File
@@ -91,7 +91,7 @@ export function uiInit(context) {
container
.append('svg')
.attr('id', 'defs')
.attr('id', 'ideditor-defs')
.call(svgDefs(context));
container
test/spec/svg/lines.js
+9 -9
View File
@@ -162,9 +162,9 @@ describe('iD.svgLines', function () {
var selection = surface.selectAll('g.onewaygroup > path');
expect(selection.size()).to.eql(3);
expect(selection.nodes()[0].attributes['marker-mid'].nodeValue).to.eql('url(#oneway-marker)');
expect(selection.nodes()[1].attributes['marker-mid'].nodeValue).to.eql('url(#oneway-marker)');
expect(selection.nodes()[2].attributes['marker-mid'].nodeValue).to.eql('url(#oneway-marker)');
expect(selection.nodes()[0].attributes['marker-mid'].nodeValue).to.eql('url(#ideditor-oneway-marker)');
expect(selection.nodes()[1].attributes['marker-mid'].nodeValue).to.eql('url(#ideditor-oneway-marker)');
expect(selection.nodes()[2].attributes['marker-mid'].nodeValue).to.eql('url(#ideditor-oneway-marker)');
});
it('has two marker layers for alternating oneway ways', function() {
@@ -179,8 +179,8 @@ describe('iD.svgLines', function () {
var selection = surface.selectAll('g.onewaygroup > path');
expect(selection.size()).to.eql(2);
expect(selection.nodes()[0].attributes['marker-mid'].nodeValue).to.eql('url(#oneway-marker)');
expect(selection.nodes()[1].attributes['marker-mid'].nodeValue).to.eql('url(#oneway-marker)');
expect(selection.nodes()[0].attributes['marker-mid'].nodeValue).to.eql('url(#ideditor-oneway-marker)');
expect(selection.nodes()[1].attributes['marker-mid'].nodeValue).to.eql('url(#ideditor-oneway-marker)');
});
it('has no marker layer for oneway=no ways', function() {
@@ -216,10 +216,10 @@ describe('iD.svgLines', function () {
surface.call(iD.svgLines(projection, context), graph, [i_n, i_nc, i_b, i_mm], all);
var selection = surface.selectAll('g.sidedgroup > path');
expect(selection.size()).to.eql(4);
expect(selection.nodes()[0].attributes['marker-mid'].nodeValue).to.eql('url(#sided-marker-natural)');
expect(selection.nodes()[1].attributes['marker-mid'].nodeValue).to.eql('url(#sided-marker-coastline)');
expect(selection.nodes()[2].attributes['marker-mid'].nodeValue).to.eql('url(#sided-marker-barrier)');
expect(selection.nodes()[3].attributes['marker-mid'].nodeValue).to.eql('url(#sided-marker-man_made)');
expect(selection.nodes()[0].attributes['marker-mid'].nodeValue).to.eql('url(#ideditor-sided-marker-natural)');
expect(selection.nodes()[1].attributes['marker-mid'].nodeValue).to.eql('url(#ideditor-sided-marker-coastline)');
expect(selection.nodes()[2].attributes['marker-mid'].nodeValue).to.eql('url(#ideditor-sided-marker-barrier)');
expect(selection.nodes()[3].attributes['marker-mid'].nodeValue).to.eql('url(#ideditor-sided-marker-man_made)');
});
it('has no marker layer for two_sided way', function() {