Update NeTEx 1.15 (#220)

entur · Nov 30, 2023 · 3024943 · 3024943
1 parent 199b59c
commit 3024943
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -54,8 +54,8 @@
         <jdk.version>17</jdk.version>
 
         <commons-io.version>2.15.0</commons-io.version>
-        <netex-parser-java.version>3.0.4</netex-parser-java.version>
-        <netex-java-model.version>2.0.14</netex-java-model.version>
+        <netex-parser-java.version>3.1.3</netex-parser-java.version>
+        <netex-java-model.version>2.0.15</netex-java-model.version>
         <onebusaway.version>1.4.9</onebusaway.version>
         <jts.version>1.19.0</jts.version>
         <slf4j.version>2.0.9</slf4j.version>

diff --git a/src/main/java/org/entur/netex/gtfs/export/repository/DefaultNetexDatasetRepository.java b/src/main/java/org/entur/netex/gtfs/export/repository/DefaultNetexDatasetRepository.java
@@ -91,7 +91,7 @@ public OperatingPeriod getOperatingPeriodByDayTypeAssignment(
     }
     OperatingPeriod operatingPeriod = netexEntitiesIndex
       .getOperatingPeriodIndex()
-      .get(dayTypeAssignment.getOperatingPeriodRef().getRef());
+      .get(dayTypeAssignment.getOperatingPeriodRef().getValue().getRef());
     if (operatingPeriod == null) {
       throw new GtfsExportException(
         "OperatingPeriod not found: " +

diff --git a/src/main/java/org/entur/netex/gtfs/export/util/TransportModeUtil.java b/src/main/java/org/entur/netex/gtfs/export/util/TransportModeUtil.java
@@ -464,7 +464,7 @@ public static int getGtfsExtendedRouteType(Line line) {
    * @return the GTFS extended route type code.
    */
   public static int getGtfsExtendedRouteType(
-    VehicleModeEnumeration transportMode
+    AllVehicleModesOfTransportEnumeration transportMode
   ) {
     return getGtfsExtendedRouteType(transportMode.value(), null).getValue();
   }

diff --git a/src/test/java/org/entur/netex/gtfs/export/repository/GtfsServiceRepositoryTest.java b/src/test/java/org/entur/netex/gtfs/export/repository/GtfsServiceRepositoryTest.java
@@ -1001,7 +1001,9 @@ private DayTypeAssignment createTestDayTypeAssignmentWithPeriod(
       NETEX_FACTORY.createOperatingPeriodRefStructure();
     operatingPeriodRef.setRef(operatingPeriodId);
 
-    dayTypeAssignment.setOperatingPeriodRef(operatingPeriodRef);
+    dayTypeAssignment.setOperatingPeriodRef(
+      NETEX_FACTORY.createOperatingPeriodRef(operatingPeriodRef)
+    );
     return dayTypeAssignment;
   }