Merge pull request #460 from af83/6360-workbenchimport-display

6360 Add checks on calendars during WorkbenchImport

18 files changed, 1164 insertions, 70 deletions

diff --git a/app/controllers/api/v1/netex_imports_controller.rb b/app/controllers/api/v1/netex_imports_controller.rb
index 2654fa088..94600e93b 100644
--- a/app/controllers/api/v1/netex_imports_controller.rb
+++ b/app/controllers/api/v1/netex_imports_controller.rb
@@ -25,56 +25,19 @@ module Api
 
       def create_models
         find_workbench
-        create_referential
         create_netex_import
       end
 
       def create_netex_import
         attributes = netex_import_params.merge creator: "Webservice"
-
-        attributes = attributes.merge referential_id: @new_referential.id
-
         @netex_import = Import::Netex.new attributes
         @netex_import.save!
-
-        unless @netex_import.referential
-          Rails.logger.info "Can't create referential for import #{@netex_import.id}: #{@new_referential.inspect} #{@new_referential.metadatas.inspect} #{@new_referential.errors.full_messages}"
-          @netex_import.messages.create criticity: :error, message_key: "referential_creation"
-        end
+        @netex_import.create_referential
       rescue ActiveRecord::RecordInvalid
         render json: {errors: @netex_import.errors}, status: 406
         finish_action!
       end
 
-      def create_referential
-        @new_referential =
-          Referential.new(
-            name: netex_import_params['name'],
-            organisation_id: @workbench.organisation_id,
-            workbench_id: @workbench.id,
-            metadatas: [metadata]
-          )
-        @new_referential.save
-      end
-
-      def metadata
-        metadata = ReferentialMetadata.new
-
-        if netex_import_params['file']
-          netex_file = STIF::NetexFile.new(netex_import_params['file'].to_io)
-          frame = netex_file.frames.first
-
-          if frame
-            metadata.periodes = frame.periods
-
-            line_objectids = frame.line_refs.map { |ref| "STIF:CODIFLIGNE:Line:#{ref}" }
-            metadata.line_ids = @workbench.lines.where(objectid: line_objectids).pluck(:id)
-          end
-        end
-
-        metadata
-      end
-
       def netex_import_params
         params
           .require('netex_import')
diff --git a/app/models/import/netex.rb b/app/models/import/netex.rb
index 2b0982229..83b654f81 100644
--- a/app/models/import/netex.rb
+++ b/app/models/import/netex.rb
@@ -10,6 +10,25 @@ class Import::Netex < Import::Base
 
   validates_presence_of :parent
 
+  def create_referential
+    self.referential =
+      Referential.new(
+        name: self.name,
+        organisation_id: workbench.organisation_id,
+        workbench_id: workbench.id,
+        metadatas: [referential_metadata]
+      )
+    self.referential.save
+    unless self.referential.valid?
+      Rails.logger.info "Can't create referential for import #{self.id}: #{referential.inspect} #{referential.metadatas.inspect} #{referential.errors.messages}"
+      if referential.metadatas.all?{|m| m.line_ids.empty?}
+        parent.messages.create criticity: :error, message_key: "referential_creation_missing_lines", message_attributes: {referential_name: referential.name}
+      else
+        parent.messages.create criticity: :error, message_key: "referential_creation", message_attributes: {referential_name: referential.name}
+      end
+    end
+  end
+
   private
 
   def iev_callback_url
@@ -21,4 +40,22 @@ class Import::Netex < Import::Base
       referential.destroy
     end
   end
+
+  def referential_metadata
+    metadata = ReferentialMetadata.new
+
+    if self.file
+      netex_file = STIF::NetexFile.new(self.file.path)
+      frame = netex_file.frames.first
+
+      if frame
+        metadata.periodes = frame.periods
+
+        line_objectids = frame.line_refs.map { |ref| "STIF:CODIFLIGNE:Line:#{ref}" }
+        metadata.line_ids = workbench.lines.where(objectid: line_objectids).pluck(:id)
+      end
+    end
+
+    metadata
+  end
 end
diff --git a/app/services/zip_service.rb b/app/services/zip_service.rb
index 7166e6448..2402721fb 100644
--- a/app/services/zip_service.rb
+++ b/app/services/zip_service.rb
@@ -1,8 +1,8 @@
 class ZipService
 
-  class Subdir < Struct.new(:name, :stream, :spurious, :foreign_lines)
+  class Subdir < Struct.new(:name, :stream, :spurious, :foreign_lines, :missing_calendar, :wrong_calendar)
     def ok?
-      foreign_lines.empty? && spurious.empty?
+      foreign_lines.empty? && spurious.empty? && !missing_calendar && !wrong_calendar
     end
   end
 
@@ -38,8 +38,21 @@ class ZipService
     add_to_current_output entry
   end
 
+  def validate entry
+    if is_calendar_file?(entry.name)
+      @current_calendar_is_missing = false
+      if wrong_calendar_data?(entry)
+        @current_calendar_is_wrong = true
+        return false
+      end
+    end
+    return false if is_spurious?(entry.name)
+    return false if is_foreign_line?(entry.name)
+    true
+  end
+
   def add_to_current_output entry
-    return if is_spurious!(entry.name) || is_foreign_line!(entry.name)
+    return unless validate(entry)
 
     current_output.put_next_entry entry.name
     write_to_current_output entry.get_input_stream
@@ -48,7 +61,7 @@ class ZipService
   def write_to_current_output input_stream
     # the condition below is true for directory entries
     return if Zip::NullInputStream == input_stream
-    current_output.write input_stream.read 
+    current_output.write input_stream.read
   end
 
   def finish_current_output
@@ -58,7 +71,9 @@ class ZipService
         # Second part of the solution, yield the closed stream
         current_output.close_buffer,
         current_spurious.to_a,
-        foreign_lines)
+        foreign_lines,
+        @current_calendar_is_missing,
+        @current_calendar_is_wrong)
     end
   end
 
@@ -68,6 +83,8 @@ class ZipService
     @current_output   = Zip::OutputStream.new(StringIO.new(''), true, nil)
     @current_spurious = Set.new
     @foreign_lines    = []
+    @current_calendar_is_missing = true
+    @current_calendar_is_wrong = false
   end
 
   def entry_key entry
@@ -75,7 +92,7 @@ class ZipService
     entry.name.split('/').first
   end
 
-  def is_spurious! entry_name
+  def is_spurious? entry_name
     segments = entry_name.split('/', 3)
     return false if segments.size < 3
 
@@ -83,11 +100,25 @@ class ZipService
     return true
   end
 
-  def is_foreign_line! entry_name
+  def is_foreign_line? entry_name
     STIF::NetexFile::Frame.get_short_id(entry_name).tap do | line_object_id |
       return nil unless line_object_id
       return nil if line_object_id.in? allowed_lines
       foreign_lines << line_object_id
     end
   end
+
+  def is_calendar_file? entry_name
+    entry_name =~ /calendriers.xml$/
+  end
+
+  def wrong_calendar_data? entry
+    content = entry.get_input_stream.read
+    period = STIF::NetexFile::Frame.parse_calendars content.to_s
+    return true unless period
+    return true unless period.first
+    return true unless period.end
+    return true unless period.first <= period.end
+    false
+  end
 end
diff --git a/app/views/shared/iev_interfaces/_messages.html.slim b/app/views/shared/iev_interfaces/_messages.html.slim
index 14157a88d..4e2c4d849 100644
--- a/app/views/shared/iev_interfaces/_messages.html.slim
+++ b/app/views/shared/iev_interfaces/_messages.html.slim
@@ -1,14 +1,15 @@
 - if messages.any?
   ul.list-unstyled.import_message-list
     - messages.order(:created_at).each do | message |
+      - width = message.resource_attributes.present? ? 6 : 12
       li
         .row class=bootstrap_class_for_message_criticity(message.criticity)
           - if message.message_attributes && message.message_attributes["line"]
             .col-md-1= "L. #{message.message_attributes["line"]}"
-            .col-md-5= export_message_content message
+            div class="col-md-#{width-1}"= export_message_content message
           - else
-            .col-md-6= export_message_content message
+            div class="col-md-#{width}"= export_message_content message
           .col-md-6
-            - if message.resource_attributes
+            - if message.resource_attributes.present?
               pre
                 = JSON.pretty_generate message.resource_attributes || {}
diff --git a/app/workers/workbench_import_worker/object_state_updater.rb b/app/workers/workbench_import_worker/object_state_updater.rb
index 67bdc0654..1edc6b9a1 100644
--- a/app/workers/workbench_import_worker/object_state_updater.rb
+++ b/app/workers/workbench_import_worker/object_state_updater.rb
@@ -6,9 +6,10 @@ class WorkbenchImportWorker
       workbench_import.update( total_steps: count )
       update_spurious entry
       update_foreign_lines entry
+      update_missing_calendar entry
+      update_wrong_calendar entry
     end
 
-
     private
 
     def update_foreign_lines entry
@@ -19,7 +20,7 @@ class WorkbenchImportWorker
         message_attributes: {
           'source_filename' => workbench_import.file.file.file,
           'foreign_lines'   => entry.foreign_lines.join(', ')
-        }) 
+        })
     end
 
     def update_spurious entry
@@ -30,7 +31,27 @@ class WorkbenchImportWorker
         message_attributes: {
           'source_filename' => workbench_import.file.file.file,
           'spurious_dirs'   => entry.spurious.join(', ')
-        }) 
+        })
+    end
+
+    def update_missing_calendar entry
+      return unless entry.missing_calendar
+      workbench_import.messages.create(
+        criticity: :error,
+        message_key: 'missing_calendar_in_zip_file',
+        message_attributes: {
+          'source_filename' => entry.name
+        })
+    end
+
+    def update_wrong_calendar entry
+      return unless entry.wrong_calendar
+      workbench_import.messages.create(
+        criticity: :error,
+        message_key: 'wrong_calendar_in_zip_file',
+        message_attributes: {
+          'source_filename' => entry.name
+        })
     end
   end
 end
diff --git a/config/locales/import_messages.en.yml b/config/locales/import_messages.en.yml
index bc06c46f0..9f370d319 100644
--- a/config/locales/import_messages.en.yml
+++ b/config/locales/import_messages.en.yml
@@ -2,7 +2,10 @@ en:
   import_message:
     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êmes périodes et lignes"
+    missing_calendar_in_zip_file: "The folder %{source_filename} lacks a calendar file"
+    wrong_calendar_in_zip_file: "The calendar file %{source_filename} cannot be parsed, or contains inconsistant data"
+    referential_creation: "The referential %{referential_name} has not been created because another referential with the same lines and periods already exists"
+    referential_creation_missing_lines: "The referential %{referential_name} has not been created because no matching line has been found"
     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 1e5054648..5ecef68d1 100644
--- a/config/locales/import_messages.fr.yml
+++ b/config/locales/import_messages.fr.yml
@@ -2,10 +2,13 @@ fr:
   import_messages:
     corrupt_zip_file: "Le fichier zip est corrompu, et ne peut être lu"
     inconsistent_zip_file: "Le fichier zip 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êmes périodes et lignes"
