Skip to content

Commit

Permalink
fix merge errors in #3750 and restore functionality as intended by th…
Browse files Browse the repository at this point in the history
…e PR (#4841)
  • Loading branch information
imagico authored Nov 24, 2023
1 parent 2f23896 commit 9d3db81
Showing 1 changed file with 24 additions and 10 deletions.
34 changes: 24 additions & 10 deletions style/water.mss
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 9d3db81

Please sign in to comment.