diff --git a/core/src/main/java/org/mobilitydata/gtfsvalidator/reportsummary/AgencyMetadata.java b/core/src/main/java/org/mobilitydata/gtfsvalidator/reportsummary/AgencyMetadata.java index f81e5988cc..b9afb509e4 100644 --- a/core/src/main/java/org/mobilitydata/gtfsvalidator/reportsummary/AgencyMetadata.java +++ b/core/src/main/java/org/mobilitydata/gtfsvalidator/reportsummary/AgencyMetadata.java @@ -10,8 +10,8 @@ public class AgencyMetadata { public AgencyMetadata(String name, String url, String phone, String email, String timezone) { this.name = name; this.url = url; - this.phone = phone.isEmpty() ? "N/A" : phone; - this.email = email.isEmpty() ? "N/A" : email; - this.timezone = timezone.isEmpty() ? "N/A" : timezone; + this.phone = phone.isEmpty() ? "" : phone; + this.email = email.isEmpty() ? "" : email; + this.timezone = timezone.isEmpty() ? "" : timezone; } } diff --git a/main/src/main/java/org/mobilitydata/gtfsvalidator/reportsummary/model/FeedMetadata.java b/main/src/main/java/org/mobilitydata/gtfsvalidator/reportsummary/model/FeedMetadata.java index de38c4b457..e35020b240 100644 --- a/main/src/main/java/org/mobilitydata/gtfsvalidator/reportsummary/model/FeedMetadata.java +++ b/main/src/main/java/org/mobilitydata/gtfsvalidator/reportsummary/model/FeedMetadata.java @@ -431,16 +431,15 @@ private void loadFeedInfo( var info = feedTable.getEntities().isEmpty() ? null : feedTable.getEntities().get(0); feedInfo.put( - JsonReportFeedInfo.FEED_INFO_PUBLISHER_NAME, - info == null ? "N/A" : info.feedPublisherName()); + JsonReportFeedInfo.FEED_INFO_PUBLISHER_NAME, info == null ? "" : info.feedPublisherName()); feedInfo.put( - JsonReportFeedInfo.FEED_INFO_PUBLISHER_URL, info == null ? "N/A" : info.feedPublisherUrl()); + JsonReportFeedInfo.FEED_INFO_PUBLISHER_URL, info == null ? "" : info.feedPublisherUrl()); feedInfo.put( JsonReportFeedInfo.FEED_INFO_FEED_CONTACT_EMAIL, - info == null ? "N/A" : info.feedContactEmail()); + info == null ? "" : info.feedContactEmail()); feedInfo.put( JsonReportFeedInfo.FEED_INFO_FEED_LANGUAGE, - info == null ? "N/A" : info.feedLang().getDisplayLanguage()); + info == null ? "" : info.feedLang().getDisplayLanguage()); if (feedTable.hasColumn(GtfsFeedInfo.FEED_START_DATE_FIELD_NAME)) { if (info != null) { LocalDate localDate = info.feedStartDate().getLocalDate(); @@ -458,7 +457,7 @@ private void loadFeedInfo( private String checkLocalDate(LocalDate localDate) { String displayDate; if (localDate.toString().equals(LocalDate.EPOCH.toString())) { - displayDate = "N/A"; + displayDate = ""; } else { displayDate = localDate.toString(); } @@ -568,12 +567,12 @@ public void loadServiceWindow( } finally { DateTimeFormatter formatter = DateTimeFormatter.ofPattern("MMMM d, yyyy"); if ((earliestStartDate == null) && (latestEndDate == null)) { - feedInfo.put(JsonReportFeedInfo.FEED_INFO_SERVICE_WINDOW, "N/A"); + feedInfo.put(JsonReportFeedInfo.FEED_INFO_SERVICE_WINDOW, ""); } else if (earliestStartDate == null && latestEndDate != null) { feedInfo.put(JsonReportFeedInfo.FEED_INFO_SERVICE_WINDOW, latestEndDate.format(formatter)); } else if (latestEndDate == null && earliestStartDate != null) { if (earliestStartDate.isAfter(latestEndDate)) { - feedInfo.put(JsonReportFeedInfo.FEED_INFO_SERVICE_WINDOW, "N/A"); + feedInfo.put(JsonReportFeedInfo.FEED_INFO_SERVICE_WINDOW, ""); } else { feedInfo.put( JsonReportFeedInfo.FEED_INFO_SERVICE_WINDOW, earliestStartDate.format(formatter)); diff --git a/main/src/main/resources/report.html b/main/src/main/resources/report.html index 813ef72028..fc82915a68 100644 --- a/main/src/main/resources/report.html +++ b/main/src/main/resources/report.html @@ -269,10 +269,10 @@