+    missing_calendar_in_zip_file: "Le dossier %{source_filename} ne contient pas de calendrier"
+    wrong_calendar_in_zip_file: "Le calendrier contenu dans %{source_filename} contient des données incorrectes ou incohérentes"
+    referential_creation: "Le référentiel %{referential_name} n'a pas pu être créé car un référentiel existe déjà sur les mêmes périodes et lignes"
+    referential_creation_missing_lines: "Le référentiel %{referential_name} n'a pas pu être créé car aucune ligne ne correspond"
     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"
+    2_netexstif_1_1: "Le fichier commun.xml ne contient pas de frame nommée NTEX_COMMUN"
     2_netexstif_1_2: "Le fichier commun.xml contient une frame nommée %{error_value} non acceptée"
     2_netexstif_2_1: "Le fichier calendriers.xml ne contient pas de frame nommée NETEX_CALENDRIER"
     2_netexstif_2_2: "Le fichier calendriers.xml contient une frame nommée %{error_value} non acceptée"
diff --git a/lib/stif/netex_file.rb b/lib/stif/netex_file.rb
index db0801bbe..1e78ca04a 100644
--- a/lib/stif/netex_file.rb
+++ b/lib/stif/netex_file.rb
@@ -47,6 +47,23 @@ module STIF
           base_name = File.basename(file_name)
           STIF::NetexFile::LINE_FILE_FORMAT.match(base_name).try(:[], 'line_object_id')
         end
+
+        def parse_calendars calendars
+          # <netex:ValidBetween>
+          #  <netex:FromDate>2017-03-01</netex:FromDate>
+          #  <netex:ToDate>2017-03-31</netex:ToDate>
+          # </netex:ValidBetween>
+          xml = Nokogiri::XML(calendars)
+          from_date = nil
+          to_date = nil
+          xml.xpath("//netex:ValidBetween", "netex" => NetexFile::XML_NAME_SPACE).each do |valid_between|
+            from_date = valid_between.xpath("netex:FromDate").try :text
+            to_date = valid_between.xpath("netex:ToDate").try :text
+          end
+          from_date = from_date && Date.parse(from_date)
+          to_date = to_date && Date.parse(to_date)
+          Range.new from_date, to_date
+        end
       end
 
       attr_accessor :name
@@ -56,16 +73,7 @@ module STIF
       end
 
       def parse_calendars(calendars)
-        # <netex:ValidBetween>
-        #  <netex:FromDate>2017-03-01</netex:FromDate>
-        #  <netex:ToDate>2017-03-31</netex:ToDate>
-        # </netex:ValidBetween>
-        xml = Nokogiri::XML(calendars)
-        xml.xpath("//netex:ValidBetween", "netex" => NetexFile::XML_NAME_SPACE).each do |valid_between|
-          from_date = valid_between.xpath("netex:FromDate").try :text
-          to_date = valid_between.xpath("netex:ToDate").try :text
-          periods << Range.new(Date.parse(from_date), Date.parse(to_date))
-        end
+        periods << self.class.parse_calendars(calendars)
       end
 
       def add_offer_file(line_object_id)
