5 files changed, 60 insertions, 3 deletions

diff --git a/app/models/chouette/journey_pattern.rb b/app/models/chouette/journey_pattern.rb
index 367b00449..366fde188 100644
--- a/app/models/chouette/journey_pattern.rb
+++ b/app/models/chouette/journey_pattern.rb
@@ -27,7 +27,7 @@ module Chouette
 
     def checksum_attributes
       values = self.slice(*['name', 'published_name', 'registration_number']).values
-      values << self.stop_points.map(&:stop_area).map(&:user_objectid)
+      values << self.stop_points.sort_by(&:position).map(&:stop_area).map(&:user_objectid)
       values.flatten
     end
 
diff --git a/app/models/chouette/line.rb b/app/models/chouette/line.rb
index 2d776e94b..389240ec7 100644
--- a/app/models/chouette/line.rb
+++ b/app/models/chouette/line.rb
@@ -21,6 +21,7 @@ module Chouette
     has_many :journey_patterns, :through => :routes
     has_many :vehicle_journeys, :through => :journey_patterns
     has_many :routing_constraint_zones, through: :routes
+    has_many :time_tables, -> { distinct }, :through => :vehicle_journeys
 
     has_and_belongs_to_many :group_of_lines, :class_name => 'Chouette::GroupOfLine', :order => 'group_of_lines.name'
 
diff --git a/app/models/chouette/time_table.rb b/app/models/chouette/time_table.rb
index 74c20f061..db97dd2fa 100644
--- a/app/models/chouette/time_table.rb
+++ b/app/models/chouette/time_table.rb
@@ -569,5 +569,56 @@ module Chouette
       tt.comment      = I18n.t("activerecord.copy", :name => self.comment)
       tt
     end
+
+    def intersect_periods!(mask_periods)
+      dates.each do |date|
+        unless mask_periods.any? { |p| p.include? date.date }
+          dates.delete date
+        end
+      end
+
+      periods.each do |period|
+        mask_periods_with_common_part = mask_periods.select { |p| p.intersect? period.range }
+
+        if mask_periods_with_common_part.empty?
+          self.periods.delete period
+        else
+          mask_periods_with_common_part.each do |mask_period|
+            intersection = (mask_period & period.range)
+            period.period_start, period.period_end = intersection.begin, intersection.end
+          end
+        end
+      end
+    end
+
+    def remove_periods!(removed_periods)
+      dates.each do |date|
+        if removed_periods.any? { |p| p.include? date.date }
+          dates.delete date
+        end
+      end
+
+      periods.each do |period|
+        modified_ranges = removed_periods.inject([period.range]) do |period_ranges, removed_period|
+          period_ranges.map { |p| p.remove removed_period }.flatten
+        end
+
+        unless modified_ranges.empty?
+          modified_ranges.each_with_index do |modified_range, index|
+            new_period = index == 0 ? period : periods.build
+
+            new_period.period_start, new_period.period_end =
+                                     modified_range.min, modified_range.max
+          end
+        else
+          periods.delete period
+        end
+      end
+    end
+
+    def empty?
+      dates.empty? && periods.empty?
+    end
+
   end
 end
diff --git a/app/models/chouette/time_table_period.rb b/app/models/chouette/time_table_period.rb
index ab3e79d7e..d9b707675 100644
--- a/app/models/chouette/time_table_period.rb
+++ b/app/models/chouette/time_table_period.rb
@@ -42,5 +42,10 @@ module Chouette
     def contains?(p)
       (p.period_start >= self.period_start && p.period_end <= self.period_end)
     end
+
+    def range
+      period_start..period_end
+    end
+
   end
-end
\ No newline at end of file
+end
diff --git a/app/models/chouette/vehicle_journey.rb b/app/models/chouette/vehicle_journey.rb
index d84bebf18..d4dc82a56 100644
--- a/app/models/chouette/vehicle_journey.rb
+++ b/app/models/chouette/vehicle_journey.rb
@@ -70,7 +70,7 @@ module Chouette
         attrs << self.published_journey_identifier
         attrs << self.try(:company).try(:get_objectid).try(:local_id)
         attrs << self.footnotes.map(&:checksum).sort
-        attrs << self.vehicle_journey_at_stops.map(&:checksum).sort
+        attrs << self.vehicle_journey_at_stops.sort_by { |s| s.stop_point&.position }.map(&:checksum).sort
       end
     end