Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
@dch0ph
dch0ph committed Nov 26, 2023
2 parents bfc49d0 + 9d3db81 commit 2646c3d
Show file tree
Hide file tree
Showing 4 changed files with 103 additions and 44 deletions.
17 changes: 9 additions & 8 deletions project.mml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -623,14 +623,15 @@ Layer:
JOIN planet_osm_line l
ON ST_DWithin(p.way, l.way, 0.1) -- Assumes Mercator
JOIN (VALUES
('primary', 1),
('secondary', 2),
('tertiary', 3),
('unclassified', 4),
('residential', 5),
('living_street', 6),
('service', 7),
('track', 8)
('trunk', 1),
('primary', 2),
('secondary', 3),
('tertiary', 4),
('unclassified', 5),
('residential', 6),
('living_street', 7),
('service', 8),
('track', 9)
) AS v (highway, prio)
ON v.highway = l.highway
WHERE p.highway IN (
Expand Down
82 changes: 63 additions & 19 deletions style/roads.mss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2780,21 +2780,42 @@ tertiary is rendered from z10 and is not included in osm_planet_roads. */
}

#turning-circle-casing {
[int_tc_type = 'trunk'][zoom >= 15] {
marker-fill: @trunk-casing;
marker-width: @trunk-width-z15 * 1.6 + 2 * @major-casing-width-z15;
marker-height: @trunk-width-z15 * 1.6 + 2 * @major-casing-width-z15;
[zoom >= 17] {
marker-width: @trunk-width-z17 * 1.6 + 2 * @major-casing-width-z17;
marker-height: @trunk-width-z17 * 1.6 + 2 * @major-casing-width-z17;
}
[zoom >= 18] {
marker-width: @trunk-width-z18 * 1.6 + 2 * @major-casing-width-z18;
marker-height: @trunk-width-z18 * 1.6 + 2 * @major-casing-width-z18;
}
[zoom >= 19] {
marker-width: @trunk-width-z19 * 1.6 + 2 * @major-casing-width-z19;
marker-height: @trunk-width-z19 * 1.6 + 2 * @major-casing-width-z19;
}
marker-allow-overlap: true;
marker-ignore-placement: true;
marker-line-width: 0;
}

