161 files changed, 2535 insertions, 2569 deletions
diff --git a/.gitignore b/.gitignore
index cfcbf47a5..03a39be90 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,6 +40,8 @@ coverage
 /public/packs
 /public/packs-test
 
+/bin
+
 # Every machine shall create its binstubs
 /bin/rake
 /bin/rails
diff --git a/Gemfile b/Gemfile
index f03fb971b..88fd635ea 100644
--- a/Gemfile
+++ b/Gemfile
@@ -35,6 +35,9 @@ gem 'has_array_of', af83: 'has_array_of'
 
 gem 'rails-observers'
 
+# Use SeedBank for spliting seeds
+gem 'seedbank'
+
 # Use ActiveModel has_secure_password
 # gem 'bcrypt', '~> 3.1.7'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 48a8b638a..9262eeb74 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -458,6 +458,7 @@ GEM
     sdoc (0.4.2)
       json (~> 1.7, >= 1.7.7)
       rdoc (~> 4.0)
+    seedbank (0.4.0)
     select2-rails (4.0.3)
       thor (~> 0.14)
     sequel (4.47.0)
@@ -652,6 +653,7 @@ DEPENDENCIES
   sass-rails (~> 4.0.3)
   sawyer (~> 0.6.0)
   sdoc (~> 0.4.0)
+  seedbank
   select2-rails (~> 4.0, >= 4.0.3)
   sequel
   shoulda-matchers (~> 3.1)
diff --git a/app/decorators/company_decorator.rb b/app/decorators/company_decorator.rb
index 764cce3a0..9416c73ae 100644
--- a/app/decorators/company_decorator.rb
+++ b/app/decorators/company_decorator.rb
@@ -49,5 +49,4 @@ class CompanyDecorator < Draper::Decorator
 
     links
   end
-
 end
diff --git a/app/decorators/referential_network_decorator.rb b/app/decorators/referential_network_decorator.rb
index 9eb94c8d2..1260a38cb 100644
--- a/app/decorators/referential_network_decorator.rb
+++ b/app/decorators/referential_network_decorator.rb
@@ -3,36 +3,36 @@ class ReferentialNetworkDecorator < Draper::Decorator
 
   delegate_all
 
-  # Requires:
-  #   context: {
-  #     referential: ,
-  #   }
-  def action_links
-    links = []
+# Requires:
+#   context: {
+#     referential: ,
+#   }
+def action_links
+  links = []
 
-    if h.policy(Chouette::Network).create?
-      links << Link.new(
-        content: h.t('networks.actions.new'),
-        href: h.new_referential_network_path(context[:referential])
-      )
-    end
+  if h.policy(Chouette::Network).create?
+    links << Link.new(
+      content: h.t('networks.actions.new'),
+      href: h.new_referential_network_path(context[:referential])
+    )
+  end
 
-    if h.policy(object).update?
-      links << Link.new(
-        content: h.t('networks.actions.edit'),
-        href: h.edit_referential_network_path(context[:referential], object)
-      )
-    end
+  if h.policy(object).update?
+    links << Link.new(
+      content: h.t('networks.actions.edit'),
+      href: h.edit_referential_network_path(context[:referential], object)
+    )
+  end
 
-    if h.policy(object).destroy?
-      links << Link.new(
-        content: h.destroy_link_content('networks.actions.destroy'),
-        href: h.referential_network_path(context[:referential], object),
-        method: :delete,
-        data: { confirm: t('networks.actions.destroy_confirm') }
-      )
-    end
+  if h.policy(object).destroy?
+    links << Link.new(
+      content: h.destroy_link_content('networks.actions.destroy'),
+      href: h.referential_network_path(context[:referential], object),
+      method: :delete,
+      data: { confirm: t('networks.actions.destroy_confirm') }
+    )
+  end
 
     links
   end
-end
+end
+\ No newline at end of file
diff --git a/app/helpers/import_resources_helper.rb b/app/helpers/import_resources_helper.rb
index 3ee96eb9b..1d870f68e 100644
--- a/app/helpers/import_resources_helper.rb
+++ b/app/helpers/import_resources_helper.rb
@@ -12,4 +12,8 @@ module ImportResourcesHelper
       content_tag :span, '', class: "fa fa-circle text-#{cls}"
   end
 
+  def import_resoruce_metrics(metrics)
+    metrics.delete_if {|k,v| !k.include?("count")}.deep_symbolize_keys
+  end
+
 end
