diff options
| author | Alban Peignier | 2018-04-22 22:46:01 +0200 |
|---|---|---|
| committer | Alban Peignier | 2018-04-22 22:46:19 +0200 |
| commit | d83281ade8176ab9b410a2d5a081ff950c84dc67 (patch) | |
| tree | 787c3c773df95b0703e95f1731d5c39063aa76e1 | |
| parent | 130004a867acc573943b67f20af4beb8f605b24b (diff) | |
| download | chouette-core-d83281ade8176ab9b410a2d5a081ff950c84dc67.tar.bz2 | |
Use both JourneyPattern and Route checksum to manage VehicleJourney merges. Refs #6646
| -rw-r--r-- | app/models/merge.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/models/merge.rb b/app/models/merge.rb index 323f0a817..450cd98bd 100644 --- a/app/models/merge.rb +++ b/app/models/merge.rb @@ -289,8 +289,11 @@ class Merge < ApplicationModel referential_vehicle_journeys.each do |vehicle_journey| # find parent journey pattern by checksum # TODO add line_id for security + associated_route_checksum = referential_routes_checksums[vehicle_journey.route_id] associated_journey_pattern_checksum = referential_journey_patterns_checksums[vehicle_journey.journey_pattern_id] - existing_associated_journey_pattern = new.journey_patterns.find_by checksum: associated_journey_pattern_checksum + + existing_associated_route = new.routes.find_by checksum: associated_route_checksum + existing_associated_journey_pattern = existing_associated_route.journey_patterns.find_by checksum: associated_journey_pattern_checksum existing_vehicle_journey = new.vehicle_journeys.find_by journey_pattern_id: existing_associated_journey_pattern.id, checksum: vehicle_journey.checksum |