Skip to content

Commit

Permalink
refactor: address PR #288 comments
Browse files Browse the repository at this point in the history
  • Loading branch information
landonreed committed Jul 13, 2020
1 parent e37b36d commit eff5b60
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,10 @@ public class MergeFeedsJob extends MonitorableJob {
public final String projectId;
public final MergeFeedsType mergeType;
private File mergedTempFile = null;
/**
* If {@link MergeFeedsJob} storeNewVersion variable is true, a new version will be created from the merged GTFS
* dataset. Otherwise, this will be null throughout the life of the job.
*/
final FeedVersion mergedVersion;
public boolean failOnDuplicateTripId = true;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
package com.conveyal.datatools.manager.jobs;

/**
* This enum contains the types of merge feeds that {@link MergeFeedsJob} can currently perform.
*/
public enum MergeFeedsType {
/** Merge feed versions that represent different transit agencies (usually operating in the same geographic region */
REGIONAL,
/**
* Merge two feed versions from the same transit agency that contain service for different time periods (usually to
* combine two overlapping time periods, for example, the current schedules and the future schedules).
*/
SERVICE_PERIOD
}

0 comments on commit eff5b60

Please sign in to comment.