From 28ec0ee428333bbf27b93e8fa322f7dac9ae6174 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried <mail@leonard.io>
Date: Thu, 1 Feb 2024 17:54:59 +0100
Subject: [PATCH] Update to newest version of GTFS Flex location groups

---
 pom.xml                                       |  2 +-
 .../gtfs/mapping/LocationGroupMapperTest.java | 51 +++++++++++++++++++
 2 files changed, 52 insertions(+), 1 deletion(-)
 create mode 100644 src/test/java/org/opentripplanner/gtfs/mapping/LocationGroupMapperTest.java

diff --git a/pom.xml b/pom.xml
index ce77a303d7d..7c7f30988b2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -831,7 +831,7 @@
         <dependency>
             <groupId>org.onebusaway</groupId>
             <artifactId>onebusaway-gtfs</artifactId>
-            <version>1.4.10</version>
+            <version>1.4.15</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.slf4j</groupId>
diff --git a/src/test/java/org/opentripplanner/gtfs/mapping/LocationGroupMapperTest.java b/src/test/java/org/opentripplanner/gtfs/mapping/LocationGroupMapperTest.java
new file mode 100644
index 00000000000..f8fe52c4731
--- /dev/null
+++ b/src/test/java/org/opentripplanner/gtfs/mapping/LocationGroupMapperTest.java
@@ -0,0 +1,51 @@
+package org.opentripplanner.gtfs.mapping;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.util.Set;
+import java.util.stream.Collectors;
+import javax.annotation.Nonnull;
+import org.junit.jupiter.api.Test;
+import org.onebusaway.gtfs.model.AgencyAndId;
+import org.onebusaway.gtfs.model.LocationGroup;
+import org.onebusaway.gtfs.model.Stop;
+import org.opentripplanner.transit.model.framework.FeedScopedId;
+import org.opentripplanner.transit.model.site.StopLocation;
+import org.opentripplanner.transit.service.StopModel;
+
+class LocationGroupMapperTest {
+
+  private static final String NAME = "A GROUP";
+
+  @Test
+  void map() {
+    var builder = StopModel.of();
+    var mapper = new LocationGroupMapper(
+      new StopMapper(new TranslationHelper(), id -> null, builder),
+      new LocationMapper(builder),
+      builder
+    );
+
+    var lg = new LocationGroup();
+    lg.setId(id("group-1"));
+    lg.setName(NAME);
+
+    var stop = new Stop();
+    stop.setId(id("stop-1"));
+    stop.setLat(1);
+    stop.setLon(1);
+
+    lg.addLocation(stop);
+    var groupStop = mapper.map(lg);
+    assertEquals(NAME, groupStop.getName().toString());
+    assertEquals(
+      Set.of(new FeedScopedId("1", "stop-1")),
+      groupStop.getChildLocations().stream().map(StopLocation::getId).collect(Collectors.toSet())
+    );
+  }
+
+  @Nonnull
+  private static AgencyAndId id(String id) {
+    return new AgencyAndId("1", id);
+  }
+}