From e7710e8e81eef65f07c441d9efa0562e10b6284c Mon Sep 17 00:00:00 2001
From: Alban Peignier
Date: Sun, 22 Apr 2018 16:33:32 +0200
Subject: Merge RoutingConstraintZones with Routes. Refs #6644

---
 app/models/chouette/route.rb                   | 2 +-
 app/models/chouette/routing_constraint_zone.rb | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'app/models/chouette')

diff --git a/app/models/chouette/route.rb b/app/models/chouette/route.rb
index a5eab3002..5e8049b58 100644
--- a/app/models/chouette/route.rb
+++ b/app/models/chouette/route.rb
@@ -148,7 +148,7 @@ module Chouette
       values = self.slice(*['name', 'published_name', 'wayback']).values
       values.tap do |attrs|
         attrs << self.stop_points.sort_by(&:position).map{|sp| [sp.stop_area.user_objectid, sp.for_boarding, sp.for_alighting]}
-        attrs << self.routing_constraint_zones.map(&:checksum)
+        attrs << self.routing_constraint_zones.map(&:checksum).sort
       end
     end
 
diff --git a/app/models/chouette/routing_constraint_zone.rb b/app/models/chouette/routing_constraint_zone.rb
index 886eadc6c..2cfb60bdd 100644
--- a/app/models/chouette/routing_constraint_zone.rb
+++ b/app/models/chouette/routing_constraint_zone.rb
@@ -1,6 +1,6 @@
 module Chouette
   class RoutingConstraintZone < Chouette::TridentActiveRecord
-    has_metadata
+    # has_metadata
     include ChecksumSupport
     include ObjectidSupport
 
@@ -30,6 +30,11 @@ module Chouette
       ]
     end
 
+    def update_route_checksum
+      route.update_checksum!
+    end
+    after_commit :update_route_checksum
+
     def stop_points_belong_to_route
       return unless route
 
-- 
cgit v1.2.3