TRIAS StopEventRequest

application/pom.xml

@@ -217,6 +217,12 @@
             <artifactId>jersey-media-json-jackson</artifactId>
             <version>${jersey.version}</version>
         </dependency>
+        <!-- JAXB serialize Jersey response objects to XML. -->
+        <dependency>
+            <groupId>org.glassfish.jersey.media</groupId>
+            <artifactId>jersey-media-jaxb</artifactId>
+            <version>${jersey.version}</version>
+        </dependency>
         <!-- HK2 dependency injection framework for injecting context -->
         <dependency>
             <groupId>org.glassfish.jersey.inject</groupId>
@@ -378,6 +384,12 @@
             <version>0.28.2</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.opentripplanner</groupId>
+            <artifactId>ojp-java-model</artifactId>
+            <version>2.0.0</version>
+        </dependency>
+
         <!-- create zip test files-->
         <dependency>
             <groupId>org.apache.commons</groupId>

application/src/ext-test/java/org/opentripplanner/ext/trias/doc/TriasApiDocTest.java

@@ -0,0 +1,81 @@
+package org.opentripplanner.ext.trias.doc;
+
+import static org.opentripplanner.framework.application.OtpFileNames.ROUTER_CONFIG_FILENAME;
+import static org.opentripplanner.framework.io.FileUtils.assertFileEquals;
+import static org.opentripplanner.framework.io.FileUtils.readFile;
+import static org.opentripplanner.framework.io.FileUtils.writeFile;
+import static org.opentripplanner.generate.doc.framework.DocsTestConstants.TEMPLATE_PATH;
+import static org.opentripplanner.generate.doc.framework.DocsTestConstants.USER_DOC_PATH;
+import static org.opentripplanner.generate.doc.framework.TemplateUtil.replaceSection;
+import static org.opentripplanner.standalone.config.framework.json.JsonSupport.jsonNodeFromPath;
+import static org.opentripplanner.utils.text.MarkdownFormatter.HEADER_4;
+
+import java.io.File;
+import org.junit.jupiter.api.Test;
+import org.opentripplanner.generate.doc.framework.DocBuilder;
+import org.opentripplanner.generate.doc.framework.GeneratesDocumentation;
+import org.opentripplanner.generate.doc.framework.ParameterDetailsList;
+import org.opentripplanner.generate.doc.framework.ParameterSummaryTable;
+import org.opentripplanner.generate.doc.framework.SkipNodes;
+import org.opentripplanner.generate.doc.framework.TemplateUtil;
+import org.opentripplanner.standalone.config.RouterConfig;
+import org.opentripplanner.standalone.config.framework.json.NodeAdapter;
+import org.opentripplanner.test.support.ResourceLoader;
+
+@GeneratesDocumentation
+public class TriasApiDocTest {
+
+  private static final File TEMPLATE = new File(TEMPLATE_PATH + "/sandbox", "TriasApi.md");
+  private static final File OUT_FILE = new File(USER_DOC_PATH + "/sandbox", "TriasApi.md");
+
+  private static final File ROUTER_CONFIG_FILE = ResourceLoader.of(
+    TriasApiDocTest.class
+  ).extTestResourceFile(ROUTER_CONFIG_FILENAME);
+  private static final SkipNodes SKIP_NODES = SkipNodes.of().build();
+  public static final String CONFIG_PARAM = "triasApi";
+
+  @Test
+  public void update() {
+    NodeAdapter node = readTriasConfig();
+
+    // Read and close input file (same as output file)
+    String template = readFile(TEMPLATE);
+    String original = readFile(OUT_FILE);
+
+    template = replaceSection(template, "config", updaterDoc(node));
+
+    writeFile(OUT_FILE, template);
+    assertFileEquals(original, OUT_FILE);
+  }
+
+  private NodeAdapter readTriasConfig() {
+    var json = jsonNodeFromPath(ROUTER_CONFIG_FILE.toPath());
+    var conf = new RouterConfig(json, ROUTER_CONFIG_FILE.getName(), false);
+    return conf.asNodeAdapter().child(CONFIG_PARAM);
+  }
+
+  private String updaterDoc(NodeAdapter node) {
+    DocBuilder buf = new DocBuilder();
+    addExample(buf, node);
+    addParameterSummaryTable(buf, node);
+    addDetailsSection(buf, node);
+    return buf.toString();
+  }
+
+  private void addParameterSummaryTable(DocBuilder buf, NodeAdapter node) {
+    buf
+      .header(3, "Overview", null)
+      .addSection(new ParameterSummaryTable(SKIP_NODES).createTable(node).toMarkdownTable());
+  }
+
+  private void addDetailsSection(DocBuilder buf, NodeAdapter node) {
+    buf
+      .header(3, "Details", null)
+      .addSection(ParameterDetailsList.listParametersWithDetails(node, SKIP_NODES, HEADER_4));
+  }
+
+  private void addExample(DocBuilder buf, NodeAdapter node) {
+    var root = TemplateUtil.jsonExampleBuilder(node.rawNode()).wrapInObject(CONFIG_PARAM).build();
+    buf.header(3, "Example configuration", null).addExample(ROUTER_CONFIG_FILENAME, root);
+  }
+}

