Cache road labels in the LTN pick area screen. [rebuild] [release]

Author: dabreegster

apps/ltn/src/app.rs

@@ -45,6 +45,7 @@ pub struct PerMap {
     pub consultation_id: Option<String>,
 
     pub draw_all_filters: Toggle3Zoomed,
+    pub draw_major_road_labels: Option<DrawSimpleRoadLabels>,
     pub draw_all_road_labels: Option<DrawSimpleRoadLabels>,
     pub draw_poi_icons: Drawable,
     pub draw_bus_routes: Drawable,
@@ -80,6 +81,7 @@ impl PerMap {
             consultation_id: None,
 
             draw_all_filters: Toggle3Zoomed::empty(ctx),
+            draw_major_road_labels: None,
             draw_all_road_labels: None,
             draw_poi_icons,
             draw_bus_routes,

apps/ltn/src/pick_area.rs

@@ -17,7 +17,6 @@ pub struct PickArea {
     bottom_panel: Panel,
     world: World<NeighbourhoodID>,
     draw_over_roads: Drawable,
-    labels: DrawSimpleRoadLabels,
     draw_boundary_roads: Drawable,
 }
 
@@ -51,12 +50,19 @@ impl PickArea {
             .layers
             .event(ctx, &app.cs, Mode::PickArea, Some(&bottom_panel));
 
+        if app.per_map.draw_major_road_labels.is_none() {
+            app.per_map.draw_major_road_labels = Some(DrawSimpleRoadLabels::only_major_roads(
+                ctx,
+                app,
+                colors::ROAD_LABEL,
+            ));
+        }
+
         Box::new(PickArea {
             appwide_panel,
             bottom_panel,
             world,
             draw_over_roads,
-            labels: DrawSimpleRoadLabels::only_major_roads(ctx, app, colors::ROAD_LABEL),
             draw_boundary_roads: draw_boundary_roads(ctx, app),
         })
     }
@@ -104,7 +110,7 @@ impl State<App> for PickArea {
         self.bottom_panel.draw(g);
         app.session.layers.draw(g, app);
         self.draw_boundary_roads.draw(g);
-        self.labels.draw(g);
+        app.per_map.draw_major_road_labels.as_ref().unwrap().draw(g);
         app.per_map.draw_all_filters.draw(g);
         app.per_map.draw_poi_icons.draw(g);
     }