Use dasharray sizes from gravitystorm#4346 and rework runway widths

pnorman · Jul 16, 2022 · 17dc3b5 · 17dc3b5
1 parent 558371b
commit 17dc3b5
Showing 1 changed file with 36 additions and 19 deletions.
diff --git a/style/aeroways.mss b/style/aeroways.mss
@@ -2,9 +2,26 @@
 
 
 #aeroway-ref {
-  [aeroway = 'runway'],
-  [aeroway = 'taxiway'] {
+  [aeroway = 'runway'] {
     [zoom >= 15] {
+      text-name: "[ref]";
+      text-size: 12;
+      text-fill: #333;
+      text-spacing: 750;
+      text-clip: false;
+      text-placement: line;
+      text-face-name: @oblique-fonts;
+      text-halo-radius: @standard-halo-radius;
+      text-halo-fill: @standard-halo-fill;
+      text-repeat-distance: @minor-highway-text-repeat-distance;
+      [zoom >= 16] { text-size: 18; }
+      [zoom >= 17] { text-size: 24; }
+      [zoom >= 18] { text-size: 32; }
+      [zoom >= 19] { text-size: 40; }
+    }
+  }
+  [aeroway = 'taxiway'] {
+    [zoom >= 16] {
       text-name: "[ref]";
       text-size: 10;
       text-fill: #333;
@@ -29,46 +46,46 @@
   [aeroway = 'runway'] {
     [zoom >= 11] {
       ::casing[bridge = true][zoom >= 14] {
-        line-width: 12 + 2*@major-casing-width-z14;
+        line-width: 9 + 2*@major-casing-width-z14;
         line-color: @bridge-casing;
         line-join: round;
-        [zoom >= 15] { line-width: 18 + 2*@major-casing-width-z15; }
-        [zoom >= 16] { line-width: 24 + 2*@major-casing-width-z16; }
-        [zoom >= 17] { line-width: 40 + 2*@major-casing-width-z17; }
-        [zoom >= 18] { line-width: 56 + 2*@major-casing-width-z18; }
-        [zoom >= 19] { line-width: 72 + 2*@major-casing-width-z19; }
+        [zoom >= 15] { line-width: 13.5 + 2*@major-casing-width-z15; }
+        [zoom >= 16] { line-width: 20 + 2*@major-casing-width-z16; }
+        [zoom >= 17] { line-width: 30 + 2*@major-casing-width-z17; }
+        [zoom >= 18] { line-width: 46 + 2*@major-casing-width-z18; }
+        [zoom >= 19] { line-width: 68 + 2*@major-casing-width-z19; }
       }
       ::fill {
         line-color: @aeroway-fill;
         line-width: 2;
         [zoom >= 12] { line-width: 4; }
         [zoom >= 13] { line-width: 6; }
-        [zoom >= 14] { line-width: 12; }
-        [zoom >= 15] { line-width: 18; }
-        [zoom >= 16] { line-width: 24; }
-        [zoom >= 17] { line-width: 40; }
-        [zoom >= 18] { line-width: 56; }
-        [zoom >= 19] { line-width: 72; }
+        [zoom >= 14] { line-width: 9; }
+        [zoom >= 15] { line-width: 13.5; }
+        [zoom >= 16] { line-width: 20; }
+        [zoom >= 17] { line-width: 30; }
+        [zoom >= 18] { line-width: 46; }
+        [zoom >= 19] { line-width: 68; }
       }
       ::center[runway != 'displaced_threshold'][runway != 'blast_pad'][zoom >= 15] {
         line-color: #ddd;
         line-width: 1.5;
-        line-dasharray: 18,12;
+        line-dasharray: 12,8;
         [zoom >= 16] {
           line-width: 2;
-          line-dasharray: 24,16;
+          line-dasharray: 21,14;
         }
         [zoom >= 17] {
           line-width: 3.3;
-          line-dasharray: 40,27;
+          line-dasharray: 42,28;
         }
         [zoom >= 18] {
           line-width: 4.5;
-          line-dasharray: 56,37;
+          line-dasharray: 84,56;
         }
         [zoom >= 19] {
           line-width: 6;
-          line-dasharray: 72,48;
+          line-dasharray: 168,112;
         }
       }
     }