Resolve merge conflict

17 files changed, 171 insertions, 65 deletions

diff --git a/app/models/chouette/access_point.rb b/app/models/chouette/access_point.rb
index 476f13c08..4a1ae8a0e 100644
--- a/app/models/chouette/access_point.rb
+++ b/app/models/chouette/access_point.rb
@@ -4,6 +4,7 @@ require 'geo_ruby'
 class Chouette::AccessPoint < Chouette::ActiveRecord
   # FIXME http://jira.codehaus.org/browse/JRUBY-6358
   self.primary_key = "id"
+
   include StifReflexAttributesSupport
   include Geokit::Mappable
   include ProjectionFields
@@ -23,12 +24,15 @@ class Chouette::AccessPoint < Chouette::ActiveRecord
   validates_numericality_of :longitude, :less_than_or_equal_to => 180, :greater_than_or_equal_to => -180, :allow_nil => true
 
   validates_format_of :coordinates, :with => %r{\A *-?(0?[0-9](\.[0-9]*)?|[0-8][0-9](\.[0-9]*)?|90(\.[0]*)?) *\, *-?(0?[0-9]?[0-9](\.[0-9]*)?|1[0-7][0-9](\.[0-9]*)?|180(\.[0]*)?) *\Z}, :allow_nil => true, :allow_blank => true
-
+  before_save :coordinates_to_lat_lng
   def self.nullable_attributes
     [:street_name, :country_code, :comment, :long_lat_type, :zip_code, :city_name]
   end
 
-  before_save :coordinates_to_lat_lng
+
+  def referential
+    @referential ||= Referential.where(:slug => Apartment::Tenant.current).first!
+  end
 
   def referential
     @referential ||= Referential.where(:slug => Apartment::Tenant.current).first!
diff --git a/app/models/chouette/company.rb b/app/models/chouette/company.rb
index 7b96e875e..a472020e1 100644
--- a/app/models/chouette/company.rb
+++ b/app/models/chouette/company.rb
@@ -1,6 +1,6 @@
 class Chouette::Company < Chouette::ActiveRecord
   include CompanyRestrictions
-  include DefaultNetexAttributesSupport
+  include StifCodifligneAttributesSupport
   include LineReferentialSupport
 
   has_many :lines
diff --git a/app/models/chouette/group_of_line.rb b/app/models/chouette/group_of_line.rb
index d954c6699..a987d6311 100644
--- a/app/models/chouette/group_of_line.rb
+++ b/app/models/chouette/group_of_line.rb
@@ -1,5 +1,5 @@
 class Chouette::GroupOfLine < Chouette::ActiveRecord
-  include DefaultNetexAttributesSupport
+  include StifCodifligneAttributesSupport
   include GroupOfLineRestrictions
   include LineReferentialSupport
 
diff --git a/app/models/chouette/journey_pattern.rb b/app/models/chouette/journey_pattern.rb
index fa5fba26d..2b62d5c7f 100644
--- a/app/models/chouette/journey_pattern.rb
+++ b/app/models/chouette/journey_pattern.rb
@@ -21,6 +21,11 @@ class Chouette::JourneyPattern < Chouette::TridentActiveRecord
   attr_accessor  :control_checked
   after_update :control_route_sections, :unless => "control_checked"
 
+
+  def local_id
+    "IBOO-#{self.try(:route).try(:line).try(:objectid).try(:local_id)}-#{self.referential.id}-#{self.id}"
+  end
+
   def checksum_attributes
     values = self.slice(*['name', 'published_name', 'registration_number']).values
     values << self.stop_points.map(&:stop_area).map(&:user_objectid)
diff --git a/app/models/chouette/network.rb b/app/models/chouette/network.rb
index 690c39344..8df205789 100644
--- a/app/models/chouette/network.rb
+++ b/app/models/chouette/network.rb
@@ -1,5 +1,5 @@
 class Chouette::Network < Chouette::ActiveRecord
-  include DefaultNetexAttributesSupport
+  include StifCodifligneAttributesSupport
   include NetworkRestrictions
   include LineReferentialSupport
   # FIXME http://jira.codehaus.org/browse/JRUBY-6358
