Merge pull request #47 from abes-esr/develop

Merge dev dans main

Author: pierre-maraval

src/main/java/fr/abes/cbs/process/ProcessCBS.java

@@ -749,7 +749,8 @@ public String affUsa() throws CBSException, IOException {
     private void majRcr() throws IOException {
         try {
             String result = this.affUsa();
-            this.setRcr(result.substring(result.indexOf("VU3") + 3, result.indexOf(" " + Constants.STR_1E)));
+            String endTrame = result.substring(result.indexOf("VU3") + 3);
+            this.setRcr(endTrame.substring(0, endTrame.indexOf(Constants.STR_1E)));
         } catch (Exception e) {
             throw new IOException(e);
         }

src/main/java/fr/abes/cbs/zones/ZonesSpecifications.java

@@ -156,7 +156,7 @@ public static ZoneSpecification getZoneSpecification(String label, TYPE_NOTICE t
                     new ZoneSpecification("447", "67a[tohilbfghi]ecndpsuxy0v9"),
                     new ZoneSpecification("448", "67a[tohilbfghi]ecndpsuxy0v9"),
                     new ZoneSpecification("451", "67a[tohilbfghi]ecndpsuxy0v9"),
-                    new ZoneSpecification("452", "67a[tohilbfghi]ecndpsuxy05v9"),
+                    new ZoneSpecification("452", "567a[tohilbfghi]ecndpsuxy0v9"),
                     new ZoneSpecification("453", "67a[tohilbfghi]ecndpsuxy0v9"),
                     new ZoneSpecification("454", "67a[tohilbfghi]ecndpsuxy0v9"),
                     new ZoneSpecification("455", "67a[tohilbfghi]ecndpsuxy0v9"),
@@ -169,7 +169,7 @@ public static ZoneSpecification getZoneSpecification(String label, TYPE_NOTICE t
                     new ZoneSpecification("481", "67a[tohilbfghi]ecndpsuxy0v9"),
                     new ZoneSpecification("482", "67a[tohilbfghi]ecndpsuxy0v9"),
                     new ZoneSpecification("488", "67a[tohilbfghi]ecndpsuxy0v9"),
-                    new ZoneSpecification("500", "6735abhiklmnqrsuw"),
+                    new ZoneSpecification("500", "5673abhiklmnqrsuw"),
                     new ZoneSpecification("501", "6735abekmrsuw"),
                     new ZoneSpecification("503", "6735abdefhijklmno"),
                     new ZoneSpecification("510", "6735aehijnz"),
@@ -187,18 +187,18 @@ public static ZoneSpecification getZoneSpecification(String label, TYPE_NOTICE t
                     new ZoneSpecification("540", "6735aehijnz"),
                     new ZoneSpecification("541", "6735aehiz"),
                     new ZoneSpecification("545", "6735aehijnz"),
-                    new ZoneSpecification("579", "16735"),
-                    new ZoneSpecification("600", "[16735abcdDfxyz]2"),
-                    new ZoneSpecification("601", "[16735abcdfgexyz]2"),
-                    new ZoneSpecification("602", "[16735acdfxyz]2"),
-                    new ZoneSpecification("604", "[6735at1xyz]2"),
-                    new ZoneSpecification("605", "[16735ahiklmnqxyz]2"),
-                    new ZoneSpecification("606", "[16735axyz]2"),
+                    new ZoneSpecification("579", "15673"),
+                    new ZoneSpecification("600", "[15673abcdDfxyz]2"),
+                    new ZoneSpecification("601", "[15673abcdfgexyz]2"),
+                    new ZoneSpecification("602", "[15673acdfxyz]2"),
+                    new ZoneSpecification("604", "[5673at1xyz]2"),
+                    new ZoneSpecification("605", "[15673ahiklmnqxyz]2"),
+                    new ZoneSpecification("606", "[15673axyz]2"),
                     new ZoneSpecification("607", "[16735axyz]2"),
                     new ZoneSpecification("608", "[16735axyz]2"),
                     new ZoneSpecification("610", "a2z"),
                     new ZoneSpecification("615", "amnx2"),
-                    new ZoneSpecification("616", "[16735afcxyz]2"),
+                    new ZoneSpecification("616", "[15673afcxyz]2"),
                     new ZoneSpecification("620", "abcdefghikmno"),
                     new ZoneSpecification("626", "abc"),
                     new ZoneSpecification("660", "a"),
@@ -208,16 +208,16 @@ public static ZoneSpecification getZoneSpecification(String label, TYPE_NOTICE t
                     new ZoneSpecification("676", "avz"),
                     new ZoneSpecification("680", "ab"),
                     new ZoneSpecification("686", "abcv2"),
-                    new ZoneSpecification("700", "[16735abgdDcf]4"),
-                    new ZoneSpecification("701", "[16735abgdDcf]4"),
-                    new ZoneSpecification("702", "[1673abgdDcf]4"),
-                    new ZoneSpecification("710", "[16735abgdhfpec]4"),
-                    new ZoneSpecification("711", "[16735abgdhfpec]4"),
+                    new ZoneSpecification("700", "[15673abgdDcf]4"),
+                    new ZoneSpecification("701", "[15673abgdDcf]4"),
+                    new ZoneSpecification("702", "[15673abgdDcf]4"),
+                    new ZoneSpecification("710", "[15673abgdhfpec]4"),
+                    new ZoneSpecification("711", "[15673abgdhfpec]4"),
                     new ZoneSpecification("712", "[1673abgdhfpec]4"),
-                    new ZoneSpecification("716", "1673afc4"),
-                    new ZoneSpecification("720", "1673acdf4"),
-                    new ZoneSpecification("721", "1673acdf4"),
-                    new ZoneSpecification("722", "1673acdf4"),
+                    new ZoneSpecification("716", "15673afc4"),
+                    new ZoneSpecification("720", "15673acdf4"),
+                    new ZoneSpecification("721", "15673acdf4"),
+                    new ZoneSpecification("722", "15673acdf4"),
                     new ZoneSpecification("801", "abcgh2"),
                     new ZoneSpecification("802", "a"),
                     new ZoneSpecification("830", "a"),