Add network name to NAD metadata output

Include the network name in the DiagramMetadata JSON output so that downstream tools like powsybl-network-viewer can use it for naming exported files.

Closes #801

Signed-off-by: hanweiwei <duzielww@163.com>
Made-with: Cursor

Author: skyhww

network-area-diagram/src/main/java/com/powsybl/nad/NetworkAreaDiagram.java

@@ -77,7 +77,7 @@ public static void draw(Network network, Path svgFile, NadParameters param, Pred
         Graph graph = getLayoutResult(network, param, voltageLevelFilter);
         NetworkGraphBuilder.applyStyle(graph, styleProvider);
         createSvgWriter(param).writeSvg(graph, svgFile);
-        createMetadata(graph, param).writeJson(getMetadataPath(svgFile));
+        createMetadata(graph, param, network).writeJson(getMetadataPath(svgFile));
     }
 
     public static void draw(Network network, Writer writer, Writer metadataWriter, NadParameters param, Predicate<VoltageLevel> voltageLevelFilter) {
@@ -90,11 +90,13 @@ public static void draw(Network network, Writer writer, Writer metadataWriter, N
         Graph graph = getLayoutResult(network, param, voltageLevelFilter);
         NetworkGraphBuilder.applyStyle(graph, styleProvider);
         createSvgWriter(param).writeSvg(graph, writer);
-        createMetadata(graph, param).writeJson(metadataWriter);
+        createMetadata(graph, param, network).writeJson(metadataWriter);
     }
 
-    private static DiagramMetadata createMetadata(Graph graph, NadParameters param) {
-        return new DiagramMetadata(param.getLayoutParameters(), param.getSvgParameters()).addMetadata(graph);
+    private static DiagramMetadata createMetadata(Graph graph, NadParameters param, Network network) {
+        return new DiagramMetadata(param.getLayoutParameters(), param.getSvgParameters())
+                .setNetworkName(network.getNameOrId())
+                .addMetadata(graph);
     }
 
     private static Graph getLayoutResult(Network network, NadParameters param, Predicate<VoltageLevel> voltageLevelFilter) {

network-area-diagram/src/main/java/com/powsybl/nad/svg/metadata/DiagramMetadata.java

@@ -40,6 +40,7 @@ public enum NodeType {
         THREEWT, BOUNDARY;
     }
 
+    private String networkName;
     private final LayoutParameters layoutParameters;
     private final SvgParameters svgParameters;
     private final List<BusNodeMetadata> busNodesMetadata = new ArrayList<>();
@@ -63,14 +64,16 @@ public DiagramMetadata(@JsonProperty("layoutParameters") LayoutParameters layout
                            @JsonProperty("nodes") List<NodeMetadata> nodesMetadata,
                            @JsonProperty("injections") List<InjectionMetadata> injectionsMetadata,
                            @JsonProperty("edges") List<EdgeMetadata> edgesMetadata,
-                           @JsonProperty("textNodes") List<TextNodeMetadata> textNodesMetadata) {
+                           @JsonProperty("textNodes") List<TextNodeMetadata> textNodesMetadata,
+                           @JsonProperty("networkName") String networkName) {
         this.layoutParameters = Objects.requireNonNull(layoutParameters);
         this.svgParameters = Objects.requireNonNull(svgParameters);
         this.busNodesMetadata.addAll(busNodesMetadata);
         this.nodesMetadata.addAll(nodesMetadata);
         this.injectionsMetadata.addAll(injectionsMetadata);
         this.edgesMetadata.addAll(edgesMetadata);
         this.textNodesMetadata.addAll(textNodesMetadata);
+        this.networkName = networkName;
     }
 
     @JsonProperty("busNodes")
@@ -108,6 +111,17 @@ public SvgParameters getSvgParameters() {
         return svgParameters;
     }
 
+    @JsonProperty("networkName")
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    public String getNetworkName() {
+        return networkName;
+    }
+
+    public DiagramMetadata setNetworkName(String networkName) {
+        this.networkName = networkName;
+        return this;
+    }
+
     public DiagramMetadata addMetadata(Graph graph) {
         Objects.requireNonNull(graph);