diff --git a/spec/fixtures/multiple_with_wrong_calendar.zip b/spec/fixtures/multiple_with_wrong_calendar.zip
new file mode 100644
index 000000000..85c0ec61d
--- /dev/null
+++ b/spec/fixtures/multiple_with_wrong_calendar.zip
diff --git a/spec/fixtures/multiple_with_wrong_calendar/OFFRE_TRANSDEV_20170301122517/calendriers.xml b/spec/fixtures/multiple_with_wrong_calendar/OFFRE_TRANSDEV_20170301122517/calendriers.xml
new file mode 100644
index 000000000..bfbd0aea1
--- /dev/null
+++ b/spec/fixtures/multiple_with_wrong_calendar/OFFRE_TRANSDEV_20170301122517/calendriers.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<netex:PublicationDelivery xmlns:netex="http://www.netex.org.uk/netex"
+    xmlns:siri="http://www.siri.org.uk/siri" xmlns:core="http://www.govtalk.gov.uk/core"
+    xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:ifopt="http://www.ifopt.org.uk/ifopt"
+    xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    version="1.0">
+    <netex:PublicationTimestamp>2017-02-14T09:13:51.0</netex:PublicationTimestamp>
+    <netex:ParticipantRef>CITYWAY</netex:ParticipantRef>
+    <netex:dataObjects>
+        <netex:GeneralFrame id="CITYWAY:GeneralFrame:NETEX_CALENDRIER-1_20170214090012:LOC"
+            version="any">
+            <netex:TypeOfFrameRef ref="NETEX_CALENDRIER"/>
+            <netex:ValidBetween>
+                <netex:FromDate>2017-03-01</netex:FromDate>
+                <netex:ToDate>2017-03-31</netex:ToDate>
+            </netex:ValidBetween>
+            <netex:members> 
+                <netex:dayTypes>
+                    <netex:DayType id="CITYWAY:DayType:1:LOC"  version="any" >
+                        <netex:Name>Semaine</netex:Name>
+                        <netex:properties>
+                            <netex:PropertyOfDay>
+                                <netex:DaysOfWeek>Monday</netex:DaysOfWeek>
+                            </netex:PropertyOfDay>
+                            <netex:PropertyOfDay>
+                                <netex:DaysOfWeek>Tuesday</netex:DaysOfWeek>
+                            </netex:PropertyOfDay>
+                            <netex:PropertyOfDay>
+                                <netex:DaysOfWeek>Wednesday</netex:DaysOfWeek>
+                            </netex:PropertyOfDay>
+                            <netex:PropertyOfDay>
+                                <netex:DaysOfWeek>Thursday</netex:DaysOfWeek>
+                            </netex:PropertyOfDay>
+                            <netex:PropertyOfDay>
+                                <netex:DaysOfWeek>Friday</netex:DaysOfWeek>
+                            </netex:PropertyOfDay>
+                        </netex:properties>
+                    </netex:DayType>                    
+                    <netex:DayType id="CITYWAY:DayType:2:LOC"  version="any" >
+                        <netex:Name>Fin de semaine</netex:Name>
+                        <netex:properties>
+                            <netex:PropertyOfDay>
+                                <netex:DaysOfWeek>Saturday</netex:DaysOfWeek>
+                            </netex:PropertyOfDay>
+                            <netex:PropertyOfDay>
+                                <netex:DaysOfWeek>Sunday</netex:DaysOfWeek>
+                            </netex:PropertyOfDay>
+                        </netex:properties>
+                    </netex:DayType>                    
+                    <netex:DayType id="CITYWAY:DayType:3:LOC"  version="any" >
+                        <netex:Name>Service spécial</netex:Name>
+                    </netex:DayType>                    
+                    <netex:DayType id="CITYWAY:DayType:4:LOC"  version="any" >
+                        <netex:Name>Restriction</netex:Name>
+                    </netex:DayType>                    
+                </netex:dayTypes>
+                <netex:dayTypeAssignments>
+                    <netex:DayTypeAssignment version="any" >
+                        <netex:OperatingPeriodRef ref="CITYWAY:OperatingPeriod:1:LOC" version="any"/>
+                        <netex:DayTypeRef ref="CITYWAY:DayType:1:LOC" version="any"/>
+                    </netex:DayTypeAssignment>
+                    <netex:DayTypeAssignment version="any" >
+                        <netex:OperatingPeriodRef ref="CITYWAY:OperatingPeriod:1:LOC" version="any"/>
+                        <netex:DayTypeRef ref="CITYWAY:DayType:2:LOC" version="any"/>
+                    </netex:DayTypeAssignment>
+                    <netex:DayTypeAssignment version="any" >
+                        <netex:Date>2017-03-15</netex:Date>
+                        <netex:DayTypeRef ref="CITYWAY:DayType:3:LOC" version="any"/>
+                        <netex:isAvailable>true</netex:isAvailable> 
+                    </netex:DayTypeAssignment>
+                    <netex:DayTypeAssignment version="any" >
+                        <netex:Date>2017-03-15</netex:Date>
+                        <netex:DayTypeRef ref="CITYWAY:DayType:4:LOC" version="any"/>
+                        <netex:isAvailable>false</netex:isAvailable> 
+                    </netex:DayTypeAssignment>
+                </netex:dayTypeAssignments>
+                <netex:operatingPeriods>
+                    <netex:OperatingPeriod id="CITYWAY:OperatingPeriod:1:LOC" version="any" >
+                        <netex:FromDate>2017-01-01</netex:FromDate>
+                        <netex:ToDate>2017-12-31</netex:ToDate>
+                    </netex:OperatingPeriod>
+                </netex:operatingPeriods>
+            </netex:members>
+        </netex:GeneralFrame>
+    </netex:dataObjects>
+</netex:PublicationDelivery>
diff --git a/spec/fixtures/multiple_with_wrong_calendar/OFFRE_TRANSDEV_20170301122517/commun.xml b/spec/fixtures/multiple_with_wrong_calendar/OFFRE_TRANSDEV_20170301122517/commun.xml
new file mode 100644
index 000000000..266c8a598
--- /dev/null
+++ b/spec/fixtures/multiple_with_wrong_calendar/OFFRE_TRANSDEV_20170301122517/commun.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<netex:PublicationDelivery xmlns:netex="http://www.netex.org.uk/netex"
+    xmlns:siri="http://www.siri.org.uk/siri" xmlns:core="http://www.govtalk.gov.uk/core"
+    xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:ifopt="http://www.ifopt.org.uk/ifopt"
+    xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    version="1.0">
+    <netex:PublicationTimestamp>2017-02-14T09:13:51.0</netex:PublicationTimestamp>
+    <netex:ParticipantRef>CITYWAY</netex:ParticipantRef>
+    <netex:dataObjects>
+        <netex:GeneralFrame id="CITYWAY:GeneralFrame:NETEX_COMMUN-1_20170214090012:LOC" version="any">
+            <netex:TypeOfFrameRef ref="NETEX_COMMUN"/>
+            <netex:members>
+                <netex:notices>
+                    <netex:Notice id="CITYWAY:Notice:1:LOC" version="any">
+                        <netex:Text>Notice 1</netex:Text>
+                        <netex:PublicCode>1</netex:PublicCode>
+                        <netex:TypeOfNoticeRef>ServiceJourneyNotice</netex:TypeOfNoticeRef>
+                    </netex:Notice>
+                    <netex:Notice id="CITYWAY:Notice:2:LOC" version="any">
+                        <netex:Text>Notice 2</netex:Text>
+                        <netex:PublicCode>2</netex:PublicCode>
+                        <netex:TypeOfNoticeRef>ServiceJourneyNotice</netex:TypeOfNoticeRef>
+                    </netex:Notice>
+                    <netex:Notice id="CITYWAY:Notice:3:LOC" version="any">
+                        <netex:Text>Notice 3</netex:Text>
+                        <netex:PublicCode>3</netex:PublicCode>
+                        <netex:TypeOfNoticeRef>ServiceJourneyNotice</netex:TypeOfNoticeRef>
+                    </netex:Notice>
+                </netex:notices>
+            </netex:members>
+        </netex:GeneralFrame>
+    </netex:dataObjects>
+</netex:PublicationDelivery>
diff --git a/spec/fixtures/multiple_with_wrong_calendar/OFFRE_TRANSDEV_20170301122517/offre_C00108_9.xml b/spec/fixtures/multiple_with_wrong_calendar/OFFRE_TRANSDEV_20170301122517/offre_C00108_9.xml
new file mode 100644
index 000000000..832793036
--- /dev/null
+++ b/spec/fixtures/multiple_with_wrong_calendar/OFFRE_TRANSDEV_20170301122517/offre_C00108_9.xml
@@ -0,0 +1,202 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<netex:PublicationDelivery xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.netex.org.uk/netex ../../xsd/NeTEx_publication.xsd"
+ xmlns:netex="http://www.netex.org.uk/netex" xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:ifopt="http://www.ifopt.org.uk/ifopt" xmlns:gml="http://www.opengis.net/gml/3.2"
+ xmlns:core="http://www.govtalk.gov.uk/core" xmlns:siri="http://www.siri.org.uk/siri" version="1.0">
+    <netex:PublicationTimestamp>2017-02-14T09:13:51.0</netex:PublicationTimestamp>
+    <netex:ParticipantRef>CITYWAY</netex:ParticipantRef>
+    <netex:dataObjects>
+        <netex:CompositeFrame id="CITYWAY:CompositeFrame:NETEX_OFFRE_LIGNE-1:LOC" version="any">
+            <netex:Name>Ligne 1</netex:Name>
+            <netex:TypeOfFrameRef ref="NETEX_OFFRE_LIGNE"/>
+            <netex:frames>
+                <netex:GeneralFrame id="CITYWAY:GeneralFrame:NETEX_STRUCTURE-20170214090012:LOC"
+                    version="any">
+                    <netex:TypeOfFrameRef ref="NETEX_STRUCTURE"/>
+                    <netex:members>
+                        <netex:routes>
+                            <netex:Route id="CITYWAY:Route:1:LOC" version="any">
+                                <netex:Name>route 1</netex:Name>
+										  <netex:LineRef ref="STIF:CODIFLIGNE:Line:C00108">version="any"</netex:LineRef>
+                                <netex:DirectionType>outbound</netex:DirectionType>
+                                <netex:DirectionRef ref="CITYWAY:Direction:1:LOC" version="any"/>
+                                <netex:InverseRouteRef ref="CITYWAY:Route:2:LOC" version="any"/>
+                            </netex:Route>
+                            <netex:Route id="CITYWAY:Route:2:LOC" version="any">
+                                <netex:Name>route 2</netex:Name>
+										  <netex:LineRef ref="STIF:CODIFLIGNE:Line:C00108">version="any"</netex:LineRef>
+                                <netex:DirectionType>inbound</netex:DirectionType>
+                                <netex:DirectionRef ref="CITYWAY:Direction:2:LOC" version="any"/>
+                                <netex:InverseRouteRef ref="CITYWAY:Route:1:LOC" version="any"/>
+                            </netex:Route>
+                        </netex:routes>
+                        <netex:directions>
+                            <netex:Direction id="CITYWAY:Direction:1:LOC" version="any">
+                                <netex:Name>Par ici</netex:Name>
+                            </netex:Direction>
+                            <netex:Direction id="CITYWAY:Direction:2:LOC" version="any">
+                                <netex:Name>Par là</netex:Name>
+                            </netex:Direction>
+                        </netex:directions>
+                        <netex:serviceJourneyPatterns>
+                            <netex:ServiceJourneyPattern id="CITYWAY:ServiceJourneyPattern:1:LOC"
+                                version="any">
+                                <netex:Name>Par ici</netex:Name>
+                                <netex:RouteRef ref="CITYWAY:Route:1:LOC" version="any"/>
+                                <netex:DestinationDisplayRef ref="CITYWAY:DestinationDisplay:1:LOC"
+                                    version="any"/>
+                                <netex:pointsInSequence>
+                                    <netex:StopPointInJourneyPattern
+                                        id="CITYWAY:StopPointInJourneyPattern:1-1-1:LOC" order="1"
+                                        version="any">
+                                        <netex:ScheduledStopPointRef
+                                            ref="CITYWAY:ScheduledStopPoint:1-1:LOC" version="any"/>
+                                        <netex:ForAlighting>true</netex:ForAlighting>
+                                        <netex:ForBoarding>true</netex:ForBoarding>
+                                    </netex:StopPointInJourneyPattern>
+                                    <netex:StopPointInJourneyPattern
+                                        id="CITYWAY:StopPointInJourneyPattern:1-1-2:LOC" order="2"
+                                        version="any">
+                                        <netex:ScheduledStopPointRef
+                                            ref="CITYWAY:ScheduledStopPoint:1-2:LOC" version="any"/>
+                                        <netex:ForAlighting>true</netex:ForAlighting>
+                                        <netex:ForBoarding>true</netex:ForBoarding>
+                                    </netex:StopPointInJourneyPattern>
+                                </netex:pointsInSequence>
+                                <netex:ServiceJourneyPatternType>passenger</netex:ServiceJourneyPatternType>
+                            </netex:ServiceJourneyPattern>
+                            <netex:ServiceJourneyPattern id="CITYWAY:ServiceJourneyPattern:2:LOC"
+                                version="any">
+                                <netex:Name>Par là</netex:Name>
+                                <netex:RouteRef ref="CITYWAY:Route:2:LOC" version="any"/>
+                                <netex:DestinationDisplayRef ref="CITYWAY:DestinationDisplay:2:LOC"
+                                    version="any"/>
+                                <netex:pointsInSequence>
+                                    <netex:StopPointInJourneyPattern
+                                        id="CITYWAY:StopPointInJourneyPattern:2-2-1:LOC" order="1"
+                                        version="any">
+                                        <netex:ScheduledStopPointRef
+                                            ref="CITYWAY:ScheduledStopPoint:2-1:LOC" version="any"/>
+                                        <netex:ForAlighting>true</netex:ForAlighting>
+                                        <netex:ForBoarding>true</netex:ForBoarding>
+                                    </netex:StopPointInJourneyPattern>
+                                    <netex:StopPointInJourneyPattern
+                                        id="CITYWAY:StopPointInJourneyPattern:2-2-2:LOC" order="2"
+                                        version="any">
+                                        <netex:ScheduledStopPointRef
+                                            ref="CITYWAY:ScheduledStopPoint:2-2:LOC" version="any"/>
+                                        <netex:ForAlighting>true</netex:ForAlighting>
+                                        <netex:ForBoarding>true</netex:ForBoarding>
+                                    </netex:StopPointInJourneyPattern>
+                                </netex:pointsInSequence>
+                                <netex:ServiceJourneyPatternType>passenger</netex:ServiceJourneyPatternType>
+                            </netex:ServiceJourneyPattern>
+                        </netex:serviceJourneyPatterns>
+                        <netex:destinationDisplays>
+                            <netex:DestinationDisplay id="CITYWAY:DestinationDisplay:1:LOC"
+                                version="any">
+                                <netex:FrontText>Mission 1</netex:FrontText>
+                                <netex:PublicCode>1234</netex:PublicCode>
+                            </netex:DestinationDisplay>
+                            <netex:DestinationDisplay id="CITYWAY:DestinationDisplay:2:LOC"
+                                version="any">
+                                <netex:FrontText>Mission 2</netex:FrontText>
+                                <netex:PublicCode>2345</netex:PublicCode>
+                            </netex:DestinationDisplay>
+                        </netex:destinationDisplays>
+                        <netex:scheduledStopPoints>
+                            <netex:ScheduledStopPoint id="CITYWAY:ScheduledStopPoint:1-1:LOC"
+                                version="any"/>
+                            <netex:ScheduledStopPoint id="CITYWAY:ScheduledStopPoint:1-2:LOC"
+                                version="any"/>
+                            <netex:ScheduledStopPoint id="CITYWAY:ScheduledStopPoint:2-1:LOC"
+                                version="any"/>
+                            <netex:ScheduledStopPoint id="CITYWAY:ScheduledStopPoint:2-2:LOC"
+                                version="any"/>
+                        </netex:scheduledStopPoints>
+                        <netex:passengerStopAssignments>
+                            <netex:PassengerStopAssignment
+                                id="CITYWAY:PassengerStopAssignment:1-1:LOC" version="any">
+                                <netex:ScheduledStopPointRef
+                                    ref="CITYWAY:ScheduledStopPoint:1-1:LOC" version="any"/>
+										  <netex:QuayRef ref="FR:78217:ZDE:50094817:STIF">version="any"</netex:QuayRef>
+                            </netex:PassengerStopAssignment>
+                            <netex:PassengerStopAssignment
+                                id="CITYWAY:PassengerStopAssignment:2-1:LOC" version="any">
+                                <netex:ScheduledStopPointRef
+                                    ref="CITYWAY:ScheduledStopPoint:2-1:LOC" version="any"/>
+										  <netex:QuayRef ref="FR:78217:ZDE:50009052:STIF">version="any"</netex:QuayRef>
+                            </netex:PassengerStopAssignment>
+                            <netex:PassengerStopAssignment
+                                id="CITYWAY:PassengerStopAssignment:1-2:LOC" version="any">
+                                <netex:ScheduledStopPointRef
+                                    ref="CITYWAY:ScheduledStopPoint:1-2:LOC" version="any"/>
+										  <netex:QuayRef ref="FR:78217:ZDE:50009053:STIF">version="any"</netex:QuayRef>
+                            </netex:PassengerStopAssignment>
+                            <netex:PassengerStopAssignment
+                                id="CITYWAY:PassengerStopAssignment:2-2:LOC" version="any">
+                                <netex:ScheduledStopPointRef
+                                    ref="CITYWAY:ScheduledStopPoint:2-2:LOC" version="any"/>
+										  <netex:QuayRef ref="FR:78217:ZDE:50094816:STIF">version="any"</netex:QuayRef>
+                            </netex:PassengerStopAssignment>
+                        </netex:passengerStopAssignments>
+                        <netex:routingConstraintZones>
+                            <netex:RoutingConstraintZone id="CITYWAY:RoutingConstraintZone:1:LOC"
+                                version="any">
+                                <netex:Name>ITL 1</netex:Name>
+                                <netex:members>
+                                    <netex:ScheduledStopPointRef
+                                        ref="CITYWAY:ScheduledStopPoint:1-1:LOC" version="any"/>
+                                    <netex:ScheduledStopPointRef
+                                        ref="CITYWAY:ScheduledStopPoint:2-1:LOC" version="any"/>
+                                </netex:members>
+                                <netex:ZoneUse>cannotBoardAndAlightInSameZone</netex:ZoneUse>
+                            </netex:RoutingConstraintZone>
+                        </netex:routingConstraintZones>
+                    </netex:members>
+                </netex:GeneralFrame>
+                <netex:GeneralFrame id="CITYWAY:GeneralFrame:NETEX_HORAIRE-20170214090012:LOC"
+                    version="any">
+                    <netex:TypeOfFrameRef ref="NETEX_HORAIRE"/>
+                    <netex:members>
+                        <netex:serviceJourneys>
+                            <netex:ServiceJourney id="CITYWAY:ServiceJourney:1-1:LOC" version="any">
+                                <netex:Name>Course 1 par ici</netex:Name>
+                                <netex:noticeAssignments>
+                                    <netex:NoticeAssignment>
+												  <netex:NoticeRef ref="CITYWAY:Notice:1:LOC">
+                                            version="any"</netex:NoticeRef>
+                                    </netex:NoticeAssignment>
+                                </netex:noticeAssignments>
+										  <netex:DayTypeRef ref="CITYWAY:DayType:1:LOC">
+                                    version="any"</netex:DayTypeRef>
+                                <netex:JourneyPatternRef ref="CITYWAY:ServiceJourneyPattern:1:LOC"
+                                    version="any"/>
+										  <netex:OperatorRef ref="STIF:CODIFLIGNE:Operator:011">
+                                    version="any"</netex:OperatorRef>
+                                <netex:trainNumbers>
+											 <netex:TrainNumberRef ref="CITYWAY:TrainNumber:1234:LOC">version="any"</netex:TrainNumberRef>
+                                </netex:trainNumbers>
+                                <netex:passingTimes>
+                                    <netex:TimetabledPassingTime version="any">
+                                        <netex:ArrivalTime>01:01:00.000</netex:ArrivalTime>
+                                        <netex:ArrivalDayOffset>0</netex:ArrivalDayOffset>
+                                        <netex:DepartureTime>01:01:00.000</netex:DepartureTime>
+                                        <netex:DepartureDayOffset>0</netex:DepartureDayOffset>
+                                    </netex:TimetabledPassingTime>
+                                    <netex:TimetabledPassingTime version="any">
+                                        <netex:ArrivalTime>01:05:00.000</netex:ArrivalTime>
+                                        <netex:ArrivalDayOffset>0</netex:ArrivalDayOffset>
+                                        <netex:DepartureTime>01:05:00.000</netex:DepartureTime>
+                                        <netex:DepartureDayOffset>0</netex:DepartureDayOffset>
+                                    </netex:TimetabledPassingTime>
+                                </netex:passingTimes>
+                            </netex:ServiceJourney>
+                        </netex:serviceJourneys>
+                    </netex:members>
+                </netex:GeneralFrame>
+            </netex:frames>
+        </netex:CompositeFrame>
+    </netex:dataObjects>
+</netex:PublicationDelivery>
diff --git a/spec/fixtures/multiple_with_wrong_calendar/OFFRE_TRANSDEV_20170301122517/offre_C00109_10.xml b/spec/fixtures/multiple_with_wrong_calendar/OFFRE_TRANSDEV_20170301122517/offre_C00109_10.xml
new file mode 100644
index 000000000..9dff0d850
--- /dev/null
+++ b/spec/fixtures/multiple_with_wrong_calendar/OFFRE_TRANSDEV_20170301122517/offre_C00109_10.xml
@@ -0,0 +1,204 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<netex:PublicationDelivery xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.netex.org.uk/netex ../../xsd/NeTEx_publication.xsd"
+ xmlns:netex="http://www.netex.org.uk/netex" xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:ifopt="http://www.ifopt.org.uk/ifopt" xmlns:gml="http://www.opengis.net/gml/3.2"
+ xmlns:core="http://www.govtalk.gov.uk/core" xmlns:siri="http://www.siri.org.uk/siri" version="1.0">
+    <netex:PublicationTimestamp>2017-02-14T09:13:51.0</netex:PublicationTimestamp>
+    <netex:ParticipantRef>CITYWAY</netex:ParticipantRef>
+    <netex:dataObjects>
+        <netex:CompositeFrame id="CITYWAY:CompositeFrame:NETEX_OFFRE_LIGNE-1:LOC" version="any">
+            <netex:Name>Ligne 1</netex:Name>
+            <netex:TypeOfFrameRef ref="NETEX_OFFRE_LIGNE"/>
+            <netex:frames>
+                <netex:GeneralFrame id="CITYWAY:GeneralFrame:NETEX_STRUCTURE-20170214090012:LOC"
+                    version="any">
+                    <netex:TypeOfFrameRef ref="NETEX_STRUCTURE"/>
+                    <netex:members>
+                        <netex:routes>
+                            <netex:Route id="CITYWAY:Route:1:LOC" version="any">
+                                <netex:Name>route 1</netex:Name>
+										  <netex:LineRef ref="STIF:CODIFLIGNE:Line:C00109">version="any"</netex:LineRef>
+                                <netex:DirectionType>outbound</netex:DirectionType>
+                                <netex:DirectionRef ref="CITYWAY:Direction:1:LOC" version="any"/>
+                                <netex:InverseRouteRef ref="CITYWAY:Route:2:LOC" version="any"/>
+                            </netex:Route>
+                            <netex:Route id="CITYWAY:Route:2:LOC" version="any">
+                                <netex:Name>route 2</netex:Name>
+										  <netex:LineRef ref="STIF:CODIFLIGNE:Line:C00109">version="any"</netex:LineRef>
+                                <netex:DirectionType>inbound</netex:DirectionType>
+                                <netex:DirectionRef ref="CITYWAY:Direction:2:LOC" version="any"/>
+                                <netex:InverseRouteRef ref="CITYWAY:Route:1:LOC" version="any"/>
+                            </netex:Route>
+                        </netex:routes>
+                        <netex:directions>
+                            <netex:Direction id="CITYWAY:Direction:1:LOC" version="any">
+                                <netex:Name>Par ici aussi</netex:Name>
+                            </netex:Direction>
+                            <netex:Direction id="CITYWAY:Direction:2:LOC" version="any">
+                                <netex:Name>Par là aussi</netex:Name>
+                            </netex:Direction>
+                        </netex:directions>
+                        <netex:serviceJourneyPatterns>
+                            <netex:ServiceJourneyPattern id="CITYWAY:ServiceJourneyPattern:1:LOC"
+                                version="any">
+                                <netex:Name>Par ici itou</netex:Name>
+                                <netex:RouteRef ref="CITYWAY:Route:1:LOC" version="any"/>
+                                <netex:DestinationDisplayRef ref="CITYWAY:DestinationDisplay:1:LOC"
+                                    version="any"/>
+                                <netex:pointsInSequence>
+                                    <netex:StopPointInJourneyPattern
+                                        id="CITYWAY:StopPointInJourneyPattern:1-1-1:LOC" order="1"
+                                        version="any">
+                                        <netex:ScheduledStopPointRef
+                                            ref="CITYWAY:ScheduledStopPoint:1-1:LOC" version="any"/>
+                                        <netex:ForAlighting>true</netex:ForAlighting>
+                                        <netex:ForBoarding>true</netex:ForBoarding>
+                                    </netex:StopPointInJourneyPattern>
+                                    <netex:StopPointInJourneyPattern
+                                        id="CITYWAY:StopPointInJourneyPattern:1-1-2:LOC" order="2"
+                                        version="any">
+                                        <netex:ScheduledStopPointRef
+                                            ref="CITYWAY:ScheduledStopPoint:1-2:LOC" version="any"/>
+                                        <netex:ForAlighting>true</netex:ForAlighting>
+                                        <netex:ForBoarding>true</netex:ForBoarding>
+                                    </netex:StopPointInJourneyPattern>
+                                </netex:pointsInSequence>
+                                <netex:ServiceJourneyPatternType>passenger</netex:ServiceJourneyPatternType>
+                            </netex:ServiceJourneyPattern>
+                            <netex:ServiceJourneyPattern id="CITYWAY:ServiceJourneyPattern:2:LOC"
+                                version="any">
+                                <netex:Name>Par là itou</netex:Name>
+                                <netex:RouteRef ref="CITYWAY:Route:2:LOC" version="any"/>
+                                <netex:DestinationDisplayRef ref="CITYWAY:DestinationDisplay:2:LOC"
+                                    version="any"/>
+                                <netex:pointsInSequence>
+                                    <netex:StopPointInJourneyPattern
+                                        id="CITYWAY:StopPointInJourneyPattern:2-2-1:LOC" order="1"
+                                        version="any">
+                                        <netex:ScheduledStopPointRef
+                                            ref="CITYWAY:ScheduledStopPoint:2-1:LOC" version="any"/>
+                                        <netex:ForAlighting>true</netex:ForAlighting>
+                                        <netex:ForBoarding>true</netex:ForBoarding>
+                                    </netex:StopPointInJourneyPattern>
+                                    <netex:StopPointInJourneyPattern
+                                        id="CITYWAY:StopPointInJourneyPattern:2-2-2:LOC" order="2"
+                                        version="any">
+                                        <netex:ScheduledStopPointRef
+                                            ref="CITYWAY:ScheduledStopPoint:2-2:LOC" version="any"/>
+                                        <netex:ForAlighting>true</netex:ForAlighting>
+                                        <netex:ForBoarding>true</netex:ForBoarding>
+                                    </netex:StopPointInJourneyPattern>
+                                </netex:pointsInSequence>
+                                <netex:ServiceJourneyPatternType>passenger</netex:ServiceJourneyPatternType>
+                            </netex:ServiceJourneyPattern>
+                        </netex:serviceJourneyPatterns>
+                        <netex:destinationDisplays>
+                            <netex:DestinationDisplay id="CITYWAY:DestinationDisplay:1:LOC"
+                                version="any">
+                                <netex:FrontText>Mission 1 bis</netex:FrontText>
+                                <netex:PublicCode>1234</netex:PublicCode>
+                            </netex:DestinationDisplay>
+                            <netex:DestinationDisplay id="CITYWAY:DestinationDisplay:2:LOC"
+                                version="any">
+                                <netex:FrontText>Mission 2 bis</netex:FrontText>
+                                <netex:PublicCode>2345</netex:PublicCode>
+                            </netex:DestinationDisplay>
+                        </netex:destinationDisplays>
+                        <netex:scheduledStopPoints>
+                            <netex:ScheduledStopPoint id="CITYWAY:ScheduledStopPoint:1-1:LOC"
+                                version="any"/>
+                            <netex:ScheduledStopPoint id="CITYWAY:ScheduledStopPoint:1-2:LOC"
+                                version="any"/>
+                            <netex:ScheduledStopPoint id="CITYWAY:ScheduledStopPoint:2-1:LOC"
+                                version="any"/>
+                            <netex:ScheduledStopPoint id="CITYWAY:ScheduledStopPoint:2-2:LOC"
+                                version="any"/>
+                        </netex:scheduledStopPoints>
+                        <netex:passengerStopAssignments>
+                            <netex:PassengerStopAssignment
+                                id="CITYWAY:PassengerStopAssignment:1-1:LOC" version="any">
+                                <netex:ScheduledStopPointRef
+                                    ref="CITYWAY:ScheduledStopPoint:1-1:LOC" version="any"/>
+										  <netex:QuayRef ref="FR:78217:ZDE:50094817:STIF">version="any"</netex:QuayRef>
+                            </netex:PassengerStopAssignment>
+                            <netex:PassengerStopAssignment
+                                id="CITYWAY:PassengerStopAssignment:2-1:LOC" version="any">
+                                <netex:ScheduledStopPointRef
+                                    ref="CITYWAY:ScheduledStopPoint:2-1:LOC" version="any"/>
+										  <netex:QuayRef ref="FR:78402:ZDE:50000918:STIF">version="any"</netex:QuayRef>
+                            </netex:PassengerStopAssignment>
+                            <netex:PassengerStopAssignment
+                                id="CITYWAY:PassengerStopAssignment:1-2:LOC" version="any">
+                                <netex:ScheduledStopPointRef
+                                    ref="CITYWAY:ScheduledStopPoint:1-2:LOC" version="any"/>
+										  <netex:QuayRef ref="FR:78402:ZDE:50000917:STIF">version="any"</netex:QuayRef>
+                            </netex:PassengerStopAssignment>
+                            <netex:PassengerStopAssignment
+                                id="CITYWAY:PassengerStopAssignment:2-2:LOC" version="any">
+                                <netex:ScheduledStopPointRef
+                                    ref="CITYWAY:ScheduledStopPoint:2-2:LOC" version="any"/>
+										  <netex:QuayRef ref="FR:78217:ZDE:50094816:STIF">version="any"</netex:QuayRef>
+                            </netex:PassengerStopAssignment>
+                        </netex:passengerStopAssignments>
+                        <netex:routingConstraintZones>
+                            <netex:RoutingConstraintZone id="CITYWAY:RoutingConstraintZone:1:LOC"
+                                version="any">
+                                <netex:Name>ITL 1</netex:Name>
+                                <netex:members>
+                                    <netex:ScheduledStopPointRef
+                                        ref="CITYWAY:ScheduledStopPoint:1-1:LOC" version="any"/>
+                                    <netex:ScheduledStopPointRef
+                                        ref="CITYWAY:ScheduledStopPoint:2-1:LOC" version="any"/>
+                                </netex:members>
+                                <netex:ZoneUse>cannotBoardAndAlightInSameZone</netex:ZoneUse>
+                            </netex:RoutingConstraintZone>
+                        </netex:routingConstraintZones>
+                    </netex:members>
+                </netex:GeneralFrame>
+                <netex:GeneralFrame id="CITYWAY:GeneralFrame:NETEX_HORAIRE-20170214090012:LOC"
+                    version="any">
+                    <netex:TypeOfFrameRef ref="NETEX_HORAIRE"/>
+                    <netex:members>
+                        <netex:serviceJourneys>
+                            <netex:ServiceJourney id="CITYWAY:ServiceJourney:1-1:LOC" version="any">
+                                <netex:Name>Course 1 par ici aussi</netex:Name>
+                                <netex:noticeAssignments>
+                                    <netex:NoticeAssignment>
+												  <netex:NoticeRef ref="CITYWAY:Notice:2:LOC">
+                                            version="any"</netex:NoticeRef>
+                                    </netex:NoticeAssignment>
+                                </netex:noticeAssignments>
+										  <netex:DayTypeRef ref="CITYWAY:DayType:1:LOC">
+                                    version="any"</netex:DayTypeRef>
+										  <netex:DayTypeRef ref="CITYWAY:DayType:4:LOC">
+                                    version="any"</netex:DayTypeRef>
+                                <netex:JourneyPatternRef ref="CITYWAY:ServiceJourneyPattern:1:LOC"
+                                    version="any"/>
+										  <netex:OperatorRef ref="STIF:CODIFLIGNE:Operator:212">
+                                    version="any"</netex:OperatorRef>
+                                <netex:trainNumbers>
+											 <netex:TrainNumberRef ref="CITYWAY:TrainNumber:1234:LOC">version="any"</netex:TrainNumberRef>
+                                </netex:trainNumbers>
+                                <netex:passingTimes>
+                                    <netex:TimetabledPassingTime version="any">
+                                        <netex:ArrivalTime>23:58:00.000</netex:ArrivalTime>
+                                        <netex:ArrivalDayOffset>0</netex:ArrivalDayOffset>
+                                        <netex:DepartureTime>23:59:00.000</netex:DepartureTime>
+                                        <netex:DepartureDayOffset>0</netex:DepartureDayOffset>
+                                    </netex:TimetabledPassingTime>
+                                    <netex:TimetabledPassingTime version="any">
+                                        <netex:ArrivalTime>00:03:00.000</netex:ArrivalTime>
+                                        <netex:ArrivalDayOffset>1</netex:ArrivalDayOffset>
+                                        <netex:DepartureTime>00:04:00.000</netex:DepartureTime>
+                                        <netex:DepartureDayOffset>1</netex:DepartureDayOffset>
+                                    </netex:TimetabledPassingTime>
+                                </netex:passingTimes>
+                            </netex:ServiceJourney>
+                        </netex:serviceJourneys>
+                    </netex:members>
+                </netex:GeneralFrame>
+            </netex:frames>
+        </netex:CompositeFrame>
+    </netex:dataObjects>
+</netex:PublicationDelivery>
diff --git a/spec/fixtures/multiple_with_wrong_calendar/OFFRE_TRANSDEV_20170301122519/calendriers.xml b/spec/fixtures/multiple_with_wrong_calendar/OFFRE_TRANSDEV_20170301122519/calendriers.xml
new file mode 100644
index 000000000..712ea8be1
--- /dev/null
+++ b/spec/fixtures/multiple_with_wrong_calendar/OFFRE_TRANSDEV_20170301122519/calendriers.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<netex:PublicationDelivery xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.netex.org.uk/netex ../../xsd/NeTEx_publication.xsd" xmlns:netex="http://www.netex.org.uk/netex"
+    xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ifopt="http://www.ifopt.org.uk/ifopt"
+    xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:core="http://www.govtalk.gov.uk/core"
+    xmlns:siri="http://www.siri.org.uk/siri" version="1.0">
+    <netex:PublicationTimestamp>2017-02-14T09:13:51.0</netex:PublicationTimestamp>
+    <netex:ParticipantRef>CITYWAY</netex:ParticipantRef>
+    <netex:dataObjects>
+        <netex:GeneralFrame id="CITYWAY:GeneralFrame:NETEX_CALENDRIER-1_20170214090012:LOC" version="any">
+            <netex:ValidBetween>
+                <netex:FromDate>2017-04-01T00:00:00</netex:FromDate>
+                <netex:ToDate>2016-12-31T00:00:00</netex:ToDate>
+            </netex:ValidBetween>
+            <netex:TypeOfFrameRef ref="NETEX_CALENDRIER"/>
+            <netex:members>
+                <netex:DayType id="CITYWAY:DayType:1:LOC" version="any">
+                    <netex:Name>Semaine</netex:Name>
+                    <netex:properties>
+                        <netex:PropertyOfDay>
+                            <netex:DaysOfWeek>Monday</netex:DaysOfWeek>
+                        </netex:PropertyOfDay>
+                        <netex:PropertyOfDay>
+                            <netex:DaysOfWeek>Tuesday</netex:DaysOfWeek>
+                        </netex:PropertyOfDay>
+                        <netex:PropertyOfDay>
+                            <netex:DaysOfWeek>Wednesday</netex:DaysOfWeek>
+                        </netex:PropertyOfDay>
+                        <netex:PropertyOfDay>
+                            <netex:DaysOfWeek>Thursday</netex:DaysOfWeek>
+                        </netex:PropertyOfDay>
+                        <netex:PropertyOfDay>
+                            <netex:DaysOfWeek>Friday</netex:DaysOfWeek>
+                        </netex:PropertyOfDay>
+                    </netex:properties>
+                </netex:DayType>
+                <netex:DayType id="CITYWAY:DayType:2:LOC" version="any">
+                    <netex:Name>Fin de semaine</netex:Name>
+                    <netex:properties>
+                        <netex:PropertyOfDay>
+                            <netex:DaysOfWeek>Saturday</netex:DaysOfWeek>
+                        </netex:PropertyOfDay>
+                        <netex:PropertyOfDay>
+                            <netex:DaysOfWeek>Sunday</netex:DaysOfWeek>
+                        </netex:PropertyOfDay>
+                    </netex:properties>
+                </netex:DayType>
+                <netex:DayType id="CITYWAY:DayType:3:LOC" version="any">
+                    <netex:Name>Service spécial</netex:Name>
+                </netex:DayType>
+                <netex:DayType id="CITYWAY:DayType:4:LOC" version="any">
+                    <netex:Name>Restriction</netex:Name>
+                </netex:DayType>
+                <netex:DayTypeAssignment id="dta1" version="any" order="0">
+                    <netex:OperatingPeriodRef ref="CITYWAY:OperatingPeriod:1:LOC" version="any"/>
+                    <netex:DayTypeRef ref="CITYWAY:DayType:1:LOC" version="any"/>
+                </netex:DayTypeAssignment>
+                <netex:DayTypeAssignment id="dta2" version="any" order="0">
+                    <netex:OperatingPeriodRef ref="CITYWAY:OperatingPeriod:1:LOC" version="any"/>
+                    <netex:DayTypeRef ref="CITYWAY:DayType:2:LOC" version="any"/>
+                </netex:DayTypeAssignment>
+                <netex:DayTypeAssignment id="dta3" version="any" order="0">
+                    <netex:Date>2017-03-15</netex:Date>
+                    <netex:DayTypeRef ref="CITYWAY:DayType:3:LOC" version="any"/>
+                    <netex:isAvailable>true</netex:isAvailable>
+                </netex:DayTypeAssignment>
+                <netex:DayTypeAssignment id="dta4" version="any" order="0">
+                    <netex:Date>2017-03-15</netex:Date>
+                    <netex:DayTypeRef ref="CITYWAY:DayType:4:LOC" version="any"/>
+                    <netex:isAvailable>false</netex:isAvailable>
+                </netex:DayTypeAssignment>
+                <netex:OperatingPeriod id="CITYWAY:OperatingPeriod:1:LOC" version="any">
+                    <netex:FromDate>2017-01-01T00:00:00</netex:FromDate>
+                    <netex:ToDate>2017-12-31T00:00:00</netex:ToDate>
+                </netex:OperatingPeriod>
+
+            </netex:members>
+        </netex:GeneralFrame>
+    </netex:dataObjects>
+</netex:PublicationDelivery>
diff --git a/spec/fixtures/multiple_with_wrong_calendar/OFFRE_TRANSDEV_20170301122519/commun.xml b/spec/fixtures/multiple_with_wrong_calendar/OFFRE_TRANSDEV_20170301122519/commun.xml
new file mode 100644
index 000000000..f59f8ac2d
--- /dev/null
+++ b/spec/fixtures/multiple_with_wrong_calendar/OFFRE_TRANSDEV_20170301122519/commun.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<netex:PublicationDelivery xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.netex.org.uk/netex ../../xsd/NeTEx_publication.xsd" xmlns:netex="http://www.netex.org.uk/netex"
+ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ifopt="http://www.ifopt.org.uk/ifopt" xmlns:gml="http://www.opengis.net/gml/3.2"
+ xmlns:core="http://www.govtalk.gov.uk/core" xmlns:siri="http://www.siri.org.uk/siri" version="1.0">
+    <netex:PublicationTimestamp>2017-02-14T09:13:51.0</netex:PublicationTimestamp>
+    <netex:ParticipantRef>CITYWAY</netex:ParticipantRef>
+    <netex:dataObjects>
+        <netex:GeneralFrame id="CITYWAY:GeneralFrame:NETEX_COMMUN-1_20170214090012:LOC" version="any">
+            <netex:TypeOfFrameRef ref="NETEX_COMMUN"/>
+            <netex:members>
+               
+                    <netex:Notice id="CITYWAY:Notice:1:LOC" version="any">
+                        <netex:Text>Notice 1</netex:Text>
+                        <netex:PublicCode>1</netex:PublicCode>
+                        <netex:TypeOfNoticeRef ref="ServiceJourneyNotice"/>
+                    </netex:Notice>
+                    <netex:Notice id="CITYWAY:Notice:2:LOC" version="any">
+                        <netex:Text>Notice 2</netex:Text>
+                        <netex:PublicCode>2</netex:PublicCode>
+                        <netex:TypeOfNoticeRef ref="ServiceJourneyNotice"/>
+                    </netex:Notice>
+                    <netex:Notice id="CITYWAY:Notice:3:LOC" version="any">
+                        <netex:Text>Notice 3</netex:Text>
+                        <netex:PublicCode>3</netex:PublicCode>
+                        <netex:TypeOfNoticeRef ref="ServiceJourneyNotice"/>
+                    </netex:Notice>
+                
+            </netex:members>
+        </netex:GeneralFrame>
+    </netex:dataObjects>
+</netex:PublicationDelivery>
diff --git a/spec/fixtures/multiple_with_wrong_calendar/OFFRE_TRANSDEV_20170301122519/offre_C00108_9.xml b/spec/fixtures/multiple_with_wrong_calendar/OFFRE_TRANSDEV_20170301122519/offre_C00108_9.xml
new file mode 100644
index 000000000..9eefeeb43
--- /dev/null
+++ b/spec/fixtures/multiple_with_wrong_calendar/OFFRE_TRANSDEV_20170301122519/offre_C00108_9.xml
@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<netex:PublicationDelivery xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.netex.org.uk/netex ../../xsd/NeTEx_publication.xsd" xmlns:netex="http://www.netex.org.uk/netex"
+    xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ifopt="http://www.ifopt.org.uk/ifopt"
+    xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:core="http://www.govtalk.gov.uk/core"
+    xmlns:siri="http://www.siri.org.uk/siri" version="1.0">
+    <netex:PublicationTimestamp>2017-02-14T09:13:51.0</netex:PublicationTimestamp>
+    <netex:ParticipantRef>CITYWAY</netex:ParticipantRef>
+    <netex:dataObjects>
+        <netex:CompositeFrame id="CITYWAY:CompositeFrame:NETEX_OFFRE_LIGNE-1:LOC" version="any">
+            <netex:Name>Ligne 1</netex:Name>
+            <netex:TypeOfFrameRef ref="NETEX_OFFRE_LIGNE"/>
+            <netex:frames>
+                <netex:GeneralFrame id="CITYWAY:GeneralFrame:NETEX_STRUCTURE-20170214090012:LOC" version="any">
+                    <netex:TypeOfFrameRef ref="NETEX_STRUCTURE"/>
+                    <netex:members>
+
+                        <netex:Route id="CITYWAY:Route:1:LOC" version="any">
+                            <netex:Name>route 1</netex:Name>
+                            <netex:LineRef ref="STIF:CODIFLIGNE:Line:C00108">version="any"</netex:LineRef>
+                            <netex:DirectionType>outbound</netex:DirectionType>
+                            <netex:DirectionRef ref="CITYWAY:Direction:1:LOC" version="any"/>
+                            <netex:InverseRouteRef ref="CITYWAY:Route:2:LOC" version="any"/>
+                        </netex:Route>
+                        <netex:Route id="CITYWAY:Route:2:LOC" version="any">
+                            <netex:Name>route 2</netex:Name>
+                            <netex:LineRef ref="STIF:CODIFLIGNE:Line:C00108">version="any"</netex:LineRef>
+                            <netex:DirectionType>inbound</netex:DirectionType>
+                            <netex:DirectionRef ref="CITYWAY:Direction:2:LOC" version="any"/>
+                            <netex:InverseRouteRef ref="CITYWAY:Route:1:LOC" version="any"/>
+                        </netex:Route>
+
+
+                        <netex:Direction id="CITYWAY:Direction:1:LOC" version="any">
+                            <netex:Name>Par ici</netex:Name>
+                        </netex:Direction>
+                        <netex:Direction id="CITYWAY:Direction:2:LOC" version="any">
+                            <netex:Name>Par là</netex:Name>
+                        </netex:Direction>
+
+
+                        <netex:ServiceJourneyPattern id="CITYWAY:ServiceJourneyPattern:1:LOC" version="any">
+                            <netex:Name>Par ici</netex:Name>
+                            <netex:RouteRef ref="CITYWAY:Route:1:LOC" version="any"/>
+                            <netex:DestinationDisplayRef ref="CITYWAY:DestinationDisplay:1:LOC" version="any"/>
+                            <netex:pointsInSequence>
+                                <netex:StopPointInJourneyPattern id="CITYWAY:StopPointInJourneyPattern:1-1-1:LOC" order="1"
+                                    version="any">
+                                    <netex:ScheduledStopPointRef ref="CITYWAY:ScheduledStopPoint:1-1:LOC" version="any"/>
+                                    <netex:ForAlighting>true</netex:ForAlighting>
+                                    <netex:ForBoarding>true</netex:ForBoarding>
+                                </netex:StopPointInJourneyPattern>
+                                <netex:StopPointInJourneyPattern id="CITYWAY:StopPointInJourneyPattern:1-1-2:LOC" order="2"
+                                    version="any">
+                                    <netex:ScheduledStopPointRef ref="CITYWAY:ScheduledStopPoint:1-2:LOC" version="any"/>
+                                    <netex:ForAlighting>true</netex:ForAlighting>
+                                    <netex:ForBoarding>true</netex:ForBoarding>
+                                </netex:StopPointInJourneyPattern>
+                            </netex:pointsInSequence>
+                            <netex:ServiceJourneyPatternType>passenger</netex:ServiceJourneyPatternType>
+                        </netex:ServiceJourneyPattern>
+                        <netex:ServiceJourneyPattern id="CITYWAY:ServiceJourneyPattern:2:LOC" version="any">
+                            <netex:Name>Par là</netex:Name>
+                            <netex:RouteRef ref="CITYWAY:Route:2:LOC" version="any"/>
+                            <netex:DestinationDisplayRef ref="CITYWAY:DestinationDisplay:2:LOC" version="any"/>
+                            <netex:pointsInSequence>
+                                <netex:StopPointInJourneyPattern id="CITYWAY:StopPointInJourneyPattern:2-2-1:LOC" order="1"
+                                    version="any">
+                                    <netex:ScheduledStopPointRef ref="CITYWAY:ScheduledStopPoint:2-1:LOC" version="any"/>
+                                    <netex:ForAlighting>true</netex:ForAlighting>
+                                    <netex:ForBoarding>true</netex:ForBoarding>
+                                </netex:StopPointInJourneyPattern>
+                                <netex:StopPointInJourneyPattern id="CITYWAY:StopPointInJourneyPattern:2-2-2:LOC" order="2"
+                                    version="any">
+                                    <netex:ScheduledStopPointRef ref="CITYWAY:ScheduledStopPoint:2-2:LOC" version="any"/>
+                                    <netex:ForAlighting>true</netex:ForAlighting>
+                                    <netex:ForBoarding>true</netex:ForBoarding>
+                                </netex:StopPointInJourneyPattern>
+                            </netex:pointsInSequence>
+                            <netex:ServiceJourneyPatternType>passenger</netex:ServiceJourneyPatternType>
+                        </netex:ServiceJourneyPattern>
+
+
+                        <netex:DestinationDisplay id="CITYWAY:DestinationDisplay:1:LOC" version="any">
+                            <netex:FrontText>Mission 1</netex:FrontText>
+                            <netex:PublicCode>1234</netex:PublicCode>
+                        </netex:DestinationDisplay>
+                        <netex:DestinationDisplay id="CITYWAY:DestinationDisplay:2:LOC" version="any">
+                            <netex:FrontText>Mission 2</netex:FrontText>
+                            <netex:PublicCode>2345</netex:PublicCode>
+                        </netex:DestinationDisplay>
+
+
+                        <netex:ScheduledStopPoint id="CITYWAY:ScheduledStopPoint:1-1:LOC" version="any"/>
+                        <netex:ScheduledStopPoint id="CITYWAY:ScheduledStopPoint:1-2:LOC" version="any"/>
+                        <netex:ScheduledStopPoint id="CITYWAY:ScheduledStopPoint:2-1:LOC" version="any"/>
+                        <netex:ScheduledStopPoint id="CITYWAY:ScheduledStopPoint:2-2:LOC" version="any"/>
+
+
+                        <netex:PassengerStopAssignment id="CITYWAY:PassengerStopAssignment:1-1:LOC" version="any" order="0">
+                            <netex:ScheduledStopPointRef ref="CITYWAY:ScheduledStopPoint:1-1:LOC" version="any"/>
+                            <netex:QuayRef ref="FR:78217:ZDE:50094817:STIF">version="any"</netex:QuayRef>
+                        </netex:PassengerStopAssignment>
+                        <netex:PassengerStopAssignment id="CITYWAY:PassengerStopAssignment:2-1:LOC" version="any" order="0">
+                            <netex:ScheduledStopPointRef ref="CITYWAY:ScheduledStopPoint:2-1:LOC" version="any"/>
+                            <netex:QuayRef ref="FR:78217:ZDE:50009052:STIF">version="any"</netex:QuayRef>
+                        </netex:PassengerStopAssignment>
+                        <netex:PassengerStopAssignment id="CITYWAY:PassengerStopAssignment:1-2:LOC" version="any" order="0">
+                            <netex:ScheduledStopPointRef ref="CITYWAY:ScheduledStopPoint:1-2:LOC" version="any"/>
+                            <netex:QuayRef ref="FR:78217:ZDE:50009053:STIF">version="any"</netex:QuayRef>
+                        </netex:PassengerStopAssignment>
+                        <netex:PassengerStopAssignment id="CITYWAY:PassengerStopAssignment:2-2:LOC" version="any" order="0">
+                            <netex:ScheduledStopPointRef ref="CITYWAY:ScheduledStopPoint:2-2:LOC" version="any"/>
+                            <netex:QuayRef ref="FR:78217:ZDE:50094816:STIF">version="any"</netex:QuayRef>
+                        </netex:PassengerStopAssignment>
+
+
+                        <netex:RoutingConstraintZone id="CITYWAY:RoutingConstraintZone:1:LOC" version="any">
+                            <netex:Name>ITL 1</netex:Name>
+                            <netex:members>
+                                <netex:ScheduledStopPointRef ref="CITYWAY:ScheduledStopPoint:1-1:LOC" version="any"/>
+                                <netex:ScheduledStopPointRef ref="CITYWAY:ScheduledStopPoint:1-2:LOC" version="any"/>
+                            </netex:members>
+                            <netex:ZoneUse>cannotBoardAndAlightInSameZone</netex:ZoneUse>
+                        </netex:RoutingConstraintZone>
+
+                    </netex:members>
+                </netex:GeneralFrame>
+                <netex:GeneralFrame id="CITYWAY:GeneralFrame:NETEX_HORAIRE-20170214090012:LOC" version="any">
+                    <netex:TypeOfFrameRef ref="NETEX_HORAIRE"/>
+                    <netex:members>
+
+                        <netex:ServiceJourney id="CITYWAY:ServiceJourney:1-1:LOC" version="any">
+                            <netex:Name>Course 1 par ici</netex:Name>
+                            <netex:noticeAssignments>
+                                <netex:NoticeAssignment id="ns1" version="any" order="0">
+                                    <netex:NoticeRef ref="CITYWAY:Notice:1:LOC">
+                                            version="any"</netex:NoticeRef>
+                                </netex:NoticeAssignment>
+                            </netex:noticeAssignments>
+                            <netex:dayTypes>
+                                <netex:DayTypeRef ref="CITYWAY:DayType:1:LOC"> version="any"</netex:DayTypeRef>
+                            </netex:dayTypes>
+
+                            <netex:JourneyPatternRef ref="CITYWAY:ServiceJourneyPattern:1:LOC" version="any"/>
+                            <netex:OperatorRef ref="STIF:CODIFLIGNE:Operator:011">
+                                    version="any"</netex:OperatorRef>
+                            <netex:trainNumbers>
+                                <netex:TrainNumberRef ref="CITYWAY:TrainNumber:1234:LOC">version="any"</netex:TrainNumberRef>
+                            </netex:trainNumbers>
+                            <netex:passingTimes>
+                                <netex:TimetabledPassingTime version="any">
+                                    <netex:ArrivalTime>01:01:00.000</netex:ArrivalTime>
+                                    <netex:ArrivalDayOffset>0</netex:ArrivalDayOffset>
+                                    <netex:DepartureTime>01:01:00.000</netex:DepartureTime>
+                                    <netex:DepartureDayOffset>0</netex:DepartureDayOffset>
+                                </netex:TimetabledPassingTime>
+                                <netex:TimetabledPassingTime version="any">
+                                    <netex:ArrivalTime>01:05:00.000</netex:ArrivalTime>
+                                    <netex:ArrivalDayOffset>0</netex:ArrivalDayOffset>
+                                    <netex:DepartureTime>01:05:00.000</netex:DepartureTime>
+                                    <netex:DepartureDayOffset>0</netex:DepartureDayOffset>
+                                </netex:TimetabledPassingTime>
+                            </netex:passingTimes>
+                        </netex:ServiceJourney>
+
+                    </netex:members>
+                </netex:GeneralFrame>
+            </netex:frames>
+        </netex:CompositeFrame>
+    </netex:dataObjects>
+</netex:PublicationDelivery>
diff --git a/spec/fixtures/multiple_with_wrong_calendar/OFFRE_TRANSDEV_20170301122519/offre_C00109_10.xml b/spec/fixtures/multiple_with_wrong_calendar/OFFRE_TRANSDEV_20170301122519/offre_C00109_10.xml
new file mode 100644
index 000000000..d260ef17e
--- /dev/null
+++ b/spec/fixtures/multiple_with_wrong_calendar/OFFRE_TRANSDEV_20170301122519/offre_C00109_10.xml
@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<netex:PublicationDelivery xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.netex.org.uk/netex ../../xsd/NeTEx_publication.xsd" xmlns:netex="http://www.netex.org.uk/netex"
+    xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ifopt="http://www.ifopt.org.uk/ifopt"
+    xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:core="http://www.govtalk.gov.uk/core"
+    xmlns:siri="http://www.siri.org.uk/siri" version="1.0">
+    <netex:PublicationTimestamp>2017-02-14T09:13:51.0</netex:PublicationTimestamp>
+    <netex:ParticipantRef>CITYWAY</netex:ParticipantRef>
+    <netex:dataObjects>
+        <netex:CompositeFrame id="CITYWAY:CompositeFrame:NETEX_OFFRE_LIGNE-1:LOC" version="any">
+            <netex:Name>Ligne 1</netex:Name>
+            <netex:TypeOfFrameRef ref="NETEX_OFFRE_LIGNE"/>
+            <netex:frames>
+                <netex:GeneralFrame id="CITYWAY:GeneralFrame:NETEX_STRUCTURE-20170214090012:LOC" version="any">
+                    <netex:TypeOfFrameRef ref="NETEX_STRUCTURE"/>
+                    <netex:members>
+
+                        <netex:Route id="CITYWAY:Route:1:LOC" version="any">
+                            <netex:Name>route 1</netex:Name>
+                            <netex:LineRef ref="STIF:CODIFLIGNE:Line:C00109">version="any"</netex:LineRef>
+                            <netex:DirectionType>outbound</netex:DirectionType>
+                            <netex:DirectionRef ref="CITYWAY:Direction:1:LOC" version="any"/>
+                            <netex:InverseRouteRef ref="CITYWAY:Route:2:LOC" version="any"/>
+                        </netex:Route>
+                        <netex:Route id="CITYWAY:Route:2:LOC" version="any">
+                            <netex:Name>route 2</netex:Name>
+                            <netex:LineRef ref="STIF:CODIFLIGNE:Line:C00109">version="any"</netex:LineRef>
+                            <netex:DirectionType>inbound</netex:DirectionType>
+                            <netex:DirectionRef ref="CITYWAY:Direction:2:LOC" version="any"/>
+                            <netex:InverseRouteRef ref="CITYWAY:Route:1:LOC" version="any"/>
+                        </netex:Route>
+
+
+                        <netex:Direction id="CITYWAY:Direction:1:LOC" version="any">
+                            <netex:Name>Par ici aussi</netex:Name>
+                        </netex:Direction>
+                        <netex:Direction id="CITYWAY:Direction:2:LOC" version="any">
+                            <netex:Name>Par là aussi</netex:Name>
+                        </netex:Direction>
+
+
+                        <netex:ServiceJourneyPattern id="CITYWAY:ServiceJourneyPattern:1:LOC" version="any">
+                            <netex:Name>Par ici itou</netex:Name>
+                            <netex:RouteRef ref="CITYWAY:Route:1:LOC" version="any"/>
+                            <netex:DestinationDisplayRef ref="CITYWAY:DestinationDisplay:1:LOC" version="any"/>
+                            <netex:pointsInSequence>
+                                <netex:StopPointInJourneyPattern id="CITYWAY:StopPointInJourneyPattern:1-1-1:LOC" order="1"
+                                    version="any">
+                                    <netex:ScheduledStopPointRef ref="CITYWAY:ScheduledStopPoint:1-1:LOC" version="any"/>
+                                    <netex:ForAlighting>true</netex:ForAlighting>
+                                    <netex:ForBoarding>true</netex:ForBoarding>
+                                </netex:StopPointInJourneyPattern>
+                                <netex:StopPointInJourneyPattern id="CITYWAY:StopPointInJourneyPattern:1-1-2:LOC" order="2"
+                                    version="any">
+                                    <netex:ScheduledStopPointRef ref="CITYWAY:ScheduledStopPoint:1-2:LOC" version="any"/>
+                                    <netex:ForAlighting>true</netex:ForAlighting>
+                                    <netex:ForBoarding>true</netex:ForBoarding>
+                                </netex:StopPointInJourneyPattern>
+                            </netex:pointsInSequence>
+                            <netex:ServiceJourneyPatternType>passenger</netex:ServiceJourneyPatternType>
+                        </netex:ServiceJourneyPattern>
+                        <netex:ServiceJourneyPattern id="CITYWAY:ServiceJourneyPattern:2:LOC" version="any">
+                            <netex:Name>Par là itou</netex:Name>
+                            <netex:RouteRef ref="CITYWAY:Route:2:LOC" version="any"/>
+                            <netex:DestinationDisplayRef ref="CITYWAY:DestinationDisplay:2:LOC" version="any"/>
+                            <netex:pointsInSequence>
+                                <netex:StopPointInJourneyPattern id="CITYWAY:StopPointInJourneyPattern:2-2-1:LOC" order="1"
+                                    version="any">
+                                    <netex:ScheduledStopPointRef ref="CITYWAY:ScheduledStopPoint:2-1:LOC" version="any"/>
+                                    <netex:ForAlighting>true</netex:ForAlighting>
+                                    <netex:ForBoarding>true</netex:ForBoarding>
+                                </netex:StopPointInJourneyPattern>
+                                <netex:StopPointInJourneyPattern id="CITYWAY:StopPointInJourneyPattern:2-2-2:LOC" order="2"
+                                    version="any">
+                                    <netex:ScheduledStopPointRef ref="CITYWAY:ScheduledStopPoint:2-2:LOC" version="any"/>
+                                    <netex:ForAlighting>true</netex:ForAlighting>
+                                    <netex:ForBoarding>true</netex:ForBoarding>
+                                </netex:StopPointInJourneyPattern>
+                            </netex:pointsInSequence>
+                            <netex:ServiceJourneyPatternType>passenger</netex:ServiceJourneyPatternType>
+                        </netex:ServiceJourneyPattern>
+
+
+                        <netex:DestinationDisplay id="CITYWAY:DestinationDisplay:1:LOC" version="any">
+                            <netex:FrontText>Mission 1 bis</netex:FrontText>
+                            <netex:PublicCode>1234</netex:PublicCode>
+                        </netex:DestinationDisplay>
+                        <netex:DestinationDisplay id="CITYWAY:DestinationDisplay:2:LOC" version="any">
+                            <netex:FrontText>Mission 2 bis</netex:FrontText>
+                            <netex:PublicCode>2345</netex:PublicCode>
+                        </netex:DestinationDisplay>
+
+
+                        <netex:ScheduledStopPoint id="CITYWAY:ScheduledStopPoint:1-1:LOC" version="any"/>
+                        <netex:ScheduledStopPoint id="CITYWAY:ScheduledStopPoint:1-2:LOC" version="any"/>
+                        <netex:ScheduledStopPoint id="CITYWAY:ScheduledStopPoint:2-1:LOC" version="any"/>
+                        <netex:ScheduledStopPoint id="CITYWAY:ScheduledStopPoint:2-2:LOC" version="any"/>
+
+
+                        <netex:PassengerStopAssignment id="CITYWAY:PassengerStopAssignment:1-1:LOC" version="any" order="0">
+                            <netex:ScheduledStopPointRef ref="CITYWAY:ScheduledStopPoint:1-1:LOC" version="any"/>
+                            <netex:QuayRef ref="FR:78217:ZDE:50094817:STIF">version="any"</netex:QuayRef>
+                        </netex:PassengerStopAssignment>
+                        <netex:PassengerStopAssignment id="CITYWAY:PassengerStopAssignment:2-1:LOC" version="any" order="0">
+                            <netex:ScheduledStopPointRef ref="CITYWAY:ScheduledStopPoint:2-1:LOC" version="any"/>
+                            <netex:QuayRef ref="FR:78402:ZDE:50000918:STIF">version="any"</netex:QuayRef>
+                        </netex:PassengerStopAssignment>
+                        <netex:PassengerStopAssignment id="CITYWAY:PassengerStopAssignment:1-2:LOC" version="any" order="0">
+                            <netex:ScheduledStopPointRef ref="CITYWAY:ScheduledStopPoint:1-2:LOC" version="any"/>
+                            <netex:QuayRef ref="FR:78402:ZDE:50000917:STIF">version="any"</netex:QuayRef>
+                        </netex:PassengerStopAssignment>
+                        <netex:PassengerStopAssignment id="CITYWAY:PassengerStopAssignment:2-2:LOC" version="any" order="0">
+                            <netex:ScheduledStopPointRef ref="CITYWAY:ScheduledStopPoint:2-2:LOC" version="any"/>
+                            <netex:QuayRef ref="FR:78217:ZDE:50094816:STIF">version="any"</netex:QuayRef>
+                        </netex:PassengerStopAssignment>
+
+
+                        <netex:RoutingConstraintZone id="CITYWAY:RoutingConstraintZone:1:LOC" version="any">
+                            <netex:Name>ITL 1</netex:Name>
+                            <netex:members>
+                                <netex:ScheduledStopPointRef ref="CITYWAY:ScheduledStopPoint:1-1:LOC" version="any"/>
+                                <netex:ScheduledStopPointRef ref="CITYWAY:ScheduledStopPoint:1-2:LOC" version="any"/>
+                            </netex:members>
+                            <netex:ZoneUse>cannotBoardAndAlightInSameZone</netex:ZoneUse>
+                        </netex:RoutingConstraintZone>
+
+                    </netex:members>
+                </netex:GeneralFrame>
+                <netex:GeneralFrame id="CITYWAY:GeneralFrame:NETEX_HORAIRE-20170214090012:LOC" version="any">
+                    <netex:TypeOfFrameRef ref="NETEX_HORAIRE"/>
+                    <netex:members>
+
+                        <netex:ServiceJourney id="CITYWAY:ServiceJourney:1-1:LOC" version="any">
+                            <netex:Name>Course 1 par ici aussi</netex:Name>
+                            <netex:noticeAssignments>
+                                <netex:NoticeAssignment id="ns1" version="any" order="0">
+                                    <netex:NoticeRef ref="CITYWAY:Notice:2:LOC">
+                                            version="any"</netex:NoticeRef>
+                                </netex:NoticeAssignment>
+                            </netex:noticeAssignments>
+                            <netex:dayTypes>
+                                <netex:DayTypeRef ref="CITYWAY:DayType:1:LOC"> version="any"</netex:DayTypeRef>
+                                <netex:DayTypeRef ref="CITYWAY:DayType:4:LOC"> version="any"</netex:DayTypeRef>
+                            </netex:dayTypes>
+                            <netex:JourneyPatternRef ref="CITYWAY:ServiceJourneyPattern:1:LOC" version="any"/>
+                            <netex:OperatorRef ref="STIF:CODIFLIGNE:Operator:212">
+                                    version="any"</netex:OperatorRef>
+                            <netex:trainNumbers>
+                                <netex:TrainNumberRef ref="CITYWAY:TrainNumber:1234:LOC">version="any"</netex:TrainNumberRef>
+                            </netex:trainNumbers>
+                            <netex:passingTimes>
+                                <netex:TimetabledPassingTime version="any">
+                                    <netex:ArrivalTime>23:58:00.000</netex:ArrivalTime>
+                                    <netex:ArrivalDayOffset>0</netex:ArrivalDayOffset>
+                                    <netex:DepartureTime>23:59:00.000</netex:DepartureTime>
+                                    <netex:DepartureDayOffset>0</netex:DepartureDayOffset>
+                                </netex:TimetabledPassingTime>
+                                <netex:TimetabledPassingTime version="any">
+                                    <netex:ArrivalTime>00:03:00.000</netex:ArrivalTime>
+                                    <netex:ArrivalDayOffset>1</netex:ArrivalDayOffset>
+                                    <netex:DepartureTime>00:04:00.000</netex:DepartureTime>
+                                    <netex:DepartureDayOffset>1</netex:DepartureDayOffset>
+                                </netex:TimetabledPassingTime>
+                            </netex:passingTimes>
+                        </netex:ServiceJourney>
+
+                    </netex:members>
+                </netex:GeneralFrame>
+            </netex:frames>
+        </netex:CompositeFrame>
+    </netex:dataObjects>
+</netex:PublicationDelivery>
diff --git a/spec/services/zip_service_spec.rb b/spec/services/zip_service_spec.rb
index 1eadaa3bf..540de5bfc 100644
--- a/spec/services/zip_service_spec.rb
+++ b/spec/services/zip_service_spec.rb
@@ -42,6 +42,24 @@ RSpec.describe ZipService, type: :zip do
     end
   end
 