application/src/ext-test/java/org/opentripplanner/ext/trias/id/HideFeedIdResolverTest.java

@@ -0,0 +1,23 @@
+package org.opentripplanner.ext.trias.id;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import org.junit.jupiter.api.Test;
+import org.opentripplanner.transit.model.framework.FeedScopedId;
+
+class HideFeedIdResolverTest {
+
+  private static final HideFeedIdResolver RESOLVER = new HideFeedIdResolver("aaa");
+
+  @Test
+  void parse() {
+    var id = RESOLVER.parse("bbb");
+    assertEquals(new FeedScopedId("aaa", "bbb"), id);
+  }
+
+  @Test
+  void tostring() {
+    var id = RESOLVER.toString(new FeedScopedId("aaa", "bbb"));
+    assertEquals("bbb", id);
+  }
+}

application/src/ext-test/java/org/opentripplanner/ext/trias/id/UseFeedIdResolverTest.java

@@ -0,0 +1,23 @@
+package org.opentripplanner.ext.trias.id;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import org.junit.jupiter.api.Test;
+import org.opentripplanner.transit.model.framework.FeedScopedId;
+
+class UseFeedIdResolverTest {
+
+  private static final IdResolver RESOLVER = new UseFeedIdResolver();
+
+  @Test
+  void parse() {
+    var id = RESOLVER.parse("aaa:bbb");
+    assertEquals(new FeedScopedId("aaa", "bbb"), id);
+  }
+
+  @Test
+  void tostring() {
+    var id = RESOLVER.toString(new FeedScopedId("aaa", "bbb"));
+    assertEquals("aaa:bbb", id);
+  }
+}

application/src/ext-test/java/org/opentripplanner/ext/trias/mapping/PtModeMapperTest.java

@@ -0,0 +1,16 @@
+package org.opentripplanner.ext.trias.mapping;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.EnumSource;
+import org.opentripplanner.transit.model.basic.TransitMode;
+
+class PtModeMapperTest {
+
+  @ParameterizedTest
+  @EnumSource(TransitMode.class)
+  void map(TransitMode mode) {
+    assertNotNull(PtModeMapper.map(mode));
+  }
+}

application/src/ext-test/java/org/opentripplanner/ext/trias/service/OjpServiceMapperTest.java

