fine-tuning of bridge labels

gravitystorm · Dec 29, 2017 · 3893958 · 3893958
1 parent 3dc9714
commit 3893958
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/project.mml b/project.mml
@@ -1680,6 +1680,7 @@ Layer:
             name
           FROM planet_osm_polygon
           WHERE man_made = 'bridge'
+          ORDER BY way_area DESC
         ) AS bridge_text
     properties:
       minzoom: 11

diff --git a/roads.mss b/roads.mss
@@ -2449,30 +2449,36 @@ tertiary is rendered from z10 and is not included in osm_planet_roads. */
       text-face-name: @book-fonts;
       text-halo-radius: @standard-halo-radius;
       text-halo-fill: @standard-halo-fill;
-      text-min-distance: 2;
+      text-margin: 3; // 0.3 em
       text-wrap-width: 30;
       text-placement: interior;
       [way_pixels > 250] {
         text-size: 11;
+        text-margin: 3.3; // 0.3 em
         text-wrap-width: 33; // 3 em
         text-line-spacing: -1.35; // -0.15 em
+        text-halo-radius: @standard-halo-radius * 1.1;
       }
       [way_pixels > 1000] {
         text-size: 12;
+        text-margin: 3.6; // 0.3 em
         text-wrap-width: 36; // 3 em
         text-line-spacing: -1.65; // -0.15 em
-        text-halo-radius: @standard-halo-radius * 1.5;
+        text-halo-radius: @standard-halo-radius * 1.2;
       }
       [way_pixels > 4000] {
         text-size: 13;
+        text-margin: 3.9; // 0.3 em
         text-wrap-width: 39; // 3 em
         text-line-spacing: -1.80; // -0.15 em
+        text-halo-radius: @standard-halo-radius * 1.3;
       }
       [way_pixels > 16000] {
         text-size: 14;
+        text-margin: 4.2; // 0.3 em
         text-wrap-width: 42; // 3 em
         text-line-spacing: -1.95; // -0.15 em
-        text-halo-radius: 2;
+        text-halo-radius: @standard-halo-radius * 1.4;
       }
     }
   }