diff --git a/app/models/chouette/route.rb b/app/models/chouette/route.rb
index 6774e8a86..5b89fbbe8 100644
--- a/app/models/chouette/route.rb
+++ b/app/models/chouette/route.rb
@@ -75,6 +75,10 @@ class Chouette::Route < Chouette::TridentActiveRecord
 
   after_commit :journey_patterns_control_route_sections
 
+  def local_id
+    "IBOO-#{self.line.objectid.local_id}-#{self.referential.id}-#{self.id}"
+  end
+
   def geometry_presenter
     Chouette::Geometry::RoutePresenter.new self
   end
diff --git a/app/models/chouette/routing_constraint_zone.rb b/app/models/chouette/routing_constraint_zone.rb
index 9931748b2..21efa2539 100644
--- a/app/models/chouette/routing_constraint_zone.rb
+++ b/app/models/chouette/routing_constraint_zone.rb
@@ -8,6 +8,10 @@ class Chouette::RoutingConstraintZone < Chouette::TridentActiveRecord
   # validates :stop_point_ids, length: { minimum: 2, too_short: I18n.t('activerecord.errors.models.routing_constraint_zone.attributes.stop_points.not_enough_stop_points') }
   validate :stop_points_belong_to_route, :not_all_stop_points_selected
 
+  def local_id
+    "IBOO-#{self.route.line.objectid.local_id}-#{self.route.objectid.local_id}-#{self.referential.id}-#{self.id}"
+  end
+
   scope :order_by_stop_points_count, ->(direction) do
     order("array_length(stop_point_ids, 1) #{direction}")
   end
diff --git a/app/models/chouette/stif_netex_objectid.rb b/app/models/chouette/stif_netex_objectid.rb
new file mode 100644
index 000000000..3b11691d9
--- /dev/null
+++ b/app/models/chouette/stif_netex_objectid.rb
@@ -0,0 +1,38 @@
+class Chouette::StifNetexObjectid < String
+  def valid?
+    parts.present?
+  end
+
+  @@format = /^([A-Za-z_]+):([A-Za-z]+):([0-9A-Za-z_-]+):([A-Za-z]+)$/
+  cattr_reader :format
+
+  def parts
+    match(format).try(:captures)
+  end
+
+  def provider_id
+    parts.try(:first)
+  end
+
+  def object_type
+    parts.try(:second)
+  end
+
+  def local_id
+    parts.try(:third)
+  end
+
+  def boiv_id
+    parts.try(:fourth)
+  end
+
+  def self.create(provider_id, object_type, local_id, boiv_id)
+    new [provider_id, object_type, local_id, boiv_id].join(":")
+  end
+
+  def self.new(string)
+    string ||= ""
+    self === string ? string : super
+  end
+
+end
diff --git a/app/models/chouette/time_table.rb b/app/models/chouette/time_table.rb
index 8aff3bf36..8821a5201 100644
--- a/app/models/chouette/time_table.rb
+++ b/app/models/chouette/time_table.rb
@@ -31,6 +31,10 @@ class Chouette::TimeTable < Chouette::TridentActiveRecord
 
   after_save :save_shortcuts
 
+  def local_id
+    "IBOO-#{self.referential.id}-#{self.id}"
+  end
+
   def checksum_attributes
     [].tap do |attrs|
       attrs << self.int_day_types
@@ -557,8 +561,7 @@ class Chouette::TimeTable < Chouette::TridentActiveRecord
   end
 
   def duplicate
-    tt = self.deep_clone :include => [:periods, :dates], :except => :object_version
-    tt.uniq_objectid
+    tt = self.deep_clone :include => [:periods, :dates], :except => [:object_version, :objectid]
     tt.tag_list.add(*self.tag_list) unless self.tag_list.empty?
     tt.created_from = self
     tt.comment      = I18n.t("activerecord.copy", :name => self.comment)
diff --git a/app/models/chouette/trident_active_record.rb b/app/models/chouette/trident_active_record.rb
index c1bc0172b..e8223e3d6 100644
--- a/app/models/chouette/trident_active_record.rb
+++ b/app/models/chouette/trident_active_record.rb
@@ -1,5 +1,5 @@
 class Chouette::TridentActiveRecord < Chouette::ActiveRecord
