Skip to content

Commit

Permalink
fix: 🎨 move code to sperate file, fixed feedback
Browse files Browse the repository at this point in the history
move code to seperate file, ajust widths, render dashes from 16 instead of 14.
  • Loading branch information
tjur0 committed Sep 18, 2022
1 parent b0aea63 commit db89734
Show file tree
Hide file tree
Showing 4 changed files with 72 additions and 72 deletions.
1 change: 0 additions & 1 deletion openstreetmap-carto.lua
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ local linestring_values = {
man_made = {breakwater = true, cutline = true, embankment = true, groyne = true, pipeline = true},
natural = {cliff = true, earth_bank = true, tree_row = true, ridge = true, arete = true},
power = {cable = true, line = true, minor_line = true},
roller_coaster = {track = true},
tourism = {yes = true},
waterway = {canal = true, derelict_canal = true, ditch = true, drain = true, river = true, stream = true, tidal_channel = true, wadi = true, weir = true}
}
Expand Down
4 changes: 3 additions & 1 deletion project.mml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ Stylesheet:
- style/admin.mss
- style/addressing.mss
- style/golf.mss
- style/tourism.mss
Layer:
- id: landcover-low-zoom
geometry: polygon
Expand Down Expand Up @@ -1020,7 +1021,8 @@ Layer:
FROM planet_osm_line
WHERE railway IS NULL
ORDER BY
COALESCE(layer, 0) -- put bottom layered track first
COALESCE(layer, 0), -- put bottom layered track first
ST_Length(way) -- put short track first
) AS roller_coaster
properties:
minzoom: 14
Expand Down
70 changes: 0 additions & 70 deletions style/roads.mss
Original file line number Diff line number Diff line change
Expand Up @@ -3520,76 +3520,6 @@ tertiary is rendered from z10 and is not included in osm_planet_roads. */
}
}

#roller-coaster[roller_coaster = 'track'][zoom >= 14] {
::bridges[bridge = 'yes'] {
line-width: 1 + 2*@casing-width-z14;
line-color: darken(#707070, 20%);
line-join: round;
line-cap: round;
[zoom >= 15] { line-width: 2 + 2*@casing-width-z15; }
[zoom >= 16] { line-width: 3 + 2*@casing-width-z16; }
[zoom >= 17] { line-width: 4.5 + 2*@casing-width-z17; }
[zoom >= 18] { line-width: 6 + 2*@casing-width-z18; }
[zoom >= 19] { line-width: 8 + 2*@casing-width-z19; }
[zoom >= 20] { line-width: 12 + 2*@casing-width-z20; }
}

::background {
line-width: 1;
line-color: #707070;
line-join: round;
line-cap: round;
[zoom >= 15] { line-width: 2; }
[zoom >= 16] { line-width: 3; }
[zoom >= 17] { line-width: 4.5; }
[zoom >= 18] { line-width: 6; }
[zoom >= 19] { line-width: 8; }
[zoom >= 20] { line-width: 12; }
}

line-width: 1;
line-color: #707070;
line-join: round;
b/line-width: 0.5;
b/line-color: @road-fill;
b/line-dasharray: 0,0.1,0.5,0.1;
b/line-join: round;
[tunnel = 'yes'] {
line-color: lighten(#707070, 20%);
b/line-color: lighten(@road-fill, 5%);
}
[zoom >= 15] {
line-width: 2;
b/line-width: 1;
b/line-dasharray: 0,0.2,1,0.2;
}
[zoom >= 16] {
line-width: 3;
b/line-width: 1.5;
b/line-dasharray: 0,0.3,3,0.3;
}
[zoom >= 17] {
line-width: 4.5;
b/line-width: 2.25;
b/line-dasharray: 0,0.45,4.5,0.45;
}
[zoom >= 18] {
line-width: 6;
b/line-width: 3;
b/line-dasharray: 0,0.6,6,0.6;
}
[zoom >= 19] {
line-width: 8;
b/line-width: 4;
b/line-dasharray: 0,0.8,8,0.8;
}
[zoom >= 20] {
line-width: 12;
b/line-width: 6;
b/line-dasharray: 0,1.2,12,1.2;
}
}

#roads-text-ref-low-zoom[zoom < 13] {
[highway = 'motorway'][zoom >= 10],
[highway = 'trunk'][zoom >= 11],
Expand Down
69 changes: 69 additions & 0 deletions style/tourism.mss
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
/* For tourism features like roller coasters */

@track-casing: #707070;
@track-fill: #ddd;

#roller-coaster[roller_coaster = 'track'][zoom >= 14] {
::bridges[bridge = 'yes'] {
line-width: 0.5 + 2*@casing-width-z14;
line-color: darken(@track-casing, 20%);
line-join: round;
line-cap: round;
[zoom >= 15] { line-width: 1 + 2*@casing-width-z15; }
[zoom >= 16] { line-width: 2.5 + 2*@casing-width-z16; }
[zoom >= 17] { line-width: 4 + 2*@casing-width-z17; }
[zoom >= 18] { line-width: 6 + 2*@casing-width-z18; }
[zoom >= 19] { line-width: 8 + 2*@casing-width-z19; }
[zoom >= 20] { line-width: 12 + 2*@casing-width-z20; }
}

::casing {
line-width: 0.5;
line-color: @track-casing;
line-join: round;
line-cap: round;
[zoom >= 15] { line-width: 1; }
[zoom >= 16] { line-width: 2.5; }
[zoom >= 17] { line-width: 4; }
[zoom >= 18] { line-width: 6; }
[zoom >= 19] { line-width: 8; }
[zoom >= 20] { line-width: 12; }
}

line-width: 0.5;
line-color: mix(@track-casing, @track-fill, 50%);
line-join: round;
[tunnel = 'yes'][zoom >= 16] {
line-color: lighten(#707070, 20%);
b/line-color: lighten(@track-fill, 5%);
}
[zoom >= 15] { line-width: 1; }
[zoom >= 16] {
line-color: @track-casing;
line-width: 2.5;
b/line-color: @track-fill;
b/line-join: round;
b/line-width: 1.25;
b/line-dasharray: 2.5,0.5;
}
[zoom >= 17] {
line-width: 4;
b/line-width: 2;
b/line-dasharray: 4,0.8;
}
[zoom >= 18] {
line-width: 6;
b/line-width: 3;
b/line-dasharray: 6,1.2;
}
[zoom >= 19] {
line-width: 8;
b/line-width: 4;
b/line-dasharray: 8,1.6;
}
[zoom >= 20] {
line-width: 12;
b/line-width: 6;
b/line-dasharray: 12,2.4;
}
}

0 comments on commit db89734

Please sign in to comment.