+  context 'one referential without calendar' do
+    let( :zip_name ){ 'one_referential_no_calendar.zip' }
+    let( :zip_content ){ first_referential_no_calendar_data }
+
+    it 'returns a not ok object' do
+      expect_incorrect_subdir subject.first, expected_missing_calendar: true
+    end
+  end
+
+  context 'one referential with an unparsable calendar' do
+    let( :zip_name ){ 'one_referential_unparsable_calendar.zip' }
+    let( :zip_content ){ first_referential_unparsable_calendar_data }
+
+    it 'returns a not ok object' do
+      expect_incorrect_subdir subject.first, expected_wrong_calendar: true
+    end
+  end
+
   context 'one referential with a foreign line' do
     let( :zip_name ){ 'one_referential_foreign.zip' }
     let( :zip_content ){ first_referential_foreign_data }
@@ -109,17 +127,29 @@ RSpec.describe ZipService, type: :zip do
     end
   end
 
-  def expect_incorrect_subdir subdir, expected_spurious: [], expected_foreign_lines: []
+  def expect_incorrect_subdir subdir, expected_spurious: [], expected_foreign_lines: [], expected_missing_calendar: false, expected_wrong_calendar: false
     expect( subdir ).not_to be_ok
     expect( subdir.foreign_lines ).to eq(expected_foreign_lines)
     expect( subdir.spurious ).to eq(expected_spurious)