-  include DefaultAttributesSupport
+  include StifNetexAttributesSupport
 
   self.abstract_class = true
 
diff --git a/app/models/chouette/vehicle_journey.rb b/app/models/chouette/vehicle_journey.rb
index d5ca58959..e60afef6e 100644
--- a/app/models/chouette/vehicle_journey.rb
+++ b/app/models/chouette/vehicle_journey.rb
@@ -56,6 +56,10 @@ module Chouette
       end
     end
 
+    def local_id
+      "IBOO-#{self.route.line.objectid.local_id}-#{self.referential.id}-#{self.id}"
+    end
+
     def checksum_attributes
       [].tap do |attrs|
         attrs << self.published_journey_name
diff --git a/app/models/concerns/line_referential_support.rb b/app/models/concerns/line_referential_support.rb
index 4ad437fed..406730ddb 100644
--- a/app/models/concerns/line_referential_support.rb
+++ b/app/models/concerns/line_referential_support.rb
@@ -3,18 +3,10 @@ module LineReferentialSupport
 
   included do
     belongs_to :line_referential
-    # validates_presence_of :line_referential_id
-
     alias_method :referential, :line_referential
   end
 
   def hub_restricted?
     false
   end
-
-  def prefix
-    # FIXME #825
-    "dummy"
-  end
-
 end
diff --git a/app/models/concerns/stif_netex_attributes_support.rb b/app/models/concerns/stif_netex_attributes_support.rb
new file mode 100644
index 000000000..795872755
--- /dev/null
+++ b/app/models/concerns/stif_netex_attributes_support.rb
@@ -0,0 +1,58 @@
+module StifNetexAttributesSupport
+  extend ActiveSupport::Concern
+
+  included do
+    validates_numericality_of :object_version
+    validates :objectid, uniqueness: true, presence: true
+    validate :objectid_format_compliance
+
+    after_save :build_objectid
+    before_validation :default_values, on: :create
+  end
+
+  module ClassMethods
+    def object_id_key
+      model_name
+    end
+
+    def model_name
+      ActiveModel::Name.new self, Chouette, self.name.demodulize
+    end
+  end
+
+  def objectid_format_compliance
+    errors.add :objectid, I18n.t("activerecord.errors.models.trident.invalid_object_id") if !objectid.valid?
+  end
+
+  def local_id
+    "IBOO-#{self.referential.id}-#{self.id}"
+  end
+
+  def build_objectid
+    if objectid.include? ':__pending_id__'
+      self.objectid = Chouette::StifNetexObjectid.create(self.provider_id, self.model_name, self.local_id, self.boiv_id)
+      self.save
+    end
+  end
+
+  def default_values
+    self.object_version ||= 1
+
+    if self.objectid.to_s.empty?
+      local_id = "__pending_id__#{rand(50)+ rand(50)}"
+      self.objectid = Chouette::StifNetexObjectid.create(self.provider_id, self.model_name, local_id, self.boiv_id)
+    end
+  end
+
+  def objectid
+    Chouette::StifNetexObjectid.new read_attribute(:objectid)
+  end
+
+  def provider_id
+    self.referential.workbench.organisation.name.parameterize
+  end
+
+  def boiv_id
+    'LOC'
+  end
+end
diff --git a/app/models/concerns/stop_area_referential_support.rb b/app/models/concerns/stop_area_referential_support.rb
index 5a01ef57e..aa59cbd35 100644
--- a/app/models/concerns/stop_area_referential_support.rb
+++ b/app/models/concerns/stop_area_referential_support.rb
@@ -3,17 +3,10 @@ module StopAreaReferentialSupport
 
   included do
     belongs_to :stop_area_referential
-    # validates_presence_of :stop_area_referential_id
-
     alias_method :referential, :stop_area_referential
   end
 
   def hub_restricted?
     false
   end
-
-  def prefix
-    # FIXME #825
-    "dummy"
-  end
 end
