Parse material modifications

models/common.go

@@ -21,7 +21,12 @@ type Material struct {
 	DestinationActual  Station `json:"destination_actual"`
 	DestinationPlanned Station `json:"destination_planned"`
 	Accessible         bool    `json:"accessible"`
-	RemainsBehind      bool    `json:"remains_behind"`
+
+	Closed        bool `json:"closed"`
+	RemainsBehind bool `json:"remains_behind"`
+	Added         bool `json:"added"`
+
+	Modifications []Modification
 }
 
 // StoreItem is for shared fields like ID, timestamp etc.

models/modification.go

@@ -89,6 +89,15 @@ const ModificationSprinterRunsAsIntercity = 80
 // ModificationSprinterRunsAsIntercity when an Sprinter train is running with intercity stock
 const ModificationIntercityRunsAsSprinter = 81
 
+// ModificationMaterialClosed when material is closed for passengers
+const ModificationMaterialClosed = 82
+
+// ModificationMaterialAdded when material is added on a station
+const ModificationMaterialAdded = 83
+
+// ModificationMaterialLeftBehind when material is left behind on a station
+const ModificationMaterialLeftBehind = 84
+
 // Modification is a change (to the schedule) which is communicated to travellers
 type Modification struct {
 	ModificationType int     `json:"type"`

parsers/dvsparser.go

@@ -167,6 +167,19 @@ func ParseDvsMessage(reader io.Reader) (departure models.Departure, err error) {
 
 			material.DestinationActual = ParseInfoPlusStation(ParseWhenAttribute(materialInfo, "MaterieelDeelEindBestemming", "InfoStatus", "Actueel"))
 			material.DestinationPlanned = ParseInfoPlusStation(ParseWhenAttribute(materialInfo, "MaterieelDeelEindBestemming", "InfoStatus", "Gepland"))
+			material.Modifications = ParseInfoPlusModifications(materialInfo)
+
+			// Check for flags that may be set:
+			for _, modification := range material.Modifications {
+				switch modification.ModificationType {
+				case models.ModificationMaterialClosed:
+					material.Closed = true
+				case models.ModificationMaterialAdded:
+					material.Added = true
+				case models.ModificationMaterialLeftBehind:
+					material.RemainsBehind = true
+				}
+			}
 
 			trainWing.Material = append(trainWing.Material, material)
 		}

parsers/dvsparser_test.go

@@ -181,3 +181,19 @@ func testParseDeparture(t *testing.T, name string) models.Departure {
 
 	return departure
 }
+
+func TestParseMaterialLeftBehind(t *testing.T) {
+	departure := testParseDeparture(t, "departure_material-left-behind.xml")
+
+	if departure.TrainWings[0].Material[0].RemainsBehind != true {
+		t.Errorf("Wrong Material.RemainsBehind: expected '%v', but got '%v'", true, departure.TrainWings[0].Material[0].RemainsBehind)
+	}
+}
+
+func TestParseMaterialModifications(t *testing.T) {
+	departure := testParseDeparture(t, "departure_material-added.xml")
+
+	if departure.TrainWings[0].Material[0].Added != true {
+		t.Errorf("Wrong Material.RemainsBehind: expected '%v', but got '%v'", true, departure.TrainWings[0].Material[0].Added)
+	}
+}