Adjust stroke width (#1283)

Author: edenhaus

src/map/map_info.rs

@@ -171,7 +171,11 @@ impl MapInfo {
                 },
                 MapInfoLayer {
                     map_info_type: MapInfoType::Outline,
-                    css: vec![CSSClass::FillNone, CSSClass::OutlineStroke],
+                    css: vec![
+                        CSSClass::FillNone,
+                        CSSClass::OutlineStroke,
+                        CSSClass::StrokeWidth2,
+                    ],
                     force_connected: false,
                     colorize: false,
                 },
@@ -192,7 +196,11 @@ impl MapInfo {
                 },
                 MapInfoLayer {
                     map_info_type: MapInfoType::Outline,
-                    css: vec![CSSClass::FillNone, CSSClass::OutlineStroke],
+                    css: vec![
+                        CSSClass::FillNone,
+                        CSSClass::OutlineStroke,
+                        CSSClass::StrokeWidth2,
+                    ],
                     force_connected: false,
                     colorize: false,
                 },

src/map/mod.rs

@@ -9,7 +9,7 @@ use common::round;
 use map_info::MapInfo;
 use ordermap::OrderSet;
 use points::{Point, TracePoints, points_to_svg_path};
-use style::{CSSClass, get_style, get_used_definitions};
+use style::{CSSClass, get_class_names, get_style, get_used_definitions};
 
 use super::util::decompress_base64_data;
 use log::debug;
@@ -303,9 +303,9 @@ impl MapData {
         document = document.add(defs).set("viewBox", viewbox.to_svg_viewbox());
 
         if !subsets.is_empty() {
-            let group_css = CSSClass::WallBase;
-            let mut group = Group::new().set("class", get_style(&group_css).class_name);
-            styles.insert(group_css);
+            let group_css = [CSSClass::WallBase, CSSClass::StrokeWidth2];
+            let mut group = Group::new().set("class", get_class_names(&group_css));
+            styles.extend(group_css);
 
             for subset in &subsets {
                 let (css, subset) = get_svg_subset(subset, rotation)?;

src/map/style.rs

@@ -68,8 +68,12 @@ fn get_definition(def: Definition) -> Box<dyn svg::node::Node> {
 #[cfg_attr(test, derive(EnumIter))]
 pub(super) enum CSSClass {
     Path,
+
     FillNone,
+    StrokeWidth2,
+
     OutlineStroke,
+
     RoomUnreachable,
     RoomUnknown,
     RoomColor0,
@@ -78,6 +82,7 @@ pub(super) enum CSSClass {
     RoomColor3,
     RoomColor4,
     RoomColor5,
+
     WallBase,
     VirtualWall,
     NoMoppingWall,
@@ -150,35 +155,66 @@ fn get_styles() -> &'static HashMap<CSSClass, CSSEntry> {
     static STYLES: OnceLock<HashMap<CSSClass, CSSEntry>> = OnceLock::new();
     STYLES.get_or_init(|| {
         HashMap::from([
-            (CSSClass::Path, CSSEntry{
-                identifier: "path",
-                value: "stroke-width: 1.5; vector-effect: non-scaling-stroke",
-                class_name: "path",
-                required_def: None,
-            }),
+            (
+                CSSClass::Path,
+                CSSEntry {
+                    identifier: "path",
+                    value: "stroke-width: 1.5; vector-effect: non-scaling-stroke",
+                    class_name: "path",
+                    required_def: None,
+                },
+            ),
             (CSSClass::FillNone, css_entry!("f", "fill: none")),
-            (CSSClass::OutlineStroke, CSSEntry {
-                class_name: "o",
-                value: "stroke: #666666; stroke-linecap: round; stroke-linejoin: round; stroke-width: 3",
-                required_def: None,
-                identifier: ".o path",
-            }),
-            (CSSClass::RoomUnknown,  css_entry!("u", "fill: #edf3fb")),
-            (CSSClass::RoomUnreachable, css_entry!("ru", "fill: url(#ds); mix-blend-mode: multiply;", Definition::DiagonalStripes)),
+            (
+                CSSClass::StrokeWidth2,
+                CSSEntry {
+                    class_name: "s2",
+                    value: "stroke-width: 2",
+                    required_def: None,
+                    identifier: ".s2 path",
+                },
+            ),
+            (
+                CSSClass::OutlineStroke,
+                CSSEntry {
+                    class_name: "o",
+                    value: "stroke: #666666; stroke-linecap: round; stroke-linejoin: round",
+                    required_def: None,
+                    identifier: ".o path",
+                },
+            ),
+            (CSSClass::RoomUnknown, css_entry!("u", "fill: #edf3fb")),
+            (
+                CSSClass::RoomUnreachable,
+                css_entry!(
+                    "ru",
+                    "fill: url(#ds); mix-blend-mode: multiply;",
+                    Definition::DiagonalStripes
+                ),
+            ),
             room_color_entry!(RoomColor0, "#a2bce7"),
             room_color_entry!(RoomColor1, "#ecd099"),
             room_color_entry!(RoomColor2, "#9bd4da"),
             room_color_entry!(RoomColor3, "#ecc6c9"),
             room_color_entry!(RoomColor4, "#d7bce3"),
             room_color_entry!(RoomColor5, "#c3e2b6"),
-            (CSSClass::WallBase, CSSEntry {
-                class_name: "w",
-                value: "stroke-dasharray: 4; stroke-width: 3",
-                required_def: None,
-                identifier: ".w path",
-            }),
-            (CSSClass::VirtualWall,  css_entry!("v", "stroke: #f00000; fill: #f0000030")),
-            (CSSClass::NoMoppingWall, css_entry!("m", "stroke: #ffa500; fill: #ffa50030")),
+            (
+                CSSClass::WallBase,
+                CSSEntry {
+                    class_name: "w",
+                    value: "stroke-dasharray: 4",
+                    required_def: None,
+                    identifier: ".w path",
+                },
+            ),
+            (
+                CSSClass::VirtualWall,
+                css_entry!("v", "stroke: #f00000; fill: #f0000030"),
+            ),
+            (
+                CSSClass::NoMoppingWall,
+                css_entry!("m", "stroke: #ffa500; fill: #ffa50030"),
+            ),
         ])
     })
 }