diff --git a/app/models/data_format_enumerations.rb b/app/models/data_format_enumerations.rb
index 94c39e152..787ab6cca 100644
--- a/app/models/data_format_enumerations.rb
+++ b/app/models/data_format_enumerations.rb
@@ -1,6 +1,6 @@
 module DataFormatEnumerations
   extend Enumerize
   extend ActiveModel::Naming
-  
-  enumerize :data_format, in: %w[neptune netex gtfs hub], default: "neptune"
+
+  enumerize :data_format, in: %w[neptune netex gtfs hub], default: "netex"
 end
diff --git a/app/models/vehicle_journey_import.rb b/app/models/vehicle_journey_import.rb
index 855fa2abe..44a6d457e 100644
--- a/app/models/vehicle_journey_import.rb
+++ b/app/models/vehicle_journey_import.rb
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-class VehicleJourneyImport   
+class VehicleJourneyImport
   include ActiveModel::Validations
   include ActiveModel::Conversion
   extend  ActiveModel::Naming
@@ -8,11 +8,11 @@ class VehicleJourneyImport
   attr_accessor :file, :route
   attr_accessor :created_vehicle_journey_count,:updated_vehicle_journey_count,:deleted_vehicle_journey_count
   attr_accessor :created_journey_pattern_count,:error_count
-  
+
   validates_presence_of :file
   validates_presence_of :route
 
-  def initialize(attributes = {})    
+  def initialize(attributes = {})
     attributes.each { |name, value| send("#{name}=", value) } if attributes
     self.created_vehicle_journey_count = 0
     self.updated_vehicle_journey_count = 0
@@ -20,15 +20,15 @@ class VehicleJourneyImport
     self.deleted_vehicle_journey_count = 0
     self.error_count = 0
   end
-  
+
   def persisted?
     false
   end
-  
+
   def save
     begin
-      Chouette::VehicleJourney.transaction do        
-        if imported_vehicle_journeys.map(&:valid?).all? 
+      Chouette::VehicleJourney.transaction do
+        if imported_vehicle_journeys.map(&:valid?).all?
           imported_vehicle_journeys.each(&:save!)
           true
         else
@@ -46,8 +46,8 @@ class VehicleJourneyImport
       errors.add :base, I18n.t("vehicle_journey_imports.errors.exception")
       false
     end
-  end   
-  
+  end
+
   def imported_vehicle_journeys
     @imported_vehicle_journeys ||= load_imported_vehicle_journeys
   end
@@ -61,31 +61,31 @@ class VehicleJourneyImport
 
     if stop_points_used.length == 1
       errors.add :base, I18n.t("vehicle_journey_imports.errors.one_stop_point_used", :column => column)
-      raise 
+      raise
     end
-    
+
     journey_pattern_founded = route.journey_patterns.select{ |jp| jp.stop_points.collect(&:id) == stop_points_used }.first
-    
+
     # If no journey pattern founded, create a new one
     self.created_journey_pattern_count += 1  if journey_pattern_founded.nil?
     journey_pattern_founded ? journey_pattern_founded :  route.journey_patterns.create(:stop_points => Chouette::StopPoint.find(stop_points_used) )
   end
-  
+
   def as_integer(v)
     v.blank? ? nil : v.to_i
   end
-  
+
   def as_boolean(v)
     v.blank? ? nil : (v[1..1].downcase != "n")
   end
-  
+
   def update_time_tables(vj,tm_ids)
     vj.time_tables.clear
     return unless tm_ids.present?
     ids = tm_ids.split(",").map(&:to_i)
     vj.time_tables << Chouette::TimeTable.where(:id => ids)
   end
-  
+
   def update_footnotes(vj,ftn_ids)
     vj.footnotes.clear
     return unless ftn_ids.present?
@@ -94,13 +94,13 @@ class VehicleJourneyImport
   end
 
   def load_imported_vehicle_journeys
-    
+
     spreadsheet = open_spreadsheet(file)
-    
+
     vehicle_journeys = []
-    
+
     first_column = spreadsheet.column(1)
-    
+
     # fixed rows (first = 1)
     number_row = 2
     published_journey_name_row = 3
