Support classing of aerialway and piste, and adjust line widths

(closes #5843)
This commit is contained in:
Bryan Housel
2019-02-02 15:32:36 -05:00
parent f1b5efc81a
commit ebdf6431f7
2 changed files with 77 additions and 49 deletions

View File

@@ -1,4 +1,56 @@
/* narrow width miscellanous things */
path.line.shadow.tag-aerialway,
path.line.shadow.tag-attraction-summer_toboggan,
path.line.shadow.tag-attraction-water_slide,
path.line.shadow.tag-man_made-pipeline,
path.line.shadow.tag-natural-tree_row,
path.line.shadow.tag-piste {
stroke-width: 16;
}
path.line.casing.tag-aerialway,
path.line.casing.tag-attraction-summer_toboggan,
path.line.casing.tag-attraction-water_slide,
path.line.casing.tag-man_made-pipeline,
path.line.casing.tag-natural-tree_row,
path.line.casing.tag-piste {
stroke-width: 7;
}
path.line.stroke.tag-aerialway,
path.line.stroke.tag-attraction-summer_toboggan,
path.line.stroke.tag-attraction-water_slide,
path.line.stroke.tag-man_made-pipeline,
path.line.stroke.tag-natural-tree_row,
path.line.stroke.tag-piste {
stroke-width: 5;
}
.low-zoom path.line.shadow.tag-aerialway,
.low-zoom path.line.shadow.tag-attraction-summer_toboggan,
.low-zoom path.line.shadow.tag-attraction-water_slide,
.low-zoom path.line.shadow.tag-man_made-pipeline,
.low-zoom path.line.shadow.tag-natural-tree_row,
.low-zoom path.line.shadow.tag-piste {
stroke-width: 12;
}
.low-zoom path.line.casing.tag-aerialway,
.low-zoom path.line.casing.tag-attraction-summer_toboggan,
.low-zoom path.line.casing.tag-attraction-water_slide,
.low-zoom path.line.casing.tag-man_made-pipeline,
.low-zoom path.line.casing.tag-natural-tree_row,
.low-zoom path.line.casing.tag-piste {
stroke-width: 5;
}
.low-zoom path.line.stroke.tag-aerialway,
.low-zoom path.line.stroke.tag-attraction-summer_toboggan,
.low-zoom path.line.stroke.tag-attraction-water_slide,
.low-zoom path.line.stroke.tag-man_made-pipeline,
.low-zoom path.line.stroke.tag-natural-tree_row,
.low-zoom path.line.stroke.tag-piste {
stroke-width: 3;
}
/* ferry routes */
.preset-icon .icon.tag-route-ferry {
color: #58a9ed;
@@ -24,6 +76,22 @@ path.line.stroke.tag-route-ferry {
}
/* aerialways */
path.line.stroke.tag-aerialway {
stroke: #c55;
}
path.line.casing.tag-aerialway {
stroke: #444;
}
/* pistes */
path.line.stroke.tag-piste {
stroke: #9ac;
}
path.line.casing.tag-piste {
stroke: #444;
}
/* power and pipeline */
.preset-icon .icon.tag-man_made-pipeline,
.preset-icon .icon.tag-power {
@@ -31,6 +99,7 @@ path.line.stroke.tag-route-ferry {
fill: #939393;
}
/* power */
path.line.stroke.tag-power {
stroke: #939393;
@@ -40,21 +109,21 @@ path.line.casing.tag-power {
stroke: none;
}
/* pipeline */
path.line.stroke.tag-man_made-pipeline {
stroke: #cbd0d8;
stroke-linecap: butt;
stroke-width: 3;
stroke-dasharray: 80, 1.25;
}
path.line.casing.tag-man_made-pipeline {
stroke: #666;
stroke-width: 4.5;
}
.low-zoom path.line.stroke.tag-man_made-pipeline {
stroke-dasharray: 40, 1;
}
/* boundaries */
path.line.stroke.tag-boundary {
stroke: #fff;
@@ -73,27 +142,6 @@ path.line.casing.tag-boundary-national_park {
}
/* Tree Rows */
path.line.shadow.tag-natural-tree_row {
stroke-width: 16;
}
path.line.casing.tag-natural-tree_row {
stroke-width: 7;
}
path.line.stroke.tag-natural-tree_row {
stroke-width: 5;
}
.low-zoom path.line.shadow.tag-natural-tree_row {
stroke-width: 12;
}
.low-zoom path.line.casing.tag-natural-tree_row {
stroke-width: 5;
}
.low-zoom path.line.stroke.tag-natural-tree_row {
stroke-width: 3;
}
/* barriers and similar */
path.line.stroke.tag-barrier {
stroke: #ddd;
@@ -416,30 +464,6 @@ path.line.stroke.tag-crossing.tag-crossing-zebra {
}
/* Attractions */
path.line.shadow.tag-attraction-summer_toboggan,
path.line.shadow.tag-attraction-water_slide {
stroke-width: 16;
}
path.line.casing.tag-attraction-summer_toboggan,
path.line.casing.tag-attraction-water_slide {
stroke-width: 7;
}
path.line.stroke.tag-attraction-summer_toboggan,
path.line.stroke.tag-attraction-water_slide {
stroke-width: 5;
}
.low-zoom path.line.shadow.tag-attraction-summer_toboggan,
.low-zoom path.line.shadow.tag-attraction-water_slide {
stroke-width: 12;
}
.low-zoom path.line.casing.tag-attraction-summer_toboggan,
.low-zoom path.line.casing.tag-attraction-water_slide {
stroke-width: 5;
}
.low-zoom path.line.stroke.tag-attraction-summer_toboggan,
.low-zoom path.line.stroke.tag-attraction-water_slide {
stroke-width: 3;
}
path.line.stroke.tag-attraction-summer_toboggan {
stroke: #9e9e9e;
}

View File

@@ -4,8 +4,8 @@ import { osmPavedTags } from '../osm/tags';
export function svgTagClasses() {
var primaries = [
'building', 'highway', 'railway', 'waterway', 'aeroway',
'motorway', 'boundary', 'power', 'amenity', 'natural', 'landuse',
'building', 'highway', 'railway', 'waterway', 'aeroway', 'aerialway',
'piste:type', 'boundary', 'power', 'amenity', 'natural', 'landuse',
'leisure', 'military', 'place', 'man_made', 'route', 'attraction'
];
var statuses = [
@@ -59,6 +59,10 @@ export function svgTagClasses() {
v = t[k];
if (!v || v === 'no') continue;
if (k === 'piste:type') { // avoid a ':' in the class name
k = 'piste';
}
primary = k;
if (statuses.indexOf(v) !== -1) { // e.g. `railway=abandoned`
status = v;