@@ -0,0 +1,191 @@
+package org.opentripplanner.ext.trias.service;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.opentripplanner.transit.model._data.TimetableRepositoryForTest.id;
+import static org.opentripplanner.transit.model.basic.TransitMode.BUS;
+import static org.opentripplanner.transit.model.basic.TransitMode.FERRY;
+
+import de.vdv.ojp20.IndividualTransportOptionStructure;
+import de.vdv.ojp20.ItModesStructure;
+import de.vdv.ojp20.LineDirectionFilterStructure;
+import de.vdv.ojp20.ModeFilterStructure;
+import de.vdv.ojp20.OJPStopEventRequestStructure;
+import de.vdv.ojp20.PersonalModesEnumeration;
+import de.vdv.ojp20.PlaceContextStructure;
+import de.vdv.ojp20.StopEventParamStructure;
+import de.vdv.ojp20.siri.LineDirectionStructure;
+import de.vdv.ojp20.siri.LineRefStructure;
+import de.vdv.ojp20.siri.VehicleModesOfTransportEnumeration;
+import java.math.BigInteger;
+import java.time.ZonedDateTime;
+import java.util.Set;
+import org.junit.jupiter.api.Test;
+import org.opentripplanner._support.time.ZoneIds;
+import org.opentripplanner.ext.trias.id.UseFeedIdResolver;
+import org.opentripplanner.transit.model.framework.FeedScopedId;
+import org.rutebanken.time.XmlDateTime;
+
+class OjpServiceMapperTest {
+
+  private static final ZonedDateTime ZDT = ZonedDateTime.parse("2025-02-17T14:24:02+01:00");
+  private static final UseFeedIdResolver ID_RESOLVER = new UseFeedIdResolver();
+  private static final OjpServiceMapper SERVICE = new OjpServiceMapper(
+    null,
+    ID_RESOLVER,
+    ZoneIds.BERLIN
+  );
+
+  private static final FeedScopedId LINE_ID = id("line1");
+
+  @Test
+  void defaultCase() {
+    var params = SERVICE.extractStopEventParams(stopEvent(new StopEventParamStructure()));
+    assertThat(params.includedAgencies()).isEmpty();
+    assertThat(params.excludedAgencies()).isEmpty();
+    assertThat(params.includedRoutes()).isEmpty();
+    assertThat(params.excludedAgencies()).isEmpty();
+    assertThat(params.includedModes()).isEmpty();
+    assertThat(params.excludedModes()).isEmpty();
+    assertEquals(OjpServiceMapper.DEFAULT_RADIUS_METERS, params.maximumWalkDistance());
+    assertEquals(OjpServiceMapper.DEFAULT_NUM_DEPARTURES, params.numDepartures());
+  }
+
+  @Test
+  void maxDistance() {
+    var params = SERVICE.extractStopEventParams(
+      new OJPStopEventRequestStructure()
+        .withLocation(
+          new PlaceContextStructure()
+            .withDepArrTime(new XmlDateTime(ZDT))
+            .withIndividualTransportOption(
+              new IndividualTransportOptionStructure()
+                .withItModeAndModeOfOperation(
+                  new ItModesStructure().withPersonalMode(PersonalModesEnumeration.FOOT)
+                )
+                .withMaxDistance(BigInteger.TEN)
+            )
+        )
+    );
+    assertEquals(10, params.maximumWalkDistance());
+  }
+
+  @Test
+  void numDepartures() {
+    var params = SERVICE.extractStopEventParams(
+      stopEvent(new StopEventParamStructure().withNumberOfResults(BigInteger.TWO))
+    );
+    assertEquals(2, params.numDepartures());
+  }
+
+  @Test
+  void lineFilterImplicitExclude() {
+    var params = SERVICE.extractStopEventParams(
+      lineFilter(
+        new LineDirectionFilterStructure()
+          .withLine(
+            new LineDirectionStructure()
+              .withLineRef(new LineRefStructure().withValue(LINE_ID.toString()))
+          )
+      )
+    );
+    assertThat(params.includedAgencies()).isEmpty();
+    assertThat(params.excludedAgencies()).isEmpty();
+    assertThat(params.includedRoutes()).isEmpty();
+    assertEquals(Set.of(LINE_ID), params.excludedRoutes());
+    assertThat(params.includedModes()).isEmpty();
+    assertThat(params.excludedModes()).isEmpty();
+  }
+
+  @Test
+  void lineFilterInclude() {
+    var params = SERVICE.extractStopEventParams(
+      lineFilter(
+        new LineDirectionFilterStructure()
+          .withExclude(true)
+          .withLine(
+            new LineDirectionStructure()
+              .withLineRef(new LineRefStructure().withValue(LINE_ID.toString()))
+          )
+      )
+    );
+    assertThat(params.includedAgencies()).isEmpty();
+    assertThat(params.excludedAgencies()).isEmpty();
+    assertThat(params.includedRoutes()).isEmpty();
+    assertEquals(Set.of(LINE_ID), params.excludedRoutes());
+    assertThat(params.includedModes()).isEmpty();
+    assertThat(params.excludedModes()).isEmpty();
+  }
+
+  @Test
+  void lineFilterExclude() {
+    var params = SERVICE.extractStopEventParams(
+      lineFilter(
+        new LineDirectionFilterStructure()
+          .withExclude(false)
+          .withLine(
+            new LineDirectionStructure()
+              .withLineRef(new LineRefStructure().withValue(LINE_ID.toString()))
+          )
+      )
+    );
+    assertThat(params.includedAgencies()).isEmpty();
+    assertThat(params.excludedAgencies()).isEmpty();
+    assertEquals(Set.of(LINE_ID), params.includedRoutes());
+    assertThat(params.excludedRoutes()).isEmpty();
+    assertThat(params.includedModes()).isEmpty();
+    assertThat(params.excludedModes()).isEmpty();
+  }
+
+  @Test
+  void modeFilter() {
+    var params = SERVICE.extractStopEventParams(
+      stopEvent(
+        new StopEventParamStructure()
+          .withModeFilter(
+            new ModeFilterStructure()
+              .withPtMode(
+                VehicleModesOfTransportEnumeration.BUS,
+                VehicleModesOfTransportEnumeration.FERRY
+              )
+          )
+      )
+    );
+    assertThat(params.includedAgencies()).isEmpty();
+    assertThat(params.excludedAgencies()).isEmpty();
+    assertThat(params.includedRoutes()).isEmpty();
+    assertThat(params.excludedRoutes()).isEmpty();
+    assertThat(params.includedModes()).isEmpty();
+    assertEquals(Set.of(BUS, FERRY), params.excludedModes());
+  }
+
+  @Test
+  void modeFilterExclude() {
+    var params = SERVICE.extractStopEventParams(
+      stopEvent(
+        new StopEventParamStructure()
+          .withModeFilter(
+            new ModeFilterStructure()
+              .withExclude(false)
+              .withPtMode(VehicleModesOfTransportEnumeration.BUS)
+          )
+      )
+    );
+    assertThat(params.includedAgencies()).isEmpty();
+    assertThat(params.excludedAgencies()).isEmpty();
+    assertThat(params.includedRoutes()).isEmpty();
+    assertThat(params.excludedRoutes()).isEmpty();
+    assertEquals(Set.of(BUS), params.includedModes());
+    assertThat(params.excludedModes()).isEmpty();
+  }
+
+  private static OJPStopEventRequestStructure lineFilter(LineDirectionFilterStructure value) {
+    return stopEvent(new StopEventParamStructure().withLineFilter(value));
+  }
+
+  private static OJPStopEventRequestStructure stopEvent(StopEventParamStructure p) {
+    return new OJPStopEventRequestStructure()
+      .withLocation(new PlaceContextStructure().withDepArrTime(new XmlDateTime(ZDT)))
+      .withParams(p);
+  }
+}