@@ -111,7 +111,7 @@ class VehicleJourneyImport
 
     # rows in column (first = 0)
     first_stop_row_index = 8
-    
+
     stop_point_ids = first_column[first_stop_row_index..spreadsheet.last_row].map(&:to_i)
     # blank lines at end of file will produce id = 0 ; ignore them
     last_stop_row_index = stop_point_ids.length + 7
@@ -119,50 +119,50 @@ class VehicleJourneyImport
       stop_point_ids = stop_point_ids[0..-2]
       last_stop_row_index -= 1
     end
-    
+
     unless route.stop_points.collect(&:id) == stop_point_ids
       errors.add :base, I18n.t("vehicle_journey_imports.errors.not_same_stop_points", :route => route.id)
       raise
-    end    
-           
+    end
+
     (3..spreadsheet.last_column).each do |i|
       vehicle_journey_id = spreadsheet.column(i)[0]
       hours_by_stop_point_ids = Hash[[stop_point_ids, spreadsheet.column(i)[first_stop_row_index..last_stop_row_index]].transpose]
-      
+
       journey_pattern = find_journey_pattern_schedule(i,hours_by_stop_point_ids)
-      
+
       vehicle_journey = route.vehicle_journeys.where(:id => vehicle_journey_id, :route_id => route.id).first_or_initialize
 
       if journey_pattern.nil?
-        if vehicle_journey.id.present? 
+        if vehicle_journey.id.present?
           self.deleted_vehicle_journey_count += 1
           vehicle_journey.delete
         end
         next
       end
-      if vehicle_journey.id.present? 
+      if vehicle_journey.id.present?
         self.updated_vehicle_journey_count += 1
       else
         self.created_vehicle_journey_count += 1
       end
-      
+
       # number
       vehicle_journey.number = as_integer(spreadsheet.row(number_row)[i-1])
-      
+
       # published_name
       vehicle_journey.published_journey_name = spreadsheet.row(published_journey_name_row)[i-1]
-      
+
       # flexible_service
       vehicle_journey.flexible_service = as_boolean(spreadsheet.row(flexible_service_row)[i-1])
-      
+
       # mobility
       vehicle_journey.mobility_restricted_suitability = as_boolean(spreadsheet.row(mobility_row)[i-1])
-      
+
       # time_tables
       update_time_tables(vehicle_journey,spreadsheet.row(time_tables_row)[i-1])
-      
+
       update_footnotes(vehicle_journey,spreadsheet.row(footnotes_row)[i-1])
-      
+
       # journey_pattern
       vehicle_journey.journey_pattern = journey_pattern
       vehicle_journey.vehicle_journey_at_stops.clear
@@ -171,7 +171,7 @@ class VehicleJourneyImport
       hours_by_stop_point_ids.each_pair do |key, value|
         line += 1
         if value.present? # Create a vehicle journey at stop when time is present
-          begin 
+          begin
             # force UTC to ignore timezone effects
             main_time = Time.parse(value+" UTC")
             if main_time.present?
@@ -182,14 +182,14 @@ class VehicleJourneyImport
             errors.add :base, I18n.t("vehicle_journey_imports.errors.invalid_vehicle_journey_at_stop", :column => i, :line => line, :time => value)
             raise exception
           end
-        end         
+        end
       end
       vehicle_journeys << vehicle_journey
     end
-    
+
     vehicle_journeys
   end
-  
+
   def open_spreadsheet(file)
     case File.extname(file.original_filename)
     when '.csv' then Roo::CSV.new(file.path, csv_options: {col_sep: ";"})
@@ -199,5 +199,5 @@ class VehicleJourneyImport
       raise "Unknown file type: #{file.original_filename}"
     end
   end
-  
+
 end
diff --git a/app/models/workbench.rb b/app/models/workbench.rb
index c37cba858..30692e625 100644
--- a/app/models/workbench.rb
+++ b/app/models/workbench.rb
@@ -10,6 +10,7 @@ class Workbench < ActiveRecord::Base
   has_many :stop_areas, through: :stop_area_referential
   has_many :imports
   has_many :workbench_imports
+
   validates :name, presence: true
   validates :organisation, presence: true