[int_tc_type = 'primary'][zoom >= 15] {
marker-fill: @primary-casing;
marker-width: @primary-width-z15 * 1.6 + 2 * @casing-width-z15;
marker-height: @primary-width-z15 * 1.6 + 2 * @casing-width-z15;
marker-width: @primary-width-z15 * 1.6 + 2 * @major-casing-width-z15;
marker-height: @primary-width-z15 * 1.6 + 2 * @major-casing-width-z15;
[zoom >= 17] {
marker-width: @primary-width-z17 * 1.6 + 2 * @casing-width-z17;
marker-height: @primary-width-z17 * 1.6 + 2 * @casing-width-z17;
marker-width: @primary-width-z17 * 1.6 + 2 * @major-casing-width-z17;
marker-height: @primary-width-z17 * 1.6 + 2 * @major-casing-width-z17;
}
[zoom >= 18] {
marker-width: @primary-width-z18 * 1.6 + 2 * @casing-width-z18;
marker-height: @primary-width-z18 * 1.6 + 2 * @casing-width-z18;
marker-width: @primary-width-z18 * 1.6 + 2 * @major-casing-width-z18;
marker-height: @primary-width-z18 * 1.6 + 2 * @major-casing-width-z18;
}
[zoom >= 19] {
marker-width: @primary-width-z19 * 1.6 + 2 * @casing-width-z19;
marker-height: @primary-width-z19 * 1.6 + 2 * @casing-width-z19;
marker-width: @primary-width-z19 * 1.6 + 2 * @major-casing-width-z19;
marker-height: @primary-width-z19 * 1.6 + 2 * @major-casing-width-z19;
}
marker-allow-overlap: true;
marker-ignore-placement: true;
Expand All @@ -2803,23 +2824,23 @@ tertiary is rendered from z10 and is not included in osm_planet_roads. */

[int_tc_type = 'secondary'][zoom >= 15] {
marker-fill: @secondary-casing;
marker-width: @secondary-width-z15 * 1.6 + 2 * @casing-width-z15;
marker-height: @secondary-width-z15 * 1.6 + 2 * @casing-width-z15;
marker-width: @secondary-width-z15 * 1.6 + 2 * @secondary-casing-width-z15;
marker-height: @secondary-width-z15 * 1.6 + 2 * @secondary-casing-width-z15;
[zoom >= 16] {
marker-width: @secondary-width-z16 * 1.6 + 2 * @casing-width-z16;
marker-height: @secondary-width-z16 * 1.6 + 2 * @casing-width-z16;
marker-width: @secondary-width-z16 * 1.6 + 2 * @secondary-casing-width-z16;
marker-height: @secondary-width-z16 * 1.6 + 2 * @secondary-casing-width-z16;
}
[zoom >= 17] {
marker-width: @secondary-width-z17 * 1.6 + 2 * @casing-width-z17;
marker-height: @secondary-width-z17 * 1.6 + 2 * @casing-width-z17;
marker-width: @secondary-width-z17 * 1.6 + 2 * @secondary-casing-width-z17;
marker-height: @secondary-width-z17 * 1.6 + 2 * @secondary-casing-width-z17;
}
[zoom >= 18] {
marker-width: @secondary-width-z18 * 1.6 + 2 * @casing-width-z18;
marker-height: @secondary-width-z18 * 1.6 + 2 * @casing-width-z18;
marker-width: @secondary-width-z18 * 1.6 + 2 * @secondary-casing-width-z18;
marker-height: @secondary-width-z18 * 1.6 + 2 * @secondary-casing-width-z18;
}
[zoom >= 19] {
marker-width: @secondary-width-z19 * 1.6 + 2 * @casing-width-z19;
marker-height: @secondary-width-z19 * 1.6 + 2 * @casing-width-z19;
marker-width: @secondary-width-z19 * 1.6 + 2 * @secondary-casing-width-z19;
marker-height: @secondary-width-z19 * 1.6 + 2 * @secondary-casing-width-z19;
}
marker-allow-overlap: true;
marker-ignore-placement: true;
Expand Down Expand Up @@ -2946,6 +2967,27 @@ tertiary is rendered from z10 and is not included in osm_planet_roads. */
}

#turning-circle-fill {
[int_tc_type = 'trunk'][zoom >= 15] {
marker-fill: @trunk-fill;
marker-width: @trunk-width-z15 * 1.6;
marker-height: @trunk-width-z15 * 1.6;
[zoom >= 17] {
marker-width: @trunk-width-z17 * 1.6;
marker-height: @trunk-width-z17 * 1.6;
}
[zoom >= 18] {
marker-width: @trunk-width-z18 * 1.6;
marker-height: @trunk-width-z18 * 1.6;
}
[zoom >= 19] {
marker-width: @trunk-width-z19 * 1.6;
marker-height: @trunk-width-z19 * 1.6;
}
marker-allow-overlap: true;
marker-ignore-placement: true;
marker-line-width: 0;
}

[int_tc_type = 'primary'][zoom >= 15] {
marker-fill: @primary-fill;
marker-width: @primary-width-z15 * 1.6;
Expand Down Expand Up @@ -3131,9 +3173,11 @@ tertiary is rendered from z10 and is not included in osm_planet_roads. */
marker-ignore-placement: true;
marker-line-width: 0;

[int_tc_type = 'trunk'] { marker-fill: @trunk-casing; }
[int_tc_type = 'primary'] { marker-fill: @primary-casing; }
[int_tc_type = 'secondary'] { marker-fill: @secondary-casing; }
[int_tc_type = 'tertiary'] { marker-fill: @primary-casing; }
[int_tc_type = 'tertiary'] { marker-fill: @tertiary-casing; }
[int_tc_type = 'unclassified'] { marker-fill: @residential-casing; }
[int_tc_type = 'residential'] { marker-fill: @residential-casing; }
[int_tc_type = 'living_street'] { marker-fill: @living-street-casing; }
[int_tc_type = 'service'] { marker-fill: @service-casing; }
Expand Down
14 changes: 7 additions & 7 deletions style/tourism.mss
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* For tourism features like roller coasters */

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

/* The purpose of “roller-coaster-gap-fill” layer is to fill in the gaps between sections of roller coaster track. */
#roller-coaster-gap-fill[zoom >= 15] {
Expand All @@ -27,14 +27,14 @@

::casing {
line-width: 1;
line-color: mix(@track-casing, @track-fill, 50%);
line-color: mix(@roller-coaster-casing, @roller-coaster-fill, 50%);
line-join: round;

[tunnel = 'yes'][zoom >= 16] {
line-color: lighten(@track-casing, 20%);
line-color: lighten(@roller-coaster-casing, 20%);
}
[zoom >= 16] {
line-color: @track-casing;
line-color: @roller-coaster-casing;
line-width: 2.5;
}
[zoom >= 17] { line-width: 4; }
Expand All @@ -45,11 +45,11 @@

::fill[zoom >= 16] {
line-width: 1.25;
line-color: @track-fill;
line-color: @roller-coaster-fill;
line-join: round;

[tunnel = 'yes'] {
line-color: lighten(@track-fill, 5%);
line-color: lighten(@roller-coaster-fill, 5%);
}
[zoom >= 17] { line-width: 2; }
[zoom >= 18] { line-width: 3; }
Expand Down
34 changes: 24 additions & 10 deletions style/water.mss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -289,30 +289,24 @@
[feature = 'natural_water'],
[feature = 'landuse_reservoir'],
[feature = 'landuse_basin'],
[feature = 'waterway_dock'],
[feature = 'natural_strait'],
[feature = 'natural_bay'] {
[feature = 'waterway_dock'] {
[zoom >= 5][way_pixels > 3000][way_pixels <= 768000],
[zoom >= 14][way_pixels <= 768000][feature = 'natural_bay'],
[zoom >= 14][way_pixels <= 768000][feature = 'natural_strait'],
[zoom >= 17][way_pixels <= 768000] {
text-name: "[name]";
text-size: 10;
text-wrap-width: 25; // 2.5 em
text-line-spacing: -1.5; // -0.15 em
[way_pixels > 12000][feature != 'natural_strait'][feature != 'natural_bay'],
[zoom >= 15][feature = 'natural_strait'],
[zoom >= 15][feature = 'natural_bay'] {
[way_pixels > 12000] {
text-size: 12;
text-wrap-width: 37; // 3.1 em
text-line-spacing: -1.6; // -0.13 em
}
[way_pixels > 48000][feature != 'natural_strait'][feature != 'natural_bay'] {
[way_pixels > 48000] {
text-size: 15;
text-wrap-width: 59; // 3.9 em
text-line-spacing: -1.5; // -0.10 em
}
[way_pixels > 192000][feature != 'natural_strait'][feature != 'natural_bay'] {
[way_pixels > 192000] {
text-size: 19;
text-wrap-width: 95; // 5.0 em
text-line-spacing: -0.95; // -0.05 em
Expand All @@ -325,3 +319,23 @@
}
}
}

#text-point[zoom >= 14] {
[feature = 'natural_bay'],
[feature = 'natural_strait'] {
text-name: "[name]";
text-size: 10;
text-wrap-width: 25; // 2.5 em
text-line-spacing: -1.5; // -0.15 em
text-fill: @water-text;
text-face-name: @oblique-fonts;
text-halo-radius: @standard-halo-radius;
text-halo-fill: @standard-halo-fill;
text-placement: interior;
[zoom >= 15] {
text-size: 12;
text-wrap-width: 37; // 3.1 em
text-line-spacing: -1.6; // -0.13 em
}
}
}

0 comments on commit 2646c3d

Please sign in to comment.