tests: update railjson version

Signed-off-by: Youness CHRIFI ALAOUI <[email protected]>
OpenRailAssociation · Dec 6, 2024 · 0c4441d · 0c4441d
1 parent 8efefb2
commit 0c4441d
Show file tree

Hide file tree

Showing 13 changed files with 41 additions and 15 deletions.
diff --git a/front/src/reducers/osrdconf/infra_schema.json b/front/src/reducers/osrdconf/infra_schema.json
@@ -842,11 +842,18 @@
                     "type": "array"
                 },
                 "weight": {
+                    "anyOf": [
+                        {
+                            "minimum": 0,
+                            "type": "integer"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
                     "default": null,
                     "description": "represents the significance of a PR",
-                    "minimum": 0,
-                    "title": "Weight",
-                    "type": "integer"
+                    "title": "Weight"
                 }
             },
             "required": [

diff --git a/front/tests/assets/infra/infra.json b/front/tests/assets/infra/infra.json
@@ -1,5 +1,5 @@
 {
-  "version": "3.4.12",
+  "version": "3.4.13",
   "track_sections": [
     {
       "id": "TA1",
@@ -6803,7 +6803,8 @@
           "uic": 3,
           "name": "Mid_West_station"
         }
-      }
+      },
+
     },
     {
       "id": "North_East_station",

diff --git a/python/osrd_schemas/osrd_schemas/infra.py b/python/osrd_schemas/osrd_schemas/infra.py
@@ -197,7 +197,7 @@ class OperationalPoint(BaseObjectTrait):
     """
 
     parts: List[OperationalPointPart]
-    weight: int = Field(description="represents the significance of a PR", ge=0, default=None)
+    weight: Optional[int] = Field(description="represents the significance of a PR", ge=0, default=None)
 
 
 class TrackEndpoint(BaseModel):

diff --git a/python/railjson_generator/railjson_generator/schema/infra/infra.py b/python/railjson_generator/railjson_generator/schema/infra/infra.py
@@ -88,6 +88,7 @@ def make_rjs_operational_points(self):
                     ),
                     "identifier": infra.OperationalPointIdentifierExtension(uic=op.uic, name=op.label),
                 },
+                weight=None,
             )
             ops.append(new_op)
         return ops

diff --git a/python/railjson_generator/railjson_generator/schema/infra/operational_point.py b/python/railjson_generator/railjson_generator/schema/infra/operational_point.py
@@ -9,13 +9,15 @@ class OperationalPoint:
     label: str
     trigram: str
     parts: List
+    weight: Optional[int]
     uic: int
 
-    def __init__(self, label: str, trigram: Optional[str] = None, uic: int = 0):
+    def __init__(self, label: str, trigram: Optional[str] = None, uic: int = 0, weight: Optional[int] = None):
         self.label = label
         self.trigram = trigram or label[:3].upper()
         self.parts = list()
         self.uic = uic
+        self.weight = weight
 
     def add_part(self, track, offset):
         op_part = OperationalPointPart(self, offset)

diff --git a/tests/data/infras/circle_infra/infra.json b/tests/data/infras/circle_infra/infra.json
@@ -1,5 +1,5 @@
 {
-    "version": "3.4.12",
+    "version": "3.4.13",
     "operational_points": [],
     "routes": [],
     "extended_switch_types": [],

diff --git a/tests/data/infras/example_script/infra.json b/tests/data/infras/example_script/infra.json
@@ -1,5 +1,5 @@
 {
-    "version": "3.4.12",
+    "version": "3.4.13",
     "operational_points": [
         {
             "id": "my-op",
@@ -13,6 +13,7 @@
                     "position": 500.0
                 }
             ],
+            "weight": null,
             "extensions": {
                 "sncf": {
                     "ci": 0,

diff --git a/tests/data/infras/nested_switches/infra.json b/tests/data/infras/nested_switches/infra.json
@@ -1,5 +1,5 @@
 {
-    "version": "3.4.12",
+    "version": "3.4.13",
     "operational_points": [],
     "routes": [
         {

diff --git a/tests/data/infras/one_line/infra.json b/tests/data/infras/one_line/infra.json
@@ -1,5 +1,5 @@
 {
-    "version": "3.4.12",
+    "version": "3.4.13",
     "operational_points": [],
     "routes": [
         {

diff --git a/tests/data/infras/overlapping_routes/infra.json b/tests/data/infras/overlapping_routes/infra.json
@@ -1,5 +1,5 @@
 {
-    "version": "3.4.12",
+    "version": "3.4.13",
     "operational_points": [
         {
             "id": "op.a1",
@@ -9,6 +9,7 @@
                     "position": 0.0
                 }
             ],
+            "weight": null,
             "extensions": {
                 "sncf": {
                     "ci": 0,
@@ -31,6 +32,7 @@
                     "position": 1000.0
                 }
             ],
+            "weight": null,
             "extensions": {
                 "sncf": {
                     "ci": 0,
@@ -53,6 +55,7 @@
                     "position": 0.0
                 }
             ],
+            "weight": null,
             "extensions": {
                 "sncf": {
                     "ci": 0,
@@ -75,6 +78,7 @@
                     "position": 1000.0
                 }
             ],
+            "weight": null,
             "extensions": {
                 "sncf": {
                     "ci": 0,

diff --git a/tests/data/infras/small_infra/infra.json b/tests/data/infras/small_infra/infra.json
@@ -1,5 +1,5 @@
 {
-    "version": "3.4.12",
+    "version": "3.4.13",
     "operational_points": [
         {
             "id": "West_station",
@@ -17,6 +17,7 @@
                     "position": 500.0
                 }
             ],
+            "weight": null,
             "extensions": {
                 "sncf": {
                     "ci": 0,
@@ -39,6 +40,7 @@
                     "position": 500.0
                 }
             ],
+            "weight": null,
             "extensions": {
                 "sncf": {
                     "ci": 0,
@@ -73,6 +75,7 @@
                     "position": 450.0
                 }
             ],
+            "weight": null,
             "extensions": {
                 "sncf": {
                     "ci": 0,
@@ -99,6 +102,7 @@
                     "position": 14000.0
                 }
             ],
+            "weight": null,
             "extensions": {
                 "sncf": {
                     "ci": 0,
@@ -125,6 +129,7 @@
                     "position": 1025.0
                 }
             ],
+            "weight": null,
             "extensions": {
                 "sncf": {
                     "ci": 0,
@@ -147,6 +152,7 @@
                     "position": 4300.0
                 }
             ],
+            "weight": null,
             "extensions": {
                 "sncf": {
                     "ci": 0,
@@ -173,6 +179,7 @@
                     "position": 1500.0
                 }
             ],
+            "weight": null,
             "extensions": {
                 "sncf": {
                     "ci": 0,
@@ -195,6 +202,7 @@
                     "position": 4400.0
                 }
             ],
+            "weight": null,
             "extensions": {
                 "sncf": {
                     "ci": 0,

diff --git a/tests/data/infras/three_trains/infra.json b/tests/data/infras/three_trains/infra.json
@@ -1,5 +1,5 @@
 {
-    "version": "3.4.12",
+    "version": "3.4.13",
     "operational_points": [],
     "routes": [
         {

diff --git a/tests/data/infras/tiny_infra/infra.json b/tests/data/infras/tiny_infra/infra.json
@@ -1,5 +1,5 @@
 {
-    "version": "3.4.12",
+    "version": "3.4.13",
     "operational_points": [
         {
             "id": "op.station_foo",
@@ -13,6 +13,7 @@
                     "position": 100.0
                 }
             ],
+            "weight": null,
             "extensions": {
                 "sncf": {
                     "ci": 0,
@@ -35,6 +36,7 @@
                     "position": 100.0
                 }
             ],
+            "weight": null,
             "extensions": {
                 "sncf": {
                     "ci": 0,