fixup! editoast: pathfinding: add CI/CH codes to pathfinding response

Author: Yohh

editoast/src/views/pathfinding/mod.rs

@@ -382,13 +382,13 @@ impl Pathfinding {
                     .id
                     .as_ref()
                     .map(|op_id| op_map.get(op_id).expect("unexpected OP id"));
-                op.and_then(|op| op.extensions.identifier.as_ref())
-                    .map(|ident| {
-                        op_name = Some(ident.name.as_ref().to_owned());
-                        op_uic = Some(ident.uic);
-                    });
-                op.and_then(|op| op.extensions.sncf.as_ref())
-                    .map(|sncf| op_ch = Some(sncf.ch.to_owned()));
+                if let Some(ident) = op.and_then(|op| op.extensions.identifier.as_ref()) {
+                    op_name = Some(ident.name.as_ref().to_owned());
+                    op_uic = Some(ident.uic);
+                }
+                if let Some(sncf) = op.and_then(|op| op.extensions.sncf.as_ref()) {
+                    op_ch = Some(sncf.ch.to_owned())
+                }
                 let track = track_map
                     .get(&waypoint.location.track_section.0)
                     .expect("unexpected track id");

tests/tests/test_pathfinding.py

@@ -52,7 +52,6 @@
         "curves": [{"radius": 0.0, "position": 0.0}, {"radius": 0.0, "position": 45549.5653000392}],
         "steps": [
             {
-                "ch": None,
                 "id": None,
                 "name": None,
                 "location": {"track_section": "TA2", "offset": 837.033949007362},
@@ -61,10 +60,10 @@
                 "suggestion": False,
                 "geo": {"coordinates": [-0.387122554630656, 49.49979999999999], "type": "Point"},
                 "sch": {"coordinates": [-0.387122554630656, 49.49979999999999], "type": "Point"},
+                "ch": None,
                 "uic": None,
             },
             {
-                "ch": None,
                 "id": "Mid_West_station",
                 "name": "Mid_West_station",
                 "location": {"track_section": "TC2", "offset": 450.0},
@@ -73,10 +72,10 @@
                 "suggestion": True,
                 "geo": {"coordinates": [-0.30369999999999997, 49.4999], "type": "Point"},
                 "sch": {"coordinates": [-0.30369999999999997, 49.4999], "type": "Point"},
+                "ch": "aa",
                 "uic": None,
             },
             {
-                "ch": None,
                 "id": "Mid_East_station",
                 "name": "Mid_East_station",
                 "location": {"track_section": "TD1", "offset": 14000.0},
@@ -85,10 +84,10 @@
                 "suggestion": True,
                 "geo": {"coordinates": [-0.22656, 49.4999], "type": "Point"},
                 "sch": {"coordinates": [-0.22656, 49.4999], "type": "Point"},
+                "ch": "aa",
                 "uic": None,
             },
             {
-                "ch": None,
                 "id": None,
                 "name": None,
                 "location": {"track_section": "TH1", "offset": 4386.599249046556},
@@ -97,6 +96,7 @@
                 "suggestion": False,
                 "geo": {"coordinates": [-0.095104854807785, 49.484], "type": "Point"},
                 "sch": {"coordinates": [-0.095104854807785, 49.484], "type": "Point"},
+                "ch": None,
                 "uic": None,
             },
         ],