+    expect( subdir.missing_calendar ).to eq(expected_missing_calendar)
+    expect( subdir.wrong_calendar ).to eq(expected_wrong_calendar)
   end
 
   # Data
   # ----
+  let :valid_calendar do
+    """
+    <netex:PublicationDelivery xmlns:netex=\"http://www.netex.org.uk/netex\">
+      <netex:ValidBetween>
+        <netex:FromDate>2017-03-01</netex:FromDate>
+        <netex:ToDate>2017-03-31</netex:ToDate>
+      </netex:ValidBetween>
+    </netex:PublicationDelivery>
+    """
+  end
   let :first_referential_ok_data do
     {
-       'Referential1/calendriers.xml'     => 'calendriers',
+       'Referential1/calendriers.xml'     => valid_calendar,
        'Referential1/commun.xml'          => 'common',
        'Referential1/offre_C00108_9.xml'  => 'line 108 ref 1',
        'Referential1/offre_C00109_10.xml' => 'line 109 ref 1'
@@ -127,7 +157,7 @@ RSpec.describe ZipService, type: :zip do
   end
   let :first_referential_foreign_data do
     {
-       'Referential2/calendriers.xml'     => 'calendriers',
+       'Referential2/calendriers.xml'     => valid_calendar,
        'Referential2/commun.xml'          => 'common',
        'Referential2/offre_C00110_11.xml' => 'foreign line ref 1',
        'Referential2/offre_C00108_9.xml'  => 'line 108 ref 1',
@@ -136,7 +166,7 @@ RSpec.describe ZipService, type: :zip do
   end
   let :first_referential_spurious_data do
     {
-       'Referential3/calendriers.xml'     => 'calendriers',
+       'Referential3/calendriers.xml'     => valid_calendar,
        'Referential3/commun.xml'          => 'common',
        'Referential3/SPURIOUS/commun.xml' => 'common',
        'Referential3/offre_C00108_9.xml'  => 'line 108 ref 1',
@@ -145,7 +175,7 @@ RSpec.describe ZipService, type: :zip do
   end
   let :second_referential_ok_data do
     {
-       'Referential4/calendriers.xml'     => 'calendriers',
+       'Referential4/calendriers.xml'     => valid_calendar,
        'Referential4/commun.xml'          => 'common',
        'Referential4/offre_C00108_9.xml'  => 'line 108 ref 2',
        'Referential4/offre_C00109_10.xml' => 'line 109 ref 2'
@@ -153,7 +183,7 @@ RSpec.describe ZipService, type: :zip do
   end
   let :messed_up_referential_data do
     {
-       'Referential5/calendriers.xml'      => 'calendriers',
+       'Referential5/calendriers.xml'      => valid_calendar,
        'Referential5/commun.xml'           => 'common',
        'Referential5/SPURIOUS1/commun.xml' => 'common',
        'Referential5/SPURIOUS2/commun.xml' => 'common',
@@ -163,5 +193,21 @@ RSpec.describe ZipService, type: :zip do
        'Referential5/offre_C00109_10.xml'  => 'line 109 ref 1'
     }
   end
+  let :first_referential_no_calendar_data do
+    {
+       'Referential6/commun.xml'          => 'common',
+       'Referential6/offre_C00108_9.xml'  => 'line 108 ref 1',
+       'Referential6/offre_C00109_10.xml' => 'line 109 ref 1'
+    }
+  end
+  let :first_referential_unparsable_calendar_data do
+    {
+       'Referential7/calendriers.xml'     => 'calendriers',
+       'Referential7/commun.xml'          => 'common',
+       'Referential7/offre_C00108_9.xml'  => 'line 108 ref 1',
+       'Referential7/offre_C00109_10.xml' => 'line 109 ref 1'
+    }
+  end
+
 
 end