Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support pelias synonyms file #547

Merged
merged 2 commits into from
Jul 13, 2023
Merged

Support pelias synonyms file #547

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
afed13c
feat: Support pelias synonyms file
miles-grant-ibigroup Jun 30, 2023
a4b9ddf
Merge branch 'dev' into pelias-synonyms
miles-grant-ibigroup Jul 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/main/java/com/conveyal/datatools/manager/jobs/PeliasUpdateJob.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@ private String makeWebhookRequest() {
PeliasWebhookRequestBody peliasWebhookRequestBody = new PeliasWebhookRequestBody();
peliasWebhookRequestBody.gtfsFeeds = gtfsFeeds;
peliasWebhookRequestBody.csvFiles = deployment.peliasCsvFiles;
peliasWebhookRequestBody.peliasSynonymsBase64 = deployment.peliasSynonymsBase64;
peliasWebhookRequestBody.logUploadUrl = logUploadS3URI.toString();
peliasWebhookRequestBody.deploymentId = deployment.id;
peliasWebhookRequestBody.resetDb = deployment.peliasResetDb;
Expand Down Expand Up @@ -218,6 +219,8 @@ private static class PeliasWebhookRequestBody {
public String logUploadUrl;
public String deploymentId;
public boolean resetDb;

public String peliasSynonymsBase64;
}

/**
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/com/conveyal/datatools/manager/models/Deployment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,8 @@ public class Deployment extends Model implements Serializable {
public boolean peliasResetDb;
public List<String> peliasCsvFiles = new ArrayList<>();

public String peliasSynonymsBase64;

/**
* Get parent project for deployment. Note: at one point this was a JSON property of this class, but severe
* performance issues prevent this field from scaling to be fetched/assigned to a large collection of deployments.
Expand Down
Loading