diff --git a/app/javascript/journey_patterns/actions/index.js b/app/javascript/journey_patterns/actions/index.js
index 8bea5a990..4ff3f77ea 100644
--- a/app/javascript/journey_patterns/actions/index.js
+++ b/app/javascript/journey_patterns/actions/index.js
@@ -90,10 +90,6 @@ const actions = {
   resetValidation: (target) => {
     $(target).parent().removeClass('has-error').children('.help-block').remove()
   },
-  humanOID : (oid) => {
-    let shortOId = oid.split(':')[2].split("-").pop()
-    return shortOId.length > 10 ? `${shortOId.slice(0, 10)}...` : shortOId
-  },
   validateFields : (fields) => {
     const test = []
 
@@ -201,6 +197,7 @@ const actions = {
               journeyPatterns.push({
                 name: val.name,
                 object_id: val.object_id,
+                short_id: val.short_id,
                 published_name: val.published_name,
                 registration_number: val.registration_number,
                 stop_points: val.route_short_description.stop_points,
diff --git a/app/javascript/journey_patterns/components/JourneyPattern.js b/app/javascript/journey_patterns/components/JourneyPattern.js
index 34d102c5d..d4c9816ec 100644
--- a/app/javascript/journey_patterns/components/JourneyPattern.js
+++ b/app/javascript/journey_patterns/components/JourneyPattern.js
@@ -68,7 +68,7 @@ export default class JourneyPattern extends Component{
         {/* this.props.value.errors ? this.getErrors(this.props.value.errors) : '' */}
 
         <div className='th'>
-          <div className='strong mb-xs'>{this.props.value.object_id ? actions.humanOID(this.props.value.object_id) : '-'}</div>
+          <div className='strong mb-xs'>{this.props.value.object_id ? this.props.value.short_id : '-'}</div>
           <div>{this.props.value.registration_number}</div>
           <div>{actions.getChecked(this.props.value.stop_points).length} arrêt(s)</div>
 
diff --git a/app/javascript/vehicle_journeys/actions/index.js b/app/javascript/vehicle_journeys/actions/index.js
index 95c739893..ddb54d615 100644
--- a/app/javascript/vehicle_journeys/actions/index.js
+++ b/app/javascript/vehicle_journeys/actions/index.js
@@ -269,10 +269,6 @@ const actions = {
     type: 'RECEIVE_TOTAL_COUNT',
     total
   }),
-  humanOID: (oid) => {
-   let shortOId = oid.split(':')[2].split("-").pop()
-   return shortOId.length > 10 ? `${shortOId.slice(0, 10)}...` : shortOId
-  },
   fetchVehicleJourneys : (dispatch, currentPage, nextPage, queryString) => {
     if(currentPage == undefined){
       currentPage = 1
@@ -334,6 +330,7 @@ const actions = {
               journey_pattern: val.journey_pattern,
               published_journey_name: val.published_journey_name,
               objectid: val.objectid,
+              short_id: val.short_id,
               footnotes: val.footnotes,
               time_tables: timeTables,
               vehicle_journey_at_stops: vjasWithDelta,
diff --git a/app/javascript/vehicle_journeys/components/VehicleJourney.js b/app/javascript/vehicle_journeys/components/VehicleJourney.js
index 13f8eced2..8fb4b8a7e 100644
--- a/app/javascript/vehicle_journeys/components/VehicleJourney.js
+++ b/app/javascript/vehicle_journeys/components/VehicleJourney.js
@@ -49,8 +49,8 @@ export default class VehicleJourney extends Component {
     return (
       <div className={'t2e-item' + (this.props.value.deletable ? ' disabled' : '') + (this.props.value.errors ? ' has-error': '')}>
         <div className='th'>
-          <div className='strong mb-xs'>{this.props.value.objectid ? actions.humanOID(this.props.value.objectid) : '-'}</div>
-          <div>{actions.humanOID(this.props.value.journey_pattern.objectid)}</div>
+          <div className='strong mb-xs'>{this.props.value.objectid ? this.props.value.short_id : '-'}</div>
+          <div>{this.props.value.journey_pattern.short_id}</div>
           <div>
             {time_tables.slice(0,3).map((tt, i)=>
               <span key={i} className='vj_tt'>{this.timeTableURL(tt)}</span>
diff --git a/app/javascript/vehicle_journeys/components/tools/EditVehicleJourney.js b/app/javascript/vehicle_journeys/components/tools/EditVehicleJourney.js
index 7ad3cf510..7d91896eb 100644
--- a/app/javascript/vehicle_journeys/components/tools/EditVehicleJourney.js
+++ b/app/javascript/vehicle_journeys/components/tools/EditVehicleJourney.js
@@ -72,7 +72,7 @@ export default class EditVehicleJourney extends Component {
                               <input
                                 type='text'
                                 className='form-control'
-                                value={actions.humanOID(this.props.modal.modalProps.vehicleJourney.journey_pattern.objectid) + ' - ' + (this.props.modal.modalProps.vehicleJourney.journey_pattern.name)}
+                                value={this.props.modal.modalProps.vehicleJourney.journey_pattern.short_id + ' - ' + (this.props.modal.modalProps.vehicleJourney.journey_pattern.name)}
                                 disabled={true}
                               />
                             </div>
diff --git a/app/javascript/vehicle_journeys/components/tools/ShiftVehicleJourney.js b/app/javascript/vehicle_journeys/components/tools/ShiftVehicleJourney.js
index ebfbed9eb..a54e40502 100644
--- a/app/javascript/vehicle_journeys/components/tools/ShiftVehicleJourney.js
+++ b/app/javascript/vehicle_journeys/components/tools/ShiftVehicleJourney.js
@@ -49,7 +49,7 @@ export default class ShiftVehicleJourney extends Component {
                   <div className='modal-header'>
                     <h4 className='modal-title'>Mettre à jour une course</h4>
                     {(this.props.modal.type == 'shift') && (
-                      <em>Mettre à jour les horaires de la course {actions.humanOID(actions.getSelected(this.props.vehicleJourneys)[0].objectid)}</em>
+                      <em>Mettre à jour les horaires de la course {actions.getSelected(this.props.vehicleJourneys)[0].short_id}</em>
                     )}
                     <span type="button" className="close modal-close" data-dismiss="modal">&times;</span>
                   </div>
diff --git a/app/javascript/vehicle_journeys/components/tools/select2s/MissionSelect2.js b/app/javascript/vehicle_journeys/components/tools/select2s/MissionSelect2.js
index 6069bf089..5b4ae564c 100644
--- a/app/javascript/vehicle_journeys/components/tools/select2s/MissionSelect2.js
+++ b/app/javascript/vehicle_journeys/components/tools/select2s/MissionSelect2.js
@@ -42,7 +42,7 @@ export default class BSelect4 extends Component {
                   item => _.assign(
                     {},
                     item,
-                    { text: "<strong>" + item.published_name + " - " + actions.humanOID(item.object_id) + "</strong><br/><small>" + item.registration_number + "</small>" }
+                    { text: "<strong>" + item.published_name + " - " + item.short_id + "</strong><br/><small>" + item.registration_number + "</small>" }
                   )
                 )
               };
diff --git a/app/javascript/vehicle_journeys/components/tools/select2s/TimetableSelect2.js b/app/javascript/vehicle_journeys/components/tools/select2s/TimetableSelect2.js
index 60c3eab83..a90a9f7b8 100644
--- a/app/javascript/vehicle_journeys/components/tools/select2s/TimetableSelect2.js
+++ b/app/javascript/vehicle_journeys/components/tools/select2s/TimetableSelect2.js
@@ -44,7 +44,7 @@ export default class BSelect4 extends Component {
                   item => _.assign(
                     {},
                     item,
-                    {text: '<strong>' + "<span class='fa fa-circle' style='color:" + (item.color ? item.color : '#4B4B4B') + "'></span> " + item.comment + ' - ' + actions.humanOID(item.objectid) + '</strong><br/><small>' + (item.day_types ? item.day_types.match(/[A-Z]?[a-z]+/g).join(', ') : "") + '</small>'}
+                    {text: '<strong>' + "<span class='fa fa-circle' style='color:" + (item.color ? item.color : '#4B4B4B') + "'></span> " + item.comment + ' - ' + item.short_id + '</strong><br/><small>' + (item.day_types ? item.day_types.match(/[A-Z]?[a-z]+/g).join(', ') : "") + '</small>'}
                   )
                 )
               };
diff --git a/app/javascript/vehicle_journeys/components/tools/select2s/VJSelect2.js b/app/javascript/vehicle_journeys/components/tools/select2s/VJSelect2.js
index 7cccbbc05..37628fce0 100644
--- a/app/javascript/vehicle_journeys/components/tools/select2s/VJSelect2.js
+++ b/app/javascript/vehicle_journeys/components/tools/select2s/VJSelect2.js
@@ -42,7 +42,7 @@ export default class BSelect4b extends Component {
                   item => _.assign(
                     {},
                     item,
-                    { id: item.objectid, text: actions.humanOID(item.objectid) }
+                    { id: item.objectid, text: item.short_id }
                   )
                 )
               };
diff --git a/app/models/chouette/access_link.rb b/app/models/chouette/access_link.rb
index b43dcfb7f..46fbcb631 100644
--- a/app/models/chouette/access_link.rb
+++ b/app/models/chouette/access_link.rb
@@ -1,5 +1,6 @@
 module Chouette
-  class AccessLink < TridentActiveRecord
+  class AccessLink < Chouette::TridentActiveRecord
+    include ObjectidSupport
     # FIXME http://jira.codehaus.org/browse/JRUBY-6358
     self.primary_key = "id"
 
@@ -62,4 +63,4 @@ module Chouette
       Chouette::Geometry::AccessLinkPresenter.new self
     end
   end
-end
+end
+\ No newline at end of file
diff --git a/app/models/chouette/access_point.rb b/app/models/chouette/access_point.rb
index 4a1ae8a0e..7757fdcfb 100644
--- a/app/models/chouette/access_point.rb
+++ b/app/models/chouette/access_point.rb
@@ -1,173 +1,170 @@
 require 'geokit'
 require 'geo_ruby'
 
-class Chouette::AccessPoint < Chouette::ActiveRecord
-  # FIXME http://jira.codehaus.org/browse/JRUBY-6358
-  self.primary_key = "id"
+module Chouette
+  class AccessPoint < Chouette::ActiveRecord
+    # FIXME http://jira.codehaus.org/browse/JRUBY-6358
+    self.primary_key = "id"
 
-  include StifReflexAttributesSupport
-  include Geokit::Mappable
-  include ProjectionFields
+    include Geokit::Mappable
+    include ProjectionFields
+    include ObjectidSupport
 
-  has_many :access_links, :dependent => :destroy
-  belongs_to :stop_area
+    has_many :access_links, :dependent => :destroy
+    belongs_to :stop_area
 
-  attr_accessor :access_point_type
-  attr_writer :coordinates
+    attr_accessor :access_point_type
+    attr_writer :coordinates
 
-  validates_presence_of :name
-  validates_presence_of :access_type
+    validates_presence_of :name
+    validates_presence_of :access_type
 
-  validates_presence_of :latitude, :if => :longitude
-  validates_presence_of :longitude, :if => :latitude
-  validates_numericality_of :latitude, :less_than_or_equal_to => 90, :greater_than_or_equal_to => -90, :allow_nil => true
-  validates_numericality_of :longitude, :less_than_or_equal_to => 180, :greater_than_or_equal_to => -180, :allow_nil => true
+    validates_presence_of :latitude, :if => :longitude
+    validates_presence_of :longitude, :if => :latitude
+    validates_numericality_of :latitude, :less_than_or_equal_to => 90, :greater_than_or_equal_to => -90, :allow_nil => true
+    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
-
-
-  def referential
-    @referential ||= Referential.where(:slug => Apartment::Tenant.current).first!
-  end
+    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
 
-  def referential
-    @referential ||= Referential.where(:slug => Apartment::Tenant.current).first!
-  end
+    def referential
+      @referential ||= Referential.where(:slug => Apartment::Tenant.current).first!
+    end
 
-  def combine_lat_lng
-    if self.latitude.nil? || self.longitude.nil?
-      ""
-    else
-      self.latitude.to_s+","+self.longitude.to_s
+    def combine_lat_lng
+      if self.latitude.nil? || self.longitude.nil?
+        ""
+      else
+        self.latitude.to_s+","+self.longitude.to_s
+      end
     end
-  end
 
-  def coordinates
-      @coordinates || combine_lat_lng
-  end
+    def coordinates
+        @coordinates || combine_lat_lng
+    end
 
-  def coordinates_to_lat_lng
-    if ! @coordinates.nil?
-      if @coordinates.empty?
-        self.latitude = nil
-        self.longitude = nil
-      else
-        self.latitude = BigDecimal.new(@coordinates.split(",").first)
-        self.longitude = BigDecimal.new(@coordinates.split(",").last)
+    def coordinates_to_lat_lng
+      if ! @coordinates.nil?
+        if @coordinates.empty?
+          self.latitude = nil
+          self.longitude = nil
+        else
+          self.latitude = BigDecimal.new(@coordinates.split(",").first)
+          self.longitude = BigDecimal.new(@coordinates.split(",").last)
+        end
+        @coordinates = nil
       end
-      @coordinates = nil
     end
-  end
 
-  def to_lat_lng
-    Geokit::LatLng.new(latitude, longitude) if latitude and longitude
-  end
+    def to_lat_lng
+      Geokit::LatLng.new(latitude, longitude) if latitude and longitude
+    end
 
-  def geometry
-    GeoRuby::SimpleFeatures::Point.from_lon_lat(longitude, latitude, 4326) if latitude and longitude
-  end
+    def geometry
+      GeoRuby::SimpleFeatures::Point.from_lon_lat(longitude, latitude, 4326) if latitude and longitude
+    end
 
-  def geometry=(geometry)
-    geometry = geometry.to_wgs84
-    self.latitude, self.longitude, self.long_lat_type = geometry.lat, geometry.lng, "WGS84"
-  end
+    def geometry=(geometry)
+      geometry = geometry.to_wgs84
+      self.latitude, self.longitude, self.long_lat_type = geometry.lat, geometry.lng, "WGS84"
+    end
 
-  def position
-    geometry
-  end
+    def position
+      geometry
+    end
 
-  def position=(position)
-    position = nil if String === position && position == ""
-    position = Geokit::LatLng.normalize(position), 4326 if String === position
-    self.latitude = position.lat
-    self.longitude = position.lng
-  end
+    def position=(position)
+      position = nil if String === position && position == ""
+      position = Geokit::LatLng.normalize(position), 4326 if String === position
+      self.latitude = position.lat
+      self.longitude = position.lng
+    end
 
-  def default_position
-    stop_area.geometry or stop_area.default_position
-  end
+    def default_position
+      stop_area.geometry or stop_area.default_position
+    end
 
 
-  def access_point_type
-    access_type && Chouette::AccessPointType.new(access_type.underscore)
-  end
+    def access_point_type
+      access_type && Chouette::AccessPointType.new(access_type.underscore)
+    end
 
-  def access_point_type=(access_point_type)
-    self.access_type = (access_point_type ? access_point_type.camelcase : nil)
-  end
+    def access_point_type=(access_point_type)
+      self.access_type = (access_point_type ? access_point_type.camelcase : nil)
+    end
 
-  @@access_point_types = nil
-  def self.access_point_types
-    @@access_point_types ||= Chouette::AccessPointType.all.select do |access_point_type|
-      access_point_type.to_i >= 0
+    @@access_point_types = nil
+    def self.access_point_types
+      @@access_point_types ||= Chouette::AccessPointType.all.select do |access_point_type|
+        access_point_type.to_i >= 0
+      end
     end
-  end
 
-  def generic_access_link_matrix
-     matrix = Array.new
-     hash = Hash.new
-     access_links.each do |link|
-        hash[link.link_key] = link
-     end
-     key=Chouette::AccessLink.build_link_key(self,stop_area,"access_point_to_stop_area")
-     if hash.has_key?(key)
-       matrix << hash[key]
-     else
-       link = Chouette::AccessLink.new
-       link.access_point = self
-       link.stop_area = stop_area
-       link.link_orientation_type = "access_point_to_stop_area"
-       matrix << link
-     end
-     key=Chouette::AccessLink.build_link_key(self,stop_area,"stop_area_to_access_point")
-     if hash.has_key?(key)
-       matrix << hash[key]
-     else
-       link = Chouette::AccessLink.new
-       link.access_point = self
-       link.stop_area = stop_area
-       link.link_orientation_type = "stop_area_to_access_point"
-       matrix << link
-     end
-     matrix
-  end
+    def generic_access_link_matrix
+      matrix = Array.new
+      hash = Hash.new
+      access_links.each do |link|
+          hash[link.link_key] = link
+      end
+      key=Chouette::AccessLink.build_link_key(self,stop_area,"access_point_to_stop_area")
+      if hash.has_key?(key)
+        matrix << hash[key]
+      else
+        link = Chouette::AccessLink.new
+        link.access_point = self
+        link.stop_area = stop_area
+        link.link_orientation_type = "access_point_to_stop_area"
+        matrix << link
+      end
+      key=Chouette::AccessLink.build_link_key(self,stop_area,"stop_area_to_access_point")
+      if hash.has_key?(key)
+        matrix << hash[key]
+      else
+        link = Chouette::AccessLink.new
+        link.access_point = self
+        link.stop_area = stop_area
+        link.link_orientation_type = "stop_area_to_access_point"
+        matrix << link
+      end
+      matrix
+    end
 
-  def detail_access_link_matrix
-     matrix = Array.new
-     hash = Hash.new
-     access_links.each do |link|
-        hash[link.link_key] = link
-     end
-     stop_area.children_at_base.each do |child|
-       key=Chouette::AccessLink.build_link_key(self,child,"access_point_to_stop_area")
-       if hash.has_key?(key)
-         matrix << hash[key]
-       else
-         link = Chouette::AccessLink.new
-         link.access_point = self
-         link.stop_area = child
-         link.link_orientation_type = "access_point_to_stop_area"
-         matrix << link
-       end
-       key=Chouette::AccessLink.build_link_key(self,child,"stop_area_to_access_point")
-       if hash.has_key?(key)
-         matrix << hash[key]
-       else
-         link = Chouette::AccessLink.new
-         link.access_point = self
-         link.stop_area = child
-         link.link_orientation_type = "stop_area_to_access_point"
-         matrix << link
-       end
-     end
-     matrix
-  end
+    def detail_access_link_matrix
+      matrix = Array.new
+      hash = Hash.new
+      access_links.each do |link|
+          hash[link.link_key] = link
+      end
+      stop_area.children_at_base.each do |child|
+        key=Chouette::AccessLink.build_link_key(self,child,"access_point_to_stop_area")
+        if hash.has_key?(key)
+          matrix << hash[key]
+        else
+          link = Chouette::AccessLink.new
+          link.access_point = self
+          link.stop_area = child
+          link.link_orientation_type = "access_point_to_stop_area"
+          matrix << link
+        end
+        key=Chouette::AccessLink.build_link_key(self,child,"stop_area_to_access_point")
+        if hash.has_key?(key)
+          matrix << hash[key]
+        else
+          link = Chouette::AccessLink.new
+          link.access_point = self
+          link.stop_area = child
+          link.link_orientation_type = "stop_area_to_access_point"
+          matrix << link
+        end
+      end
+      matrix
+    end
 
-  def geometry_presenter
-    Chouette::Geometry::AccessPointPresenter.new self
+    def geometry_presenter
+      Chouette::Geometry::AccessPointPresenter.new self
+    end
   end
-end
+end
+\ No newline at end of file
diff --git a/app/models/chouette/access_point_type.rb b/app/models/chouette/access_point_type.rb
index 94d28e5ae..f7439a428 100644
--- a/app/models/chouette/access_point_type.rb
+++ b/app/models/chouette/access_point_type.rb
@@ -1,50 +1,52 @@
-class Chouette::AccessPointType < ActiveSupport::StringInquirer
+module Chouette
+  class AccessPointType < ActiveSupport::StringInquirer
 
-  def initialize(text_code, numerical_code)
-    super text_code.to_s
-    @numerical_code = numerical_code
-  end
+    def initialize(text_code, numerical_code)
+      super text_code.to_s
+      @numerical_code = numerical_code
+    end
 
-  def self.new(text_code, numerical_code = nil)
-    if text_code and numerical_code
-      super
-    elsif self === text_code 
-      text_code
-    else
-      if Fixnum === text_code
-        text_code, numerical_code = definitions.rassoc(text_code)
+    def self.new(text_code, numerical_code = nil)
+      if text_code and numerical_code
+        super
+      elsif self === text_code 
+        text_code
       else
-        text_code, numerical_code = definitions.assoc(text_code.to_s)
-      end
+        if Fixnum === text_code
+          text_code, numerical_code = definitions.rassoc(text_code)
+        else
+          text_code, numerical_code = definitions.assoc(text_code.to_s)
+        end
 
-      super text_code, numerical_code
+        super text_code, numerical_code
+      end
     end
-  end
 
-  def to_i
-    @numerical_code
-  end
+    def to_i
+      @numerical_code
+    end
 
-  def inspect
-    "#{to_s}/#{to_i}"
-  end
+    def inspect
+      "#{to_s}/#{to_i}"
+    end
 
-  def name
-    camelize
-  end
+    def name
+      camelize
+    end
 
-  @@definitions = [
-    ["in", 0],
-    ["out", 1],
-    ["in_out", 2]
-  ]
-  cattr_reader :definitions
-
-  @@all = nil
-  def self.all
-    @@all ||= definitions.collect do |text_code, numerical_code|
-      new(text_code, numerical_code)
+    @@definitions = [
+      ["in", 0],
+      ["out", 1],
+      ["in_out", 2]
+    ]
+    cattr_reader :definitions
+
+    @@all = nil
+    def self.all
+      @@all ||= definitions.collect do |text_code, numerical_code|
+        new(text_code, numerical_code)
+      end
     end
-  end
 
-end
+  end
+end
+\ No newline at end of file
diff --git a/app/models/chouette/active_record.rb b/app/models/chouette/active_record.rb
index e12f30266..c2aab9d50 100644
--- a/app/models/chouette/active_record.rb
+++ b/app/models/chouette/active_record.rb
@@ -24,6 +24,10 @@ module Chouette
       end
     end
 
+    def self.model_name
+      ActiveModel::Name.new self, Chouette, self.name.demodulize
+    end
+
     # TODO: Can we remove this?
     # class << self
     #   alias_method :create_reflection_without_chouette_naming, :create_reflection
diff --git a/app/models/chouette/command.rb b/app/models/chouette/command.rb
index d2995a000..b735747bf 100644
--- a/app/models/chouette/command.rb
+++ b/app/models/chouette/command.rb
@@ -10,85 +10,85 @@ require 'tmpdir'
   end
 #end
 
-class Chouette::Command
+module Chouette
+  class Command
 
-  include Chouette::CommandLineSupport
+    include Chouette::CommandLineSupport
 
-  @@command = "chouette"
-  cattr_accessor :command
+    @@command = "chouette"
+    cattr_accessor :command
 
-  attr_accessor :database, :schema, :host, :user, :password, :port
+    attr_accessor :database, :schema, :host, :user, :password, :port
 
-  def initialize(options = {})
-    database_options_from_active_record.merge(options).each do |k,v|
-      send "#{k}=", v
+    def initialize(options = {})
+      database_options_from_active_record.merge(options).each do |k,v|
+        send "#{k}=", v
+      end
     end
-  end
 
-  def database_options_from_active_record
-    config = Chouette::ActiveRecord.connection_pool.spec.config
-    { 
-      :database => config[:database], 
-      :user => config[:username],
-      :password => config[:password],
-      :port => config[:port],
-      :host => (config[:host] or "localhost")
-    }
-  end
+    def database_options_from_active_record
+      config = Chouette::ActiveRecord.connection_pool.spec.config
+      { 
+        :database => config[:database], 
+        :user => config[:username],
+        :password => config[:password],
+        :port => config[:port],
+        :host => (config[:host] or "localhost")
+      }
+    end
 
 
-  def run!(options = {})
-    Dir.mktmpdir do |config_dir|
-      chouette_properties = File.join(config_dir, "chouette.properties")
-      open(chouette_properties, "w") do |f|
-        f.puts "database.name = #{database}"
-        f.puts "database.schema = #{schema}"
-        #f.puts "database.showsql = true"
-        f.puts "hibernate.username = #{user}"
-        f.puts "hibernate.password = #{password}"
-        f.puts "jdbc.url=jdbc:postgresql://#{host}:#{port}/#{database}"
-        f.puts "jdbc.username = #{user}"
-        f.puts "jdbc.password = #{password}"
-        #f.puts "database.hbm2ddl.auto=update"
-      end
+    def run!(options = {})
+      Dir.mktmpdir do |config_dir|
+        chouette_properties = File.join(config_dir, "chouette.properties")
+        open(chouette_properties, "w") do |f|
+          f.puts "database.name = #{database}"
+          f.puts "database.schema = #{schema}"
+          #f.puts "database.showsql = true"
+          f.puts "hibernate.username = #{user}"
+          f.puts "hibernate.password = #{password}"
+          f.puts "jdbc.url=jdbc:postgresql://#{host}:#{port}/#{database}"
+          f.puts "jdbc.username = #{user}"
+          f.puts "jdbc.password = #{password}"
+          #f.puts "database.hbm2ddl.auto=update"
+        end
 
-      logger.debug "Chouette properties: #{File.readlines(chouette_properties).collect(&:strip).join(', ')}"
+        logger.debug "Chouette properties: #{File.readlines(chouette_properties).collect(&:strip).join(', ')}"
 
-      command_line = "#{command} -classpath #{config_dir} #{command_options(options)}"
-      logger.debug "Execute '#{command_line}'"
+        command_line = "#{command} -classpath #{config_dir} #{command_options(options)}"
+        logger.debug "Execute '#{command_line}'"
 
-      execute! command_line
+        execute! command_line
+      end
     end
-  end
 
-  class Option
+    class Option
 
-    attr_accessor :key, :value
+      attr_accessor :key, :value
 
-    def initialize(key, value)
-      @key, @value = key.to_s, value
-    end
+      def initialize(key, value)
+        @key, @value = key.to_s, value
+      end
 
-    def command_key
-      key.camelize(:lower) 
-    end
+      def command_key
+        key.camelize(:lower) 
+      end
 
-    def to_s
-      unless value == true
-        "-#{command_key} #{value}"
-      else
-        "-#{command_key}"
+      def to_s
+        unless value == true
+          "-#{command_key} #{value}"
+        else
+          "-#{command_key}"
+        end
       end
+
     end
 
-  end
+    def command_options(options)
+      options.collect do |key, value|
+        Option.new(key, value)
+      end.sort_by(&:key).join(' ')
+    end
 
-  def command_options(options)
-    options.collect do |key, value|
-      Option.new(key, value)
-    end.sort_by(&:key).join(' ')
   end
-
-  
-
-end
+end
+\ No newline at end of file
diff --git a/app/models/chouette/company.rb b/app/models/chouette/company.rb
index a472020e1..d79e5ff59 100644
--- a/app/models/chouette/company.rb
+++ b/app/models/chouette/company.rb
@@ -1,18 +1,19 @@
-class Chouette::Company < Chouette::ActiveRecord
-  include CompanyRestrictions
-  include StifCodifligneAttributesSupport
-  include LineReferentialSupport
+module Chouette
+  class Company < Chouette::ActiveRecord
+    include CompanyRestrictions
+    include LineReferentialSupport
+    include ObjectidSupport
 
-  has_many :lines
+    has_many :lines
 
-  validates_format_of :registration_number, :with => %r{\A[0-9A-Za-z_-]+\Z}, :allow_nil => true, :allow_blank => true
-  validates_presence_of :name
-  validates_format_of :url, :with => %r{\Ahttps?:\/\/([\da-z\.-]+)\.([a-z\.]{2,6})([\/\w \.-]*)*\/?\Z}, :allow_nil => true, :allow_blank => true
-
-  def self.nullable_attributes
-    [:organizational_unit, :operating_department_name, :code, :phone, :fax, :email, :url, :time_zone]
-  end
+    validates_format_of :registration_number, :with => %r{\A[0-9A-Za-z_-]+\Z}, :allow_nil => true, :allow_blank => true
+    validates_presence_of :name
+    validates_format_of :url, :with => %r{\Ahttps?:\/\/([\da-z\.-]+)\.([a-z\.]{2,6})([\/\w \.-]*)*\/?\Z}, :allow_nil => true, :allow_blank => true
 
+    def self.nullable_attributes
+      [:organizational_unit, :operating_department_name, :code, :phone, :fax, :email, :url, :time_zone]
+    end
 
-end
 
+  end
+end
+\ No newline at end of file
diff --git a/app/models/chouette/connection_link.rb b/app/models/chouette/connection_link.rb
index e225c2fae..d19b53974 100644
--- a/app/models/chouette/connection_link.rb
+++ b/app/models/chouette/connection_link.rb
@@ -1,48 +1,50 @@
-class Chouette::ConnectionLink < Chouette::TridentActiveRecord
-  include ConnectionLinkRestrictions
-  # FIXME http://jira.codehaus.org/browse/JRUBY-6358
-  self.primary_key = "id"
+module Chouette
+  class ConnectionLink < Chouette::TridentActiveRecord
+    include ObjectidSupport
+    include ConnectionLinkRestrictions
+    # FIXME http://jira.codehaus.org/browse/JRUBY-6358
+    self.primary_key = "id"
 
-  attr_accessor :connection_link_type
+    attr_accessor :connection_link_type
 
-  belongs_to :departure, :class_name => 'Chouette::StopArea'
-  belongs_to :arrival, :class_name => 'Chouette::StopArea'
+    belongs_to :departure, :class_name => 'Chouette::StopArea'
+    belongs_to :arrival, :class_name => 'Chouette::StopArea'
 
-  validates_presence_of :name
+    validates_presence_of :name
 
-  def self.nullable_attributes
-    [:link_distance, :default_duration, :frequent_traveller_duration, :occasional_traveller_duration,
-      :mobility_restricted_traveller_duration, :link_type]
-  end
+    def self.nullable_attributes
+      [:link_distance, :default_duration, :frequent_traveller_duration, :occasional_traveller_duration,
+        :mobility_restricted_traveller_duration, :link_type]
+    end
 
-  def connection_link_type
-    link_type && Chouette::ConnectionLinkType.new( link_type.underscore)
-  end
+    def connection_link_type
+      link_type && Chouette::ConnectionLinkType.new( link_type.underscore)
+    end
 
-  def connection_link_type=(connection_link_type)
-    self.link_type = (connection_link_type ? connection_link_type.camelcase : nil)
-  end
-
-  @@connection_link_types = nil
-  def self.connection_link_types
-    @@connection_link_types ||= Chouette::ConnectionLinkType.all
-  end
+    def connection_link_type=(connection_link_type)
+      self.link_type = (connection_link_type ? connection_link_type.camelcase : nil)
+    end
 
-  def possible_areas
-    Chouette::StopArea.where("area_type != 'ITL'")
-  end
+    @@connection_link_types = nil
+    def self.connection_link_types
+      @@connection_link_types ||= Chouette::ConnectionLinkType.all
+    end
 
-  def stop_areas
-    Chouette::StopArea.where(:id => [self.departure_id,self.arrival_id])
-  end
+    def possible_areas
+      Chouette::StopArea.where("area_type != 'ITL'")
+    end
 
-  def geometry
-    GeoRuby::SimpleFeatures::LineString.from_points( [ departure.geometry, arrival.geometry], 4326) if departure.geometry and arrival.geometry
-  end
+    def stop_areas
+      Chouette::StopArea.where(:id => [self.departure_id,self.arrival_id])
+    end
 
-  def geometry_presenter
-    Chouette::Geometry::ConnectionLinkPresenter.new self
-  end
+    def geometry
+      GeoRuby::SimpleFeatures::LineString.from_points( [ departure.geometry, arrival.geometry], 4326) if departure.geometry and arrival.geometry
+    end
 
-end
+    def geometry_presenter
+      Chouette::Geometry::ConnectionLinkPresenter.new self
+    end
 
+  end
+end
+\ No newline at end of file
diff --git a/app/models/chouette/connection_link_type.rb b/app/models/chouette/connection_link_type.rb
index 41635f48c..516395ed9 100644
--- a/app/models/chouette/connection_link_type.rb
+++ b/app/models/chouette/connection_link_type.rb
@@ -1,51 +1,50 @@
-class Chouette::ConnectionLinkType < ActiveSupport::StringInquirer
-
-  def initialize(text_code, numerical_code)
-    super text_code.to_s
-    @numerical_code = numerical_code
-  end
+module Chouette
+  class ConnectionLinkType < ActiveSupport::StringInquirer
+    def initialize(text_code, numerical_code)
+      super text_code.to_s
+      @numerical_code = numerical_code
+    end
 
-  def self.new(text_code, numerical_code = nil)
-    if text_code and numerical_code
-      super
-    elsif self === text_code 
-      text_code
-    else
-      if Fixnum === text_code
-        text_code, numerical_code = definitions.rassoc(text_code)
+    def self.new(text_code, numerical_code = nil)
+      if text_code and numerical_code
+        super
+      elsif self === text_code 
+        text_code
       else
-        text_code, numerical_code = definitions.assoc(text_code.to_s)
-      end
+        if Fixnum === text_code
+          text_code, numerical_code = definitions.rassoc(text_code)
+        else
+          text_code, numerical_code = definitions.assoc(text_code.to_s)
+        end
 
-      super text_code, numerical_code
+        super text_code, numerical_code
+      end
     end
-  end
-
-  def to_i
-    @numerical_code
-  end
 
-  def inspect
-    "#{to_s}/#{to_i}"
-  end
+    def to_i
+      @numerical_code
+    end
 
-  def name
-    camelize
-  end
+    def inspect
+      "#{to_s}/#{to_i}"
+    end
 
-  @@definitions = [
-    ["underground", 0],
-    ["mixed", 1],
-    ["overground", 2]
-  ]
-  cattr_reader :definitions
+    def name
+      camelize
+    end
 
-  @@all = nil
-  def self.all
-    @@all ||= definitions.collect do |text_code, numerical_code|
-      new(text_code, numerical_code)
+    @@definitions = [
+      ["underground", 0],
+      ["mixed", 1],
+      ["overground", 2]
+    ]
+    cattr_reader :definitions
+
+    @@all = nil
+    def self.all
+      @@all ||= definitions.collect do |text_code, numerical_code|
+        new(text_code, numerical_code)
+      end
     end
   end
-
-end
-
+end
+\ No newline at end of file
diff --git a/app/models/chouette/direction.rb b/app/models/chouette/direction.rb
index 93bc1318b..2d3fea10a 100644
--- a/app/models/chouette/direction.rb
+++ b/app/models/chouette/direction.rb
@@ -1,60 +1,59 @@
-class Chouette::Direction < ActiveSupport::StringInquirer
-
-  def initialize(text_code, numerical_code)
-    super text_code.to_s
-    @numerical_code = numerical_code
-  end
+module Chouette
+  class Direction < ActiveSupport::StringInquirer
+    def initialize(text_code, numerical_code)
+      super text_code.to_s
+      @numerical_code = numerical_code
+    end
 
-  def self.new(text_code, numerical_code = nil)
-    if text_code and numerical_code
-      super
-    elsif self === text_code 
-      text_code
-    else
-      if Fixnum === text_code
-        text_code, numerical_code = definitions.rassoc(text_code)
+    def self.new(text_code, numerical_code = nil)
+      if text_code and numerical_code
+        super
+      elsif self === text_code 
+        text_code
       else
-        text_code, numerical_code = definitions.assoc(text_code.to_s)
-      end
+        if Fixnum === text_code
+          text_code, numerical_code = definitions.rassoc(text_code)
+        else
+          text_code, numerical_code = definitions.assoc(text_code.to_s)
+        end
 
-      super text_code, numerical_code
+        super text_code, numerical_code
+      end
     end
-  end
-
-  def to_i
-    @numerical_code
-  end
 
-  def inspect
-    "#{to_s}/#{to_i}"
-  end
+    def to_i
+      @numerical_code
+    end
 
-  def name
-    to_s
-  end
+    def inspect
+      "#{to_s}/#{to_i}"
+    end
 
-  @@definitions = [
-    ["straight_forward", 0],
-    ["backward", 1],
-    ["clock_wise", 2],
-    ["counter_clock_wise", 3],
-    ["north", 4],
-    ["north_west", 5],
-    ["west", 6],
-    ["south_west", 7],
-    ["south", 8],
-    ["south_east", 9],
-    ["east", 10],
-    ["north_east", 11]
-  ]
-  cattr_reader :definitions
+    def name
+      to_s
+    end
 
-  @@all = nil
-  def self.all
-    @@all ||= definitions.collect do |text_code, numerical_code|
-      new(text_code, numerical_code)
+    @@definitions = [
+      ["straight_forward", 0],
+      ["backward", 1],
+      ["clock_wise", 2],
+      ["counter_clock_wise", 3],
+      ["north", 4],
+      ["north_west", 5],
+      ["west", 6],
+      ["south_west", 7],
+      ["south", 8],
+      ["south_east", 9],
+      ["east", 10],
+      ["north_east", 11]
+    ]
+    cattr_reader :definitions
+
+    @@all = nil
+    def self.all
+      @@all ||= definitions.collect do |text_code, numerical_code|
+        new(text_code, numerical_code)
+      end
     end
   end
-
-end
-
+end
+\ No newline at end of file
diff --git a/app/models/chouette/exporter.rb b/app/models/chouette/exporter.rb
index df85a9dde..98cab7269 100644
--- a/app/models/chouette/exporter.rb
+++ b/app/models/chouette/exporter.rb
@@ -1,32 +1,34 @@
-class Chouette::Exporter
+module Chouette
+  class Exporter
 
-  attr_reader :schema
+    attr_reader :schema
 
-  def initialize(schema)
-    @schema = schema
-  end
+    def initialize(schema)
+      @schema = schema
+    end
 
-  def chouette_command
-    @chouette_command ||= Chouette::Command.new(:schema => schema)
-  end
+    def chouette_command
+      @chouette_command ||= Chouette::Command.new(:schema => schema)
+    end
 
-  def export(file, options = {})
-    options = {
-      :format => :neptune
-    }.merge(options)
-
-    command_options = {
-      :c => "export", 
-      :o => "line", 
-      :format => options.delete(:format).to_s.upcase, 
-      :output_file => File.expand_path(file), 
-      :optimize_memory => true
-    }.merge(options)
-
-    logger.info "Export #{file} in schema #{schema}"
-    chouette_command.run! command_options
-  end
+    def export(file, options = {})
+      options = {
+        :format => :neptune
+      }.merge(options)
 
-  include Chouette::CommandLineSupport
+      command_options = {
+        :c => "export", 
+        :o => "line", 
+        :format => options.delete(:format).to_s.upcase, 
+        :output_file => File.expand_path(file), 
+        :optimize_memory => true
+      }.merge(options)
 
-end
+      logger.info "Export #{file} in schema #{schema}"
+      chouette_command.run! command_options
+    end
+
+    include Chouette::CommandLineSupport
+
+  end
+end
+\ No newline at end of file
diff --git a/app/models/chouette/file_validator.rb b/app/models/chouette/file_validator.rb
index 513648a62..98453c71c 100644
--- a/app/models/chouette/file_validator.rb
+++ b/app/models/chouette/file_validator.rb
@@ -1,47 +1,49 @@
-class Chouette::FileValidator
+module Chouette
+  class FileValidator
 
-  attr_reader :schema, :database, :user, :password, :host
+    attr_reader :schema, :database, :user, :password, :host
 
-  def initialize(schema)
-    @schema = schema
+    def initialize(schema)
+      @schema = schema
 
-    Chouette::ActiveRecord.connection_pool.spec.config.tap do |config|
-      @database = config[:database]
-      @user = config[:username]
-      @password = config[:password]
-      @host = (config[:host] or "localhost")
+      Chouette::ActiveRecord.connection_pool.spec.config.tap do |config|
+        @database = config[:database]
+        @user = config[:username]
+        @password = config[:password]
+        @host = (config[:host] or "localhost")
+      end
     end
-  end
 
-  def self.chouette_command=(command)
-    Chouette::Command.command = command
-  end
+    def self.chouette_command=(command)
+      Chouette::Command.command = command
+    end
 
-  class << self
-    deprecate :chouette_command= => "Use Chouette::Command.command ="
-  end
+    class << self
+      deprecate :chouette_command= => "Use Chouette::Command.command ="
+    end
 
-  def chouette_command
-    @chouette_command ||= Chouette::Command.new(:schema => schema)
-  end
+    def chouette_command
+      @chouette_command ||= Chouette::Command.new(:schema => schema)
+    end
 
-  def validate(file, options = {})
-    options = {
-      :format => :neptune
-    }.merge(options)
+    def validate(file, options = {})
+      options = {
+        :format => :neptune
+      }.merge(options)
 
-    command_options = {
-      :c => "validate", 
-      :o => "line", 
-      :input_file => File.expand_path(file), 
-      :optimize_memory => true
-    }.merge(options)
+      command_options = {
+        :c => "validate", 
+        :o => "line", 
+        :input_file => File.expand_path(file), 
+        :optimize_memory => true
+      }.merge(options)
 
-    logger.info "Validate #{file}"
-    chouette_command.run! command_options
-  end
+      logger.info "Validate #{file}"
+      chouette_command.run! command_options
+    end
 
 
-  include Chouette::CommandLineSupport
+    include Chouette::CommandLineSupport
 
-end
+  end
+end
+\ No newline at end of file
diff --git a/app/models/chouette/footnote.rb b/app/models/chouette/footnote.rb
index 1664faf23..051027cea 100644
--- a/app/models/chouette/footnote.rb
+++ b/app/models/chouette/footnote.rb
@@ -1,13 +1,15 @@
-class Chouette::Footnote < Chouette::ActiveRecord
-  include ChecksumSupport
+module Chouette
+  class Footnote < Chouette::ActiveRecord
+    include ChecksumSupport
 
-  belongs_to :line, inverse_of: :footnotes
-  has_and_belongs_to_many :vehicle_journeys, :class_name => 'Chouette::VehicleJourney'
+    belongs_to :line, inverse_of: :footnotes
+    has_and_belongs_to_many :vehicle_journeys, :class_name => 'Chouette::VehicleJourney'
 
-  validates_presence_of :line
+    validates_presence_of :line
 
-  def checksum_attributes
-    attrs = ['code', 'label']
-    self.slice(*attrs).values
+    def checksum_attributes
+      attrs = ['code', 'label']
+      self.slice(*attrs).values
+    end
   end
-end
+end
+\ No newline at end of file
diff --git a/app/models/chouette/group_of_line.rb b/app/models/chouette/group_of_line.rb
index a987d6311..3023d23ed 100644
--- a/app/models/chouette/group_of_line.rb
+++ b/app/models/chouette/group_of_line.rb
@@ -1,31 +1,33 @@
-class Chouette::GroupOfLine < Chouette::ActiveRecord
-  include StifCodifligneAttributesSupport
-  include GroupOfLineRestrictions
-  include LineReferentialSupport
+module Chouette
+  class GroupOfLine < Chouette::ActiveRecord
+    include ObjectidSupport
+    include GroupOfLineRestrictions
+    include LineReferentialSupport
 
-  # FIXME http://jira.codehaus.org/browse/JRUBY-6358
-  self.primary_key = "id"
+    # FIXME http://jira.codehaus.org/browse/JRUBY-6358
+    self.primary_key = "id"
 
-  has_and_belongs_to_many :lines, :class_name => 'Chouette::Line', :order => 'lines.name'
+    has_and_belongs_to_many :lines, :class_name => 'Chouette::Line', :order => 'lines.name'
 
-  validates_presence_of :name
+    validates_presence_of :name
 
-  attr_reader :line_tokens
+    attr_reader :line_tokens
 
-  def self.nullable_attributes
-    [:comment]
-  end
+    def self.nullable_attributes
+      [:comment]
+    end
 
-  def commercial_stop_areas
-    Chouette::StopArea.joins(:children => [:stop_points => [:route => [:line => :group_of_lines] ] ]).where(:group_of_lines => {:id => self.id}).uniq
-  end
+    def commercial_stop_areas
+      Chouette::StopArea.joins(:children => [:stop_points => [:route => [:line => :group_of_lines] ] ]).where(:group_of_lines => {:id => self.id}).uniq
+    end
 
-  def stop_areas
-    Chouette::StopArea.joins(:stop_points => [:route => [:line => :group_of_lines] ]).where(:group_of_lines => {:id => self.id})
-  end
+    def stop_areas
+      Chouette::StopArea.joins(:stop_points => [:route => [:line => :group_of_lines] ]).where(:group_of_lines => {:id => self.id})
+    end
 
-  def line_tokens=(ids)
-    self.line_ids = ids.split(",")
-  end
+    def line_tokens=(ids)
+      self.line_ids = ids.split(",")
+    end
 
-end
+  end
+end
+\ No newline at end of file
diff --git a/app/models/chouette/journey_frequency.rb b/app/models/chouette/journey_frequency.rb
index 45b8aea8c..1b4efe96e 100644
--- a/app/models/chouette/journey_frequency.rb
+++ b/app/models/chouette/journey_frequency.rb
@@ -1,5 +1,4 @@
 module Chouette
-
   class JourneyFrequencyValidator < ActiveModel::Validator
     def validate(record)
       timeband = record.timeband
@@ -31,6 +30,6 @@ module Chouette
     validates :first_departure_time, presence: true
     validates :last_departure_time,  presence: true
     validates :scheduled_headway_interval, presence: true
-    validates_with JourneyFrequencyValidator
+    validates_with Chouette::JourneyFrequencyValidator
   end
-end
+end
+\ No newline at end of file
diff --git a/app/models/chouette/journey_pattern.rb b/app/models/chouette/journey_pattern.rb
index 1104c6035..c1f9fb4f8 100644
--- a/app/models/chouette/journey_pattern.rb
+++ b/app/models/chouette/journey_pattern.rb
@@ -1,144 +1,148 @@
-class Chouette::JourneyPattern < Chouette::TridentActiveRecord
-  include ChecksumSupport
-  include JourneyPatternRestrictions
-  # FIXME http://jira.codehaus.org/browse/JRUBY-6358
-  self.primary_key = "id"
-
-  belongs_to :route
-  has_many :vehicle_journeys, :dependent => :destroy
-  has_many :vehicle_journey_at_stops, :through => :vehicle_journeys
-  has_and_belongs_to_many :stop_points, -> { order("stop_points.position") }, :before_add => :vjas_add, :before_remove => :vjas_remove, :after_add => :shortcuts_update_for_add, :after_remove => :shortcuts_update_for_remove
-  has_many :stop_areas, through: :stop_points
-
-  validates_presence_of :route
-  validates_presence_of :name
-
-  #validates :stop_points, length: { minimum: 2, too_short: :minimum }, on: :update
-  enum section_status: { todo: 0, completed: 1, control: 2 }
-
-  attr_accessor  :control_checked
-  def local_id
-    "IBOO-#{self.referential.id}-#{self.try(:route).try(:line).try(:objectid).try(:local_id)}-#{self.id}"
-  end
+module Chouette
+  class JourneyPattern < Chouette::TridentActiveRecord
+    include ChecksumSupport
+    include JourneyPatternRestrictions
+    include ObjectidSupport
+    # FIXME http://jira.codehaus.org/browse/JRUBY-6358
+    self.primary_key = "id"
+
+    belongs_to :route
+    has_many :vehicle_journeys, :dependent => :destroy
+    has_many :vehicle_journey_at_stops, :through => :vehicle_journeys
+    has_and_belongs_to_many :stop_points, -> { order("stop_points.position") }, :before_add => :vjas_add, :before_remove => :vjas_remove, :after_add => :shortcuts_update_for_add, :after_remove => :shortcuts_update_for_remove
+    has_many :stop_areas, through: :stop_points
+
+    validates_presence_of :route
+    validates_presence_of :name
+
+    #validates :stop_points, length: { minimum: 2, too_short: :minimum }, on: :update
+    enum section_status: { todo: 0, completed: 1, control: 2 }
+
+    attr_accessor  :control_checked
+
+    def local_id
+      "IBOO-#{self.referential.id}-#{self.route.line.get_objectid.local_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)
-    values.flatten
-  end
+    def checksum_attributes
+      values = self.slice(*['name', 'published_name', 'registration_number']).values
+      values << self.stop_points.map(&:stop_area).map(&:user_objectid)
+      values.flatten
+    end
 
-  def self.state_update route, state
-    transaction do
-      state.each do |item|
-        item.delete('errors')
-        jp = find_by(objectid: item['object_id']) || state_create_instance(route, item)
-        next if item['deletable'] && jp.persisted? && jp.destroy
-        # Update attributes and stop_points associations
-        jp.update_attributes(state_permited_attributes(item)) unless item['new_record']
-        jp.state_stop_points_update(item) if !jp.errors.any? && jp.persisted?
-        item['errors'] = jp.errors if jp.errors.any?
+    def self.state_update route, state
+      transaction do
+        state.each do |item|
+          item.delete('errors')
+          jp = find_by(objectid: item['object_id']) || state_create_instance(route, item)
+          next if item['deletable'] && jp.persisted? && jp.destroy
+          # Update attributes and stop_points associations
+          jp.update_attributes(state_permited_attributes(item)) unless item['new_record']
+          jp.state_stop_points_update(item) if !jp.errors.any? && jp.persisted?
+          item['errors'] = jp.errors if jp.errors.any?
+        end
+
+        if state.any? {|item| item['errors']}
+          state.map {|item| item.delete('object_id') if item['new_record']}
+          raise ::ActiveRecord::Rollback
+        end
       end
 
-      if state.any? {|item| item['errors']}
-        state.map {|item| item.delete('object_id') if item['new_record']}
-        raise ActiveRecord::Rollback
-      end
+      state.map {|item| item.delete('new_record')}
+      state.delete_if {|item| item['deletable']}
     end
 
-    state.map {|item| item.delete('new_record')}
-    state.delete_if {|item| item['deletable']}
-  end
-
-  def self.state_permited_attributes item
-    {
-      name: item['name'],
-      published_name: item['published_name'],
-      registration_number: item['registration_number']
-    }
-  end
-
-  def self.state_create_instance route, item
-    # Flag new record, so we can unset object_id if transaction rollback
-    jp = route.journey_patterns.create(state_permited_attributes(item))
+    def self.state_permited_attributes item
+      {
+        name: item['name'],
+        published_name: item['published_name'],
+        registration_number: item['registration_number']
+      }
+    end
 
-    # FIXME
-    # DefaultAttributesSupport will trigger some weird validation on after save
-    # wich will call to valid?, wich will populate errors
-    # In this case, we mark jp to be valid if persisted? return true
-    jp.errors.clear if jp.persisted?
+    def self.state_create_instance route, item
+      # Flag new record, so we can unset object_id if transaction rollback
+      jp = route.journey_patterns.create(state_permited_attributes(item))
 
-    item['object_id']  = jp.objectid
-    item['new_record'] = true
-    jp
-  end
+      # FIXME
+      # DefaultAttributesSupport will trigger some weird validation on after save
+      # wich will call to valid?, wich will populate errors
+      # In this case, we mark jp to be valid if persisted? return true
+      jp.errors.clear if jp.persisted?
 
-  def state_stop_points_update item
-    item['stop_points'].each do |sp|
-      exist = stop_area_ids.include?(sp['id'])
-      next if exist && sp['checked']
+      item['object_id']  = jp.objectid
+      item['new_record'] = true
+      jp
+    end
 
-      stop_point = route.stop_points.find_by(stop_area_id: sp['id'])
-      if !exist && sp['checked']
-        stop_points << stop_point
-      end
-      if exist && !sp['checked']
-        stop_points.delete(stop_point)
+    def state_stop_points_update item
+      item['stop_points'].each do |sp|
+        exist = stop_area_ids.include?(sp['id'])
+        next if exist && sp['checked']
+
+        stop_point = route.stop_points.find_by(stop_area_id: sp['id'])
+        if !exist && sp['checked']
+          stop_points << stop_point
+        end
+        if exist && !sp['checked']
+          stop_points.delete(stop_point)
+        end
       end
     end
-  end
 
-  # TODO: this a workarround
-  # otherwise, we loose the first stop_point
-  # when creating a new journey_pattern
-  def special_update
-    bck_sp = self.stop_points.map {|s| s}
-    self.update_attributes :stop_points => []
-    self.update_attributes :stop_points => bck_sp
-  end
+    # TODO: this a workarround
+    # otherwise, we loose the first stop_point
+    # when creating a new journey_pattern
+    def special_update
+      bck_sp = self.stop_points.map {|s| s}
+      self.update_attributes :stop_points => []
+      self.update_attributes :stop_points => bck_sp
+    end
 
-  def departure_stop_point
-    return unless departure_stop_point_id
-    Chouette::StopPoint.find( departure_stop_point_id)
-  end
+    def departure_stop_point
+      return unless departure_stop_point_id
+      Chouette::StopPoint.find( departure_stop_point_id)
+    end
 
-  def arrival_stop_point
-    return unless arrival_stop_point_id
-    Chouette::StopPoint.find( arrival_stop_point_id)
-  end
+    def arrival_stop_point
+      return unless arrival_stop_point_id
+      Chouette::StopPoint.find( arrival_stop_point_id)
+    end
 
-  def shortcuts_update_for_add( stop_point)
-    stop_points << stop_point unless stop_points.include?( stop_point)
+    def shortcuts_update_for_add( stop_point)
+      stop_points << stop_point unless stop_points.include?( stop_point)
 
-    ordered_stop_points = stop_points
-    ordered_stop_points = ordered_stop_points.sort { |a,b| a.position <=> b.position} unless ordered_stop_points.empty?
+      ordered_stop_points = stop_points
+      ordered_stop_points = ordered_stop_points.sort { |a,b| a.position <=> b.position} unless ordered_stop_points.empty?
 
-    self.update_attributes( :departure_stop_point_id => (ordered_stop_points.first && ordered_stop_points.first.id),
-                             :arrival_stop_point_id => (ordered_stop_points.last && ordered_stop_points.last.id))
-  end
+      self.update_attributes( :departure_stop_point_id => (ordered_stop_points.first && ordered_stop_points.first.id),
+                              :arrival_stop_point_id => (ordered_stop_points.last && ordered_stop_points.last.id))
+    end
 
-  def shortcuts_update_for_remove( stop_point)
-    stop_points.delete( stop_point) if stop_points.include?( stop_point)
+    def shortcuts_update_for_remove( stop_point)
+      stop_points.delete( stop_point) if stop_points.include?( stop_point)
 
-    ordered_stop_points = stop_points
-    ordered_stop_points = ordered_stop_points.sort { |a,b| a.position <=> b.position} unless ordered_stop_points.empty?
+      ordered_stop_points = stop_points
+      ordered_stop_points = ordered_stop_points.sort { |a,b| a.position <=> b.position} unless ordered_stop_points.empty?
 
-    self.update_attributes( :departure_stop_point_id => (ordered_stop_points.first && ordered_stop_points.first.id),
-                             :arrival_stop_point_id => (ordered_stop_points.last && ordered_stop_points.last.id))
-  end
+      self.update_attributes( :departure_stop_point_id => (ordered_stop_points.first && ordered_stop_points.first.id),
+                              :arrival_stop_point_id => (ordered_stop_points.last && ordered_stop_points.last.id))
+    end
 
-  def vjas_add( stop_point)
-    return if new_record?
+    def vjas_add( stop_point)
+      return if new_record?
 
-    vehicle_journeys.each do |vj|
-      vjas = vj.vehicle_journey_at_stops.create :stop_point_id => stop_point.id
+      vehicle_journeys.each do |vj|
+        vjas = vj.vehicle_journey_at_stops.create :stop_point_id => stop_point.id
+      end
     end
-  end
 
-  def vjas_remove( stop_point)
-    return if new_record?
+    def vjas_remove( stop_point)
+      return if new_record?
 
-    vehicle_journey_at_stops.where( :stop_point_id => stop_point.id).each do |vjas|
-      vjas.destroy
+      vehicle_journey_at_stops.where( :stop_point_id => stop_point.id).each do |vjas|
+        vjas.destroy
+      end
     end
   end
 end
diff --git a/app/models/chouette/line.rb b/app/models/chouette/line.rb
index 6f87a5d08..8d5ff5f60 100644
--- a/app/models/chouette/line.rb
+++ b/app/models/chouette/line.rb
@@ -1,81 +1,82 @@
-class Chouette::Line < Chouette::ActiveRecord
-  include StifCodifligneAttributesSupport
-  include LineRestrictions
-  include LineReferentialSupport
-  include StifTransportModeEnumerations
-  include StifTransportSubmodeEnumerations
+module Chouette
+  class Line < Chouette::ActiveRecord
+    include LineRestrictions
+    include LineReferentialSupport
+    include ObjectidSupport
+    extend StifTransportModeEnumerations
+    extend StifTransportSubmodeEnumerations
+    extend ActiveModel::Naming
 
-  extend ActiveModel::Naming
+    # FIXME http://jira.codehaus.org/browse/JRUBY-6358
+    self.primary_key = "id"
 
-  # FIXME http://jira.codehaus.org/browse/JRUBY-6358
-  self.primary_key = "id"
+    belongs_to :company
+    belongs_to :network
+    belongs_to :line_referential
 
-  belongs_to :company
-  belongs_to :network
-  belongs_to :line_referential
+    has_array_of :secondary_companies, class_name: 'Chouette::Company'
 
-  has_array_of :secondary_companies, class_name: 'Chouette::Company'
+    has_many :routes, :dependent => :destroy
+    has_many :journey_patterns, :through => :routes
+    has_many :vehicle_journeys, :through => :journey_patterns
+    has_many :routing_constraint_zones, through: :routes
 
-  has_many :routes, :dependent => :destroy
-  has_many :journey_patterns, :through => :routes
-  has_many :vehicle_journeys, :through => :journey_patterns
-  has_many :routing_constraint_zones, through: :routes
+    has_and_belongs_to_many :group_of_lines, :class_name => 'Chouette::GroupOfLine', :order => 'group_of_lines.name'
 
-  has_and_belongs_to_many :group_of_lines, :class_name => 'Chouette::GroupOfLine', :order => 'group_of_lines.name'
+    has_many :footnotes, :inverse_of => :line, :validate => :true, :dependent => :destroy
+    accepts_nested_attributes_for :footnotes, :reject_if => :all_blank, :allow_destroy => true
 
-  has_many :footnotes, :inverse_of => :line, :validate => :true, :dependent => :destroy
-  accepts_nested_attributes_for :footnotes, :reject_if => :all_blank, :allow_destroy => true
+    attr_reader :group_of_line_tokens
 
-  attr_reader :group_of_line_tokens
+    # validates_presence_of :network
+    # validates_presence_of :company
 
-  # validates_presence_of :network
-  # validates_presence_of :company
+    validates_format_of :registration_number, :with => %r{\A[\d\w_\-]+\Z}, :allow_nil => true, :allow_blank => true
+    validates_format_of :stable_id, :with => %r{\A[\d\w_\-]+\Z}, :allow_nil => true, :allow_blank => true
+    validates_format_of :url, :with => %r{\Ahttps?:\/\/([\da-z\.-]+)\.([a-z\.]{2,6})([\/\w \.-]*)*\/?\Z}, :allow_nil => true, :allow_blank => true
+    validates_format_of :color, :with => %r{\A[0-9a-fA-F]{6}\Z}, :allow_nil => true, :allow_blank => true
+    validates_format_of :text_color, :with => %r{\A[0-9a-fA-F]{6}\Z}, :allow_nil => true, :allow_blank => true
 
-  validates_format_of :registration_number, :with => %r{\A[\d\w_\-]+\Z}, :allow_nil => true, :allow_blank => true
-  validates_format_of :stable_id, :with => %r{\A[\d\w_\-]+\Z}, :allow_nil => true, :allow_blank => true
-  validates_format_of :url, :with => %r{\Ahttps?:\/\/([\da-z\.-]+)\.([a-z\.]{2,6})([\/\w \.-]*)*\/?\Z}, :allow_nil => true, :allow_blank => true
-  validates_format_of :color, :with => %r{\A[0-9a-fA-F]{6}\Z}, :allow_nil => true, :allow_blank => true
-  validates_format_of :text_color, :with => %r{\A[0-9a-fA-F]{6}\Z}, :allow_nil => true, :allow_blank => true
+    validates_presence_of :name
 
-  validates_presence_of :name
+    scope :by_text, ->(text) { where('lower(name) LIKE :t or lower(published_name) LIKE :t or lower(objectid) LIKE :t or lower(comment) LIKE :t or lower(number) LIKE :t',
+      t: "%#{text.downcase}%") }
 
-  scope :by_text, ->(text) { where('lower(name) LIKE :t or lower(published_name) LIKE :t or lower(objectid) LIKE :t or lower(comment) LIKE :t or lower(number) LIKE :t',
-    t: "%#{text.downcase}%") }
+    def self.nullable_attributes
+      [:published_name, :number, :comment, :url, :color, :text_color, :stable_id]
+    end
 
-  def self.nullable_attributes
-    [:published_name, :number, :comment, :url, :color, :text_color, :stable_id]
-  end
+    def geometry_presenter
+      Chouette::Geometry::LinePresenter.new self
+    end
 
-  def geometry_presenter
-    Chouette::Geometry::LinePresenter.new self
-  end
+    def commercial_stop_areas
+      Chouette::StopArea.joins(:children => [:stop_points => [:route => :line] ]).where(:lines => {:id => self.id}).uniq
+    end
 
-  def commercial_stop_areas
-    Chouette::StopArea.joins(:children => [:stop_points => [:route => :line] ]).where(:lines => {:id => self.id}).uniq
-  end
+    def stop_areas
+      Chouette::StopArea.joins(:stop_points => [:route => :line]).where(:lines => {:id => self.id})
+    end
 
-  def stop_areas
-    Chouette::StopArea.joins(:stop_points => [:route => :line]).where(:lines => {:id => self.id})
-  end
+    def stop_areas_last_parents
+      Chouette::StopArea.joins(:stop_points => [:route => :line]).where(:lines => {:id => self.id}).collect(&:root).flatten.uniq
+    end
 
-  def stop_areas_last_parents
-    Chouette::StopArea.joins(:stop_points => [:route => :line]).where(:lines => {:id => self.id}).collect(&:root).flatten.uniq
-  end
+    def group_of_line_tokens=(ids)
+      self.group_of_line_ids = ids.split(",")
+    end
 
-  def group_of_line_tokens=(ids)
-    self.group_of_line_ids = ids.split(",")
-  end
+    def vehicle_journey_frequencies?
+      self.vehicle_journeys.unscoped.where(journey_category: 1).count > 0
+    end
 
-  def vehicle_journey_frequencies?
-    self.vehicle_journeys.unscoped.where(journey_category: 1).count > 0
-  end
+    def display_name
+      [self.get_objectid.local_id, number, name, company.try(:name)].compact.join(' - ')
+    end
 
-  def display_name
-    [objectid.local_id, number, name, company.try(:name)].compact.join(' - ')
-  end
+    def companies
+      line_referential.companies.where(id: ([company_id] + Array(secondary_company_ids)).compact)
+    end
 
-  def companies
-    line_referential.companies.where(id: ([company_id] + Array(secondary_company_ids)).compact)
   end
-
-end
+end
+\ No newline at end of file
diff --git a/app/models/chouette/link_orientation_type.rb b/app/models/chouette/link_orientation_type.rb
index ec279aba3..c3addf4b4 100644
--- a/app/models/chouette/link_orientation_type.rb
+++ b/app/models/chouette/link_orientation_type.rb
@@ -1,49 +1,51 @@
-class Chouette::LinkOrientationType < ActiveSupport::StringInquirer
+module Chouette
+  class LinkOrientationType < ActiveSupport::StringInquirer
 
-  def initialize(text_code, numerical_code)
-    super text_code.to_s
-    @numerical_code = numerical_code
-  end
+    def initialize(text_code, numerical_code)
+      super text_code.to_s
+      @numerical_code = numerical_code
+    end
 
-  def self.new(text_code, numerical_code = nil)
-    if text_code and numerical_code
-      super
-    elsif self === text_code 
-      text_code
-    else
-      if Fixnum === text_code
-        text_code, numerical_code = definitions.rassoc(text_code)
+    def self.new(text_code, numerical_code = nil)
+      if text_code and numerical_code
+        super
+      elsif self === text_code 
+        text_code
       else
-        text_code, numerical_code = definitions.assoc(text_code.to_s)
-      end
+        if Fixnum === text_code
+          text_code, numerical_code = definitions.rassoc(text_code)
+        else
+          text_code, numerical_code = definitions.assoc(text_code.to_s)
+        end
 
-      super text_code, numerical_code
+        super text_code, numerical_code
+      end
     end
-  end
 
-  def to_i
-    @numerical_code
-  end
+    def to_i
+      @numerical_code
+    end
 
-  def inspect
-    "#{to_s}/#{to_i}"
-  end
+    def inspect
+      "#{to_s}/#{to_i}"
+    end
 
-  def name
-    camelize
-  end
+    def name
+      camelize
+    end
 
-  @@definitions = [
-    ["access_point_to_stop_area", 0],
-    ["stop_area_to_access_point", 1]
-  ]
-  cattr_reader :definitions
+    @@definitions = [
+      ["access_point_to_stop_area", 0],
+      ["stop_area_to_access_point", 1]
+    ]
+    cattr_reader :definitions
 
-  @@all = nil
-  def self.all
-    @@all ||= definitions.collect do |text_code, numerical_code|
-      new(text_code, numerical_code)
+    @@all = nil
+    def self.all
+      @@all ||= definitions.collect do |text_code, numerical_code|
+        new(text_code, numerical_code)
+      end
     end
-  end
 
-end
+  end
+end
+\ No newline at end of file
diff --git a/app/models/chouette/loader.rb b/app/models/chouette/loader.rb
index 40a2be4ee..7ab696dab 100644
--- a/app/models/chouette/loader.rb
+++ b/app/models/chouette/loader.rb
@@ -1,110 +1,112 @@
-class Chouette::Loader
+module Chouette
+  class Loader
 
-  attr_reader :schema, :database, :user, :password, :host
+    attr_reader :schema, :database, :user, :password, :host
 
-  def initialize(schema)
-    @schema = schema
+    def initialize(schema)
+      @schema = schema
 
-    Chouette::ActiveRecord.connection_pool.spec.config.tap do |config|
-      @database = config[:database]
-      @user = config[:username]
-      @password = config[:password]
-      @host = (config[:host] or "localhost")
+      Chouette::ActiveRecord.connection_pool.spec.config.tap do |config|
+        @database = config[:database]
+        @user = config[:username]
+        @password = config[:password]
+        @host = (config[:host] or "localhost")
+      end
     end
-  end
 
-  # Load dump where datas are in schema 'chouette'
-  def load_dump(file)
-    logger.info "Load #{file} in schema #{schema}"
-    with_pg_password do
-      execute!("sed -e 's/ chouette/ \"#{schema}\"/' -e 's/ OWNER TO .*;/ OWNER TO #{user};/' #{file} | psql #{pg_options} --set ON_ERROR_ROLLBACK=1 --set ON_ERROR_STOP=1")
+    # Load dump where datas are in schema 'chouette'
+    def load_dump(file)
+      logger.info "Load #{file} in schema #{schema}"
+      with_pg_password do
+        execute!("sed -e 's/ chouette/ \"#{schema}\"/' -e 's/ OWNER TO .*;/ OWNER TO #{user};/' #{file} | psql #{pg_options} --set ON_ERROR_ROLLBACK=1 --set ON_ERROR_STOP=1")
+      end
+      self
     end
-    self
-  end
 
-  def self.chouette_command=(command)
-    Chouette::Command.command = command
-  end
+    def self.chouette_command=(command)
+      Chouette::Command.command = command
+    end
 
-  class << self
-    deprecate :chouette_command= => "Use Chouette::Command.command ="
-  end
+    class << self
+      deprecate :chouette_command= => "Use Chouette::Command.command ="
+    end
 
-  def chouette_command
-    @chouette_command ||= Chouette::Command.new(:schema => schema)
-  end
+    def chouette_command
+      @chouette_command ||= Chouette::Command.new(:schema => schema)
+    end
 
-  def import(file, options = {})
-    options = {
-      :format => :neptune
-    }.merge(options)
-
-    command_options = {
-      :c => "import", 
-      :o => "line", 
-      :format => options.delete(:format).to_s.upcase, 
-      :input_file => File.expand_path(file), 
-      :optimize_memory => true
-    }.merge(options)
-
-    logger.info "Import #{file} in schema #{schema}"
-    chouette_command.run! command_options
-  end
+    def import(file, options = {})
+      options = {
+        :format => :neptune
+      }.merge(options)
+
+      command_options = {
+        :c => "import", 
+        :o => "line", 
+        :format => options.delete(:format).to_s.upcase, 
+        :input_file => File.expand_path(file), 
+        :optimize_memory => true
+      }.merge(options)
+
+      logger.info "Import #{file} in schema #{schema}"
+      chouette_command.run! command_options
+    end
 
-  def backup(file)
-    logger.info "Backup schema #{schema} in #{file}"
+    def backup(file)
+      logger.info "Backup schema #{schema} in #{file}"
 
-    with_pg_password do
-      execute!("pg_dump -n #{schema} -f #{file} #{pg_options}")
-    end
+      with_pg_password do
+        execute!("pg_dump -n #{schema} -f #{file} #{pg_options}")
+      end
 
-    self
-  end
+      self
+    end
 
-  def pg_options
-    [].tap do |options|
-      options << "-U #{user}" if user
-      options << "-h #{host}" if host
-      options << database
-    end.join(" ")
-  end
+    def pg_options
+      [].tap do |options|
+        options << "-U #{user}" if user
+        options << "-h #{host}" if host
+        options << database
+      end.join(" ")
+    end
 
-  def create
-    logger.info "Create schema #{schema}"
-    with_pg_password do
-      execute!("psql -c 'CREATE SCHEMA \"#{schema}\";' #{pg_options}")
+    def create
+      logger.info "Create schema #{schema}"
+      with_pg_password do
+        execute!("psql -c 'CREATE SCHEMA \"#{schema}\";' #{pg_options}")
+      end
+      self
     end
-    self
-  end
 
-  def drop
-    logger.info "Drop schema #{schema}"
-    with_pg_password do
-      execute!("psql -c 'DROP SCHEMA \"#{schema}\" CASCADE;' #{pg_options}")
+    def drop
+      logger.info "Drop schema #{schema}"
+      with_pg_password do
+        execute!("psql -c 'DROP SCHEMA \"#{schema}\" CASCADE;' #{pg_options}")
+      end
+      self
     end
-    self
-  end
 
-  def with_pg_password(&block)
-    ENV['PGPASSWORD'] = password.to_s if password
-    begin
-      yield
-    ensure
-      ENV['PGPASSWORD'] = nil
+    def with_pg_password(&block)
+      ENV['PGPASSWORD'] = password.to_s if password
+      begin
+        yield
+      ensure
+        ENV['PGPASSWORD'] = nil
+      end
     end
-  end
 
-  @@binarisation_command = "binarisation"
-  cattr_accessor :binarisation_command
+    @@binarisation_command = "binarisation"
+    cattr_accessor :binarisation_command
 
-  def binarize(period, target_directory)
-    # TODO check these computed daybefore/dayafter
-    day_before = Date.today - period.begin
-    day_after = period.end - period.begin
+    def binarize(period, target_directory)
+      # TODO check these computed daybefore/dayafter
+      day_before = Date.today - period.begin
+      day_after = period.end - period.begin
 
-    execute! "#{binarisation_command} --host=#{host} --dbname=#{database} --user=#{user} --password=#{password} --schema=#{schema} --daybefore=#{day_before} --dayafter=#{day_after} --targetdirectory=#{target_directory}"
-  end
+      execute! "#{binarisation_command} --host=#{host} --dbname=#{database} --user=#{user} --password=#{password} --schema=#{schema} --daybefore=#{day_before} --dayafter=#{day_after} --targetdirectory=#{target_directory}"
+    end
 
-  include Chouette::CommandLineSupport
+    include Chouette::CommandLineSupport
 
-end
+  end
+end
+\ No newline at end of file
diff --git a/app/models/chouette/netex_object_id.rb b/app/models/chouette/netex_object_id.rb
deleted file mode 100644
index 441004c1e..000000000
--- a/app/models/chouette/netex_object_id.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-class Chouette::NetexObjectId < String
-
-  def valid?
-    parts.present?
-  end
-  alias_method :objectid?, :valid?
-
-  @@format = /^([A-Za-z_]+):([0-9A-Za-z_]+):([A-Za-z]+):([0-9A-Za-z_-]+)$/
-  cattr_reader :format
-
-  def parts
-    match(format).try(:captures)
-  end
-
-  def provider_id
-    parts.try(:first)
-  end
-
-  def system_id
-    parts.try(:second)
-  end
-
-  def object_type
-    parts.try(:third)
-  end
-
-  def local_id
-    parts.try(:fourth)
-  end
-
-  def self.create(provider_id, system_id, object_type, local_id)
-    new [provider_id, system_id, object_type, local_id].join(":")
-  end
-
-  def self.new(string)
-    string ||= ""
-    self === string ? string : super
-  end
-
-end
diff --git a/app/models/chouette/network.rb b/app/models/chouette/network.rb
index 8df205789..3f07ebe0c 100644
--- a/app/models/chouette/network.rb
+++ b/app/models/chouette/network.rb
@@ -1,49 +1,50 @@
-class Chouette::Network < Chouette::ActiveRecord
-  include StifCodifligneAttributesSupport
-  include NetworkRestrictions
-  include LineReferentialSupport
-  # FIXME http://jira.codehaus.org/browse/JRUBY-6358
-  self.primary_key = "id"
+module Chouette
+  class Network < Chouette::ActiveRecord
+    include NetworkRestrictions
+    include LineReferentialSupport
+    include ObjectidSupport
+    # FIXME http://jira.codehaus.org/browse/JRUBY-6358
+    self.primary_key = "id"
 
-  has_many :lines
+    has_many :lines
 
-  attr_accessor :source_type_name
+    attr_accessor :source_type_name
 
-  validates_format_of :registration_number, :with => %r{\A[0-9A-Za-z_-]+\Z}, :allow_nil => true, :allow_blank => true
-  validates_presence_of :name
+    validates_format_of :registration_number, :with => %r{\A[0-9A-Za-z_-]+\Z}, :allow_nil => true, :allow_blank => true
+    validates_presence_of :name
 
-  def self.object_id_key
-    "PTNetwork"
-  end
-
-  def self.nullable_attributes
-    [:source_name, :source_type, :source_identifier, :comment]
-  end
+    def self.object_id_key
+      "PTNetwork"
+    end
 
-  def commercial_stop_areas
-    Chouette::StopArea.joins(:children => [:stop_points => [:route => [:line => :network] ] ]).where(:networks => {:id => self.id}).uniq
-  end
+    def self.nullable_attributes
+      [:source_name, :source_type, :source_identifier, :comment]
+    end
 
-  def stop_areas
-    Chouette::StopArea.joins(:stop_points => [:route => [:line => :network] ]).where(:networks => {:id => self.id})
-  end
+    def commercial_stop_areas
+      Chouette::StopArea.joins(:children => [:stop_points => [:route => [:line => :network] ] ]).where(:networks => {:id => self.id}).uniq
+    end
 
-  def source_type_name
-    # return nil if source_type is nil
-    source_type && Chouette::SourceType.new( source_type.underscore)
-  end
+    def stop_areas
+      Chouette::StopArea.joins(:stop_points => [:route => [:line => :network] ]).where(:networks => {:id => self.id})
+    end
 
-  def source_type_name=(source_type_name)
-    self.source_type = (source_type_name ? source_type_name.camelcase : nil)
-  end
+    def source_type_name
+      # return nil if source_type is nil
+      source_type && Chouette::SourceType.new( source_type.underscore)
+    end
 
-  @@source_type_names = nil
-  def self.source_type_names
-    @@source_type_names ||= Chouette::SourceType.all.select do |source_type_name|
-      source_type_name.to_i > 0
+    def source_type_name=(source_type_name)
+      self.source_type = (source_type_name ? source_type_name.camelcase : nil)
     end
-  end
 
+    @@source_type_names = nil
+    def self.source_type_names
+      @@source_type_names ||= Chouette::SourceType.all.select do |source_type_name|
+        source_type_name.to_i > 0
+      end
+    end
 
-end
 
+  end
+end
+\ No newline at end of file
diff --git a/app/models/chouette/object_id.rb b/app/models/chouette/object_id.rb
deleted file mode 100644
index 0b122c91b..000000000
--- a/app/models/chouette/object_id.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-class Chouette::ObjectId < String
-
-  def valid?
-    parts.present?
-  end
-  alias_method :objectid?, :valid?
-
-  @@format = /^([0-9A-Za-z_]+):([A-Za-z]+):([0-9A-Za-z_-]+)$/
-  cattr_reader :format
-
-  def parts
-    match(format).try(:captures)
-  end
-
-  def system_id
-    parts.try(:first)
-  end
-
-  def object_type
-    parts.try(:second)
-  end
-
-  def local_id
-    parts.try(:third)
-  end
-
-  def self.create(system_id, object_type, local_id)
-    new [system_id, object_type, local_id].join(":")
-  end
-
-  def self.new(string)
-    string ||= ""
-    self === string ? string : super
-  end
-
-end
diff --git a/app/models/chouette/objectid/netex.rb b/app/models/chouette/objectid/netex.rb
new file mode 100644
index 000000000..5d27abb1f
--- /dev/null
+++ b/app/models/chouette/objectid/netex.rb
@@ -0,0 +1,33 @@
+module Chouette
+  module Objectid
+    class Netex
+      include ActiveModel::Model
+
+      attr_accessor :provider_id, :object_type, :local_id, :creation_id
+      validates_presence_of :provider_id, :object_type, :local_id, :creation_id
+      validate :must_respect_format
+
+      def initialize(**attributes)
+        @provider_id = attributes[:provider_id] || 'chouette'
+        @object_type = attributes[:object_type]
+        @local_id = attributes[:local_id]
+        @creation_id = attributes[:creation_id] || 'LOC'
+      end
+
+      @@format = /^([A-Za-z_-]+):([A-Za-z]+):([0-9A-Za-z_-]+):([A-Za-z]+)$/
+      cattr_reader :format
+
+      def to_s
+        "#{self.provider_id}:#{self.object_type}:#{self.local_id}:#{self.creation_id}"
+      end
+
+      def must_respect_format
+        self.to_s.match(self.class.format)
+      end
+
+      def short_id
+        local_id.try(:split, "-").try(:first)
+      end
+    end
+  end
+end
+\ No newline at end of file
diff --git a/app/models/chouette/objectid/stif_codifligne.rb b/app/models/chouette/objectid/stif_codifligne.rb
new file mode 100644
index 000000000..903ebc2dc
--- /dev/null
+++ b/app/models/chouette/objectid/stif_codifligne.rb
@@ -0,0 +1,28 @@
+module Chouette
+  module Objectid
+    class StifCodifligne < Chouette::Objectid::Netex
+
+      attr_accessor :sync_id
+      validates_presence_of :sync_id
+      validates :creation_id, presence: false
+
+      @@format = /^([A-Za-z_]+):([A-Za-z]+):([A-Za-z]+):([0-9A-Za-z_-]+)$/
+
+      def initialize(**attributes)
+        @provider_id = attributes[:provider_id]
+        @object_type = attributes[:object_type]
+        @local_id = attributes[:local_id]
+        @sync_id = attributes[:sync_id]
+        super
+      end
+
+      def to_s
+        "#{self.provider_id}:#{self.sync_id}:#{self.object_type}:#{self.local_id}"
+      end
+
+      def short_id
+        local_id
+      end
+    end
+  end
+end
+\ No newline at end of file
diff --git a/app/models/chouette/objectid/stif_netex.rb b/app/models/chouette/objectid/stif_netex.rb
new file mode 100644
index 000000000..19fd42702
--- /dev/null
+++ b/app/models/chouette/objectid/stif_netex.rb
@@ -0,0 +1,17 @@
+module Chouette
+  module Objectid
+    class StifNetex < Chouette::Objectid::Netex
+
+      @@format = Chouette::Objectid::Netex.format
+
+      def initialize(**attributes)
+        @provider_id = attributes[:provider_id] ||= 'stif'
+        super
+      end
+
+      def short_id
+        local_id.try(:split, "-").try(:last)
+      end
+    end
+  end
+end
+\ No newline at end of file
diff --git a/app/models/chouette/objectid/stif_reflex.rb b/app/models/chouette/objectid/stif_reflex.rb
new file mode 100644
index 000000000..770f3c433
--- /dev/null
+++ b/app/models/chouette/objectid/stif_reflex.rb
@@ -0,0 +1,27 @@
+module Chouette
+  module Objectid
+    class StifReflex < Chouette::Objectid::Netex
+
+      attr_accessor :country_code, :zip_code
+      validates_presence_of :country_code, :zip_code
+      validates :creation_id, presence: false
+
+      @@format = /^([A-Za-z_]+):([0-9A-Za-z_-]+):([A-Za-z]+):([0-9A-Za-z_-]+):([A-Za-z]+)$/
+
+      def initialize(**attributes)
+        @provider_id = attributes[:provider_id]
+        @country_code = attributes[:country_code]
+        @zip_code = attributes[:zip_code]
+        super
+      end
+
+      def to_s
+        "#{self.country_code}:#{self.zip_code}:#{self.object_type}:#{self.local_id}:#{self.provider_id}"
+      end
+
+      def short_id
+        local_id
+      end
+    end
+  end
+end
+\ No newline at end of file
diff --git a/app/models/chouette/objectid_formatter/netex.rb b/app/models/chouette/objectid_formatter/netex.rb
new file mode 100644
index 000000000..00c539553
--- /dev/null
+++ b/app/models/chouette/objectid_formatter/netex.rb
@@ -0,0 +1,19 @@
+module Chouette
+  module ObjectidFormatter
+    class Netex
+      def before_validation(model)
+        oid = Chouette::Objectid::Netex.new(local_id: SecureRandom.uuid, object_type: model.class.name.gsub('Chouette::',''))
+        model.update(objectid: oid.to_s) if oid.valid?
+      end
+
+      def after_commit(model)
+        # unused method in this context
+      end
+
+      def get_objectid(definition)
+        parts = definition.try(:split, ":")
+        Chouette::Objectid::Netex.new(provider_id: parts[0], object_type: parts[1], local_id: parts[2], creation_id: parts[3])
+      end
+    end
+  end
+end
+\ No newline at end of file
diff --git a/app/models/chouette/objectid_formatter/stif_codifligne.rb b/app/models/chouette/objectid_formatter/stif_codifligne.rb
new file mode 100644
index 000000000..eafd2a090
--- /dev/null
+++ b/app/models/chouette/objectid_formatter/stif_codifligne.rb
@@ -0,0 +1,18 @@
+module Chouette
+  module ObjectidFormatter
+    class StifCodifligne
+      def before_validation(model) 
+        # unused method in this context
+      end
+
+      def after_commit(model)
+        # unused method in this context
+      end
+
+      def get_objectid(definition)
+        parts = definition.try(:split, ":")
+        Chouette::Objectid::StifCodifligne.new(provider_id: parts[0], sync_id: parts[1], object_type: parts[2], local_id: parts[3])
+      end
+    end
+  end
+end
+\ No newline at end of file
diff --git a/app/models/chouette/objectid_formatter/stif_netex.rb b/app/models/chouette/objectid_formatter/stif_netex.rb
new file mode 100644
index 000000000..01ddfc528
--- /dev/null
+++ b/app/models/chouette/objectid_formatter/stif_netex.rb
@@ -0,0 +1,19 @@
+module Chouette
+  module ObjectidFormatter
+    class StifNetex
+      def before_validation(model)
+        model.attributes = {objectid: "__pending_id__#{SecureRandom.uuid}"}
+      end
+
+      def after_commit(model)
+        oid = Chouette::Objectid::StifNetex.new(provider_id: "stif", object_type: model.class.name.gsub('Chouette::',''), local_id: model.local_id)
+        model.update(objectid: oid.to_s) if oid.valid?
+      end
+
+      def get_objectid(definition)
+        parts = definition.try(:split, ":")
+        Chouette::Objectid::StifNetex.new(provider_id: parts[0], object_type: parts[1], local_id: parts[2], creation_id: parts[3])
+      end
+    end
+  end
+end
+\ No newline at end of file
diff --git a/app/models/chouette/objectid_formatter/stif_reflex.rb b/app/models/chouette/objectid_formatter/stif_reflex.rb
new file mode 100644
index 000000000..5bfb21ecd
--- /dev/null
+++ b/app/models/chouette/objectid_formatter/stif_reflex.rb
@@ -0,0 +1,18 @@
+module Chouette
+  module ObjectidFormatter
+    class StifReflex
+      def before_validation(model) 
+        # unused method in this context
+      end
+
+      def after_commit(model)
+        # unused method in this context
+      end
+
+      def get_objectid(definition)
+        parts = definition.try(:split, ":")
+        Chouette::Objectid::StifReflex.new(country_code: parts[0], zip_code: parts[1], object_type: parts[2], local_id: parts[3], provider_id: parts[4])
+      end
+    end
+  end
+end
+\ No newline at end of file
diff --git a/app/models/chouette/pt_link.rb b/app/models/chouette/pt_link.rb
index 8a4e368ea..5bf77da02 100644
--- a/app/models/chouette/pt_link.rb
+++ b/app/models/chouette/pt_link.rb
@@ -1,37 +1,37 @@
 require 'geokit'
 
-class Chouette::PtLink < Chouette::ActiveRecord
-  # FIXME http://jira.codehaus.org/browse/JRUBY-6358
-  self.primary_key = "id"
+module Chouette
+  class PtLink < Chouette::ActiveRecord
+    # FIXME http://jira.codehaus.org/browse/JRUBY-6358
+    self.primary_key = "id"
 
-  include Geokit::Mappable
+    include Geokit::Mappable
 
-  def geometry
-    the_geom
-  end
+    def geometry
+      the_geom
+    end
 
-  def self.import_csv
-    csv_file = Rails.root + "chouette_pt_links.csv"
-    if File.exists?( csv_file)
-      csv = CSV::Reader.parse(File.read(csv_file))
+    def self.import_csv
+      csv_file = Rails.root + "chouette_pt_links.csv"
+      if File.exists?( csv_file)
+        csv = CSV::Reader.parse(File.read(csv_file))
 
-      slug = csv.shift.first
+        slug = csv.shift.first
 
-      Network::Base.find_by_slug( slug).tune_connection
+        Network::Base.find_by_slug( slug).tune_connection
 
-      csv.each do |row|
-        origin = Chouette::StopArea.find_by_objectid( row[0])
-        destination = Chouette::StopArea.find_by_objectid( row[1])
+        csv.each do |row|
+          origin = Chouette::StopArea.find_by_objectid( row[0])
+          destination = Chouette::StopArea.find_by_objectid( row[1])
 
-        raise "unknown origin #{row[0]}" unless origin
-        raise "unknown destination #{row[1]}" unless destination
+          raise "unknown origin #{row[0]}" unless origin
+          raise "unknown destination #{row[1]}" unless destination
 
-        Chouette::PtLink.create( :departure_id => origin.id,
-                                 :arrival_id => destination.id,
-                                 :the_geom => GeoRuby::SimpleFeatures::Geometry.from_hex_ewkb( row[2]))
+          Chouette::PtLink.create( :departure_id => origin.id,
+                                  :arrival_id => destination.id,
+                                  :the_geom => GeoRuby::SimpleFeatures::Geometry.from_hex_ewkb( row[2]))
+        end
       end
     end
-    
   end
-
-end
+end
+\ No newline at end of file
diff --git a/app/models/chouette/route.rb b/app/models/chouette/route.rb
index 1a05d43d9..1f4088aa7 100644
--- a/app/models/chouette/route.rb
+++ b/app/models/chouette/route.rb
@@ -1,78 +1,80 @@
-class Chouette::Route < Chouette::TridentActiveRecord
-  include RouteRestrictions
-  include ChecksumSupport
+module Chouette
+  class Route < Chouette::TridentActiveRecord
+    include RouteRestrictions
+    include ChecksumSupport
+    include ObjectidSupport
 
-  extend Enumerize
-  extend ActiveModel::Naming
+    extend Enumerize
+    extend ActiveModel::Naming
 
-  enumerize :direction, in: %i(straight_forward backward clockwise counter_clockwise north north_west west south_west south south_east east north_east)
-  enumerize :wayback, in: %i(outbound inbound), default: :outbound
+    enumerize :direction, in: %i(straight_forward backward clockwise counter_clockwise north north_west west south_west south south_east east north_east)
+    enumerize :wayback, in: %i(outbound inbound), default: :outbound
 
-  # FIXME http://jira.codehaus.org/browse/JRUBY-6358
-  self.primary_key = "id"
+    # FIXME http://jira.codehaus.org/browse/JRUBY-6358
+    self.primary_key = "id"
 
-  def self.nullable_attributes
-    [:published_name, :comment, :number, :name, :direction, :wayback]
-  end
+    def self.nullable_attributes
+      [:published_name, :comment, :number, :name, :direction, :wayback]
+    end
 
-  belongs_to :line
-  belongs_to :opposite_route, :class_name => 'Chouette::Route', :foreign_key => :opposite_route_id
+    belongs_to :line
+    belongs_to :opposite_route, :class_name => 'Chouette::Route', :foreign_key => :opposite_route_id
 
-  has_many :routing_constraint_zones
-  has_many :journey_patterns, :dependent => :destroy
-  has_many :vehicle_journeys, :dependent => :destroy do
-    def timeless
-      Chouette::Route.vehicle_journeys_timeless(proxy_association.owner.journey_patterns.pluck( :departure_stop_point_id))
+    has_many :routing_constraint_zones
+    has_many :journey_patterns, :dependent => :destroy
+    has_many :vehicle_journeys, :dependent => :destroy do
+      def timeless
+        Chouette::Route.vehicle_journeys_timeless(proxy_association.owner.journey_patterns.pluck( :departure_stop_point_id))
+      end
     end
-  end
-  has_many :vehicle_journey_frequencies, :dependent => :destroy do
-    # Todo : I think there is a better way to do this.
-    def timeless
-      Chouette::Route.vehicle_journeys_timeless(proxy_association.owner.journey_patterns.pluck( :departure_stop_point_id))
+    has_many :vehicle_journey_frequencies, :dependent => :destroy do
+      # Todo : I think there is a better way to do this.
+      def timeless
+        Chouette::Route.vehicle_journeys_timeless(proxy_association.owner.journey_patterns.pluck( :departure_stop_point_id))
+      end
     end
-  end
-  has_many :stop_points, -> { order("position") }, :dependent => :destroy do
-    def find_by_stop_area(stop_area)
-      stop_area_ids = Integer === stop_area ? [stop_area] : (stop_area.children_in_depth + [stop_area]).map(&:id)
-      where( :stop_area_id => stop_area_ids).first or
-        raise ActiveRecord::RecordNotFound.new("Can't find a StopArea #{stop_area.inspect} in Route #{proxy_owner.id.inspect}'s StopPoints")
-    end
-
-    def between(departure, arrival)
-      between_positions = [departure, arrival].collect do |endpoint|
-        case endpoint
-        when Chouette::StopArea
-          find_by_stop_area(endpoint).position
-        when  Chouette::StopPoint
-          endpoint.position
-        when Integer
-          endpoint
-        else
-          raise ActiveRecord::RecordNotFound.new("Can't determine position in route #{proxy_owner.id} with #{departure.inspect}")
+    has_many :stop_points, -> { order("position") }, :dependent => :destroy do
+      def find_by_stop_area(stop_area)
+        stop_area_ids = Integer === stop_area ? [stop_area] : (stop_area.children_in_depth + [stop_area]).map(&:id)
+        where( :stop_area_id => stop_area_ids).first or
+          raise ActiveRecord::RecordNotFound.new("Can't find a StopArea #{stop_area.inspect} in Route #{proxy_owner.id.inspect}'s StopPoints")
+      end
+
+      def between(departure, arrival)
+        between_positions = [departure, arrival].collect do |endpoint|
+          case endpoint
+          when Chouette::StopArea
+            find_by_stop_area(endpoint).position
+          when  Chouette::StopPoint
+            endpoint.position
+          when Integer
+            endpoint
+          else
+            raise ActiveRecord::RecordNotFound.new("Can't determine position in route #{proxy_owner.id} with #{departure.inspect}")
+          end
         end
+        where(" position between ? and ? ", between_positions.first, between_positions.last)
       end
-      where(" position between ? and ? ", between_positions.first, between_positions.last)
     end
-  end
-  has_many :stop_areas, -> { order('stop_points.position ASC') }, :through => :stop_points do
-    def between(departure, arrival)
-      departure, arrival = [departure, arrival].map do |endpoint|
-        String === endpoint ? Chouette::StopArea.find_by_objectid(endpoint) : endpoint
+    has_many :stop_areas, -> { order('stop_points.position ASC') }, :through => :stop_points do
+      def between(departure, arrival)
+        departure, arrival = [departure, arrival].map do |endpoint|
+          String === endpoint ? Chouette::StopArea.find_by_objectid(endpoint) : endpoint
+        end
+        proxy_owner.stop_points.between(departure, arrival).includes(:stop_area).collect(&:stop_area)
       end
-      proxy_owner.stop_points.between(departure, arrival).includes(:stop_area).collect(&:stop_area)
     end
-  end
 
-  accepts_nested_attributes_for :stop_points, :allow_destroy => :true
+    accepts_nested_attributes_for :stop_points, :allow_destroy => :true
 
-  validates_presence_of :name
-  validates_presence_of :published_name
-  validates_presence_of :line
+    validates_presence_of :name
+    validates_presence_of :published_name
+    validates_presence_of :line
 
-  # validates_presence_of :direction
-  # validates_presence_of :wayback
+    # validates_presence_of :direction
+    # validates_presence_of :wayback
 
-  validates :wayback, inclusion: { in: self.wayback.values }
+    validates :wayback, inclusion: { in: self.wayback.values }
 
   def duplicate
     overrides = {
@@ -88,103 +90,104 @@ class Chouette::Route < Chouette::TridentActiveRecord
     new_route
   end
 
-  def duplicate_stop_points(for_route:)
-    stop_points.each(&duplicate_stop_point(for_route: for_route))
-  end
-  def duplicate_stop_point(for_route:)
-    -> stop_point do
-      stop_point.duplicate(for_route: for_route)
+    def duplicate_stop_points(for_route:)
+      stop_points.each(&duplicate_stop_point(for_route: for_route))
+    end
+    def duplicate_stop_point(for_route:)
+      -> stop_point do
+        stop_point.duplicate(for_route: for_route)
+      end
     end
-  end
 
-  def local_id
-    "IBOO-#{self.referential.id}-#{self.line.objectid.local_id}-#{self.id}"
-  end
+    def local_id
+      "IBOO-#{self.referential.id}-#{self.line.get_objectid.local_id}-#{self.id}"
+    end
 
-  def geometry_presenter
-    Chouette::Geometry::RoutePresenter.new self
-  end
+    def geometry_presenter
+      Chouette::Geometry::RoutePresenter.new self
+    end
 
-  @@opposite_waybacks = { outbound: :inbound, inbound: :outbound}
-  def opposite_wayback
-    @@opposite_waybacks[wayback.to_sym]
-  end
+    @@opposite_waybacks = { outbound: :inbound, inbound: :outbound}
+    def opposite_wayback
+      @@opposite_waybacks[wayback.to_sym]
+    end
 
-  def opposite_route_candidates
-    if opposite_wayback
-      line.routes.where(opposite_route: [nil, self], wayback: opposite_wayback)
-    else
-      self.class.none
+    def opposite_route_candidates
+      if opposite_wayback
+        line.routes.where(opposite_route: [nil, self], wayback: opposite_wayback)
+      else
+        self.class.none
+      end
     end
-  end
 
-  validate :check_opposite_route
-  def check_opposite_route
-    return unless opposite_route && opposite_wayback
-    unless opposite_route_candidates.include?(opposite_route)
-      errors.add(:opposite_route_id, :invalid)
+    validate :check_opposite_route
+    def check_opposite_route
+      return unless opposite_route && opposite_wayback
+      unless opposite_route_candidates.include?(opposite_route)
+        errors.add(:opposite_route_id, :invalid)
+      end
     end
-  end
 
-  def checksum_attributes
-    values = self.slice(*['name', 'published_name', 'wayback']).values
-    values.tap do |attrs|
-      attrs << self.stop_points.map{|sp| "#{sp.stop_area.user_objectid}#{sp.for_boarding}#{sp.for_alighting}" }.join
-      attrs << self.routing_constraint_zones.map(&:checksum)
+    def checksum_attributes
+      values = self.slice(*['name', 'published_name', 'wayback']).values
+      values.tap do |attrs|
+        attrs << self.stop_points.map{|sp| "#{sp.stop_area.user_objectid}#{sp.for_boarding}#{sp.for_alighting}" }.join
+        attrs << self.routing_constraint_zones.map(&:checksum)
+      end
     end
-  end
 
-  def geometry
-    points = stop_areas.map(&:to_lat_lng).compact.map do |loc|
-      [loc.lng, loc.lat]
+    def geometry
+      points = stop_areas.map(&:to_lat_lng).compact.map do |loc|
+        [loc.lng, loc.lat]
+      end
+      GeoRuby::SimpleFeatures::LineString.from_coordinates( points, 4326)
     end
-    GeoRuby::SimpleFeatures::LineString.from_coordinates( points, 4326)
-  end
 
-  def time_tables
-    vehicle_journeys.joins(:time_tables).map(&:"time_tables").flatten.uniq
-  end
+    def time_tables
+      vehicle_journeys.joins(:time_tables).map(&:"time_tables").flatten.uniq
+    end
 
-  def sorted_vehicle_journeys(journey_category_model)
-    send(journey_category_model)
-        .joins(:journey_pattern, :vehicle_journey_at_stops)
-        .joins('LEFT JOIN "time_tables_vehicle_journeys" ON "time_tables_vehicle_journeys"."vehicle_journey_id" = "vehicle_journeys"."id" LEFT JOIN "time_tables" ON "time_tables"."id" = "time_tables_vehicle_journeys"."time_table_id"')
-        .where("vehicle_journey_at_stops.stop_point_id=journey_patterns.departure_stop_point_id")
-        .order("vehicle_journey_at_stops.departure_time")
-  end
+    def sorted_vehicle_journeys(journey_category_model)
+      send(journey_category_model)
+          .joins(:journey_pattern, :vehicle_journey_at_stops)
+          .joins('LEFT JOIN "time_tables_vehicle_journeys" ON "time_tables_vehicle_journeys"."vehicle_journey_id" = "vehicle_journeys"."id" LEFT JOIN "time_tables" ON "time_tables"."id" = "time_tables_vehicle_journeys"."time_table_id"')
+          .where("vehicle_journey_at_stops.stop_point_id=journey_patterns.departure_stop_point_id")
+          .order("vehicle_journey_at_stops.departure_time")
+    end
 
-  def stop_point_permutation?( stop_point_ids)
-    stop_points.map(&:id).map(&:to_s).sort == stop_point_ids.map(&:to_s).sort
-  end
+    def stop_point_permutation?( stop_point_ids)
+      stop_points.map(&:id).map(&:to_s).sort == stop_point_ids.map(&:to_s).sort
+    end
 
-  def reorder!( stop_point_ids)
-    return false unless stop_point_permutation?( stop_point_ids)
+    def reorder!( stop_point_ids)
+      return false unless stop_point_permutation?( stop_point_ids)
 
-    stop_area_id_by_stop_point_id = {}
-    stop_points.each do |sp|
-      stop_area_id_by_stop_point_id.merge!( sp.id => sp.stop_area_id)
-    end
+      stop_area_id_by_stop_point_id = {}
+      stop_points.each do |sp|
+        stop_area_id_by_stop_point_id.merge!( sp.id => sp.stop_area_id)
+      end
 
-    reordered_stop_area_ids = []
-    stop_point_ids.each do |stop_point_id|
-      reordered_stop_area_ids << stop_area_id_by_stop_point_id[ stop_point_id.to_i]
-    end
+      reordered_stop_area_ids = []
+      stop_point_ids.each do |stop_point_id|
+        reordered_stop_area_ids << stop_area_id_by_stop_point_id[ stop_point_id.to_i]
+      end
 
-    stop_points.each_with_index do |sp, index|
-      if sp.stop_area_id.to_s != reordered_stop_area_ids[ index].to_s
-        #result = sp.update_attributes( :stop_area_id => reordered_stop_area_ids[ index])
-        sp.stop_area_id = reordered_stop_area_ids[ index]
-        result = sp.save!
+      stop_points.each_with_index do |sp, index|
+        if sp.stop_area_id.to_s != reordered_stop_area_ids[ index].to_s
+          #result = sp.update_attributes( :stop_area_id => reordered_stop_area_ids[ index])
+          sp.stop_area_id = reordered_stop_area_ids[ index]
+          result = sp.save!
+        end
       end
+
+      return true
     end
 
-    return true
-  end
+    protected
 
-  protected
+    def self.vehicle_journeys_timeless(stop_point_id)
+      all( :conditions => ['vehicle_journeys.id NOT IN (?)', Chouette::VehicleJourneyAtStop.where(stop_point_id: stop_point_id).pluck(:vehicle_journey_id)] )
+    end
 
-  def self.vehicle_journeys_timeless(stop_point_id)
-    all( :conditions => ['vehicle_journeys.id NOT IN (?)', Chouette::VehicleJourneyAtStop.where(stop_point_id: stop_point_id).pluck(:vehicle_journey_id)] )
   end
-
-end
+end
+\ No newline at end of file
diff --git a/app/models/chouette/routing_constraint_zone.rb b/app/models/chouette/routing_constraint_zone.rb
index efe1b7237..70b016a48 100644
--- a/app/models/chouette/routing_constraint_zone.rb
+++ b/app/models/chouette/routing_constraint_zone.rb
@@ -1,43 +1,46 @@
-class Chouette::RoutingConstraintZone < Chouette::TridentActiveRecord
-  include ChecksumSupport
+module Chouette
+  class RoutingConstraintZone < Chouette::TridentActiveRecord
+    include ChecksumSupport
+    include ObjectidSupport
 
-  belongs_to :route
-  has_array_of :stop_points, class_name: 'Chouette::StopPoint'
+    belongs_to :route
+    has_array_of :stop_points, class_name: 'Chouette::StopPoint'
 
-  validates_presence_of :name, :stop_points, :route
-  # 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
+    validates_presence_of :name, :stop_points, :route
+    # 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.referential.id}-#{self.route.line.objectid.local_id}-#{self.route.objectid.local_id}-#{self.id}"
-  end
+    def local_id
+      "IBOO-#{self.referential.id}-#{self.route.line.get_objectid.local_id}-#{self.route.id}-#{self.id}"
+    end
 
-  scope :order_by_stop_points_count, ->(direction) do
-    order("array_length(stop_point_ids, 1) #{direction}")
-  end
+    scope :order_by_stop_points_count, ->(direction) do
+      order("array_length(stop_point_ids, 1) #{direction}")
+    end
 
-  scope :order_by_route_name, ->(direction) do
-    joins(:route)
-      .order("routes.name #{direction}")
-  end
+    scope :order_by_route_name, ->(direction) do
+      joins(:route)
+        .order("routes.name #{direction}")
+    end
 
-  def checksum_attributes
-    self.stop_points.map(&:stop_area).map(&:user_objectid)
-  end
+    def checksum_attributes
+      self.stop_points.map(&:stop_area).map(&:user_objectid)
+    end
 
-  def stop_points_belong_to_route
-    errors.add(:stop_point_ids, I18n.t('activerecord.errors.models.routing_constraint_zone.attributes.stop_points.stop_points_not_from_route')) unless stop_points.all? { |sp| route.stop_points.include? sp }
-  end
+    def stop_points_belong_to_route
+      errors.add(:stop_point_ids, I18n.t('activerecord.errors.models.routing_constraint_zone.attributes.stop_points.stop_points_not_from_route')) unless stop_points.all? { |sp| route.stop_points.include? sp }
+    end
 
-  def not_all_stop_points_selected
-    errors.add(:stop_point_ids, I18n.t('activerecord.errors.models.routing_constraint_zone.attributes.stop_points.all_stop_points_selected')) if stop_points.length == route.stop_points.length
-  end
+    def not_all_stop_points_selected
+      errors.add(:stop_point_ids, I18n.t('activerecord.errors.models.routing_constraint_zone.attributes.stop_points.all_stop_points_selected')) if stop_points.length == route.stop_points.length
+    end
 
-  def stop_points_count
-    stop_points.count
-  end
+    def stop_points_count
+      stop_points.count
+    end
 
-  def route_name
-    route.name
+    def route_name
+      route.name
+    end
   end
-end
+end
+\ No newline at end of file
diff --git a/app/models/chouette/source_type.rb b/app/models/chouette/source_type.rb
index 124a6c433..1554d846b 100644
--- a/app/models/chouette/source_type.rb
+++ b/app/models/chouette/source_type.rb
@@ -1,56 +1,58 @@
-class Chouette::SourceType < ActiveSupport::StringInquirer
+module Chouette
+  class SourceType < ActiveSupport::StringInquirer
 
-  def initialize(text_code, numerical_code)
-    super text_code.to_s
-    @numerical_code = numerical_code
-  end
+    def initialize(text_code, numerical_code)
+      super text_code.to_s
+      @numerical_code = numerical_code
+    end
 
-  def self.new(text_code, numerical_code = nil)
-    if text_code and numerical_code
-      super
-    elsif self === text_code 
-      text_code
-    else
-      if Fixnum === text_code
-        text_code, numerical_code = definitions.rassoc(text_code)
+    def self.new(text_code, numerical_code = nil)
+      if text_code and numerical_code
+        super
+      elsif self === text_code 
+        text_code
       else
-        text_code, numerical_code = definitions.assoc(text_code.to_s)
-      end
+        if Fixnum === text_code
+          text_code, numerical_code = definitions.rassoc(text_code)
+        else
+          text_code, numerical_code = definitions.assoc(text_code.to_s)
+        end
 
-      super text_code, numerical_code
+        super text_code, numerical_code
+      end
     end
-  end
 
-  def to_i
-    @numerical_code
-  end
+    def to_i
+      @numerical_code
+    end
 
-  def inspect
-    "#{to_s}/#{to_i}"
-  end
+    def inspect
+      "#{to_s}/#{to_i}"
+    end
 
-  def name
-    camelize
-  end
+    def name
+      camelize
+    end
 
-  @@definitions = [
-    ["public_and_private_utilities", 0],
-    ["road_authorities", 1],
-    ["transit_operator", 2],
-    ["public_transport", 3],
-    ["passenger_transport_coordinating_authority", 4],
-    ["travel_information_service_provider", 5],
-    ["travel_agency", 6],
-    ["individual_subject_of_travel_itinerary", 7],
-    ["other_information", 8]
-  ]
-  cattr_reader :definitions
-
-  @@all = nil
-  def self.all
-    @@all ||= definitions.collect do |text_code, numerical_code|
-      new(text_code, numerical_code)
+    @@definitions = [
+      ["public_and_private_utilities", 0],
+      ["road_authorities", 1],
+      ["transit_operator", 2],
+      ["public_transport", 3],
+      ["passenger_transport_coordinating_authority", 4],
+      ["travel_information_service_provider", 5],
+      ["travel_agency", 6],
+      ["individual_subject_of_travel_itinerary", 7],
+      ["other_information", 8]
+    ]
+    cattr_reader :definitions
+
+    @@all = nil
+    def self.all
+      @@all ||= definitions.collect do |text_code, numerical_code|
+        new(text_code, numerical_code)
+      end
     end
-  end
 
-end
+  end
+end
+\ No newline at end of file
diff --git a/app/models/chouette/stif_codifligne_objectid.rb b/app/models/chouette/stif_codifligne_objectid.rb
deleted file mode 100644
index 46109e24f..000000000
--- a/app/models/chouette/stif_codifligne_objectid.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-class Chouette::StifCodifligneObjectid < String
-
-  @@format = /^([A-Za-z_]+):([A-Za-z]+):([A-Za-z]+):([0-9A-Za-z_-]+)$/
-  cattr_reader :format
-
-  def parts
-    match(format).try(:captures)
-  end
-
-  def object_type
-    parts.try(:third)
-  end
-
-  def local_id
-    parts.try(:fourth)
-  end
-
-end
diff --git a/app/models/chouette/stif_netex_objectid.rb b/app/models/chouette/stif_netex_objectid.rb
deleted file mode 100644
index 93e7a1e85..000000000
--- a/app/models/chouette/stif_netex_objectid.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-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 short_id
-    local_id.try(:split, "-").try(:[], -1)
-  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/stif_reflex_objectid.rb b/app/models/chouette/stif_reflex_objectid.rb
deleted file mode 100644
index c41a9325a..000000000
--- a/app/models/chouette/stif_reflex_objectid.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-class Chouette::StifReflexObjectid < String
-
-  @@format = /^([A-Za-z_]+):([0-9A-Za-z_-]+):([A-Za-z]+):([0-9A-Za-z_-]+):([A-Za-z]+)$/
-  cattr_reader :format
-
-  def parts
-    match(format).try(:captures)
-  end
-
-  def object_type
-    parts.try(:third)
-  end
-
-  def local_id
-    parts.try(:fourth)
-  end
-
-end
diff --git a/app/models/chouette/stop_area.rb b/app/models/chouette/stop_area.rb
index 43bc82f7f..5d8b5033f 100644
--- a/app/models/chouette/stop_area.rb
+++ b/app/models/chouette/stop_area.rb
@@ -1,333 +1,328 @@
 require 'geokit'
 require 'geo_ruby'
 
-class Chouette::StopArea < Chouette::ActiveRecord
-  # FIXME http://jira.codehaus.org/browse/JRUBY-6358
-  self.primary_key = "id"
-
-  include Geokit::Mappable
-  include StifReflexAttributesSupport
-  include ProjectionFields
-  include StopAreaRestrictions
-  include StopAreaReferentialSupport
-
-  extend Enumerize
-  enumerize :area_type, in: %i(zdep zder zdlp zdlr lda)
-
-  with_options dependent: :destroy do |assoc|
-    assoc.has_many :stop_points
-    assoc.has_many :access_points
-    assoc.has_many :access_links
-  end
+module Chouette
+  class StopArea < Chouette::ActiveRecord
+    include ProjectionFields
+    include StopAreaRestrictions
+    include StopAreaReferentialSupport
+    include ObjectidSupport
+
+    extend Enumerize
+    enumerize :area_type, in: %i(zdep zder zdlp zdlr lda)
+
+    with_options dependent: :destroy do |assoc|
+      assoc.has_many :stop_points
+      assoc.has_many :access_points
+      assoc.has_many :access_links
+    end
 
-  has_and_belongs_to_many :routing_lines, :class_name => 'Chouette::Line', :foreign_key => "stop_area_id", :association_foreign_key => "line_id", :join_table => "routing_constraints_lines", :order => "lines.number"
-  has_and_belongs_to_many :routing_stops, :class_name => 'Chouette::StopArea', :foreign_key => "parent_id", :association_foreign_key => "child_id", :join_table => "stop_areas_stop_areas", :order => "stop_areas.name"
+    has_and_belongs_to_many :routing_lines, :class_name => 'Chouette::Line', :foreign_key => "stop_area_id", :association_foreign_key => "line_id", :join_table => "routing_constraints_lines", :order => "lines.number"
+    has_and_belongs_to_many :routing_stops, :class_name => 'Chouette::StopArea', :foreign_key => "parent_id", :association_foreign_key => "child_id", :join_table => "stop_areas_stop_areas", :order => "stop_areas.name"
 
-  belongs_to :stop_area_referential
-  validates_presence_of :stop_area_referential_id
+    acts_as_tree :foreign_key => 'parent_id', :order => "name"
 
-  acts_as_tree :foreign_key => 'parent_id', :order => "name"
+    attr_accessor :stop_area_type
+    attr_accessor :children_ids
+    attr_writer :coordinates
 
-  attr_accessor :stop_area_type
-  attr_accessor :children_ids
-  attr_writer :coordinates
+    after_update :journey_patterns_control_route_sections,
+                if: Proc.new { |stop_area| ['boarding_position', 'quay'].include? stop_area.stop_area_type }
 
-  after_update :journey_patterns_control_route_sections,
-               if: Proc.new { |stop_area| ['boarding_position', 'quay'].include? stop_area.stop_area_type }
+    validates_format_of :registration_number, :with => %r{\A[\d\w_\-]+\Z}, :allow_blank => true
+    validates_presence_of :name
+    validates_presence_of :latitude, :if => :longitude
+    validates_presence_of :longitude, :if => :latitude
+    validates_numericality_of :latitude, :less_than_or_equal_to => 90, :greater_than_or_equal_to => -90, :allow_nil => true
+    validates_numericality_of :longitude, :less_than_or_equal_to => 180, :greater_than_or_equal_to => -180, :allow_nil => true
 
-  validates_format_of :registration_number, :with => %r{\A[\d\w_\-]+\Z}, :allow_blank => true
-  validates_presence_of :name
-  validates_presence_of :latitude, :if => :longitude
-  validates_presence_of :longitude, :if => :latitude
-  validates_numericality_of :latitude, :less_than_or_equal_to => 90, :greater_than_or_equal_to => -90, :allow_nil => true
-  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
+    validates_format_of :url, :with => %r{\Ahttps?:\/\/([\da-z\.-]+)\.([a-z\.]{2,6})([\/\w \.-]*)*\/?\Z}, :allow_nil => true, :allow_blank => 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
-  validates_format_of :url, :with => %r{\Ahttps?:\/\/([\da-z\.-]+)\.([a-z\.]{2,6})([\/\w \.-]*)*\/?\Z}, :allow_nil => true, :allow_blank => true
+    def self.nullable_attributes
+      [:registration_number, :street_name, :country_code, :fare_code,
+      :nearest_topic_name, :comment, :long_lat_type, :zip_code, :city_name, :url, :time_zone]
+    end
 
-  def self.nullable_attributes
-    [:registration_number, :street_name, :country_code, :fare_code,
-     :nearest_topic_name, :comment, :long_lat_type, :zip_code, :city_name, :url, :time_zone]
-  end
+    after_update :clean_invalid_access_links
+    before_save :coordinates_to_lat_lng
 
-  after_update :clean_invalid_access_links
-  before_save :coordinates_to_lat_lng
+    def combine_lat_lng
+      if self.latitude.nil? || self.longitude.nil?
+        ""
+      else
+        self.latitude.to_s+","+self.longitude.to_s
+      end
+    end
 
-  def combine_lat_lng
-    if self.latitude.nil? || self.longitude.nil?
-      ""
-    else
-      self.latitude.to_s+","+self.longitude.to_s
+    def coordinates
+        @coordinates || combine_lat_lng
     end
-  end
 
-  def coordinates
-      @coordinates || combine_lat_lng
-  end
+    def coordinates_to_lat_lng
+      if ! @coordinates.nil?
+        if @coordinates.empty?
+          self.latitude = nil
+          self.longitude = nil
+        else
+          self.latitude = BigDecimal.new(@coordinates.split(",").first)
+          self.longitude = BigDecimal.new(@coordinates.split(",").last)
+        end
+        @coordinates = nil
+      end
+    end
 
-  def coordinates_to_lat_lng
-    if ! @coordinates.nil?
-      if @coordinates.empty?
-        self.latitude = nil
-        self.longitude = nil
+    def user_objectid
+      if objectid =~ /^.*:([0-9A-Za-z_-]+):STIF$/
+        $1
       else
-        self.latitude = BigDecimal.new(@coordinates.split(",").first)
-        self.longitude = BigDecimal.new(@coordinates.split(",").last)
+        id.to_s
       end
-      @coordinates = nil
     end
-  end
 
-  def user_objectid
-    if objectid =~ /^.*:([0-9A-Za-z_-]+):STIF$/
-      $1
-    else
-      id.to_s
-    end
-  end
+    def children_in_depth
+      return [] if self.children.empty?
 
-  def children_in_depth
-    return [] if self.children.empty?
+      self.children + self.children.map do |child|
+        child.children_in_depth
+      end.flatten.compact
+    end
 
-    self.children + self.children.map do |child|
-      child.children_in_depth
-    end.flatten.compact
-  end
+    def possible_children
+      case area_type
+        when "BoardingPosition" then []
+        when "Quay" then []
+        when "CommercialStopPoint" then Chouette::StopArea.where(:area_type => ['Quay', 'BoardingPosition']) - [self]
+        when "StopPlace" then Chouette::StopArea.where(:area_type => ['StopPlace', 'CommercialStopPoint']) - [self]
+      end
 
-  def possible_children
-    case area_type
-      when "BoardingPosition" then []
-      when "Quay" then []
-      when "CommercialStopPoint" then Chouette::StopArea.where(:area_type => ['Quay', 'BoardingPosition']) - [self]
-      when "StopPlace" then Chouette::StopArea.where(:area_type => ['StopPlace', 'CommercialStopPoint']) - [self]
     end
 
-  end
-
-  def possible_parents
-    case area_type
-      when "BoardingPosition" then Chouette::StopArea.where(:area_type => "CommercialStopPoint")  - [self]
-      when "Quay" then Chouette::StopArea.where(:area_type => "CommercialStopPoint") - [self]
-      when "CommercialStopPoint" then Chouette::StopArea.where(:area_type => "StopPlace") - [self]
-      when "StopPlace" then Chouette::StopArea.where(:area_type => "StopPlace") - [self]
+    def possible_parents
+      case area_type
+        when "BoardingPosition" then Chouette::StopArea.where(:area_type => "CommercialStopPoint")  - [self]
+        when "Quay" then Chouette::StopArea.where(:area_type => "CommercialStopPoint") - [self]
+        when "CommercialStopPoint" then Chouette::StopArea.where(:area_type => "StopPlace") - [self]
+        when "StopPlace" then Chouette::StopArea.where(:area_type => "StopPlace") - [self]
+      end
     end
-  end
 
-  def geometry_presenter
-    Chouette::Geometry::StopAreaPresenter.new self
-  end
+    def geometry_presenter
+      Chouette::Geometry::StopAreaPresenter.new self
+    end
 
-  def lines
-    []
-  end
+    def lines
+      []
+    end
 
-  def routes
-     []
-  end
+    def routes
+      []
+    end
 
-  def self.commercial
-    where :area_type => "CommercialStopPoint"
-  end
+    def self.commercial
+      where :area_type => "CommercialStopPoint"
+    end
 
-  def self.stop_place
-    where :area_type => "StopPlace"
-  end
+    def self.stop_place
+      where :area_type => "StopPlace"
+    end
 
-  def self.physical
-    where :area_type => [ "BoardingPosition", "Quay" ]
-  end
+    def self.physical
+      where :area_type => [ "BoardingPosition", "Quay" ]
+    end
 
 
-  def to_lat_lng
-    Geokit::LatLng.new(latitude, longitude) if latitude and longitude
-  end
+    def to_lat_lng
+      Geokit::LatLng.new(latitude, longitude) if latitude and longitude
+    end
 
-  def geometry
-    GeoRuby::SimpleFeatures::Point.from_lon_lat(longitude, latitude, 4326) if latitude and longitude
-  end
+    def geometry
+      GeoRuby::SimpleFeatures::Point.from_lon_lat(longitude, latitude, 4326) if latitude and longitude
+    end
 
-  def geometry=(geometry)
-    geometry = geometry.to_wgs84
-    self.latitude, self.longitude, self.long_lat_type = geometry.lat, geometry.lng, "WGS84"
-  end
+    def geometry=(geometry)
+      geometry = geometry.to_wgs84
+      self.latitude, self.longitude, self.long_lat_type = geometry.lat, geometry.lng, "WGS84"
+    end
 
-  def position
-    geometry
-  end
+    def position
+      geometry
+    end
 
-  def position=(position)
-    position = nil if String === position && position == ""
-    position = Geokit::LatLng.normalize(position), 4326 if String === position
-    if position
-      self.latitude  = position.lat
-      self.longitude = position.lng
+    def position=(position)
+      position = nil if String === position && position == ""
+      position = Geokit::LatLng.normalize(position), 4326 if String === position
+      if position
+        self.latitude  = position.lat
+        self.longitude = position.lng
+      end
     end
-  end
 
-  def default_position
-    # for first StopArea ... the bounds is nil :(
-    Chouette::StopArea.bounds ? Chouette::StopArea.bounds.center : nil # FIXME #821 stop_area_referential.envelope.center
-  end
+    def default_position
+      # for first StopArea ... the bounds is nil :(
+      Chouette::StopArea.bounds ? Chouette::StopArea.bounds.center : nil # FIXME #821 stop_area_referential.envelope.center
+    end
 
-  def around(scope, distance)
-    db   = "ST_GeomFromEWKB(ST_MakePoint(longitude, latitude, 4326))"
-    from = "ST_GeomFromText('POINT(#{self.longitude} #{self.latitude})', 4326)"
-    scope.where("ST_DWithin(#{db}, #{from}, ?, false)", distance)
-  end
+    def around(scope, distance)
+      db   = "ST_GeomFromEWKB(ST_MakePoint(longitude, latitude, 4326))"
+      from = "ST_GeomFromText('POINT(#{self.longitude} #{self.latitude})', 4326)"
+      scope.where("ST_DWithin(#{db}, #{from}, ?, false)", distance)
+    end
 
-  def self.near(origin, distance = 0.3)
-    origin = origin.to_lat_lng
+    def self.near(origin, distance = 0.3)
+      origin = origin.to_lat_lng
 
-    lat_degree_units = units_per_latitude_degree(:kms)
-    lng_degree_units = units_per_longitude_degree(origin.lat, :kms)
+      lat_degree_units = units_per_latitude_degree(:kms)
+      lng_degree_units = units_per_longitude_degree(origin.lat, :kms)
 
-    where "SQRT(POW(#{lat_degree_units}*(#{origin.lat}-latitude),2)+POW(#{lng_degree_units}*(#{origin.lng}-longitude),2)) <= #{distance}"
-  end
+      where "SQRT(POW(#{lat_degree_units}*(#{origin.lat}-latitude),2)+POW(#{lng_degree_units}*(#{origin.lng}-longitude),2)) <= #{distance}"
+    end
 
-  def self.bounds
-    # Give something like :
-    # [["113.5292500000000000", "22.1127580000000000", "113.5819330000000000", "22.2157050000000000"]]
-    min_and_max = connection.select_rows("select min(longitude) as min_lon, min(latitude) as min_lat, max(longitude) as max_lon, max(latitude) as max_lat from #{table_name} where latitude is not null and longitude is not null").first
-    return nil unless min_and_max
+    def self.bounds
+      # Give something like :
+      # [["113.5292500000000000", "22.1127580000000000", "113.5819330000000000", "22.2157050000000000"]]
+      min_and_max = connection.select_rows("select min(longitude) as min_lon, min(latitude) as min_lat, max(longitude) as max_lon, max(latitude) as max_lat from #{table_name} where latitude is not null and longitude is not null").first
+      return nil unless min_and_max
 
-    # Ignore [nil, nil, nil, nil]
-    min_and_max.compact!
-    return nil unless min_and_max.size == 4
+      # Ignore [nil, nil, nil, nil]
+      min_and_max.compact!
+      return nil unless min_and_max.size == 4
 
-    min_and_max.collect! { |n| n.to_f }
+      min_and_max.collect! { |n| n.to_f }
 
-    # We need something like :
-    # [[113.5292500000000000, 22.1127580000000000], [113.5819330000000000, 22.2157050000000000]]
-    coordinates = min_and_max.each_slice(2).to_a
-    GeoRuby::SimpleFeatures::Envelope.from_coordinates coordinates
-  end
+      # We need something like :
+      # [[113.5292500000000000, 22.1127580000000000], [113.5819330000000000, 22.2157050000000000]]
+      coordinates = min_and_max.each_slice(2).to_a
+      GeoRuby::SimpleFeatures::Envelope.from_coordinates coordinates
+    end
 
-  def stop_area_type
-    area_type ? area_type : " "
-  end
+    def stop_area_type
+      area_type ? area_type : " "
+    end
 
-  def stop_area_type=(stop_area_type)
-    self.area_type = (stop_area_type ? stop_area_type.camelcase : nil)
-  end
+    def stop_area_type=(stop_area_type)
+      self.area_type = (stop_area_type ? stop_area_type.camelcase : nil)
+    end
 
-  def children_ids=(children_ids)
-    children = children_ids.split(',').uniq
-    # remove unset children
-    self.children.each do |child|
-      if (! children.include? child.id)
-        child.update_attribute :parent_id, nil
+    def children_ids=(children_ids)
+      children = children_ids.split(',').uniq
+      # remove unset children
+      self.children.each do |child|
+        if (! children.include? child.id)
+          child.update_attribute :parent_id, nil
+        end
+      end
+      # add new children
+      Chouette::StopArea.find(children).each do |child|
+        child.update_attribute :parent_id, self.id
       end
     end
-    # add new children
-    Chouette::StopArea.find(children).each do |child|
-       child.update_attribute :parent_id, self.id
-    end
-  end
 
-  def routing_stop_ids=(routing_stop_ids)
-    stops = routing_stop_ids.split(',').uniq
-    self.routing_stops.clear
-    Chouette::StopArea.find(stops).each do |stop|
-      self.routing_stops << stop
+    def routing_stop_ids=(routing_stop_ids)
+      stops = routing_stop_ids.split(',').uniq
+      self.routing_stops.clear
+      Chouette::StopArea.find(stops).each do |stop|
+        self.routing_stops << stop
+      end
     end
-  end
 
-  def routing_line_ids=(routing_line_ids)
-    lines = routing_line_ids.split(',').uniq
-    self.routing_lines.clear
-    Chouette::Line.find(lines).each do |line|
-      self.routing_lines << line
+    def routing_line_ids=(routing_line_ids)
+      lines = routing_line_ids.split(',').uniq
+      self.routing_lines.clear
+      Chouette::Line.find(lines).each do |line|
+        self.routing_lines << line
+      end
     end
-  end
 
-  def self.without_geometry
-    where("latitude is null or longitude is null")
-  end
+    def self.without_geometry
+      where("latitude is null or longitude is null")
+    end
 
-  def self.with_geometry
-    where("latitude is not null and longitude is not null")
-  end
+    def self.with_geometry
+      where("latitude is not null and longitude is not null")
+    end
 
-  def self.default_geometry!
-    count = 0
-    where(nil).find_each do |stop_area|
-      Chouette::StopArea.unscoped do
-        count += 1 if stop_area.default_geometry!
+    def self.default_geometry!
+      count = 0
+      where(nil).find_each do |stop_area|
+        Chouette::StopArea.unscoped do
+          count += 1 if stop_area.default_geometry!
+        end
       end
+      count
     end
-    count
-  end
-
-  def default_geometry!
-    new_geometry = default_geometry
-    update_attribute :geometry, new_geometry if new_geometry
-  end
 
-  def default_geometry
-    children_geometries = children.with_geometry.map(&:geometry).uniq
-    GeoRuby::SimpleFeatures::Point.centroid children_geometries if children_geometries.present?
-  end
+    def default_geometry!
+      new_geometry = default_geometry
+      update_attribute :geometry, new_geometry if new_geometry
+    end
 
-  def generic_access_link_matrix
-     matrix = Array.new
-     access_points.each do |access_point|
-       matrix += access_point.generic_access_link_matrix
-     end
-     matrix
-  end
+    def default_geometry
+      children_geometries = children.with_geometry.map(&:geometry).uniq
+      GeoRuby::SimpleFeatures::Point.centroid children_geometries if children_geometries.present?
+    end
 
-  def detail_access_link_matrix
-     matrix = Array.new
-     access_points.each do |access_point|
-       matrix += access_point.detail_access_link_matrix
-     end
-     matrix
-  end
+    def generic_access_link_matrix
+      matrix = Array.new
+      access_points.each do |access_point|
+        matrix += access_point.generic_access_link_matrix
+      end
+      matrix
+    end
 
-  def children_at_base
-    list = Array.new
-    children_in_depth.each do |child|
-      if child.area_type == 'Quay' || child.area_type == 'BoardingPosition'
-        list << child
+    def detail_access_link_matrix
+      matrix = Array.new
+      access_points.each do |access_point|
+        matrix += access_point.detail_access_link_matrix
       end
+      matrix
     end
-    list
-  end
 
-  def parents
-    list = Array.new
-    if !parent.nil?
-      list << parent
-      list += parent.parents
+    def children_at_base
+      list = Array.new
+      children_in_depth.each do |child|
+        if child.area_type == 'Quay' || child.area_type == 'BoardingPosition'
+          list << child
+        end
+      end
+      list
     end
-    list
-  end
 
-  def clean_invalid_access_links
-    stop_parents = parents
-    access_links.each do |link|
-      unless stop_parents.include? link.access_point.stop_area
-        link.delete
+    def parents
+      list = Array.new
+      if !parent.nil?
+        list << parent
+        list += parent.parents
       end
+      list
     end
-    children.each do |child|
-      child.clean_invalid_access_links
+
+    def clean_invalid_access_links
+      stop_parents = parents
+      access_links.each do |link|
+        unless stop_parents.include? link.access_point.stop_area
+          link.delete
+        end
+      end
+      children.each do |child|
+        child.clean_invalid_access_links
+      end
     end
-  end
 
-  def duplicate
-    sa = self.deep_clone :except => [:object_version, :parent_id, :registration_number]
-    sa.uniq_objectid
-    sa.name = I18n.t("activerecord.copy", :name => self.name)
-    sa
-  end
+    def duplicate
+      sa = self.deep_clone :except => [:object_version, :parent_id, :registration_number]
+      sa.uniq_objectid
+      sa.name = I18n.t("activerecord.copy", :name => self.name)
+      sa
+    end
 
-  def journey_patterns_control_route_sections
-    if self.changed_attributes['latitude'] || self.changed_attributes['longitude']
-      self.stop_points.each do |stop_point|
-        stop_point.route.journey_patterns.completed.map{ |jp| jp.control! }
+    def journey_patterns_control_route_sections
+      if self.changed_attributes['latitude'] || self.changed_attributes['longitude']
+        self.stop_points.each do |stop_point|
+          stop_point.route.journey_patterns.completed.map{ |jp| jp.control! }
+        end
       end
     end
-  end
 
-end
+  end
+end
+\ No newline at end of file
diff --git a/app/models/chouette/stop_point.rb b/app/models/chouette/stop_point.rb
index 89c492b91..f4c9b3800 100644
--- a/app/models/chouette/stop_point.rb
+++ b/app/models/chouette/stop_point.rb
@@ -1,5 +1,5 @@
 module Chouette
-  class StopPoint < TridentActiveRecord
+  class StopPoint < Chouette::TridentActiveRecord
 
     def self.policy_class
       RoutePolicy
@@ -7,6 +7,7 @@ module Chouette
 
     include ForBoardingEnumerations
     include ForAlightingEnumerations
+    include ObjectidSupport
 
     # FIXME http://jira.codehaus.org/browse/JRUBY-6358
     self.primary_key = "id"
@@ -18,6 +19,7 @@ module Chouette
 
     acts_as_list :scope => :route, top_of_list: 0
 
+
     validates_presence_of :stop_area
     validate :stop_area_id_validation
     def stop_area_id_validation
@@ -47,9 +49,12 @@ module Chouette
       self.class.create!(atts_for_create)
     end
 
+    def local_id
+      "IBOO-#{self.referential.id}-#{self.route.line.get_objectid.local_id}-#{self.route.id}-#{self.id}"
+    end
+
     def self.area_candidates
       Chouette::StopArea.where(:area_type => ['Quay', 'BoardingPosition'])
     end
-
   end
-end
+end
+\ No newline at end of file
diff --git a/app/models/chouette/time_table.rb b/app/models/chouette/time_table.rb
index 72496273e..09d3e2244 100644
--- a/app/models/chouette/time_table.rb
+++ b/app/models/chouette/time_table.rb
@@ -1,570 +1,573 @@
-class Chouette::TimeTable < Chouette::TridentActiveRecord
-  include ChecksumSupport
-  include TimeTableRestrictions
-  # FIXME http://jira.codehaus.org/browse/JRUBY-6358
-  self.primary_key = "id"
+module Chouette
+  class TimeTable < Chouette::TridentActiveRecord
+    include ChecksumSupport
+    include TimeTableRestrictions
+    include ObjectidSupport
+    # FIXME http://jira.codehaus.org/browse/JRUBY-6358
+    self.primary_key = "id"
 
-  acts_as_taggable
+    acts_as_taggable
 
-  attr_accessor :monday,:tuesday,:wednesday,:thursday,:friday,:saturday,:sunday
-  attr_accessor :tag_search
+    attr_accessor :monday,:tuesday,:wednesday,:thursday,:friday,:saturday,:sunday
+    attr_accessor :tag_search
 
-  def self.ransackable_attributes auth_object = nil
-    (column_names + ['tag_search']) + _ransackers.keys
-  end
+    def self.ransackable_attributes auth_object = nil
+      (column_names + ['tag_search']) + _ransackers.keys
+    end
 
-  has_and_belongs_to_many :vehicle_journeys, :class_name => 'Chouette::VehicleJourney'
+    has_and_belongs_to_many :vehicle_journeys, :class_name => 'Chouette::VehicleJourney'
 
-  has_many :dates, -> {order(:date)}, inverse_of: :time_table, :validate => :true, :class_name => "Chouette::TimeTableDate", :dependent => :destroy
-  has_many :periods, -> {order(:period_start)}, inverse_of: :time_table, :validate => :true, :class_name => "Chouette::TimeTablePeriod", :dependent => :destroy
+    has_many :dates, -> {order(:date)}, inverse_of: :time_table, :validate => :true, :class_name => "Chouette::TimeTableDate", :dependent => :destroy
+    has_many :periods, -> {order(:period_start)}, inverse_of: :time_table, :validate => :true, :class_name => "Chouette::TimeTablePeriod", :dependent => :destroy
 
-  belongs_to :calendar
-  belongs_to :created_from, class_name: 'Chouette::TimeTable'
+    belongs_to :calendar
+    belongs_to :created_from, class_name: 'Chouette::TimeTable'
 
-  scope :overlapping, -> (period_range) do
-    joins("
-      LEFT JOIN time_table_periods ON time_tables.id = time_table_periods.time_table_id
-      LEFT JOIN time_table_dates ON time_tables.id = time_table_dates.time_table_id
-    ")
-    .where("(time_table_periods.period_start <= :end AND time_table_periods.period_end >= :begin) OR (time_table_dates.date BETWEEN :begin AND :end)", {begin: period_range.begin, end: period_range.end})
-  end
+    scope :overlapping, -> (period_range) do
+      joins("
+        LEFT JOIN time_table_periods ON time_tables.id = time_table_periods.time_table_id
+        LEFT JOIN time_table_dates ON time_tables.id = time_table_dates.time_table_id
+      ")
+      .where("(time_table_periods.period_start <= :end AND time_table_periods.period_end >= :begin) OR (time_table_dates.date BETWEEN :begin AND :end)", {begin: period_range.begin, end: period_range.end})
+    end
 
-  after_save :save_shortcuts
+    after_save :save_shortcuts
 
-  def local_id
-    "IBOO-#{self.referential.id}-#{self.id}"
-  end
+    def local_id
+      "IBOO-#{self.referential.id}-#{self.id}"
+    end
 
-  def checksum_attributes
-    [].tap do |attrs|
-      attrs << self.int_day_types
-      attrs << self.dates.map(&:checksum).map(&:to_s).sort
-      attrs << self.periods.map(&:checksum).map(&:to_s).sort
+    def checksum_attributes
+      [].tap do |attrs|
+        attrs << self.int_day_types
+        attrs << self.dates.map(&:checksum).map(&:to_s).sort
+        attrs << self.periods.map(&:checksum).map(&:to_s).sort
+      end
     end
-  end
 
-  def self.object_id_key
-    "Timetable"
-  end
+    def self.object_id_key
+      "Timetable"
+    end
 
-  accepts_nested_attributes_for :dates, :allow_destroy => :true
-  accepts_nested_attributes_for :periods, :allow_destroy => :true
-
-  validates_presence_of :comment
-  validates_associated :dates
-  validates_associated :periods
-
-  def continuous_dates
-    in_days = self.dates.where(in_out: true).sort_by(&:date)
-    chunk = {}
-    group = nil
-    in_days.each_with_index do |date, index|
-      group ||= index
-      group = (date.date == in_days[index - 1].date + 1.day) ? group : group + 1
-      chunk[group] ||= []
-      chunk[group] << date
-    end
-    # Remove less than 2 continuous day chunk
-    chunk.values.delete_if {|dates| dates.count < 2}
-  end
+    accepts_nested_attributes_for :dates, :allow_destroy => :true
+    accepts_nested_attributes_for :periods, :allow_destroy => :true
+
+    validates_presence_of :comment
+    validates_associated :dates
+    validates_associated :periods
+
+    def continuous_dates
+      in_days = self.dates.where(in_out: true).sort_by(&:date)
+      chunk = {}
+      group = nil
+      in_days.each_with_index do |date, index|
+        group ||= index
+        group = (date.date == in_days[index - 1].date + 1.day) ? group : group + 1
+        chunk[group] ||= []
+        chunk[group] << date
+      end
+      # Remove less than 2 continuous day chunk
+      chunk.values.delete_if {|dates| dates.count < 2}
+    end
 
-  def convert_continuous_dates_to_periods
-    chunks = self.continuous_dates
+    def convert_continuous_dates_to_periods
+      chunks = self.continuous_dates
 
-    transaction do
-      chunks.each do |chunk|
-        self.periods.create!(period_start: chunk.first.date, period_end: chunk.last.date)
-        self.dates.delete(chunk)
+      transaction do
+        chunks.each do |chunk|
+          self.periods.create!(period_start: chunk.first.date, period_end: chunk.last.date)
+          self.dates.delete(chunk)
+        end
       end
     end
-  end
 
-  def state_update state
-    update_attributes(self.class.state_permited_attributes(state))
-    self.tag_list    = state['tags'].collect{|t| t['name']}.join(', ')
-    self.calendar_id = nil unless state['calendar']
+    def state_update state
+      update_attributes(self.class.state_permited_attributes(state))
+      self.tag_list    = state['tags'].collect{|t| t['name']}.join(', ')
+      self.calendar_id = nil unless state['calendar']
 
-    days = state['day_types'].split(',')
-    Date::DAYNAMES.map(&:underscore).each do |name|
-      prefix = human_attribute_name(name).first(2)
-      send("#{name}=", days.include?(prefix))
-    end
+      days = state['day_types'].split(',')
+      Date::DAYNAMES.map(&:underscore).each do |name|
+        prefix = human_attribute_name(name).first(2)
+        send("#{name}=", days.include?(prefix))
+      end
 
-    saved_dates = Hash[self.dates.collect{ |d| [d.id, d.date]}]
-    cmonth = Date.parse(state['current_periode_range'])
+      saved_dates = Hash[self.dates.collect{ |d| [d.id, d.date]}]
+      cmonth = Date.parse(state['current_periode_range'])
 
-    state['current_month'].each do |d|
-      date    = Date.parse(d['date'])
-      checked = d['include_date'] || d['excluded_date']
-      in_out  = d['include_date'] ? true : false
+      state['current_month'].each do |d|
+        date    = Date.parse(d['date'])
+        checked = d['include_date'] || d['excluded_date']
+        in_out  = d['include_date'] ? true : false
 
-      date_id = saved_dates.key(date)
-      time_table_date = self.dates.find(date_id) if date_id
+        date_id = saved_dates.key(date)
+        time_table_date = self.dates.find(date_id) if date_id
 
-      next if !checked && !time_table_date
-      # Destroy date if no longer checked
-      next if !checked && time_table_date.destroy
+        next if !checked && !time_table_date
+        # Destroy date if no longer checked
+        next if !checked && time_table_date.destroy
 
-      # Create new date
-      unless time_table_date
-        time_table_date = self.dates.create({in_out: in_out, date: date})
-      end
-      # Update in_out
-      if in_out != time_table_date.in_out
-        time_table_date.update_attributes({in_out: in_out})
+        # Create new date
+        unless time_table_date
+          time_table_date = self.dates.create({in_out: in_out, date: date})
+        end
+        # Update in_out
+        if in_out != time_table_date.in_out
+          time_table_date.update_attributes({in_out: in_out})
+        end
       end
-    end
 
-    self.state_update_periods state['time_table_periods']
-    self.save
-  end
+      self.state_update_periods state['time_table_periods']
+      self.save
+    end
 
-  def state_update_periods state_periods
-    state_periods.each do |item|
-      period = self.periods.find(item['id']) if item['id']
-      next if period && item['deleted'] && period.destroy
-      period ||= self.periods.build
+    def state_update_periods state_periods
+      state_periods.each do |item|
+        period = self.periods.find(item['id']) if item['id']
+        next if period && item['deleted'] && period.destroy
+        period ||= self.periods.build
 
-      period.period_start = Date.parse(item['period_start'])
-      period.period_end   = Date.parse(item['period_end'])
+        period.period_start = Date.parse(item['period_start'])
+        period.period_end   = Date.parse(item['period_end'])
 
-      if period.changed?
-        period.save
-        item['id'] = period.id
+        if period.changed?
+          period.save
+          item['id'] = period.id
+        end
       end
+
+      state_periods.delete_if {|item| item['deleted']}
     end
 
-    state_periods.delete_if {|item| item['deleted']}
-  end
+    def self.state_permited_attributes item
+      item.slice('comment', 'color').to_hash
+    end
 
-  def self.state_permited_attributes item
-    item.slice('comment', 'color').to_hash
-  end
+    def presenter
+      @presenter ||= ::TimeTablePresenter.new( self)
+    end
 
-  def presenter
-    @presenter ||= ::TimeTablePresenter.new( self)
-  end
+    def self.start_validity_period
+      [Chouette::TimeTable.minimum(:start_date)].compact.min
+    end
+    def self.end_validity_period
+      [Chouette::TimeTable.maximum(:end_date)].compact.max
+    end
 
-  def self.start_validity_period
-    [Chouette::TimeTable.minimum(:start_date)].compact.min
-  end
-  def self.end_validity_period
-    [Chouette::TimeTable.maximum(:end_date)].compact.max
-  end
+    def add_exclude_date(in_out, date)
+      self.dates.create!({in_out: in_out, date: date})
+    end
 
-  def add_exclude_date(in_out, date)
-    self.dates.create!({in_out: in_out, date: date})
-  end
+    def actualize
+      self.dates.clear
+      self.periods.clear
+      from = self.calendar.convert_to_time_table
+      self.dates   = from.dates
+      self.periods = from.periods
+      self.save
+    end
 
-  def actualize
-    self.dates.clear
-    self.periods.clear
-    from = self.calendar.convert_to_time_table
-    self.dates   = from.dates
-    self.periods = from.periods
-    self.save
-  end
+    def month_inspect(date)
+      (date.beginning_of_month..date.end_of_month).map do |d|
+        {
+          day: I18n.l(d, format: '%A'),
+          date: d.to_s,
+          wday: d.wday,
+          wnumber: d.strftime("%W").to_s,
+          mday: d.mday,
+          include_date: include_in_dates?(d),
+          excluded_date: excluded_date?(d)
+        }
+      end
+    end
 
-  def month_inspect(date)
-    (date.beginning_of_month..date.end_of_month).map do |d|
-      {
-        day: I18n.l(d, format: '%A'),
-        date: d.to_s,
-        wday: d.wday,
-        wnumber: d.strftime("%W").to_s,
-        mday: d.mday,
-        include_date: include_in_dates?(d),
-        excluded_date: excluded_date?(d)
-      }
+    def save_shortcuts
+        shortcuts_update
+        self.update_column(:start_date, start_date)
+        self.update_column(:end_date, end_date)
     end
-  end
 
-  def save_shortcuts
-      shortcuts_update
-      self.update_column(:start_date, start_date)
-      self.update_column(:end_date, end_date)
-  end
+    def shortcuts_update(date=nil)
+      dates_array = bounding_dates
+      #if new_record?
+        if dates_array.empty?
+          self.start_date=nil
+          self.end_date=nil
+        else
+          self.start_date=dates_array.min
+          self.end_date=dates_array.max
+        end
+      #else
+      # if dates_array.empty?
+      #   update_attributes :start_date => nil, :end_date => nil
+      # else
+      #   update_attributes :start_date => dates_array.min, :end_date => dates_array.max
+      # end
+      #end
+    end
 
-  def shortcuts_update(date=nil)
-    dates_array = bounding_dates
-    #if new_record?
-      if dates_array.empty?
-        self.start_date=nil
-        self.end_date=nil
+    def validity_out_from_on?(expected_date)
+      return false unless self.end_date
+      self.end_date <= expected_date
+    end
+
+    def validity_out_between?(starting_date, ending_date)
+      return false unless self.start_date
+      starting_date < self.end_date  &&
+        self.end_date <= ending_date
+    end
+    def self.validity_out_from_on?(expected_date,limit=0)
+      if limit==0
+        Chouette::TimeTable.where("end_date <= ?", expected_date)
       else
-        self.start_date=dates_array.min
-        self.end_date=dates_array.max
+        Chouette::TimeTable.where("end_date <= ?", expected_date).limit( limit)
       end
-    #else
-     # if dates_array.empty?
-     #   update_attributes :start_date => nil, :end_date => nil
-     # else
-     #   update_attributes :start_date => dates_array.min, :end_date => dates_array.max
-     # end
-    #end
-  end
-
-  def validity_out_from_on?(expected_date)
-    return false unless self.end_date
-    self.end_date <= expected_date
-  end
-
-  def validity_out_between?(starting_date, ending_date)
-    return false unless self.start_date
-    starting_date < self.end_date  &&
-      self.end_date <= ending_date
-  end
-  def self.validity_out_from_on?(expected_date,limit=0)
-    if limit==0
-      Chouette::TimeTable.where("end_date <= ?", expected_date)
-    else
-      Chouette::TimeTable.where("end_date <= ?", expected_date).limit( limit)
     end
-  end
-  def self.validity_out_between?(start_date, end_date,limit=0)
-    if limit==0
-      Chouette::TimeTable.where( "? < end_date", start_date).where( "end_date <= ?", end_date)
-    else
-      Chouette::TimeTable.where( "? < end_date", start_date).where( "end_date <= ?", end_date).limit( limit)
+    def self.validity_out_between?(start_date, end_date,limit=0)
+      if limit==0
+        Chouette::TimeTable.where( "? < end_date", start_date).where( "end_date <= ?", end_date)
+      else
+        Chouette::TimeTable.where( "? < end_date", start_date).where( "end_date <= ?", end_date).limit( limit)
+      end
     end
-  end
 
-  # Return days which intersects with the time table dates and periods
-  def intersects(days)
-    [].tap do |intersect_days|
-      days.each do |day|
-        intersect_days << day if include_day?(day)
+    # Return days which intersects with the time table dates and periods
+    def intersects(days)
+      [].tap do |intersect_days|
+        days.each do |day|
+          intersect_days << day if include_day?(day)
+        end
       end
     end
-  end
 
-  def include_day?(day)
-    include_in_dates?(day) || include_in_periods?(day)
-  end
+    def include_day?(day)
+      include_in_dates?(day) || include_in_periods?(day)
+    end
 
-  def include_in_dates?(day)
-    self.dates.any?{ |d| d.date === day && d.in_out == true }
-  end
+    def include_in_dates?(day)
+      self.dates.any?{ |d| d.date === day && d.in_out == true }
+    end
 
-  def excluded_date?(day)
-    self.dates.any?{ |d| d.date === day && d.in_out == false }
-  end
+    def excluded_date?(day)
+      self.dates.any?{ |d| d.date === day && d.in_out == false }
+    end
 
-  def include_in_periods?(day)
-    self.periods.any?{ |period| period.period_start <= day &&
-                                day <= period.period_end &&
-                                valid_days.include?(day.cwday) &&
-                                ! excluded_date?(day) }
-  end
+    def include_in_periods?(day)
+      self.periods.any?{ |period| period.period_start <= day &&
+                                  day <= period.period_end &&
+                                  valid_days.include?(day.cwday) &&
+                                  ! excluded_date?(day) }
+    end
 
-  def include_in_overlap_dates?(day)
-    return false if self.excluded_date?(day)
+    def include_in_overlap_dates?(day)
+      return false if self.excluded_date?(day)
 
-    counter = self.dates.select{ |d| d.date === day}.size + self.periods.select{ |period| period.period_start <= day && day <= period.period_end && valid_days.include?(day.cwday) }.size
-    counter <= 1 ? false : true
-   end
+      counter = self.dates.select{ |d| d.date === day}.size + self.periods.select{ |period| period.period_start <= day && day <= period.period_end && valid_days.include?(day.cwday) }.size
+      counter <= 1 ? false : true
+    end
 
-  def periods_max_date
-    return nil if self.periods.empty?
+    def periods_max_date
+      return nil if self.periods.empty?
 
-    min_start = self.periods.map(&:period_start).compact.min
-    max_end = self.periods.map(&:period_end).compact.max
-    result = nil
+      min_start = self.periods.map(&:period_start).compact.min
+      max_end = self.periods.map(&:period_end).compact.max
+      result = nil
 
-    if max_end && min_start
-      max_end.downto( min_start) do |date|
-        if self.valid_days.include?(date.cwday) && !self.excluded_date?(date)
-            result = date
-            break
+      if max_end && min_start
+        max_end.downto( min_start) do |date|
+          if self.valid_days.include?(date.cwday) && !self.excluded_date?(date)
+              result = date
+              break
+          end
         end
       end
+      result
     end
-    result
-  end
-  def periods_min_date
-    return nil if self.periods.empty?
-
-    min_start = self.periods.map(&:period_start).compact.min
-    max_end = self.periods.map(&:period_end).compact.max
-    result = nil
-
-    if max_end && min_start
-      min_start.upto(max_end) do |date|
-        if self.valid_days.include?(date.cwday) && !self.excluded_date?(date)
-            result = date
-            break
+    def periods_min_date
+      return nil if self.periods.empty?
+
+      min_start = self.periods.map(&:period_start).compact.min
+      max_end = self.periods.map(&:period_end).compact.max
+      result = nil
+
+      if max_end && min_start
+        min_start.upto(max_end) do |date|
+          if self.valid_days.include?(date.cwday) && !self.excluded_date?(date)
+              result = date
+              break
+          end
         end
       end
+      result
     end
-    result
-  end
-  def bounding_dates
-    bounding_min = self.dates.select{|d| d.in_out}.map(&:date).compact.min
-    bounding_max = self.dates.select{|d| d.in_out}.map(&:date).compact.max
+    def bounding_dates
+      bounding_min = self.dates.select{|d| d.in_out}.map(&:date).compact.min
+      bounding_max = self.dates.select{|d| d.in_out}.map(&:date).compact.max
 
-    unless self.periods.empty?
-      bounding_min = periods_min_date if periods_min_date &&
-          (bounding_min.nil? || (periods_min_date < bounding_min))
+      unless self.periods.empty?
+        bounding_min = periods_min_date if periods_min_date &&
+            (bounding_min.nil? || (periods_min_date < bounding_min))
 
-      bounding_max = periods_max_date if periods_max_date &&
-          (bounding_max.nil? || (bounding_max < periods_max_date))
-    end
+        bounding_max = periods_max_date if periods_max_date &&
+            (bounding_max.nil? || (bounding_max < periods_max_date))
+      end
 
-    [bounding_min, bounding_max].compact
-  end
+      [bounding_min, bounding_max].compact
+    end
 
-  def display_day_types
-    %w(monday tuesday wednesday thursday friday saturday sunday).select{ |d| self.send(d) }.map{ |d| self.human_attribute_name(d).first(2)}.join(', ')
-  end
+    def display_day_types
+      %w(monday tuesday wednesday thursday friday saturday sunday).select{ |d| self.send(d) }.map{ |d| self.human_attribute_name(d).first(2)}.join(', ')
+    end
 
-  def day_by_mask(flag)
-    int_day_types & flag == flag
-  end
+    def day_by_mask(flag)
+      int_day_types & flag == flag
+    end
 
-  def self.day_by_mask(int_day_types,flag)
-    int_day_types & flag == flag
-  end
+    def self.day_by_mask(int_day_types,flag)
+      int_day_types & flag == flag
+    end
 
 
-  def valid_days
-    # Build an array with day of calendar week (1-7, Monday is 1).
-    [].tap do |valid_days|
-      valid_days << 1  if monday
-      valid_days << 2  if tuesday
-      valid_days << 3  if wednesday
-      valid_days << 4  if thursday
-      valid_days << 5  if friday
-      valid_days << 6  if saturday
-      valid_days << 7  if sunday
+    def valid_days
+      # Build an array with day of calendar week (1-7, Monday is 1).
+      [].tap do |valid_days|
+        valid_days << 1  if monday
+        valid_days << 2  if tuesday
+        valid_days << 3  if wednesday
+        valid_days << 4  if thursday
+        valid_days << 5  if friday
+        valid_days << 6  if saturday
+        valid_days << 7  if sunday
+      end
     end
-  end
 
-  def self.valid_days(int_day_types)
-    # Build an array with day of calendar week (1-7, Monday is 1).
-    [].tap do |valid_days|
-      valid_days << 1  if day_by_mask(int_day_types,4)
-      valid_days << 2  if day_by_mask(int_day_types,8)
-      valid_days << 3  if day_by_mask(int_day_types,16)
-      valid_days << 4  if day_by_mask(int_day_types,32)
-      valid_days << 5  if day_by_mask(int_day_types,64)
-      valid_days << 6  if day_by_mask(int_day_types,128)
-      valid_days << 7  if day_by_mask(int_day_types,256)
+    def self.valid_days(int_day_types)
+      # Build an array with day of calendar week (1-7, Monday is 1).
+      [].tap do |valid_days|
+        valid_days << 1  if day_by_mask(int_day_types,4)
+        valid_days << 2  if day_by_mask(int_day_types,8)
+        valid_days << 3  if day_by_mask(int_day_types,16)
+        valid_days << 4  if day_by_mask(int_day_types,32)
+        valid_days << 5  if day_by_mask(int_day_types,64)
+        valid_days << 6  if day_by_mask(int_day_types,128)
+        valid_days << 7  if day_by_mask(int_day_types,256)
+      end
     end
-  end
 
-  def monday
-    day_by_mask(4)
-  end
-  def tuesday
-    day_by_mask(8)
-  end
-  def wednesday
-    day_by_mask(16)
-  end
-  def thursday
-    day_by_mask(32)
-  end
-  def friday
-    day_by_mask(64)
-  end
-  def saturday
-    day_by_mask(128)
-  end
-  def sunday
-    day_by_mask(256)
-  end
+    def monday
+      day_by_mask(4)
+    end
+    def tuesday
+      day_by_mask(8)
+    end
+    def wednesday
+      day_by_mask(16)
+    end
+    def thursday
+      day_by_mask(32)
+    end
+    def friday
+      day_by_mask(64)
+    end
+    def saturday
+      day_by_mask(128)
+    end
+    def sunday
+      day_by_mask(256)
+    end
 
-  def set_day(day,flag)
-    if day == '1' || day == true
-      self.int_day_types |= flag
-    else
-      self.int_day_types &= ~flag
+    def set_day(day,flag)
+      if day == '1' || day == true
+        self.int_day_types |= flag
+      else
+        self.int_day_types &= ~flag
+      end
+      shortcuts_update
     end
-    shortcuts_update
-  end
 
-  def monday=(day)
-    set_day(day,4)
-  end
-  def tuesday=(day)
-    set_day(day,8)
-  end
-  def wednesday=(day)
-    set_day(day,16)
-  end
-  def thursday=(day)
-    set_day(day,32)
-  end
-  def friday=(day)
-    set_day(day,64)
-  end
-  def saturday=(day)
-    set_day(day,128)
-  end
-  def sunday=(day)
-    set_day(day,256)
-  end
+    def monday=(day)
+      set_day(day,4)
+    end
+    def tuesday=(day)
+      set_day(day,8)
+    end
+    def wednesday=(day)
+      set_day(day,16)
+    end
+    def thursday=(day)
+      set_day(day,32)
+    end
+    def friday=(day)
+      set_day(day,64)
+    end
+    def saturday=(day)
+      set_day(day,128)
+    end
+    def sunday=(day)
+      set_day(day,256)
+    end
 
-  def effective_days_of_period(period,valid_days=self.valid_days)
-    days = []
-      period.period_start.upto(period.period_end) do |date|
-        if valid_days.include?(date.cwday) && !self.excluded_date?(date)
-            days << date
+    def effective_days_of_period(period,valid_days=self.valid_days)
+      days = []
+        period.period_start.upto(period.period_end) do |date|
+          if valid_days.include?(date.cwday) && !self.excluded_date?(date)
+              days << date
+          end
         end
-      end
-    days
-  end
+      days
+    end
 
-  def effective_days(valid_days=self.valid_days)
-    days=self.effective_days_of_periods(valid_days)
-    self.dates.each do |d|
-      days |= [d.date] if d.in_out
+    def effective_days(valid_days=self.valid_days)
+      days=self.effective_days_of_periods(valid_days)
+      self.dates.each do |d|
+        days |= [d.date] if d.in_out
+      end
+      days.sort
     end
-    days.sort
-  end
 
-  def effective_days_of_periods(valid_days=self.valid_days)
-    days = []
-    self.periods.each { |p| days |= self.effective_days_of_period(p,valid_days)}
-    days.sort
-  end
+    def effective_days_of_periods(valid_days=self.valid_days)
+      days = []
+      self.periods.each { |p| days |= self.effective_days_of_period(p,valid_days)}
+      days.sort
+    end
 
-  def clone_periods
-    periods = []
-    self.periods.each { |p| periods << p.copy}
-    periods.sort_by(&:period_start)
-  end
+    def clone_periods
+      periods = []
+      self.periods.each { |p| periods << p.copy}
+      periods.sort_by(&:period_start)
+    end
 
-  def included_days
-    days = []
-    self.dates.each do |d|
-      days |= [d.date] if d.in_out
+    def included_days
+      days = []
+      self.dates.each do |d|
+        days |= [d.date] if d.in_out
+      end
+      days.sort
     end
-    days.sort
-  end
 
-  def excluded_days
-    days = []
-    self.dates.each do |d|
-      days |= [d.date] unless d.in_out
+    def excluded_days
+      days = []
+      self.dates.each do |d|
+        days |= [d.date] unless d.in_out
+      end
+      days.sort
     end
-    days.sort
-  end
 
 
-  # produce a copy of periods without anyone overlapping or including another
-  def optimize_overlapping_periods
-    periods = self.clone_periods
-    optimized = []
-    i=0
-    while i < periods.length
-      p1 = periods[i]
-      optimized << p1
-      j= i+1
-      while j < periods.length
-        p2 = periods[j]
-        if p1.contains? p2
-          periods.delete p2
-        elsif p1.overlap? p2
-          p1.period_start = [p1.period_start,p2.period_start].min
-          p1.period_end = [p1.period_end,p2.period_end].max
-          periods.delete p2
-        else
-          j += 1
+    # produce a copy of periods without anyone overlapping or including another
+    def optimize_overlapping_periods
+      periods = self.clone_periods
+      optimized = []
+      i=0
+      while i < periods.length
+        p1 = periods[i]
+        optimized << p1
+        j= i+1
+        while j < periods.length
+          p2 = periods[j]
+          if p1.contains? p2
+            periods.delete p2
+          elsif p1.overlap? p2
+            p1.period_start = [p1.period_start,p2.period_start].min
+            p1.period_end = [p1.period_end,p2.period_end].max
+            periods.delete p2
+          else
+            j += 1
+          end
         end
+        i+= 1
       end
-      i+= 1
+      optimized.sort { |a,b| a.period_start <=> b.period_start}
     end
-    optimized.sort { |a,b| a.period_start <=> b.period_start}
-  end
 
-  # add a peculiar day or switch it from excluded to included
-  def add_included_day(d)
-    if self.excluded_date?(d)
-       self.dates.each do |date|
-         if date.date === d
-           date.in_out = true
-         end
-       end
-    elsif !self.include_in_dates?(d)
-       self.dates << Chouette::TimeTableDate.new(:date => d, :in_out => true)
+    # add a peculiar day or switch it from excluded to included
+    def add_included_day(d)
+      if self.excluded_date?(d)
+        self.dates.each do |date|
+          if date.date === d
+            date.in_out = true
+          end
+        end
+      elsif !self.include_in_dates?(d)
+        self.dates << Chouette::TimeTableDate.new(:date => d, :in_out => true)
+      end
     end
-  end
 
-  # merge effective days from another timetable
-  def merge!(another_tt)
-    transaction do
-      days = [].tap do |array|
-        array.push(*self.effective_days, *another_tt.effective_days)
-        array.uniq!
-      end
+    # merge effective days from another timetable
+    def merge!(another_tt)
+      transaction do
+        days = [].tap do |array|
+          array.push(*self.effective_days, *another_tt.effective_days)
+          array.uniq!
+        end
 
-      self.dates.clear
-      self.periods.clear
+        self.dates.clear
+        self.periods.clear
 
-      days.each do |day|
-        self.dates << Chouette::TimeTableDate.new(date: day, in_out: true)
+        days.each do |day|
+          self.dates << Chouette::TimeTableDate.new(date: day, in_out: true)
+        end
+        self.save!
       end
-      self.save!
+      self.convert_continuous_dates_to_periods
     end
-    self.convert_continuous_dates_to_periods
-  end
 
-  def included_days_in_dates_and_periods
-    in_day  = self.dates.select {|d| d.in_out }.map(&:date)
-    out_day = self.dates.select {|d| !d.in_out }.map(&:date)
+    def included_days_in_dates_and_periods
+      in_day  = self.dates.select {|d| d.in_out }.map(&:date)
+      out_day = self.dates.select {|d| !d.in_out }.map(&:date)
 
-    in_periods = self.periods.map{|p| (p.period_start..p.period_end).to_a }.flatten
-    days = in_periods + in_day
-    days -= out_day
-    days
-  end
+      in_periods = self.periods.map{|p| (p.period_start..p.period_end).to_a }.flatten
+      days = in_periods + in_day
+      days -= out_day
+      days
+    end
 
-  # keep common dates with another_tt
-  def intersect!(another_tt)
-    transaction do
-      days = [].tap do |array|
-        array.push(*self.effective_days)
-        array.delete_if {|day| !another_tt.effective_days.include?(day) }
-        array.uniq!
-      end
+    # keep common dates with another_tt
+    def intersect!(another_tt)
+      transaction do
+        days = [].tap do |array|
+          array.push(*self.effective_days)
+          array.delete_if {|day| !another_tt.effective_days.include?(day) }
+          array.uniq!
+        end
 
-      self.dates.clear
-      self.periods.clear
+        self.dates.clear
+        self.periods.clear
 
-      days.sort.each do |d|
-        self.dates << Chouette::TimeTableDate.new(:date => d, :in_out => true)
+        days.sort.each do |d|
+          self.dates << Chouette::TimeTableDate.new(:date => d, :in_out => true)
+        end
+        self.save!
       end
-      self.save!
+      self.convert_continuous_dates_to_periods
     end
-    self.convert_continuous_dates_to_periods
-  end
 
-  # remove common dates with another_tt
-  def disjoin!(another_tt)
-    transaction do
-      days = [].tap do |array|
-        array.push(*self.effective_days)
-        array.delete_if {|day| another_tt.effective_days.include?(day) }
-        array.uniq!
-      end
+    # remove common dates with another_tt
+    def disjoin!(another_tt)
+      transaction do
+        days = [].tap do |array|
+          array.push(*self.effective_days)
+          array.delete_if {|day| another_tt.effective_days.include?(day) }
+          array.uniq!
+        end
 
-      self.dates.clear
-      self.periods.clear
+        self.dates.clear
+        self.periods.clear
 
-      days.sort.each do |d|
-        self.dates << Chouette::TimeTableDate.new(:date => d, :in_out => true)
+        days.sort.each do |d|
+          self.dates << Chouette::TimeTableDate.new(:date => d, :in_out => true)
+        end
+        self.save!
       end
-      self.save!
+      self.convert_continuous_dates_to_periods
     end
-    self.convert_continuous_dates_to_periods
-  end
 
-  def duplicate
-    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)
-    tt
+    def duplicate
+      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)
+      tt
+    end
   end
-end
+end
+\ No newline at end of file
diff --git a/app/models/chouette/time_table_date.rb b/app/models/chouette/time_table_date.rb
index 1893eae91..b3b2fd561 100644
--- a/app/models/chouette/time_table_date.rb
+++ b/app/models/chouette/time_table_date.rb
@@ -1,22 +1,23 @@
-class Chouette::TimeTableDate < Chouette::ActiveRecord
-  include ChecksumSupport
+module Chouette
+  class TimeTableDate < Chouette::ActiveRecord
+    include ChecksumSupport
 
-  self.primary_key = "id"
-  belongs_to :time_table, inverse_of: :dates
-  acts_as_list :scope => 'time_table_id = #{time_table_id}',:top_of_list => 0
+    self.primary_key = "id"
+    belongs_to :time_table, inverse_of: :dates
+    acts_as_list :scope => 'time_table_id = #{time_table_id}',:top_of_list => 0
 
-  validates_presence_of :date
-  validates_uniqueness_of :date, :scope => :time_table_id
+    validates_presence_of :date
+    validates_uniqueness_of :date, :scope => :time_table_id
 
-  scope :in_dates, -> { where(in_out: true) }
+    scope :in_dates, -> { where(in_out: true) }
 
-  def self.model_name
-    ActiveModel::Name.new Chouette::TimeTableDate, Chouette, "TimeTableDate"
-  end
+    def self.model_name
+      ActiveModel::Name.new Chouette::TimeTableDate, Chouette, "TimeTableDate"
+    end
 
-  def checksum_attributes
-    attrs = ['date', 'in_out']
-    self.slice(*attrs).values
+    def checksum_attributes
+      attrs = ['date', 'in_out']
+      self.slice(*attrs).values
+    end
   end
-end
-
+end
+\ No newline at end of file
diff --git a/app/models/chouette/time_table_period.rb b/app/models/chouette/time_table_period.rb
index ed136f3b9..ab3e79d7e 100644
--- a/app/models/chouette/time_table_period.rb
+++ b/app/models/chouette/time_table_period.rb
@@ -1,45 +1,46 @@
-class Chouette::TimeTablePeriod < Chouette::ActiveRecord
-  include ChecksumSupport
+module Chouette
+  class TimeTablePeriod < Chouette::ActiveRecord
+    include ChecksumSupport
 
-  self.primary_key = "id"
-  belongs_to :time_table, inverse_of: :periods
-  acts_as_list :scope => 'time_table_id = #{time_table_id}',:top_of_list => 0
+    self.primary_key = "id"
+    belongs_to :time_table, inverse_of: :periods
+    acts_as_list :scope => 'time_table_id = #{time_table_id}',:top_of_list => 0
 
-  validates_presence_of :period_start, :period_end
+    validates_presence_of :period_start, :period_end
 
-  validate :start_must_be_before_end
+    validate :start_must_be_before_end
 
-  def checksum_attributes
-    attrs = ['period_start', 'period_end']
-    self.slice(*attrs).values
-  end
-
-  def self.model_name
-    ActiveModel::Name.new Chouette::TimeTablePeriod, Chouette, "TimeTablePeriod"
-  end
+    def checksum_attributes
+      attrs = ['period_start', 'period_end']
+      self.slice(*attrs).values
+    end
 
-  def start_must_be_before_end
-    # security against nil values
-    if period_end.nil? || period_start.nil?
-      return
+    def self.model_name
+      ActiveModel::Name.new Chouette::TimeTablePeriod, Chouette, "TimeTablePeriod"
     end
-    if period_end <= period_start
-      errors.add(:period_end,I18n.t("activerecord.errors.models.time_table_period.start_must_be_before_end"))
+
+    def start_must_be_before_end
+      # security against nil values
+      if period_end.nil? || period_start.nil?
+        return
+      end
+      if period_end <= period_start
+        errors.add(:period_end,I18n.t("activerecord.errors.models.time_table_period.start_must_be_before_end"))
+      end
     end
-  end
 
-  def copy
-    Chouette::TimeTablePeriod.new(:period_start => self.period_start,:period_end => self.period_end)
-  end
+    def copy
+      Chouette::TimeTablePeriod.new(:period_start => self.period_start,:period_end => self.period_end)
+    end
 
-  # Test to see if a period overlap this period
-  def overlap?(p)
-     (p.period_start >= self.period_start && p.period_start <= self.period_end) || (p.period_end >= self.period_start && p.period_end <= self.period_end)
-  end
+    # Test to see if a period overlap this period
+    def overlap?(p)
+      (p.period_start >= self.period_start && p.period_start <= self.period_end) || (p.period_end >= self.period_start && p.period_end <= self.period_end)
+    end
 
-  # Test to see if a period is included in this period
-  def contains?(p)
-     (p.period_start >= self.period_start && p.period_end <= self.period_end)
+    # Test to see if a period is included in this period
+    def contains?(p)
+      (p.period_start >= self.period_start && p.period_end <= self.period_end)
+    end
   end
-
-end
+end
+\ No newline at end of file
diff --git a/app/models/chouette/timeband.rb b/app/models/chouette/timeband.rb
index 9844dd1b1..21c81ab1c 100644
--- a/app/models/chouette/timeband.rb
+++ b/app/models/chouette/timeband.rb
@@ -1,5 +1,4 @@
 module Chouette
-
   class TimebandValidator < ActiveModel::Validator
     def validate(record)
       if record.end_time <= record.start_time
@@ -9,10 +8,12 @@ module Chouette
   end
 
   class Timeband < Chouette::TridentActiveRecord
+    include ObjectidSupport
+
     self.primary_key = "id"
 
     validates :start_time, :end_time, presence: true
-    validates_with TimebandValidator
+    validates_with Chouette::TimebandValidator
 
     default_scope { order(:start_time) }
 
@@ -24,7 +25,5 @@ module Chouette
       fullname = "#{I18n.l(self.start_time, format: :hour)}-#{I18n.l(self.end_time, format: :hour)}"
       "#{self.name} (#{fullname})" if self.name
     end
-
   end
-
-end
+end
+\ No newline at end of file
diff --git a/app/models/chouette/trident_active_record.rb b/app/models/chouette/trident_active_record.rb
index e8223e3d6..18b7bbf9b 100644
--- a/app/models/chouette/trident_active_record.rb
+++ b/app/models/chouette/trident_active_record.rb
@@ -1,18 +1,19 @@
-class Chouette::TridentActiveRecord < Chouette::ActiveRecord
-  include StifNetexAttributesSupport
+module Chouette
+  class TridentActiveRecord < Chouette::ActiveRecord
 
-  self.abstract_class = true
+    self.abstract_class = true
 
-  def referential
-    @referential ||= Referential.where(:slug => Apartment::Tenant.current).first!
-  end
+    def referential
+      @referential ||= Referential.where(:slug => Apartment::Tenant.current).first!
+    end
 
-  def hub_restricted?
-    referential.data_format == "hub"
-  end
+    def hub_restricted?
+      referential.data_format == "hub"
+    end
 
-  def prefix
-    referential.prefix
-  end
+    def prefix
+      referential.prefix
+    end
 
-end
+  end
+end
+\ No newline at end of file
diff --git a/app/models/chouette/vehicle_journey.rb b/app/models/chouette/vehicle_journey.rb
index f574afc93..329b37a6c 100644
--- a/app/models/chouette/vehicle_journey.rb
+++ b/app/models/chouette/vehicle_journey.rb
@@ -1,7 +1,8 @@
 module Chouette
-  class VehicleJourney < TridentActiveRecord
+  class VehicleJourney < Chouette::TridentActiveRecord
     include ChecksumSupport
     include VehicleJourneyRestrictions
+    include ObjectidSupport
     include StifTransportModeEnumerations
     # FIXME http://jira.codehaus.org/browse/JRUBY-6358
     self.primary_key = "id"
@@ -57,14 +58,14 @@ module Chouette
     end
 
     def local_id
-      "IBOO-#{self.referential.id}-#{self.route.line.objectid.local_id}-#{self.id}"
+      "IBOO-#{self.referential.id}-#{self.route.line.get_objectid.local_id}-#{self.id}"
     end
 
     def checksum_attributes
       [].tap do |attrs|
         attrs << self.published_journey_name
         attrs << self.published_journey_identifier
-        attrs << self.try(:company).try(:objectid).try(:local_id)
+        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
       end
@@ -302,6 +303,5 @@ module Chouette
         ')
         .where('"time_tables_vehicle_journeys"."vehicle_journey_id" IS NULL')
     end
-
   end
-end
+end
+\ No newline at end of file
diff --git a/app/models/chouette/vehicle_journey_at_stop.rb b/app/models/chouette/vehicle_journey_at_stop.rb
index a4a4a02c8..6f0119e74 100644
--- a/app/models/chouette/vehicle_journey_at_stop.rb
+++ b/app/models/chouette/vehicle_journey_at_stop.rb
@@ -1,7 +1,7 @@
 module Chouette
   class VehicleJourneyAtStop < ActiveRecord
-    include ForBoardingEnumerations
-    include ForAlightingEnumerations
+    include Chouette::ForBoardingEnumerations
+    include Chouette::ForAlightingEnumerations
     include ChecksumSupport
 
     DAY_OFFSET_MAX = 1
@@ -41,7 +41,7 @@ module Chouette
           :arrival_day_offset,
           I18n.t(
             'vehicle_journey_at_stops.errors.day_offset_must_not_exceed_max',
-            short_id: vehicle_journey.objectid.short_id,
+            short_id: vehicle_journey.get_objectid.short_id,
             max: DAY_OFFSET_MAX + 1
           )
         )
@@ -52,7 +52,7 @@ module Chouette
           :departure_day_offset,
           I18n.t(
             'vehicle_journey_at_stops.errors.day_offset_must_not_exceed_max',
-            short_id: vehicle_journey.objectid.short_id,
+            short_id: vehicle_journey.get_objectid.short_id,
             max: DAY_OFFSET_MAX + 1
           )
         )
@@ -76,4 +76,4 @@ module Chouette
       end
     end
   end
-end
+end
+\ No newline at end of file
diff --git a/app/models/chouette/vehicle_journey_at_stops_are_in_increasing_time_order_validator.rb b/app/models/chouette/vehicle_journey_at_stops_are_in_increasing_time_order_validator.rb
index 95f0cdc3e..db48a6108 100644
--- a/app/models/chouette/vehicle_journey_at_stops_are_in_increasing_time_order_validator.rb
+++ b/app/models/chouette/vehicle_journey_at_stops_are_in_increasing_time_order_validator.rb
@@ -1,6 +1,6 @@
+
 module Chouette
-  class VehicleJourneyAtStopsAreInIncreasingTimeOrderValidator <
-      ActiveModel::EachValidator
+  class VehicleJourneyAtStopsAreInIncreasingTimeOrderValidator < ActiveModel::EachValidator
     def validate_each(vehicle_journey, attribute, value)
       previous_at_stop = nil
 
@@ -47,4 +47,4 @@ module Chouette
       valid
     end
   end
-end
+end
+\ No newline at end of file
diff --git a/app/models/chouette/vehicle_journey_at_stops_day_offset.rb b/app/models/chouette/vehicle_journey_at_stops_day_offset.rb
index 9f577dded..b2cb90d11 100644
--- a/app/models/chouette/vehicle_journey_at_stops_day_offset.rb
+++ b/app/models/chouette/vehicle_journey_at_stops_day_offset.rb
@@ -39,4 +39,4 @@ module Chouette
       save
     end
   end
-end
+end
+\ No newline at end of file
diff --git a/app/models/chouette/vehicle_journey_frequency.rb b/app/models/chouette/vehicle_journey_frequency.rb
index 41ba49082..53e85121f 100644
--- a/app/models/chouette/vehicle_journey_frequency.rb
+++ b/app/models/chouette/vehicle_journey_frequency.rb
@@ -1,5 +1,5 @@
 module Chouette
-  class VehicleJourneyFrequency < VehicleJourney
+  class VehicleJourneyFrequency < Chouette::VehicleJourney
 
     after_initialize :fill_journey_category
 
@@ -66,4 +66,4 @@ module Chouette
       errors.add(:base, I18n.t('vehicle_journey_frequency.require_at_least_one_frequency')) unless journey_frequencies.size > 0
     end
   end
-end
+end
+\ No newline at end of file
diff --git a/app/models/compliance_control.rb b/app/models/compliance_control.rb
index 146c4e838..65e22643d 100644
--- a/app/models/compliance_control.rb
+++ b/app/models/compliance_control.rb
@@ -83,7 +83,7 @@ require_dependency 'route_control/omnibus_journey_pattern'
 require_dependency 'route_control/opposite_route_terminus'
 require_dependency 'route_control/opposite_route'
 require_dependency 'route_control/stop_points_in_journey_pattern'
-require_dependency 'route_control/unactivated_stop_points'
+require_dependency 'route_control/unactivated_stop_point'
 require_dependency 'route_control/zdl_stop_area'
 require_dependency 'routing_constraint_zone_control/maximum_length'
 require_dependency 'routing_constraint_zone_control/minimum_length'
diff --git a/app/models/concerns/default_netex_attributes_support.rb b/app/models/concerns/default_netex_attributes_support.rb
deleted file mode 100644
index 4cf77ea65..000000000
--- a/app/models/concerns/default_netex_attributes_support.rb
+++ /dev/null
@@ -1,72 +0,0 @@
-module DefaultNetexAttributesSupport
-  extend ActiveSupport::Concern
-
-  included do
-    before_validation :prepare_auto_columns
-
-    validates_presence_of :objectid
-    validates_uniqueness_of :objectid
-    validates_numericality_of :object_version
-    validate :objectid_format_compliance
-
-    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
-    Chouette::NetexObjectId.new read_attribute(:objectid)
-  end
-
-  def prepare_auto_columns
-    if object_version.nil?
-      self.object_version = 1
-    else
-      self.object_version += 1
-    end
-    self.creator_id = 'chouette'
-  end
-
-  def fix_uniq_objectid
-    base_objectid = objectid.rpartition(":").first
-    self.objectid = "#{base_objectid}:#{id}"
-    if !valid?
-      base_objectid="#{objectid}_"
-      cnt=1
-      while !valid?
-        self.objectid = "#{base_objectid}#{cnt}"
-        cnt += 1
-      end
-    end
-
-  end
-
-  def objectid_format_compliance
-    if !objectid.valid?
-      errors.add :objectid, I18n.t("activerecord.errors.models.trident.invalid_object_id", type: self.class.object_id_key)
-    end
-  end
-
-  def uniq_objectid
-    # OPTIMIZEME
-    i = 0
-    baseobjectid = objectid
-    while self.class.exists?(:objectid => objectid)
-      i += 1
-      self.objectid = baseobjectid+"_"+i.to_s
-    end
-  end
-
-  def default_values
-    self.object_version ||= 1
-  end
-
-end
diff --git a/app/models/concerns/line_referential_support.rb b/app/models/concerns/line_referential_support.rb
index 406730ddb..5eade3557 100644
--- a/app/models/concerns/line_referential_support.rb
+++ b/app/models/concerns/line_referential_support.rb
@@ -3,6 +3,7 @@ module LineReferentialSupport
 
   included do
     belongs_to :line_referential
+    validates_presence_of :line_referential
     alias_method :referential, :line_referential
   end
 
diff --git a/app/models/concerns/object_id_format.rb b/app/models/concerns/object_id_format.rb
new file mode 100644
index 000000000..55b93ec81
--- /dev/null
+++ b/app/models/concerns/object_id_format.rb
@@ -0,0 +1,5 @@
+module ObjectIdFormat
+  def object_id_format
+    self.referential.object_id_format
+  end
+end
diff --git a/app/models/concerns/objectid_formatter_support.rb b/app/models/concerns/objectid_formatter_support.rb
new file mode 100644
index 000000000..34a51740f
--- /dev/null
+++ b/app/models/concerns/objectid_formatter_support.rb
@@ -0,0 +1,17 @@
+module ObjectidFormatterSupport
+  extend ActiveSupport::Concern
+
+  included do
+    extend Enumerize
+    enumerize :objectid_format, in: %w(netex stif_netex stif_reflex stif_codifligne), default: 'netex'
+    validates_presence_of :objectid_format
+    
+    def objectid_formatter
+      objectid_formatter_class.new
+    end
+
+    def objectid_formatter_class
+      "Chouette::ObjectidFormatter::#{read_attribute(:objectid_format).camelcase}".constantize if read_attribute(:objectid_format)
+    end
+  end
+end
diff --git a/app/models/concerns/objectid_support.rb b/app/models/concerns/objectid_support.rb
new file mode 100644
index 000000000..85b5da3a8
--- /dev/null
+++ b/app/models/concerns/objectid_support.rb
@@ -0,0 +1,30 @@
+module ObjectidSupport
+  extend ActiveSupport::Concern
+
+  included do
+    before_validation :before_validation_objectid, unless: Proc.new {|model| model.read_attribute(:objectid)}
+    after_commit :after_commit_objectid, on: :create, if: Proc.new {|model| model.read_attribute(:objectid).try(:include?, '__pending_id__')}
+    validates_presence_of :objectid
+    validates_uniqueness_of :objectid, skip_validation: Proc.new {|model| model.read_attribute(:objectid).nil?}
+
+    def before_validation_objectid
+      self.referential.objectid_formatter.before_validation self
+    end
+
+    def after_commit_objectid
+      self.referential.objectid_formatter.after_commit self
+    end
+
+    def get_objectid
+      self.referential.objectid_formatter.get_objectid read_attribute(:objectid) if self.referential.objectid_format && read_attribute(:objectid)
+    end
+
+    def objectid
+      get_objectid.try(:to_s)
+    end
+
+    def objectid_class
+      get_objectid.try(:class)
+    end
+  end
+end
+\ No newline at end of file
diff --git a/app/models/concerns/stif_codifligne_attributes_support.rb b/app/models/concerns/stif_codifligne_attributes_support.rb
deleted file mode 100644
index 0cd2cccc4..000000000
--- a/app/models/concerns/stif_codifligne_attributes_support.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-module StifCodifligneAttributesSupport
-  extend ActiveSupport::Concern
-
-  included do
-    validates_presence_of :objectid
-  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
-    Chouette::StifCodifligneObjectid.new read_attribute(:objectid)
-  end
-end
diff --git a/app/models/concerns/stif_netex_attributes_support.rb b/app/models/concerns/stif_netex_attributes_support.rb
deleted file mode 100644
index 076acf491..000000000
--- a/app/models/concerns/stif_netex_attributes_support.rb
+++ /dev/null
@@ -1,58 +0,0 @@
-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.code.underscore.parameterize
-  end
-
-  def boiv_id
-    'LOC'
-  end
-end
diff --git a/app/models/concerns/stif_reflex_attributes_support.rb b/app/models/concerns/stif_reflex_attributes_support.rb
deleted file mode 100644
index 9dfd21f94..000000000
--- a/app/models/concerns/stif_reflex_attributes_support.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-module StifReflexAttributesSupport
-  extend ActiveSupport::Concern
-
-  included do
-    validates_presence_of :objectid
-  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
-    Chouette::StifReflexObjectid.new read_attribute(:objectid)
-  end
-end
diff --git a/app/models/concerns/stop_area_referential_support.rb b/app/models/concerns/stop_area_referential_support.rb
index aa59cbd35..f29397b3a 100644
--- a/app/models/concerns/stop_area_referential_support.rb
+++ b/app/models/concerns/stop_area_referential_support.rb
@@ -3,6 +3,7 @@ module StopAreaReferentialSupport
 
   included do
     belongs_to :stop_area_referential
+    validates_presence_of :stop_area_referential
     alias_method :referential, :stop_area_referential
   end
 
diff --git a/app/models/line_referential.rb b/app/models/line_referential.rb
index 7ab892b53..15b2f6276 100644
--- a/app/models/line_referential.rb
+++ b/app/models/line_referential.rb
@@ -1,5 +1,6 @@
 class LineReferential < ActiveRecord::Base
-  include StifTransportModeEnumerations
+  include ObjectidFormatterSupport
+  extend StifTransportModeEnumerations
   
   has_many :line_referential_memberships
   has_many :organisations, through: :line_referential_memberships
diff --git a/app/models/referential.rb b/app/models/referential.rb
index fad91fa7f..ee74bd9f5 100644
--- a/app/models/referential.rb
+++ b/app/models/referential.rb
@@ -1,5 +1,6 @@
 class Referential < ActiveRecord::Base
   include DataFormatEnumerations
+  include ObjectidFormatterSupport
 
   validates_presence_of :name
   validates_presence_of :slug
@@ -11,8 +12,6 @@ class Referential < ActiveRecord::Base
 
   validates_uniqueness_of :slug
 
-  validates_presence_of :line_referential
-  validates_presence_of :stop_area_referential
   validates_format_of :slug, :with => %r{\A[a-z][0-9a-z_]+\Z}
   validates_format_of :prefix, :with => %r{\A[0-9a-zA-Z_]+\Z}
   validates_format_of :upper_corner, :with => %r{\A-?[0-9]+\.?[0-9]*\,-?[0-9]+\.?[0-9]*\Z}
@@ -55,6 +54,7 @@ class Referential < ActiveRecord::Base
 
   belongs_to :referential_suite
 
+
   scope :ready, -> { where(ready: true) }
   scope :in_periode, ->(periode) { where(id: referential_ids_in_periode(periode)) }
   scope :include_metadatas_lines, ->(line_ids) { where('referential_metadata.line_ids && ARRAY[?]::bigint[]', line_ids) }
diff --git a/app/models/route_control/unactivated_stop_points.rb b/app/models/route_control/unactivated_stop_point.rb
index a903fff53..3066bb523 100644
--- a/app/models/route_control/unactivated_stop_points.rb
+++ b/app/models/route_control/unactivated_stop_point.rb
@@ -1,5 +1,5 @@
 module RouteControl
-  class UnactivatedStopPoints < ComplianceControl
+  class UnactivatedStopPoint < ComplianceControl
 
     def self.default_code; "3-Route-10" end
   end
diff --git a/app/models/stop_area_referential.rb b/app/models/stop_area_referential.rb
index dd206f9e9..54e895cd0 100644
--- a/app/models/stop_area_referential.rb
+++ b/app/models/stop_area_referential.rb
@@ -1,4 +1,5 @@
 class StopAreaReferential < ActiveRecord::Base
+  include ObjectidFormatterSupport
   has_many :stop_area_referential_memberships
   has_many :organisations, through: :stop_area_referential_memberships
 
diff --git a/app/models/workbench.rb b/app/models/workbench.rb
index c304e8ba9..e36589210 100644
--- a/app/models/workbench.rb
+++ b/app/models/workbench.rb
@@ -1,4 +1,5 @@
 class Workbench < ActiveRecord::Base
+  include ObjectidFormatterSupport
   belongs_to :organisation
   belongs_to :line_referential
   belongs_to :stop_area_referential
diff --git a/app/policies/company_policy.rb b/app/policies/company_policy.rb
index 6106798be..45386aba4 100644
--- a/app/policies/company_policy.rb
+++ b/app/policies/company_policy.rb
@@ -1,7 +1,7 @@
 class CompanyPolicy < ApplicationPolicy
-  class Scope < Scope
-    def resolve
-      scope
+    class Scope < Scope
+      def resolve
+        scope
+      end
     end
   end
-end
diff --git a/app/policies/compliance_check_set_policy.rb b/app/policies/compliance_check_set_policy.rb
index 3f715649e..171a33347 100644
--- a/app/policies/compliance_check_set_policy.rb
+++ b/app/policies/compliance_check_set_policy.rb
@@ -4,4 +4,4 @@ class ComplianceCheckSetPolicy < ApplicationPolicy
       scope
     end
   end
-end
+end
+\ No newline at end of file
diff --git a/app/policies/journey_pattern_policy.rb b/app/policies/journey_pattern_policy.rb
index 507a364b6..12bcced17 100644
--- a/app/policies/journey_pattern_policy.rb
+++ b/app/policies/journey_pattern_policy.rb
@@ -18,4 +18,3 @@ class JourneyPatternPolicy < ApplicationPolicy
     !archived? && organisation_match? && user.has_permission?('journey_patterns.update')
   end
 end
-
diff --git a/app/views/api/v1/journey_patterns/show.rabl b/app/views/api/v1/journey_patterns/show.rabl
index 7c3af52fc..3ea1bb6ff 100644
--- a/app/views/api/v1/journey_patterns/show.rabl
+++ b/app/views/api/v1/journey_patterns/show.rabl
@@ -5,13 +5,6 @@ extends "api/v1/trident_objects/show"
   attributes attr, :unless => lambda { |m| m.send( attr).nil?}
 end
 
-node do |jp|
-  {
-    short_id: jp.objectid.parts.try(:third)
-  }
-
-end
-
 node(:route_short_description) do |journey_pattern|
   partial("api/v1/routes/short_description", :object => journey_pattern.route)
 end
diff --git a/app/views/api/v1/trident_objects/show.rabl b/app/views/api/v1/trident_objects/show.rabl
index e53a791ef..e58c0a866 100644
--- a/app/views/api/v1/trident_objects/show.rabl
+++ b/app/views/api/v1/trident_objects/show.rabl
@@ -3,3 +3,4 @@ attributes :objectid => :object_id
   attributes attr, :unless => lambda { |m| m.send( attr).nil?}
 end
 
+node { |model| {short_id: model.get_objectid.short_id} }
+\ No newline at end of file
diff --git a/app/views/autocomplete_time_tables/index.rabl b/app/views/autocomplete_time_tables/index.rabl
index 7aafdca16..b17411684 100644
--- a/app/views/autocomplete_time_tables/index.rabl
+++ b/app/views/autocomplete_time_tables/index.rabl
@@ -10,7 +10,7 @@ node do |time_table|
     :tags => time_table.tags.join(','),
     :color => time_table.color,
     :day_types => time_table.display_day_types,
-    :short_id => time_table.objectid.parts.try(:third),
-    :text => "<strong><span class='fa fa-circle' style='color:" + (time_table.color ? time_table.color : '#4b4b4b') + "'></span> " + time_table.comment + " - " + time_table.objectid.parts.try(:third) + "</strong><br/><small>" + time_table.display_day_types + "</small>"
+    :short_id => time_table.get_objectid.short_id,
+    :text => "<strong><span class='fa fa-circle' style='color:" + (time_table.color ? time_table.color : '#4b4b4b') + "'></span> " + time_table.comment + " - " + time_table.get_objectid.short_id + "</strong><br/><small>" + time_table.display_day_types + "</small>"
   }
 end
diff --git a/app/views/companies/index.html.slim b/app/views/companies/index.html.slim
index ba061f505..8fcadc370 100644
--- a/app/views/companies/index.html.slim
+++ b/app/views/companies/index.html.slim
@@ -27,7 +27,7 @@
             [ \
               TableBuilderHelper::Column.new( \
                 name: 'Oid', \
-                attribute: Proc.new { |n| n.try(:objectid).try(:local_id) }, \
+                attribute: Proc.new { |n| n.try(:get_objectid).try(:short_id) }, \
                 sortable: false \
               ), \
               TableBuilderHelper::Column.new( \
diff --git a/app/views/companies/show.html.slim b/app/views/companies/show.html.slim
index 668226938..4219595b8 100644
--- a/app/views/companies/show.html.slim
+++ b/app/views/companies/show.html.slim
@@ -23,7 +23,7 @@
     .row
       .col-lg-6.col-md-6.col-sm-12.col-xs-12
         = definition_list t('metadatas'),
-          { 'ID Codif' => @company.try(:objectid).try(:local_id),
+          { 'ID Codif' => @company.try(:get_objectid).try(:local_id),
             Chouette::Company.human_attribute_name(:phone) => @company.phone,
             Chouette::Company.human_attribute_name(:email) => @company.email,
             Chouette::Company.human_attribute_name(:url) => @company.url }
diff --git a/app/views/compliance_controls/_form.html.slim b/app/views/compliance_controls/_form.html.slim
index d342f120a..1bcfc093e 100644
--- a/app/views/compliance_controls/_form.html.slim
+++ b/app/views/compliance_controls/_form.html.slim
@@ -6,7 +6,7 @@
       = f.input :compliance_control_set_id, as: :hidden, input_html: { value: @compliance_control_set.id }
       = f.input :code
       = f.input :criticity
-      = f.association :compliance_control_block, collection: @compliance_control_set.compliance_control_blocks, label_method: lambda { |block| transport_mode(block.transport_mode, block.transport_submode) }
+      = f.association :compliance_control_block, collection: @compliance_control_set.compliance_control_blocks, label_method: lambda { |block| transport_mode_text(block) }
       = f.input :comment
       - f.object.class.dynamic_attributes.each do |attribute|
         - if attribute == :target
diff --git a/app/views/connection_links/_connection_link.slim b/app/views/connection_links/_connection_link.slim
index 2ece8ed44..44ed5093f 100644
--- a/app/views/connection_links/_connection_link.slim
+++ b/app/views/connection_links/_connection_link.slim
@@ -11,7 +11,7 @@
               span.fa.fa-trash-o
 
       h5
-        = link_to([@referential, connection_link], class: 'preview', title: "#{Chouette::ConnectionLink.model_name.human.capitalize} #{connection_link.name}") do
+        = link_to referential_connection_link_path(@referential, connection_link), class: 'preview', title: "#{Chouette::ConnectionLink.model_name.human.capitalize} #{connection_link.name}" do
           span.name
             = truncate(connection_link.name, :length => 20)
 
diff --git a/app/views/import_resources/index.html.slim b/app/views/import_resources/index.html.slim
index 849ed6d8d..57c83ce82 100644
--- a/app/views/import_resources/index.html.slim
+++ b/app/views/import_resources/index.html.slim
@@ -38,7 +38,7 @@
                 ), \
                 TableBuilderHelper::Column.new( \
                   name: 'Résultat des tests' , \
-                  attribute: Proc.new { |n| I18n.t('import_resources.index.metrics', n.metrics.deep_symbolize_keys) }, \
+                  attribute: Proc.new { |n| I18n.t('import_resources.index.metrics', import_resoruce_metrics(n.metrics) }, \
                   sortable: false, \
                 ), \
                 TableBuilderHelper::Column.new( \
diff --git a/app/views/imports/show.html.slim b/app/views/imports/show.html.slim
index 69ee44f9f..775b09e8b 100644
--- a/app/views/imports/show.html.slim
+++ b/app/views/imports/show.html.slim
@@ -58,7 +58,7 @@
           overhead: [ \
             {}, \
             { \
-              title: "#{@import.children_succeedeed} jeu de données validé sur #{@import.children.count} présents dans l'archive", \
+              title: "#{@import.children_succeedeed} jeu de données validé sur #{@import.children.count} présent(s) dans l'archive", \
               width: 1, \
               cls: "#{@import.import_status_css_class} full-border" \
             }, { \
diff --git a/app/views/lines/index.html.slim b/app/views/lines/index.html.slim
index 1fecae26d..911c95e0c 100644
--- a/app/views/lines/index.html.slim
+++ b/app/views/lines/index.html.slim
@@ -21,7 +21,7 @@
             [ \
               TableBuilderHelper::Column.new( \
                 name: t('id_codif'), \
-                attribute: Proc.new { |n| n.objectid.local_id }, \
+                attribute: Proc.new { |n| n.get_objectid.short_id }, \
                 sortable: false \
               ), \
               TableBuilderHelper::Column.new( \
diff --git a/app/views/lines/show.html.slim b/app/views/lines/show.html.slim
index d8f236ecc..ccf237154 100644
--- a/app/views/lines/show.html.slim
+++ b/app/views/lines/show.html.slim
@@ -21,7 +21,7 @@
     .row
       .col-lg-6.col-md-6.col-sm-12.col-xs-12
         = definition_list t('metadatas'),
-          {  'ID Codif' => @line.objectid.local_id,
+          {  'ID Codif' => @line.get_objectid.short_id,
              'Activé' => (@line.deactivated? ? t('false') : t('true')),
              @line.human_attribute_name(:network) => (@line.network.nil? ? t('lines.index.unset') : @line.network.name),
              @line.human_attribute_name(:company) => (@line.company.nil? ? t('lines.index.unset') : @line.company.name),
diff --git a/app/views/networks/index.html.slim b/app/views/networks/index.html.slim
index e498ea35f..6004f5859 100644
--- a/app/views/networks/index.html.slim
+++ b/app/views/networks/index.html.slim
@@ -27,7 +27,7 @@
             [ \
               TableBuilderHelper::Column.new( \
                 name: 'Oid', \
-                attribute: Proc.new { |n| n.try(:objectid).try(:local_id) }, \
+                attribute: Proc.new { |n| n.get_objectid.try(:short_id) }, \
                 sortable: false \
               ),
               TableBuilderHelper::Column.new( \
diff --git a/app/views/networks/show.html.slim b/app/views/networks/show.html.slim
index 9b2a0dbf8..89aa1e50a 100644
--- a/app/views/networks/show.html.slim
+++ b/app/views/networks/show.html.slim
@@ -21,4 +21,4 @@
     .row
       .col-lg-6.col-md-6.col-sm-12.col-xs-12
         = definition_list t('metadatas'),
-          { 'ID Codif' => @network.try(:objectid).try(:local_id) }
+          { 'ID Codif' => @network.try(:get_objectid).try(:short_id) }
diff --git a/app/views/referential_lines/show.html.slim b/app/views/referential_lines/show.html.slim
index 0ef548e89..7607c391b 100644
--- a/app/views/referential_lines/show.html.slim
+++ b/app/views/referential_lines/show.html.slim
@@ -21,7 +21,7 @@
     .row
       .col-lg-6.col-md-6.col-sm-12.col-xs-12
         = definition_list t('metadatas'),
-          {  t('id_codif') => @line.objectid.local_id,
+          {  t('id_codif') => @line.get_objectid.short_id,
              'Activé' => (@line.deactivated? ? t('false') : t('true')),
              @line.human_attribute_name(:network) => (@line.network.nil? ? t('lines.index.unset') : link_to(@line.network.name, [@referential, @line.network]) ),
              @line.human_attribute_name(:company) => (@line.company.nil? ? t('lines.index.unset') : link_to(@line.company.name, [@referential, @line.company]) ),
@@ -47,8 +47,8 @@
               = table_builder_2 @routes,
                 [ \
                   TableBuilderHelper::Column.new( \
-                    name: 'ID', \
-                    attribute: Proc.new { |n| n.objectid.short_id }, \
+                    name: 'Oid', \
+                    attribute: Proc.new { |n| n.get_objectid.short_id }, \
                     sortable: false \
                   ), \
                   TableBuilderHelper::Column.new( \
diff --git a/app/views/referential_networks/index.html.slim b/app/views/referential_networks/index.html.slim
index 038cb0949..6a2df6d16 100644
--- a/app/views/referential_networks/index.html.slim
+++ b/app/views/referential_networks/index.html.slim
@@ -27,7 +27,7 @@
             [ \
               TableBuilderHelper::Column.new( \
                 name: t('id_codif'), \
-                attribute: Proc.new { |n| n.try(:objectid).try(:local_id) }, \
+                attribute: Proc.new { |n| n.get_objectid.try(:short_id) }, \
                 sortable: false \
               ),
               TableBuilderHelper::Column.new( \
diff --git a/app/views/referential_networks/show.html.slim b/app/views/referential_networks/show.html.slim
index eab0cd51a..c2cc79e0d 100644
--- a/app/views/referential_networks/show.html.slim
+++ b/app/views/referential_networks/show.html.slim
@@ -21,4 +21,4 @@
     .row
       .col-lg-6.col-md-6.col-sm-12.col-xs-12
         = definition_list t('metadatas'),
-          { t('id_codif') => @network.try(:objectid).try(:local_id) }
+          { t('id_codif') => @network.try(:get_objectid).try(:local_id) }
diff --git a/app/views/referentials/show.html.slim b/app/views/referentials/show.html.slim
index b03fb9f53..0abeb0669 100644
--- a/app/views/referentials/show.html.slim
+++ b/app/views/referentials/show.html.slim
@@ -43,7 +43,7 @@
             [ \
               TableBuilderHelper::Column.new( \
                 name: t('id_codif'), \
-                attribute: Proc.new { |n| n.objectid.local_id }, \
+                attribute: Proc.new { |n| n.get_objectid.short_id }, \
                 sortable: false \
               ), \
               TableBuilderHelper::Column.new( \
diff --git a/app/views/routes/show.html.slim b/app/views/routes/show.html.slim
index 2829d6cb9..734d6ebf3 100644
--- a/app/views/routes/show.html.slim
+++ b/app/views/routes/show.html.slim
@@ -22,7 +22,7 @@
     .row
       .col-lg-6.col-md-6.col-sm-12.col-xs-12
         = definition_list t('metadatas'),
-          { t('objectid') => @route.objectid.short_id,
+          { t('objectid') => @route.get_objectid.short_id,
             t('activerecord.attributes.route.published_name') => (@route.published_name ? @route.published_name : '-'),
             @route.human_attribute_name(:wayback) => (@route.wayback ? @route.wayback_text : '-' ),
             @route.human_attribute_name(:opposite_route) => (@route.opposite_route ? @route.opposite_route.name : '-') }
diff --git a/app/views/routing_constraint_zones/index.html.slim b/app/views/routing_constraint_zones/index.html.slim
index ddad7723e..fcf904070 100644
--- a/app/views/routing_constraint_zones/index.html.slim
+++ b/app/views/routing_constraint_zones/index.html.slim
@@ -21,7 +21,7 @@
             [ \
               TableBuilderHelper::Column.new( \
                 name: 'ID', \
-                attribute: Proc.new { |n| n.try(:objectid).try(:local_id) }, \
+                attribute: Proc.new { |n| n.get_objectid.local_id }, \
                 sortable: false \
               ), \
               TableBuilderHelper::Column.new( \
diff --git a/app/views/stop_areas/index.html.slim b/app/views/stop_areas/index.html.slim
index 9de470939..1b28f411e 100644
--- a/app/views/stop_areas/index.html.slim
+++ b/app/views/stop_areas/index.html.slim
@@ -21,7 +21,7 @@
             [ \
               TableBuilderHelper::Column.new( \
                 name: t('id_reflex'), \
-                attribute: Proc.new { |n| n.try(:user_objectid) }, \
+                attribute: Proc.new { |n| n.get_objectid.try(:short_id) }, \
                 sortable: false \
               ), \
               TableBuilderHelper::Column.new( \
diff --git a/app/views/stop_areas/show.html.slim b/app/views/stop_areas/show.html.slim
index bc9cc2ac0..7f7c2e07f 100644
--- a/app/views/stop_areas/show.html.slim
+++ b/app/views/stop_areas/show.html.slim
@@ -19,9 +19,9 @@
     .row
       .col-lg-6.col-md-6.col-sm-12.col-xs-12
         = definition_list t('metadatas'),
-          { @stop_area.human_attribute_name(:stop_area_type) => t("area_types.label.#{@stop_area.stop_area_type}"),
+          { t('id_reflex') => @stop_area.get_objectid.short_id,
+            @stop_area.human_attribute_name(:stop_area_type) => t("area_types.label.#{@stop_area.stop_area_type}"),
             @stop_area.human_attribute_name(:registration_number) => @stop_area.registration_number,
-            t('id_reflex') => @stop_area.user_objectid,
             'Coordonnées' => geo_data(@stop_area, @stop_area_referential),
             @stop_area.human_attribute_name(:zip_code) => @stop_area.zip_code,
             @stop_area.human_attribute_name(:city_name) => @stop_area.city_name,
diff --git a/app/views/time_tables/index.html.slim b/app/views/time_tables/index.html.slim
index b0f4e84c5..edbf89c43 100644
--- a/app/views/time_tables/index.html.slim
+++ b/app/views/time_tables/index.html.slim
@@ -19,7 +19,7 @@
             [ \
               TableBuilderHelper::Column.new( \
                 name: 'ID', \
-                attribute: Proc.new { |n| n.objectid.short_id}, \
+                attribute: Proc.new { |n| n.get_objectid.short_id}, \
                 sortable: false \
               ), \
               TableBuilderHelper::Column.new( \
diff --git a/app/views/time_tables/show.rabl b/app/views/time_tables/show.rabl
index 53c9daec0..55744bf8c 100644
--- a/app/views/time_tables/show.rabl
+++ b/app/views/time_tables/show.rabl
@@ -10,7 +10,7 @@ node do |tt|
     periode_range: month_periode_enum(3),
     current_periode_range: Date.today.beginning_of_month,
     color: tt.color ? tt.color : '',
-    short_id: tt.objectid.parts.try(:third)
+    short_id: tt.get_objectid.short_id
   }
 end
 
diff --git a/app/views/vehicle_journeys/show.rabl b/app/views/vehicle_journeys/show.rabl
index fce16dfb3..830dee8bd 100644
--- a/app/views/vehicle_journeys/show.rabl
+++ b/app/views/vehicle_journeys/show.rabl
@@ -4,6 +4,8 @@ object @vehicle_journey
   attributes attr, :unless => lambda { |m| m.send( attr).nil?}
 end
 
+node { |vj| {short_id: vj.get_objectid.short_id} }
+
 child(:company) do |company|
   attributes :id, :objectid, :name
 end
@@ -16,6 +18,7 @@ end
 
 child(:journey_pattern) do |journey_pattern|
   attributes :id, :objectid, :name, :published_name
+  node(:short_id) {journey_pattern.get_objectid.short_id}
 end
 
 child(:time_tables, :object_root => false) do |time_tables|
diff --git a/bin/bundle b/bin/bundle
deleted file mode 100755
index 66e9889e8..000000000
--- a/bin/bundle
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env ruby
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
-load Gem.bin_path('bundler', 'bundle')
diff --git a/bin/setup b/bin/setup
deleted file mode 100755
index acdb2c138..000000000
--- a/bin/setup
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/usr/bin/env ruby
-require 'pathname'
-
-# path to your application root.
-APP_ROOT = Pathname.new File.expand_path('../../',  __FILE__)
-
-Dir.chdir APP_ROOT do
-  # This script is a starting point to setup your application.
-  # Add necessary setup steps to this file:
-
-  puts "== Installing dependencies =="
-  system "gem install bundler --conservative"
-  system "bundle check || bundle install"
-
-  # puts "\n== Copying sample files =="
-  # unless File.exist?("config/database.yml")
-  #   system "cp config/database.yml.sample config/database.yml"
-  # end
-
-  puts "\n== Preparing database =="
-  system "bin/rake db:setup"
-
-  puts "\n== Removing old logs and tempfiles =="
-  system "rm -f log/*"
-  system "rm -rf tmp/cache"
-
-  puts "\n== Restarting application server =="
-  system "touch tmp/restart.txt"
-end
diff --git a/config/initializers/apartment.rb b/config/initializers/apartment.rb
index 87bca0b45..69204a5d7 100644
--- a/config/initializers/apartment.rb
+++ b/config/initializers/apartment.rb
@@ -61,7 +61,7 @@ Apartment.configure do |config|
     'RouteControl::OppositeRouteTerminus',
     'RouteControl::OppositeRoute',
     'RouteControl::StopPointsInJourneyPattern',
-    'RouteControl::UnactivatedStopPoints',
+    'RouteControl::UnactivatedStopPoint',
     'RouteControl::ZDLStopArea',
     'RoutingConstraintZoneControl::MaximumLength',
     'RoutingConstraintZoneControl::MinimumLength',
diff --git a/config/initializers/stif.rb b/config/initializers/stif.rb
index ad2ea6ed3..eb918131b 100644
--- a/config/initializers/stif.rb
+++ b/config/initializers/stif.rb
@@ -6,6 +6,7 @@ Rails.application.config.to_prepare do
     organisation.workbenches.find_or_create_by(name: "Gestion de l'offre") do |workbench|
       workbench.line_referential      = line_referential
       workbench.stop_area_referential = stop_area_referential
+      workbench.objectid_format = Workbench.objectid_format.stif_netex
 
       Rails.logger.debug "Create Workbench for #{organisation.name}"
     end
diff --git a/config/locales/compliance_controls.en.yml b/config/locales/compliance_controls.en.yml
index 9615bbf69..0c476a46d 100644
--- a/config/locales/compliance_controls.en.yml
+++ b/config/locales/compliance_controls.en.yml
@@ -160,7 +160,7 @@ en:
         one: "A route must have at least 2 stop points"
       route_control/omnibus_journey_pattern:
         one: "A journey pattern of a route should connect all of a route's stop points"
-      route_control/unactivated_stop_points:
+      route_control/unactivated_stop_point:
         one: "Route and unactivated stop point"
       route_control/stop_points_in_journey_pattern:
         one: "The stop points of a route must be used by at least one journey pattern"
diff --git a/config/locales/compliance_controls.fr.yml b/config/locales/compliance_controls.fr.yml
index e23f879f5..70227b01f 100644
--- a/config/locales/compliance_controls.fr.yml
+++ b/config/locales/compliance_controls.fr.yml
@@ -106,7 +106,7 @@ fr:
         3_vehiclejourney_5_1: "La course %{source_objectid} a un horaire d'arrivé %{error_value} supérieur à l'horaire de départ %{reference_value} à l'arrêt %{target_0_label} (%{target_0_objectid})"
         3_vehiclejourney_5_2: "La course %{source_objectid} a un horaire de départ %{error_value} à l'arrêt %{target_0_label} (%{target_0_objectid}) supérieur à l'horaire d'arrivé % à l'arrêt suivant"
       description: "L'horaire d'arrivée à un arrêt doit être antérieur à l'horaire de départ de cet arrêt ET les horaires de départ aux arrêts doivent être dans l'ordre chronologique croissant."
-    routing_constraint_zone_control/vehicle_journey_at_stops:
+    routing_constraint_zone_control/unactivated_stop_point:
       messages:
         3_routingconstraint_1: "L'ITL %{source_objectid} référence un arrêt (ZDEp) désactivé %{target_0_label} (%{target_0_objectid})"
       description: "Les arrêts d'une ITL ne doivent pas être désactivés"
@@ -159,7 +159,7 @@ fr:
         one: "Un itinéraire doit contenir au moins 2 arrêts"
       route_control/omnibus_journey_pattern:
         one: "Existence d’une mission passant par tous les arrêts de l'itinéraire"
-      route_control/unactivated_stop_points:
+      route_control/unactivated_stop_point:
         one: "Itinéraire & arrêt désactivé"
       route_control/stop_points_in_journey_pattern:
         one: "Utilisation des arrêts par les missions"
diff --git a/config/locales/import_messages.en.yml b/config/locales/import_messages.en.yml
index bf6b45020..42d180abd 100644
--- a/config/locales/import_messages.en.yml
+++ b/config/locales/import_messages.en.yml
@@ -3,7 +3,7 @@ en:
     compliance_check_messages:
       corrupt_zip_file: "The zip file %{source_filename} is corrupted and cannot be read"
       inconsistent_zip_file: "The zip file %{source_filename} contains unexpected directories: %{spurious_dirs}, which are ignored"
-      referential_creation: "Le référentiel n'a pas pu être créé car un référentiel existe déjà sur les même périodes et lignes"
+      referential_creation: "Le référentiel n'a pas pu être créé car un référentiel existe déjà sur les mêmes périodes et lignes"
       1_netexstif_2: "Le fichier %{source_filename} ne respecte pas la syntaxe XML ou la XSD NeTEx : erreur '%{error_value}' rencontré"
       1_netexstif_5: "%{source_filename}-Ligne %{source_line_number}-Colonne %{source_column_number} : l'objet %{source_label} d'identifiant %{source_objectid} a une date de mise à jour dans le futur"
       2_netexstif_1_1: "Le fichier commun.xml ne contient pas de frame nommée NETEX_COMMUN"
diff --git a/config/locales/import_messages.fr.yml b/config/locales/import_messages.fr.yml
index 7d3bbf23b..e29da05f9 100644
--- a/config/locales/import_messages.fr.yml
+++ b/config/locales/import_messages.fr.yml
@@ -3,7 +3,7 @@ fr:
     compliance_check_messages:
       corrupt_zip_file: "Le fichier zip %{source_filename} est corrompu, et ne peut être lu"
       inconsistent_zip_file: "Le fichier zip %{source_filename} contient des repertoires non prévus : %{spurious_dirs} qui seront ignorés"
-      referential_creation: "Le référentiel n'a pas pu être créé car un référentiel existe déjà sur les même périodes et lignes"
+      referential_creation: "Le référentiel n'a pas pu être créé car un référentiel existe déjà sur les mêmes périodes et lignes"
       1_netexstif_2: "Le fichier %{source_filename} ne respecte pas la syntaxe XML ou la XSD NeTEx : erreur '%{error_value}' rencontré"
       1_netexstif_5: "%{source_filename}-Ligne %{source_line_number}-Colonne %{source_column_number} : l'objet %{source_label} d'identifiant %{source_objectid} a une date de mise à jour dans le futur"
       2_netexstif_1_1: "Le fichier commun.xml ne contient pas de frame nommée NETEX_COMMUN"
diff --git a/config/locales/import_resources.en.yml b/config/locales/import_resources.en.yml
index d98b3eacf..5f0f3213e 100644
--- a/config/locales/import_resources.en.yml
+++ b/config/locales/import_resources.en.yml
@@ -2,7 +2,7 @@ en:
   import_resources:
     index:
       title: "NeTEx conformity"
-      table_state: "%{lines_imported} lines imported on %{lines_in_zipfile} presents in zipfile"
+      table_state: "%{lines_imported} line(s) imported on %{lines_in_zipfile} presents in zipfile"
       table_title: "Satus of anlyzed files"
       table_explanation: "When calendriers.xml and/or commun.xml are not imported, then all lines file are not processed."
       metrics: "%{ok_count} ok, %{error_count} errors, %{warning_count} warnings, %{uncheck_count} n/a"
diff --git a/config/locales/import_resources.fr.yml b/config/locales/import_resources.fr.yml
index 86c8d8e73..a271ae1ca 100644
--- a/config/locales/import_resources.fr.yml
+++ b/config/locales/import_resources.fr.yml
@@ -2,7 +2,7 @@ fr:
   import_resources:
     index:
       title: "Rapport de conformité NeTEx"
-      table_state: "%{lines_imported} lignes importées sur %{lines_in_zipfile} présentes dans l'archive"
+      table_state: "%{lines_imported} ligne(s) importée(s) sur %{lines_in_zipfile} présente(s) dans l'archive"
       table_title: "Etat des fichiers analysés"
       table_explanation: "Dans le cas ou le(s) fichiers calendriers.xml et/ou commun.xml sont dans un état non importé, alors tous les fichiers lignes sont automatiquement dans un état non traité."
       metrics: "%{ok_count} ok, %{error_count} errors, %{warning_count} warnings, %{uncheck_count} n/a"
diff --git a/db/migrate/20171109100955_add_object_id_format_to_workbenches.rb b/db/migrate/20171109100955_add_object_id_format_to_workbenches.rb
new file mode 100644
index 000000000..0e5e57643
--- /dev/null
+++ b/db/migrate/20171109100955_add_object_id_format_to_workbenches.rb
@@ -0,0 +1,5 @@
+class AddObjectIdFormatToWorkbenches < ActiveRecord::Migration
+  def change
+    add_column :workbenches, :objectid_format, :string
+  end
+end
diff --git a/db/migrate/20171109101523_add_object_id_format_to_referential.rb b/db/migrate/20171109101523_add_object_id_format_to_referential.rb
new file mode 100644
index 000000000..fed630b75
--- /dev/null
+++ b/db/migrate/20171109101523_add_object_id_format_to_referential.rb
@@ -0,0 +1,5 @@
+class AddObjectIdFormatToReferential < ActiveRecord::Migration
+  def change
+    add_column :referentials, :objectid_format, :string
+  end
+end
diff --git a/db/migrate/20171109101545_add_object_id_format_to_line_referential.rb b/db/migrate/20171109101545_add_object_id_format_to_line_referential.rb
new file mode 100644
index 000000000..5d2fc9f4f
--- /dev/null
+++ b/db/migrate/20171109101545_add_object_id_format_to_line_referential.rb
@@ -0,0 +1,5 @@
+class AddObjectIdFormatToLineReferential < ActiveRecord::Migration
+  def change
+    add_column :line_referentials, :objectid_format, :string
+  end
+end
diff --git a/db/migrate/20171109101605_add_object_id_format_to_stop_area_referential.rb b/db/migrate/20171109101605_add_object_id_format_to_stop_area_referential.rb
new file mode 100644
index 000000000..ffa77e2ed
--- /dev/null
+++ b/db/migrate/20171109101605_add_object_id_format_to_stop_area_referential.rb
@@ -0,0 +1,5 @@
+class AddObjectIdFormatToStopAreaReferential < ActiveRecord::Migration
+  def change
+    add_column :stop_area_referentials, :objectid_format, :string
+  end
+end
diff --git a/db/migrate/20171123110204_update_objectid_format_value_to_referentials.rb b/db/migrate/20171123110204_update_objectid_format_value_to_referentials.rb
new file mode 100644
index 000000000..c85a63b6e
--- /dev/null
+++ b/db/migrate/20171123110204_update_objectid_format_value_to_referentials.rb
@@ -0,0 +1,14 @@
+class UpdateObjectidFormatValueToReferentials < ActiveRecord::Migration
+  # Migration in the context of the STIF
+  # Not a definitive choice since it cannot be used for Chouette
+  def up
+    Workbench.update_all(objectid_format: 'stif_netex')
+    Referential.update_all(objectid_format: 'stif_netex')
+    LineReferential.update_all(objectid_format: 'stif_codifligne')
+    StopAreaReferential.update_all(objectid_format: 'stif_reflex')
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 48efa912e..349d8e5eb 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20171114102438) do
+ActiveRecord::Schema.define(version: 20171123110204) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
diff --git a/db/seeds.rb b/db/seeds/chouette.seeds.rb
index 1cbdb584d..1cbdb584d 100644
--- a/db/seeds.rb
+++ b/db/seeds/chouette.seeds.rb
diff --git a/db/seeds/stif.seeds.rb b/db/seeds/stif.seeds.rb
new file mode 100644
index 000000000..464601557
--- /dev/null
+++ b/db/seeds/stif.seeds.rb
@@ -0,0 +1,38 @@
+# coding: utf-8
+# This file should contain all the record creation needed to seed the database with its default values.
+# The data can then be loaded with the rake db:seed (or created alongside the db with db:setup).
+
+stop_area_referential = StopAreaReferential.find_or_create_by!(name: "Reflex", objectid_format: "stif_netex")
+line_referential = LineReferential.find_or_create_by!(name: "CodifLigne", objectid_format: "stif_netex")
+
+# Organisations
+stif = Organisation.find_or_create_by!(code: "STIF") do |org|
+  org.name = 'STIF'
+end
+operator = Organisation.find_or_create_by!(code: 'transporteur-a') do |organisation|
+  organisation.name = "Transporteur A"
+end
+
+# Member
+line_referential.add_member stif, owner: true
+line_referential.add_member operator
+
+stop_area_referential.add_member stif, owner: true
+stop_area_referential.add_member operator
+
+# Users
+stif.users.find_or_create_by!(username: "admin") do |user|
+  user.email = 'stif-boiv@af83.com'
+  user.password = "secret"
+  user.name = "STIF Administrateur"
+end
+
+operator.users.find_or_create_by!(username: "transporteur") do |user|
+  user.email = 'stif-boiv+transporteur@af83.com'
+  user.password = "secret"
+  user.name = "Martin Lejeune"
+end
+
+# Include all Lines in organisation functional_scope
+stif.update sso_attributes: { functional_scope: line_referential.lines.pluck(:objectid) }
+operator.update sso_attributes: { functional_scope: line_referential.lines.limit(3).pluck(:objectid) }
diff --git a/lib/stif/reflex_synchronization.rb b/lib/stif/reflex_synchronization.rb
index a3bf3957e..39a92bd1f 100644
--- a/lib/stif/reflex_synchronization.rb
+++ b/lib/stif/reflex_synchronization.rb
@@ -150,9 +150,8 @@ module Stif
       end
 
       def create_or_update_stop_area entry
-        stop = Chouette::StopArea.find_or_create_by(objectid: entry['id'])
+        stop = Chouette::StopArea.find_or_create_by(objectid: entry['id'], stop_area_referential: self.defaut_referential )
         stop.deleted_at            = nil
-        stop.stop_area_referential = self.defaut_referential
         {
           :comment        => 'Description',
           :name           => 'Name',
diff --git a/spec/controllers/routes_controller_spec.rb b/spec/controllers/routes_controller_spec.rb
index fb29c8d73..f8e8697ec 100644
--- a/spec/controllers/routes_controller_spec.rb
+++ b/spec/controllers/routes_controller_spec.rb
@@ -1,5 +1,3 @@
-Route = Chouette::Route
-
 RSpec.describe RoutesController, type: :controller do
   login_user
 
@@ -87,10 +85,10 @@ RSpec.describe RoutesController, type: :controller do
           referential_id: route.line.line_referential_id,
           line_id: route.line_id,
           id: route.id
-      end.to change { Route.count }.by(1)
+      end.to change { Chouette::Route.count }.by(1)
 
-      expect(Route.last.name).to eq( I18n.t('activerecord.copy', name: route.name))
-      expect(Route.last.published_name).to eq(route.published_name)
+      expect(Chouette::Route.last.name).to eq(I18n.t('activerecord.copy', name: route.name))
+      expect(Chouette::Route.last.published_name).to eq(route.published_name)
     end
   end
 end
diff --git a/spec/decorators/company_decorator_spec.rb b/spec/decorators/company_decorator_spec.rb
index a1df03449..557d98da1 100644
--- a/spec/decorators/company_decorator_spec.rb
+++ b/spec/decorators/company_decorator_spec.rb
@@ -1,2 +1,2 @@
-describe CompanyDecorator do
+describe Chouette::CompanyDecorator do
 end
diff --git a/spec/fabricators/user_fabricator.rb b/spec/fabricators/user_fabricator.rb
index 04c1c6279..62eb82d51 100644
--- a/spec/fabricators/user_fabricator.rb
+++ b/spec/fabricators/user_fabricator.rb
@@ -5,4 +5,4 @@ Fabricator :user do
   password { 'password' }
 
   username { "#{FFaker::Name.first_name.parameterize}.#{FFaker::Name.last_name.parameterize}" }
-end
-\ No newline at end of file
+end
diff --git a/spec/factories/chouette_lines.rb b/spec/factories/chouette_lines.rb
index 423ab99f2..95f760174 100644
--- a/spec/factories/chouette_lines.rb
+++ b/spec/factories/chouette_lines.rb
@@ -8,7 +8,7 @@ FactoryGirl.define do
 
     association :network, :factory => :network
     association :company, :factory => :company
-
+   
     before(:create) do |line|
       line.line_referential ||= LineReferential.find_by! name: "first"
     end
@@ -44,6 +44,11 @@ FactoryGirl.define do
 
     end
 
+    factory :line_with_after_commit do |line|
+      line.run_callbacks(:commit)
+
+    end
+
   end
 
 end
diff --git a/spec/factories/chouette_routes.rb b/spec/factories/chouette_routes.rb
index 4986ab70e..4e20059fe 100644
--- a/spec/factories/chouette_routes.rb
+++ b/spec/factories/chouette_routes.rb
@@ -33,6 +33,13 @@ FactoryGirl.define do
       end
     end
 
+    factory :route_with_after_commit do
+      sequence(:objectid) {nil}
+      after(:create) do |route|
+        route.run_callbacks(:commit)
+      end
+    end
+
   end
 
 end
diff --git a/spec/factories/compliance_controls/route_control_factories.rb b/spec/factories/compliance_controls/route_control_factories.rb
index 1462ca635..35d8f481f 100644
--- a/spec/factories/compliance_controls/route_control_factories.rb
+++ b/spec/factories/compliance_controls/route_control_factories.rb
@@ -28,7 +28,7 @@ FactoryGirl.define do
     association :compliance_control_set
   end
 
-  factory :route_control_unactivated_stop_points, class: 'RouteControl::UnactivatedStopPoints' do
+  factory :route_control_unactivated_stop_point, class: 'RouteControl::UnactivatedStopPoint' do
     association :compliance_control_set
   end
 
diff --git a/spec/factories/line_referentials.rb b/spec/factories/line_referentials.rb
index cfce1399f..e9e6dce5a 100644
--- a/spec/factories/line_referentials.rb
+++ b/spec/factories/line_referentials.rb
@@ -1,5 +1,6 @@
 FactoryGirl.define do
   factory :line_referential do
     sequence(:name) { |n| "Line Referential #{n}" }
+    objectid_format 'stif_codifligne'
   end
 end
diff --git a/spec/factories/referentials.rb b/spec/factories/referentials.rb
index a4155d181..0276a47be 100644
--- a/spec/factories/referentials.rb
+++ b/spec/factories/referentials.rb
@@ -8,6 +8,7 @@ FactoryGirl.define do
     association :organisation
     time_zone "Europe/Paris"
     ready { true }
+    objectid_format "stif_netex"
 
     factory :workbench_referential do
       association :workbench
diff --git a/spec/factories/stop_area_referentials.rb b/spec/factories/stop_area_referentials.rb
index c88819010..fcba996e4 100644
--- a/spec/factories/stop_area_referentials.rb
+++ b/spec/factories/stop_area_referentials.rb
@@ -1,5 +1,6 @@
 FactoryGirl.define do
   factory :stop_area_referential, :class => StopAreaReferential do
     sequence(:name) { |n| "StopArea Referential #{n}" }
+    objectid_format 'stif_reflex'
   end
 end
diff --git a/spec/factories/workbenches.rb b/spec/factories/workbenches.rb
index 57bef2203..0f26559d8 100644
--- a/spec/factories/workbenches.rb
+++ b/spec/factories/workbenches.rb
@@ -1,6 +1,7 @@
 FactoryGirl.define do
   factory :workbench do
     name "Gestion de l'offre"
+    objectid_format 'stif_netex'
 
     association :organisation
     association :line_referential
diff --git a/spec/helpers/table_builder_helper_spec.rb b/spec/helpers/table_builder_helper_spec.rb
index a8854bf97..3b0a18379 100644
--- a/spec/helpers/table_builder_helper_spec.rb
+++ b/spec/helpers/table_builder_helper_spec.rb
@@ -214,7 +214,7 @@ describe TableBuilderHelper, type: :helper do
     </thead>
     <tbody>
         <tr>
-            <td>#{company.objectid.local_id}</td>
+            <td>#{company.get_objectid.local_id}</td>
             <td title="Voir"><a href="/referentials/#{referential.id}/companies/#{company.id}">#{company.name}</a></td>
             <td></td>
             <td></td>
@@ -237,7 +237,7 @@ describe TableBuilderHelper, type: :helper do
         [
           TableBuilderHelper::Column.new(
             name: 'ID Codif',
-            attribute: Proc.new { |n| n.try(:objectid).try(:local_id) },
+            attribute: Proc.new { |n| n.try(:get_objectid).try(:local_id) },
             sortable: false
           ),
           TableBuilderHelper::Column.new(
@@ -327,7 +327,7 @@ describe TableBuilderHelper, type: :helper do
     </thead>
     <tbody>
         <tr>
-            <td>#{company.objectid.local_id}</td>
+            <td>#{company.get_objectid.local_id}</td>
             <td title="Voir"><a href="/referentials/#{referential.id}/companies/#{company.id}">#{company.name}</a></td>
             <td></td>
             <td></td>
@@ -350,7 +350,7 @@ describe TableBuilderHelper, type: :helper do
         [
           TableBuilderHelper::Column.new(
             name: 'ID Codif',
-            attribute: Proc.new { |n| n.try(:objectid).try(:local_id) }
+            attribute: Proc.new { |n| n.try(:get_objectid).try(:local_id) }
           ),
           TableBuilderHelper::Column.new(
             key: :name,
diff --git a/spec/models/chouette/access_link_spec.rb b/spec/models/chouette/access_link_spec.rb
index 5a31b8f0c..d0f351480 100644
--- a/spec/models/chouette/access_link_spec.rb
+++ b/spec/models/chouette/access_link_spec.rb
@@ -5,9 +5,9 @@ describe Chouette::AccessLink, :type => :model do
 
   it { is_expected.to validate_uniqueness_of :objectid }
 
-  describe '#objectid' do
-    subject { super().objectid }
-    it { is_expected.to be_kind_of(Chouette::StifNetexObjectid) }
+   describe '#get_objectid' do
+    subject { super().get_objectid }
+    it {is_expected.to be_kind_of(Chouette::Objectid::StifNetex)}
   end
 
   it { is_expected.to validate_presence_of :name }
diff --git a/spec/models/chouette/access_point_spec.rb b/spec/models/chouette/access_point_spec.rb
index e0f4b1501..a6798ec3b 100644
--- a/spec/models/chouette/access_point_spec.rb
+++ b/spec/models/chouette/access_point_spec.rb
@@ -4,8 +4,9 @@ describe Chouette::AccessPoint, :type => :model do
   subject { create(:access_point) }
 
   describe '#objectid' do
-    subject { super().objectid }
-    it { is_expected.to be_kind_of(Chouette::StifReflexObjectid) }
+    it "should have the same class as stop_area objectid" do
+      expect(subject.objectid.class).to eq(subject.stop_area.objectid.class)
+    end
   end
 
   it { is_expected.to validate_presence_of :name }
diff --git a/spec/models/chouette/connection_link_spec.rb b/spec/models/chouette/connection_link_spec.rb
index 57eb7d66c..04c15b42e 100644
--- a/spec/models/chouette/connection_link_spec.rb
+++ b/spec/models/chouette/connection_link_spec.rb
@@ -9,9 +9,9 @@ describe Chouette::ConnectionLink, :type => :model do
 
   it { is_expected.to validate_uniqueness_of :objectid }
 
-  describe '#objectid' do
-    subject { super().objectid }
-    it { is_expected.to be_kind_of(Chouette::StifNetexObjectid) }
+  describe '#get_objectid' do
+    subject { super().get_objectid }
+    it {is_expected.to be_kind_of(Chouette::Objectid::StifNetex)}
   end
 
   it { is_expected.to validate_presence_of :name }
diff --git a/spec/models/chouette/line_spec.rb b/spec/models/chouette/line_spec.rb
index 2e5882012..bc7b6e0c7 100644
--- a/spec/models/chouette/line_spec.rb
+++ b/spec/models/chouette/line_spec.rb
@@ -10,16 +10,11 @@ describe Chouette::Line, :type => :model do
 
   describe '#display_name' do
     it 'should display local_id, number, name and company name' do
-      display_name = "#{subject.objectid.local_id} - #{subject.number} - #{subject.name} - #{subject.company.try(:name)}"
+      display_name = "#{subject.get_objectid.local_id} - #{subject.number} - #{subject.name} - #{subject.company.try(:name)}"
       expect(subject.display_name).to eq(display_name)
     end
   end
 
-  describe '#objectid' do
-    subject { super().objectid }
-    it { is_expected.to be_kind_of(Chouette::StifCodifligneObjectid) }
-  end
-
   # it { should validate_numericality_of :objectversion }
 
   # describe ".last_stop_areas_parents" do
diff --git a/spec/models/chouette/object_id_spec.rb b/spec/models/chouette/object_id_spec.rb
deleted file mode 100644
index dd8b66388..000000000
--- a/spec/models/chouette/object_id_spec.rb
+++ /dev/null
@@ -1,149 +0,0 @@
-require 'spec_helper'
-
-describe Chouette::ObjectId, :type => :model do
-
-  def objectid(value = "abc:StopArea:abc123")
-    Chouette::ObjectId.new value
-  end
-
-  subject { objectid }
-
-  context "when invalid" do
-
-    subject { objectid("abc") }
-
-    it { is_expected.not_to be_valid }
-
-    describe '#parts' do
-      subject { super().parts }
-      it { is_expected.to be_nil }
-    end
-
-    describe '#system_id' do
-      subject { super().system_id }
-      it { is_expected.to be_nil }
-    end
-
-  end
-  
-  context "when with spaces in last part" do
-
-    subject { objectid("abc:Line:Aze toto") }
-
-    it { is_expected.not_to be_valid }
-
-
-  end
-  
-  context "when with spaces in first part" do
-
-    subject { objectid("ae abc:Line:Aze") }
-
-    it { is_expected.not_to be_valid }
-
-
-  end
-  
-  context "when with spaces in middle part" do
-
-    subject { objectid("aeabc:Li ne:Aze") }
-
-    it { is_expected.not_to be_valid }
-    
-
-  end
-  
-  context "when invalid in first part" do
-
-    subject { objectid("Abc_+19:Line:Abc") }
-
-    it { is_expected.not_to be_valid }
-  end
-  
-  context "when invalid in middle part" do
-
-    subject { objectid("Abc_19:Li56ne:Abc") }
-
-    it { is_expected.not_to be_valid }
-  end
-
-  context "when invalid in last part" do
-
-    subject { objectid("Abc_19:Line:Ab+c") }
-
-    it { is_expected.not_to be_valid }
-  end
-  context "when valid" do
-
-    subject { objectid("Abc_19:Line:Abc_12-") }
-
-    it { is_expected.to be_valid }
-  end
-
-  describe "#parts" do
-
-    it "should be the 3 parts of the ObjectId" do
-      expect(objectid("abc:StopArea:abc123").parts).to eq(%w{abc StopArea abc123})
-    end
-
-  end
-
-  describe "#system_id" do
-    
-    it "should be the first ObjectId parts" do
-      expect(objectid("first:second:third").system_id).to eq("first")
-    end
-
-  end
-
-  describe "#object_type" do
-    
-    it "should be the second ObjectId parts" do
-      expect(objectid("first:second:third").object_type).to eq("second")
-    end
-
-  end
-
-  describe "#local_id" do
-    
-    it "should be the third ObjectId parts" do
-      expect(objectid("first:second:third").local_id).to eq("third")
-    end
-
-  end
-
-  it "should be valid when parts are found" do
-    allow(subject).to receive_messages :parts => "dummy"
-    expect(subject).to be_valid
-  end
-
-  describe ".create" do
-
-    let(:given_system_id) { "systemId" }
-    let(:given_object_type) { "objectType" }
-    let(:given_local_id) { "localId" }
-
-    subject { Chouette::ObjectId.create(given_system_id, given_object_type, given_local_id) }
-
-    it "should return ObjectId attributes" do
-      expect(subject.send(:system_id)).to eq(given_system_id)
-      expect(subject.send(:object_type)).to eq(given_object_type)
-      expect(subject.send(:local_id)).to eq(given_local_id)
-    end
-
-  end
-
-  describe ".new" do
-    
-    it "should return an existing ObjectId" do
-      expect(Chouette::ObjectId.new(objectid)).to eq(objectid)
-    end
-
-    it "should create an empty ObjectId with nil" do
-      expect(Chouette::ObjectId.new(nil)).to be_empty
-    end
-
-  end
-
-
-end
diff --git a/spec/models/chouette/objectid/netex_spec.rb b/spec/models/chouette/objectid/netex_spec.rb
new file mode 100644
index 000000000..3aee13624
--- /dev/null
+++ b/spec/models/chouette/objectid/netex_spec.rb
@@ -0,0 +1,10 @@
+require 'spec_helper'
+
+describe Chouette::Objectid::Netex, :type => :model do
+  subject { Chouette::Objectid::Netex.new(object_type: 'Route', local_id: SecureRandom.uuid) }
+  it { should validate_presence_of :provider_id }
+  it { should validate_presence_of :object_type }
+  it { should validate_presence_of :local_id }
+  it { should validate_presence_of :creation_id }
+  it { is_expected.to be_valid }
+end
+\ No newline at end of file
diff --git a/spec/models/chouette/objectid/stif_codifligne_spec.rb b/spec/models/chouette/objectid/stif_codifligne_spec.rb
new file mode 100644
index 000000000..533af3556
--- /dev/null
+++ b/spec/models/chouette/objectid/stif_codifligne_spec.rb
@@ -0,0 +1,10 @@
+require 'spec_helper'
+
+describe Chouette::Objectid::StifCodifligne, :type => :model do
+  subject { Chouette::Objectid::StifCodifligne.new(object_type: 'Line', local_id: 'C02008', sync_id: 'CODIFLIGNE', provider_id: 'STIF') }
+  it { should validate_presence_of :provider_id }
+  it { should validate_presence_of :object_type }
+  it { should validate_presence_of :local_id }
+  it { should validate_presence_of :sync_id }
+  it { is_expected.to be_valid }
+end
+\ No newline at end of file
diff --git a/spec/models/chouette/objectid/stif_netex_spec.rb b/spec/models/chouette/objectid/stif_netex_spec.rb
new file mode 100644
index 000000000..1d361ca86
--- /dev/null
+++ b/spec/models/chouette/objectid/stif_netex_spec.rb
@@ -0,0 +1,10 @@
+require 'spec_helper'
+
+describe Chouette::Objectid::StifNetex, :type => :model do
+  subject { Chouette::Objectid::StifNetex.new(object_type: 'Route', local_id: '13') }
+  it { should validate_presence_of :provider_id }
+  it { should validate_presence_of :object_type }
+  it { should validate_presence_of :local_id }
+  it { should validate_presence_of :creation_id }
+  it { is_expected.to be_valid }
+end
+\ No newline at end of file
diff --git a/spec/models/chouette/objectid/stif_reflex_spec.rb b/spec/models/chouette/objectid/stif_reflex_spec.rb
new file mode 100644
index 000000000..0846f27fa
--- /dev/null
+++ b/spec/models/chouette/objectid/stif_reflex_spec.rb
@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe Chouette::Objectid::StifReflex, :type => :model do
+  subject { Chouette::Objectid::StifReflex.new(country_code: 'FR', zip_code: '78517', object_type: 'ZDL', local_id: '50015386', provider_id: 'STIF') }
+  it { should validate_presence_of :provider_id }
+  it { should validate_presence_of :object_type }
+  it { should validate_presence_of :local_id }
+  it { should validate_presence_of :country_code }
+  it { should validate_presence_of :zip_code }
+  it { is_expected.to be_valid }
+end
+\ No newline at end of file
diff --git a/spec/models/chouette/route/route_base_spec.rb b/spec/models/chouette/route/route_base_spec.rb
index cac2880e8..79daeb6c2 100644
--- a/spec/models/chouette/route/route_base_spec.rb
+++ b/spec/models/chouette/route/route_base_spec.rb
@@ -5,11 +5,6 @@ RSpec.describe Chouette::Route, :type => :model do
     it_behaves_like 'checksum support', :route
   end
 
-  describe '#objectid' do
-    subject { super().objectid }
-    it { is_expected.to be_kind_of(Chouette::StifNetexObjectid) }
-  end
-
   it { is_expected.to enumerize(:direction).in(:straight_forward, :backward, :clockwise, :counter_clockwise, :north, :north_west, :west, :south_west, :south, :south_east, :east, :north_east) }
   it { is_expected.to enumerize(:wayback).in(:outbound, :inbound) }
 
diff --git a/spec/models/chouette/route/route_duplication_spec.rb b/spec/models/chouette/route/route_duplication_spec.rb
index 5bcd13fc8..ee45b5005 100644
--- a/spec/models/chouette/route/route_duplication_spec.rb
+++ b/spec/models/chouette/route/route_duplication_spec.rb
@@ -1,9 +1,4 @@
-# From Chouette import what we need ™
-Route     = Chouette::Route
-StopArea  = Chouette::StopArea
-StopPoint = Chouette::StopPoint
-
-RSpec.describe Route do
+RSpec.describe Chouette::Route do
 
   let!( :route ){ create :route }
 
@@ -11,7 +6,7 @@ RSpec.describe Route do
     describe 'properties' do
       it 'same attribute values' do
         route.duplicate
-        expect( values_for_create(Route.last, except: %w{objectid name checksum checksum_source}) ).to eq( values_for_create( route, except: %w{objectid name checksum checksum_source} ) )
+        expect( values_for_create(Chouette::Route.last, except: %w{objectid name checksum checksum_source}) ).to eq( values_for_create( route, except: %w{objectid name checksum checksum_source} ) )
       end
       it 'and others cannot' do
         expect{ route.duplicate name: 'YAN', line_id: 42  }.to raise_error(ArgumentError)
@@ -23,13 +18,13 @@ RSpec.describe Route do
 
     describe 'side_effects' do
       it {
-        expect{ route.duplicate }.to change{Route.count}.by(1)
+        expect{ route.duplicate }.to change{Chouette::Route.count}.by(1)
       }
       it 'duplicates its stop points' do
-        expect{ route.duplicate }.to change{StopPoint.count}.by(route.stop_points.count)
+        expect{ route.duplicate }.to change{Chouette::StopPoint.count}.by(route.stop_points.count)
       end
       it 'does bot duplicate the stop areas' do
-        expect{ route.duplicate }.not_to change{StopArea.count}
+        expect{ route.duplicate }.not_to change{Chouette::StopArea.count}
       end
     end
 
diff --git a/spec/models/chouette/stop_area_spec.rb b/spec/models/chouette/stop_area_spec.rb
index a3a398bfb..1e0b4af84 100644
--- a/spec/models/chouette/stop_area_spec.rb
+++ b/spec/models/chouette/stop_area_spec.rb
@@ -7,11 +7,6 @@ describe Chouette::StopArea, :type => :model do
   let!(:commercial_stop_point) { create :stop_area, :area_type => "lda" }
   let!(:stop_place) { create :stop_area, :area_type => "zdlp" }
 
-  describe '#objectid' do
-    subject { super().objectid }
-    it { should be_kind_of(Chouette::StifReflexObjectid) }
-  end
-
   it { should belong_to(:stop_area_referential) }
   it { should validate_presence_of :name }
   it { should validate_numericality_of :latitude }
diff --git a/spec/models/chouette/stop_point_spec.rb b/spec/models/chouette/stop_point_spec.rb
index 329e76a75..264fd26fc 100644
--- a/spec/models/chouette/stop_point_spec.rb
+++ b/spec/models/chouette/stop_point_spec.rb
@@ -1,7 +1,4 @@
-# From Chouette import what we need ™
-StopPoint = Chouette::StopPoint
-
-describe StopPoint, :type => :model do
+describe Chouette::StopPoint, :type => :model do
   let!(:vehicle_journey) { create(:vehicle_journey)}
   subject { Chouette::Route.find( vehicle_journey.route_id).stop_points.first }
 
@@ -9,8 +6,8 @@ describe StopPoint, :type => :model do
   it { is_expected.to validate_presence_of :stop_area }
 
   describe '#objectid' do
-    subject { super().objectid }
-    it { is_expected.to be_kind_of(Chouette::StifNetexObjectid) }
+    subject { super().get_objectid }
+    it { is_expected.to be_kind_of(Chouette::Objectid::StifNetex) }
   end
 
   describe "#destroy" do
@@ -44,7 +41,7 @@ describe StopPoint, :type => :model do
     let!( :new_route ){ create :route }
 
     it 'creates a new instance' do
-      expect{ subject.duplicate(for_route: new_route) }.to change{ StopPoint.count }.by(1)
+      expect{ subject.duplicate(for_route: new_route) }.to change{ Chouette::StopPoint.count }.by(1)
     end
     it 'new instance has a new route' do
       expect(subject.duplicate(for_route: new_route).route).to eq(new_route)
diff --git a/spec/models/chouette/trident_active_record_spec.rb b/spec/models/chouette/trident_active_record_spec.rb
deleted file mode 100644
index d5e30594d..000000000
--- a/spec/models/chouette/trident_active_record_spec.rb
+++ /dev/null
@@ -1,57 +0,0 @@
-require 'spec_helper'
-
-describe Chouette::TridentActiveRecord, :type => :model do
-  subject { create(:time_table) }
-
-  it { should validate_presence_of :objectid }
-  it { should validate_uniqueness_of :objectid }
-
-  describe "#default_values" do
-    let(:object) { build(:time_table, objectid: nil) }
-
-    it 'should fill __pending_id__' do
-      object.default_values
-      expect(object.objectid.include?('__pending_id__')).to be_truthy
-    end
-  end
-
-  describe "#objectid" do
-    let(:object) { build(:time_table, objectid: nil) }
-
-    it 'should build objectid on create' do
-      object.save
-      id = "#{object.provider_id}:#{object.model_name}:#{object.local_id}:#{object.boiv_id}"
-      expect(object.objectid).to eq(id)
-    end
-
-    it 'should call build_objectid on after save' do
-      expect(object).to receive(:build_objectid)
-      object.save
-    end
-
-    it 'should not build new objectid is already set' do
-      id = "first:TimeTable:1-1:LOC"
-      object.objectid = id
-      object.save
-      expect(object.objectid).to eq(id)
-    end
-
-    it 'should call default_values on create' do
-      expect(object).to receive(:default_values)
-      object.save
-    end
-
-    it 'should not call default_values on update' do
-      object = create(:time_table)
-      expect(object).to_not receive(:default_values)
-      object.touch
-    end
-
-    it 'should create a new objectid when cleared' do
-      object.save
-      object.objectid = nil
-      object.save
-      expect(object.objectid).to be_truthy
-    end
-  end
-end
diff --git a/spec/models/chouette/vehicle_journey_at_stop_spec.rb b/spec/models/chouette/vehicle_journey_at_stop_spec.rb
index 03e6fcb7d..df8a630fe 100644
--- a/spec/models/chouette/vehicle_journey_at_stop_spec.rb
+++ b/spec/models/chouette/vehicle_journey_at_stop_spec.rb
@@ -51,7 +51,7 @@ RSpec.describe Chouette::VehicleJourneyAtStop, type: :model do
       )
       error_message = I18n.t(
         'vehicle_journey_at_stops.errors.day_offset_must_not_exceed_max',
-        short_id: at_stop.vehicle_journey.objectid.short_id,
+        short_id: at_stop.vehicle_journey.get_objectid.short_id,
         max: bad_offset
       )
 
diff --git a/spec/models/chouette/vehicle_journey_spec.rb b/spec/models/chouette/vehicle_journey_spec.rb
index 52f2ab42d..86aa475f0 100644
--- a/spec/models/chouette/vehicle_journey_spec.rb
+++ b/spec/models/chouette/vehicle_journey_spec.rb
@@ -1,6 +1,7 @@
 require 'spec_helper'
 
 describe Chouette::VehicleJourney, :type => :model do
+
   it "must be valid with an at-stop day offset of 1" do
     vehicle_journey = create(
       :vehicle_journey,
@@ -94,10 +95,13 @@ describe Chouette::VehicleJourney, :type => :model do
       expect {
         Chouette::VehicleJourney.state_update(route, collection)
       }.to change {Chouette::VehicleJourney.count}.by(1)
+
       expect(collection.last['objectid']).not_to be_nil
 
-      vj = Chouette::VehicleJourney.find_by(objectid: collection.last['objectid'])
-      expect(vj.published_journey_name).to eq 'dummy'
+      obj = Chouette::VehicleJourney.last
+      obj.run_callbacks(:commit)
+
+      expect(obj.published_journey_name).to eq 'dummy'
     end
 
     it 'should save vehicle_journey_at_stops of newly created vj' do
diff --git a/spec/models/compliance_control_class_level_defaults/route_control/unactivated_stop_point_cccld_spec.rb b/spec/models/compliance_control_class_level_defaults/route_control/unactivated_stop_point_cccld_spec.rb
new file mode 100644
index 000000000..e9c335dea
--- /dev/null
+++ b/spec/models/compliance_control_class_level_defaults/route_control/unactivated_stop_point_cccld_spec.rb
@@ -0,0 +1,7 @@
+
+RSpec.describe RouteControl::UnactivatedStopPoint, type: :model do
+  let( :default_code ){ "3-Route-10" }
+  let( :factory ){ :route_control_unactivated_stop_point }
+
+  it_behaves_like 'ComplianceControl Class Level Defaults' 
+end
diff --git a/spec/models/compliance_control_class_level_defaults/route_control/unactivated_stop_points_cccld_spec.rb b/spec/models/compliance_control_class_level_defaults/route_control/unactivated_stop_points_cccld_spec.rb
deleted file mode 100644
index bf725d743..000000000
--- a/spec/models/compliance_control_class_level_defaults/route_control/unactivated_stop_points_cccld_spec.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-
-RSpec.describe RouteControl::UnactivatedStopPoints, type: :model do
-  let( :default_code ){ "3-Route-10" }
-  let( :factory ){ :route_control_unactivated_stop_points }
-
-  it_behaves_like 'ComplianceControl Class Level Defaults' 
-end
diff --git a/spec/models/concerns/objectid_support_spec.rb b/spec/models/concerns/objectid_support_spec.rb
new file mode 100644
index 000000000..fabeeec11
--- /dev/null
+++ b/spec/models/concerns/objectid_support_spec.rb
@@ -0,0 +1,138 @@
+RSpec.describe ObjectidSupport do 
+
+  context 'when referential has an objectid format of stif_netex' do
+    let(:object) { create(:time_table, objectid: nil) }
+
+    context "#objectid_format" do
+      it "should be stif_netex" do
+        expect(object.referential.objectid_format).to eq('stif_netex')
+      end
+    end
+
+    it 'should fill __pending_id__' do
+      expect(object.objectid.include?('__pending_id__')).to be_truthy
+    end
+
+    context "#get_objectid" do
+
+      before(:each) do
+        object.run_callbacks(:commit)
+      end
+
+      it "should be valid" do
+        expect(object.get_objectid).to be_valid
+      end
+
+      it "should have the same local id than the object" do
+        expect(object.get_objectid.local_id).to eq(object.local_id)
+      end
+
+      it "should be a Chouette::Objectid::StifNetex" do
+        expect(object.get_objectid).to be_kind_of(Chouette::Objectid::StifNetex)
+      end
+
+      context "#to_s" do
+        it "should return a string" do
+          expect(object.get_objectid.to_s).to be_kind_of(String)
+        end
+
+        it "should be the same as the db attribute" do 
+          expect(object.get_objectid.to_s).to eq(object.read_attribute(:objectid))
+          expect(object.get_objectid.to_s).to eq(object.objectid)
+        end
+    
+    context "#objectid" do
+
+      it 'should build objectid on create' do
+        object.save
+        object.run_callbacks(:commit)
+        objectid = object.get_objectid
+        id = "#{objectid.provider_id}:#{objectid.object_type}:#{objectid.local_id}:#{objectid.creation_id}"
+        expect(object.read_attribute(:objectid)).to eq(id)
+      end
+
+      it 'should not build new objectid is already set' do
+        id = "first:TimeTable:1-1:LOC"
+        object.attributes = {objectid: id}
+        object.save
+        expect(object.objectid).to eq(id)
+      end
+
+      it 'should create a new objectid when cleared' do
+        object.save
+        object.attributes = { objectid: nil}
+        object.save
+        expect(object.objectid).to be_truthy
+      end
+    end
+      end
+    end
+  end
+
+  context 'when referential has an objectid format of netex' do
+    before(:all) do
+      Referential.first.update(objectid_format: 'netex')
+    end
+
+    let(:object) { create(:time_table, objectid: nil) }
+
+
+    context "#objectid_format" do 
+      it "should be netex" do
+        expect(object.referential.objectid_format).to eq('netex')
+      end
+    end
+
+    context "#get_objectid" do
+
+      it "should be valid" do
+        expect(object.get_objectid).to be_valid
+      end
+
+      it "should have the same local id than the object" do
+        expect(object.get_objectid.local_id).to match(/\w+-\w+-\w+-\w+-\w+/)
+      end
+
+      it "should be a Chouette::Objectid::StifNetex" do
+        expect(object.get_objectid).to be_kind_of(Chouette::Objectid::Netex)
+      end
+
+      context "#to_s" do
+        it "should return a string" do
+          expect(object.get_objectid.to_s).to be_kind_of(String)
+        end
+
+        it "should be the same as the db attribute" do 
+          expect(object.get_objectid.to_s).to eq(object.read_attribute(:objectid))
+          expect(object.get_objectid.to_s).to eq(object.objectid)
+        end
+    
+    context "#objectid" do
+
+      it 'should build objectid on create' do
+        object.save
+        object.run_callbacks(:commit)
+        objectid = object.get_objectid
+        id = "#{objectid.provider_id}:#{objectid.object_type}:#{objectid.local_id}:#{objectid.creation_id}"
+        expect(object.read_attribute(:objectid)).to eq(id)
+      end
+
+      it 'should not build new objectid is already set' do
+        id = "first:TimeTable:1-1:LOC"
+        object.attributes = {objectid: id}
+        object.save
+        expect(object.objectid).to eq(id)
+      end
+
+      it 'should create a new objectid when cleared' do
+        object.save
+        object.attributes = { objectid: nil}
+        object.save
+        expect(object.objectid).to be_truthy
+      end
+    end
+      end
+    end
+  end
+  
+end
+\ No newline at end of file
diff --git a/spec/models/line_referential_spec.rb b/spec/models/line_referential_spec.rb
index 8f8714f8f..46434a7ab 100644
--- a/spec/models/line_referential_spec.rb
+++ b/spec/models/line_referential_spec.rb
@@ -7,5 +7,6 @@ RSpec.describe LineReferential, type: :model do
   it { is_expected.to have_many(:line_referential_syncs) }
   it { is_expected.to have_many(:workbenches) }
   it { should validate_presence_of(:sync_interval) }
+  it { should validate_presence_of(:objectid_format) }
 
 end
diff --git a/spec/models/referential_spec.rb b/spec/models/referential_spec.rb
index ad9c43010..d0b1d6447 100644
--- a/spec/models/referential_spec.rb
+++ b/spec/models/referential_spec.rb
@@ -12,6 +12,12 @@ describe Referential, :type => :model do
   it { should belong_to(:workbench) }
   it { should belong_to(:referential_suite) }
 
+  context "validation" do
+    subject { build_stubbed(:referential) }
+
+    it { should validate_presence_of(:objectid_format) }
+  end
+
   context ".referential_ids_in_periode" do
     it 'should retrieve referential id in periode range' do
       range = ref.metadatas.first.periodes.sample
diff --git a/spec/models/stop_area_referential_spec.rb b/spec/models/stop_area_referential_spec.rb
index 271badff8..dd2bdce20 100644
--- a/spec/models/stop_area_referential_spec.rb
+++ b/spec/models/stop_area_referential_spec.rb
@@ -7,4 +7,5 @@ RSpec.describe StopAreaReferential, :type => :model do
 
   it { is_expected.to have_many(:stop_area_referential_syncs) }
   it { is_expected.to have_many(:workbenches) }
+  it { should validate_presence_of(:objectid_format) }
 end
diff --git a/spec/models/workbench_spec.rb b/spec/models/workbench_spec.rb
index 037537b60..3b9ed6b07 100644
--- a/spec/models/workbench_spec.rb
+++ b/spec/models/workbench_spec.rb
@@ -7,6 +7,7 @@ RSpec.describe Workbench, :type => :model do
 
   it { should validate_presence_of(:name) }
   it { should validate_presence_of(:organisation) }
+  it { should validate_presence_of(:objectid_format) }
 
   it { should belong_to(:organisation) }
   it { should belong_to(:line_referential) }
diff --git a/spec/policies/network_policy_spec.rb b/spec/policies/network_policy_spec.rb
index ae4ffa03a..c09546c22 100644
--- a/spec/policies/network_policy_spec.rb
+++ b/spec/policies/network_policy_spec.rb
@@ -1,4 +1,4 @@
-RSpec.describe NetworkPolicy, type: :policy do
+RSpec.describe Chouette::NetworkPolicy, type: :policy do
 
   let( :record ){ build_stubbed :network }
   before { stub_policy_scope(record) }
diff --git a/spec/policies/route_policy_spec.rb b/spec/policies/route_policy_spec.rb
index d7edceaef..df2e41a89 100644
--- a/spec/policies/route_policy_spec.rb
+++ b/spec/policies/route_policy_spec.rb
@@ -1,4 +1,4 @@
-RSpec.describe RoutePolicy, type: :policy do
+RSpec.describe Chouette::RoutePolicy, type: :policy do
 
   let( :record ){ build_stubbed :route }
 
diff --git a/spec/support/referential.rb b/spec/support/referential.rb
index 6f60bd86b..b615491da 100644
--- a/spec/support/referential.rb
+++ b/spec/support/referential.rb
@@ -46,9 +46,11 @@ RSpec.configure do |config|
     organisation = Organisation.create!(code: "first", name: "first")
 
     line_referential = LineReferential.find_or_create_by(name: "first") do |referential|
+      referential.objectid_format = "stif_codifligne"
       referential.add_member organisation, owner: true
     end
     stop_area_referential = StopAreaReferential.find_or_create_by(name: "first") do |referential|
+      referential.objectid_format = "stif_reflex"
       referential.add_member organisation, owner: true
     end
 
@@ -65,7 +67,8 @@ RSpec.configure do |config|
       name: "first",
       slug: "first",
       organisation: organisation,
-      workbench: workbench
+      workbench: workbench,
+      objectid_format: "stif_netex"
     )
   end