Remove stroke on Nodes

src/main/java/com/powsybl/nad/svg/SvgParameters.java

@@ -26,16 +26,17 @@ public class SvgParameters {
     private double voltageLevelCircleRadius = 0.3;
     private double fictitiousVoltageLevelCircleRadius = 0.15;
     private double transformerCircleRadius = 0.2;
-    private double nodeHollowWidth = 0.1;
+    private double nodeHollowWidth = 0.15;
     private double edgesForkLength = 0.8;
     private double edgesForkAperture = Math.toRadians(60);
-    private double edgeStartShift = 0.03;
+    private double edgeStartShift = 0.02;
     private double unknownBusNodeExtraRadius = 0.1;
     private double loopDistance = 1.2;
     private double loopEdgesAperture = Math.toRadians(60);
     private double loopControlDistance = 0.4;
     private boolean textNodeBackground = true;
     private boolean edgeInfoAlongEdge = true;
+    private double interAnnulusSpace = 0.05;
     private String svgPrefix = "";
 
     public enum CssLocation {
@@ -74,6 +75,7 @@ public SvgParameters(SvgParameters other) {
         this.textNodeBackground = other.textNodeBackground;
         this.edgeInfoAlongEdge = other.edgeInfoAlongEdge;
         this.svgPrefix = other.svgPrefix;
+        this.interAnnulusSpace = other.interAnnulusSpace;
     }
 
     public Padding getDiagramPadding() {
@@ -285,6 +287,15 @@ public SvgParameters setEdgeInfoAlongEdge(boolean edgeInfoAlongEdge) {
         return this;
     }
 
+    public double getInterAnnulusSpace() {
+        return interAnnulusSpace;
+    }
+
+    public SvgParameters setInterAnnulusSpace(double interAnnulusSpace) {
+        this.interAnnulusSpace = interAnnulusSpace;
+        return this;
+    }
+
     public String getSvgPrefix() {
         return svgPrefix;
     }

src/main/java/com/powsybl/nad/svg/SvgWriter.java

@@ -445,12 +445,11 @@ private void drawNode(Graph graph, XMLStreamWriter writer, VoltageLevelNode vlNo
             writer.writeAttribute(CIRCLE_RADIUS_ATTRIBUTE, getFormattedValue(nodeOuterRadius + svgParameters.getUnknownBusNodeExtraRadius()));
         }
 
-        int nbBuses = vlNode.getBusNodes().size();
-        double busInnerRadius = 0;
         List<Edge> traversingBusEdges = new ArrayList<>();
 
         for (BusNode busNode : vlNode.getBusNodes()) {
-            double busOuterRadius = busInnerRadius + nodeOuterRadius / nbBuses;
+            double busInnerRadius = getBusAnnulusInnerRadius(busNode, vlNode, svgParameters);
+            double busOuterRadius = getBusAnnulusOuterRadius(busNode, vlNode, svgParameters);
             if (busInnerRadius == 0) {
                 writer.writeEmptyElement(CIRCLE_ELEMENT_NAME);
                 writer.writeAttribute(CIRCLE_RADIUS_ATTRIBUTE, getFormattedValue(busOuterRadius));
@@ -460,7 +459,6 @@ private void drawNode(Graph graph, XMLStreamWriter writer, VoltageLevelNode vlNo
             }
             writer.writeAttribute(ID_ATTRIBUTE, getPrefixedId(busNode.getDiagramId()));
             addStylesIfAny(writer, styleProvider.getNodeStyleClasses(busNode));
-            busInnerRadius = busOuterRadius;
             traversingBusEdges.addAll(graph.getBusEdges(busNode));
         }
     }
@@ -704,10 +702,19 @@ protected static double getVoltageLevelCircleRadius(VoltageLevelNode vlNode, Svg
         return Math.min(Math.max(nbBuses, 1), 2) * svgParameters.getVoltageLevelCircleRadius();
     }
 
+    public static double getBusAnnulusInnerRadius(BusNode node, VoltageLevelNode vlNode, SvgParameters svgParameters) {
+        if (node.getIndex() == 0) {
+            return 0;
+        }
+        int nbNeighbours = node.getNbNeighbouringBusNodes();
+        double unitaryRadius = SvgWriter.getVoltageLevelCircleRadius(vlNode, svgParameters) / (nbNeighbours + 1);
+        return node.getIndex() * unitaryRadius + svgParameters.getInterAnnulusSpace() / 2;
+    }
+
     public static double getBusAnnulusOuterRadius(BusNode node, VoltageLevelNode vlNode, SvgParameters svgParameters) {
         int nbNeighbours = node.getNbNeighbouringBusNodes();
         double unitaryRadius = SvgWriter.getVoltageLevelCircleRadius(vlNode, svgParameters) / (nbNeighbours + 1);
-        return (node.getIndex() + 1) * unitaryRadius;
+        return (node.getIndex() + 1) * unitaryRadius - svgParameters.getInterAnnulusSpace() / 2;
     }
 
     public String getPrefixedId(String id) {

src/main/resources/nominalStyle.css

@@ -3,7 +3,7 @@
 .nad-3wt-edges polyline {stroke: var(--nad-vl-color, lightgrey); stroke-width: 0.05; fill: none}
 .nad-text-edges {stroke: black; stroke-width: 0.02; stroke-dasharray: .03,.05}
 .nad-branch-edges .nad-disconnected polyline {stroke-dasharray: .1,.1}
-.nad-vl-nodes circle, .nad-vl-nodes path {fill: var(--nad-vl-color, lightblue); stroke-width: 0.05; stroke: white; stroke-linejoin:round}
+.nad-vl-nodes circle, .nad-vl-nodes path {fill: var(--nad-vl-color, lightblue)}
 .nad-vl-nodes circle.nad-unknown-busnode {stroke: lightgrey; stroke-dasharray: .05,.05; fill: none}
 .nad-hvdc-edge polyline.nad-hvdc {stroke: grey; stroke-width: 0.2}
 .nad-3wt-nodes circle {stroke: var(--nad-vl-color, lightgrey); stroke-width: 0.05; fill: none}
@@ -34,10 +34,10 @@
   40% {stroke: #FFEB3B; stroke-width: 0.15}
 }
 @keyframes node-over-blink {
-  0%, 80%, 100% {stroke: white; stroke-width: 0.05}
+  0%, 80%, 100% {stroke: white; stroke-width: 0}
   40% {stroke: #ff5722; stroke-width: 0.15}
 }
 @keyframes node-under-blink {
-  0%, 80%, 100% {stroke: white; stroke-width: 0.05}
+  0%, 80%, 100% {stroke: white; stroke-width: 0}
   40% {stroke: #00BCD4; stroke-width: 0.15}
 }

src/main/resources/topologicalStyle.css

@@ -3,7 +3,7 @@
 .nad-3wt-edges polyline {stroke: var(--nad-vl-color, lightgrey); stroke-width: 0.05; fill: none}
 .nad-text-edges {stroke: black; stroke-width: 0.02; stroke-dasharray: .03,.05}
 .nad-branch-edges .nad-disconnected polyline {stroke-dasharray: .1,.1}
-.nad-vl-nodes circle, .nad-vl-nodes path {fill: var(--nad-vl-color, lightgrey); stroke-width: 0.05; stroke: white; stroke-linejoin:round}
+.nad-vl-nodes circle, .nad-vl-nodes path {fill: var(--nad-vl-color, lightgrey)}
 .nad-vl-nodes circle.nad-unknown-busnode {stroke: var(--nad-vl-color, #808080); stroke-dasharray: .05,.05; fill: none}
 .nad-hvdc-edge polyline.nad-hvdc {stroke: grey; stroke-width: 0.2}
 .nad-3wt-nodes circle {stroke: var(--nad-vl-color, lightgrey); stroke-width: 0.05; fill: none}

src/test/java/com/powsybl/nad/svg/SvgParametersTest.java

@@ -41,7 +41,8 @@ void test() {
                 .setLoopControlDistance(1.)
                 .setTextNodeBackground(false)
                 .setEdgeInfoAlongEdge(false)
-                .setSvgPrefix("TestPrefix");
+                .setSvgPrefix("TestPrefix")
+                .setInterAnnulusSpace(0.25);
 
         SvgParameters svgParameters1 = new SvgParameters(svgParameters0);
 
@@ -72,5 +73,6 @@ void test() {
         assertEquals(svgParameters0.isTextNodeBackground(), svgParameters1.isTextNodeBackground());
         assertEquals(svgParameters0.isEdgeInfoAlongEdge(), svgParameters1.isEdgeInfoAlongEdge());
         assertEquals(svgParameters0.getSvgPrefix(), svgParameters1.getSvgPrefix());
+        assertEquals(svgParameters0.getInterAnnulusSpace(), svgParameters1.getInterAnnulusSpace());
     }
 }