render the layer name in the selected properties window

rgis-events/src/lib.rs

@@ -172,7 +172,10 @@ pub struct CrsChangedEvent {
 pub struct RenderMessageEvent(pub String);
 
 #[derive(Event)]
-pub struct RenderFeaturePropertiesEvent(pub geo_features::Properties);
+pub struct RenderFeaturePropertiesEvent {
+    pub layer_id: rgis_layer_id::LayerId,
+    pub properties: geo_features::Properties,
+}
 
 #[derive(Event)]
 pub struct CreateLayerEvent {

rgis-layers/src/systems.rs

@@ -112,9 +112,10 @@ fn handle_map_clicked_events(
 ) {
     for event in map_clicked_event_reader.read() {
         if let Some((layer, feature)) = layers.feature_from_click(event.0) {
-            render_message_event_writer.send(rgis_events::RenderFeaturePropertiesEvent(
-                feature.properties.clone(),
-            ));
+            render_message_event_writer.send(rgis_events::RenderFeaturePropertiesEvent {
+                layer_id: layer.id,
+                properties: feature.properties.clone(),
+            });
             feature_clicked_event_writer
                 .send(rgis_events::FeatureSelectedEvent(layer.id, feature.id));
         }

rgis-ui/src/feature_properties_window.rs

@@ -3,6 +3,7 @@ use bevy_egui::egui;
 pub(crate) struct FeaturePropertiesWindow<'a> {
     pub bevy_egui_ctx: &'a mut bevy_egui::EguiContext,
     pub state: &'a mut crate::FeaturePropertiesWindowState,
+    pub layer: &'a rgis_layers::Layer,
 }
 
 impl FeaturePropertiesWindow<'_> {
@@ -14,6 +15,7 @@ impl FeaturePropertiesWindow<'_> {
             .id(egui::Id::new("Layer Feature Properties Window"))
             .open(&mut self.state.is_visible)
             .show(self.bevy_egui_ctx.get_mut(), |ui| {
+                ui.label(format!("Layer: {}", self.layer.name));
                 ui.add(FeaturePropertiesTable { properties })
             });
     }

rgis-ui/src/lib.rs

@@ -47,6 +47,7 @@ pub struct ManageLayerWindowState {
 
 #[derive(Default)]
 pub struct FeaturePropertiesWindowState {
+    layer_id: Option<rgis_layer_id::LayerId>,
     properties: Option<geo_features::Properties>,
     is_visible: bool,
 }

rgis-ui/src/systems.rs

@@ -159,21 +159,28 @@ fn render_change_crs_window(
 fn render_feature_properties_window(
     mut state: Local<crate::FeaturePropertiesWindowState>,
     mut egui_ctx_query: Query<&mut EguiContext, With<PrimaryWindow>>,
+    layers: Res<rgis_layers::Layers>,
     mut render_message_events: ResMut<
         bevy::ecs::event::Events<rgis_events::RenderFeaturePropertiesEvent>,
     >,
 ) {
     if let Some(event) = render_message_events.drain().last() {
         state.is_visible = true;
-        state.properties = Some(event.0);
+        state.layer_id = Some(event.layer_id);
+        state.properties = Some(event.properties);
     }
 
     let Ok(mut egui_ctx) = egui_ctx_query.get_single_mut() else {
         return;
     };
 
+    let Some(layer) = state.layer_id.and_then(|id| layers.get(id)) else {
+        return;
+    };
+
     crate::feature_properties_window::FeaturePropertiesWindow {
         state: &mut state,
+        layer,
         bevy_egui_ctx: &mut egui_ctx,
     }
     .render();