-
Notifications
You must be signed in to change notification settings - Fork 53
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
refactor(Fixed merge conflicts): Fixed conflicts with merging dev-fle…
…x into flex-merge-feeds
- Loading branch information
Showing
13 changed files
with
214 additions
and
46 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
109 changes: 109 additions & 0 deletions
109
src/main/java/com/conveyal/datatools/manager/jobs/feedmerge/ReferenceTableDiscovery.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,109 @@ | ||
| package com.conveyal.datatools.manager.jobs.feedmerge; | ||
|
|
||
| import com.conveyal.gtfs.loader.Field; | ||
| import com.conveyal.gtfs.loader.Table; | ||
|
|
||
| import java.util.stream.Collectors; | ||
|
|
||
| import static com.conveyal.datatools.manager.jobs.feedmerge.MergeLineContext.SERVICE_ID; | ||
|
|
||
| public class ReferenceTableDiscovery { | ||
|
|
||
| public static final String REF_TABLE_SEPARATOR = "#~#"; | ||
|
|
||
| public enum ReferenceTableKey { | ||
|
|
||
| TRIP_SERVICE_ID_KEY( | ||
| String.join( | ||
| REF_TABLE_SEPARATOR, | ||
| Table.TRIPS.name, | ||
| SERVICE_ID, | ||
| Table.CALENDAR.name, | ||
| Table.CALENDAR_DATES.name, | ||
| Table.SCHEDULE_EXCEPTIONS.name | ||
| ) | ||
| ), | ||
| STOP_AREA_STOP_ID_KEY( | ||
| String.join( | ||
| REF_TABLE_SEPARATOR, | ||
| Table.STOP_AREAS.name, | ||
| "stop_id", | ||
| Table.STOPS.name, | ||
| Table.LOCATIONS.name | ||
| ) | ||
| ), | ||
| STOP_TIMES_STOP_ID_KEY( | ||
| String.join( | ||
| REF_TABLE_SEPARATOR, | ||
| Table.STOP_TIMES.name, | ||
| "stop_id", | ||
| Table.STOPS.name, | ||
| Table.LOCATIONS.name, | ||
| Table.STOP_AREAS.name | ||
| ) | ||
| ); | ||
|
|
||
| private final String value; | ||
|
|
||
| ReferenceTableKey(String value) { | ||
| this.value = value; | ||
| } | ||
|
|
||
| public String getValue() { | ||
| return value; | ||
| } | ||
|
|
||
| public static ReferenceTableKey fromValue(String key) { | ||
| for (ReferenceTableKey ref: ReferenceTableKey.values()) { | ||
| if (ref.getValue().equals(key)) { | ||
| return ref; | ||
| } | ||
| } | ||
| throw new UnsupportedOperationException(String.format("Unsupported reference table key: %s.", key)); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Get reference table key by matching the provided values to predefined reference table keys. | ||
| */ | ||
| public static ReferenceTableKey getReferenceTableKey(Field field, Table table) { | ||
| return ReferenceTableKey.fromValue(createKey(field, table)); | ||
| } | ||
|
|
||
| /** | ||
| * Create a unique key for this table, field and reference tables. | ||
| */ | ||
| public static String createKey(Field field, Table table) { | ||
| return String.format( | ||
| "%s%s%s%s%s", | ||
| table.name, | ||
| REF_TABLE_SEPARATOR, | ||
| field.name, | ||
| REF_TABLE_SEPARATOR, | ||
| field.referenceTables.stream().map(r -> r.name).collect(Collectors.joining(REF_TABLE_SEPARATOR)) | ||
| ); | ||
| } | ||
|
|
||
| /** | ||
| * Define the reference table for a trip service id. | ||
| */ | ||
| public static Table getTripServiceIdReferenceTable( | ||
| String fieldValue, | ||
| MergeFeedsResult mergeFeedsResult, | ||
| String calendarKey, | ||
| String calendarDatesKey | ||
| ) { | ||
| if ( | ||
| mergeFeedsResult.calendarServiceIds.contains(fieldValue) || | ||
| mergeFeedsResult.skippedIds.contains(calendarKey) | ||
| ) { | ||
| return Table.CALENDAR; | ||
| } else if ( | ||
| mergeFeedsResult.calendarDatesServiceIds.contains(fieldValue) || | ||
| mergeFeedsResult.skippedIds.contains(calendarDatesKey) | ||
| ) { | ||
| return Table.CALENDAR_DATES; | ||
| } | ||
| return null; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.