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

Render bridge casing for bridge=viaduct, etc.

Browse Source 
Fixes #1500.
This commit is contained in:
John Firebaugh
2013-05-20 16:49:55 -07:00
parent 2631accdb3
commit bd2c7ba756
3 changed files with 27 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
css/map.css
View File

@@ -646,24 +646,24 @@ path.fill.tag-aeroway-apron {
/* bridges */
path.casing.tag-bridge-yes {
path.casing.tag-bridge {
stroke-width: 14;
stroke-opacity: 0.5;
stroke: #000;
}
path.casing.tag-highway-living_street.tag-bridge-yes,
path.casing.tag-highway-path.tag-bridge-yes {
path.casing.tag-highway-living_street.tag-bridge,
path.casing.tag-highway-path.tag-bridge {
stroke-width: 6;
}
path.casing.line.tag-highway-pedestrian,
path.casing.tag-highway-service.tag-bridge-yes,
path.casing.tag-highway-track.tag-bridge-yes,
path.casing.tag-highway-steps.tag-bridge-yes,
path.casing.tag-highway-footway.tag-bridge-yes,
path.casing.tag-highway-cycleway.tag-bridge-yes,
path.casing.tag-highway-bridleway.tag-bridge-yes {
path.casing.tag-highway-service.tag-bridge,
path.casing.tag-highway-track.tag-bridge,
path.casing.tag-highway-steps.tag-bridge,
path.casing.tag-highway-footway.tag-bridge,
path.casing.tag-highway-cycleway.tag-bridge,
path.casing.tag-highway-bridleway.tag-bridge {
stroke-width: 8;
}
@@ -671,25 +671,25 @@ path.shadow.tag-highway-residential.tag-bridge {
stroke-width:22;
}
path.shadow.tag-highway-living_street.tag-bridge-yes,
path.shadow.tag-highway-path.tag-bridge-yes,
path.shadow.tag-highway-living_street.tag-bridge,
path.shadow.tag-highway-path.tag-bridge,
path.shadow.line.tag-highway-pedestrian,
path.shadow.tag-highway-service.tag-bridge-yes,
path.shadow.tag-highway-track.tag-bridge-yes,
path.shadow.tag-highway-steps.tag-bridge-yes,
path.shadow.tag-highway-footway.tag-bridge-yes,
path.shadow.tag-highway-cycleway.tag-bridge-yes,
path.shadow.tag-highway-bridleway.tag-bridge-yes {
path.shadow.tag-highway-service.tag-bridge,
path.shadow.tag-highway-track.tag-bridge,
path.shadow.tag-highway-steps.tag-bridge,
path.shadow.tag-highway-footway.tag-bridge,
path.shadow.tag-highway-cycleway.tag-bridge,
path.shadow.tag-highway-bridleway.tag-bridge {
stroke-width: 16;
}
/* tunnels */
path.stroke.tag-highway.tag-tunnel-yes {
path.stroke.tag-highway.tag-tunnel {
stroke-opacity: 0.3;
}
path.casing.tag-highway.tag-tunnel-yes {
path.casing.tag-highway.tag-tunnel {
stroke-opacity: 0.5;
}

2
js/id/svg/tag_classes.js
View File

@@ -18,7 +18,7 @@ iD.svg.TagClasses = function() {
var t = tags(entity);
for (var k in t) {
if (!keys.has(k)) continue;
if (!keys.has(k) || t[k] === 'no') continue;
classes += ' tag-' + k + ' tag-' + k + '-' + t[k];
}

7
test/spec/svg/tag_classes.js
View File

@@ -19,6 +19,13 @@ describe("iD.svg.TagClasses", function () {
expect(selection.attr('class')).to.equal('tag-highway tag-highway-primary');
});
it('adds no bridge=no tags', function() {
selection
.datum(iD.Entity({tags: {bridge: 'no'}}))
.call(iD.svg.TagClasses());
expect(selection.attr('class')).to.equal(null);
});
it('adds tags based on the result of the `tags` accessor', function() {
selection
.datum(iD.Entity())