Improved support for AM/MR rolling stock

Author: Bertware

opentransport_be/src/main/java/be/hyperrail/opentransportdata/be/irail/NmbsToMlgDessinsAdapter.java

@@ -12,33 +12,42 @@ private NmbsToMlgDessinsAdapter() {
 
     }
 
-    static NmbsTrainType convert(String parentType, String subType, String orientation, int firstClassSeats) {
+    static NmbsTrainType convert(String parentType, String subType, String orientation, int firstClassSeats, int position) {
+        subType = subType.toUpperCase();
         if (parentType.startsWith("HLE")) {
             return convertHle(parentType, subType, orientation);
-        } else if (parentType.startsWith("AM") || parentType.startsWith("MR") || parentType.startsWith("AR")) {
+        } else if (parentType.startsWith("AM") || parentType.startsWith("MR") || parentType.startsWith("AR") || parentType.startsWith("M08")) {
             return convertAm(parentType, subType, orientation, firstClassSeats);
         } else if (parentType.startsWith("I") || parentType.startsWith("M")) {
-            return convertCarriage(parentType, subType, orientation, firstClassSeats);
+            return convertCarriage(parentType, subType, orientation, firstClassSeats, position);
         } else {
             return new NmbsTrainType(parentType, subType, orientation);
         }
     }
 
-    private static NmbsTrainType convertCarriage(String parentType, String subType, String orientation, int firstClassSeats) {
+    private static NmbsTrainType convertCarriage(String parentType, String subType, String orientation, int firstClassSeats, int position) {
         String newParentType = parentType;
         String newSubType = subType;
+        String newOrientation = orientation;
         switch (parentType) {
             case "M4":
                 switch (subType) {
                     case "A":
                     case "AU":
+                    case "AYU":
                         newSubType = "B_A";
                         break;
                     case "AD":
                     case "AUD":
                         newSubType = "B_AD";
                         break;
+                    case "ADU":
                     case "ADX":
+                        if (position <= 2) {
+                            newOrientation = "R";
+                        } else {
+                            newOrientation = "L";
+                        }
                         newSubType = "B_ADX";
                         break;
                     case "B":
@@ -109,31 +118,34 @@ private static NmbsTrainType convertCarriage(String parentType, String subType,
                 }
                 break;
         }
-        return new NmbsTrainType(newParentType, newSubType, orientation);
+        return new NmbsTrainType(newParentType, newSubType, newOrientation);
     }
 
     private static NmbsTrainType convertAm(String parentType, String subType, String orientation, int firstClassSeats) {
         String newParentType = parentType;
         String newSubType = subType;
-
         switch (parentType) {
             case "AM08":
             case "AM08M":
+                newParentType = "AM08";
                 switch (subType) {
                     case "A":
+                        newSubType = "A";
+                        break;
                     case "C":
                         newSubType = "0_C";
                         break;
                     case "B":
                         newSubType = "0_B";
                         break;
                 }
-                newParentType = "AM08";
                 break;
             case "AM08P":
                 newParentType = "AM08";
                 switch (subType) {
                     case "A":
+                        newSubType = "A";
+                        break;
                     case "C":
                         newSubType = "5_C";
                         break;

opentransport_be/src/main/java/be/hyperrail/opentransportdata/be/irail/VehicleCompositionParser.java

@@ -37,7 +37,7 @@ VehicleCompositionImpl parseVehicleComposition(Context appContext, JSONObject re
         boolean confirmed = !longestSegment.getJSONObject("composition").getString("source").equalsIgnoreCase("planning");
         VehicleCompositionUnit[] vehicleCompositionUnits = new VehicleCompositionUnit[units.length()];
         for (int i = 0; i < units.length(); i++) {
-            vehicleCompositionUnits[i] = parseVehicleCompositionUnit(appContext, units.getJSONObject(i));
+            vehicleCompositionUnits[i] = parseVehicleCompositionUnit(appContext, units.getJSONObject(i), i);
         }
         return new VehicleCompositionImpl(vehicleCompositionUnits, confirmed);
     }
@@ -58,7 +58,7 @@ private JSONObject getLongestComposition(JSONArray segmentsArray) throws JSONExc
         return longestSegment;
     }
 
-    private VehicleCompositionUnit parseVehicleCompositionUnit(Context appContext, JSONObject jsonObject) throws JSONException {
+    private VehicleCompositionUnit parseVehicleCompositionUnit(Context appContext, JSONObject jsonObject, int position) throws JSONException {
         String parentType = jsonObject.getJSONObject("materialType").getString("parent_type").toUpperCase();
         String subType = jsonObject.getJSONObject("materialType").getString("sub_type").toUpperCase();
         String orientation = jsonObject.getJSONObject("materialType").getString("orientation").substring(0, 1).toUpperCase();
@@ -70,7 +70,7 @@ private VehicleCompositionUnit parseVehicleCompositionUnit(Context appContext, J
         int numberOfFirstClassSeats = jsonObject.getInt("seatsFirstClass");
         int numberOfSecondClassSeats = jsonObject.getInt("seatsSecondClass");
 
-        NmbsTrainType trainType = NmbsToMlgDessinsAdapter.convert(parentType, subType, orientation, numberOfFirstClassSeats);
+        NmbsTrainType trainType = NmbsToMlgDessinsAdapter.convert(parentType, subType, orientation, numberOfFirstClassSeats, position);
         int resourceId = getResourceIdForTrain(appContext, trainType);
         return new VehicleCompositionUnitImpl(resourceId, publicFacingNumber, trainType.parentType, hasToilet, hasAirco, canPassToNextUnit, numberOfFirstClassSeats, numberOfSecondClassSeats);
     }