Switch D0 and D1 track style to that of D2.

Author: partim

src/railway/class.rs

@@ -810,6 +810,7 @@ impl Gauge {
         ("g600", 600),
         ("g750", 750),
         ("g760", 760),
+        ("g762", 762),
         ("g785", 785),
         ("g800", 800),
         ("g802", 802),

src/railway/feature/track.rs

@@ -295,12 +295,15 @@ impl Feature for TrackContour {
     fn shape(
         &self, style: &Style, _canvas: &Canvas
     ) -> AnyShape {
+        /*
         if style.detail() <= 1 {
             AnyShape::from(
                 ContourShape::new(&self.class, self.trace.outline(style))
             )
         }
-        else if style.detail() == 2 {
+        else
+        */
+        if style.detail() <= 2 {
             return AnyShape::from(ContourShape2::new(self, style));
         }
         else if style.detail() == 3 {
@@ -313,6 +316,7 @@ impl Feature for TrackContour {
 }
 
 
+/*
 //------------ ContourShape --------------------------------------------------
 
 struct ContourShape<'a> {
@@ -372,6 +376,7 @@ impl<'a> ContourShape<'a> {
         );
     }
 }
+*/
 
 
 //------------ ContourShape2 -------------------------------------------------

src/railway/measures.rs

@@ -259,12 +259,12 @@ impl ops::MulAssign<f64> for Measures {
 /// The standard measures for detail level 0.
 pub const BASE_D0: Measures = Measures([
     2.0,    // dt
-    0.8,    // main track
-    0.85,   // main double
-    0.3,    // main skip
+    1.1,    // main track
+    1.6,   // main double
+    0.4,    // main skip
     0.6,    // light track
-    0.65,   // light double
-    0.2,    // light skip
+    1.2,   // light double
+    0.3,    // light skip
     0.3,    // guide width
     0.4,    // border width
     12.,    // seg              = 6dt

src/railway/style.rs

@@ -49,9 +49,9 @@ const ZOOM: &[Zoom] = &[
     Zoom::new(4.5, 4, 1.6, measures::BASE_D4),
     Zoom::new(5.0, 5, 1.3, measures::BASE_D5), // 15
     Zoom::new(5.5, 5, 1.6, measures::BASE_D5),
-    Zoom::new(5.5, 5, 1.9, measures::BASE_D5),
-    Zoom::new(5.5, 5, 2.2, measures::BASE_D5),
-    Zoom::new(5.5, 5, 2.5, measures::BASE_D5),
+    Zoom::new(6.0, 6, 1.9, measures::BASE_D6),
+    Zoom::new(6.5, 6, 2.2, measures::BASE_D6),
+    Zoom::new(6.5, 6, 2.5, measures::BASE_D6),
 ];
 
 const PROOF_ZOOM: &[Zoom] = &[
@@ -70,10 +70,10 @@ const PROOF_ZOOM: &[Zoom] = &[
     Zoom::new(4.0, 4, 1.0, measures::BASE_D4),
     Zoom::new(4.5, 4, 1.3, measures::BASE_D4),
     Zoom::new(5.0, 5, 1.0, measures::BASE_D5),
-    Zoom::new(5.5, 5, 1.3, measures::BASE_D6), // 15
-    Zoom::new(5.5, 5, 1.6, measures::BASE_D6),
-    Zoom::new(5.5, 5, 1.9, measures::BASE_D6),
-    Zoom::new(5.5, 5, 2.1, measures::BASE_D6),
+    Zoom::new(5.5, 5, 1.3, measures::BASE_D5), // 15
+    Zoom::new(6.0, 6, 1.6, measures::BASE_D6),
+    Zoom::new(6.5, 6, 1.9, measures::BASE_D6),
+    Zoom::new(6.5, 6, 2.1, measures::BASE_D6),
 ];
 
 /// Size correction for feature bounds.