Merge 8d3cb1e into 9badbe8

MobilityData · Jan 23, 2025 · 7a41769 · 7a41769
2 parents 9badbe8 + 8d3cb1e
commit 7a41769
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 0 deletions.
diff --git a/main/src/main/java/org/mobilitydata/gtfsvalidator/report/JsonReportSummary.java b/main/src/main/java/org/mobilitydata/gtfsvalidator/report/JsonReportSummary.java
@@ -37,6 +37,7 @@ public class JsonReportSummary {
   private Set<String> files;
   private Double validationTimeSeconds;
   public List<MemoryUsage> memoryUsageRecords;
+  public String agencyTimezone;
 
   @SerializedName("counts")
   private JsonReportCounts jsonReportCounts;
@@ -71,6 +72,7 @@ public JsonReportSummary(
         this.feedInfo = new JsonReportFeedInfo(feedMetadata.feedInfo);
         this.validationTimeSeconds = feedMetadata.validationTimeSeconds;
         this.memoryUsageRecords = feedMetadata.memoryUsageRecords;
+        this.agencyTimezone = feedMetadata.agencyTimezone;
       } else {
         logger.atSevere().log(
             "No feed info for feed "
@@ -119,6 +121,7 @@ private static class JsonReportFeedInfo {
     public JsonReportFeedInfo(Map<String, String> feedInfo) {
       publisherName = feedInfo.get(FeedMetadata.FEED_INFO_PUBLISHER_NAME);
       publisherUrl = feedInfo.get(FeedMetadata.FEED_INFO_PUBLISHER_URL);
+      // here
       feedEmail = feedInfo.get(FeedMetadata.FEED_INFO_FEED_CONTACT_EMAIL);
       feedLanguage = feedInfo.get(FeedMetadata.FEED_INFO_FEED_LANGUAGE);
       feedStartDate = feedInfo.get(FeedMetadata.FEED_INFO_FEED_START_DATE);

diff --git a/main/src/main/java/org/mobilitydata/gtfsvalidator/report/model/FeedMetadata.java b/main/src/main/java/org/mobilitydata/gtfsvalidator/report/model/FeedMetadata.java
@@ -57,6 +57,9 @@ public class FeedMetadata {
   public double validationTimeSeconds;
 
   public List<MemoryUsage> memoryUsageRecords;
+
+  public String agencyTimezone;
+
   // List of features that only require checking the presence of one record in the file.
   private final List<Pair<FeatureMetadata, String>> FILE_BASED_FEATURES =
       List.of(
@@ -105,6 +108,7 @@ public static FeedMetadata from(GtfsFeedContainer feedContainer, ImmutableSet<St
       Optional<GtfsTableContainer<GtfsAgency, GtfsAgencyTableDescriptor>> agencyTableOptional =
           feedContainer.getTableForFilename(GtfsAgency.FILENAME);
       feedMetadata.loadAgencyData(agencyTableOptional.get());
+      feedMetadata.loadAgencyTimezone(agencyTableOptional.get());
     }
 
     if (feedContainer.getTableForFilename(GtfsTrip.FILENAME).isPresent()
@@ -124,6 +128,20 @@ public static FeedMetadata from(GtfsFeedContainer feedContainer, ImmutableSet<St
     return feedMetadata;
   }
 
+  private void loadAgencyTimezone(
+      GtfsTableContainer<GtfsAgency, GtfsAgencyTableDescriptor>
+          gtfsAgencyGtfsAgencyTableDescriptorGtfsTableContainer) {
+    if (gtfsAgencyGtfsAgencyTableDescriptorGtfsTableContainer.getEntities().isEmpty()) {
+      return;
+    }
+    agencyTimezone =
+        gtfsAgencyGtfsAgencyTableDescriptorGtfsTableContainer
+            .getEntities()
+            .get(0)
+            .agencyTimezone()
+            .getId();
+  }
+
   private void setCounts(GtfsFeedContainer feedContainer) {
     setCount(COUNTS_SHAPES, feedContainer, GtfsShape.FILENAME, GtfsShape.class, GtfsShape::shapeId);
     setCount(COUNTS_STOPS, feedContainer, GtfsStop.FILENAME, GtfsStop.class, GtfsStop::stopId);