aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Florisson2013-05-16 15:45:23 +0200
committerMarc Florisson2013-05-16 15:45:23 +0200
commit74fa1a9551e1bd6eedabf88a40e5ebc6bed21645 (patch)
tree9480fac78ce2650c3f256e25e694e18c941c9091
parent629ebdfafc4ac8fa0bc65a1dd93b1e21b985d162 (diff)
parentecec5d5a081c567444d6fc843d06ba02912958db (diff)
downloadchouette-core-74fa1a9551e1bd6eedabf88a40e5ebc6bed21645.tar.bz2
merge
-rw-r--r--.travis.yml21
-rw-r--r--Gemfile68
-rw-r--r--Gemfile.lock232
-rw-r--r--README261
-rw-r--r--README.textile62
-rw-r--r--app/assets/images/icons/disabled_left_arrow.pngbin0 -> 958 bytes
-rw-r--r--app/assets/images/icons/disabled_right_arrow.pngbin0 -> 920 bytes
-rw-r--r--app/assets/images/icons/gray_left_arrow.pngbin0 -> 567 bytes
-rw-r--r--app/assets/images/icons/gray_right_arrow.pngbin0 -> 556 bytes
-rw-r--r--app/assets/images/icons/green_left_arrow.pngbin0 -> 422 bytes
-rw-r--r--app/assets/images/icons/green_right_arrow.pngbin0 -> 423 bytes
-rw-r--r--app/assets/images/logoMEDDE.jpgbin0 -> 9767 bytes
-rw-r--r--app/assets/images/map/access_in.pngbin0 -> 840 bytes
-rw-r--r--app/assets/images/map/access_in_out.pngbin0 -> 847 bytes
-rw-r--r--app/assets/images/map/access_out.pngbin0 -> 829 bytes
-rw-r--r--app/assets/javascripts/access_points.js.coffee46
-rw-r--r--app/assets/javascripts/exports.js.coffee2
-rw-r--r--app/assets/javascripts/group_of_line.js.coffee15
-rw-r--r--app/assets/javascripts/imports.js.coffee2
-rw-r--r--app/assets/javascripts/journey_pattern.js.coffee4
-rw-r--r--app/assets/javascripts/public/formtastic.qtip2.min.js76
-rw-r--r--app/assets/javascripts/public/jquery.qtip.min.js15
-rw-r--r--app/assets/javascripts/public/jquery.ui.datepicker-i18n.js9
-rw-r--r--app/assets/javascripts/referentials.js.coffee13
-rw-r--r--app/assets/javascripts/route.js.coffee4
-rw-r--r--app/assets/javascripts/stop_areas.js.coffee15
-rw-r--r--app/assets/javascripts/time_tables.js.coffee46
-rw-r--r--app/assets/javascripts/vehicle_journey.js.coffee6
-rw-r--r--app/assets/stylesheets/access_links.css.scss21
-rw-r--r--app/assets/stylesheets/access_points.css.scss103
-rw-r--r--app/assets/stylesheets/api_keys.css.scss34
-rw-r--r--app/assets/stylesheets/calendar.css.scss104
-rw-r--r--app/assets/stylesheets/errors.css.scss15
-rw-r--r--app/assets/stylesheets/group_of_lines.css.scss101
-rw-r--r--app/assets/stylesheets/jquery.qtip.min.css2
-rw-r--r--app/assets/stylesheets/lines.css.scss34
-rw-r--r--app/assets/stylesheets/stop_areas.css.scss58
-rw-r--r--app/assets/stylesheets/time_tables.css.scss61
-rw-r--r--app/controllers/access_links_controller.rb74
-rw-r--r--app/controllers/access_points_controller.rb55
-rw-r--r--app/controllers/api/v1/access_links_controller.rb14
-rw-r--r--app/controllers/api/v1/access_points_controller.rb13
-rw-r--r--app/controllers/api/v1/chouette_controller.rb25
-rw-r--r--app/controllers/api/v1/companies_controller.rb13
-rw-r--r--app/controllers/api/v1/connection_links_controller.rb12
-rw-r--r--app/controllers/api/v1/group_of_lines_controller.rb12
-rw-r--r--app/controllers/api/v1/journey_patterns_controller.rb16
-rw-r--r--app/controllers/api/v1/lines_controller.rb16
-rw-r--r--app/controllers/api/v1/networks_controller.rb15
-rw-r--r--app/controllers/api/v1/routes_controller.rb13
-rw-r--r--app/controllers/api/v1/stop_areas_controller.rb20
-rw-r--r--app/controllers/api/v1/time_tables_controller.rb12
-rw-r--r--app/controllers/api/v1/vehicle_journeys_controller.rb16
-rw-r--r--app/controllers/api_keys_controller.rb17
-rw-r--r--app/controllers/errors_controller.rb9
-rw-r--r--app/controllers/file_validations_controller.rb13
-rw-r--r--app/controllers/group_of_lines_controller.rb47
-rw-r--r--app/controllers/journey_patterns_controller.rb5
-rw-r--r--app/controllers/lines_controller.rb24
-rw-r--r--app/controllers/referentials_controller.rb3
-rw-r--r--app/controllers/routes_controller.rb6
-rw-r--r--app/controllers/stop_areas_controller.rb9
-rw-r--r--app/controllers/subscriptions_controller.rb2
-rw-r--r--app/controllers/time_table_dates_controller.rb27
-rw-r--r--app/controllers/time_table_periods_controller.rb27
-rw-r--r--app/controllers/time_tables_controller.rb5
-rw-r--r--app/controllers/vehicle_journeys_controller.rb6
-rw-r--r--app/helpers/access_points_helper.rb28
-rw-r--r--app/helpers/creation_helper.rb15
-rw-r--r--app/helpers/stop_areas_helper.rb51
-rw-r--r--app/maps/access_link_map.rb37
-rw-r--r--app/maps/access_point_map.rb66
-rw-r--r--app/maps/application_map.rb6
-rw-r--r--app/maps/connection_link_map.rb2
-rw-r--r--app/maps/group_of_line_map.rb34
-rw-r--r--app/maps/stop_area_map.rb35
-rw-r--r--app/maps/style_map/access_link_style_map.rb43
-rw-r--r--app/maps/style_map/access_points_style_map.rb58
-rw-r--r--app/maps/style_map/edit_access_point_style_map.rb46
-rw-r--r--app/maps/style_map/stop_areas_style_map.rb26
-rw-r--r--app/models/access_link_pair.rb45
-rw-r--r--app/models/api/v1/api_key.rb30
-rw-r--r--app/models/clean_up.rb40
-rw-r--r--app/models/clean_up_result.rb6
-rw-r--r--app/models/export.rb10
-rw-r--r--app/models/gtfs_import.rb18
-rw-r--r--app/models/help_page.rb5
-rw-r--r--app/models/import.rb12
-rw-r--r--app/models/netex_export.rb7
-rw-r--r--app/models/netex_import.rb7
-rw-r--r--app/models/referential.rb40
-rw-r--r--app/models/subscription.rb9
-rw-r--r--app/models/test_sheet_page.rb1
-rw-r--r--app/models/user.rb3
-rw-r--r--app/views/access_link_pairs/_access_link_pair.html.erb57
-rw-r--r--app/views/access_links/_form.html.erb37
-rw-r--r--app/views/access_links/edit.html.erb4
-rw-r--r--app/views/access_links/new.html.erb3
-rw-r--r--app/views/access_links/show.html.erb84
-rw-r--r--app/views/access_links/show.kml.erb20
-rw-r--r--app/views/access_points/_access_point.html.erb20
-rw-r--r--app/views/access_points/_form.html.erb44
-rw-r--r--app/views/access_points/edit.html.erb5
-rw-r--r--app/views/access_points/index.html.erb26
-rw-r--r--app/views/access_points/index.kml.erb12
-rw-r--r--app/views/access_points/new.html.erb3
-rw-r--r--app/views/access_points/show.html.erb141
-rw-r--r--app/views/access_points/show.kml.erb10
-rw-r--r--app/views/api/v1/access_links/index.rabl4
-rw-r--r--app/views/api/v1/access_links/short_description.rabl6
-rw-r--r--app/views/api/v1/access_links/show.rabl6
-rw-r--r--app/views/api/v1/access_points/index.rabl4
-rw-r--r--app/views/api/v1/access_points/short_description.rabl6
-rw-r--r--app/views/api/v1/access_points/show.rabl9
-rw-r--r--app/views/api/v1/companies/index.rabl4
-rw-r--r--app/views/api/v1/companies/short_description.rabl6
-rw-r--r--app/views/api/v1/companies/show.rabl6
-rw-r--r--app/views/api/v1/connection_links/index.rabl4
-rw-r--r--app/views/api/v1/connection_links/show.rabl16
-rw-r--r--app/views/api/v1/group_of_lines/index.rabl4
-rw-r--r--app/views/api/v1/group_of_lines/short_description.rabl6
-rw-r--r--app/views/api/v1/group_of_lines/show.rabl6
-rw-r--r--app/views/api/v1/journey_patterns/index.rabl4
-rw-r--r--app/views/api/v1/journey_patterns/short_description.rabl6
-rw-r--r--app/views/api/v1/journey_patterns/show.rabl21
-rw-r--r--app/views/api/v1/lines/index.rabl4
-rw-r--r--app/views/api/v1/lines/short_description.rabl6
-rw-r--r--app/views/api/v1/lines/show.rabl14
-rw-r--r--app/views/api/v1/networks/index.rabl4
-rw-r--r--app/views/api/v1/networks/short_description.rabl6
-rw-r--r--app/views/api/v1/networks/show.rabl7
-rw-r--r--app/views/api/v1/routes/index.rabl3
-rw-r--r--app/views/api/v1/routes/short_description.rabl7
-rw-r--r--app/views/api/v1/routes/show.rabl29
-rw-r--r--app/views/api/v1/stop_areas/index.rabl3
-rw-r--r--app/views/api/v1/stop_areas/short_description.rabl10
-rw-r--r--app/views/api/v1/stop_areas/show.rabl21
-rw-r--r--app/views/api/v1/time_tables/index.rabl3
-rw-r--r--app/views/api/v1/time_tables/show.rabl18
-rw-r--r--app/views/api/v1/trident_objects/short_description.rabl3
-rw-r--r--app/views/api/v1/trident_objects/show.rabl5
-rw-r--r--app/views/api/v1/vehicle_journeys/index.rabl3
-rw-r--r--app/views/api/v1/vehicle_journeys/show.rabl32
-rw-r--r--app/views/api_keys/_api_key.html.erb12
-rw-r--r--app/views/api_keys/_form.html.erb14
-rw-r--r--app/views/api_keys/edit.html.erb4
-rw-r--r--app/views/api_keys/new.html.erb4
-rw-r--r--app/views/companies/_company.erb2
-rw-r--r--app/views/companies/show.html.erb11
-rw-r--r--app/views/connection_links/_connection_link.erb2
-rw-r--r--app/views/connection_links/show.html.erb11
-rw-r--r--app/views/errors/not_found.html.erb13
-rw-r--r--app/views/errors/server_error.html.erb14
-rw-r--r--app/views/exports/_export.erb2
-rw-r--r--app/views/exports/index.html.erb2
-rw-r--r--app/views/exports/new.html.erb8
-rw-r--r--app/views/exports/new.js.coffee2
-rw-r--r--app/views/exports/show.html.erb2
-rw-r--r--app/views/file_validations/_file_validation.erb2
-rw-r--r--app/views/file_validations/index.html.erb2
-rw-r--r--app/views/file_validations/show.html.erb2
-rw-r--r--app/views/group_of_lines/_form.erb27
-rw-r--r--app/views/group_of_lines/_group_of_line.erb12
-rw-r--r--app/views/group_of_lines/_lines_detail.html.erb10
-rw-r--r--app/views/group_of_lines/edit.html.erb3
-rw-r--r--app/views/group_of_lines/index.html.erb26
-rw-r--r--app/views/group_of_lines/new.html.erb3
-rw-r--r--app/views/group_of_lines/show.html.erb39
-rw-r--r--app/views/group_of_lines/show.js.erb4
-rw-r--r--app/views/group_of_lines/show.kml.erb13
-rw-r--r--app/views/help/access_links.textile66
-rw-r--r--app/views/help/access_points.textile74
-rw-r--r--app/views/help/companies.textile10
-rw-r--r--app/views/help/connection_links.textile6
-rw-r--r--app/views/help/csv.textile95
-rw-r--r--app/views/help/dataspaces.textile9
-rw-r--r--app/views/help/documentation.textile4
-rw-r--r--app/views/help/exports.textile6
-rw-r--r--app/views/help/faq.textile4
-rw-r--r--app/views/help/group_of_lines.textile37
-rw-r--r--app/views/help/imports.textile7
-rw-r--r--app/views/help/index.textile31
-rw-r--r--app/views/help/introduction.textile12
-rw-r--r--app/views/help/journeypatterns.textile6
-rw-r--r--app/views/help/lines.textile11
-rw-r--r--app/views/help/networks.textile8
-rw-r--r--app/views/help/normalisation.textile16
-rw-r--r--app/views/help/prerequisite.textile18
-rw-r--r--app/views/help/restapis.textile45
-rw-r--r--app/views/help/routes.textile8
-rw-r--r--app/views/help/schema.textile4
-rw-r--r--app/views/help/stop_areas.textile22
-rw-r--r--app/views/help/timetables.textile8
-rw-r--r--app/views/help/toc.textile5
-rw-r--r--app/views/help/tutorial.textile15
-rw-r--r--app/views/help/users.textile6
-rw-r--r--app/views/help/validations.textile7
-rw-r--r--app/views/help/vehiclejourneys.textile8
-rw-r--r--app/views/imports/_fields_gtfs_import.erb7
-rw-r--r--app/views/imports/_import.erb2
-rw-r--r--app/views/imports/index.html.erb2
-rw-r--r--app/views/imports/new.html.erb8
-rw-r--r--app/views/imports/show.html.erb2
-rw-r--r--app/views/journey_patterns/_journey_pattern.html.erb2
-rw-r--r--app/views/journey_patterns/show.html.erb11
-rw-r--r--app/views/layouts/_logos.erb4
-rw-r--r--app/views/layouts/application.html.erb1
-rw-r--r--app/views/lines/_form.erb15
-rw-r--r--app/views/lines/_line.erb13
-rw-r--r--app/views/lines/index.html.erb18
-rw-r--r--app/views/lines/show.html.erb19
-rw-r--r--app/views/networks/_network.erb2
-rw-r--r--app/views/networks/show.html.erb11
-rw-r--r--app/views/referentials/_clean.html.erb3
-rw-r--r--app/views/referentials/_counts.html.erb9
-rw-r--r--app/views/referentials/_referential.erb11
-rw-r--r--app/views/referentials/show.html.erb9
-rw-r--r--app/views/referentials/show.js.erb25
-rw-r--r--app/views/routes/_route.html.erb12
-rw-r--r--app/views/routes/show.html.erb11
-rw-r--r--app/views/stop_areas/_form.html.erb24
-rw-r--r--app/views/stop_areas/_genealogical.html.erb66
-rw-r--r--app/views/stop_areas/_stop_area.html.erb2
-rw-r--r--app/views/stop_areas/access_links.html.erb33
-rw-r--r--app/views/stop_areas/edit.html.erb5
-rw-r--r--app/views/stop_areas/show.html.erb206
-rw-r--r--app/views/stop_areas/show.kml.erb20
-rw-r--r--app/views/stop_points/_stop_point_draggable.html.erb2
-rw-r--r--app/views/subscriptions/new.html.erb1
-rw-r--r--app/views/test_sheet/1_1.html375
-rw-r--r--app/views/test_sheet/1_2.html444
-rw-r--r--app/views/test_sheet/2_1.html660
-rw-r--r--app/views/test_sheet/2_10.html353
-rw-r--r--app/views/test_sheet/2_11.html378
-rw-r--r--app/views/test_sheet/2_12.html351
-rw-r--r--app/views/test_sheet/2_13.html362
-rw-r--r--app/views/test_sheet/2_14.html529
-rw-r--r--app/views/test_sheet/2_15.html628
-rw-r--r--app/views/test_sheet/2_16.html387
-rw-r--r--app/views/test_sheet/2_17.html394
-rw-r--r--app/views/test_sheet/2_18.html695
-rw-r--r--app/views/test_sheet/2_19.html411
-rw-r--r--app/views/test_sheet/2_2.html354
-rw-r--r--app/views/test_sheet/2_20.html440
-rw-r--r--app/views/test_sheet/2_21.html415
-rw-r--r--app/views/test_sheet/2_22.html438
-rw-r--r--app/views/test_sheet/2_23.html441
-rw-r--r--app/views/test_sheet/2_24.html333
-rw-r--r--app/views/test_sheet/2_25.html379
-rw-r--r--app/views/test_sheet/2_26.html394
-rw-r--r--app/views/test_sheet/2_27.html378
-rw-r--r--app/views/test_sheet/2_28.html501
-rw-r--r--app/views/test_sheet/2_3.html441
-rw-r--r--app/views/test_sheet/2_4.html505
-rw-r--r--app/views/test_sheet/2_5.html653
-rw-r--r--app/views/test_sheet/2_6.html443
-rw-r--r--app/views/test_sheet/2_7.html410
-rw-r--r--app/views/test_sheet/2_8.html780
-rw-r--r--app/views/test_sheet/2_9.html384
-rw-r--r--app/views/test_sheet/3_1.html300
-rw-r--r--app/views/test_sheet/3_10.html542
-rw-r--r--app/views/test_sheet/3_11.html318
-rw-r--r--app/views/test_sheet/3_12.html297
-rw-r--r--app/views/test_sheet/3_13.html331
-rw-r--r--app/views/test_sheet/3_14.html311
-rw-r--r--app/views/test_sheet/3_15.html332
-rw-r--r--app/views/test_sheet/3_16.html625
-rw-r--r--app/views/test_sheet/3_17.html293
-rw-r--r--app/views/test_sheet/3_18.html306
-rw-r--r--app/views/test_sheet/3_19.html292
-rw-r--r--app/views/test_sheet/3_2.html314
-rw-r--r--app/views/test_sheet/3_20.html306
-rw-r--r--app/views/test_sheet/3_21.html355
-rw-r--r--app/views/test_sheet/3_3.html303
-rw-r--r--app/views/test_sheet/3_4.html277
-rw-r--r--app/views/test_sheet/3_5.html279
-rw-r--r--app/views/test_sheet/3_6.html322
-rw-r--r--app/views/test_sheet/3_7.html312
-rw-r--r--app/views/test_sheet/3_8.html366
-rw-r--r--app/views/test_sheet/3_9.html309
-rw-r--r--app/views/time_table_dates/_form.html.erb11
-rw-r--r--app/views/time_table_dates/new.html.erb4
-rw-r--r--app/views/time_table_periods/_form.html.erb11
-rw-r--r--app/views/time_table_periods/new.html.erb4
-rw-r--r--app/views/time_tables/_date_fields.erb4
-rw-r--r--app/views/time_tables/_dates.html.erb4
-rw-r--r--app/views/time_tables/_form.erb37
-rw-r--r--app/views/time_tables/_period_fields.erb5
-rw-r--r--app/views/time_tables/_periods.html.erb3
-rw-r--r--app/views/time_tables/_time_table.erb4
-rw-r--r--app/views/time_tables/show.html.erb74
-rw-r--r--app/views/users/show.html.erb2
-rw-r--r--app/views/vehicle_journeys/_form.html.erb3
-rw-r--r--app/views/vehicle_journeys/new.js.erb4
-rw-r--r--app/views/vehicle_journeys/show.html.erb11
-rw-r--r--config/application.rb3
-rw-r--r--config/database.yml2
-rw-r--r--config/database.yml.ccontrol2
-rw-r--r--config/database.yml.travis11
-rw-r--r--config/environments/development.rb4
-rw-r--r--config/environments/production.rb58
-rw-r--r--config/initializers/apartment.rb2
-rw-r--r--config/initializers/rabl_config.rb5
-rw-r--r--config/locales/access_links.yml93
-rw-r--r--config/locales/access_points.yml117
-rw-r--r--config/locales/access_types.yml13
-rw-r--r--config/locales/actions.yml24
-rw-r--r--config/locales/api_keys.yml37
-rw-r--r--config/locales/area_types.yml16
-rw-r--r--config/locales/clean_ups.yml20
-rw-r--r--config/locales/companies.yml26
-rw-r--r--config/locales/connection_link_types.yml12
-rw-r--r--config/locales/connection_links.yml150
-rw-r--r--config/locales/directions.yml48
-rw-r--r--config/locales/en.yml1
-rw-r--r--config/locales/exports.yml204
-rw-r--r--config/locales/file_validations.yml146
-rw-r--r--config/locales/fr.yml127
-rw-r--r--config/locales/group_of_lines.yml78
-rw-r--r--config/locales/imports.yml292
-rw-r--r--config/locales/journey_patterns.yml76
-rw-r--r--config/locales/layouts.yml8
-rw-r--r--config/locales/lines.yml152
-rw-r--r--config/locales/networks.yml54
-rw-r--r--config/locales/referentials.yml160
-rw-r--r--config/locales/routes.yml120
-rw-r--r--config/locales/stop_areas.yml195
-rw-r--r--config/locales/stop_points.yml56
-rw-r--r--config/locales/subscriptions.yml30
-rw-r--r--config/locales/time_table_dates.yml21
-rw-r--r--config/locales/time_table_periods.yml23
-rw-r--r--config/locales/time_tables.yml164
-rw-r--r--config/locales/transport_modes.yml80
-rw-r--r--config/locales/users.yml38
-rw-r--r--config/locales/vehicle_journeys.yml185
-rw-r--r--config/locales/vehicle_translations.yml4
-rw-r--r--config/locales/waybacks.yml8
-rw-r--r--config/locales/will_paginate.yml8
-rw-r--r--config/routes.rb70
-rw-r--r--db/migrate/20120926144618_add_id_to_time_table_date.ninoxe_engine.rb13
-rw-r--r--db/migrate/20120926144619_add_id_to_time_table_period.ninoxe_engine.rb13
-rw-r--r--db/migrate/20121025112852_add_fields_to_access_points.ninoxe_engine.rb13
-rw-r--r--db/migrate/20121211085620_create_api_key.rb14
-rw-r--r--db/migrate/20130207123618_add_foreign_keys.ninoxe_engine.rb278
-rw-r--r--db/migrate/20130412083016_add_shortcut_to_time_table.ninoxe_engine.rb7
-rw-r--r--db/migrate/20130412083017_set_shortcut_to_existing_time_table.ninoxe_engine.rb11
-rw-r--r--db/migrate/20130412083423_resize_chouette_columns.ninoxe_engine.rb6
-rw-r--r--db/migrate/20130412094550_resize_columns.rb11
-rw-r--r--db/schema.rb161
-rw-r--r--doc/interfaces/api_rest_v1.xsd937
-rw-r--r--lib/tasks/ci.rake9
-rw-r--r--public/404.html35
-rw-r--r--public/422.html35
-rw-r--r--public/500.html70
-rw-r--r--public/help/access_in.pngbin0 -> 840 bytes
-rw-r--r--public/help/access_in_out.pngbin0 -> 847 bytes
-rw-r--r--public/help/access_out.pngbin0 -> 829 bytes
-rw-r--r--public/help/disabled_left_arrow.pngbin0 -> 958 bytes
-rw-r--r--public/help/disabled_right_arrow.pngbin0 -> 920 bytes
-rw-r--r--public/help/gray_left_arrow.pngbin0 -> 567 bytes
-rw-r--r--public/help/gray_right_arrow.pngbin0 -> 556 bytes
-rw-r--r--public/help/green_left_arrow.pngbin0 -> 422 bytes
-rw-r--r--public/help/green_right_arrow.pngbin0 -> 423 bytes
-rwxr-xr-xpublic/test_sheet/image001.gifbin0 -> 4189 bytes
-rwxr-xr-xpublic/test_sheet/image001.jpgbin0 -> 26174 bytes
-rwxr-xr-xpublic/test_sheet/image002.jpgbin0 -> 26981 bytes
-rwxr-xr-xpublic/test_sheet/image003.jpgbin0 -> 12447 bytes
-rwxr-xr-xpublic/test_sheet/image004.jpgbin0 -> 24332 bytes
-rwxr-xr-xpublic/test_sheet/image005.jpgbin0 -> 29931 bytes
-rwxr-xr-xpublic/test_sheet/image006.jpgbin0 -> 23793 bytes
-rwxr-xr-xpublic/test_sheet/image007.jpgbin0 -> 25209 bytes
-rwxr-xr-xpublic/test_sheet/image008.jpgbin0 -> 27417 bytes
-rwxr-xr-xpublic/test_sheet/image009.jpgbin0 -> 32142 bytes
-rwxr-xr-xpublic/test_sheet/image010.jpgbin0 -> 6619 bytes
-rwxr-xr-xpublic/test_sheet/image011.jpgbin0 -> 34046 bytes
-rwxr-xr-xpublic/test_sheet/image012.jpgbin0 -> 20893 bytes
-rwxr-xr-xpublic/test_sheet/image013.jpgbin0 -> 32782 bytes
-rwxr-xr-xpublic/test_sheet/image014.jpgbin0 -> 32519 bytes
-rwxr-xr-xpublic/test_sheet/image015.jpgbin0 -> 42376 bytes
-rwxr-xr-xpublic/test_sheet/image016.jpgbin0 -> 42360 bytes
-rwxr-xr-xpublic/test_sheet/image017.jpgbin0 -> 34481 bytes
-rwxr-xr-xpublic/test_sheet/image018.jpgbin0 -> 28857 bytes
-rwxr-xr-xpublic/test_sheet/image019.jpgbin0 -> 36552 bytes
-rwxr-xr-xpublic/test_sheet/image020.jpgbin0 -> 22333 bytes
-rwxr-xr-xpublic/test_sheet/image021.jpgbin0 -> 32147 bytes
-rwxr-xr-xpublic/test_sheet/image022.jpgbin0 -> 15660 bytes
-rwxr-xr-xpublic/test_sheet/image023.jpgbin0 -> 27012 bytes
-rwxr-xr-xpublic/test_sheet/image024.jpgbin0 -> 32139 bytes
-rwxr-xr-xpublic/test_sheet/image025.jpgbin0 -> 25545 bytes
-rwxr-xr-xpublic/test_sheet/image026.jpgbin0 -> 32947 bytes
-rwxr-xr-xpublic/test_sheet/image027.gifbin0 -> 12197 bytes
-rwxr-xr-xpublic/test_sheet/image028.gifbin0 -> 17384 bytes
-rwxr-xr-xpublic/test_sheet/image029.jpgbin0 -> 43921 bytes
-rw-r--r--spec/controllers/api/v1/lines_controller_spec.rb21
-rw-r--r--spec/controllers/api/v1/networks_controller_spec.rb35
-rw-r--r--spec/controllers/api/v1/stop_area_controller_spec.rb33
-rw-r--r--spec/factories.rb1
-rw-r--r--spec/models/api/v1/api_key_spec.rb13
-rw-r--r--spec/models/export_spec.rb2
-rw-r--r--spec/models/gtfs_import_spec.rb75
-rw-r--r--spec/models/import_spec.rb2
-rw-r--r--spec/models/netex_export_spec.rb7
-rw-r--r--spec/spec_helper.rb2
-rw-r--r--spec/support/api_key.rb42
-rw-r--r--spec/support/api_key_protected.rb51
-rw-r--r--spec/views/time_tables/show.html.erb_spec.rb3
406 files changed, 11985 insertions, 18533 deletions
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 000000000..0362f9def
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,21 @@
+language: ruby
+rvm:
+ - 1.8.7
+ - jruby-18mode
+jdk:
+ - oraclejdk7
+ - openjdk7
+ - openjdk6
+matrix:
+ exclude:
+ - rvm: 1.8.7
+ jdk: openjdk7
+ - rvm: 1.8.7
+ jdk: oraclejdk7
+before_install:
+ - sudo apt-get install build-essential ruby-dev libproj-dev libgeos-dev libffi-dev libsparsehash-dev zlib1g-dev libxslt1-dev libxml2-dev libbz2-dev
+before_script:
+ - "rake ci:db_travis_config"
+ - "rake db:create"
+ - "rake apartment:migrate"
+script: "rake spec"
diff --git a/Gemfile b/Gemfile
index ff0b9a92c..8db7eb582 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,57 +1,61 @@
source 'http://rubygems.org'
-gem 'rails', '3.2.6'
-gem 'devise'
-gem 'devise_invitable'
-#gem 'devise-encryptable'
-
-gem "ffi-proj4", :git => 'git://github.com/dryade/ffi-proj4.git'
+gem 'rails', '3.2.6'
platforms :jruby do
- gem 'activerecord-jdbcpostgresql-adapter', :git => 'git://github.com/dryade/activerecord-jdbc-adapter.git'
+ gem 'activerecord-jdbcpostgresql-adapter', '1.2.9'
gem 'activerecord-jdbcsqlite3-adapter'
gem 'jruby-openssl'
gem "jruby-rack-worker"
gem 'warbler'
- gem "jruby-rack-worker"
+ gem 'therubyrhino'
end
-platforms :ruby do
+platforms :ruby do
+ gem 'therubyracer', '~> 0.10.2'
gem 'pg', '~> 0.11.0'
gem 'sqlite3'
end
-gem "map_layers", "~> 0.0.4"
-gem "georuby-ext", :git => 'git://github.com/dryade/georuby-ext.git'
+# Authentication
+gem 'devise', '2.1.3'
+gem 'devise_invitable'
-#gem 'user_interface', :git => 'git://github.com/dryade/user-interface.git'
-gem 'user_interface', :git => 'git://sim.dryade.priv/user_interface' #, :path => '~/Projects/UserInterfaceDryade'
-gem 'json'
-gem 'cocoon'
+# Map, Geolocalization
+gem "map_layers", "0.0.4"
+gem "georuby-ext", "0.0.2"
+
+# User interface
+gem 'user_interface', "0.0.2"
+gem 'gravatar_image_tag'
+gem 'calendar_helper', "0.2.5"
+gem 'cocoon', "1.1.2"
gem 'formtastic'
+gem 'RedCloth'
+gem 'jquery-rails', '2.2.1'
+gem "modernizr-rails", "~> 2.0.6"
+
+# Format Output
+gem 'json'
+
+# Controller
gem 'inherited_resources'
+
+# Model
gem 'will_paginate', '~> 3.0'
gem 'ransack'
gem 'squeel'
-gem 'RedCloth'
-gem 'jquery-rails'
-gem "modernizr-rails", "~> 2.0.6"
-gem 'gravatar_image_tag'
-
-gem "acts_as_tree", :git => "git://github.com/dryade/acts_as_tree.git"
-#gem 'ninoxe', :git => 'git://github.com/dryade/ninoxe.git'
-gem 'ninoxe', :git => 'git://chouette.dryade.priv/ninoxe' #, :path => '~/Projects/Ninoxe'
+gem 'ninoxe', '0.1.2'
gem 'acts_as_list', '0.1.6'
+gem "acts_as_tree-1.8", '1.1.0', :require => "acts_as_tree"
-#gem 'composite_primary_keys', '~> 5.0.8'
gem 'delayed_job_active_record'
-gem 'apartment',:git => 'git://github.com/dryade/apartment.git'
+gem 'dr-apartment', :require => "apartment"
# some views use coffee script
gem 'coffee-rails', '~> 3.2.1'
gem 'coffee-script-source'
-gem 'therubyrhino', :platform => :jruby
-gem 'therubyracer', :platform => :ruby
+gem 'rabl'
# Gems used only for assets and not required
# in production environments by default.
@@ -68,19 +72,15 @@ group :development do
end
group :test, :development do
- gem "rspec"
- gem "rspec-rails"
+ gem "rspec-rails", "~> 2.0"
gem "remarkable", "~> 4.0.0.alpha4"
gem "remarkable_activerecord", "~> 4.0.0.alpha4"
gem "shoulda-matchers"
- gem 'rb-inotify', :platform => :ruby
-end
-
-group :test do
gem 'capybara'
gem 'launchy'
- gem 'database_cleaner', :git => 'git://github.com/dnagir/database_cleaner.git', :branch => 'postgre_jruby_issue'
gem 'factory_girl_rails', '1.7'
+ gem 'rb-inotify', :require => RUBY_PLATFORM.include?('linux') && 'rb-inotify'
+ gem 'rb-fsevent', :require => RUBY_PLATFORM.include?('darwin') && 'rb-fsevent'
end
group :production do
diff --git a/Gemfile.lock b/Gemfile.lock
index 03ad2fb8d..9aebe2e77 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,75 +1,6 @@
-GIT
- remote: git://chouette.dryade.priv/ninoxe
- revision: 848e356ff197dc5dcd143057e770373646b4c62c
- specs:
- ninoxe (0.0.8)
- GeoRuby
- activerecord (>= 3.1.3)
- acts_as_list (= 0.1.6)
- composite_primary_keys (>= 4.1.2)
- geokit
- rails (>= 3.1.3)
-
-GIT
- remote: git://github.com/dnagir/database_cleaner.git
- revision: 0c0aa44f13ae392000a6f506b62d5d1602cb4e53
- branch: postgre_jruby_issue
- specs:
- database_cleaner (0.7.0)
-
-GIT
- remote: git://github.com/dryade/activerecord-jdbc-adapter.git
- revision: 0bf424bc3bcaf9f44646976cc4c1a8e9e57f11b4
- specs:
- activerecord-jdbc-adapter (1.2.2)
- activerecord-jdbcpostgresql-adapter (1.2.2)
- activerecord-jdbc-adapter (~> 1.2.2)
- jdbc-postgres (>= 9.0, < 9.2)
- jdbc-sqlite3 (3.7.2)
-
-GIT
- remote: git://github.com/dryade/acts_as_tree.git
- revision: 36ced5234beafdb3b21c2c2e2aa1686d37061497
- specs:
- acts_as_tree (1.1.0)
- activerecord (>= 3.0.0)
-
-GIT
- remote: git://github.com/dryade/apartment.git
- revision: cd6185f55eb6d9df958599825e848af4e12a9eae
- specs:
- apartment (0.14.1)
-
-GIT
- remote: git://github.com/dryade/ffi-proj4.git
- revision: 7ae89176e8ddc1c2175192ecbff0e9cffbedcb99
- specs:
- ffi-proj4 (0.0.1)
- ffi (~> 1.0.0)
-
-GIT
- remote: git://github.com/dryade/georuby-ext.git
- revision: be03b9d2e43f970eb368ab52c19b9dbfc68cc540
- specs:
- georuby-ext (0.0.1)
- activesupport
- ffi-geos (~> 0.0.4)
- geokit
- georuby
- json_pure
- rgeo (~> 0.3.8)
-
-GIT
- remote: git://sim.dryade.priv/user_interface
- revision: 0fac5e33ba61eaa691a65d9a5f49f6acd3755927
- specs:
- user_interface (0.0.1)
- rails (> 3.1.0)
-
GEM
remote: http://rubygems.org/
specs:
- GeoRuby (1.3.4)
RedCloth (4.2.9)
RedCloth (4.2.9-java)
SyslogLogger (1.4.1)
@@ -94,6 +25,10 @@ GEM
activesupport (= 3.2.6)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
+ activerecord-jdbc-adapter (1.2.9)
+ activerecord-jdbcpostgresql-adapter (1.2.9)
+ activerecord-jdbc-adapter (~> 1.2.9)
+ jdbc-postgres (>= 9.1, < 9.3)
activerecord-jdbcsqlite3-adapter (1.2.1)
activerecord-jdbc-adapter (~> 1.2.1)
jdbc-sqlite3 (~> 3.7.2)
@@ -104,13 +39,17 @@ GEM
i18n (~> 0.6)
multi_json (~> 1.0)
acts_as_list (0.1.6)
+ acts_as_tree-1.8 (1.1.0)
+ activerecord (>= 3.0.0)
addressable (2.2.8)
arel (3.0.2)
bcrypt-ruby (3.0.1)
bcrypt-ruby (3.0.1-java)
bouncy-castle-java (1.5.0146.1)
- builder (3.0.3)
- capistrano (2.13.3)
+ builder (3.0.4)
+ calendar_helper (0.2.5)
+ open4
+ capistrano (2.13.5)
highline
net-scp (>= 1.0.0)
net-sftp (>= 2.0.0)
@@ -127,7 +66,7 @@ GEM
xpath (~> 0.1.4)
childprocess (0.3.5)
ffi (~> 1.0, >= 1.0.6)
- cocoon (1.0.22)
+ cocoon (1.1.2)
coffee-rails (3.2.2)
coffee-script (>= 2.2.0)
railties (~> 3.2.0)
@@ -135,14 +74,14 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.3.3)
- composite_primary_keys (5.0.8)
- activerecord (~> 3.2.0)
+ dbf (2.0.3)
+ fastercsv (~> 1.5.4)
delayed_job (3.0.3)
activesupport (~> 3.0)
delayed_job_active_record (0.3.2)
activerecord (> 2.1.0)
delayed_job (~> 3.0.0)
- devise (2.1.2)
+ devise (2.1.3)
bcrypt-ruby (~> 3.0)
orm_adapter (~> 0.1)
railties (~> 3.1)
@@ -151,7 +90,10 @@ GEM
actionmailer (~> 3.0)
devise (>= 2.1.0)
railties (~> 3.0)
- diff-lcs (1.1.3)
+ diff-lcs (1.2.1)
+ dr-apartment (0.14.1)
+ dr-ffi-proj4 (0.0.1)
+ ffi (>= 1.0.0)
erubis (2.7.0)
execjs (1.4.0)
multi_json (~> 1.0)
@@ -160,17 +102,28 @@ GEM
factory_girl_rails (1.7.0)
factory_girl (~> 2.6.0)
railties (>= 3.0.0)
+ fastercsv (1.5.5)
ffi (1.0.11)
ffi (1.0.11-java)
- ffi-geos (0.0.6)
+ ffi-geos (0.1.1)
ffi (>= 1.0.0)
- rake (~> 0.9)
- rdoc
+ foreigner (1.4.0)
+ activerecord (>= 3.0.0)
formtastic (2.2.1)
actionpack (>= 3.0)
geokit (1.6.5)
multi_json
- georuby (1.9.7)
+ georuby (1.9.8)
+ georuby-ext (0.0.2)
+ activesupport
+ dbf
+ dr-ffi-proj4 (= 0.0.1)
+ ffi-geos (= 0.1.1)
+ geokit
+ georuby (= 1.9.8)
+ json_pure
+ nokogiri
+ rgeo (= 0.3.20)
gravatar_image_tag (1.1.3)
guard (1.3.2)
listen (>= 0.4.2)
@@ -178,31 +131,34 @@ GEM
guard-rspec (1.2.1)
guard (>= 1.1)
has_scope (0.5.1)
- highline (1.6.14)
- hike (1.2.1)
- i18n (0.6.1)
+ highline (1.6.15)
+ hike (1.2.2)
+ i18n (0.6.4)
inherited_resources (1.3.1)
has_scope (~> 0.5.0)
responders (~> 0.6)
- jdbc-postgres (9.0.801)
+ jdbc-postgres (9.2.1002.1)
+ jdbc-sqlite3 (3.7.2.1)
journey (1.0.4)
- jquery-rails (2.1.1)
- railties (>= 3.1.0, < 5.0)
- thor (~> 0.14)
+ jquery-rails (2.2.1)
+ railties (>= 3.0, < 5.0)
+ thor (>= 0.14, < 2.0)
jruby-jars (1.6.7.2)
jruby-openssl (0.7.7)
bouncy-castle-java (>= 1.5.0146.1)
jruby-rack (1.1.9)
jruby-rack-worker (0.4-java)
jruby-rack (>= 1.1.1)
- json (1.7.5-java)
- json_pure (1.7.5)
+ json (1.7.7)
+ json (1.7.7-java)
+ json_pure (1.7.7)
launchy (2.1.0)
addressable (~> 2.2.6)
launchy (2.1.0-java)
addressable (~> 2.2.6)
ffi (~> 1.0.9)
spoon (~> 0.0.1)
+ libv8 (3.3.10.4)
libwebsocket (0.1.5)
addressable
listen (0.4.7)
@@ -213,29 +169,39 @@ GEM
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
- map_layers (0.0.5)
+ map_layers (0.0.4)
mime-types (1.19)
modernizr-rails (2.0.6)
- multi_json (1.3.6)
+ multi_json (1.7.2)
net-scp (1.0.4)
net-ssh (>= 1.99.1)
net-sftp (2.0.5)
net-ssh (>= 2.0.9)
- net-ssh (2.5.2)
+ net-ssh (2.6.2)
net-ssh-gateway (1.1.0)
net-ssh (>= 1.99.1)
- nokogiri (1.5.5)
- nokogiri (1.5.5-java)
+ ninoxe (0.1.2)
+ activerecord (>= 3.1.3)
+ acts_as_list (= 0.1.6)
+ foreigner (= 1.4.0)
+ georuby-ext (= 0.0.2)
+ nokogiri (1.5.9)
+ nokogiri (1.5.9-java)
+ open4 (1.3.0)
orm_adapter (0.4.0)
+ pg (0.11.0)
polyamorous (0.5.0)
activerecord (~> 3.0)
polyglot (0.3.3)
- rack (1.4.1)
+ rabl (0.7.8)
+ activesupport (>= 2.3.14)
+ multi_json (~> 1.0)
+ rack (1.4.5)
rack-cache (1.2)
rack (>= 0.4)
- rack-ssl (1.3.2)
+ rack-ssl (1.3.3)
rack
- rack-test (0.6.1)
+ rack-test (0.6.2)
rack (>= 1.0)
rails (3.2.6)
actionmailer (= 3.2.6)
@@ -252,7 +218,7 @@ GEM
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
- rake (0.9.2.2)
+ rake (10.0.4)
ransack (0.7.0)
actionpack (~> 3.0)
activerecord (~> 3.0)
@@ -262,7 +228,7 @@ GEM
rb-fsevent (0.9.1)
rb-inotify (0.8.8)
ffi (>= 0.5.0)
- rdoc (3.12)
+ rdoc (3.12.2)
json (~> 1.4)
remarkable (4.0.0.alpha4)
rspec (>= 2.0.0.alpha11)
@@ -275,20 +241,22 @@ GEM
rspec (>= 2.0.0.alpha11)
responders (0.9.2)
railties (~> 3.1)
- rgeo (0.3.17)
- rspec (2.11.0)
- rspec-core (~> 2.11.0)
- rspec-expectations (~> 2.11.0)
- rspec-mocks (~> 2.11.0)
- rspec-core (2.11.1)
- rspec-expectations (2.11.2)
- diff-lcs (~> 1.1.3)
- rspec-mocks (2.11.2)
- rspec-rails (2.11.0)
+ rgeo (0.3.20)
+ rspec (2.13.0)
+ rspec-core (~> 2.13.0)
+ rspec-expectations (~> 2.13.0)
+ rspec-mocks (~> 2.13.0)
+ rspec-core (2.13.0)
+ rspec-expectations (2.13.0)
+ diff-lcs (>= 1.1.3, < 2.0)
+ rspec-mocks (2.13.0)
+ rspec-rails (2.13.0)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
- rspec (~> 2.11.0)
+ rspec-core (~> 2.13.0)
+ rspec-expectations (~> 2.13.0)
+ rspec-mocks (~> 2.13.0)
rubyzip (0.9.9)
sass (3.2.1)
sass-rails (3.2.5)
@@ -307,22 +275,27 @@ GEM
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
+ sqlite3 (1.3.6)
squeel (1.0.9)
activerecord (~> 3.0)
activesupport (~> 3.0)
polyamorous (~> 0.5.0)
+ therubyracer (0.10.2)
+ libv8 (~> 3.3.10)
therubyrhino (2.0.1)
therubyrhino_jar (>= 1.7.3)
therubyrhino_jar (1.7.4)
- thor (0.16.0)
- tilt (1.3.3)
- treetop (1.4.10)
+ thor (0.18.1)
+ tilt (1.3.6)
+ treetop (1.4.12)
polyglot
polyglot (>= 0.3.1)
- tzinfo (0.3.33)
+ tzinfo (0.3.37)
uglifier (1.2.7)
execjs (>= 0.3.0)
multi_json (~> 1.3)
+ user_interface (0.0.2)
+ rails (> 3.1.0)
warbler (1.3.6)
jruby-jars (>= 1.4.0)
jruby-rack (>= 1.0.0)
@@ -336,56 +309,57 @@ GEM
PLATFORMS
java
+ ruby
DEPENDENCIES
RedCloth
SyslogLogger
- activerecord-jdbcpostgresql-adapter!
+ activerecord-jdbcpostgresql-adapter (= 1.2.9)
activerecord-jdbcsqlite3-adapter
acts_as_list (= 0.1.6)
- acts_as_tree!
- apartment!
+ acts_as_tree-1.8 (= 1.1.0)
+ calendar_helper (= 0.2.5)
capistrano
capistrano-ext
capybara
- cocoon
+ cocoon (= 1.1.2)
coffee-rails (~> 3.2.1)
coffee-script-source
- database_cleaner!
delayed_job_active_record
- devise
+ devise (= 2.1.3)
devise_invitable
+ dr-apartment
factory_girl_rails (= 1.7)
- ffi-proj4!
formtastic
- georuby-ext!
+ georuby-ext (= 0.0.2)
gravatar_image_tag
guard
guard-rspec
inherited_resources
- jquery-rails
+ jquery-rails (= 2.2.1)
jruby-openssl
jruby-rack-worker
json
launchy
- map_layers (~> 0.0.4)
+ map_layers (= 0.0.4)
modernizr-rails (~> 2.0.6)
- ninoxe!
+ ninoxe (= 0.1.2)
pg (~> 0.11.0)
+ rabl
rails (= 3.2.6)
ransack
+ rb-fsevent
rb-inotify
remarkable (~> 4.0.0.alpha4)
remarkable_activerecord (~> 4.0.0.alpha4)
- rspec
- rspec-rails
+ rspec-rails (~> 2.0)
sass-rails (~> 3.2.3)
shoulda-matchers
sqlite3
squeel
- therubyracer
+ therubyracer (~> 0.10.2)
therubyrhino
uglifier (>= 1.0.3)
- user_interface!
+ user_interface (= 0.0.2)
warbler
will_paginate (~> 3.0)
diff --git a/README b/README
deleted file mode 100644
index 7c36f2356..000000000
--- a/README
+++ /dev/null
@@ -1,261 +0,0 @@
-== Welcome to Rails
-
-Rails is a web-application framework that includes everything needed to create
-database-backed web applications according to the Model-View-Control pattern.
-
-This pattern splits the view (also called the presentation) into "dumb"
-templates that are primarily responsible for inserting pre-built data in between
-HTML tags. The model contains the "smart" domain objects (such as Account,
-Product, Person, Post) that holds all the business logic and knows how to
-persist themselves to a database. The controller handles the incoming requests
-(such as Save New Account, Update Product, Show Post) by manipulating the model
-and directing data to the view.
-
-In Rails, the model is handled by what's called an object-relational mapping
-layer entitled Active Record. This layer allows you to present the data from
-database rows as objects and embellish these data objects with business logic
-methods. You can read more about Active Record in
-link:files/vendor/rails/activerecord/README.html.
-
-The controller and view are handled by the Action Pack, which handles both
-layers by its two parts: Action View and Action Controller. These two layers
-are bundled in a single package due to their heavy interdependence. This is
-unlike the relationship between the Active Record and Action Pack that is much
-more separate. Each of these packages can be used independently outside of
-Rails. You can read more about Action Pack in
-link:files/vendor/rails/actionpack/README.html.
-
-
-== Getting Started
-
-1. At the command prompt, create a new Rails application:
- <tt>rails new myapp</tt> (where <tt>myapp</tt> is the application name)
-
-2. Change directory to <tt>myapp</tt> and start the web server:
- <tt>cd myapp; rails server</tt> (run with --help for options)
-
-3. Go to http://localhost:3000/ and you'll see:
- "Welcome aboard: You're riding Ruby on Rails!"
-
-4. Follow the guidelines to start developing your application. You can find
-the following resources handy:
-
-* The Getting Started Guide: http://guides.rubyonrails.org/getting_started.html
-* Ruby on Rails Tutorial Book: http://www.railstutorial.org/
-
-
-== Debugging Rails
-
-Sometimes your application goes wrong. Fortunately there are a lot of tools that
-will help you debug it and get it back on the rails.
-
-First area to check is the application log files. Have "tail -f" commands
-running on the server.log and development.log. Rails will automatically display
-debugging and runtime information to these files. Debugging info will also be
-shown in the browser on requests from 127.0.0.1.
-
-You can also log your own messages directly into the log file from your code
-using the Ruby logger class from inside your controllers. Example:
-
- class WeblogController < ActionController::Base
- def destroy
- @weblog = Weblog.find(params[:id])
- @weblog.destroy
- logger.info("#{Time.now} Destroyed Weblog ID ##{@weblog.id}!")
- end
- end
-
-The result will be a message in your log file along the lines of:
-
- Mon Oct 08 14:22:29 +1000 2007 Destroyed Weblog ID #1!
-
-More information on how to use the logger is at http://www.ruby-doc.org/core/
-
-Also, Ruby documentation can be found at http://www.ruby-lang.org/. There are
-several books available online as well:
-
-* Programming Ruby: http://www.ruby-doc.org/docs/ProgrammingRuby/ (Pickaxe)
-* Learn to Program: http://pine.fm/LearnToProgram/ (a beginners guide)
-
-These two books will bring you up to speed on the Ruby language and also on
-programming in general.
-
-
-== Debugger
-
-Debugger support is available through the debugger command when you start your
-Mongrel or WEBrick server with --debugger. This means that you can break out of
-execution at any point in the code, investigate and change the model, and then,
-resume execution! You need to install ruby-debug to run the server in debugging
-mode. With gems, use <tt>sudo gem install ruby-debug</tt>. Example:
-
- class WeblogController < ActionController::Base
- def index
- @posts = Post.all
- debugger
- end
- end
-
-So the controller will accept the action, run the first line, then present you
-with a IRB prompt in the server window. Here you can do things like:
-
- >> @posts.inspect
- => "[#<Post:0x14a6be8
- @attributes={"title"=>nil, "body"=>nil, "id"=>"1"}>,
- #<Post:0x14a6620
- @attributes={"title"=>"Rails", "body"=>"Only ten..", "id"=>"2"}>]"
- >> @posts.first.title = "hello from a debugger"
- => "hello from a debugger"
-
-...and even better, you can examine how your runtime objects actually work:
-
- >> f = @posts.first
- => #<Post:0x13630c4 @attributes={"title"=>nil, "body"=>nil, "id"=>"1"}>
- >> f.
- Display all 152 possibilities? (y or n)
-
-Finally, when you're ready to resume execution, you can enter "cont".
-
-
-== Console
-
-The console is a Ruby shell, which allows you to interact with your
-application's domain model. Here you'll have all parts of the application
-configured, just like it is when the application is running. You can inspect
-domain models, change values, and save to the database. Starting the script
-without arguments will launch it in the development environment.
-
-To start the console, run <tt>rails console</tt> from the application
-directory.
-
-Options:
-
-* Passing the <tt>-s, --sandbox</tt> argument will rollback any modifications
- made to the database.
-* Passing an environment name as an argument will load the corresponding
- environment. Example: <tt>rails console production</tt>.
-
-To reload your controllers and models after launching the console run
-<tt>reload!</tt>
-
-More information about irb can be found at:
-link:http://www.rubycentral.org/pickaxe/irb.html
-
-
-== dbconsole
-
-You can go to the command line of your database directly through <tt>rails
-dbconsole</tt>. You would be connected to the database with the credentials
-defined in database.yml. Starting the script without arguments will connect you
-to the development database. Passing an argument will connect you to a different
-database, like <tt>rails dbconsole production</tt>. Currently works for MySQL,
-PostgreSQL and SQLite 3.
-
-== Description of Contents
-
-The default directory structure of a generated Ruby on Rails application:
-
- |-- app
- | |-- assets
- | |-- images
- | |-- javascripts
- | `-- stylesheets
- | |-- controllers
- | |-- helpers
- | |-- mailers
- | |-- models
- | `-- views
- | `-- layouts
- |-- config
- | |-- environments
- | |-- initializers
- | `-- locales
- |-- db
- |-- doc
- |-- lib
- | `-- tasks
- |-- log
- |-- public
- |-- script
- |-- test
- | |-- fixtures
- | |-- functional
- | |-- integration
- | |-- performance
- | `-- unit
- |-- tmp
- | |-- cache
- | |-- pids
- | |-- sessions
- | `-- sockets
- `-- vendor
- |-- assets
- `-- stylesheets
- `-- plugins
-
-app
- Holds all the code that's specific to this particular application.
-
-app/assets
- Contains subdirectories for images, stylesheets, and JavaScript files.
-
-app/controllers
- Holds controllers that should be named like weblogs_controller.rb for
- automated URL mapping. All controllers should descend from
- ApplicationController which itself descends from ActionController::Base.
-
-app/models
- Holds models that should be named like post.rb. Models descend from
- ActiveRecord::Base by default.
-
-app/views
- Holds the template files for the view that should be named like
- weblogs/index.html.erb for the WeblogsController#index action. All views use
- eRuby syntax by default.
-
-app/views/layouts
- Holds the template files for layouts to be used with views. This models the
- common header/footer method of wrapping views. In your views, define a layout
- using the <tt>layout :default</tt> and create a file named default.html.erb.
- Inside default.html.erb, call <% yield %> to render the view using this
- layout.
-
-app/helpers
- Holds view helpers that should be named like weblogs_helper.rb. These are
- generated for you automatically when using generators for controllers.
- Helpers can be used to wrap functionality for your views into methods.
-
-config
- Configuration files for the Rails environment, the routing map, the database,
- and other dependencies.
-
-db
- Contains the database schema in schema.rb. db/migrate contains all the
- sequence of Migrations for your schema.
-
-doc
- This directory is where your application documentation will be stored when
- generated using <tt>rake doc:app</tt>
-
-lib
- Application specific libraries. Basically, any kind of custom code that
- doesn't belong under controllers, models, or helpers. This directory is in
- the load path.
-
-public
- The directory available for the web server. Also contains the dispatchers and the
- default HTML files. This should be set as the DOCUMENT_ROOT of your web
- server.
-
-script
- Helper scripts for automation and generation.
-
-test
- Unit and functional tests along with fixtures. When using the rails generate
- command, template test files will be generated for you and placed in this
- directory.
-
-vendor
- External libraries that the application depends on. Also includes the plugins
- subdirectory. If the app has frozen rails, those gems also go here, under
- vendor/rails/. This directory is in the load path.
diff --git a/README.textile b/README.textile
new file mode 100644
index 000000000..94a4d75c9
--- /dev/null
+++ b/README.textile
@@ -0,0 +1,62 @@
+h1. Chouette2 !https://travis-ci.org/dryade/chouette2.png?branch=master!:https://travis-ci.org/dryade/chouette2 !https://codeclimate.com/badge.png!:https://codeclimate.com/github/dryade/ninoxe
+
+h2. Licence
+
+Copyright "AFIMB":http://www.developpement-durable.gouv.fr/Presentation-de-l-AFIMB.html
+
+contributeurs / contributors :
+* "DRYADE":http://www.dryade.net
+* "MobiGIS":http://www.mobigis.fr
+* "Cityway":http://www.cityway.fr
+
+
+Ce logiciel est un programme informatique servant à créer et à échanger des données de modélisation d'offres de transport en commun en respectant les préconisations de la norme NEPTUNE [ref AFNOR en cour] .
+
+Ce logiciel est régi par la licence CeCILL-B soumise au droit français et respectant les principes de diffusion des logiciels libres. Vous pouvez utiliser, modifier et/ou redistribuer ce programme sous les conditions de la licence CeCILL-B telle que diffusée par le CEA, le CNRS et l'INRIA sur le site "http://www.cecill.info":http://www.cecill.info .
+
+En contrepartie de l'accessibilité au code source et des droits de copie, de modification et de redistribution accordés par cette licence, il n'est offert aux utilisateurs qu'une garantie limitée. Pour les mêmes raisons, seule une responsabilité restreinte pèse sur l'auteur du programme, le titulaire des droits patrimoniaux et les concédants successifs.
+
+A cet égard l'attention de l'utilisateur est attirée sur les risques associés au chargement, à l'utilisation, à la modification et/ou au développement et à la reproduction du logiciel par l'utilisateur étant donné sa spécificité de logiciel libre, qui peut le rendre complexe à manipuler et qui le réserve donc à des développeurs et des professionnels avertis possédant des connaissances informatiques approfondies. Les utilisateurs sont donc invités à charger et tester l'adéquation du logiciel à leurs besoins dans des conditions permettant d'assurer la sécurité de leurs systèmes et ou de leurs données et, plus généralement, à l'utiliser et l'exploiter dans les mêmes conditions de sécurité.
+
+Le fait que vous puissiez accéder à cet en-tête signifie que vous avez pris connaissance de la licence CeCILL-B, et que vous en avez accepté les termes.
+
+--------------------------------------------------------------
+
+This software is a computer program whose purpose is to to manage and disseminate public transfort offers according to the french NEPTUNE standard [AFNOR reference in progress].
+
+This software is governed by the CeCILL-B license under French law and abiding by the rules of distribution of free software. You can use, modify and/ or redistribute the software under the terms of the CeCILL-B license as circulated by CEA, CNRS and INRIA at the following URL "http://www.cecill.info":http://www.cecill.info .
+
+As a counterpart to the access to the source code and rights to copy, modify and redistribute granted by the license, users are provided only with a limited warranty and the software's author, the holder of the economic rights, and the successive licensors have only limited liability.
+
+In this respect, the user's attention is drawn to the risks associated with loading, using, modifying and/or developing or reproducing the software by the user in light of its specific status of free software, that may mean that it is complicated to manipulate,and that also therefore means that it is reserved for developers and experienced professionals having in-depth computer knowledge. Users are therefore encouraged to load and test the software's suitability as regards their requirements in conditions enabling the security of their systems and/or data to be ensured and, more generally, to use and operate it in the same conditions as regards security.
+
+The fact that you are presently reading this means that you have had knowledge of the CeCILL-B license and that you accept its terms.
+
+h2. Notes de version
+
+h3. V2.0.3
+
+* Ajout des imports/export NeTex
+* Fonctionnement sous windows
+* Prise en compte de grandes quantités de calendriers.
+* Reprise des logs d'import Neptune
+
+h3. V2.0.2
+
+* Ajout de l'import GTFS (expérimental, ne traite pas les stations)
+* Ajout d'API Rest pour accéder aux données depuis une autre application
+
+h3. V2.0.1
+
+* Ajout de la gestion des groupes de lignes
+* Ajout de la gestion des accès et des relations arrêts-accès
+* Ajout d'une vue calendaire des calendriers d'application
+* Améliorations ergonomiques et cartographiques
+* L'import Neptune accepte les principaux formats d'encodage : ISO-8859-1, UTF-8, ...
+
+h3. V2.0.0
+
+* refonte de l'interface graphique
+* ajout d'une gestion simplifiée d'utilisateurs :
+** ajout d'une notion d'organisation
+** ajout d'une notion d'espace de données
diff --git a/app/assets/images/icons/disabled_left_arrow.png b/app/assets/images/icons/disabled_left_arrow.png
new file mode 100644
index 000000000..3e11b9c71
--- /dev/null
+++ b/app/assets/images/icons/disabled_left_arrow.png
Binary files differ
diff --git a/app/assets/images/icons/disabled_right_arrow.png b/app/assets/images/icons/disabled_right_arrow.png
new file mode 100644
index 000000000..be6fcdf65
--- /dev/null
+++ b/app/assets/images/icons/disabled_right_arrow.png
Binary files differ
diff --git a/app/assets/images/icons/gray_left_arrow.png b/app/assets/images/icons/gray_left_arrow.png
new file mode 100644
index 000000000..7dc80a93e
--- /dev/null
+++ b/app/assets/images/icons/gray_left_arrow.png
Binary files differ
diff --git a/app/assets/images/icons/gray_right_arrow.png b/app/assets/images/icons/gray_right_arrow.png
new file mode 100644
index 000000000..a2fa02a7c
--- /dev/null
+++ b/app/assets/images/icons/gray_right_arrow.png
Binary files differ
diff --git a/app/assets/images/icons/green_left_arrow.png b/app/assets/images/icons/green_left_arrow.png
new file mode 100644
index 000000000..26149186d
--- /dev/null
+++ b/app/assets/images/icons/green_left_arrow.png
Binary files differ
diff --git a/app/assets/images/icons/green_right_arrow.png b/app/assets/images/icons/green_right_arrow.png
new file mode 100644
index 000000000..09ac3eec9
--- /dev/null
+++ b/app/assets/images/icons/green_right_arrow.png
Binary files differ
diff --git a/app/assets/images/logoMEDDE.jpg b/app/assets/images/logoMEDDE.jpg
new file mode 100644
index 000000000..06d4a2a1f
--- /dev/null
+++ b/app/assets/images/logoMEDDE.jpg
Binary files differ
diff --git a/app/assets/images/map/access_in.png b/app/assets/images/map/access_in.png
new file mode 100644
index 000000000..6d341c517
--- /dev/null
+++ b/app/assets/images/map/access_in.png
Binary files differ
diff --git a/app/assets/images/map/access_in_out.png b/app/assets/images/map/access_in_out.png
new file mode 100644
index 000000000..5c9b066c5
--- /dev/null
+++ b/app/assets/images/map/access_in_out.png
Binary files differ
diff --git a/app/assets/images/map/access_out.png b/app/assets/images/map/access_out.png
new file mode 100644
index 000000000..bd366b7fc
--- /dev/null
+++ b/app/assets/images/map/access_out.png
Binary files differ
diff --git a/app/assets/javascripts/access_points.js.coffee b/app/assets/javascripts/access_points.js.coffee
new file mode 100644
index 000000000..74c5e926f
--- /dev/null
+++ b/app/assets/javascripts/access_points.js.coffee
@@ -0,0 +1,46 @@
+jQuery ->
+ x_y_change = (event) ->
+ if referential_projection != undefined
+ referential_point = new OpenLayers.Geometry.Point($('input#access_point_longitude').val(), $('input#access_point_latitude').val()).transform(new OpenLayers.Projection("EPSG:4326"), referential_projection )
+
+ $('input#access_point_x').val(referential_point.x)
+ $('input#access_point_y').val(referential_point.y)
+
+ feature = map.getLayersByName("access_point")[0].getFeatureByFid($('input#access_point_id').val())
+ google_point = new OpenLayers.LonLat($('input#access_point_longitude').val(), $('input#access_point_latitude').val()).transform(new OpenLayers.Projection("EPSG:4326"), map.getProjectionObject())
+ feature.move(google_point)
+ map.setCenter(google_point, 16, false, true)
+
+ $('input#access_point_longitude').change(x_y_change)
+ $('input#access_point_latitude').change(x_y_change)
+
+ lon_lat_change = (event) ->
+ if referential_projection != undefined
+ wgs84_point = new OpenLayers.Geometry.Point($('input#access_point_x').val(), $('input#access_point_y').val()).transform(referential_projection, new OpenLayers.Projection("EPSG:4326"))
+
+ $('input#access_point_longitude').val( wgs84_point.x)
+ $('input#access_point_latitude').val( wgs84_point.y)
+
+ feature = map.getLayersByName("stop_area")[0].getFeatureByFid($('input#access_point_id').val())
+ google_point = new OpenLayers.LonLat(wgs84_point.x, wgs84_point.y).transform(new OpenLayers.Projection("EPSG:4326"), map.getProjectionObject())
+ feature.move(google_point)
+ map.setCenter(google_point, 16, false, true)
+
+ $('input#access_point_x').change(lon_lat_change)
+ $('input#access_point_y').change(lon_lat_change)
+
+
+ # switch visibility of access_links
+ switch_generics = (event) ->
+ event.preventDefault()
+ $('.access_points .generics.content').toggle('slow')
+ $('a.generics .switcher').toggle()
+
+ $('.access_points a.generics').click(switch_generics)
+
+ switch_details = (event) ->
+ event.preventDefault()
+ $('.access_points .details.content').toggle('slow')
+ $('a.details .switcher').toggle()
+
+ $('.access_points a.details').click(switch_details)
diff --git a/app/assets/javascripts/exports.js.coffee b/app/assets/javascripts/exports.js.coffee
index 6de0d4692..6430c38ba 100644
--- a/app/assets/javascripts/exports.js.coffee
+++ b/app/assets/javascripts/exports.js.coffee
@@ -18,6 +18,6 @@ jQuery ->
export_type_change = (event) ->
export_type = $("select option:selected").attr("value")
- $(form).toggle($(form).is("#" + export_type + "_new")) for form in $('form.export')
+ $(form).toggle($(form).is("#" + export_type + "_new")) for form in $('form.export[method = "post"]')
$('#export_type').change(export_type_change)
diff --git a/app/assets/javascripts/group_of_line.js.coffee b/app/assets/javascripts/group_of_line.js.coffee
new file mode 100644
index 000000000..315fb19e6
--- /dev/null
+++ b/app/assets/javascripts/group_of_line.js.coffee
@@ -0,0 +1,15 @@
+jQuery ->
+
+ switch_lines = (event) ->
+ event.preventDefault()
+ $('.group_of_lines.show .lines_detail').toggle('slow')
+ $('a.lines .switcher').toggle()
+
+ $('.group_of_lines.show a.lines').click(switch_lines)
+
+
+ make_ajax_pagination = () ->
+ $.get(this.href, null, null, 'script')
+ false
+
+ $(document).on("click", '.group_of_lines.show .lines_detail .pagination a', make_ajax_pagination)
diff --git a/app/assets/javascripts/imports.js.coffee b/app/assets/javascripts/imports.js.coffee
index ba7372e13..6bccc3ef6 100644
--- a/app/assets/javascripts/imports.js.coffee
+++ b/app/assets/javascripts/imports.js.coffee
@@ -3,6 +3,6 @@ jQuery ->
import_type_change = (event) ->
import_type = $("select option:selected").attr("value")
- $(form).toggle($(form).is("#" + import_type + "_new")) for form in $('form.import')
+ $(form).toggle($(form).is("#" + import_type + "_new")) for form in $('form.import[method = "post"]')
$('#import_type').change(import_type_change)
diff --git a/app/assets/javascripts/journey_pattern.js.coffee b/app/assets/javascripts/journey_pattern.js.coffee
index 6ea0c01de..062fc611e 100644
--- a/app/assets/javascripts/journey_pattern.js.coffee
+++ b/app/assets/javascripts/journey_pattern.js.coffee
@@ -9,11 +9,11 @@ jQuery ->
else
selectFeature.unselectAll()
- $('.journey_patterns.show div.stop_points .stop_point').live("hover", select_stop_on_map)
+ $(document).on("hover", '.journey_patterns.show div.stop_points .stop_point', select_stop_on_map)
make_ajax_pagination = () ->
$.get(this.href, null, null, 'script')
false
- $('.stop_points_detail .pagination a').live("click", make_ajax_pagination)
+ $(document).on("click", '.stop_points_detail .pagination a', make_ajax_pagination)
diff --git a/app/assets/javascripts/public/formtastic.qtip2.min.js b/app/assets/javascripts/public/formtastic.qtip2.min.js
index 2f81a7a54..52a1ef1f7 100644
--- a/app/assets/javascripts/public/formtastic.qtip2.min.js
+++ b/app/assets/javascripts/public/formtastic.qtip2.min.js
@@ -1,74 +1,2 @@
-// formtastic.qtip2.js
-//
-// author: Gyorgy Schreiber
-// gydotschreiberatmobilitydothu
-//
-// this script allows a simple replacement of formtastic's inline hints with qTip2
-// tooltips for all formtastic forms in your rails app by binding a qtip to the
-// parent of each '.inline-hints' class element of the app's pages (those normally
-// should be the default hints generated by formtastic).
-//
-// REQUIRES:
-// formtastic - https://github.com/justinfrench/formtastic
-// jQuery (for qTip2) - http://jquery.com/
-// qTip2 - http://craigsworks.com/projects/qtip2/
-//
-// INSTALLATION:
-// (assuming you have a rails app set up with formtastic and jQuery > 1.4.2)
-// 1) include this file in your app's javascripts directory (optionally you can
-// use the min version of this file)
-// 2) add the following line to your application.html.erb (and other templates
-// where you intend to use qTip2 for formtastic):
-// <%= javascript_include_tag 'jquery.qtip.min', 'formtastic.qtip2.min' %>
-// also include the qTip2 CSS
-// <%= stylesheet_link_tag 'jquery.qtip.min.css' %>
-// 3) you should reload a page that was displaying a formtastic form with inline
-// hints and you should see those hints gone (hidden) and a qTip2 tooltip should
-// pop-up as the mouse moves over the formtastic input element showing the text
-// of the inline hint... enjoy! :)
-//
-// LICENSING:
-// GPL & MIT dual license (as qTip2)
-// GPL - http://www.gnu.org/copyleft/gpl.html
-//
-// MIT License
-// Copyright (C) 2012 Gyorgy Schreiber (gydotschreiberatmobilitydothu)
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy of
-// this software and associated documentation files (the "Software"), to deal in
-// the Software without restriction, including without limitation the rights to
-// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-// of the Software, and to permit persons to whom the Software is furnished to do
-// so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-
-$(function() {
-// hide all inline-hints
-$(".inline-hints").hide();
-// set qtip2 tooltips in conjunction with formtastic's 'inline-hints' class
-$(".inline-hints").each(function(){
- var input = $(this.parentNode);
- //$(this).hide(); // hide the inline-hint
- // assign tooltip
- input.qtip({
- position: {at: "bottom middle", my: "top middle"},
- content: {text: function(api) {
- var hinttext = $(this)[0].lastChild.firstChild.parentElement.attributes[0].nodeName == 'class' && $(this)[0].lastChild.firstChild.parentElement.attributes[0].nodeValue == 'inline-errors' ? $(this)[0].children[$(this)[0].children.length-2].firstChild.wholeText : $(this)[0].lastChild.firstChild.wholeText;
- return hinttext;
- //return $(this)[0].children[2].firstChild.wholeText;
- }
- }
- });
-});
-
-}); \ No newline at end of file
+// formtastic.qtip2.min.js Copyright (C) 2012 Gyorgy Schreiber (gydotschreiberatmobilitydothu) - MIT & GPL licenses apply
+$(".inline-hints").hide();$(".inline-hints").each(function(){var input = $(this.parentNode);input.qtip({position: {at: "bottom middle", my: "top middle"},content: {text: function(api) {var hinttext = $(this)[0].lastChild.firstChild.parentElement.attributes[0].nodeName == 'class' && $(this)[0].lastChild.firstChild.parentElement.attributes[0].nodeValue == 'inline-errors' ? $(this)[0].children[$(this)[0].children.length-2].firstChild.wholeText : $(this)[0].lastChild.firstChild.wholeText;return hinttext;}}});});
diff --git a/app/assets/javascripts/public/jquery.qtip.min.js b/app/assets/javascripts/public/jquery.qtip.min.js
index 891523841..1ed034ee3 100644
--- a/app/assets/javascripts/public/jquery.qtip.min.js
+++ b/app/assets/javascripts/public/jquery.qtip.min.js
@@ -1,13 +1,2 @@
-/*!
-* qTip2 - Pretty powerful tooltips
-* http://craigsworks.com/projects/qtip2/
-*
-* Version: nightly
-* Copyright 2009-2010 Craig Michael Thompson - http://craigsworks.com
-*
-* Dual licensed under MIT or GPLv2 licenses
-* http://en.wikipedia.org/wiki/MIT_License
-* http://en.wikipedia.org/wiki/GNU_General_Public_License
-*
-* Date: Tue Jul 3 15:45:43.0000000000 2012
-*//*jslint browser: true, onevar: true, undef: true, nomen: true, bitwise: true, regexp: true, newcap: true, immed: true, strict: true *//*global window: false, jQuery: false, console: false, define: false */(function(a){typeof define==="function"&&define.amd?define(["jquery"],a):a(jQuery)})(function(a){function K(e,f){var g,h,i,j,k,l=a(this),m=a(document.body),n=this===document?m:l,o=l.metadata?l.metadata(f.metadata):d,p=f.metadata.type==="html5"&&o?o[f.metadata.name]:d,q=l.data(f.metadata.name||"qtipopts");try{q=typeof q==="string"?(new Function("return "+q))():q}catch(t){H("Unable to parse HTML5 attribute data: "+q)}j=a.extend(b,{},r.defaults,f,typeof q==="object"?I(q):d,I(p||o)),h=j.position,j.id=e;if("boolean"===typeof j.content.text){i=l.attr(j.content.attr);if(j.content.attr!==c&&i)j.content.text=i;else{H("Unable to locate content for tooltip! Aborting render of tooltip on element: ",l);return c}}h.container.length||(h.container=m),h.target===c&&(h.target=n),j.show.target===c&&(j.show.target=n),j.show.solo===b&&(j.show.solo=h.container.closest("body")),j.hide.target===c&&(j.hide.target=n),j.position.viewport===b&&(j.position.viewport=h.container),h.container=h.container.eq(0),h.at=new s.Corner(h.at),h.my=new s.Corner(h.my);if(a.data(this,"qtip"))if(j.overwrite)l.qtip("destroy");else if(j.overwrite===c)return c;j.suppress&&(k=a.attr(this,"title"))&&a(this).removeAttr("title").attr(F,k).attr("title",""),g=new J(l,j,e,!!i),a.data(this,"qtip",g),l.bind("remove.qtip-"+e+" removeqtip.qtip-"+e,function(){g.destroy()});return g}function J(f,g,o,p){function X(){var b=[g.show.target[0],g.hide.target[0],q.rendered&&M.tooltip[0],g.position.container[0],g.position.viewport[0],window,document];q.rendered?a([]).pushStack(a.grep(b,function(a){return typeof a==="object"})).unbind(L):g.show.target.unbind(L+"-create")}function W(){function m(a){q.rendered&&K[0].offsetWidth>0&&q.reposition(a)}function l(a){if(K.hasClass(x))return c;clearTimeout(q.timers.inactive),q.timers.inactive=setTimeout(function(){q.hide(a)},g.hide.inactive)}function k(b){if(K.hasClass(x)||H||J)return c;var f=a(b.relatedTarget||b.target),h=f.closest(y)[0]===K[0],i=f[0]===e.show[0];clearTimeout(q.timers.show),clearTimeout(q.timers.hide);if(d.target==="mouse"&&h||g.hide.fixed&&(/mouse(out|leave|move)/.test(b.type)&&(h||i)))try{b.preventDefault(),b.stopImmediatePropagation()}catch(j){}else g.hide.delay>0?q.timers.hide=setTimeout(function(){q.hide(b)},g.hide.delay):q.hide(b)}function j(a){if(K.hasClass(x))return c;clearTimeout(q.timers.show),clearTimeout(q.timers.hide);var d=function(){q.toggle(b,a)};g.show.delay>0?q.timers.show=setTimeout(d,g.show.delay):d()}var d=g.position,e={show:g.show.target,hide:g.hide.target,viewport:a(d.viewport),document:a(document),body:a(document.body),window:a(window)},h={show:a.trim(""+g.show.event).split(" "),hide:a.trim(""+g.hide.event).split(" ")},i=a.browser.msie&&parseInt(a.browser.version,10)===6;K.bind("mouseenter"+L+" mouseleave"+L,function(a){var b=a.type==="mouseenter";b&&q.focus(a),K.toggleClass(B,b)}),/mouse(out|leave)/i.test(g.hide.event)&&(g.hide.leave==="window"&&e.window.bind("mouseleave"+L+" blur"+L,function(a){!/select|option/.test(a.target.nodeName)&&!a.relatedTarget&&q.hide(a)})),g.hide.fixed?(e.hide=e.hide.add(K),K.bind("mouseover"+L,function(){K.hasClass(x)||clearTimeout(q.timers.hide)})):/mouse(over|enter)/i.test(g.show.event)&&e.hide.bind("mouseleave"+L,function(a){clearTimeout(q.timers.show)}),(""+g.hide.event).indexOf("unfocus")>-1&&d.container.closest("html").bind("mousedown"+L,function(b){var c=a(b.target),d=q.rendered&&!K.hasClass(x)&&K[0].offsetWidth>0,e=c.parents(y).filter(K[0]).length>0;c[0]!==f[0]&&c[0]!==K[0]&&!e&&!f.has(c[0]).length&&!c.attr("disabled")&&q.hide(b)}),"number"===typeof g.hide.inactive&&(e.show.bind("qtip-"+o+"-inactive",l),a.each(r.inactiveEvents,function(a,b){e.hide.add(M.tooltip).bind(b+L+"-inactive",l)})),a.each(h.hide,function(b,c){var d=a.inArray(c,h.show),f=a(e.hide);d>-1&&f.add(e.show).length===f.length||c==="unfocus"?(e.show.bind(c+L,function(a){K[0].offsetWidth>0?k(a):j(a)}),delete h.show[d]):e.hide.bind(c+L,k)}),a.each(h.show,function(a,b){e.show.bind(b+L,j)}),"number"===typeof g.hide.distance&&e.show.add(K).bind("mousemove"+L,function(a){var b=N.origin||{},c=g.hide.distance,d=Math.abs;(d(a.pageX-b.pageX)>=c||d(a.pageY-b.pageY)>=c)&&q.hide(a)}),d.target==="mouse"&&(e.show.bind("mousemove"+L,function(a){t={pageX:a.pageX,pageY:a.pageY,type:"mousemove"}}),d.adjust.mouse&&(g.hide.event&&(K.bind("mouseleave"+L,function(a){(a.relatedTarget||a.target)!==e.show[0]&&q.hide(a)}),M.target.bind("mouseenter"+L+" mouseleave"+L,function(a){N.onTarget=a.type==="mouseenter"})),e.document.bind("mousemove"+L,function(a){q.rendered&&N.onTarget&&!K.hasClass(x)&&K[0].offsetWidth>0&&q.reposition(a||t)}))),(d.adjust.resize||e.viewport.length)&&(a.event.special.resize?e.viewport:e.window).bind("resize"+L,m),(e.viewport.length||i&&K.css("position")==="fixed")&&e.viewport.bind("scroll"+L,m)}function V(b,d){function h(b){function i(e){e&&(delete h[e.src],clearTimeout(q.timers.img[e.src]),a(e).unbind(L)),a.isEmptyObject(h)&&(q.redraw(),d!==c&&q.reposition(N.event),b())}var f,h={};if((f=g.find("img[src]:not([height]):not([width])")).length===0)return i();f.each(function(b,c){if(h[c.src]===e){var d=0,f=3;(function g(){if(c.height||c.width||d>f)return i(c);d+=1,q.timers.img[c.src]=setTimeout(g,700)})(),a(c).bind("error"+L+" load"+L,function(){i(this)}),h[c.src]=c}})}var g=M.content;if(!q.rendered||!b)return c;a.isFunction(b)&&(b=b.call(f,N.event,q)||""),b.jquery&&b.length>0?g.empty().append(b.css({display:"block"})):g.html(b),q.rendered<0?K.queue("fx",h):(J=0,h(a.noop));return q}function U(b,d){var e=M.title;if(!q.rendered||!b)return c;a.isFunction(b)&&(b=b.call(f,N.event,q));if(b===c||!b&&b!=="")return Q(c);b.jquery&&b.length>0?e.empty().append(b.css({display:"block"})):e.html(b),q.redraw(),d!==c&&q.rendered&&K[0].offsetWidth>0&&q.reposition(N.event)}function T(a){var b=M.button,d=M.title;if(!q.rendered)return c;a?(d||S(),R()):b.remove()}function S(){var c=E+"-title";M.titlebar&&Q(),M.titlebar=a("<div />",{"class":v+"-titlebar "+(g.style.widget?"ui-widget-header":"")}).append(M.title=a("<div />",{id:c,"class":v+"-title","aria-atomic":b})).insertBefore(M.content).delegate(".ui-tooltip-close","mousedown keydown mouseup keyup mouseout",function(b){a(this).toggleClass("ui-state-active ui-state-focus",b.type.substr(-4)==="down")}).delegate(".ui-tooltip-close","mouseover mouseout",function(b){a(this).toggleClass("ui-state-hover",b.type==="mouseover")}),g.content.title.button?R():q.rendered&&q.redraw()}function R(){var b=g.content.title.button,d=typeof b==="string",e=d?b:"Close tooltip";M.button&&M.button.remove(),b.jquery?M.button=b:M.button=a("<a />",{"class":"ui-state-default ui-tooltip-close "+(g.style.widget?"":v+"-icon"),title:e,"aria-label":e}).prepend(a("<span />",{"class":"ui-icon ui-icon-close",html:"&times;"})),M.button.appendTo(M.titlebar).attr("role","button").click(function(a){K.hasClass(x)||q.hide(a);return c}),q.redraw()}function Q(a){M.title&&(M.titlebar.remove(),M.titlebar=M.title=M.button=d,a!==c&&q.reposition())}function P(){var a=g.style.widget;K.toggleClass(w,a).toggleClass(z,g.style.def&&!a),M.content.toggleClass(w+"-content",a),M.titlebar&&M.titlebar.toggleClass(w+"-header",a),M.button&&M.button.toggleClass(v+"-icon",!a)}function O(a){var b=0,c,d=g,e=a.split(".");while(d=d[e[b++]])b<e.length&&(c=d);return[c||g,e.pop()]}var q=this,D=document.body,E=v+"-"+o,H=0,J=0,K=a(),L=".qtip-"+o,M,N;q.id=o,q.destroyed=q.rendered=c,q.elements=M={target:f},q.timers={img:{}},q.options=g,q.checks={},q.plugins={},q.cache=N={event:{},target:a(),disabled:c,attr:p,onTarget:c,lastClass:""},q.checks.builtin={"^id$":function(d,e,f){var g=f===b?r.nextid:f,h=v+"-"+g;g!==c&&g.length>0&&!a("#"+h).length&&(K[0].id=h,M.content[0].id=h+"-content",M.title[0].id=h+"-title")},"^content.text$":function(a,b,c){V(c)},"^content.title.text$":function(a,b,c){if(!c)return Q();!M.title&&c&&S(),U(c)},"^content.title.button$":function(a,b,c){T(c)},"^position.(my|at)$":function(a,b,c){"string"===typeof c&&(a[b]=new s.Corner(c))},"^position.container$":function(a,b,c){q.rendered&&K.appendTo(c)},"^show.ready$":function(){q.rendered?q.toggle(b):q.render(1)},"^style.classes$":function(a,b,c){K.attr("class",v+" qtip ui-helper-reset "+c)},"^style.widget|content.title":P,"^events.(render|show|move|hide|focus|blur)$":function(b,c,d){K[(a.isFunction(d)?"":"un")+"bind"]("tooltip"+c,d)},"^(show|hide|position).(event|target|fixed|inactive|leave|distance|viewport|adjust)":function(){var a=g.position;K.attr("tracking",a.target==="mouse"&&a.adjust.mouse),X(),W()}},a.extend(q,{render:function(d){if(q.rendered)return q;var e=g.content.text,h=g.content.title.text,i=g.position,j=a.Event("tooltiprender");a.attr(f[0],"aria-describedby",E),K=M.tooltip=a("<div/>",{id:E,"class":v+" qtip ui-helper-reset "+z+" "+g.style.classes+" "+v+"-pos-"+g.position.my.abbrev(),width:g.style.width||"",height:g.style.height||"",tracking:i.target==="mouse"&&i.adjust.mouse,role:"alert","aria-live":"polite","aria-atomic":c,"aria-describedby":E+"-content","aria-hidden":b}).toggleClass(x,N.disabled).data("qtip",q).appendTo(g.position.container).append(M.content=a("<div />",{"class":v+"-content",id:E+"-content","aria-atomic":b})),q.rendered=-1,H=J=1,h&&(S(),a.isFunction(h)||U(h,c)),a.isFunction(e)||V(e,c),q.rendered=b,P(),a.each(g.events,function(b,c){a.isFunction(c)&&K.bind(b==="toggle"?"tooltipshow tooltiphide":"tooltip"+b,c)}),a.each(s,function(){this.initialize==="render"&&this(q)}),W(),K.queue("fx",function(a){j.originalEvent=N.event,K.trigger(j,[q]),H=J=0,q.redraw(),(g.show.ready||d)&&q.toggle(b,N.event,c),a()});return q},get:function(a){var b,c;switch(a.toLowerCase()){case"dimensions":b={height:K.outerHeight(),width:K.outerWidth()};break;case"offset":b=s.offset(K,g.position.container);break;default:c=O(a.toLowerCase()),b=c[0][c[1]],b=b.precedance?b.string():b}return b},set:function(e,f){function n(a,b){var c,d,e;for(c in l)for(d in l[c])if(e=(new RegExp(d,"i")).exec(a))b.push(e),l[c][d].apply(q,b)}var h=/^position\.(my|at|adjust|target|container)|style|content|show\.ready/i,i=/^content\.(title|attr)|style/i,j=c,k=c,l=q.checks,m;"string"===typeof e?(m=e,e={},e[m]=f):e=a.extend(b,{},e),a.each(e,function(b,c){var d=O(b.toLowerCase()),f;f=d[0][d[1]],d[0][d[1]]="object"===typeof c&&c.nodeType?a(c):c,e[b]=[d[0],d[1],c,f],j=h.test(b)||j,k=i.test(b)||k}),I(g),H=J=1,a.each(e,n),H=J=0,q.rendered&&K[0].offsetWidth>0&&(j&&q.reposition(g.position.target==="mouse"?d:N.event),k&&q.redraw());return q},toggle:function(e,f){function u(){e?(a.browser.msie&&K[0].style.removeAttribute("filter"),K.css("overflow",""),"string"===typeof i.autofocus&&a(i.autofocus,K).focus(),i.target.trigger("qtip-"+o+"-inactive")):K.css({display:"",visibility:"",opacity:"",left:"",top:""}),s=a.Event("tooltip"+(e?"visible":"hidden")),s.originalEvent=f?N.event:d,K.trigger(s,[q])}if(!q.rendered)return e?q.render(1):q;var h=e?"show":"hide",i=g[h],j=g[e?"hide":"show"],k=g.position,l=g.content,m=K[0].offsetWidth>0,n=e||i.target.length===1,p=!f||i.target.length<2||N.target[0]===f.target,r,s;(typeof e).search("boolean|number")&&(e=!m);if(!K.is(":animated")&&m===e&&p)return q;if(f){if(/over|enter/.test(f.type)&&/out|leave/.test(N.event.type)&&g.show.target.add(f.target).length===g.show.target.length&&K.has(f.relatedTarget).length)return q;N.event=a.extend({},f)}s=a.Event("tooltip"+h),s.originalEvent=f?N.event:d,K.trigger(s,[q,90]);if(s.isDefaultPrevented())return q;a.attr(K[0],"aria-hidden",!e),e?(N.origin=a.extend({},t),q.focus(f),a.isFunction(l.text)&&V(l.text,c),a.isFunction(l.title.text)&&U(l.title.text,c),!G&&k.target==="mouse"&&k.adjust.mouse&&(a(document).bind("mousemove.qtip",function(a){t={pageX:a.pageX,pageY:a.pageY,type:"mousemove"}}),G=b),q.reposition(f,arguments[2]),(s.solo=!!i.solo)&&a(y,i.solo).not(K).qtip("hide",s)):(clearTimeout(q.timers.show),delete N.origin,G&&!a(y+'[tracking="true"]:visible',i.solo).not(K).length&&(a(document).unbind("mousemove.qtip"),G=c),q.blur(f)),i.effect===c||n===c?(K[h](),u.call(K)):a.isFunction(i.effect)?(K.stop(1,1),i.effect.call(K,q),K.queue("fx",function(a){u(),a()})):K.fadeTo(90,e?1:0,u),e&&i.target.trigger("qtip-"+o+"-inactive");return q},show:function(a){return q.toggle(b,a)},hide:function(a){return q.toggle(c,a)},focus:function(b){if(!q.rendered)return q;var c=a(y),d=parseInt(K[0].style.zIndex,10),e=r.zindex+c.length,f=a.extend({},b),g,h;K.hasClass(A)||(h=a.Event("tooltipfocus"),h.originalEvent=f,K.trigger(h,[q,e]),h.isDefaultPrevented()||(d!==e&&(c.each(function(){this.style.zIndex>d&&(this.style.zIndex=this.style.zIndex-1)}),c.filter("."+A).qtip("blur",f)),K.addClass(A)[0].style.zIndex=e));return q},blur:function(b){var c=a.extend({},b),d;K.removeClass(A),d=a.Event("tooltipblur"),d.originalEvent=c,K.trigger(d,[q]);return q},reposition:function(b,d){if(!q.rendered||H)return q;H=1;var e=g.position.target,f=g.position,h=f.my,i=f.at,o=f.adjust,p=o.method.split(" "),r=K.outerWidth(),u=K.outerHeight(),v=0,w=0,x=a.Event("tooltipmove"),y=K.css("position")==="fixed",z=f.viewport,A={left:0,top:0},B=f.container,C=K[0].offsetWidth>0,D,E,F;if(a.isArray(e)&&e.length===2)i={x:k,y:j},A={left:e[0],top:e[1]};else if(e==="mouse"&&(b&&b.pageX||N.event.pageX))i={x:k,y:j},b=(b&&(b.type==="resize"||b.type==="scroll")?N.event:b&&b.pageX&&b.type==="mousemove"?b:t&&t.pageX&&(o.mouse||!b||!b.pageX)?{pageX:t.pageX,pageY:t.pageY}:!o.mouse&&N.origin&&N.origin.pageX&&g.show.distance?N.origin:b)||b||N.event||t||{},A={top:b.pageY,left:b.pageX};else{e==="event"&&b&&b.target&&b.type!=="scroll"&&b.type!=="resize"?N.target=a(b.target):e!=="event"&&(N.target=a(e.jquery?e:M.target)),e=N.target,e=a(e).eq(0);if(e.length===0)return q;e[0]===document||e[0]===window?(v=s.iOS?window.innerWidth:e.width(),w=s.iOS?window.innerHeight:e.height(),e[0]===window&&(A={top:(z||e).scrollTop(),left:(z||e).scrollLeft()})):s.imagemap&&e.is("area")?D=s.imagemap(q,e,i,s.viewport?p:c):s.svg&&typeof e[0].xmlbase==="string"?D=s.svg(q,e,i,s.viewport?p:c):(v=e.outerWidth(),w=e.outerHeight(),A=s.offset(e,B)),D&&(v=D.width,w=D.height,E=D.offset,A=D.position);if(s.iOS>3.1&&s.iOS<4.1||s.iOS>=4.3&&s.iOS<4.33||!s.iOS&&y)F=a(window),A.left-=F.scrollLeft(),A.top-=F.scrollTop();A.left+=i.x===m?v:i.x===n?v/2:0,A.top+=i.y===l?w:i.y===n?w/2:0}A.left+=o.x+(h.x===m?-r:h.x===n?-r/2:0),A.top+=o.y+(h.y===l?-u:h.y===n?-u/2:0),s.viewport?(A.adjusted=s.viewport(q,A,f,v,w,r,u),E&&A.adjusted.left&&(A.left+=E.left),E&&A.adjusted.top&&(A.top+=E.top)):A.adjusted={left:0,top:0},x.originalEvent=a.extend({},b),K.trigger(x,[q,A,z.elem||z]);if(x.isDefaultPrevented())return q;delete A.adjusted,d===c||!C||isNaN(A.left)||isNaN(A.top)||e==="mouse"||!a.isFunction(f.effect)?K.css(A):a.isFunction(f.effect)&&(f.effect.call(K,q,a.extend({},A)),K.queue(function(b){a(this).css({opacity:"",height:""}),a.browser.msie&&this.style.removeAttribute("filter"),b()})),H=0;return q},redraw:function(){if(q.rendered<1||J)return q;var a=g.position.container,b,c,d,e;J=1,g.style.height&&K.css(i,g.style.height),g.style.width?K.css(h,g.style.width):(K.css(h,"").addClass(C),c=K.width()+1,d=K.css("max-width")||"",e=K.css("min-width")||"",b=(d+e).indexOf("%")>-1?a.width()/100:0,d=(d.indexOf("%")>-1?b:1)*parseInt(d,10)||c,e=(e.indexOf("%")>-1?b:1)*parseInt(e,10)||0,c=d+e?Math.min(Math.max(c,e),d):c,K.css(h,Math.round(c)).removeClass(C)),J=0;return q},disable:function(b){"boolean"!==typeof b&&(b=!K.hasClass(x)&&!N.disabled),q.rendered?(K.toggleClass(x,b),a.attr(K[0],"aria-disabled",b)):N.disabled=!!b;return q},enable:function(){return q.disable(c)},destroy:function(){var c=f[0],d=a.attr(c,F),e=f.data("qtip");q.destroyed=b,q.rendered&&(K.stop(1,0).remove(),a.each(q.plugins,function(){this.destroy&&this.destroy()})),clearTimeout(q.timers.show),clearTimeout(q.timers.hide),X();if(!e||q===e)a.removeData(c,"qtip"),g.suppress&&d&&(a.attr(c,"title",d),f.removeAttr(F)),f.removeAttr("aria-describedby");f.unbind(".qtip-"+o),delete u[q.id];return f}})}function I(b){var e;if(!b||"object"!==typeof b)return c;if(b.metadata===d||"object"!==typeof b.metadata)b.metadata={type:b.metadata};if("content"in b){if(b.content===d||"object"!==typeof b.content||b.content.jquery)b.content={text:b.content};e=b.content.text||c,!a.isFunction(e)&&(!e&&!e.attr||e.length<1||"object"===typeof e&&!e.jquery)&&(b.content.text=c);if("title"in b.content){if(b.content.title===d||"object"!==typeof b.content.title)b.content.title={text:b.content.title};e=b.content.title.text||c,!a.isFunction(e)&&(!e&&!e.attr||e.length<1||"object"===typeof e&&!e.jquery)&&(b.content.title.text=c)}}if("position"in b)if(b.position===d||"object"!==typeof b.position)b.position={my:b.position,at:b.position};if("show"in b)if(b.show===d||"object"!==typeof b.show)b.show.jquery?b.show={target:b.show}:b.show={event:b.show};if("hide"in b)if(b.hide===d||"object"!==typeof b.hide)b.hide.jquery?b.hide={target:b.hide}:b.hide={event:b.hide};if("style"in b)if(b.style===d||"object"!==typeof b.style)b.style={classes:b.style};a.each(s,function(){this.sanitize&&this.sanitize(b)});return b}function H(){H.history=H.history||[],H.history.push(arguments);if("object"===typeof console){var a=console[console.warn?"warn":"log"],b=Array.prototype.slice.call(arguments),c;typeof arguments[0]==="string"&&(b[0]="qTip2: "+b[0]),c=a.apply?a.apply(console,b):a(b)}}"use strict";var b=!0,c=!1,d=null,e,f="x",g="y",h="width",i="height",j="top",k="left",l="bottom",m="right",n="center",o="flip",p="flipinvert",q="shift",r,s,t,u={},v="ui-tooltip",w="ui-widget",x="ui-state-disabled",y="div.qtip."+v,z=v+"-default",A=v+"-focus",B=v+"-hover",C=v+"-fluid",D="-31000px",E="_replacedByqTip",F="oldtitle",G;r=a.fn.qtip=function(f,g,h){var i=(""+f).toLowerCase(),j=d,k=a.makeArray(arguments).slice(1),l=k[k.length-1],m=this[0]?a.data(this[0],"qtip"):d;if(!arguments.length&&m||i==="api")return m;if("string"===typeof f){this.each(function(){var d=a.data(this,"qtip");if(!d)return b;l&&l.timeStamp&&(d.cache.event=l);if(i!=="option"&&i!=="options"||!g)d[i]&&d[i].apply(d[i],k);else if(a.isPlainObject(g)||h!==e)d.set(g,h);else{j=d.get(g);return c}});return j!==d?j:this}if("object"===typeof f||!arguments.length){m=I(a.extend(b,{},f));return r.bind.call(this,m,l)}},r.bind=function(d,f){return this.each(function(g){function n(b){function d(){l.render(typeof b==="object"||h.show.ready),i.show.add(i.hide).unbind(k)}if(l.cache.disabled)return c;l.cache.event=a.extend({},b),l.cache.target=b?a(b.target):[e],h.show.delay>0?(clearTimeout(l.timers.show),l.timers.show=setTimeout(d,h.show.delay),j.show!==j.hide&&i.hide.bind(j.hide,function(){clearTimeout(l.timers.show)})):d()}var h,i,j,k,l,m;m=a.isArray(d.id)?d.id[g]:d.id,m=!m||m===c||m.length<1||u[m]?r.nextid++:u[m]=m,k=".qtip-"+m+"-create",l=K.call(this,m,d);if(l===c)return b;h=l.options,a.each(s,function(){this.initialize==="initialize"&&this(l)}),i={show:h.show.target,hide:h.hide.target},j={show:a.trim(""+h.show.event).replace(/ /g,k+" ")+k,hide:a.trim(""+h.hide.event).replace(/ /g,k+" ")+k},/mouse(over|enter)/i.test(j.show)&&!/mouse(out|leave)/i.test(j.hide)&&(j.hide+=" mouseleave"+k),i.show.bind("mousemove"+k,function(a){t={pageX:a.pageX,pageY:a.pageY,type:"mousemove"},l.cache.onTarget=b}),i.show.bind(j.show,n),(h.show.ready||h.prerender)&&n(f)})},s=r.plugins={Corner:function(a){a=(""+a).replace(/([A-Z])/," $1").replace(/middle/gi,n).toLowerCase(),this.x=(a.match(/left|right/i)||a.match(/center/)||["inherit"])[0].toLowerCase(),this.y=(a.match(/top|bottom|center/i)||["inherit"])[0].toLowerCase();var b=a.charAt(0);this.precedance=b==="t"||b==="b"?g:f,this.string=function(){return this.precedance===g?this.y+this.x:this.x+this.y},this.abbrev=function(){var a=this.x.substr(0,1),b=this.y.substr(0,1);return a===b?a:this.precedance===g?b+a:a+b},this.invertx=function(a){this.x=this.x===k?m:this.x===m?k:a||this.x},this.inverty=function(a){this.y=this.y===j?l:this.y===l?j:a||this.y},this.clone=function(){return{x:this.x,y:this.y,precedance:this.precedance,string:this.string,abbrev:this.abbrev,clone:this.clone,invertx:this.invertx,inverty:this.inverty}}},offset:function(b,c){function j(a,b){d.left+=b*a.scrollLeft(),d.top+=b*a.scrollTop()}var d=b.offset(),e=b.closest("body")[0],f=c,g,h,i;if(f){do f.css("position")!=="static"&&(h=f.position(),d.left-=h.left+(parseInt(f.css("borderLeftWidth"),10)||0)+(parseInt(f.css("marginLeft"),10)||0),d.top-=h.top+(parseInt(f.css("borderTopWidth"),10)||0)+(parseInt(f.css("marginTop"),10)||0),!g&&(i=f.css("overflow"))!=="hidden"&&i!=="visible"&&(g=f));while((f=a(f[0].offsetParent)).length);g&&g[0]!==e&&j(g,1)}return d},iOS:parseFloat((""+(/CPU.*OS ([0-9_]{1,5})|(CPU like).*AppleWebKit.*Mobile/i.exec(navigator.userAgent)||[0,""])[1]).replace("undefined","3_2").replace("_",".").replace("_",""))||c,fn:{attr:function(b,c){if(this.length){var d=this[0],e="title",f=a.data(d,"qtip");if(b===e&&f&&"object"===typeof f&&f.options.suppress){if(arguments.length<2)return a.attr(d,F);f&&f.options.content.attr===e&&f.cache.attr&&f.set("content.text",c);return this.attr(F,c)}}return a.fn["attr"+E].apply(this,arguments)},clone:function(b){var c=a([]),d="title",e=a.fn["clone"+E].apply(this,arguments);b||e.filter("["+F+"]").attr("title",function(){return a.attr(this,F)}).removeAttr(F);return e}}},a.each(s.fn,function(c,d){if(!d||a.fn[c+E])return b;var e=a.fn[c+E]=a.fn[c];a.fn[c]=function(){return d.apply(this,arguments)||e.apply(this,arguments)}}),a.ui||(a["cleanData"+E]=a.cleanData,a.cleanData=function(b){for(var c=0,d;(d=b[c])!==e;c++)try{a(d).triggerHandler("removeqtip")}catch(f){}a["cleanData"+E](b)}),r.version="nightly",r.nextid=0,r.inactiveEvents="click dblclick mousedown mouseup mousemove mouseleave mouseenter".split(" "),r.zindex=15e3,r.defaults={prerender:c,id:c,overwrite:b,suppress:b,content:{text:b,attr:"title",title:{text:c,button:c}},position:{my:"top left",at:"bottom right",target:c,container:c,viewport:c,adjust:{x:0,y:0,mouse:b,resize:b,method:"flip flip"},effect:function(b,d,e){a(this).animate(d,{duration:200,queue:c})}},show:{target:c,event:"mouseenter",effect:b,delay:90,solo:c,ready:c,autofocus:c},hide:{target:c,event:"mouseleave",effect:b,delay:0,fixed:c,inactive:c,leave:"window",distance:c},style:{classes:"",widget:c,width:c,height:c,def:b},events:{render:d,move:d,show:d,hide:d,toggle:d,visible:d,hidden:d,focus:d,blur:d}}}) \ No newline at end of file
+/*! qTip2 v2.0.1 (includes: svg ajax tips modal viewport imagemap ie6 / basic css3) | qtip2.com | Licensed MIT, GPL | Mon Dec 31 2012 14:55:17 */
+(function(e,t,n){(function(e){"use strict";typeof define=="function"&&define.amd?define(["jquery"],e):jQuery&&!jQuery.fn.qtip&&e(jQuery)})(function(r){function _(n){E={pageX:n.pageX,pageY:n.pageY,type:"mousemove",scrollX:e.pageXOffset||t.body.scrollLeft||t.documentElement.scrollLeft,scrollY:e.pageYOffset||t.body.scrollTop||t.documentElement.scrollTop}}function D(e){var t=function(e){return e===o||"object"!=typeof e},n=function(e){return!r.isFunction(e)&&(!e&&!e.attr||e.length<1||"object"==typeof e&&!e.jquery&&!e.then)};if(!e||"object"!=typeof e)return s;t(e.metadata)&&(e.metadata={type:e.metadata});if("content"in e){if(t(e.content)||e.content.jquery)e.content={text:e.content};n(e.content.text||s)&&(e.content.text=s),"title"in e.content&&(t(e.content.title)&&(e.content.title={text:e.content.title}),n(e.content.title.text||s)&&(e.content.title.text=s))}return"position"in e&&t(e.position)&&(e.position={my:e.position,at:e.position}),"show"in e&&t(e.show)&&(e.show=e.show.jquery?{target:e.show}:{event:e.show}),"hide"in e&&t(e.hide)&&(e.hide=e.hide.jquery?{target:e.hide}:{event:e.hide}),"style"in e&&t(e.style)&&(e.style={classes:e.style}),r.each(w,function(){this.sanitize&&this.sanitize(e)}),e}function P(u,a,f,l){function q(e){var t=0,n,r=a,i=e.split(".");while(r=r[i[t++]])t<i.length&&(n=r);return[n||a,i.pop()]}function R(e){return T.concat("").join(e?"-"+e+" ":" ")}function U(){var e=a.style.widget,t=H.hasClass(j);H.removeClass(j),j=e?"ui-state-disabled":"qtip-disabled",H.toggleClass(j,t),H.toggleClass("ui-helper-reset "+R(),e).toggleClass(C,a.style.def&&!e),F.content&&F.content.toggleClass(R("content"),e),F.titlebar&&F.titlebar.toggleClass(R("header"),e),F.button&&F.button.toggleClass(S+"-icon",!e)}function z(e){F.title&&(F.titlebar.remove(),F.titlebar=F.title=F.button=o,e!==s&&m.reposition())}function W(){var e=a.content.title.button,t=typeof e=="string",n=t?e:"Close tooltip";F.button&&F.button.remove(),e.jquery?F.button=e:F.button=r("<a />",{"class":"qtip-close "+(a.style.widget?"":S+"-icon"),title:n,"aria-label":n}).prepend(r("<span />",{"class":"ui-icon ui-icon-close",html:"&times;"})),F.button.appendTo(F.titlebar||H).attr("role","button").click(function(e){return H.hasClass(j)||m.hide(e),s})}function X(){var e=y+"-title";F.titlebar&&z(),F.titlebar=r("<div />",{"class":S+"-titlebar "+(a.style.widget?R("header"):"")}).append(F.title=r("<div />",{id:e,"class":S+"-title","aria-atomic":i})).insertBefore(F.content).delegate(".qtip-close","mousedown keydown mouseup keyup mouseout",function(e){r(this).toggleClass("ui-state-active ui-state-focus",e.type.substr(-4)==="down")}).delegate(".qtip-close","mouseover mouseout",function(e){r(this).toggleClass("ui-state-hover",e.type==="mouseover")}),a.content.title.button&&W()}function V(e){var t=F.button;if(!m.rendered)return s;e?W():t.remove()}function J(e,t){var n=F.title;if(!m.rendered||!e)return s;r.isFunction(e)&&(e=e.call(u,I.event,m));if(e===s||!e&&e!=="")return z(s);e.jquery&&e.length>0?n.empty().append(e.css({display:"block"})):n.html(e),t!==s&&m.rendered&&H[0].offsetWidth>0&&m.reposition(I.event)}function K(e){e&&r.isFunction(e.done)&&e.done(function(e){Q(e,null,s)})}function Q(e,t,i){function f(e){function a(n){n&&(delete u[n.src],clearTimeout(m.timers.img[n.src]),r(n).unbind(B)),r.isEmptyObject(u)&&(t!==s&&m.reposition(I.event),e())}var i,u={};if((i=o.find("img[src]:not([height]):not([width])")).length===0)return a();i.each(function(e,t){if(u[t.src]!==n)return;var i=0,s=3;(function o(){if(t.height||t.width||i>s)return a(t);i+=1,m.timers.img[t.src]=setTimeout(o,700)})(),r(t).bind("error"+B+" load"+B,function(){a(this)}),u[t.src]=t})}var o=F.content;return!m.rendered||!e?s:(r.isFunction(e)&&(e=e.call(u,I.event,m)||""),i!==s&&K(a.content.deferred),e.jquery&&e.length>0?o.empty().append(e.css({display:"block"})):o.html(e),m.rendered<0?H.queue("fx",f):(P=0,f(r.noop)),m)}function G(){function h(e){if(H.hasClass(j))return s;clearTimeout(m.timers.show),clearTimeout(m.timers.hide);var t=function(){m.toggle(i,e)};a.show.delay>0?m.timers.show=setTimeout(t,a.show.delay):t()}function p(e){if(H.hasClass(j)||A||P)return s;var t=r(e.relatedTarget||e.target),i=t.closest(N)[0]===H[0],u=t[0]===o.show[0];clearTimeout(m.timers.show),clearTimeout(m.timers.hide);if(n.target==="mouse"&&i||a.hide.fixed&&/mouse(out|leave|move)/.test(e.type)&&(i||u)){try{e.preventDefault(),e.stopImmediatePropagation()}catch(f){}return}a.hide.delay>0?m.timers.hide=setTimeout(function(){m.hide(e)},a.hide.delay):m.hide(e)}function d(e){if(H.hasClass(j))return s;clearTimeout(m.timers.inactive),m.timers.inactive=setTimeout(function(){m.hide(e)},a.hide.inactive)}function v(e){m.rendered&&H[0].offsetWidth>0&&m.reposition(e)}var n=a.position,o={show:a.show.target,hide:a.hide.target,viewport:r(n.viewport),document:r(t),body:r(t.body),window:r(e)},l={show:r.trim(""+a.show.event).split(" "),hide:r.trim(""+a.hide.event).split(" ")},c=r.browser.msie&&parseInt(r.browser.version,10)===6;H.bind("mouseenter"+B+" mouseleave"+B,function(e){var t=e.type==="mouseenter";t&&m.focus(e),H.toggleClass(L,t)}),/mouse(out|leave)/i.test(a.hide.event)&&a.hide.leave==="window"&&o.window.bind("mouseout"+B+" blur"+B,function(e){!/select|option/.test(e.target.nodeName)&&!e.relatedTarget&&m.hide(e)}),a.hide.fixed?(o.hide=o.hide.add(H),H.bind("mouseover"+B,function(){H.hasClass(j)||clearTimeout(m.timers.hide)})):/mouse(over|enter)/i.test(a.show.event)&&o.hide.bind("mouseleave"+B,function(e){clearTimeout(m.timers.show)}),(""+a.hide.event).indexOf("unfocus")>-1&&n.container.closest("html").bind("mousedown"+B+" touchstart"+B,function(e){var t=r(e.target),n=m.rendered&&!H.hasClass(j)&&H[0].offsetWidth>0,i=t.parents(N).filter(H[0]).length>0;t[0]!==u[0]&&t[0]!==H[0]&&!i&&!u.has(t[0]).length&&!t.attr("disabled")&&m.hide(e)}),"number"==typeof a.hide.inactive&&(o.show.bind("qtip-"+f+"-inactive",d),r.each(b.inactiveEvents,function(e,t){o.hide.add(F.tooltip).bind(t+B+"-inactive",d)})),r.each(l.hide,function(e,t){var n=r.inArray(t,l.show),i=r(o.hide);n>-1&&i.add(o.show).length===i.length||t==="unfocus"?(o.show.bind(t+B,function(e){H[0].offsetWidth>0?p(e):h(e)}),delete l.show[n]):o.hide.bind(t+B,p)}),r.each(l.show,function(e,t){o.show.bind(t+B,h)}),"number"==typeof a.hide.distance&&o.show.add(H).bind("mousemove"+B,function(e){var t=I.origin||{},n=a.hide.distance,r=Math.abs;(r(e.pageX-t.pageX)>=n||r(e.pageY-t.pageY)>=n)&&m.hide(e)}),n.target==="mouse"&&(o.show.bind("mousemove"+B,_),n.adjust.mouse&&(a.hide.event&&(H.bind("mouseleave"+B,function(e){(e.relatedTarget||e.target)!==o.show[0]&&m.hide(e)}),F.target.bind("mouseenter"+B+" mouseleave"+B,function(e){I.onTarget=e.type==="mouseenter"})),o.document.bind("mousemove"+B,function(e){m.rendered&&I.onTarget&&!H.hasClass(j)&&H[0].offsetWidth>0&&m.reposition(e||E)}))),(n.adjust.resize||o.viewport.length)&&(r.event.special.resize?o.viewport:o.window).bind("resize"+B,v),o.window.bind("scroll"+B,v)}function Y(){var n=[a.show.target[0],a.hide.target[0],m.rendered&&F.tooltip[0],a.position.container[0],a.position.viewport[0],a.position.container.closest("html")[0],e,t];m.rendered?r([]).pushStack(r.grep(n,function(e){return typeof e=="object"})).unbind(B):a.show.target.unbind(B+"-create")}var m=this,g=t.body,y=S+"-"+f,A=0,P=0,H=r(),B=".qtip-"+f,j="qtip-disabled",F,I;m.id=f,m.rendered=s,m.destroyed=s,m.elements=F={target:u},m.timers={img:{}},m.options=a,m.checks={},m.plugins={},m.cache=I={event:{},target:r(),disabled:s,attr:l,onTarget:s,lastClass:""},m.checks.builtin={"^id$":function(e,t,n){var o=n===i?b.nextid:n,u=S+"-"+o;o!==s&&o.length>0&&!r("#"+u).length&&(H[0].id=u,F.content[0].id=u+"-content",F.title[0].id=u+"-title")},"^content.text$":function(e,t,n){Q(a.content.text)},"^content.deferred$":function(e,t,n){K(a.content.deferred)},"^content.title.text$":function(e,t,n){if(!n)return z();!F.title&&n&&X(),J(n)},"^content.title.button$":function(e,t,n){V(n)},"^position.(my|at)$":function(e,t,n){"string"==typeof n&&(e[t]=new w.Corner(n))},"^position.container$":function(e,t,n){m.rendered&&H.appendTo(n)},"^show.ready$":function(){m.rendered?m.toggle(i):m.render(1)},"^style.classes$":function(e,t,n){H.attr("class",S+" qtip "+n)},"^style.width|height":function(e,t,n){H.css(t,n)},"^style.widget|content.title":U,"^events.(render|show|move|hide|focus|blur)$":function(e,t,n){H[(r.isFunction(n)?"":"un")+"bind"]("tooltip"+t,n)},"^(show|hide|position).(event|target|fixed|inactive|leave|distance|viewport|adjust)":function(){var e=a.position;H.attr("tracking",e.target==="mouse"&&e.adjust.mouse),Y(),G()}},r.extend(m,{_triggerEvent:function(e,t,n){var i=r.Event("tooltip"+e);return i.originalEvent=(n?r.extend({},n):o)||I.event||o,H.trigger(i,[m].concat(t||[])),!i.isDefaultPrevented()},render:function(e){if(m.rendered)return m;var t=a.content.text,n=a.content.title,o=a.position;return r.attr(u[0],"aria-describedby",y),H=F.tooltip=r("<div/>",{id:y,"class":[S,C,a.style.classes,S+"-pos-"+a.position.my.abbrev()].join(" "),width:a.style.width||"",height:a.style.height||"",tracking:o.target==="mouse"&&o.adjust.mouse,role:"alert","aria-live":"polite","aria-atomic":s,"aria-describedby":y+"-content","aria-hidden":i}).toggleClass(j,I.disabled).data("qtip",m).appendTo(a.position.container).append(F.content=r("<div />",{"class":S+"-content",id:y+"-content","aria-atomic":i})),m.rendered=-1,A=1,n.text?(X(),r.isFunction(n.text)||J(n.text,s)):n.button&&W(),(!r.isFunction(t)||t.then)&&Q(t,s),m.rendered=i,U(),r.each(a.events,function(e,t){r.isFunction(t)&&H.bind(e==="toggle"?"tooltipshow tooltiphide":"tooltip"+e,t)}),r.each(w,function(){this.initialize==="render"&&this(m)}),G(),H.queue("fx",function(t){m._triggerEvent("render"),A=0,(a.show.ready||e)&&m.toggle(i,I.event,s),t()}),m},get:function(e){var t,n;switch(e.toLowerCase()){case"dimensions":t={height:H.outerHeight(s),width:H.outerWidth(s)};break;case"offset":t=w.offset(H,a.position.container);break;default:n=q(e.toLowerCase()),t=n[0][n[1]],t=t.precedance?t.string():t}return t},set:function(e,t){function h(e,t){var n,r,i;for(n in l)for(r in l[n])if(i=(new RegExp(r,"i")).exec(e))t.push(i),l[n][r].apply(m,t)}var n=/^position\.(my|at|adjust|target|container)|style|content|show\.ready/i,u=/^content\.(title|attr)|style/i,f=s,l=m.checks,c;return"string"==typeof e?(c=e,e={},e[c]=t):e=r.extend(i,{},e),r.each(e,function(t,i){var s=q(t.toLowerCase()),o;o=s[0][s[1]],s[0][s[1]]="object"==typeof i&&i.nodeType?r(i):i,e[t]=[s[0],s[1],i,o],f=n.test(t)||f}),D(a),A=1,r.each(e,h),A=0,m.rendered&&H[0].offsetWidth>0&&f&&m.reposition(a.position.target==="mouse"?o:I.event),m},toggle:function(e,n){function b(){e?(r.browser.msie&&H[0].style.removeAttribute("filter"),H.css("overflow",""),"string"==typeof u.autofocus&&r(u.autofocus,H).focus(),u.target.trigger("qtip-"+f+"-inactive")):H.css({display:"",visibility:"",opacity:"",left:"",top:""}),m._triggerEvent(e?"visible":"hidden")}if(n){if(/over|enter/.test(n.type)&&/out|leave/.test(I.event.type)&&a.show.target.add(n.target).length===a.show.target.length&&H.has(n.relatedTarget).length)return m;I.event=r.extend({},n)}if(!m.rendered)return e?m.render(1):m;var o=e?"show":"hide",u=a[o],l=a[e?"hide":"show"],c=a.position,h=a.content,p=H[0].offsetWidth>0,d=e||u.target.length===1,v=!n||u.target.length<2||I.target[0]===n.target,g,y;return(typeof e).search("boolean|number")&&(e=!p),!H.is(":animated")&&p===e&&v?m:m._triggerEvent(o,[90])?(r.attr(H[0],"aria-hidden",!e),e?(I.origin=r.extend({},E),m.focus(n),r.isFunction(h.text)&&Q(h.text,s),r.isFunction(h.title.text)&&J(h.title.text,s),!M&&c.target==="mouse"&&c.adjust.mouse&&(r(t).bind("mousemove.qtip",_),M=i),m.reposition(n,arguments[2]),!u.solo||r(N,u.solo).not(H).qtip("hide",r.Event("tooltipsolo"))):(clearTimeout(m.timers.show),delete I.origin,M&&!r(N+'[tracking="true"]:visible',u.solo).not(H).length&&(r(t).unbind("mousemove.qtip"),M=s),m.blur(n)),u.effect===s||d===s?(H[o](),b.call(H)):r.isFunction(u.effect)?(H.stop(1,1),u.effect.call(H,m),H.queue("fx",function(e){b(),e()})):H.fadeTo(90,e?1:0,b),e&&u.target.trigger("qtip-"+f+"-inactive"),m):m},show:function(e){return m.toggle(i,e)},hide:function(e){return m.toggle(s,e)},focus:function(e){if(!m.rendered)return m;var t=r(N),n=parseInt(H[0].style.zIndex,10),i=b.zindex+t.length,s=r.extend({},e),o;return H.hasClass(k)||m._triggerEvent("focus",[i],s)&&(n!==i&&(t.each(function(){this.style.zIndex>n&&(this.style.zIndex=this.style.zIndex-1)}),t.filter("."+k).qtip("blur",s)),H.addClass(k)[0].style.zIndex=i),m},blur:function(e){return H.removeClass(k),m._triggerEvent("blur",[H.css("zIndex")],e),m},reposition:function(n,i){if(!m.rendered||A)return m;A=1;var o=a.position.target,u=a.position,f=u.my,l=u.at,g=u.adjust,y=g.method.split(" "),b=H.outerWidth(s),S=H.outerHeight(s),x=0,T=0,N=H.css("position"),C=u.viewport,k={left:0,top:0},L=u.container,O=H[0].offsetWidth>0,M=n&&n.type==="scroll",_=r(e),D,P;if(r.isArray(o)&&o.length===2)l={x:h,y:c},k={left:o[0],top:o[1]};else if(o==="mouse"&&(n&&n.pageX||I.event.pageX))l={x:h,y:c},n=E&&E.pageX&&(g.mouse||!n||!n.pageX)?{pageX:E.pageX,pageY:E.pageY}:(!n||n.type!=="resize"&&n.type!=="scroll"?n&&n.pageX&&n.type==="mousemove"?n:!g.mouse&&I.origin&&I.origin.pageX&&a.show.distance?I.origin:n:I.event)||n||I.event||E||{},N!=="static"&&(k=L.offset()),k={left:n.pageX-k.left,top:n.pageY-k.top},g.mouse&&M&&(k.left-=E.scrollX-_.scrollLeft(),k.top-=E.scrollY-_.scrollTop());else{o==="event"&&n&&n.target&&n.type!=="scroll"&&n.type!=="resize"?I.target=r(n.target):o!=="event"&&(I.target=r(o.jquery?o:F.target)),o=I.target,o=r(o).eq(0);if(o.length===0)return m;o[0]===t||o[0]===e?(x=w.iOS?e.innerWidth:o.width(),T=w.iOS?e.innerHeight:o.height(),o[0]===e&&(k={top:(C||o).scrollTop(),left:(C||o).scrollLeft()})):w.imagemap&&o.is("area")?D=w.imagemap(m,o,l,w.viewport?y:s):w.svg&&o[0].ownerSVGElement?D=w.svg(m,o,l,w.viewport?y:s):(x=o.outerWidth(s),T=o.outerHeight(s),k=w.offset(o,L)),D&&(x=D.width,T=D.height,P=D.offset,k=D.position);if(w.iOS>3.1&&w.iOS<4.1||w.iOS>=4.3&&w.iOS<4.33||!w.iOS&&N==="fixed")k.left-=_.scrollLeft(),k.top-=_.scrollTop();k.left+=l.x===d?x:l.x===v?x/2:0,k.top+=l.y===p?T:l.y===v?T/2:0}return k.left+=g.x+(f.x===d?-b:f.x===v?-b/2:0),k.top+=g.y+(f.y===p?-S:f.y===v?-S/2:0),w.viewport?(k.adjusted=w.viewport(m,k,u,x,T,b,S),P&&k.adjusted.left&&(k.left+=P.left),P&&k.adjusted.top&&(k.top+=P.top)):k.adjusted={left:0,top:0},m._triggerEvent("move",[k,C.elem||C],n)?(delete k.adjusted,i===s||!O||isNaN(k.left)||isNaN(k.top)||o==="mouse"||!r.isFunction(u.effect)?H.css(k):r.isFunction(u.effect)&&(u.effect.call(H,m,r.extend({},k)),H.queue(function(e){r(this).css({opacity:"",height:""}),r.browser.msie&&this.style.removeAttribute("filter"),e()})),A=0,m):m},disable:function(e){return"boolean"!=typeof e&&(e=!H.hasClass(j)&&!I.disabled),m.rendered?(H.toggleClass(j,e),r.attr(H[0],"aria-disabled",e)):I.disabled=!!e,m},enable:function(){return m.disable(s)},destroy:function(){var e=u[0],t=r.attr(e,O),n=u.data("qtip");m.destroyed=i,m.rendered&&(H.stop(1,0).remove(),r.each(m.plugins,function(){this.destroy&&this.destroy()})),clearTimeout(m.timers.show),clearTimeout(m.timers.hide),Y();if(!n||m===n)r.removeData(e,"qtip"),a.suppress&&t&&(r.attr(e,"title",t),u.removeAttr(O)),u.removeAttr("aria-describedby");return u.unbind(".qtip-"+f),delete x[m.id],u}})}function H(e,n){var u,a,f,l,c,h=r(this),p=r(t.body),d=this===t?p:h,v=h.metadata?h.metadata(n.metadata):o,m=n.metadata.type==="html5"&&v?v[n.metadata.name]:o,g=h.data(n.metadata.name||"qtipopts");try{g=typeof g=="string"?r.parseJSON(g):g}catch(y){}l=r.extend(i,{},b.defaults,n,typeof g=="object"?D(g):o,D(m||v)),a=l.position,l.id=e;if("boolean"==typeof l.content.text){f=h.attr(l.content.attr);if(l.content.attr===s||!f)return s;l.content.text=f}a.container.length||(a.container=p),a.target===s&&(a.target=d),l.show.target===s&&(l.show.target=d),l.show.solo===i&&(l.show.solo=a.container.closest("body")),l.hide.target===s&&(l.hide.target=d),l.position.viewport===i&&(l.position.viewport=a.container),a.container=a.container.eq(0),a.at=new w.Corner(a.at),a.my=new w.Corner(a.my);if(r.data(this,"qtip"))if(l.overwrite)h.qtip("destroy");else if(l.overwrite===s)return s;return l.suppress&&(c=r.attr(this,"title"))&&r(this).removeAttr("title").attr(O,c).attr("title",""),u=new P(h,l,e,!!f),r.data(this,"qtip",u),h.bind("remove.qtip-"+e+" removeqtip.qtip-"+e,function(){u.destroy()}),u}function B(e){var t=this,n=e.elements.tooltip,o=e.options.content.ajax,u=b.defaults.content.ajax,a=".qtip-ajax",f=/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,l=i,c=s,h;e.checks.ajax={"^content.ajax":function(e,r,i){r==="ajax"&&(o=i),r==="once"?t.init():o&&o.url?t.load():n.unbind(a)}},r.extend(t,{init:function(){return o&&o.url&&n.unbind(a)[o.once?"one":"bind"]("tooltipshow"+a,t.load),t},load:function(n){function g(){var t;if(e.destroyed)return;l=s,v&&(c=i,e.show(n.originalEvent)),(t=u.complete||o.complete)&&r.isFunction(t)&&t.apply(o.context||e,arguments)}function y(t,n,i){var s;if(e.destroyed)return;d&&"string"==typeof t&&(t=r("<div/>").append(t.replace(f,"")).find(d)),(s=u.success||o.success)&&r.isFunction(s)?s.call(o.context||e,t,n,i):e.set("content.text",t)}function b(t,n,r){if(e.destroyed||t.status===0)return;e.set("content.text",n+": "+r)}if(c){c=s;return}var a=o.url.lastIndexOf(" "),p=o.url,d,v=!o.loading&&l;if(v)try{n.preventDefault()}catch(m){}else if(n&&n.isDefaultPrevented())return t;h&&h.abort&&h.abort(),a>-1&&(d=p.substr(a),p=p.substr(0,a)),h=r.ajax(r.extend({error:u.error||b,context:e},o,{url:p,success:y,complete:g}))},destroy:function(){h&&h.abort&&h.abort(),e.destroyed=i}}),t.init()}function j(e,t,n){var r=Math.ceil(t/2),i=Math.ceil(n/2),s={bottomright:[[0,0],[t,n],[t,0]],bottomleft:[[0,0],[t,0],[0,n]],topright:[[0,n],[t,0],[t,n]],topleft:[[0,0],[0,n],[t,n]],topcenter:[[0,n],[r,0],[t,n]],bottomcenter:[[0,0],[t,0],[r,n]],rightcenter:[[0,0],[t,i],[0,n]],leftcenter:[[t,0],[t,n],[0,i]]};return s.lefttop=s.bottomright,s.righttop=s.bottomleft,s.leftbottom=s.topright,s.rightbottom=s.topleft,s[e.string()]}function F(e,t){function A(e){var t=E.is(":visible");E.show(),e(),E.toggle(t)}function O(){x.width=g.height,x.height=g.width}function M(){x.width=g.width,x.height=g.height}function _(t,r,o,f){if(!b.tip)return;var l=m.corner.clone(),w=o.adjusted,E=e.options.position.adjust.method.split(" "),x=E[0],T=E[1]||E[0],N={left:s,top:s,x:0,y:0},C,k={},L;m.corner.fixed!==i&&(x===y&&l.precedance===u&&w.left&&l.y!==v?l.precedance=l.precedance===u?a:u:x!==y&&w.left&&(l.x=l.x===v?w.left>0?h:d:l.x===h?d:h),T===y&&l.precedance===a&&w.top&&l.x!==v?l.precedance=l.precedance===a?u:a:T!==y&&w.top&&(l.y=l.y===v?w.top>0?c:p:l.y===c?p:c),l.string()!==S.corner.string()&&(S.top!==w.top||S.left!==w.left)&&m.update(l,s)),C=m.position(l,w),C[l.x]+=P(l,l.x),C[l.y]+=P(l,l.y),C.right!==n&&(C.left=-C.right),C.bottom!==n&&(C.top=-C.bottom),C.user=Math.max(0,g.offset);if(N.left=x===y&&!!w.left)l.x===v?k["margin-left"]=N.x=C["margin-left"]:(L=C.right!==n?[w.left,-C.left]:[-w.left,C.left],(N.x=Math.max(L[0],L[1]))>L[0]&&(o.left-=w.left,N.left=s),k[C.right!==n?d:h]=N.x);if(N.top=T===y&&!!w.top)l.y===v?k["margin-top"]=N.y=C["margin-top"]:(L=C.bottom!==n?[w.top,-C.top]:[-w.top,C.top],(N.y=Math.max(L[0],L[1]))>L[0]&&(o.top-=w.top,N.top=s),k[C.bottom!==n?p:c]=N.y);b.tip.css(k).toggle(!(N.x&&N.y||l.x===v&&N.y||l.y===v&&N.x)),o.left-=C.left.charAt?C.user:x!==y||N.top||!N.left&&!N.top?C.left:0,o.top-=C.top.charAt?C.user:T!==y||N.left||!N.left&&!N.top?C.top:0,S.left=w.left,S.top=w.top,S.corner=l.clone()}function D(){var t=g.corner,n=e.options.position,r=n.at,o=n.my.string?n.my.string():n.my;return t===s||o===s&&r===s?s:(t===i?m.corner=new w.Corner(o):t.string||(m.corner=new w.Corner(t),m.corner.fixed=i),S.corner=new w.Corner(m.corner.string()),m.corner.string()!=="centercenter")}function P(e,t,n){t=t?t:e[e.precedance];var r=b.titlebar&&e.y===c,i=r?b.titlebar:E,s="border-"+t+"-width",o=function(e){return parseInt(e.css(s),10)},u;return A(function(){u=(n?o(n):o(b.content)||o(i)||o(E))||0}),u}function H(e){var t=b.titlebar&&e.y===c,n=t?b.titlebar:b.content,i=r.browser.mozilla,s=i?"-moz-":r.browser.webkit?"-webkit-":"",o="border-radius-"+e.y+e.x,u="border-"+e.y+"-"+e.x+"-radius",a=function(e){return parseInt(n.css(e),10)||parseInt(E.css(e),10)},f;return A(function(){f=a(u)||a(s+u)||a(s+o)||a(o)||0}),f}function B(e){function N(e,t,n){var r=e.css(t)||p;return n&&r===e.css(n)?s:f.test(r)?s:r}var t,n,o,u=b.tip.css("cssText",""),a=e||m.corner,f=/rgba?\(0, 0, 0(, 0)?\)|transparent|#123456/i,l="border-"+a[a.precedance]+"-color",h="background-color",p="transparent",d=" !important",y=b.titlebar,w=y&&(a.y===c||a.y===v&&u.position().top+x.height/2+g.offset<y.outerHeight(i)),S=w?y:b.content;A(function(){T.fill=N(u,h)||N(S,h)||N(b.content,h)||N(E,h)||u.css(h),T.border=N(u,l,"color")||N(S,l,"color")||N(b.content,l,"color")||N(E,l,"color")||E.css(l),r("*",u).add(u).css("cssText",h+":"+p+d+";border:0"+d+";")})}function F(e){var t=e.precedance===a,n=x[t?f:l],r=x[t?l:f],i=e.string().indexOf(v)>-1,s=n*(i?.5:1),o=Math.pow,u=Math.round,c,h,p,d=Math.sqrt(o(s,2)+o(r,2)),m=[N/s*d,N/r*d];return m[2]=Math.sqrt(o(m[0],2)-o(N,2)),m[3]=Math.sqrt(o(m[1],2)-o(N,2)),c=d+m[2]+m[3]+(i?0:m[0]),h=c/d,p=[u(h*r),u(h*n)],{height:p[t?0:1],width:p[t?1:0]}}function I(e,t,n){return"<qvml:"+e+' xmlns="urn:schemas-microsoft.com:vml" class="qtip-vml" '+(t||"")+' style="behavior: url(#default#VML); '+(n||"")+'" />'}var m=this,g=e.options.style.tip,b=e.elements,E=b.tooltip,S={top:0,left:0},x={width:g.width,height:g.height},T={},N=g.border||0,C=".qtip-tip",k=!!(r("<canvas />")[0]||{}).getContext,L;m.corner=o,m.mimic=o,m.border=N,m.offset=g.offset,m.size=x,e.checks.tip={"^position.my|style.tip.(corner|mimic|border)$":function(){m.init()||m.destroy(),e.reposition()},"^style.tip.(height|width)$":function(){x={width:g.width,height:g.height},m.create(),m.update(),e.reposition()},"^content.title.text|style.(classes|widget)$":function(){b.tip&&b.tip.length&&m.update()}},r.extend(m,{init:function(){var e=D()&&(k||r.browser.msie);return e&&(m.create(),m.update(),E.unbind(C).bind("tooltipmove"+C,_)),e},create:function(){var e=x.width,t=x.height,n;b.tip&&b.tip.remove(),b.tip=r("<div />",{"class":"qtip-tip"}).css({width:e,height:t}).prependTo(E),k?r("<canvas />").appendTo(b.tip)[0].getContext("2d").save():(n=I("shape",'coordorigin="0,0"',"position:absolute;"),b.tip.html(n+n),r("*",b.tip).bind("click mousedown",function(e){e.stopPropagation()}))},update:function(e,t){var n=b.tip,f=n.children(),l=x.width,y=x.height,C=g.mimic,L=Math.round,A,_,D,H,q;e||(e=S.corner||m.corner),C===s?C=e:(C=new w.Corner(C),C.precedance=e.precedance,C.x==="inherit"?C.x=e.x:C.y==="inherit"?C.y=e.y:C.x===C.y&&(C[e.precedance]=e[e.precedance])),A=C.precedance,e.precedance===u?O():M(),b.tip.css({width:l=x.width,height:y=x.height}),B(e),T.border!=="transparent"?(N=P(e,o),g.border===0&&N>0&&(T.fill=T.border),m.border=N=g.border!==i?g.border:N):m.border=N=0,D=j(C,l,y),m.size=q=F(e),n.css(q).css("line-height",q.height+"px"),e.precedance===a?H=[L(C.x===h?N:C.x===d?q.width-l-N:(q.width-l)/2),L(C.y===c?q.height-y:0)]:H=[L(C.x===h?q.width-l:0),L(C.y===c?N:C.y===p?q.height-y-N:(q.height-y)/2)],k?(f.attr(q),_=f[0].getContext("2d"),_.restore(),_.save(),_.clearRect(0,0,3e3,3e3),_.fillStyle=T.fill,_.strokeStyle=T.border,_.lineWidth=N*2,_.lineJoin="miter",_.miterLimit=100,_.translate(H[0],H[1]),_.beginPath(),_.moveTo(D[0][0],D[0][1]),_.lineTo(D[1][0],D[1][1]),_.lineTo(D[2][0],D[2][1]),_.closePath(),N&&(E.css("background-clip")==="border-box"&&(_.strokeStyle=T.fill,_.stroke()),_.strokeStyle=T.border,_.stroke()),_.fill()):(D="m"+D[0][0]+","+D[0][1]+" l"+D[1][0]+","+D[1][1]+" "+D[2][0]+","+D[2][1]+" xe",H[2]=N&&/^(r|b)/i.test(e.string())?parseFloat(r.browser.version,10)===8?2:1:0,f.css({coordsize:l+N+" "+(y+N),antialias:""+(C.string().indexOf(v)>-1),left:H[0],top:H[1],width:l+N,height:y+N}).each(function(e){var t=r(this);t[t.prop?"prop":"attr"]({coordsize:l+N+" "+(y+N),path:D,fillcolor:T.fill,filled:!!e,stroked:!e}).toggle(!!N||!!e),!e&&t.html()===""&&t.html(I("stroke",'weight="'+N*2+'px" color="'+T.border+'" miterlimit="1000" joinstyle="miter"'))})),t!==s&&m.position(e)},position:function(e){var t=b.tip,n={},i=Math.max(0,g.offset),o,p,d;return g.corner===s||!t?s:(e=e||m.corner,o=e.precedance,p=F(e),d=[e.x,e.y],o===u&&d.reverse(),r.each(d,function(t,r){var s,u,d;r===v?(s=o===a?h:c,n[s]="50%",n["margin-"+s]=-Math.round(p[o===a?f:l]/2)+i):(s=P(e,r),u=P(e,r,b.content),d=H(e),n[r]=t?u:i+(d>s?d:-s))}),n[e[o]]-=p[o===u?f:l],t.css({top:"",bottom:"",left:"",right:"",margin:""}).css(n),n)},destroy:function(){b.tip&&b.tip.remove(),b.tip=!1,E.unbind(C)}}),m.init()}function I(n){function y(){m=r(v,f).not("[disabled]").map(function(){return typeof this.focus=="function"?this:null})}function b(e){m.length<1&&e.length?e.not("body").blur():m.first().focus()}function E(e){var t=r(e.target),n=t.closest(".qtip"),i;i=n.length<1?s:parseInt(n[0].style.zIndex,10)>parseInt(f[0].style.zIndex,10),!i&&r(e.target).closest(N)[0]!==f[0]&&b(t)}var o=this,u=n.options.show.modal,a=n.elements,f=a.tooltip,l="#qtip-overlay",c=".qtipmodal",h=c+n.id,p="is-modal-qtip",d=r(t.body),v=w.modal.focusable.join(","),m={},g;n.checks.modal={"^show.modal.(on|blur)$":function(){o.init(),a.overlay.toggle(f.is(":visible"))},"^content.text$":function(){y()}},r.extend(o,{init:function(){return u.on?(g=o.create(),f.attr(p,i).css("z-index",w.modal.zindex+r(N+"["+p+"]").length).unbind(c).unbind(h).bind("tooltipshow"+c+" tooltiphide"+c,function(e,t,n){var i=e.originalEvent;if(e.target===f[0])if(i&&e.type==="tooltiphide"&&/mouse(leave|enter)/.test(i.type)&&r(i.relatedTarget).closest(g[0]).length)try{e.preventDefault()}catch(s){}else(!i||i&&!i.solo)&&o[e.type.replace("tooltip","")](e,n)}).bind("tooltipfocus"+c,function(e){if(e.isDefaultPrevented()||e.target!==f[0])return;var t=r(N).filter("["+p+"]"),n=w.modal.zindex+t.length,i=parseInt(f[0].style.zIndex,10);g[0].style.zIndex=n-2,t.each(function(){this.style.zIndex>i&&(this.style.zIndex-=1)}),t.end().filter("."+k).qtip("blur",e.originalEvent),f.addClass(k)[0].style.zIndex=n;try{e.preventDefault()}catch(s){}}).bind("tooltiphide"+c,function(e){e.target===f[0]&&r("["+p+"]").filter(":visible").not(f).last().qtip("focus",e)}),u.escape&&r(t).unbind(h).bind("keydown"+h,function(e){e.keyCode===27&&f.hasClass(k)&&n.hide(e)}),u.blur&&a.overlay.unbind(h).bind("click"+h,function(e){f.hasClass(k)&&n.hide(e)}),y(),o):o},create:function(){function i(){g.css({height:n.height(),width:n.width()})}var t=r(l),n=r(e);return t.length?a.overlay=t.insertAfter(r(N).last()):(g=a.overlay=r("<div />",{id:l.substr(1),html:"<div></div>",mousedown:function(){return s}}).hide().insertAfter(r(N).last()),n.unbind(c).bind("resize"+c,i),i(),g)},toggle:function(e,t,n){if(e&&e.isDefaultPrevented())return o;var a=u.effect,l=t?"show":"hide",c=g.is(":visible"),v=r("["+p+"]").filter(":visible").not(f),m;return g||(g=o.create()),g.is(":animated")&&c===t&&g.data("toggleState")!==s||!t&&v.length?o:(t?(g.css({left:0,top:0}),g.toggleClass("blurs",u.blur),u.stealfocus!==s&&(d.bind("focusin"+h,E),b(r("body :focus")))):d.unbind("focusin"+h),g.stop(i,s).data("toggleState",t),r.isFunction(a)?a.call(g,t):a===s?g[l]():g.fadeTo(parseInt(n,10)||90,t?1:0,function(){t||r(this).hide()}),t||g.queue(function(e){g.css({left:"",top:""}).removeData("toggleState"),e()}),o)},show:function(e,t){return o.toggle(e,i,t)},hide:function(e,t){return o.toggle(e,s,t)},destroy:function(){var e=g;return e&&(e=r("["+p+"]").not(f).length<1,e?(a.overlay.remove(),r(t).unbind(c)):a.overlay.unbind(c+n.id),d.unbind("focusin"+h)),f.removeAttr(p).unbind(c)}}),o.init()}function q(n){var o=this,u=n.elements,a=n.options,c=u.tooltip,h=".ie6-"+n.id,p=r("select, object").length<1,d=0,v=s,m;n.checks.ie6={"^content|style$":function(e,t,n){redraw()}},r.extend(o,{init:function(){var n=r(e),s;p&&(u.bgiframe=r('<iframe class="qtip-bgiframe" frameborder="0" tabindex="-1" src="javascript:\'\';" style="display:block; position:absolute; z-index:-1; filter:alpha(opacity=0); -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";"></iframe>'),u.bgiframe.appendTo(c),c.bind("tooltipmove"+h,o.adjustBGIFrame)),m=r("<div/>",{id:"qtip-rcontainer"}).appendTo(t.body),o.redraw(),u.overlay&&!v&&(s=function(){u.overlay[0].style.top=n.scrollTop()+"px"},n.bind("scroll.qtip-ie6, resize.qtip-ie6",s),s(),u.overlay.addClass("qtipmodal-ie6fix"),v=i)},adjustBGIFrame:function(){var e=n.get("dimensions"),t=n.plugins.tip,r=u.tip,i,s;s=parseInt(c.css("border-left-width"),10)||0,s={left:-s,top:-s},t&&r&&(i=t.corner.precedance==="x"?["width","left"]:["height","top"],s[i[1]]-=r[i[0]]()),u.bgiframe.css(s).css(e)},redraw:function(){if(n.rendered<1||d)return o;var e=a.style,t=a.position.container,r,i,s,u;return d=1,e.height&&c.css(l,e.height),e.width?c.css(f,e.width):(c.css(f,"").appendTo(m),i=c.width(),i%2<1&&(i+=1),s=c.css("max-width")||"",u=c.css("min-width")||"",r=(s+u).indexOf("%")>-1?t.width()/100:0,s=(s.indexOf("%")>-1?r:1)*parseInt(s,10)||i,u=(u.indexOf("%")>-1?r:1)*parseInt(u,10)||0,i=s+u?Math.min(Math.max(i,u),s):i,c.css(f,Math.round(i)).appendTo(t)),d=0,o},destroy:function(){p&&u.bgiframe.remove(),c.unbind(h)}}),o.init()}var i=!0,s=!1,o=null,u="x",a="y",f="width",l="height",c="top",h="left",p="bottom",d="right",v="center",m="flip",g="flipinvert",y="shift",b,w,E,S="qtip",x={},T=["ui-widget","ui-tooltip"],N="div.qtip."+S,C=S+"-default",k=S+"-focus",L=S+"-hover",A="_replacedByqTip",O="oldtitle",M;b=r.fn.qtip=function(e,t,u){var a=(""+e).toLowerCase(),f=o,l=r.makeArray(arguments).slice(1),c=l[l.length-1],h=this[0]?r.data(this[0],"qtip"):o;if(!arguments.length&&h||a==="api")return h;if("string"==typeof e)return this.each(function(){var e=r.data(this,"qtip");if(!e)return i;c&&c.timeStamp&&(e.cache.event=c);if(a!=="option"&&a!=="options"||!t)e[a]&&e[a].apply(e[a],l);else{if(!r.isPlainObject(t)&&u===n)return f=e.get(t),s;e.set(t,u)}}),f!==o?f:this;if("object"==typeof e||!arguments.length)return h=D(r.extend(i,{},e)),b.bind.call(this,h,c)},b.bind=function(e,t){return this.each(function(o){function p(e){function t(){c.render(typeof e=="object"||u.show.ready),a.show.add(a.hide).unbind(l)}if(c.cache.disabled)return s;c.cache.event=r.extend({},e),c.cache.target=e?r(e.target):[n],u.show.delay>0?(clearTimeout(c.timers.show),c.timers.show=setTimeout(t,u.show.delay),f.show!==f.hide&&a.hide.bind(f.hide,function(){clearTimeout(c.timers.show)})):t()}var u,a,f,l,c,h;h=r.isArray(e.id)?e.id[o]:e.id,h=!h||h===s||h.length<1||x[h]?b.nextid++:x[h]=h,l=".qtip-"+h+"-create",c=H.call(this,h,e);if(c===s)return i;u=c.options,r.each(w,function(){this.initialize==="initialize"&&this(c)}),a={show:u.show.target,hide:u.hide.target},f={show:r.trim(""+u.show.event).replace(/ /g,l+" ")+l,hide:r.trim(""+u.hide.event).replace(/ /g,l+" ")+l},/mouse(over|enter)/i.test(f.show)&&!/mouse(out|leave)/i.test(f.hide)&&(f.hide+=" mouseleave"+l),a.show.bind("mousemove"+l,function(e){_(e),c.cache.onTarget=i}),a.show.bind(f.show,p),(u.show.ready||u.prerender)&&p(t)}).attr("data-hasqtip",i)},w=b.plugins={Corner:function(e){e=(""+e).replace(/([A-Z])/," $1").replace(/middle/gi,v).toLowerCase(),this.x=(e.match(/left|right/i)||e.match(/center/)||["inherit"])[0].toLowerCase(),this.y=(e.match(/top|bottom|center/i)||["inherit"])[0].toLowerCase();var t=e.charAt(0);this.precedance=t==="t"||t==="b"?a:u,this.string=function(){return this.precedance===a?this.y+this.x:this.x+this.y},this.abbrev=function(){var e=this.x.substr(0,1),t=this.y.substr(0,1);return e===t?e:this.precedance===a?t+e:e+t},this.invertx=function(e){this.x=this.x===h?d:this.x===d?h:e||this.x},this.inverty=function(e){this.y=this.y===c?p:this.y===p?c:e||this.y},this.clone=function(){return{x:this.x,y:this.y,precedance:this.precedance,string:this.string,abbrev:this.abbrev,clone:this.clone,invertx:this.invertx,inverty:this.inverty}}},offset:function(e,n){function c(e,t){i.left+=t*e.scrollLeft(),i.top+=t*e.scrollTop()}var i=e.offset(),s=e.closest("body"),o=r.browser.msie&&t.compatMode!=="CSS1Compat",u=n,a,f,l;if(u){do u.css("position")!=="static"&&(f=u.position(),i.left-=f.left+(parseInt(u.css("borderLeftWidth"),10)||0)+(parseInt(u.css("marginLeft"),10)||0),i.top-=f.top+(parseInt(u.css("borderTopWidth"),10)||0)+(parseInt(u.css("marginTop"),10)||0),!a&&(l=u.css("overflow"))!=="hidden"&&l!=="visible"&&(a=u));while((u=r(u[0].offsetParent)).length);(a&&a[0]!==s[0]||o)&&c(a||s,1)}return i},iOS:parseFloat((""+(/CPU.*OS ([0-9_]{1,5})|(CPU like).*AppleWebKit.*Mobile/i.exec(navigator.userAgent)||[0,""])[1]).replace("undefined","3_2").replace("_",".").replace("_",""))||s,fn:{attr:function(e,t){if(this.length){var n=this[0],i="title",s=r.data(n,"qtip");if(e===i&&s&&"object"==typeof s&&s.options.suppress)return arguments.length<2?r.attr(n,O):(s&&s.options.content.attr===i&&s.cache.attr&&s.set("content.text",t),this.attr(O,t))}return r.fn["attr"+A].apply(this,arguments)},clone:function(e){var t=r([]),n="title",i=r.fn["clone"+A].apply(this,arguments);return e||i.filter("["+O+"]").attr("title",function(){return r.attr(this,O)}).removeAttr(O),i}}},r.each(w.fn,function(e,t){if(!t||r.fn[e+A])return i;var n=r.fn[e+A]=r.fn[e];r.fn[e]=function(){return t.apply(this,arguments)||n.apply(this,arguments)}}),r.ui||(r["cleanData"+A]=r.cleanData,r.cleanData=function(e){for(var t=0,i;(i=e[t])!==n;t++)try{r(i).triggerHandler("removeqtip")}catch(s){}r["cleanData"+A](e)}),b.version="2.0.1",b.nextid=0,b.inactiveEvents="click dblclick mousedown mouseup mousemove mouseleave mouseenter".split(" "),b.zindex=15e3,b.defaults={prerender:s,id:s,overwrite:i,suppress:i,content:{text:i,attr:"title",deferred:s,title:{text:s,button:s}},position:{my:"top left",at:"bottom right",target:s,container:s,viewport:s,adjust:{x:0,y:0,mouse:i,resize:i,method:"flipinvert flipinvert"},effect:function(e,t,n){r(this).animate(t,{duration:200,queue:s})}},show:{target:s,event:"mouseenter",effect:i,delay:90,solo:s,ready:s,autofocus:s},hide:{target:s,event:"mouseleave",effect:i,delay:0,fixed:s,inactive:s,leave:"window",distance:s},style:{classes:"",widget:s,width:s,height:s,def:i},events:{render:o,move:o,show:o,hide:o,toggle:o,visible:o,hidden:o,focus:o,blur:o}},w.svg=function(e,n,i,s){var o=r(t),u=n[0],a={width:0,height:0,position:{top:1e10,left:1e10}},f,l,c,h,p;while(!u.getBBox)u=u.parentNode;if(u.getBBox&&u.parentNode){f=u.getBBox(),l=u.getScreenCTM(),c=u.farthestViewportElement||u;if(!c.createSVGPoint)return a;h=c.createSVGPoint(),h.x=f.x,h.y=f.y,p=h.matrixTransform(l),a.position.left=p.x,a.position.top=p.y,h.x+=f.width,h.y+=f.height,p=h.matrixTransform(l),a.width=p.x-a.position.left,a.height=p.y-a.position.top,a.position.left+=o.scrollLeft(),a.position.top+=o.scrollTop()}return a},w.ajax=function(e){var t=e.plugins.ajax;return"object"==typeof t?t:e.plugins.ajax=new B(e)},w.ajax.initialize="render",w.ajax.sanitize=function(e){var t=e.content,n;t&&"ajax"in t&&(n=t.ajax,typeof n!="object"&&(n=e.content.ajax={url:n}),"boolean"!=typeof n.once&&n.once&&(n.once=!!n.once))},r.extend(i,b.defaults,{content:{ajax:{loading:i,once:i}}}),w.tip=function(e){var t=e.plugins.tip;return"object"==typeof t?t:e.plugins.tip=new F(e)},w.tip.initialize="render",w.tip.sanitize=function(e){var t=e.style,n;t&&"tip"in t&&(n=e.style.tip,typeof n!="object"&&(e.style.tip={corner:n}),/string|boolean/i.test(typeof n.corner)||(n.corner=i),typeof n.width!="number"&&delete n.width,typeof n.height!="number"&&delete n.height,typeof n.border!="number"&&n.border!==i&&delete n.border,typeof n.offset!="number"&&delete n.offset)},r.extend(i,b.defaults,{style:{tip:{corner:i,mimic:s,width:6,height:6,border:i,offset:0}}}),w.modal=function(e){var t=e.plugins.modal;return"object"==typeof t?t:e.plugins.modal=new I(e)},w.modal.initialize="render",w.modal.sanitize=function(e){e.show&&(typeof e.show.modal!="object"?e.show.modal={on:!!e.show.modal}:typeof e.show.modal.on=="undefined"&&(e.show.modal.on=i))},w.modal.zindex=b.zindex-200,w.modal.focusable=["a[href]","area[href]","input","select","textarea","button","iframe","object","embed","[tabindex]","[contenteditable]"],r.extend(i,b.defaults,{show:{modal:{on:s,effect:i,blur:i,stealfocus:i,escape:i}}}),w.viewport=function(n,r,i,s,o,m,b){function j(e,t,n,i,s,o,u,a,f){var l=r[s],c=x[e],h=T[e],p=n===y,d=-O.offset[s]+A.offset[s]+A["scroll"+s],m=c===s?f:c===o?-f:-f/2,b=h===s?a:h===o?-a:-a/2,w=_&&_.size?_.size[u]||0:0,E=_&&_.corner&&_.corner.precedance===e&&!p?w:0,S=d-l+E,N=l+f-A[u]-d+E,C=m-(x.precedance===e||c===x[t]?b:0)-(h===v?a/2:0);return p?(E=_&&_.corner&&_.corner.precedance===t?w:0,C=(c===s?1:-1)*m-E,r[s]+=S>0?S:N>0?-N:0,r[s]=Math.max(-O.offset[s]+A.offset[s]+(E&&_.corner[e]===v?_.offset:0),l-C,Math.min(Math.max(-O.offset[s]+A.offset[s]+A[u],l+C),r[s]))):(i*=n===g?2:0,S>0&&(c!==s||N>0)?(r[s]-=C+i,H["invert"+e](s)):N>0&&(c!==o||S>0)&&(r[s]-=(c===v?-C:C)+i,H["invert"+e](o)),r[s]<d&&-r[s]>N&&(r[s]=l,H=x.clone())),r[s]-l}var w=i.target,E=n.elements.tooltip,x=i.my,T=i.at,N=i.adjust,C=N.method.split(" "),k=C[0],L=C[1]||C[0],A=i.viewport,O=i.container,M=n.cache,_=n.plugins.tip,D={left:0,top:0},P,H,B;if(!A.jquery||w[0]===e||w[0]===t.body||N.method==="none")return D;P=E.css("position")==="fixed",A={elem:A,height:A[(A[0]===e?"h":"outerH")+"eight"](),width:A[(A[0]===e?"w":"outerW")+"idth"](),scrollleft:P?0:A.scrollLeft(),scrolltop:P?0:A.scrollTop(),offset:A.offset()||{left:0,top:0}},O={elem:O,scrollLeft:O.scrollLeft(),scrollTop:O.scrollTop(),offset:O.offset()||{left:0,top:0}};if(k!=="shift"||L!=="shift")H=x.clone();return D={left:k!=="none"?j(u,a,k,N.x,h,d,f,s,m):0,top:L!=="none"?j(a,u,L,N.y,c,p,l,o,b):0},H&&M.lastClass!==(B=S+"-pos-"+H.abbrev())&&E.removeClass(n.cache.lastClass).addClass(n.cache.lastClass=B),D},w.imagemap=function(e,t,n,i){function E(e,t,n){var r=0,i=1,s=1,o=0,u=0,a=e.width,f=e.height;while(a>0&&f>0&&i>0&&s>0){a=Math.floor(a/2),f=Math.floor(f/2),n.x===h?i=a:n.x===d?i=e.width-a:i+=Math.floor(a/2),n.y===c?s=f:n.y===p?s=e.height-f:s+=Math.floor(f/2),r=t.length;while(r--){if(t.length<2)break;o=t[r][0]-e.position.left,u=t[r][1]-e.position.top,(n.x===h&&o>=i||n.x===d&&o<=i||n.x===v&&(o<i||o>e.width-i)||n.y===c&&u>=s||n.y===p&&u<=s||n.y===v&&(u<s||u>e.height-s))&&t.splice(r,1)}}return{left:t[0][0],top:t[0][1]}}t.jquery||(t=r(t));var s=e.cache.areas={},o=(t[0].shape||t.attr("shape")).toLowerCase(),u=t[0].coords||t.attr("coords"),a=u.split(","),f=[],l=r('img[usemap="#'+t.parent("map").attr("name")+'"]'),m=l.offset(),g={width:0,height:0,position:{top:1e10,right:0,bottom:0,left:1e10}},y=0,b=0,w;m.left+=Math.ceil((l.outerWidth()-l.width())/2),m.top+=Math.ceil((l.outerHeight()-l.height())/2);if(o==="poly"){y=a.length;while(y--)b=[parseInt(a[--y],10),parseInt(a[y+1],10)],b[0]>g.position.right&&(g.position.right=b[0]),b[0]<g.position.left&&(g.position.left=b[0]),b[1]>g.position.bottom&&(g.position.bottom=b[1]),b[1]<g.position.top&&(g.position.top=b[1]),f.push(b)}else{y=-1;while(y++<a.length)f.push(parseInt(a[y],10))}switch(o){case"rect":g={width:Math.abs(f[2]-f[0]),height:Math.abs(f[3]-f[1]),position:{left:Math.min(f[0],f[2]),top:Math.min(f[1],f[3])}};break;case"circle":g={width:f[2]+2,height:f[2]+2,position:{left:f[0],top:f[1]}};break;case"poly":g.width=Math.abs(g.position.right-g.position.left),g.height=Math.abs(g.position.bottom-g.position.top),n.abbrev()==="c"?g.position={left:g.position.left+g.width/2,top:g.position.top+g.height/2}:(s[n+u]||(g.position=E(g,f.slice(),n),i&&(i[0]==="flip"||i[1]==="flip")&&(g.offset=E(g,f.slice(),{x:n.x===h?d:n.x===d?h:v,y:n.y===c?p:n.y===p?c:v}),g.offset.left-=g.position.left,g.offset.top-=g.position.top),s[n+u]=g),g=s[n+u]),g.width=g.height=0}return g.position.left+=m.left,g.position.top+=m.top,g},w.ie6=function(e){var t=r.browser,n=e.plugins.ie6;return!t.msie||(""+t.version).charAt(0)!=="6"?s:"object"==typeof n?n:e.plugins.ie6=new q(e)},w.ie6.initialize="render"})})(window,document); \ No newline at end of file
diff --git a/app/assets/javascripts/public/jquery.ui.datepicker-i18n.js b/app/assets/javascripts/public/jquery.ui.datepicker-i18n.js
index 3d0d55b46..b7748a77a 100644
--- a/app/assets/javascripts/public/jquery.ui.datepicker-i18n.js
+++ b/app/assets/javascripts/public/jquery.ui.datepicker-i18n.js
@@ -53,7 +53,14 @@ jQuery(function($){
monthNamesShort: $.datepicker.regional[ $('html').attr('lang') ].monthNamesShort,
monthNames: $.datepicker.regional[ $('html').attr('lang') ].monthNames
} );
- $(element).datepicker("setDate", $.datepicker.parseDate('yy-mm-dd', $(element).val() ) );
+ if ($(element).val().indexOf('/') >= 0)
+ {
+ $(element).datepicker("setDate", $.datepicker.parseDate('dd/mm/y', $(element).val() ) );
+ }
+ else
+ {
+ $(element).datepicker("setDate", $.datepicker.parseDate('yy-mm-dd', $(element).val() ) );
+ }
});
$("form").submit(function(event) {
diff --git a/app/assets/javascripts/referentials.js.coffee b/app/assets/javascripts/referentials.js.coffee
deleted file mode 100644
index 020fbbd1f..000000000
--- a/app/assets/javascripts/referentials.js.coffee
+++ /dev/null
@@ -1,13 +0,0 @@
-jQuery ->
- update_infos = (json) ->
- info = $('#referential_'+json.referential_id+' .info')
- update_info = (key, value) ->
- $(info.find('.'+key)[0]).text( value) if key.match(/_count$/)
- $.each( json, update_info)
-
- update_referential_details = (ref) ->
- ref_id = $(ref).attr("id").match( /(\d+)$/)[0]
- $.getJSON( '/referentials/'+ref_id+'.json', update_infos)
-
- update_referential_details(ref) for ref in $('.referentials.index .referential')
-
diff --git a/app/assets/javascripts/route.js.coffee b/app/assets/javascripts/route.js.coffee
index 274e87f77..b679f1893 100644
--- a/app/assets/javascripts/route.js.coffee
+++ b/app/assets/javascripts/route.js.coffee
@@ -23,10 +23,10 @@ jQuery ->
else
selectFeature.unselectAll()
- $('.routes.show div.stop_points .stop_point').live("hover", select_stop_on_map)
+ $(document).on("hover", '.routes.show div.stop_points .stop_point', select_stop_on_map)
make_ajax_pagination = () ->
$.get(this.href, null, null, 'script')
false
- $('.routes.show .stop_points_detail .pagination a').live("click", make_ajax_pagination)
+ $(document).on("click", '.routes.show .stop_points_detail .pagination a', make_ajax_pagination)
diff --git a/app/assets/javascripts/stop_areas.js.coffee b/app/assets/javascripts/stop_areas.js.coffee
index cab862d46..aae8d4885 100644
--- a/app/assets/javascripts/stop_areas.js.coffee
+++ b/app/assets/javascripts/stop_areas.js.coffee
@@ -28,3 +28,18 @@ jQuery ->
$('input#stop_area_x').change(lon_lat_change)
$('input#stop_area_y').change(lon_lat_change)
+
+ # switch visibility of access_links
+ switch_generics = (event) ->
+ event.preventDefault()
+ $('.stop_areas .generics.content').toggle('slow')
+ $('a.generics .switcher').toggle()
+
+ $('.stop_areas a.generics').click(switch_generics)
+
+ switch_details = (event) ->
+ event.preventDefault()
+ $('.stop_areas .details.content').toggle('slow')
+ $('a.details .switcher').toggle()
+
+ $('.stop_areas a.details').click(switch_details)
diff --git a/app/assets/javascripts/time_tables.js.coffee b/app/assets/javascripts/time_tables.js.coffee
new file mode 100644
index 000000000..d347ddc67
--- /dev/null
+++ b/app/assets/javascripts/time_tables.js.coffee
@@ -0,0 +1,46 @@
+jQuery ->
+# add trigger to hide/show application dates and periods
+ switch_calendars = (event) ->
+ event.preventDefault()
+ $('.time_tables .calendars.content').toggle('slow')
+ $('a.calendars .switcher').toggle()
+
+ $('.time_tables a.calendars').click(switch_calendars)
+
+ switch_dates = (event) ->
+ event.preventDefault()
+ $('.time_tables .dates.content').toggle('slow')
+ $('a.dates .switcher').toggle()
+
+ $('.time_tables a.dates').click(switch_dates)
+
+ switch_periods = (event) ->
+ event.preventDefault()
+ $('.time_tables .periods.content').toggle('slow')
+ $('a.periods .switcher').toggle()
+
+ $('.time_tables a.periods').click(switch_periods)
+
+# add trigger when creating new date or period entries to activate datepicker
+ tt_datepickerI18n = (index, element) ->
+ # do nothig if a datepicker is already attached
+ return if ($(element).hasClass('hasDatepicker') )
+ $(element).datepicker({
+ dateFormat: "dd/mm/y",
+ dayNamesShort: $.datepicker.regional[ $('html').attr('lang') ].dayNamesShort,
+ dayNames: $.datepicker.regional[ $('html').attr('lang') ].dayNames,
+ monthNamesShort: $.datepicker.regional[ $('html').attr('lang') ].monthNamesShort,
+ monthNames: $.datepicker.regional[ $('html').attr('lang') ].monthNames
+ })
+ $(element).datepicker("setDate", $.datepicker.parseDate('dd/mm/y', $(element).val() ) ) if ($(element).val().indexOf('/') >= 0)
+ $(element).datepicker("setDate", $.datepicker.parseDate('yy-mm-dd', $(element).val() ) ) if ($(element).val().indexOf('/') < 0)
+
+ after_inserts = ->
+ $('input[type="date"]').each(tt_datepickerI18n)
+
+ bind_after_inserts = ->
+ $('#periods_content').bind('insertion-callback',after_inserts)
+ $('#dates_content').bind('insertion-callback',after_inserts)
+ #after_inserts()
+
+ $(document).ready(bind_after_inserts) if $('.time_tables').length > 0
diff --git a/app/assets/javascripts/vehicle_journey.js.coffee b/app/assets/javascripts/vehicle_journey.js.coffee
index 513d177c8..94c45602c 100644
--- a/app/assets/javascripts/vehicle_journey.js.coffee
+++ b/app/assets/javascripts/vehicle_journey.js.coffee
@@ -1,6 +1,6 @@
jQuery ->
swap_hour_minute = ( from, to) ->
- rows = $('.vehicle_journeys.edit tbody.journey_pattern_dependent_list tr')
+ rows = $('.vehicle_journeys tbody.journey_pattern_dependent_list tr')
for row in rows
do (row) ->
$(row).find( to).find('.hour')[0].value = $(row).find( from).find('.hour')[0].value
@@ -10,13 +10,13 @@ jQuery ->
event.preventDefault()
swap_hour_minute( '.departure_time', '.arrival_time')
- $('.vehicle_journeys.edit a.to_arrivals').live("click", copy_departures_to_arrivals)
+ $(document).on("click", '.vehicle_journeys a.to_arrivals', copy_departures_to_arrivals)
copy_arrivals_to_departures = (event) ->
event.preventDefault()
swap_hour_minute( '.arrival_time', '.departure_time')
- $('.vehicle_journeys.edit a.to_departures').live("click", copy_arrivals_to_departures)
+ $(document).on("click", '.vehicle_journeys a.to_departures', copy_arrivals_to_departures)
switch_vehicle_journey_at_stops = (event) ->
event.preventDefault()
diff --git a/app/assets/stylesheets/access_links.css.scss b/app/assets/stylesheets/access_links.css.scss
new file mode 100644
index 000000000..63a55e021
--- /dev/null
+++ b/app/assets/stylesheets/access_links.css.scss
@@ -0,0 +1,21 @@
+// Place all the styles related to the lines controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/
+@import "common";
+
+
+#workspace.access_links.show
+{
+
+ .summary p label {
+ font-weight: bold;
+ }
+ .duration {
+ padding-left: 10px;
+ }
+
+}
+
+
+
+
diff --git a/app/assets/stylesheets/access_points.css.scss b/app/assets/stylesheets/access_points.css.scss
new file mode 100644
index 000000000..22dc3ac3d
--- /dev/null
+++ b/app/assets/stylesheets/access_points.css.scss
@@ -0,0 +1,103 @@
+// Place all the styles related to the lines controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/
+@import "common";
+
+#workspace.access_points.index
+{
+ .access_point:after {
+ @include after_div_for_object;
+ }
+
+ .access_points:after {
+ @include content_to_clear;
+ }
+
+ .access_point {
+ @include div_for_object;
+ /* to create multi-column index */
+ width: 250px;
+ float: left;
+ padding-right: 10px;
+
+ .access_type {
+ width: 25px;
+ height: 64px;
+ float: left;
+ margin-right: 10px;
+
+
+ a {
+ text-decoration: none;
+ }
+ }
+
+ }
+}
+
+#workspace.access_points.edit {
+ legend { padding-bottom: 20px; }
+}
+
+#workspace.access_points.show
+{
+ .geo_data {
+ padding-left:15px;
+ }
+
+ .summary{
+
+ p label {
+ font-weight: bold;
+ }
+ }
+
+ .access_link_pairs {
+
+ .link {
+ border: 2px solid black;
+ }
+ .access_point{
+ float: left;
+ padding: 3px 15px 0px 3px;
+ height: 25px;
+ * { vertical-align:middle; }
+ span { margin-left: 7px; }
+ img { margin: 0px 5px 0px 5px;}
+ }
+ .stop_area{
+ float: left;
+ padding: 3px 15px 0px 3px;
+ height: 25px;
+ * { vertical-align:middle; }
+ span { margin-left: 7px; }
+ img { margin: 0px 5px 0px 5px;}
+ }
+
+ .info {
+ font-size: 10px;
+ color: #777;
+ font-weight: normal;
+ padding-top: 0px;
+ padding-left: 45px;
+ padding-right: 3px;
+ padding-bottom: 3px;
+ }
+ }
+
+}
+
+
+#sidebar ul.selection li {
+ a {
+ line-height: 27px;
+
+ img{
+ height: 25px;
+ width: 25px;
+ vertical-align: middle;
+ }
+ }
+}
+
+
diff --git a/app/assets/stylesheets/api_keys.css.scss b/app/assets/stylesheets/api_keys.css.scss
new file mode 100644
index 000000000..cca96321e
--- /dev/null
+++ b/app/assets/stylesheets/api_keys.css.scss
@@ -0,0 +1,34 @@
+// Place all the styles related to the routes controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/
+@import "common";
+
+#workspace.referentials.show
+{
+ .api_key:after {
+ @include after_div_for_object;
+ }
+
+ .api_keys {
+ margin-top: 20px;
+ }
+
+ .api_keys:after {
+ @include content_to_clear;
+ }
+
+ .api_key {
+ @include div_for_object;
+
+ /* to create multi-column index */
+ width: 350px;
+ padding-right: 10px;
+
+ .name {
+ line-height: 16px;
+ float: left;
+ }
+
+ }
+}
+
diff --git a/app/assets/stylesheets/calendar.css.scss b/app/assets/stylesheets/calendar.css.scss
new file mode 100644
index 000000000..f9f5fd913
--- /dev/null
+++ b/app/assets/stylesheets/calendar.css.scss
@@ -0,0 +1,104 @@
+/*
+ A grey based theme, inspired by Blinksale and their ColorBurn widget. http://firewheeldesign.com
+
+ AUTHOR: Geoffrey Grosenbach http://nubyonrails.com
+
+ Colors:
+ dk: 787888
+ lt: 4f4f5b
+ lter: a8a8a8
+ white: ffffff
+*/
+
+/* TODO */
+
+.year_choice{
+ font-size: 16px;
+ font-weight: bold;
+ margin: 20px 0 0 0;
+ text-align: center;
+
+ .year{
+ text-align: center;
+
+ }
+
+}
+
+.calendar_helper{
+
+ padding: auto;
+}
+
+.calendar {
+ color: white;
+ text-align: center;
+ margin-left: 30px;
+ display: inline-table;
+}
+
+thead tr {
+ color: black;
+}
+
+ th.monthName {
+ font-weight: bold;
+ text-align: center;
+ padding-top: 1em;
+ padding-bottom: 0.7em;
+ color: black;
+}
+
+.dayName th {
+ font-size: 0.7em;
+ text-align: center;
+ padding-top: 0.6em;
+ padding-bottom: 0.3em;
+ background-color: #303030;
+ color: white;
+ border-bottom: 1px solid white;
+}
+
+.otherMonth {
+ color: #999999;
+ background-color: #4f4f5b;
+ padding: 0.7em;
+ border-right: 1px solid #111111;
+ border-bottom: 1px solid #111111;
+}
+
+.day { background-color: #333333; }
+
+.day, .specialDay, .selected_period, .selected_date, .overlap_date {
+ border-bottom: 1px solid #111111;
+ padding: 0.7em;
+ border-right: 1px solid #111111;
+ border-bottom: 1px solid #111111;
+}
+
+.specialDay { background-color: #a8a8a8 !important; }
+
+.selected_period { background-color: #ffbd2b !important; }
+
+.selected_date { background-color: #8fc861 !important; }
+
+.overlap_date { background-color: #ffbd2b !important; }
+
+.specialDay, .selected_period, .selected_date, .overlap_date {
+ a, a:visited, a:hover {
+ color: white;
+ text-decoration: none;
+ }
+}
+
+.specialDay a:hover, selected_period a:hover, selected_date a:hover, overlap_date a:hover {
+ color: black;
+}
+
+.weekendDay {
+ background-color: #787888;
+}
+.today {
+ background-color: white;
+ color: black;
+} \ No newline at end of file
diff --git a/app/assets/stylesheets/errors.css.scss b/app/assets/stylesheets/errors.css.scss
new file mode 100644
index 000000000..b314da37a
--- /dev/null
+++ b/app/assets/stylesheets/errors.css.scss
@@ -0,0 +1,15 @@
+#workspace.errors {
+
+ body {text-align: center; }
+ div.error {
+ width: 45em;
+ padding:1em;
+ margin: 2em auto 0 auto;
+ border: 1px solid #ccc;
+ border-right-color: #999;
+ border-bottom-color: #999;
+ }
+ h2 { font-size: 100%; color: #f00; line-height: 1.5em; font-weight: bold}
+ a,a:visited { text-decoration: underline; color: blue}
+
+}
diff --git a/app/assets/stylesheets/group_of_lines.css.scss b/app/assets/stylesheets/group_of_lines.css.scss
new file mode 100644
index 000000000..24fbdce12
--- /dev/null
+++ b/app/assets/stylesheets/group_of_lines.css.scss
@@ -0,0 +1,101 @@
+// Place all the styles related to the lines controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/
+@import "common";
+
+#workspace.group_of_lines.index
+{
+ .group_of_line:after {
+ @include after_div_for_object;
+ }
+
+ .group_of_lines {
+ margin-top: 20px;
+ }
+
+ .group_of_lines:after {
+ @include content_to_clear;
+ }
+
+ .group_of_line {
+ @include div_for_object;
+
+ /* to create multi-column index */
+ width: 350px;
+ float: left;
+ padding-right: 10px;
+
+ }
+}
+
+#workspace.group_of_lines.show
+{
+ .summary p label {
+ font-weight: bold;
+ }
+ .lines_detail div.page_info {
+ margin-top: 0px;
+ }
+
+ .line:after {
+ @include after_div_for_object;
+ }
+
+ .lines {
+ margin-top: 10px;
+ }
+
+ .lines:after {
+ @include content_to_clear;
+ }
+ .group_of_line_lines {
+ clear: both;
+ margin: 0px;
+ padding: 0px;
+ a {
+ cursor: pointer;
+ }
+ }
+
+ .line {
+ @include div_for_object;
+ /* to create multi-column index */
+ width: 250px;
+ float: left;
+ padding-right: 10px;
+
+ .position {
+ width: 25px;
+ height: 20px;
+ float: left;
+ background-color: #61970B;
+ font-weight: bold;
+ color: white;
+ margin-right: 10px;
+ padding-left: 4px;
+ }
+ .color {
+ background-color: white;
+ width: 64px;
+ height: 64px;
+ float: left;
+ margin-right: 10px;
+ border: 1px solid #999;
+
+ a {
+ text-decoration: none;
+ }
+ }
+
+ .number {
+ font-size: 16px;
+ text-align: center;
+ font-weight: bold;
+ padding-top: 21px;
+ }
+ .name a {
+ display: inline;
+ }
+ }
+}
+
diff --git a/app/assets/stylesheets/jquery.qtip.min.css b/app/assets/stylesheets/jquery.qtip.min.css
index 65d786f52..9e1ab087d 100644
--- a/app/assets/stylesheets/jquery.qtip.min.css
+++ b/app/assets/stylesheets/jquery.qtip.min.css
@@ -1 +1 @@
-/*!* qTip2 - Pretty powerful tooltips * http://craigsworks.com/projects/qtip2/ * * Version:nightly * Copyright 2009-2010 Craig Michael Thompson - http://craigsworks.com * * Dual licensed under MIT or GPLv2 licenses * http://en.wikipedia.org/wiki/MIT_License * http://en.wikipedia.org/wiki/GNU_General_Public_License * * Date:Tue Jul 3 15:45:43.0000000000 2012 */ .ui-tooltip,.qtip{position:absolute;left:-28000px;top:-28000px;display:none;max-width:280px;min-width:50px;font-size:10.5px;line-height:12px;border-width:1px;border-style:solid;}.ui-tooltip-fluid{display:block;visibility:hidden;position:static!important;float:left!important;}.ui-tooltip-content{position:relative;padding:5px 9px;overflow:hidden;text-align:left;word-wrap:break-word;overflow:hidden;}.ui-tooltip-titlebar{position:relative;min-height:14px;padding:5px 35px 5px 10px;overflow:hidden;border-width:0 0 1px;font-weight:bold;}.ui-tooltip-titlebar+.ui-tooltip-content{border-top-width:0!important;}/*!Default close button class */ .ui-tooltip-titlebar .ui-state-default{position:absolute;right:4px;top:50%;margin-top:-9px;cursor:pointer;outline:medium none;border-width:1px;border-style:solid;}* html .ui-tooltip-titlebar .ui-state-default{top:16px;}.ui-tooltip-titlebar .ui-icon,.ui-tooltip-icon .ui-icon{display:block;text-indent:-1000em;}.ui-tooltip-icon,.ui-tooltip-icon .ui-icon{-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;text-decoration:none;}.ui-tooltip-icon .ui-icon{width:18px;height:14px;text-align:center;text-indent:0;font:normal bold 10px/13px Tahoma,sans-serif;color:inherit;background:transparent none no-repeat -100em -100em;}/*!Default tooltip style */ .ui-tooltip-default{border-color:#F1D031;background-color:#FFFFA3;color:#555;}.ui-tooltip-default .ui-tooltip-titlebar{background-color:#FFEF93;}.ui-tooltip-default .ui-tooltip-icon{border-color:#CCC;background:#F1F1F1;color:#777;}.ui-tooltip-default .ui-tooltip-titlebar .ui-state-hover{border-color:#AAA;color:#111;} \ No newline at end of file
+/*! qTip2 v2.0.1 (includes: svg ajax tips modal viewport imagemap ie6 / basic css3) | qtip2.com | Licensed MIT, GPL | Mon Dec 31 2012 14:55:17 */.qtip,.qtip{position:absolute;left:-28000px;top:-28000px;display:none;max-width:280px;min-width:50px;font-size:10.5px;line-height:12px;direction:ltr}.qtip-content{position:relative;padding:5px 9px;overflow:hidden;text-align:left;word-wrap:break-word}.qtip-titlebar{position:relative;padding:5px 35px 5px 10px;overflow:hidden;border-width:0 0 1px;font-weight:700}.qtip-titlebar+.qtip-content{border-top-width:0!important}.qtip-close{position:absolute;right:-9px;top:-9px;cursor:pointer;outline:medium none;border-width:1px;border-style:solid;border-color:transparent}.qtip-titlebar .qtip-close{right:4px;top:50%;margin-top:-9px}* html .qtip-titlebar .qtip-close{top:16px}.qtip-titlebar .ui-icon,.qtip-icon .ui-icon{display:block;text-indent:-1000em;direction:ltr;vertical-align:middle}.qtip-icon,.qtip-icon .ui-icon{-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;text-decoration:none}.qtip-icon .ui-icon{width:18px;height:14px;text-align:center;text-indent:0;font:normal bold 10px/13px Tahoma,sans-serif;color:inherit;background:transparent none no-repeat -100em -100em}.qtip-focus{}.qtip-hover{}.qtip-default{border-width:1px;border-style:solid;border-color:#F1D031;background-color:#FFFFA3;color:#555}.qtip-default .qtip-titlebar{background-color:#FFEF93}.qtip-default .qtip-icon{border-color:#CCC;background:#F1F1F1;color:#777}.qtip-default .qtip-titlebar .qtip-close{border-color:#AAA;color:#111}/*! Light tooltip style */.qtip-light{background-color:#fff;border-color:#E2E2E2;color:#454545}.qtip-light .qtip-titlebar{background-color:#f1f1f1}/*! Dark tooltip style */.qtip-dark{background-color:#505050;border-color:#303030;color:#f3f3f3}.qtip-dark .qtip-titlebar{background-color:#404040}.qtip-dark .qtip-icon{border-color:#444}.qtip-dark .qtip-titlebar .ui-state-hover{border-color:#303030}/*! Cream tooltip style */.qtip-cream{background-color:#FBF7AA;border-color:#F9E98E;color:#A27D35}.qtip-cream .qtip-titlebar{background-color:#F0DE7D}.qtip-cream .qtip-close .qtip-icon{background-position:-82px 0}/*! Red tooltip style */.qtip-red{background-color:#F78B83;border-color:#D95252;color:#912323}.qtip-red .qtip-titlebar{background-color:#F06D65}.qtip-red .qtip-close .qtip-icon{background-position:-102px 0}.qtip-red .qtip-icon{border-color:#D95252}.qtip-red .qtip-titlebar .ui-state-hover{border-color:#D95252}/*! Green tooltip style */.qtip-green{background-color:#CAED9E;border-color:#90D93F;color:#3F6219}.qtip-green .qtip-titlebar{background-color:#B0DE78}.qtip-green .qtip-close .qtip-icon{background-position:-42px 0}/*! Blue tooltip style */.qtip-blue{background-color:#E5F6FE;border-color:#ADD9ED;color:#5E99BD}.qtip-blue .qtip-titlebar{background-color:#D0E9F5}.qtip-blue .qtip-close .qtip-icon{background-position:-2px 0}.qtip-shadow{-webkit-box-shadow:1px 1px 3px 1px rgba(0,0,0,.15);-moz-box-shadow:1px 1px 3px 1px rgba(0,0,0,.15);box-shadow:1px 1px 3px 1px rgba(0,0,0,.15)}.qtip-rounded,.qtip-tipsy,.qtip-bootstrap{-moz-border-radius:5px;-webkit-border-radius:5px;border-radius:5px}.qtip-youtube{-moz-border-radius:2px;-webkit-border-radius:2px;border-radius:2px;-webkit-box-shadow:0 0 3px #333;-moz-box-shadow:0 0 3px #333;box-shadow:0 0 3px #333;color:#fff;border-width:0;background:#4A4A4A;background-image:-webkit-gradient(linear,left top,left bottom,color-stop(0,#4A4A4A),color-stop(100%,black));background-image:-webkit-linear-gradient(top,#4A4A4A 0,black 100%);background-image:-moz-linear-gradient(top,#4A4A4A 0,black 100%);background-image:-ms-linear-gradient(top,#4A4A4A 0,black 100%);background-image:-o-linear-gradient(top,#4A4A4A 0,black 100%)}.qtip-youtube .qtip-titlebar{background-color:#4A4A4A;background-color:rgba(0,0,0,0)}.qtip-youtube .qtip-content{padding:.75em;font:12px arial,sans-serif;filter:progid:DXImageTransform.Microsoft.Gradient(GradientType=0, StartColorStr=#4a4a4a, EndColorStr=#000000);-ms-filter:"progid:DXImageTransform.Microsoft.Gradient(GradientType=0, StartColorStr=#4a4a4a, EndColorStr=#000000);"}.qtip-youtube .qtip-icon{border-color:#222}.qtip-youtube .qtip-titlebar .ui-state-hover{border-color:#303030}.qtip-jtools{background:#232323;background:rgba(0,0,0,.7);background-image:-webkit-gradient(linear,left top,left bottom,from(#717171),to(#232323));background-image:-moz-linear-gradient(top,#717171,#232323);background-image:-webkit-linear-gradient(top,#717171,#232323);background-image:-ms-linear-gradient(top,#717171,#232323);background-image:-o-linear-gradient(top,#717171,#232323);border:2px solid #ddd;border:2px solid rgba(241,241,241,1);-moz-border-radius:2px;-webkit-border-radius:2px;border-radius:2px;-webkit-box-shadow:0 0 12px #333;-moz-box-shadow:0 0 12px #333;box-shadow:0 0 12px #333}.qtip-jtools .qtip-titlebar{background-color:transparent;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#717171, endColorstr=#4A4A4A);-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr=#717171, endColorstr=#4A4A4A)"}.qtip-jtools .qtip-content{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#4A4A4A, endColorstr=#232323);-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr=#4A4A4A, endColorstr=#232323)"}.qtip-jtools .qtip-titlebar,.qtip-jtools .qtip-content{background:transparent;color:#fff;border:0 dashed transparent}.qtip-jtools .qtip-icon{border-color:#555}.qtip-jtools .qtip-titlebar .ui-state-hover{border-color:#333}.qtip-cluetip{-webkit-box-shadow:4px 4px 5px rgba(0,0,0,.4);-moz-box-shadow:4px 4px 5px rgba(0,0,0,.4);box-shadow:4px 4px 5px rgba(0,0,0,.4);background-color:#D9D9C2;color:#111;border:0 dashed transparent}.qtip-cluetip .qtip-titlebar{background-color:#87876A;color:#fff;border:0 dashed transparent}.qtip-cluetip .qtip-icon{border-color:#808064}.qtip-cluetip .qtip-titlebar .ui-state-hover{border-color:#696952;color:#696952}.qtip-tipsy{background:#000;background:rgba(0,0,0,.87);color:#fff;border:0 solid transparent;font-size:11px;font-family:'Lucida Grande',sans-serif;font-weight:700;line-height:16px;text-shadow:0 1px black}.qtip-tipsy .qtip-titlebar{padding:6px 35px 0 10;background-color:transparent}.qtip-tipsy .qtip-content{padding:6px 10}.qtip-tipsy .qtip-icon{border-color:#222;text-shadow:none}.qtip-tipsy .qtip-titlebar .ui-state-hover{border-color:#303030}.qtip-tipped{border:3px solid #959FA9;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;background-color:#F9F9F9;color:#454545;font-weight:400;font-family:serif}.qtip-tipped .qtip-titlebar{border-bottom-width:0;color:#fff;background:#3A79B8;background-image:-webkit-gradient(linear,left top,left bottom,from(#3A79B8),to(#2E629D));background-image:-webkit-linear-gradient(top,#3A79B8,#2E629D);background-image:-moz-linear-gradient(top,#3A79B8,#2E629D);background-image:-ms-linear-gradient(top,#3A79B8,#2E629D);background-image:-o-linear-gradient(top,#3A79B8,#2E629D);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#3A79B8, endColorstr=#2E629D);-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr=#3A79B8, endColorstr=#2E629D)"}.qtip-tipped .qtip-icon{border:2px solid #285589;background:#285589}.qtip-tipped .qtip-icon .ui-icon{background-color:#FBFBFB;color:#555}.qtip-bootstrap{font-size:14px;line-height:20px;color:#333;padding:1px;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0,0,0,.2);-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,.2);-moz-box-shadow:0 5px 10px rgba(0,0,0,.2);box-shadow:0 5px 10px rgba(0,0,0,.2);-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box}.qtip-bootstrap .qtip-titlebar{padding:8px 14px;margin:0;font-size:14px;font-weight:400;line-height:18px;background-color:#f7f7f7;border-bottom:1px solid #ebebeb;-webkit-border-radius:5px 5px 0 0;-moz-border-radius:5px 5px 0 0;border-radius:5px 5px 0 0}.qtip-bootstrap .qtip-titlebar .qtip-close{right:11px;top:45%;border-style:none}.qtip-bootstrap .qtip-content{padding:9px 14px}.qtip-bootstrap .qtip-icon{background:transparent}.qtip-bootstrap .qtip-icon .ui-icon{width:auto;height:auto;float:right;font-size:20px;font-weight:700;line-height:18px;color:#000;text-shadow:0 1px 0 #fff;opacity:.2;filter:alpha(opacity=20)}.qtip-bootstrap .qtip-icon .ui-icon:hover{color:#000;text-decoration:none;cursor:pointer;opacity:.4;filter:alpha(opacity=40)}.qtip:not(.ie9haxors) div.qtip-content,.qtip:not(.ie9haxors) div.qtip-titlebar{filter:none;-ms-filter:none}.qtip .qtip-tip{margin:0 auto;overflow:hidden;z-index:10}.qtip .qtip-tip,.qtip .qtip-tip .qtip-vml{position:absolute;color:#123456;background:transparent;border:0 dashed transparent}.qtip .qtip-tip canvas{top:0;left:0}.qtip .qtip-tip .qtip-vml{behavior:url(#default#VML);display:inline-block;visibility:visible}#qtip-overlay{position:fixed;left:-10000em;top:-10000em}#qtip-overlay.blurs{cursor:pointer}#qtip-overlay div{position:absolute;left:0;top:0;width:100%;height:100%;background-color:#000;opacity:.7;filter:alpha(opacity=70);-ms-filter:"alpha(Opacity=70)"}.qtipmodal-ie6fix{position:absolute!important} \ No newline at end of file
diff --git a/app/assets/stylesheets/lines.css.scss b/app/assets/stylesheets/lines.css.scss
index cbd39f90b..8632a72b2 100644
--- a/app/assets/stylesheets/lines.css.scss
+++ b/app/assets/stylesheets/lines.css.scss
@@ -77,6 +77,40 @@
.summary p label {
font-weight: bold;
}
+ .group_of_line {
+ @include div_for_object;
+ /* to create multi-column index */
+ width: 250px;
+ float: left;
+ padding-right: 10px;
+
+ .position {
+ width: 25px;
+ height: 20px;
+ float: left;
+ background-color: #61970B;
+ font-weight: bold;
+ color: white;
+ margin-right: 10px;
+ padding-left: 4px;
+ }
+ .color {
+ background-color: white;
+ width: 64px;
+ height: 64px;
+ float: left;
+ margin-right: 10px;
+ border: 1px solid #999;
+
+ a {
+ text-decoration: none;
+ }
+ }
+
+ .name a {
+ display: inline;
+ }
+ }
}
diff --git a/app/assets/stylesheets/stop_areas.css.scss b/app/assets/stylesheets/stop_areas.css.scss
index cd1623a05..fcfeb9fcf 100644
--- a/app/assets/stylesheets/stop_areas.css.scss
+++ b/app/assets/stylesheets/stop_areas.css.scss
@@ -118,6 +118,26 @@
height: 25px;
}
}
+ .access_point {
+ @include div_for_object;
+ /* to create multi-column index */
+ width: 250px;
+ float: left;
+ padding-right: 10px;
+
+ .access_type {
+ width: 25px;
+ height: 64px;
+ float: left;
+ margin-right: 10px;
+
+
+ a {
+ text-decoration: none;
+ }
+ }
+
+ }
}
#workspace.stop_areas.select_parent
@@ -135,6 +155,44 @@
}
}
+
+#workspace.stop_areas.access_links
+{
+ .access_link_pairs {
+ .link {
+ border: 2px solid black;
+ }
+ .access_point{
+ float: left;
+ padding: 3px 15px 0px 3px;
+ height: 25px;
+ * { vertical-align:middle; }
+ span { margin-left: 7px; }
+ img { margin: 0px 5px 0px 5px;}
+ }
+ .stop_area{
+ float: left;
+ padding: 3px 15px 0px 3px;
+ height: 25px;
+ * { vertical-align:middle; }
+ span { margin-left: 7px; }
+ img { margin: 0px 5px 0px 5px;}
+ }
+
+ .info {
+ font-size: 10px;
+ color: #777;
+ font-weight: normal;
+ padding-top: 0px;
+ padding-left: 45px;
+ padding-right: 3px;
+ padding-bottom: 3px;
+ }
+
+ }
+
+}
+
#sidebar ul.selection li {
a {
line-height: 27px;
diff --git a/app/assets/stylesheets/time_tables.css.scss b/app/assets/stylesheets/time_tables.css.scss
index 6a168eb4f..f1ff7b3d2 100644
--- a/app/assets/stylesheets/time_tables.css.scss
+++ b/app/assets/stylesheets/time_tables.css.scss
@@ -103,6 +103,16 @@
#workspace.time_tables.edit,#workspace.time_tables.new,#workspace.time_tables.create,#workspace.time_tables.update
{
+ h3 {
+ .dates {
+ cursor: pointer;
+ }
+ .periods {
+ cursor: pointer;
+ }
+ }
+
+
.day_type ol {
float: left;
margin: 0;
@@ -126,4 +136,55 @@
.day_type ol li label {
padding-left: 10%;
}
+
+ .dates ol {
+ margin-top: -0.3em;
+ margin-bottom: 1em;
+ margin-left: 25%;
+ padding: 0;
+ width: 75%;
+ }
+ .dates ol li { padding : 0.3em 0; }
+
+ .dates ol li label {
+ width: 40%;
+ margin-top: -0.3em;
+ }
+ .dates ol li.fl1 {float: left; width: 30% ;}
+ .dates ol li.fl1 label {width: 40%; margin-top: -0.3em; }
+ .dates ol li.fl1 input { width: 50%; }
+
+
+ .periods ol {
+ margin-top: -0.3em;
+ margin-bottom: 1em;
+ margin-left: 25%;
+ padding: 0;
+ width: 75%;
+ }
+ .periods ol li { padding : 0.3em 0; }
+
+ .periods ol li label {
+ width: 40%;
+ margin-top: -0.3em;
+ }
+ .periods ol li.fl1 {float: left; width: 30% ;}
+ .periods ol li.fl1 label {width: 40%; margin-top: -0.3em; }
+ .periods ol li.fl1 input { width: 50%; }
+
+ .periods ol li.fl2 {float: left; width: 30% ;}
+ .periods ol li.fl2 label {width: 40%; margin-top: -0.3em;}
+ .periods ol li.fl2 input { width: 50%; }
+ a.add_fields {
+ margin-left: 25%;
+ color: #666;
+ padding-left: 18px;
+ background: url(image-path('user_interface/ui/add.png')) no-repeat 0% 50%;
+ }
+ a.remove_fields {
+ color: #666;
+ padding-left: 18px;
+ background: url(image-path('user_interface/ui/remove.png')) no-repeat 0% 50%;
+ }
+
}
diff --git a/app/controllers/access_links_controller.rb b/app/controllers/access_links_controller.rb
new file mode 100644
index 000000000..a8c4a3ba3
--- /dev/null
+++ b/app/controllers/access_links_controller.rb
@@ -0,0 +1,74 @@
+class AccessLinksController < ChouetteController
+ defaults :resource_class => Chouette::AccessLink
+
+ belongs_to :referential do
+ belongs_to :access_point, :parent_class => Chouette::AccessPoint, :optional => true, :polymorphic => true
+ belongs_to :stop_area, :parent_class => Chouette::StopArea, :optional => true, :polymorphic => true
+ end
+
+ respond_to :html, :xml, :json
+ respond_to :kml, :only => :show
+
+
+ def index
+ request.format.kml? ? @per_page = nil : @per_page = 12
+ index!
+ end
+
+ def show
+ @map = AccessLinkMap.new(resource).with_helpers(self)
+ show!
+ end
+
+ def new
+ @access_point = Chouette::AccessPoint.find(params[:access_point_id])
+ data=params[:access_link]
+ @stop_area = Chouette::StopArea.find(data[:stop_area_id])
+ @orientation = data[:link_orientation_type]
+ name=data[:name]
+ if name.nil? || name.empty?
+ if @orientation == "access_point_to_stop_area"
+ name = "#{@access_point.name} -> #{@stop_area.name}"
+ else
+ name = "#{@stop_area.name} -> #{@access_point.name}"
+ end
+ data[:name] = name
+ end
+ @access_link = Chouette::AccessLink.new(data)
+ new!
+ end
+
+ def create
+ @access_point = Chouette::AccessPoint.find(params[:access_point_id])
+ data=params[:access_link]
+ @stop_area = Chouette::StopArea.find(data[:stop_area_id])
+ @orientation = data[:link_orientation_type]
+ create!
+ end
+
+ def edit
+ @access_point = Chouette::AccessPoint.find(params[:access_point_id])
+ @access_link = Chouette::AccessLink.find(params[:id])
+ @stop_area = @access_link.stop_area
+ @orientation = @access_link.link_orientation_type
+ edit!
+ end
+ protected
+
+ alias_method :access_link, :resource
+
+# def map
+# @map = AccessLinkMap.new(access_link).with_helpers(self)
+# end
+
+ def collection
+ @q = parent.access_links.search(params[:q])
+ @access_links ||=
+ begin
+ access_links = @q.result(:distinct => true).order(:name)
+ access_links = access_links.paginate(:page => params[:page]) if @per_page.present?
+ access_links
+ end
+ end
+
+end
diff --git a/app/controllers/access_points_controller.rb b/app/controllers/access_points_controller.rb
new file mode 100644
index 000000000..d26595a85
--- /dev/null
+++ b/app/controllers/access_points_controller.rb
@@ -0,0 +1,55 @@
+class AccessPointsController < ChouetteController
+ defaults :resource_class => Chouette::AccessPoint
+
+ belongs_to :referential do
+ belongs_to :stop_area, :parent_class => Chouette::StopArea, :optional => true, :polymorphic => true
+ end
+
+ respond_to :html, :kml, :xml, :json
+
+
+ def index
+ request.format.kml? ? @per_page = nil : @per_page = 12
+ index!
+ end
+
+ def show
+ map.editable = false
+ @generic_access_links = @access_point.generic_access_link_matrix
+ @detail_access_links = @access_point.detail_access_link_matrix
+ show! do |format|
+ unless access_point.position or params[:default]
+ format.kml {
+ render :nothing => true, :status => :not_found
+ }
+
+ end
+ end
+ end
+
+ def edit
+ access_point.position ||= access_point.default_position
+ map.editable = true
+ edit!
+ end
+
+
+ protected
+
+ alias_method :access_point, :resource
+
+ def map
+ @map = AccessPointMap.new(access_point).with_helpers(self)
+ end
+
+ def collection
+ @q = parent.access_points.search(params[:q])
+ @access_points ||=
+ begin
+ access_points = @q.result(:distinct => true).order(:name)
+ access_points = access_points.paginate(:page => params[:page]) if @per_page.present?
+ access_points
+ end
+ end
+
+end
diff --git a/app/controllers/api/v1/access_links_controller.rb b/app/controllers/api/v1/access_links_controller.rb
new file mode 100644
index 000000000..1b9c98538
--- /dev/null
+++ b/app/controllers/api/v1/access_links_controller.rb
@@ -0,0 +1,14 @@
+class Api::V1::AccessLinksController < Api::V1::ChouetteController
+
+ defaults :resource_class => Chouette::AccessLink, :finder => :find_by_objectid!
+
+protected
+
+ def collection
+ @access_links ||= ( @referential ? @referential.access_links.search(params[:q]).result(:distinct => true) : [])
+
+ end
+
+end
+
+
diff --git a/app/controllers/api/v1/access_points_controller.rb b/app/controllers/api/v1/access_points_controller.rb
new file mode 100644
index 000000000..4c3f5adc0
--- /dev/null
+++ b/app/controllers/api/v1/access_points_controller.rb
@@ -0,0 +1,13 @@
+class Api::V1::AccessPointsController < Api::V1::ChouetteController
+
+ defaults :resource_class => Chouette::AccessPoint, :finder => :find_by_objectid!
+
+protected
+
+ def collection
+ @access_points ||= ( @referential ? @referential.access_points.search(params[:q]).result(:distinct => true) : [])
+
+ end
+
+end
+
diff --git a/app/controllers/api/v1/chouette_controller.rb b/app/controllers/api/v1/chouette_controller.rb
new file mode 100644
index 000000000..b8879cd3f
--- /dev/null
+++ b/app/controllers/api/v1/chouette_controller.rb
@@ -0,0 +1,25 @@
+module Api
+ module V1
+ class ChouetteController < ActionController::Base
+ inherit_resources
+ respond_to :json, :xml
+ layout false
+ before_filter :authenticate
+
+private
+
+ def authenticate
+ authenticate_or_request_with_http_token do |token, options|
+ @referential = Api::V1::ApiKey.referential_from_token(token)
+
+ @api_key = @referential.api_keys.find_by_token(token) if @referential
+ switch_referential if @api_key
+ end
+ end
+ def switch_referential
+ Apartment::Database.switch(@api_key.referential.slug)
+ end
+
+ end
+ end
+end
diff --git a/app/controllers/api/v1/companies_controller.rb b/app/controllers/api/v1/companies_controller.rb
new file mode 100644
index 000000000..32ffafd03
--- /dev/null
+++ b/app/controllers/api/v1/companies_controller.rb
@@ -0,0 +1,13 @@
+class Api::V1::CompaniesController < Api::V1::ChouetteController
+
+ defaults :resource_class => Chouette::Company, :finder => :find_by_objectid!
+
+protected
+
+ def collection
+ @companies ||= ( @referential ? @referential.companies.search(params[:q]).result(:distinct => true) : [])
+
+ end
+
+end
+
diff --git a/app/controllers/api/v1/connection_links_controller.rb b/app/controllers/api/v1/connection_links_controller.rb
new file mode 100644
index 000000000..c5cf39812
--- /dev/null
+++ b/app/controllers/api/v1/connection_links_controller.rb
@@ -0,0 +1,12 @@
+class Api::V1::ConnectionLinksController < Api::V1::ChouetteController
+
+ defaults :resource_class => Chouette::ConnectionLink, :finder => :find_by_objectid!
+
+protected
+
+ def collection
+ @connection_links ||= ( @referential ? @referential.connection_links.search(params[:q]).result(:distinct => true) : [])
+ end
+
+end
+
diff --git a/app/controllers/api/v1/group_of_lines_controller.rb b/app/controllers/api/v1/group_of_lines_controller.rb
new file mode 100644
index 000000000..b3760e1b0
--- /dev/null
+++ b/app/controllers/api/v1/group_of_lines_controller.rb
@@ -0,0 +1,12 @@
+class Api::V1::GroupOfLinesController < Api::V1::ChouetteController
+
+ defaults :resource_class => Chouette::GroupOfLine, :finder => :find_by_objectid!
+
+protected
+
+ def collection
+ @group_of_lines ||= ( @referential ? @referential.group_of_lines.search(params[:q]).result(:distinct => true) : [])
+
+ end
+
+end \ No newline at end of file
diff --git a/app/controllers/api/v1/journey_patterns_controller.rb b/app/controllers/api/v1/journey_patterns_controller.rb
new file mode 100644
index 000000000..9e7bc3da2
--- /dev/null
+++ b/app/controllers/api/v1/journey_patterns_controller.rb
@@ -0,0 +1,16 @@
+class Api::V1::JourneyPatternsController < Api::V1::ChouetteController
+
+ defaults :resource_class => Chouette::JourneyPattern, :finder => :find_by_objectid!
+
+ belongs_to :line, :parent_class => Chouette::Line, :optional => true, :finder => :find_by_objectid!, :param => :line_id do
+ belongs_to :route, :parent_class => Chouette::Route, :optional => true, :finder => :find_by_objectid!, :param => :route_id
+ end
+
+protected
+
+ def collection
+ @journey_patterns ||= parent.journey_patterns
+ end
+
+end
+
diff --git a/app/controllers/api/v1/lines_controller.rb b/app/controllers/api/v1/lines_controller.rb
new file mode 100644
index 000000000..2375a5f7a
--- /dev/null
+++ b/app/controllers/api/v1/lines_controller.rb
@@ -0,0 +1,16 @@
+module Api
+ module V1
+ class LinesController < ChouetteController
+
+ defaults :resource_class => Chouette::Line, :finder => :find_by_objectid!
+
+ protected
+
+ def collection
+ @lines ||= ( @referential ? @referential.lines.search(params[:q]).result(:distinct => true) : [])
+ end
+ end
+ end
+end
+
+
diff --git a/app/controllers/api/v1/networks_controller.rb b/app/controllers/api/v1/networks_controller.rb
new file mode 100644
index 000000000..22f58addf
--- /dev/null
+++ b/app/controllers/api/v1/networks_controller.rb
@@ -0,0 +1,15 @@
+module Api
+ module V1
+ class NetworksController < ChouetteController
+
+ defaults :resource_class => Chouette::Network, :finder => :find_by_objectid!
+
+ protected
+
+ def collection
+ @networks ||= ( @referential ? @referential.networks.search(params[:q]).result(:distinct => true) : [])
+ end
+ end
+ end
+end
+
diff --git a/app/controllers/api/v1/routes_controller.rb b/app/controllers/api/v1/routes_controller.rb
new file mode 100644
index 000000000..e3694725f
--- /dev/null
+++ b/app/controllers/api/v1/routes_controller.rb
@@ -0,0 +1,13 @@
+class Api::V1::RoutesController < Api::V1::ChouetteController
+
+ defaults :resource_class => Chouette::Route, :finder => :find_by_objectid!
+
+ belongs_to :line, :parent_class => Chouette::Line, :optional => true, :finder => :find_by_objectid!, :param => :line_id
+
+protected
+
+ def collection
+ @routes ||= parent.routes
+ end
+end
+
diff --git a/app/controllers/api/v1/stop_areas_controller.rb b/app/controllers/api/v1/stop_areas_controller.rb
new file mode 100644
index 000000000..31259ec8f
--- /dev/null
+++ b/app/controllers/api/v1/stop_areas_controller.rb
@@ -0,0 +1,20 @@
+class Api::V1::StopAreasController < Api::V1::ChouetteController
+
+ defaults :resource_class => Chouette::StopArea, :finder => :find_by_objectid!
+
+ belongs_to :line, :parent_class => Chouette::Line, :optional => true, :finder => :find_by_objectid!, :param => :line_id do
+ belongs_to :route, :parent_class => Chouette::Route, :optional => true, :finder => :find_by_objectid!, :param => :route_id
+ end
+
+protected
+
+ def collection
+ if parent
+ @stop_areas ||= parent.stop_areas.search(params[:q]).result
+ else
+ @stop_areas ||= @referential.stop_areas.search(params[:q]).result(:distinct => true)
+ end
+ end
+
+end
+
diff --git a/app/controllers/api/v1/time_tables_controller.rb b/app/controllers/api/v1/time_tables_controller.rb
new file mode 100644
index 000000000..669318bad
--- /dev/null
+++ b/app/controllers/api/v1/time_tables_controller.rb
@@ -0,0 +1,12 @@
+class Api::V1::TimeTablesController < Api::V1::ChouetteController
+
+ defaults :resource_class => Chouette::TimeTable, :finder => :find_by_objectid!
+
+protected
+
+ def collection
+ @time_tables ||= @referential.time_tables.search(params[:q]).result(:distinct => true)
+ end
+
+end
+
diff --git a/app/controllers/api/v1/vehicle_journeys_controller.rb b/app/controllers/api/v1/vehicle_journeys_controller.rb
new file mode 100644
index 000000000..b5c077635
--- /dev/null
+++ b/app/controllers/api/v1/vehicle_journeys_controller.rb
@@ -0,0 +1,16 @@
+class Api::V1::VehicleJourneysController < Api::V1::ChouetteController
+
+ defaults :resource_class => Chouette::VehicleJourney, :finder => :find_by_objectid!
+
+ belongs_to :line, :parent_class => Chouette::Line, :optional => true, :finder => :find_by_objectid!, :param => :line_id do
+ belongs_to :route, :parent_class => Chouette::Route, :optional => true, :finder => :find_by_objectid!, :param => :route_id
+ end
+
+protected
+
+ def collection
+ @vehicle_journeys ||= parent.vehicle_journeys
+ end
+
+end
+
diff --git a/app/controllers/api_keys_controller.rb b/app/controllers/api_keys_controller.rb
new file mode 100644
index 000000000..fea8f66b3
--- /dev/null
+++ b/app/controllers/api_keys_controller.rb
@@ -0,0 +1,17 @@
+class ApiKeysController < ChouetteController
+ defaults :resource_class => Api::V1::ApiKey
+
+ belongs_to :referential
+
+ def create
+ create! { referential_path(@referential) }
+ end
+ def update
+ update! { referential_path(@referential) }
+ end
+ def destroy
+ destroy! { referential_path(@referential) }
+ end
+
+end
+
diff --git a/app/controllers/errors_controller.rb b/app/controllers/errors_controller.rb
new file mode 100644
index 000000000..c68a60804
--- /dev/null
+++ b/app/controllers/errors_controller.rb
@@ -0,0 +1,9 @@
+class ErrorsController < ApplicationController
+ def not_found
+ render :status => 404, :formats => [:html]
+ end
+
+ def server_error
+ render :status => 500, :formats => [:html]
+ end
+end \ No newline at end of file
diff --git a/app/controllers/file_validations_controller.rb b/app/controllers/file_validations_controller.rb
index cc50a7499..274d11f9f 100644
--- a/app/controllers/file_validations_controller.rb
+++ b/app/controllers/file_validations_controller.rb
@@ -1,23 +1,36 @@
class FileValidationsController < InheritedResources::Base
respond_to :html, :xml, :json
+ def index
+ no_referential
+ index!
+ end
+
def show
+ no_referential
@toc = TestSheetPage.find("toc")
show!
end
def new
+ no_referential
@toc = TestSheetPage.find("toc")
new!
end
def create
+ no_referential
create! do |success, failure|
success.html { redirect_to file_validations_path }
end
end
+
protected
+ def no_referential
+ Apartment::Database.switch("public")
+ end
+
def resource
@file_validation ||= current_organisation.file_validations.find_by_id(params[:id])
end
diff --git a/app/controllers/group_of_lines_controller.rb b/app/controllers/group_of_lines_controller.rb
new file mode 100644
index 000000000..c758ad16d
--- /dev/null
+++ b/app/controllers/group_of_lines_controller.rb
@@ -0,0 +1,47 @@
+class GroupOfLinesController < ChouetteController
+ defaults :resource_class => Chouette::GroupOfLine
+ respond_to :html
+ respond_to :xml
+ respond_to :json
+ respond_to :kml, :only => :show
+
+ belongs_to :referential
+
+ def show
+ @map = GroupOfLineMap.new(resource).with_helpers(self)
+ @lines = resource.lines.order(:name).paginate(:page => params[:page])
+ show!
+ end
+
+ def name_filter
+ respond_to do |format|
+ format.json { render :json => filtered_group_of_lines_maps}
+ end
+
+ end
+
+ protected
+
+ def filtered_group_of_lines_maps
+ filtered_group_of_lines.collect do |group_of_line|
+ { :id => group_of_line.id, :name => group_of_line.name }
+ end
+ end
+
+ def filtered_group_of_lines
+ referential.group_of_lines.select{ |t| t.name =~ /#{params[:q]}/i }
+ end
+
+ def collection
+ @q = referential.group_of_lines.search(params[:q])
+ @group_of_lines ||= @q.result(:distinct => true).order(:name).paginate(:page => params[:page])
+ end
+
+ def resource_url(group_of_line = nil)
+ referential_group_of_line_path(referential, group_of_line || resource)
+ end
+
+ def collection_url
+ referential_group_of_lines_path(referential)
+ end
+end
diff --git a/app/controllers/journey_patterns_controller.rb b/app/controllers/journey_patterns_controller.rb
index 377ddf7c8..0274b9b71 100644
--- a/app/controllers/journey_patterns_controller.rb
+++ b/app/controllers/journey_patterns_controller.rb
@@ -35,5 +35,10 @@ class JourneyPatternsController < ChouetteController
@vehicle_journey.update_journey_pattern(resource)
render "vehicle_journeys/select_journey_pattern"
end
+ # overwrite inherited resources to use delete instead of destroy
+ # foreign keys will propagate deletion)
+ def destroy_resource(object)
+ object.delete
+ end
end
diff --git a/app/controllers/lines_controller.rb b/app/controllers/lines_controller.rb
index e85c29fc9..acae8348e 100644
--- a/app/controllers/lines_controller.rb
+++ b/app/controllers/lines_controller.rb
@@ -10,9 +10,16 @@ class LinesController < ChouetteController
def show
@map = LineMap.new(resource).with_helpers(self)
@routes = @line.routes
+ @group_of_lines = @line.group_of_lines
show!
end
+ # overwrite inherited resources to use delete instead of destroy
+ # foreign keys will propagate deletion)
+ def destroy_resource(object)
+ object.delete
+ end
+
def destroy_all
objects =
get_collection_ivar || set_collection_ivar(end_of_association_chain.where(:id => params[:ids]))
@@ -20,8 +27,25 @@ class LinesController < ChouetteController
respond_with(objects, :location => smart_collection_url)
end
+ def name_filter
+ respond_to do |format|
+ format.json { render :json => filtered_lines_maps}
+ end
+
+ end
+
protected
+ def filtered_lines_maps
+ filtered_lines.collect do |line|
+ { :id => line.id, :name => line.published_name }
+ end
+ end
+
+ def filtered_lines
+ referential.lines.select{ |t| t.published_name =~ /#{params[:q]}/i }
+ end
+
def collection
@q = referential.lines.search(params[:q])
@lines ||= @q.result(:distinct => true).order(:number).paginate(:page => params[:page]).includes([:network, :company])
diff --git a/app/controllers/referentials_controller.rb b/app/controllers/referentials_controller.rb
index 18a01daeb..447c48bc3 100644
--- a/app/controllers/referentials_controller.rb
+++ b/app/controllers/referentials_controller.rb
@@ -1,7 +1,8 @@
class ReferentialsController < InheritedResources::Base
respond_to :html
respond_to :json, :only => :show
-
+ respond_to :js, :only => :show
+
def show
resource.switch
show! do |format|
diff --git a/app/controllers/routes_controller.rb b/app/controllers/routes_controller.rb
index 078694ea0..7b5e096db 100644
--- a/app/controllers/routes_controller.rb
+++ b/app/controllers/routes_controller.rb
@@ -21,6 +21,12 @@ class RoutesController < ChouetteController
show!
end
+ # overwrite inherited resources to use delete instead of destroy
+ # foreign keys will propagate deletion)
+ def destroy_resource(object)
+ object.delete
+ end
+
def destroy
destroy! do |success, failure|
success.html { redirect_to referential_line_path(@referential,@line) }
diff --git a/app/controllers/stop_areas_controller.rb b/app/controllers/stop_areas_controller.rb
index 08cf86853..a3e2ab921 100644
--- a/app/controllers/stop_areas_controller.rb
+++ b/app/controllers/stop_areas_controller.rb
@@ -34,6 +34,12 @@ class StopAreasController < ChouetteController
@stops = stop_area.routing_stops
end
+ def access_links
+ @stop_area = stop_area
+ @generic_access_links = stop_area.generic_access_link_matrix
+ @detail_access_links = stop_area.detail_access_link_matrix
+ end
+
def index
request.format.kml? ? @per_page = nil : @per_page = 12
index!
@@ -41,8 +47,9 @@ class StopAreasController < ChouetteController
def show
map.editable = false
+ @access_points = @stop_area.access_points
show! do |format|
- unless stop_area.position or params[:default]
+ unless stop_area.position or params[:default] or params[:routing]
format.kml {
render :nothing => true, :status => :not_found
}
diff --git a/app/controllers/subscriptions_controller.rb b/app/controllers/subscriptions_controller.rb
index a1dca5a5d..f16370a00 100644
--- a/app/controllers/subscriptions_controller.rb
+++ b/app/controllers/subscriptions_controller.rb
@@ -2,7 +2,7 @@ class SubscriptionsController < InheritedResources::Base
skip_filter :authenticate_user!
def create
- create! do |success, failure|
+ create! do |success|
success.html do
sign_in resource.user
redirect_to referentials_path
diff --git a/app/controllers/time_table_dates_controller.rb b/app/controllers/time_table_dates_controller.rb
deleted file mode 100644
index 100034394..000000000
--- a/app/controllers/time_table_dates_controller.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-class TimeTableDatesController < ChouetteController
- defaults :resource_class => Chouette::TimeTableDate, :collection_name => 'dates'
-
- respond_to :html
-
- belongs_to :referential do
- belongs_to :time_table, :parent_class => Chouette::TimeTable
- end
-
- def update
- update! do |success, failure|
- success.html { redirect_to referential_time_table_path(@referential,@time_table) }
- end
- end
-
- def create
- create! do |success, failure|
- success.html { redirect_to referential_time_table_path(@referential,@time_table) }
- end
- end
-
- def destroy
- destroy! do |success, failure|
- success.html { redirect_to referential_time_table_path(@referential,@time_table) }
- end
- end
-end
diff --git a/app/controllers/time_table_periods_controller.rb b/app/controllers/time_table_periods_controller.rb
deleted file mode 100644
index 0614de2d5..000000000
--- a/app/controllers/time_table_periods_controller.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-class TimeTablePeriodsController < ChouetteController
- defaults :resource_class => Chouette::TimeTablePeriod, :collection_name => 'periods'
-
- respond_to :html
-
- belongs_to :referential do
- belongs_to :time_table, :parent_class => Chouette::TimeTable
- end
-
- def update
- update! do |success, failure|
- success.html { redirect_to referential_time_table_path(@referential,@time_table) }
- end
- end
-
- def create
- create! do |success, failure|
- success.html { redirect_to referential_time_table_path(@referential,@time_table) }
- end
- end
-
- def destroy
- destroy! do |success, failure|
- success.html { redirect_to referential_time_table_path(@referential,@time_table) }
- end
- end
-end
diff --git a/app/controllers/time_tables_controller.rb b/app/controllers/time_tables_controller.rb
index 8f57f18c0..a9f799e9d 100644
--- a/app/controllers/time_tables_controller.rb
+++ b/app/controllers/time_tables_controller.rb
@@ -6,6 +6,11 @@ class TimeTablesController < ChouetteController
belongs_to :referential
+ def show
+ @year = params[:year] ? params[:year].to_i : Date.today.cwyear
+ show!
+ end
+
def comment_filter
respond_to do |format|
format.json { render :json => filtered_time_tables_maps}
diff --git a/app/controllers/vehicle_journeys_controller.rb b/app/controllers/vehicle_journeys_controller.rb
index e83c3c3ff..1aec533c1 100644
--- a/app/controllers/vehicle_journeys_controller.rb
+++ b/app/controllers/vehicle_journeys_controller.rb
@@ -30,6 +30,12 @@ class VehicleJourneysController < ChouetteController
update!(:alert => t('activerecord.errors.models.vehicle_journey.invalid_times'))
end
+ # overwrite inherited resources to use delete instead of destroy
+ # foreign keys will propagate deletion)
+ def destroy_resource(object)
+ object.delete
+ end
+
protected
alias_method :vehicle_journey, :resource
diff --git a/app/helpers/access_points_helper.rb b/app/helpers/access_points_helper.rb
new file mode 100644
index 000000000..c5e9f672e
--- /dev/null
+++ b/app/helpers/access_points_helper.rb
@@ -0,0 +1,28 @@
+module AccessPointsHelper
+ def access_links_pairs(access_links)
+ hpairs = Hash.new
+ pairs = Array.new
+ access_links.each do |link|
+ key = pair_key(link)
+ pair = nil
+ if (hpairs.has_key? key)
+ pair = hpairs[key]
+ else
+ pair = AccessLinkPair.new
+ pairs << pair
+ hpairs[key] = pair
+ end
+ if (link.link_orientation_type == "access_point_to_stop_area")
+ pair.from_access_point = link
+ else
+ pair.to_access_point = link
+ end
+ end
+ pairs
+ end
+
+ def pair_key(access_link)
+ "#{access_link.access_point.id}-#{access_link.stop_area.id}"
+ end
+
+end
diff --git a/app/helpers/creation_helper.rb b/app/helpers/creation_helper.rb
new file mode 100644
index 000000000..167f2f01b
--- /dev/null
+++ b/app/helpers/creation_helper.rb
@@ -0,0 +1,15 @@
+module CreationHelper
+
+ def creation_tag(object)
+ field_set_tag t("layouts.creation_tag.title") do
+ content_tag :ul do
+ [(content_tag :li do
+ object.human_attribute_name('creation_time') + ' : ' + l(object.creation_time, :format => :short)
+ end),
+ (content_tag :li do
+ object.human_attribute_name('creator_id') + ' : ' + object.creator_id if object.creator_id
+ end)].join.html_safe
+ end
+ end
+ end
+end
diff --git a/app/helpers/stop_areas_helper.rb b/app/helpers/stop_areas_helper.rb
new file mode 100644
index 000000000..4a2f3f9a4
--- /dev/null
+++ b/app/helpers/stop_areas_helper.rb
@@ -0,0 +1,51 @@
+module StopAreasHelper
+ def genealogical_title
+ return t(".genealogical_routing") if @stop_area.stop_area_type == 'itl'
+ t(".genealogical")
+ end
+
+ def show_map?
+ manage_itl || @stop_area.projection_type != nil || @stop_area.long_lat_type != nil
+ end
+
+ def manage_access_points
+ @stop_area.stop_area_type == 'stop_place' || @stop_area.stop_area_type == 'commercial_stop_point'
+ end
+ def manage_itl
+ @stop_area.stop_area_type == 'itl'
+ end
+ def manage_parent
+ @stop_area.stop_area_type != 'itl'
+ end
+ def manage_children
+ @stop_area.stop_area_type == 'stop_place' || @stop_area.stop_area_type == 'commercial_stop_point'
+ end
+
+ def access_links_pairs(access_links)
+ hpairs = Hash.new
+ pairs = Array.new
+ access_links.each do |link|
+ key = pair_key(link)
+ pair = nil
+ if (hpairs.has_key? key)
+ pair = hpairs[key]
+ else
+ pair = AccessLinkPair.new
+ pairs << pair
+ hpairs[key] = pair
+ end
+ if (link.link_orientation_type == "access_point_to_stop_area")
+ pair.from_access_point = link
+ else
+ pair.to_access_point = link
+ end
+ end
+ pairs
+ end
+
+ def pair_key(access_link)
+ "#{access_link.access_point.id}-#{access_link.stop_area.id}"
+ end
+
+
+end
diff --git a/app/maps/access_link_map.rb b/app/maps/access_link_map.rb
new file mode 100644
index 000000000..daf49738a
--- /dev/null
+++ b/app/maps/access_link_map.rb
@@ -0,0 +1,37 @@
+
+class AccessLinkMap < ApplicationMap
+
+ attr_reader :access_link, :access_link_style
+
+ def initialize(access_link, access_link_style = nil)
+ @access_link = access_link
+ @access_link_style = access_link_style
+ end
+
+ def map
+ @map ||= MapLayers::Map.new(id, :projection => projection("EPSG:900913"), :controls => controls) do |map, page|
+ page << map.add_layer(MapLayers::OSM_MAPNIK)
+ page << map.add_layer(google_physical)
+ page << map.add_layer(google_streets)
+ page << map.add_layer(google_hybrid)
+ page << map.add_layer(google_satellite)
+
+ page.assign "access_points_layer", kml_layer([access_link.referential, access_link.access_point], :styleMap => StyleMap::AccessPointsStyleMap.new(helpers).style_map)
+ page << map.add_layer(:access_points_layer)
+ page.assign "stop_areas_layer", kml_layer([access_link.referential, access_link.stop_area], :styleMap => StyleMap::StopAreasStyleMap.new(helpers).style_map)
+ page << map.add_layer(:stop_areas_layer)
+ page << map.add_layer( kml_layer([access_link.referential, access_link.access_point, access_link], :styleMap => StyleMap::AccessLinkStyleMap.new(helpers).style_map))
+ page << map.add_control( hover_control_display_name([:access_points_layer,:stop_areas_layer]) )
+ page << map.zoom_to_extent(bounds.to_google.to_openlayers) if bounds
+ end
+ end
+
+ def ready?
+ Chouette::StopArea.bounds.present?
+ end
+
+ def bounds
+ @bounds ||= GeoRuby::SimpleFeatures::Point.bounds([access_link.stop_area.geometry,access_link.access_point.geometry])
+ end
+
+end
diff --git a/app/maps/access_point_map.rb b/app/maps/access_point_map.rb
new file mode 100644
index 000000000..bf763e6c6
--- /dev/null
+++ b/app/maps/access_point_map.rb
@@ -0,0 +1,66 @@
+class AccessPointMap < ApplicationMap
+
+ attr_reader :access_point
+
+ attr_accessor :editable
+ alias_method :editable?, :editable
+
+ def initialize(access_point)
+ @access_point = access_point
+ end
+
+ def map
+ @map ||= MapLayers::Map.new(id, :projection => projection("EPSG:900913"), :controls => controls) do |map, page|
+ page << map.add_layer(MapLayers::OSM_MAPNIK)
+ page << map.add_layer(google_physical)
+ page << map.add_layer(google_streets)
+ page << map.add_layer(google_hybrid)
+ page << map.add_layer(google_satellite)
+
+ page.assign "parent_layer", kml_layer(access_point.stop_area, :style_map => StyleMap::StopAreasStyleMap.new(helpers).style_map)
+ page << map.add_layer(:parent_layer)
+ page.assign "edit_access_point_layer", kml_layer(access_point, { :default => editable? }, :style_map => StyleMap::EditAccessPointStyleMap.new(helpers).style_map)
+ page << map.add_layer(:edit_access_point_layer)
+
+
+ if editable?
+ page.assign "referential_projection", projection_type.present? ? projection("EPSG:" + projection_type) : JsVar.new("undefined")
+ # TODO virer ce code inline
+ page << <<EOF
+ edit_access_point_layer.events.on({
+ 'afterfeaturemodified': function(event) {
+ geometry = event.feature.geometry.clone().transform(new OpenLayers.Projection("EPSG:900913"), new OpenLayers.Projection("EPSG:4326"));
+ $('#access_point_longitude').val(geometry.x);
+ $('#access_point_latitude').val(geometry.y);
+
+ if(referential_projection != undefined)
+ {
+ projection_geometry = event.feature.geometry.clone().transform(new OpenLayers.Projection("EPSG:900913"), referential_projection );
+ $('#access_point_x').val(projection_geometry.x);
+ $('#access_point_y').val(projection_geometry.y); }
+ }
+ });
+EOF
+ page << map.add_control(OpenLayers::Control::ModifyFeature.new(:edit_access_point_layer, :mode => 8, :autoActivate => true))
+
+ else
+ page << map.add_control( hover_control_display_name(:parent_layer) )
+ end
+
+ page << map.set_center(center.to_google.to_openlayers, 16, false, true)
+ end
+ end
+
+ def projection_type
+ access_point.referential.projection_type
+ end
+
+ def ready?
+ center.present?
+ end
+
+ def center
+ access_point.geometry or access_point.default_position
+ end
+
+end
diff --git a/app/maps/application_map.rb b/app/maps/application_map.rb
index 618ca0db2..8e9ce4d57 100644
--- a/app/maps/application_map.rb
+++ b/app/maps/application_map.rb
@@ -130,12 +130,6 @@ class ApplicationMap
} } )
end
- def open_layer_path
- relative_url_root = Rails.application.config.relative_url_root
- return "/assets/openlayers/" unless relative_url_root
- "#{relative_url_root}/assets/openlayers/"
- end
-
def kml_layer(url_or_object, options_or_url_options = {}, options = nil)
unless options
url_options = {}
diff --git a/app/maps/connection_link_map.rb b/app/maps/connection_link_map.rb
index 98e51e38f..9318ec90f 100644
--- a/app/maps/connection_link_map.rb
+++ b/app/maps/connection_link_map.rb
@@ -11,7 +11,7 @@ class ConnectionLinkMap < ApplicationMap
def customize_map(map, page)
page.assign "stop_areas_layer", kml_layer([connection_link.referential, connection_link, :stop_areas], :styleMap => StyleMap::StopAreasStyleMap.new(helpers).style_map)
page << map.add_layer(:stop_areas_layer)
- page << map.add_layer( kml_layer([connection_link.referential, connection_link], :styleMap => StyleMap::ConnectionLinkStyleMap.new.style_map))
+ page << map.add_layer( kml_layer([connection_link.referential, connection_link], :styleMap => StyleMap::ConnectionLinkStyleMap.new(helpers).style_map))
page << map.add_control( hover_control_display_name(:stop_areas_layer) )
page << map.zoom_to_extent(bounds.to_google.to_openlayers) if bounds
end
diff --git a/app/maps/group_of_line_map.rb b/app/maps/group_of_line_map.rb
new file mode 100644
index 000000000..fdd8cac1d
--- /dev/null
+++ b/app/maps/group_of_line_map.rb
@@ -0,0 +1,34 @@
+class GroupOfLineMap < ApplicationMap
+
+ attr_reader :group_of_line, :group_of_line_style
+
+ def initialize(group_of_line, group_of_line_style = nil)
+ @group_of_line = group_of_line
+ @group_of_line_style = group_of_line_style
+ end
+
+ def map
+ @map ||= MapLayers::Map.new(id, :projection => projection("EPSG:900913"), :controls => controls) do |map, page|
+ page << map.add_layer(MapLayers::OSM_MAPNIK)
+ page << map.add_layer(google_physical)
+ page << map.add_layer(google_streets)
+ page << map.add_layer(google_hybrid)
+ page << map.add_layer(google_satellite)
+
+ page.assign "stop_areas_layer", kml_layer([group_of_line.referential, group_of_line], :styleMap => StyleMap::StopAreasStyleMap.new(helpers).style_map)
+
+ page << map.add_layer(:stop_areas_layer)
+ page << map.add_control( hover_control_display_name(:stop_areas_layer) )
+ page << map.zoom_to_extent(bounds.to_google.to_openlayers) if bounds
+ end
+ end
+
+ def bounds
+ @bounds ||= GeoRuby::SimpleFeatures::Point.bounds(group_of_line.stop_areas.collect(&:geometry).compact)
+ end
+
+ def ready?
+ Chouette::StopArea.bounds.present?
+ end
+
+end
diff --git a/app/maps/stop_area_map.rb b/app/maps/stop_area_map.rb
index a1cae955c..ab254bf73 100644
--- a/app/maps/stop_area_map.rb
+++ b/app/maps/stop_area_map.rb
@@ -12,13 +12,26 @@ class StopAreaMap < ApplicationMap
def customize_map(map, page)
page.assign "edit_stop_area_layer", kml_layer(stop_area, { :default => editable? }, :style_map => StyleMap::EditStopAreaStyleMap.new(helpers).style_map)
page << map.add_layer(:edit_stop_area_layer)
+
+ if stop_area.children.present?
+ page.assign "children_layer", kml_layer(stop_area, { :children => true }, :style_map => StyleMap::StopAreasStyleMap.new(helpers).style_map)
+ page << map.add_layer(:children_layer)
+ end
+ if stop_area.routing_stops.present?
+ page.assign "routing_layer", kml_layer(stop_area, { :routing => true }, :style_map => StyleMap::StopAreasStyleMap.new(helpers).style_map)
+ page << map.add_layer(:routing_layer)
+ page << map.add_control( hover_control_display_name(:routing_layer) )
+ page << map.zoom_to_extent(bounds.to_google.to_openlayers) if bounds
+ else
+ page.assign "edit_stop_area_layer", kml_layer(stop_area, { :default => editable? }, :style_map => StyleMap::EditStopAreaStyleMap.new(helpers).style_map)
+ page << map.add_layer(:edit_stop_area_layer)
- if editable?
- page.assign "referential_projection", projection_type.present? ? projection("EPSG:" + projection_type) : JsVar.new("undefined")
- # TODO virer ce code inline
- page << <<EOF
- edit_stop_area_layer.events.on({
+ if editable?
+ page.assign "referential_projection", projection_type.present? ? projection("EPSG:" + projection_type) : JsVar.new("undefined")
+ # TODO virer ce code inline
+ page << <<EOF
+ edit_stop_area_layer.events.on({
'afterfeaturemodified': function(event) {
geometry = event.feature.geometry.clone().transform(new OpenLayers.Projection("EPSG:900913"), new OpenLayers.Projection("EPSG:4326"));
$('#stop_area_longitude').val(geometry.x);
@@ -32,11 +45,14 @@ class StopAreaMap < ApplicationMap
}
});
EOF
- page << map.add_control(OpenLayers::Control::ModifyFeature.new(:edit_stop_area_layer, :mode => 8, :autoActivate => true))
+ page << map.add_control(OpenLayers::Control::ModifyFeature.new(:edit_stop_area_layer, :mode => 8, :autoActivate => true))
+ elsif stop_area.children.present?
+ page << map.add_control( hover_control_display_name(:children_layer) )
- end
+ end
page << map.set_center(center.to_google.to_openlayers, 16, false, true)
+ end
end
def projection_type
@@ -51,4 +67,9 @@ EOF
stop_area.geometry or stop_area.default_position
end
+ def bounds
+ # for ITL only
+ @bounds ||= GeoRuby::SimpleFeatures::Point.bounds(stop_area.routing_stops.collect(&:geometry).compact)
+ end
+
end
diff --git a/app/maps/style_map/access_link_style_map.rb b/app/maps/style_map/access_link_style_map.rb
new file mode 100644
index 000000000..07ef5952b
--- /dev/null
+++ b/app/maps/style_map/access_link_style_map.rb
@@ -0,0 +1,43 @@
+class StyleMap::AccessLinkStyleMap < StyleMap::GenericStyleMap
+ attr_accessor :style
+
+ def initialize(helpers,options = {})
+ @helpers= helpers
+ @style = options[:style].present? ? default_style.merge(options[:style]) : default_style
+ end
+
+ def default_style
+ {
+ :fontColor => "black",
+ :fontSize => "11px",
+ :fontWeight => "bold",
+ :labelAlign => "ct",
+ :labelXOffset => 0,
+ :labelYOffset => -10,
+ :strokeColor => "#000000",
+ :strokeOpacity => 1,
+ :strokeWidth => 3,
+ :strokeLineCap => "round",
+ :strokeDashstyle => "solid",
+ :externalGraphic => @helpers.assets_path_patch( "map/${positionType}.png"),
+ :graphicWidth => 36,
+ :graphicHeight => 36,
+ :graphicOpacity => 1,
+ :graphicXOffset => -18,
+ :graphicYOffset => -18,
+ :display => true
+ }
+ end
+
+ def context
+ context = {
+ :positionType => :" function(feature) { if (feature.attributes.departure != undefined) { return 'departure'; } else { return 'arrival'; }} "
+ }
+ end
+
+ def style_map
+ OpenLayers::StyleMap.new(:default => OpenLayers::Style.new(style, { :context => context}))
+ end
+
+end
+
diff --git a/app/maps/style_map/access_points_style_map.rb b/app/maps/style_map/access_points_style_map.rb
new file mode 100644
index 000000000..57cf8dfb3
--- /dev/null
+++ b/app/maps/style_map/access_points_style_map.rb
@@ -0,0 +1,58 @@
+class StyleMap::AccessPointsStyleMap < StyleMap::GenericStyleMap
+ attr_accessor :style, :context, :temporary
+
+ def default_style
+ raise "Helpers nil" if @helpers.nil?
+ {:label => "${label}",
+ :fontColor => "black",
+ :fontSize => "11px",
+ :fontWeight => "bold",
+ :labelAlign => "ct",
+ :labelXOffset => 0,
+ :labelYOffset => -20,
+ :pointRadius => 1,
+ :externalGraphic => @helpers.assets_path_patch( "map/access_${accessType}.png"),
+ :graphicWidth => 25,
+ :graphicHeight => 25,
+ :graphicOpacity => 1,
+ :graphicXOffset => -12.5,
+ :graphicYOffset => -12.5 }
+ end
+ def temporary_style
+ raise "Helpers nil" if @helpers.nil?
+ {:label => "${label}",
+ :fontColor => "darkblue",
+ :fontSize => "12px",
+ :fontWeight => "bold",
+ :labelAlign => "ct",
+ :labelXOffset => 0,
+ :labelYOffset => -20,
+ :pointRadius => 1,
+ :externalGraphic => @helpers.assets_path_patch( "map/access_${accessType}.png"),
+ :graphicWidth => 25,
+ :graphicHeight => 25,
+ :graphicOpacity => 1,
+ :graphicXOffset => -12.5,
+ :graphicYOffset => -12.5 }
+ end
+
+ def initialize(helpers,options = {})
+ @helpers= helpers
+ @style = options[:style].present? ? default_style.merge(options[:style]) : default_style
+ @temporary = options[:style].present? ? temporary_style.merge(options[:style]) : temporary_style
+ end
+
+
+ def context
+ {
+ :label => :" function(feature) {if(feature.layer.map.getZoom() > 13) { return feature.attributes.name;} else {return '';}} ",
+ :accessType => :" function(feature) { return feature.attributes.access_point_type.toLowerCase();} "
+ }
+ end
+
+ def style_map
+ OpenLayers::StyleMap.new(:default => OpenLayers::Style.new(style, { :context => context}),
+ :temporary => OpenLayers::Style.new(temporary, { :context => context}) )
+ end
+
+end
diff --git a/app/maps/style_map/edit_access_point_style_map.rb b/app/maps/style_map/edit_access_point_style_map.rb
new file mode 100644
index 000000000..83f9298e8
--- /dev/null
+++ b/app/maps/style_map/edit_access_point_style_map.rb
@@ -0,0 +1,46 @@
+class StyleMap::EditAccessPointStyleMap < StyleMap::GenericStyleMap
+ attr_accessor :style
+
+ def default_style
+ { :fontColor => "black",
+ :fontSize => "11px",
+ :fontWeight => "bold",
+ :labelAlign => "ct",
+ :labelXOffset => 0,
+ :labelYOffset => -15,
+ :pointRadius => 4,
+ :fillColor => "white",
+ :fillOpacity => 1,
+ :strokeColor => "black",
+ :strokeOpacity => 1,
+ :strokeWidth => 2 }
+ end
+
+ def select_style
+ { :fontColor => "black",
+ :fontSize => "11px",
+ :fontWeight => "bold",
+ :pointRadius => 4,
+ :fillColor => "#86b41d",
+ :fillOpacity => 1,
+ :strokeColor => "black",
+ :strokeOpacity => 1,
+ :strokeWidth => 2 }
+ end
+
+ def initialize(helpers, options = {})
+ @helpers= helpers
+ @style = options[:style].present? ? default_style.merge(options[:style]) : default_style
+ end
+
+ def context
+ {
+ :label => :" function(feature) {if(feature.layer.map.getZoom() > 13) { return feature.attributes.name;} else {return '';}} "
+ }
+ end
+
+ def style_map
+ OpenLayers::StyleMap.new(:default => OpenLayers::Style.new(style, { :context => context}), :select => OpenLayers::Style.new(style.merge( select_style), { :context => context}))
+ end
+
+end
diff --git a/app/maps/style_map/stop_areas_style_map.rb b/app/maps/style_map/stop_areas_style_map.rb
index 398748a22..f23b58136 100644
--- a/app/maps/style_map/stop_areas_style_map.rb
+++ b/app/maps/style_map/stop_areas_style_map.rb
@@ -1,5 +1,5 @@
class StyleMap::StopAreasStyleMap < StyleMap::GenericStyleMap
- attr_accessor :style, :context
+ attr_accessor :style, :context, :temporary
def default_style
raise "Helpers nil" if @helpers.nil?
@@ -9,7 +9,7 @@ class StyleMap::StopAreasStyleMap < StyleMap::GenericStyleMap
:fontWeight => "bold",
:labelAlign => "ct",
:labelXOffset => 0,
- :labelYOffset => -40,
+ :labelYOffset => -20,
:pointRadius => 1,
:externalGraphic => @helpers.assets_path_patch( "map/${areaType}.png"),
:graphicWidth => 25,
@@ -18,10 +18,29 @@ class StyleMap::StopAreasStyleMap < StyleMap::GenericStyleMap
:graphicXOffset => -12.5,
:graphicYOffset => -12.5 }
end
+ def temporary_style
+ raise "Helpers nil" if @helpers.nil?
+ {:label => "${label}",
+ :fontColor => "darkblue",
+ :fontSize => "12px",
+ :fontWeight => "bold",
+ :labelAlign => "ct",
+ :labelXOffset => 0,
+ :labelYOffset => -20,
+ :pointRadius => 1,
+ :externalGraphic => @helpers.assets_path_patch( "map/${areaType}.png"),
+ :graphicWidth => 25,
+ :graphicHeight => 25,
+ :graphicOpacity => 1,
+ :graphicXOffset => -12.5,
+ :graphicYOffset => -12.5 }
+ end
+
def initialize(helpers,options = {})
@helpers= helpers
@style = options[:style].present? ? default_style.merge(options[:style]) : default_style
+ @temporary = options[:style].present? ? temporary_style.merge(options[:style]) : temporary_style
end
@@ -33,7 +52,8 @@ class StyleMap::StopAreasStyleMap < StyleMap::GenericStyleMap
end
def style_map
- OpenLayers::StyleMap.new(:default => OpenLayers::Style.new(style, { :context => context}) )
+ OpenLayers::StyleMap.new(:default => OpenLayers::Style.new(style, { :context => context}),
+ :temporary => OpenLayers::Style.new(temporary, { :context => context}) )
end
end
diff --git a/app/models/access_link_pair.rb b/app/models/access_link_pair.rb
new file mode 100644
index 000000000..16df48fd5
--- /dev/null
+++ b/app/models/access_link_pair.rb
@@ -0,0 +1,45 @@
+class AccessLinkPair
+ include ActiveModel::Validations
+ include ActiveModel::Conversion
+ extend ActiveModel::Naming
+
+
+ attr_accessor :from_access_point, :to_access_point
+
+ validates_presence_of :from_access_point, :to_access_point
+
+ def initialize(attributes = {})
+ attributes.each do |name, value|
+ send("#{name}=", value)
+ end
+ end
+
+ def persisted?
+ false
+ end
+
+ def access_point
+ return nil if from_access_point.nil?
+ from_access_point.access_point
+ end
+
+ def stop_area
+ return nil if from_access_point.nil?
+ from_access_point.stop_area
+ end
+
+ def in_valid?
+ access_point.access_point_type != "out"
+ end
+
+ def out_valid?
+ access_point.access_point_type != "in"
+ end
+
+ def in_exists?
+ !from_access_point.id.nil?
+ end
+ def out_exists?
+ !to_access_point.id.nil?
+ end
+end
diff --git a/app/models/api/v1/api_key.rb b/app/models/api/v1/api_key.rb
new file mode 100644
index 000000000..2c1b9ba5f
--- /dev/null
+++ b/app/models/api/v1/api_key.rb
@@ -0,0 +1,30 @@
+module Api
+ module V1
+ class ApiKey < ::ActiveRecord::Base
+ before_create :generate_access_token
+ belongs_to :referential, :class_name => '::Referential'
+
+ def self.model_name
+ ActiveModel::Name.new self, Api::V1, self.name.demodulize
+ end
+
+ def eql?(other)
+ other.token == self.token
+ end
+
+ def self.referential_from_token(token)
+ array = token.split('-')
+ return nil unless array.size==2
+ ::Referential.find( array.first)
+ end
+
+ private
+ def generate_access_token
+ begin
+ self.token = "#{referential.id}-#{SecureRandom.hex}"
+ end while self.class.exists?(:token => self.token)
+ end
+ end
+ end
+end
+
diff --git a/app/models/clean_up.rb b/app/models/clean_up.rb
index 5b3d346ff..70c763146 100644
--- a/app/models/clean_up.rb
+++ b/app/models/clean_up.rb
@@ -4,7 +4,8 @@ class CleanUp
extend ActiveModel::Naming
- attr_accessor :expected_date, :keep_lines, :keep_stops , :keep_companies, :keep_networks
+ attr_accessor :expected_date, :keep_lines, :keep_stops , :keep_companies
+ attr_accessor :keep_networks, :keep_group_of_lines
validates_presence_of :expected_date
@@ -19,32 +20,33 @@ class CleanUp
end
def clean
+ # as foreign keys are presents , delete method can be used for faster performance
result = CleanUpResult.new
# find and remove time_tables
- tms = Chouette::TimeTable.expired_on(Date.parse(expected_date))
+ tms = Chouette::TimeTable.validity_out_from_on?(Date.parse(expected_date))
result.time_table_count = tms.size
tms.each do |tm|
- tm.destroy
+ tm.delete
end
# remove vehiclejourneys without timetables
Chouette::VehicleJourney.find_each(:conditions => "id not in (select distinct vehicle_journey_id from time_tables_vehicle_journeys)") do |vj|
if vj.time_tables.size == 0
result.vehicle_journey_count += 1
- vj.destroy
+ vj.delete
end
end
# remove journeypatterns without vehicle journeys
Chouette::JourneyPattern.find_each(:conditions => "id not in (select distinct journey_pattern_id from vehicle_journeys)") do |jp|
if jp.vehicle_journeys.size == 0
result.journey_pattern_count += 1
- jp.destroy
+ jp.delete
end
end
# remove routes without journeypatterns
Chouette::Route.find_each(:conditions => "id not in (select distinct route_id from journey_patterns)") do |r|
if r.journey_patterns.size == 0
result.route_count += 1
- r.destroy
+ r.delete
end
end
# if asked remove lines without routes
@@ -52,7 +54,7 @@ class CleanUp
Chouette::Line.find_each(:conditions => "id not in (select distinct line_id from routes)") do |l|
if l.routes.size == 0
result.line_count += 1
- l.destroy
+ l.delete
end
end
end
@@ -61,31 +63,31 @@ class CleanUp
Chouette::StopArea.find_each(:conditions => { :area_type => "BoardingPosition" }) do |bp|
if bp.stop_points.size == 0
result.stop_count += 1
- bp.destroy
+ bp.delete
end
end
Chouette::StopArea.find_each(:conditions => { :area_type => "Quay" }) do |q|
if q.stop_points.size == 0
result.stop_count += 1
- q.destroy
+ q.delete
end
end
Chouette::StopArea.find_each(:conditions => { :area_type => "CommercialStopPoint" }) do |csp|
if csp.children.size == 0
result.stop_count += 1
- csp.destroy
+ csp.delete
end
end
Chouette::StopArea.find_each(:conditions => { :area_type => "StopPlace" }) do |sp|
if sp.children.size == 0
result.stop_count += 1
- sp.destroy
+ sp.delete
end
end
Chouette::StopArea.find_each(:conditions => { :area_type => "ITL" }) do |itl|
if itl.routing_stops.size == 0
result.stop_count += 1
- itl.destroy
+ itl.delete
end
end
end
@@ -94,7 +96,7 @@ class CleanUp
Chouette::Company.find_each do |c|
if c.lines.size == 0
result.company_count += 1
- c.destroy
+ c.delete
end
end
end
@@ -104,7 +106,17 @@ class CleanUp
Chouette::Network.find_each do |n|
if n.lines.size == 0
result.network_count += 1
- n.destroy
+ n.delete
+ end
+ end
+ end
+
+ # if asked remove group_of_lines without lines
+ if keep_group_of_lines == "0"
+ Chouette::GroupOfLine.find_each do |n|
+ if n.lines.size == 0
+ result.group_of_line_count += 1
+ n.delete
end
end
end
diff --git a/app/models/clean_up_result.rb b/app/models/clean_up_result.rb
index 9151decaf..92f326c0f 100644
--- a/app/models/clean_up_result.rb
+++ b/app/models/clean_up_result.rb
@@ -3,7 +3,7 @@ class CleanUpResult
extend ActiveModel::Naming
attr_accessor :time_table_count,:vehicle_journey_count,:journey_pattern_count,:route_count,:line_count
- attr_accessor :stop_count,:company_count,:network_count
+ attr_accessor :stop_count,:company_count,:network_count,:group_of_line_count
def initialize()
self.time_table_count = 0
@@ -14,6 +14,7 @@ class CleanUpResult
self.stop_count = 0
self.company_count = 0
self.network_count = 0
+ self.group_of_line_count = 0
end
def persisted?
@@ -41,6 +42,9 @@ class CleanUpResult
if (network_count > 0)
a << I18n.t('clean_ups.success_n', :count => network_count.to_s)
end
+ if (group_of_line_count > 0)
+ a << I18n.t('clean_ups.success_g', :count => group_of_line_count.to_s)
+ end
if (stop_count > 0)
a << I18n.t('clean_ups.success_sa', :count => stop_count.to_s)
end
diff --git a/app/models/export.rb b/app/models/export.rb
index 73694239b..d8c7820be 100644
--- a/app/models/export.rb
+++ b/app/models/export.rb
@@ -136,12 +136,20 @@ class Export < ActiveRecord::Base
read_attribute :reference_ids
end
+ def self.format_name(format)
+ name_by_format = { "NeptuneExport" => "Neptune",
+ "CsvExport" => "CSV",
+ "GtfsExport" => "GTFS",
+ "NetexExport" => "NeTEx"}
+ name_by_format[format]
+ end
+
def self.types
unless Rails.env.development?
subclasses.map(&:to_s)
else
# FIXME
- %w{NeptuneExport CsvExport GtfsExport}
+ %w{NeptuneExport CsvExport GtfsExport NetexExport}
end
end
diff --git a/app/models/gtfs_import.rb b/app/models/gtfs_import.rb
new file mode 100644
index 000000000..a332fe65e
--- /dev/null
+++ b/app/models/gtfs_import.rb
@@ -0,0 +1,18 @@
+class GtfsImport < Import
+
+ validates_presence_of :objectid_prefix
+ option :objectid_prefix
+ option :max_distance_for_commercial
+ option :ignore_last_word
+ option :ignore_end_chars
+ option :max_distance_for_connection_link
+
+ def import_options
+ super.merge(:format => :gtfs, :objectid_prefix => objectid_prefix,
+ :max_distance_for_commercial => max_distance_for_commercial,
+ :ignore_last_word => ignore_last_word,
+ :ignore_end_chars => ignore_end_chars,
+ :max_distance_for_connection_link => max_distance_for_connection_link)
+ end
+
+end
diff --git a/app/models/help_page.rb b/app/models/help_page.rb
index 28d9e22b2..ea9d34e44 100644
--- a/app/models/help_page.rb
+++ b/app/models/help_page.rb
@@ -1,3 +1,4 @@
+#encoding: utf-8
class HelpPage
attr_accessor :slug, :content, :data
@@ -44,8 +45,12 @@ class HelpPage
self.content = self.content.gsub('ç','&ccedil;')
self.content = self.content.gsub('oe','&oelig;')
self.content = self.content.gsub('<<','&laquo;')
+ self.content = self.content.gsub('«','&laquo;')
self.content = self.content.gsub('>>','&raquo;')
+ self.content = self.content.gsub('»','&raquo;')
self.content = self.content.gsub('°','&ordm;')
+ self.content = self.content.gsub('’',"'")
+ self.content = self.content.gsub(' '," ")
end
def method_missing(method, *arguments)
diff --git a/app/models/import.rb b/app/models/import.rb
index b898cc8e3..bd795d6ce 100644
--- a/app/models/import.rb
+++ b/app/models/import.rb
@@ -25,6 +25,14 @@ class Import < ActiveRecord::Base
end
end
+ def self.format_name(format)
+ name_by_format = { "NeptuneImport" => "Neptune",
+ "CsvImport" => "CSV",
+ "GtfsImport" => "GTFS",
+ "NetexImport" => "NeTEx"}
+ name_by_format[format]
+ end
+
def self.types
# if Rails.env.development? and subclasses.blank?
# Dir[File.expand_path("../*_import.rb", __FILE__)].each do |f|
@@ -36,7 +44,7 @@ class Import < ActiveRecord::Base
subclasses.map(&:to_s)
else
# FIXME
- %w{NeptuneImport CsvImport}
+ %w{NeptuneImport CsvImport GtfsImport NetexImport}
end
end
@@ -88,7 +96,7 @@ class Import < ActiveRecord::Base
end
def name
- "#{Import.model_name.humanize} #{id}"
+ "#{self.class.model_name.human} #{id}"
end
def import_options
diff --git a/app/models/netex_export.rb b/app/models/netex_export.rb
new file mode 100644
index 000000000..c29ef2b45
--- /dev/null
+++ b/app/models/netex_export.rb
@@ -0,0 +1,7 @@
+class NetexExport < Export
+
+ def export_options
+ super.merge(:format => :netex)
+ end
+
+end
diff --git a/app/models/netex_import.rb b/app/models/netex_import.rb
new file mode 100644
index 000000000..74e76e47c
--- /dev/null
+++ b/app/models/netex_import.rb
@@ -0,0 +1,7 @@
+class NetexImport < Import
+
+ def import_options
+ super.merge(:format => :netex)
+ end
+
+end
diff --git a/app/models/referential.rb b/app/models/referential.rb
index ab4290cdd..2e49e844b 100644
--- a/app/models/referential.rb
+++ b/app/models/referential.rb
@@ -20,6 +20,7 @@ class Referential < ActiveRecord::Base
has_many :imports, :dependent => :destroy
has_many :exports, :dependent => :destroy
+ has_many :api_keys, :class_name => 'Api::V1::ApiKey', :dependent => :destroy
belongs_to :organisation
validates_presence_of :organisation
@@ -47,6 +48,10 @@ class Referential < ActiveRecord::Base
Chouette::Network.scoped
end
+ def group_of_lines
+ Chouette::GroupOfLine.scoped
+ end
+
def companies
Chouette::Company.scoped
end
@@ -55,6 +60,14 @@ class Referential < ActiveRecord::Base
Chouette::StopArea.scoped
end
+ def access_points
+ Chouette::AccessPoint.scoped
+ end
+
+ def access_links
+ Chouette::AccessLink.scoped
+ end
+
def time_tables
Chouette::TimeTable.scoped
end
@@ -206,4 +219,31 @@ Rails.application.config.after_initialize do
end
end
end
+
+ Chouette::AccessPoint
+
+ class Chouette::AccessPoint
+
+ # add projection_type set on pre-insert and pre_update action
+ before_validation :set_projections
+ def set_projections
+ if ! self.latitude.nil? && ! self.longitude.nil?
+ self.long_lat_type = 'WGS84'
+ else
+ self.long_lat_type = nil
+ end
+ if ! self.referential.projection_type.nil? && !self.referential.projection_type.empty?
+ if ! self.x.nil? && ! self.y.nil?
+ self.projection_type = referential.projection_type_label
+ else
+ self.projection_type = nil
+ end
+ else
+ self.projection_type = nil
+ self.x = nil
+ self.y = nil
+ end
+ end
+ end
+
end
diff --git a/app/models/subscription.rb b/app/models/subscription.rb
index 8b2b025de..c0d42732b 100644
--- a/app/models/subscription.rb
+++ b/app/models/subscription.rb
@@ -5,6 +5,12 @@ class Subscription
attr_accessor :organisation_name, :user_name, :email, :password, :password_confirmation
+ validates_presence_of :organisation_name
+ validates_presence_of :user_name
+ validates_presence_of :email
+ validates_presence_of :password
+ validates_presence_of :password_confirmation
+
def initialize(attributes = {})
attributes.each do |name, value|
send("#{name}=", value)
@@ -16,7 +22,7 @@ class Subscription
end
def user
- @user ||= organisation.users.build :email => email, :password => password, :password_confirmation => password_confirmation
+ @user ||= organisation.users.build :name => user_name,:email => email, :password => password, :password_confirmation => password_confirmation
end
def organisation
@@ -28,6 +34,7 @@ class Subscription
self.errors.add( :organisation_name, organisation.errors[:name]) if organisation.errors[:name]
end
unless user.valid?
+ self.errors.add( :user_name, user.errors[:name]) if user.errors[:name]
self.errors.add( :password, user.errors[:password]) if user.errors[:password]
self.errors.add( :email, user.errors[:email]) if user.errors[:email]
end
diff --git a/app/models/test_sheet_page.rb b/app/models/test_sheet_page.rb
index da808f411..880e28c76 100644
--- a/app/models/test_sheet_page.rb
+++ b/app/models/test_sheet_page.rb
@@ -1,3 +1,4 @@
+#encoding: utf-8
class TestSheetPage
attr_accessor :slug, :content, :data
diff --git a/app/models/user.rb b/app/models/user.rb
index 480efa2f9..f88fbfd41 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -9,6 +9,9 @@ class User < ActiveRecord::Base
attr_accessible :email, :password, :password_confirmation, :remember_me, :name
belongs_to :organisation
+
+ validates_presence_of :email
+ validates_presence_of :password
before_validation(:on => :create) do
self.password ||= Devise.friendly_token.first(6)
diff --git a/app/views/access_link_pairs/_access_link_pair.html.erb b/app/views/access_link_pairs/_access_link_pair.html.erb
new file mode 100644
index 000000000..588b276b9
--- /dev/null
+++ b/app/views/access_link_pairs/_access_link_pair.html.erb
@@ -0,0 +1,57 @@
+<%= div_for(access_link_pair) do %>
+ <tr>
+ <td class="link">
+ <div class="access_point">
+ <%= link_to([@referential, @stop_area, access_link_pair.access_point]) do %>
+ <%= image_tag "map/access_" + access_link_pair.access_point.access_point_type + ".png" %><span><%= access_link_pair.access_point.name %></span>
+ <% end %>
+ </div>
+ <br/><br/>
+ <div class="info">
+ <%= t("access_types.label.#{access_link_pair.access_point.access_point_type}") %>
+ </div>
+ </td>
+ <td>
+ <% if access_link_pair.out_valid? %>
+ <% if access_link_pair.out_exists? %>
+ <%= link_to(referential_access_point_access_link_path(@referential, access_link_pair.access_point,:access_link => {:stop_area_id => access_link_pair.stop_area.id, :link_orientation_type => 'stop_area_to_access_point'})) do %>
+ <%= image_tag "icons/green_left_arrow.png" %>
+ <% end %>
+ <% else %>
+ <%= link_to(new_referential_access_point_access_link_path(@referential, access_link_pair.access_point, :access_link => {:stop_area_id => access_link_pair.stop_area.id, :link_orientation_type => 'stop_area_to_access_point'})) do %>
+ <%= image_tag "icons/gray_left_arrow.png" %>
+ <% end %>
+ <% end %>
+ <% else %>
+ <%= image_tag "icons/disabled_left_arrow.png" %>
+ <% end %>
+ </td>
+ <td>
+ <% if access_link_pair.in_valid? %>
+ <% if access_link_pair.in_exists? %>
+ <%= link_to(referential_access_point_access_link_path(@referential, access_link_pair.access_point, access_link_pair.from_access_point)) do %>
+ <%= image_tag "icons/green_right_arrow.png" %>
+ <% end %>
+ <% else %>
+ <%= link_to(new_referential_access_point_access_link_path(@referential, access_link_pair.access_point, :access_link => {:stop_area_id => access_link_pair.stop_area.id, :link_orientation_type => 'access_point_to_stop_area'})) do %>
+ <%= image_tag "icons/gray_right_arrow.png" %>
+ <% end %>
+ <% end %>
+ <% else %>
+ <%= image_tag "icons/disabled_right_arrow.png" %>
+ <% end %>
+ </td>
+ <td class="link">
+ <div class="stop_area">
+ <%= link_to([@referential, access_link_pair.stop_area]) do %>
+ <%= image_tag "map/" + access_link_pair.stop_area.stop_area_type + ".png" %><span><%= access_link_pair.stop_area.name %></span>
+ <% end %>
+ </div>
+ <br/><br/>
+ <div class="info">
+ <%= t("area_types.label.#{access_link_pair.stop_area.stop_area_type}") %>
+ </div>
+ </td>
+ </tr>
+ <tr><td colspan=4>&nbsp;</td></tr>
+<% end %>
diff --git a/app/views/access_links/_form.html.erb b/app/views/access_links/_form.html.erb
new file mode 100644
index 000000000..147686930
--- /dev/null
+++ b/app/views/access_links/_form.html.erb
@@ -0,0 +1,37 @@
+<%= semantic_form_for [@referential,@access_point,@access_link] do |form| %>
+ <%= form.inputs do %>
+ <%= form.input :access_point_id , :as => :hidden %>
+ <%= form.input :stop_area_id , :as => :hidden %>
+ <%= form.input :link_orientation_type , :as => :hidden%>
+ <%= form.input :name %>
+ <%= form.input :access_link_type, :as => :select, :collection => Chouette::AccessLink.access_link_types, :include_blank => false, :member_label => Proc.new { |type| t("connection_link_types.label.#{type}") } %>
+ <%= form.input :comment %>
+ <%= form.input :link_distance %>
+ <%= form.inputs :name => t('access_links.show.durations') do %>
+ <%= form.input "default_duration(1i)", :as => :hidden ,:input_html => { :value => "2000" } %>
+ <%= form.input "default_duration(2i)", :as => :hidden ,:input_html => { :value => "1" } %>
+ <%= form.input "default_duration(3i)", :as => :hidden ,:input_html => { :value => "1" } %>
+ <%= form.input :default_duration, :ignore_date=>true,:include_seconds=>true, :label => @access_link.human_attribute_name("default_duration")%>
+ <%= form.input "frequent_traveller_duration(1i)", :as => :hidden ,:input_html => { :value => "2000" } %>
+ <%= form.input "frequent_traveller_duration(2i)", :as => :hidden ,:input_html => { :value => "1" } %>
+ <%= form.input "frequent_traveller_duration(3i)", :as => :hidden ,:input_html => { :value => "1" } %>
+ <%= form.input :frequent_traveller_duration, :ignore_date=>true,:include_seconds=>true, :label => @access_link.human_attribute_name("frequent_traveller_duration")%>
+ <%= form.input "occasional_traveller_duration(1i)", :as => :hidden ,:input_html => { :value => "2000" } %>
+ <%= form.input "occasional_traveller_duration(2i)", :as => :hidden ,:input_html => { :value => "1" } %>
+ <%= form.input "occasional_traveller_duration(3i)", :as => :hidden ,:input_html => { :value => "1" } %>
+ <%= form.input :occasional_traveller_duration, :ignore_date=>true,:include_seconds=>true, :label => @access_link.human_attribute_name("occasional_traveller_duration")%>
+ <%= form.input "mobility_restricted_traveller_duration(1i)", :as => :hidden ,:input_html => { :value => "2000" } %>
+ <%= form.input "mobility_restricted_traveller_duration(2i)", :as => :hidden ,:input_html => { :value => "1" } %>
+ <%= form.input "mobility_restricted_traveller_duration(3i)", :as => :hidden ,:input_html => { :value => "1" } %>
+ <%= form.input :mobility_restricted_traveller_duration, :ignore_date=>true,:include_seconds=>true, :label => @access_link.human_attribute_name("mobility_restricted_traveller_duration")%>
+ <% end %>
+ <%= form.input :mobility_restricted_suitability,:as => :boolean %>
+ <%= form.input :stairs_availability,:as => :boolean %>
+ <%= form.input :lift_availability,:as => :boolean %>
+ <%= form.input :objectid, :required => !@access_link.new_record?, :input_html => { :disabled => !@access_link.new_record? } %>
+ <% end %>
+ <%= form.actions do %>
+ <%= form.action :submit, :as => :button %>
+ <%= form.action :cancel, :as => :link %>
+ <% end %>
+<% end %>
diff --git a/app/views/access_links/edit.html.erb b/app/views/access_links/edit.html.erb
new file mode 100644
index 000000000..c954989f1
--- /dev/null
+++ b/app/views/access_links/edit.html.erb
@@ -0,0 +1,4 @@
+<%= title_tag t("access_links.edit.title_#{@orientation}", :access_point => @access_point.name, :stop_area => @stop_area.name ) %>
+
+
+<%= render "form" %>
diff --git a/app/views/access_links/new.html.erb b/app/views/access_links/new.html.erb
new file mode 100644
index 000000000..db9a611a5
--- /dev/null
+++ b/app/views/access_links/new.html.erb
@@ -0,0 +1,3 @@
+<%= title_tag t("access_links.new.title_#{@orientation}", :access_point => @access_point.name, :stop_area => @stop_area.name ) %>
+
+<%= render "form" %>
diff --git a/app/views/access_links/show.html.erb b/app/views/access_links/show.html.erb
new file mode 100644
index 000000000..a318a84c6
--- /dev/null
+++ b/app/views/access_links/show.html.erb
@@ -0,0 +1,84 @@
+<%= title_tag t('access_links.show.title', :access_link => @access_link.name ) %>
+
+<div class="access_link_show">
+ <%= @map.to_html %>
+
+ <div class="summary">
+ <p>
+ <label><%= @access_link.human_attribute_name(:access_point) %>: </label>
+ <%= link_to @access_link.access_point.name, [@referential, @access_link.access_point.stop_area, @access_link.access_point] %>
+ </p>
+ <p>
+ <label><%= @access_link.human_attribute_name(:stop_area) %>: </label>
+ <%= link_to @access_link.stop_area.name, [@referential, @access_link.stop_area] %>
+ </p>
+ <p>
+ <label><%= @access_link.human_attribute_name("name") %>: </label>
+ <%= @access_link.name %>
+ </p>
+ <p>
+ <label><%= @access_link.human_attribute_name("access_link_type") %>: </label>
+ <%= t("connection_link_types.label.#{@access_link.access_link_type}") %>
+ </p>
+ <p>
+ <label><%= @access_link.human_attribute_name("comment") %>: </label>
+ <%= @access_link.comment %>
+ </p>
+ <p>
+ <label><%= @access_link.human_attribute_name("link_distance") %>: </label>
+ <%= @access_link.link_distance %>
+ </p>
+ <p>
+ <label><%= t('access_links.show.durations') %> </label>
+ </p>
+ <p>
+ <label class='duration'><%= @access_link.human_attribute_name("default_duration") %>: </label>
+ <% if (@access_link.default_duration.present?) %>
+ <%= @access_link.default_duration.strftime('%Hh %Mm %Ss') %>
+ <% end %>
+ </p>
+ <p>
+ <label class='duration'><%= @access_link.human_attribute_name("frequent_traveller_duration") %>: </label>
+ <% if (@access_link.frequent_traveller_duration.present?) %>
+ <%= @access_link.frequent_traveller_duration.strftime('%Hh %Mm %Ss') %>
+ <% end %>
+ </p>
+ <p>
+ <label class='duration'><%= @access_link.human_attribute_name("occasional_traveller_duration") %>: </label>
+ <% if (@access_link.occasional_traveller_duration.present?) %>
+ <%= @access_link.occasional_traveller_duration.strftime('%Hh %Mm %Ss') %>
+ <% end %>
+ </p>
+ <p>
+ <label class='duration'><%= @access_link.human_attribute_name("mobility_restricted_traveller_duration") %>: </label>
+ <% if (@access_link.mobility_restricted_traveller_duration.present?) %>
+ <%= @access_link.mobility_restricted_traveller_duration.strftime('%Hh %Mm %Ss') %>
+ <% end %>
+ </p>
+ <p>
+ <label><%= @access_link.human_attribute_name("mobility_restricted_suitability") %>: </label>
+ <%= t((@access_link.mobility_restricted_suitability == true).to_s) %>
+ </p>
+ <p>
+ <label><%= @access_link.human_attribute_name("stairs_availability") %>: </label>
+ <%= t((@access_link.stairs_availability == true).to_s) %>
+ </p>
+ <p>
+ <label><%= @access_link.human_attribute_name("lift_availability") %>: </label>
+ <%= t((@access_link.lift_availability == true).to_s) %>
+ </p>
+ <p>
+ <label><%= @access_link.human_attribute_name("objectid") %>: </label>
+ <%= @access_link.objectid %>
+ </p>
+ </div>
+</div>
+
+<% content_for :sidebar do %>
+<ul class="actions">
+ <li><%= link_to t('access_links.actions.edit'), edit_referential_access_point_access_link_path(@referential, @access_link.access_point, @access_link), :class => "edit" %></li>
+ <li><%= link_to t('access_links.actions.destroy'), referential_access_point_access_link_path(@referential, @access_link.access_point, @access_link), :method => :delete, :data => {:confirm => t('access_links.actions.destroy_confirm')}, :class => "remove" %></li>
+ <br>
+</ul>
+ <%= creation_tag(@access_link) %>
+<% end %>
diff --git a/app/views/access_links/show.kml.erb b/app/views/access_links/show.kml.erb
new file mode 100644
index 000000000..25e4351b8
--- /dev/null
+++ b/app/views/access_links/show.kml.erb
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<kml xmlns="http://www.opengis.net/kml/2.2">
+ <Document>
+ <% if @access_link.geometry %>
+ <Placemark id="route_<%= @access_link.id %>" >
+ <name><%= @access_link.name %></name>
+ <%= @access_link.geometry.kml_representation.html_safe %>
+ </Placemark>
+ <Placemark id="<%= @access_link.access_point.id %>" >
+ <departure><%= @access_link.link_orientation_type == "access_point_to_stop_area" %></departure>
+ <%= @access_link.access_point.geometry.kml_representation.html_safe %>
+ </Placemark>
+ <Placemark id="<%= @access_link.stop_area.id %>" >
+ <arrival><%= @access_link.link_orientation_type == "access_point_to_stop_area" %></arrival>
+ <%= @access_link.stop_area.geometry.kml_representation.html_safe %>
+ </Placemark>
+ <% end %>
+ </Document>
+</kml>
+
diff --git a/app/views/access_points/_access_point.html.erb b/app/views/access_points/_access_point.html.erb
new file mode 100644
index 000000000..2890cc124
--- /dev/null
+++ b/app/views/access_points/_access_point.html.erb
@@ -0,0 +1,20 @@
+<%= div_for(access_point) do %>
+ <%= link_to([@referential, @stop_area, access_point], :class => "preview") do %>
+ <div class="access_point_type">
+ <%= image_tag "map/access_" + access_point.access_point_type + ".png" %>
+ </div>
+ <% end %>
+ <%= link_to access_point.name, [@referential, @stop_area, access_point] %>
+ <div class="info">
+ <p>
+ <% unless access_point.geometry %>
+ <span class="warning"><%= t('.no_position') %></span> -
+ <% end %>
+ </p>
+ <p><%= t("access_types.label.#{access_point.access_point_type}") %></p>
+ <div class="actions">
+ <%= link_to t("actions.edit"), edit_referential_stop_area_access_point_path(@referential, @stop_area, access_point), :class => "edit" %> |
+ <%= link_to t("actions.destroy"), referential_stop_area_access_point_path(@referential, @stop_area, access_point), :method => :delete, :data => {:confirm => t('access_points.actions.destroy_confirm')}, :class => "remove" %>
+ </div>
+ </div>
+<% end %>
diff --git a/app/views/access_points/_form.html.erb b/app/views/access_points/_form.html.erb
new file mode 100644
index 000000000..cd728f0d6
--- /dev/null
+++ b/app/views/access_points/_form.html.erb
@@ -0,0 +1,44 @@
+<%= semantic_form_for [@referential, @stop_area, @access_point] do |form| %>
+ <%= form.inputs do %>
+ <%= form.input :id, :as => :hidden %>
+ <%= form.input :name %>
+ <%= form.input :access_point_type, :as => :select, :input_html => { :disabled => !@access_point.new_record? },
+ :collection => Chouette::AccessPoint.access_point_types, :include_blank => false, :member_label => Proc.new { |access_point_type| t("access_types.label.#{access_point_type}") } %>
+ <%= form.input :street_name %>
+ <%= form.input :country_code %>
+ <%= form.input :comment %>
+ <%= form.inputs do %>
+ <%= form.input "openning_time(1i)", :as => :hidden ,:input_html => { :value => "2000" } %>
+ <%= form.input "openning_time(2i)", :as => :hidden ,:input_html => { :value => "1" } %>
+ <%= form.input "openning_time(3i)", :as => :hidden ,:input_html => { :value => "1" } %>
+ <%= form.input "openning_time(6i)", :as => :hidden ,:input_html => { :value => "0" } %>
+ <%= form.input :openning_time, :ignore_date=>true, :label => @access_point.human_attribute_name("openning_time")%>
+ <%= form.input "closing_time(1i)", :as => :hidden ,:input_html => { :value => "2000" } %>
+ <%= form.input "closing_time(2i)", :as => :hidden ,:input_html => { :value => "1" } %>
+ <%= form.input "closing_time(3i)", :as => :hidden ,:input_html => { :value => "1" } %>
+ <%= form.input "closing_time(6i)", :as => :hidden ,:input_html => { :value => "0" } %>
+ <%= form.input :closing_time, :ignore_date=>true, :label => @access_point.human_attribute_name("closing_time")%>
+ <% end %>
+ <%= form.input :mobility_restricted_suitability,:as => :boolean %>
+ <%= form.input :stairs_availability,:as => :boolean %>
+ <%= form.input :lift_availability,:as => :boolean %>
+ <%= form.input :objectid, :required => !@access_point.new_record?, :input_html => { :disabled => !@access_point.new_record? } %>
+ <%= form.inputs :name => t('access_points.show.geographic_data') do %>
+ <% if ! @referential.projection_type_label.empty? %>
+ <%= form.inputs :name => @referential.projection_type_label do %>
+ <%= form.input :x %>
+ <%= form.input :y %>
+ <% end %>
+ <% end %>
+ <%= form.inputs :name => "WGS84" do %>
+ <%= form.input :longitude %>
+ <%= form.input :latitude %>
+ <% end %>
+ <% end %>
+ <% end %>
+
+ <%= form.actions do %>
+ <%= form.action :submit, :as => :button %>
+ <%= form.action :cancel, :as => :link %>
+ <% end %>
+<% end %>
diff --git a/app/views/access_points/edit.html.erb b/app/views/access_points/edit.html.erb
new file mode 100644
index 000000000..e2e8636b3
--- /dev/null
+++ b/app/views/access_points/edit.html.erb
@@ -0,0 +1,5 @@
+<%= title_tag t('access_points.edit.title', :access_point => @access_point.name ) %>
+
+<%= @map.to_html %>
+
+<%= render "form" %>
diff --git a/app/views/access_points/index.html.erb b/app/views/access_points/index.html.erb
new file mode 100644
index 000000000..164169205
--- /dev/null
+++ b/app/views/access_points/index.html.erb
@@ -0,0 +1,26 @@
+<%= title_tag t('access_points.index.title', :stop_area => @stop_area.name) %>
+
+<%= search_form_for @q, :url => referential_stop_area_access_points_path(@referential,@stop_area), :html => {:method => :get} do |f| %>
+ <%= f.label :name_or_country_code_cont, "#{t('.name_or_country_code')} :" %>
+ <%= f.text_field :name_or_country_code_cont %>
+
+ <%= f.submit t('actions.search') %> <%= t("or") %>
+ <%= link_to t("cancel"), referential_stop_area_access_points_path(@referential,@stop_area) %>
+<% end %>
+
+<div class="page_info">
+ <span class="search"> <%= t("will_paginate.page_entries_info.search") %></span> <%= page_entries_info @access_points %>
+</div>
+<div class="access_points paginated_content">
+ <%= render :partial => "access_point", :collection => @access_points %>
+</div>
+<div class="pagination">
+ <%= will_paginate @access_points, :container => false %>
+</div>
+
+<% content_for :sidebar do %>
+<ul class="actions">
+ <li><%= link_to t('access_points.actions.new'), new_referential_stop_area_access_point_path(@referential,@stop_area), :class => "add" %></li>
+</ul>
+
+<% end %>
diff --git a/app/views/access_points/index.kml.erb b/app/views/access_points/index.kml.erb
new file mode 100644
index 000000000..bbcf19d23
--- /dev/null
+++ b/app/views/access_points/index.kml.erb
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<kml xmlns="http://www.opengis.net/kml/2.2">
+ <Document>
+ <% @access_points.where("latitude is not null and longitude is not null").each do |access_point| %>
+ <Placemark id="<%= access_point.id %>" >
+ <name><%= access_point.name %></name>
+ <access_point_type><%= access_pointaccess_point_type %></access_point_type>
+ <%= access_point.geometry.kml_representation.html_safe %>
+ </Placemark>
+ <% end %>
+ </Document>
+</kml>
diff --git a/app/views/access_points/new.html.erb b/app/views/access_points/new.html.erb
new file mode 100644
index 000000000..3b9c8a397
--- /dev/null
+++ b/app/views/access_points/new.html.erb
@@ -0,0 +1,3 @@
+<%= title_tag t('access_points.new.title') %>
+
+<%= render "form" %>
diff --git a/app/views/access_points/show.html.erb b/app/views/access_points/show.html.erb
new file mode 100644
index 000000000..6361e2115
--- /dev/null
+++ b/app/views/access_points/show.html.erb
@@ -0,0 +1,141 @@
+<%= title_tag t('access_points.show.title', :access_point => @access_point.name) %>
+<div class="access_point_show">
+ <% if @access_point.projection_type != nil || @access_point.long_lat_type != nil %>
+ <%= @map.to_html %>
+ <% end %>
+ <div class="summary">
+ <p>
+ <label><%= @access_point.human_attribute_name(:stop_area) %>: </label>
+ <%= link_to @stop_area.name, [@referential, @stop_area] %>
+ </p>
+ <p>
+ <label><%= @access_point.human_attribute_name("name") %>: </label>
+ <%= @access_point.name %>
+ </p>
+ <p>
+ <label><%= @access_point.human_attribute_name("comment") %>: </label>
+ <%= @access_point.comment %>
+ </p>
+ <p>
+ <label><%= @access_point.human_attribute_name("street_name") %>: </label>
+ <%= @access_point.street_name %>
+ </p>
+ <p>
+ <label><%= @access_point.human_attribute_name("country_code") %>: </label>
+ <%= @access_point.country_code %>
+ </p>
+ <p>
+ <label><%= @access_point.human_attribute_name("access_point_type") %>: </label>
+ <%= t("access_types.label.#{@access_point.access_point_type}") %>
+ </p>
+ <p>
+ <label><%= @access_point.human_attribute_name("openning_time") %>: </label>
+ <% if (@access_point.openning_time.present?) %>
+ <%= @access_point.openning_time.strftime('%Hh %Mm') %>
+ <% end %>
+ </p>
+ <p>
+ <label><%= @access_point.human_attribute_name("closing_time") %>: </label>
+ <% if (@access_point.closing_time.present?) %>
+ <%= @access_point.closing_time.strftime('%Hh %Mm') %>
+ <% end %>
+ </p>
+ <p>
+ <label><%= @access_point.human_attribute_name("mobility_restricted_suitability") %>: </label>
+ <%= t((@access_point.mobility_restricted_suitability == true).to_s) %>
+ </p>
+ <p>
+ <label><%= @access_point.human_attribute_name("stairs_availability") %>: </label>
+ <%= t((@access_point.stairs_availability == true).to_s) %>
+ </p>
+ <p>
+ <label><%= @access_point.human_attribute_name("lift_availability") %>: </label>
+ <%= t((@access_point.lift_availability == true).to_s) %>
+ </p>
+ <p> <label><%= t('access_points.show.geographic_data') %> </label></p>
+ <% if @access_point.projection_type == nil && @access_point.long_lat_type == nil %>
+ <span class='geo_data'><%= t('access_points.show.no_geographic_data') %></span>
+ <% else %>
+ <% if !@access_point.projection_type.nil? %>
+ <p>
+ <span class='geo_data'><%= @access_point.human_attribute_name("projection_type") %>: </span>
+ <%= @access_point.projection_type %>
+ </p>
+ <p>
+ <span class='geo_data'><%= @access_point.human_attribute_name("x") %>: </span>
+ <%= @access_point.x %>
+ </p>
+ <p>
+ <span class='geo_data'><%= @access_point.human_attribute_name("y") %>: </span>
+ <%= @access_point.y %>
+ </p>
+ <% end %>
+ <% if !@access_point.long_lat_type.nil? %>
+ <p>
+ <span class='geo_data'><%= @access_point.human_attribute_name("long_lat_type") %>: </span>
+ <%= @access_point.long_lat_type %>
+ </p>
+ <p>
+ <span class='geo_data'><%= @access_point.human_attribute_name("longitude") %>: </span>
+ <%= @access_point.longitude %>
+ </p>
+ <p>
+ <span class='geo_data'><%= @access_point.human_attribute_name("latitude") %>: </span>
+ <%= @access_point.latitude %>
+ </p>
+ <% end %>
+ <% end %>
+ <p>
+ <label><%= @access_point.human_attribute_name("objectid") %>: </label>
+ <%= @access_point.objectid %>
+ </p>
+ </div>
+
+</div>
+
+<p class="after_map" />
+<div>
+ <h3 class="access_point_generics">
+ <a class="generics"><%= t('.generic_access_links') %>
+ <%= image_tag("icons/plus.png" , :class => "switcher", :style => "display: none;") %>
+ <%= image_tag("icons/minus.png" , :class => "switcher" ) %>
+ </a>
+
+ </h3>
+ <div class="generics content">
+
+ <div class="access_link_pairs">
+ <table>
+ <%= render :partial => "access_link_pairs/access_link_pair", :collection => access_links_pairs(@generic_access_links) %>
+ </table>
+ </div>
+
+ </div>
+
+ <h3 class="access_point_details">
+ <a class="details"><%= t('.detail_access_links') %>
+ <%= image_tag("icons/plus.png" , :class => "switcher") %>
+ <%= image_tag("icons/minus.png" , :class => "switcher", :style => "display: none;" ) %>
+ </a>
+
+ </h3>
+ <div class="details content" style="display: none;">
+
+ <div class="access_link_pairs">
+ <table>
+ <%= render :partial => "access_link_pairs/access_link_pair", :collection => access_links_pairs(@detail_access_links) %>
+ </table>
+ </div>
+
+ </div>
+</div>
+
+
+<% content_for :sidebar do %>
+<ul class="actions">
+ <li><%= link_to t('access_points.actions.edit'), edit_referential_stop_area_access_point_path(@referential, @stop_area, @access_point), :class => "edit" %></li>
+ <li><%= link_to t('access_points.actions.destroy'), referential_stop_area_access_point_path(@referential, @stop_area, @access_point), :method => :delete, :data => {:confirm => t('access_points.actions.destroy_confirm')}, :class => "remove" %></li>
+</ul>
+ <br>
+ <%= creation_tag(@access_point) %>
+<% end %>
diff --git a/app/views/access_points/show.kml.erb b/app/views/access_points/show.kml.erb
new file mode 100644
index 000000000..f54e6340e
--- /dev/null
+++ b/app/views/access_points/show.kml.erb
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<kml xmlns="http://www.opengis.net/kml/2.2">
+ <Document>
+ <Placemark id="<%= @access_point.id %>" >
+ <name><%= @access_point.name %></name>
+ <access_point_type><%= @access_point.access_point_type %></access_point_type>
+ <%= (@access_point.position or @access_point.default_position).kml_representation.html_safe %>
+ </Placemark>
+ </Document>
+</kml>
diff --git a/app/views/api/v1/access_links/index.rabl b/app/views/api/v1/access_links/index.rabl
new file mode 100644
index 000000000..fb9c8d728
--- /dev/null
+++ b/app/views/api/v1/access_links/index.rabl
@@ -0,0 +1,4 @@
+collection @access_links
+
+extends "api/v1/access_links/show"
+
diff --git a/app/views/api/v1/access_links/short_description.rabl b/app/views/api/v1/access_links/short_description.rabl
new file mode 100644
index 000000000..5c37de47c
--- /dev/null
+++ b/app/views/api/v1/access_links/short_description.rabl
@@ -0,0 +1,6 @@
+object @access_link
+extends "api/v1/trident_objects/short_description"
+
+[ :name, :short_name, :registration_number].each do |attr|
+ attributes attr, :unless => lambda { |m| m.send( attr).nil?}
+end
diff --git a/app/views/api/v1/access_links/show.rabl b/app/views/api/v1/access_links/show.rabl
new file mode 100644
index 000000000..5dbbec81b
--- /dev/null
+++ b/app/views/api/v1/access_links/show.rabl
@@ -0,0 +1,6 @@
+object @access_link
+extends "api/v1/trident_objects/show"
+
+[:access_point_id , :comment , :creation_time , :creator_id , :default_duration , :frequent_traveller_duration , :int_user_needs , :lift_availability , :link_distance , :link_orientation , :link_type , :mobility_restricted_suitability , :mobility_restricted_traveller_duration , :name , :occasional_traveller_duration , :stairs_availability , :stop_area_id].each do |attr|
+ attributes attr, :unless => lambda { |m| m.send( attr).nil?}
+end
diff --git a/app/views/api/v1/access_points/index.rabl b/app/views/api/v1/access_points/index.rabl
new file mode 100644
index 000000000..68037f89f
--- /dev/null
+++ b/app/views/api/v1/access_points/index.rabl
@@ -0,0 +1,4 @@
+collection @access_points
+
+extends "api/v1/access_points/show"
+
diff --git a/app/views/api/v1/access_points/short_description.rabl b/app/views/api/v1/access_points/short_description.rabl
new file mode 100644
index 000000000..e1786a51d
--- /dev/null
+++ b/app/views/api/v1/access_points/short_description.rabl
@@ -0,0 +1,6 @@
+object @access_point
+extends "api/v1/trident_objects/short_description"
+
+[ :name, :short_name, :registration_number].each do |attr|
+ attributes attr, :unless => lambda { |m| m.send( attr).nil?}
+end
diff --git a/app/views/api/v1/access_points/show.rabl b/app/views/api/v1/access_points/show.rabl
new file mode 100644
index 000000000..76e43a9e5
--- /dev/null
+++ b/app/views/api/v1/access_points/show.rabl
@@ -0,0 +1,9 @@
+object @access_point
+extends "api/v1/trident_objects/show"
+
+[ :name, :comment, :longitude, :latitude, :long_lat_type,
+ :x , :y , :projection_type, :country_code, :street_name, :contained_in,
+ :openning_time, :closing_time, :access_type, :lift_availability,
+ :mobility_restricted_suitability, :stairs_availability, :stop_area_id].each do |attr|
+ attributes attr, :unless => lambda { |m| m.send( attr).nil?}
+end
diff --git a/app/views/api/v1/companies/index.rabl b/app/views/api/v1/companies/index.rabl
new file mode 100644
index 000000000..ff94da999
--- /dev/null
+++ b/app/views/api/v1/companies/index.rabl
@@ -0,0 +1,4 @@
+collection @companies
+
+extends "api/v1/companies/show"
+
diff --git a/app/views/api/v1/companies/short_description.rabl b/app/views/api/v1/companies/short_description.rabl
new file mode 100644
index 000000000..4382f1f2e
--- /dev/null
+++ b/app/views/api/v1/companies/short_description.rabl
@@ -0,0 +1,6 @@
+object @company
+extends "api/v1/trident_objects/short_description"
+
+[ :name, :short_name, :registration_number].each do |attr|
+ attributes attr, :unless => lambda { |m| m.send( attr).nil?}
+end
diff --git a/app/views/api/v1/companies/show.rabl b/app/views/api/v1/companies/show.rabl
new file mode 100644
index 000000000..b2b064c54
--- /dev/null
+++ b/app/views/api/v1/companies/show.rabl
@@ -0,0 +1,6 @@
+object @company
+extends "api/v1/trident_objects/show"
+
+[ :name, :short_name, :organizational_unit, :operating_department_name, :code, :phone, :fax, :email, :registration_number].each do |attr|
+ attributes attr, :unless => lambda { |m| m.send( attr).nil?}
+end
diff --git a/app/views/api/v1/connection_links/index.rabl b/app/views/api/v1/connection_links/index.rabl
new file mode 100644
index 000000000..d17d2c149
--- /dev/null
+++ b/app/views/api/v1/connection_links/index.rabl
@@ -0,0 +1,4 @@
+collection @connection_links
+
+extends "api/v1/connection_links/show"
+
diff --git a/app/views/api/v1/connection_links/show.rabl b/app/views/api/v1/connection_links/show.rabl
new file mode 100644
index 000000000..ce3410f83
--- /dev/null
+++ b/app/views/api/v1/connection_links/show.rabl
@@ -0,0 +1,16 @@
+object @connection_link
+extends "api/v1/trident_objects/show"
+
+[ :name, :link_distance, :link_type, :default_duration,
+ :frequent_traveller_duration, :occasional_traveller_duration, :mobility_restricted_traveller_duration,
+ :mobility_restricted_suitability, :stairs_availability, :lift_availability, :comment].each do |attr|
+ attributes attr, :unless => lambda { |m| m.send( attr).nil?}
+end
+
+node :start_of_link_short_description do |connection|
+ partial("api/v1/stop_areas/short_description", :object => connection.departure) unless connection.departure.nil?
+end
+
+node :end_of_link_short_description do |connection|
+ partial("api/v1/stop_areas/short_description", :object => connection.arrival) unless connection.arrival.nil?
+end
diff --git a/app/views/api/v1/group_of_lines/index.rabl b/app/views/api/v1/group_of_lines/index.rabl
new file mode 100644
index 000000000..47b6b6d4e
--- /dev/null
+++ b/app/views/api/v1/group_of_lines/index.rabl
@@ -0,0 +1,4 @@
+collection @group_of_lines
+
+extends "api/v1/group_of_lines/show"
+
diff --git a/app/views/api/v1/group_of_lines/short_description.rabl b/app/views/api/v1/group_of_lines/short_description.rabl
new file mode 100644
index 000000000..770b334ec
--- /dev/null
+++ b/app/views/api/v1/group_of_lines/short_description.rabl
@@ -0,0 +1,6 @@
+object @group_of_line
+extends "api/v1/trident_objects/short_description"
+
+[ :creator_id, :name].each do |attr|
+ attributes attr, :unless => lambda { |m| m.send( attr).nil?}
+end
diff --git a/app/views/api/v1/group_of_lines/show.rabl b/app/views/api/v1/group_of_lines/show.rabl
new file mode 100644
index 000000000..96e4bfc58
--- /dev/null
+++ b/app/views/api/v1/group_of_lines/show.rabl
@@ -0,0 +1,6 @@
+object @group_of_line
+extends "api/v1/trident_objects/show"
+
+[ :creator_id, :name].each do |attr|
+ attributes attr, :unless => lambda { |m| m.send( attr).nil?}
+end
diff --git a/app/views/api/v1/journey_patterns/index.rabl b/app/views/api/v1/journey_patterns/index.rabl
new file mode 100644
index 000000000..4eb394669
--- /dev/null
+++ b/app/views/api/v1/journey_patterns/index.rabl
@@ -0,0 +1,4 @@
+collection @journey_patterns
+
+extends "api/v1/journey_patterns/show"
+
diff --git a/app/views/api/v1/journey_patterns/short_description.rabl b/app/views/api/v1/journey_patterns/short_description.rabl
new file mode 100644
index 000000000..5932f85f7
--- /dev/null
+++ b/app/views/api/v1/journey_patterns/short_description.rabl
@@ -0,0 +1,6 @@
+object @journey_pattern
+extends "api/v1/trident_objects/short_description"
+
+[ :name, :published_name, :registration_number].each do |attr|
+ attributes attr, :unless => lambda { |m| m.send( attr).nil?}
+end
diff --git a/app/views/api/v1/journey_patterns/show.rabl b/app/views/api/v1/journey_patterns/show.rabl
new file mode 100644
index 000000000..882660360
--- /dev/null
+++ b/app/views/api/v1/journey_patterns/show.rabl
@@ -0,0 +1,21 @@
+object @journey_pattern
+extends "api/v1/trident_objects/show"
+
+[:name, :published_name, :registration_number, :comment].each do |attr|
+ attributes attr, :unless => lambda { |m| m.send( attr).nil?}
+end
+
+node(:route_short_description) do |journey_pattern|
+ partial("api/v1/routes/short_description", :object => journey_pattern.route)
+end
+
+node(:vehicle_journey_object_ids) do |journey_pattern|
+ journey_pattern.vehicle_journeys.map(&:objectid)
+end unless root_object.vehicle_journeys.empty?
+
+child :stop_points => :stop_area_short_descriptions do |stop_points|
+ node do |stop_point|
+ partial("api/v1/stop_areas/short_description", :object => stop_point.stop_area)
+ end
+end unless root_object.stop_points.empty?
+
diff --git a/app/views/api/v1/lines/index.rabl b/app/views/api/v1/lines/index.rabl
new file mode 100644
index 000000000..6c3f73022
--- /dev/null
+++ b/app/views/api/v1/lines/index.rabl
@@ -0,0 +1,4 @@
+collection @lines
+
+extends "api/v1/lines/show"
+
diff --git a/app/views/api/v1/lines/short_description.rabl b/app/views/api/v1/lines/short_description.rabl
new file mode 100644
index 000000000..7d42e4584
--- /dev/null
+++ b/app/views/api/v1/lines/short_description.rabl
@@ -0,0 +1,6 @@
+object @line
+extends "api/v1/trident_objects/short_description"
+
+[ :name, :published_name, :number, :registration_number].each do |attr|
+ attributes attr, :unless => lambda { |m| m.send( attr).nil?}
+end
diff --git a/app/views/api/v1/lines/show.rabl b/app/views/api/v1/lines/show.rabl
new file mode 100644
index 000000000..dcd497aa5
--- /dev/null
+++ b/app/views/api/v1/lines/show.rabl
@@ -0,0 +1,14 @@
+object @line
+extends "api/v1/trident_objects/show"
+[ :name, :number, :published_name, :transport_mode_name, :registration_number, :comment, :mobility_restricted_suitability].each do |attr|
+ attributes attr, :unless => lambda { |m| m.send( attr).nil?}
+end
+
+node :network_short_description do |line|
+ partial("api/v1/networks/short_description", :object => line.network)
+end unless root_object.network.nil?
+
+node :company_short_description do |line|
+ partial("api/v1/companies/short_description", :object => line.company)
+end unless root_object.company.nil?
+
diff --git a/app/views/api/v1/networks/index.rabl b/app/views/api/v1/networks/index.rabl
new file mode 100644
index 000000000..124a65bee
--- /dev/null
+++ b/app/views/api/v1/networks/index.rabl
@@ -0,0 +1,4 @@
+collection @networks
+
+extends "api/v1/networks/show"
+
diff --git a/app/views/api/v1/networks/short_description.rabl b/app/views/api/v1/networks/short_description.rabl
new file mode 100644
index 000000000..9dc458064
--- /dev/null
+++ b/app/views/api/v1/networks/short_description.rabl
@@ -0,0 +1,6 @@
+object @network
+extends "api/v1/trident_objects/short_description"
+
+[ :name, :description, :registration_number].each do |attr|
+ attributes attr, :unless => lambda { |m| m.send( attr).nil?}
+end
diff --git a/app/views/api/v1/networks/show.rabl b/app/views/api/v1/networks/show.rabl
new file mode 100644
index 000000000..ae5915da2
--- /dev/null
+++ b/app/views/api/v1/networks/show.rabl
@@ -0,0 +1,7 @@
+object @network
+extends "api/v1/trident_objects/show"
+
+[ :version_date, :description, :name, :registration_number, :source_name,
+ :source_type, :source_identifier, :comment].each do |attr|
+ attributes attr, :unless => lambda { |m| m.send( attr).nil?}
+end
diff --git a/app/views/api/v1/routes/index.rabl b/app/views/api/v1/routes/index.rabl
new file mode 100644
index 000000000..8f0eab32c
--- /dev/null
+++ b/app/views/api/v1/routes/index.rabl
@@ -0,0 +1,3 @@
+collection @routes
+
+extends "api/v1/routes/show"
diff --git a/app/views/api/v1/routes/short_description.rabl b/app/views/api/v1/routes/short_description.rabl
new file mode 100644
index 000000000..ae149167d
--- /dev/null
+++ b/app/views/api/v1/routes/short_description.rabl
@@ -0,0 +1,7 @@
+object @route
+extends "api/v1/trident_objects/short_description"
+
+[ :name, :published_name, :number, :direction, :wayback].each do |attr|
+ attributes attr, :unless => lambda { |m| m.send( attr).nil?}
+end
+
diff --git a/app/views/api/v1/routes/show.rabl b/app/views/api/v1/routes/show.rabl
new file mode 100644
index 000000000..e3a7fdffa
--- /dev/null
+++ b/app/views/api/v1/routes/show.rabl
@@ -0,0 +1,29 @@
+object @route
+extends "api/v1/trident_objects/show"
+
+[:name, :published_name, :number, :direction].each do |attr|
+ attributes attr, :unless => lambda { |m| m.send( attr).nil?}
+end
+attributes :opposite_route_id => :way_back_route_id, :unless => lambda { |m| m.opposite_route_id.nil?}
+attributes :comment, :unless => lambda { |m| m.comment.nil?}
+attributes :wayback => :way_back, :unless => lambda { |m| m.wayback.nil?}
+
+node :line_short_description do |route|
+ partial("api/v1/lines/short_description", :object => route.line)
+end
+
+child :journey_patterns => :journey_pattern_short_descriptions do |journey_patterns|
+ node do |journey|
+ partial("api/v1/journey_patterns/short_description", :object => journey)
+ end
+end unless root_object.journey_patterns.empty?
+
+node(:vehicle_journey_object_ids) do |route|
+ route.vehicle_journeys.map(&:objectid)
+end unless root_object.vehicle_journeys.empty?
+
+child :stop_areas => :stop_area_short_descriptions do |stop_areas|
+ node do |stop_area|
+ partial("api/v1/stop_areas/short_description", :object => stop_area)
+ end
+end unless root_object.stop_areas.empty?
diff --git a/app/views/api/v1/stop_areas/index.rabl b/app/views/api/v1/stop_areas/index.rabl
new file mode 100644
index 000000000..0e253266e
--- /dev/null
+++ b/app/views/api/v1/stop_areas/index.rabl
@@ -0,0 +1,3 @@
+collection @stop_areas
+
+extends "api/v1/stop_areas/show"
diff --git a/app/views/api/v1/stop_areas/short_description.rabl b/app/views/api/v1/stop_areas/short_description.rabl
new file mode 100644
index 000000000..73627c5a1
--- /dev/null
+++ b/app/views/api/v1/stop_areas/short_description.rabl
@@ -0,0 +1,10 @@
+object @stop_area
+extends "api/v1/trident_objects/short_description"
+
+[ :name, :area_type, :longitude, :latitude, :long_lat_type].each do |attr|
+ attributes attr, :unless => lambda { |m| m.send( attr).nil?}
+end
+node(:parent_object_id) do |stop_area|
+ stop_area.parent.objectid
+end unless root_object.parent.nil?
+
diff --git a/app/views/api/v1/stop_areas/show.rabl b/app/views/api/v1/stop_areas/show.rabl
new file mode 100644
index 000000000..976d96342
--- /dev/null
+++ b/app/views/api/v1/stop_areas/show.rabl
@@ -0,0 +1,21 @@
+object @stop_area
+extends "api/v1/trident_objects/show"
+
+[ :name, :area_type,:nearest_topic_name, :fare_code, :registration_number,
+ :longitude, :latitude, :long_lat_type,
+ :country_code, :street_name, :x, :y, :projection_type, :comment
+].each do |attr|
+ attributes attr, :unless => lambda { |m| m.send( attr).nil?}
+end
+
+node(:routing_stop_area_object_ids) do |stop_area|
+ stop_area.routing_stops.map(&:objectid)
+end unless root_object.routing_stops.empty?
+
+node(:routing_line_object_ids) do |stop_area|
+ stop_area.routing_lines.map(&:objectid)
+end unless root_object.routing_lines.empty?
+
+node :parent do |stop_area|
+ partial("api/v1/stop_areas/short_description", :object => stop_area.parent)
+end unless root_object.parent.nil?
diff --git a/app/views/api/v1/time_tables/index.rabl b/app/views/api/v1/time_tables/index.rabl
new file mode 100644
index 000000000..7f6371c88
--- /dev/null
+++ b/app/views/api/v1/time_tables/index.rabl
@@ -0,0 +1,3 @@
+collection @time_tables
+
+extends "api/v1/time_tables/show"
diff --git a/app/views/api/v1/time_tables/show.rabl b/app/views/api/v1/time_tables/show.rabl
new file mode 100644
index 000000000..ae1e6e180
--- /dev/null
+++ b/app/views/api/v1/time_tables/show.rabl
@@ -0,0 +1,18 @@
+object @time_table
+extends "api/v1/trident_objects/show"
+
+[ :version, :comment].each do |attr|
+ attributes attr, :unless => lambda { |m| m.send( attr).nil?}
+end
+
+node(:dates) do |time_table|
+ time_table.dates.map(&:date)
+end unless root_object.dates.empty?
+
+unless root_object.periods.empty?
+ attributes :monday,:tuesday,:wednesday,:thursday,:friday,:saturday,:sunday
+ child :periods => :periods do |period|
+ attributes :period_start, :period_end
+ end
+end
+
diff --git a/app/views/api/v1/trident_objects/short_description.rabl b/app/views/api/v1/trident_objects/short_description.rabl
new file mode 100644
index 000000000..09f829850
--- /dev/null
+++ b/app/views/api/v1/trident_objects/short_description.rabl
@@ -0,0 +1,3 @@
+attributes :objectid => :object_id
+attributes :object_version
+
diff --git a/app/views/api/v1/trident_objects/show.rabl b/app/views/api/v1/trident_objects/show.rabl
new file mode 100644
index 000000000..7d58d9a55
--- /dev/null
+++ b/app/views/api/v1/trident_objects/show.rabl
@@ -0,0 +1,5 @@
+attributes :objectid => :object_id
+[ :object_version, :creation_time, :creator_id].each do |attr|
+ attributes attr, :unless => lambda { |m| m.send( attr).nil?}
+end
+
diff --git a/app/views/api/v1/vehicle_journeys/index.rabl b/app/views/api/v1/vehicle_journeys/index.rabl
new file mode 100644
index 000000000..f7d25f3b9
--- /dev/null
+++ b/app/views/api/v1/vehicle_journeys/index.rabl
@@ -0,0 +1,3 @@
+collection @vehicle_journeys
+
+extends "api/v1/vehicle_journeys/show"
diff --git a/app/views/api/v1/vehicle_journeys/show.rabl b/app/views/api/v1/vehicle_journeys/show.rabl
new file mode 100644
index 000000000..e7288fffb
--- /dev/null
+++ b/app/views/api/v1/vehicle_journeys/show.rabl
@@ -0,0 +1,32 @@
+object @vehicle_journey
+extends "api/v1/trident_objects/show"
+
+[ :published_journey_name, :published_journey_identifier, :transport_mode, :vehicle_type_identifier, :status_value, :facility, :number, :comment].each do |attr|
+ attributes attr, :unless => lambda { |m| m.send( attr).nil?}
+end
+
+node(:route_short_description) do |vehicle|
+ partial("api/v1/routes/short_description", :object => vehicle.route)
+end
+
+node(:journey_pattern_short_description) do |vehicle|
+ partial("api/v1/routes/short_description", :object => vehicle.journey_pattern)
+end
+
+node(:time_table_object_ids) do |vehicle|
+ vehicle.time_tables.map(&:objectid)
+end unless root_object.time_tables.empty?
+
+child :vehicle_journey_at_stops do |vehicle_stops|
+ node do |vehicle_stop|
+ node(:stop_area_object_id) { vehicle_stop.stop_point.stop_area.objectid }
+
+ [ :connecting_service_id, :arrival_time, :departure_time, :waiting_time, :elapse_duration,
+ :headway_frequency, :boarding_alighting_possibility].each do |attr|
+ node( attr) do
+ vehicle_stop.send(attr)
+ end unless vehicle_stop.send(attr).nil?
+ end
+ attributes :order => vehicle_stop.position, :unless => lambda { |m| m.send( :position).nil?}
+ end
+end
diff --git a/app/views/api_keys/_api_key.html.erb b/app/views/api_keys/_api_key.html.erb
new file mode 100644
index 000000000..6492af3b0
--- /dev/null
+++ b/app/views/api_keys/_api_key.html.erb
@@ -0,0 +1,12 @@
+<%= div_for(api_key) do %>
+ <%= api_key.token %>
+ <div class="info">
+ <%= api_key.class.human_attribute_name('name') %> <%= api_key.name %> -
+ <%= api_key.class.human_attribute_name('updated_at') %> <%= l(api_key.updated_at) %>
+ <div class="actions">
+ <%= link_to t("actions.edit"), edit_referential_api_key_path(@referential, api_key), :class => "edit" %> |
+ <%= link_to t("actions.destroy"), referential_api_key_path(@referential, api_key), :method => :delete, :data => {:confirm => t('api_keys.actions.destroy_confirm')}, :class => "remove" %>
+ </div>
+ </div>
+<% end %>
+
diff --git a/app/views/api_keys/_form.html.erb b/app/views/api_keys/_form.html.erb
new file mode 100644
index 000000000..de3f9ad7e
--- /dev/null
+++ b/app/views/api_keys/_form.html.erb
@@ -0,0 +1,14 @@
+<%= semantic_form_for [@referential, @api_key] do |form| %>
+ <%= form.inputs do %>
+ <%= form.input :name %>
+ <% unless @api_key.new_record? %>
+ <%= form.input :token, :input_html => { :disabled => true } %>
+ <% end %>
+ <% end %>
+
+ <%= form.actions do %>
+ <%= form.action :submit, :as => :button %>
+ <%= form.action :cancel, :as => :link %>
+ <% end %>
+<% end %>
+
diff --git a/app/views/api_keys/edit.html.erb b/app/views/api_keys/edit.html.erb
new file mode 100644
index 000000000..7d367421e
--- /dev/null
+++ b/app/views/api_keys/edit.html.erb
@@ -0,0 +1,4 @@
+<%= title_tag t('api_keys.edit.title') %>
+
+<%= render "form" %>
+
diff --git a/app/views/api_keys/new.html.erb b/app/views/api_keys/new.html.erb
new file mode 100644
index 000000000..40dd1a4fe
--- /dev/null
+++ b/app/views/api_keys/new.html.erb
@@ -0,0 +1,4 @@
+<%= title_tag t('api_keys.new.title') %>
+
+<%= render "form" %>
+
diff --git a/app/views/companies/_company.erb b/app/views/companies/_company.erb
index 34c65b798..4955dec8b 100644
--- a/app/views/companies/_company.erb
+++ b/app/views/companies/_company.erb
@@ -4,7 +4,7 @@
<%= company.human_attribute_name('code') %> <%= company.code %>
<div class="actions">
<%= link_to t("actions.edit"), edit_referential_company_path(@referential, company), :class => "edit" %> |
- <%= link_to t("actions.destroy"), referential_company_path(@referential, company), :method => :delete, :confirm => t('companies.actions.destroy_confirm'), :class => "remove" %>
+ <%= link_to t("actions.destroy"), referential_company_path(@referential, company), :method => :delete, :data => {:confirm => t('companies.actions.destroy_confirm')}, :class => "remove" %>
</div>
</div>
diff --git a/app/views/companies/show.html.erb b/app/views/companies/show.html.erb
index bf4a0bdc3..844832ee1 100644
--- a/app/views/companies/show.html.erb
+++ b/app/views/companies/show.html.erb
@@ -43,21 +43,14 @@
<label><%= Chouette::Company.human_attribute_name("objectid") %>: </label>
<%= @company.objectid %>
</p>
- <p>
- <label><%= @company.human_attribute_name("creation_time") %>: </label>
- <%= l(@company.creation_time) %>
- </p>
- <p>
- <label><%= @company.human_attribute_name("creator_id") %>: </label>
- <%= @company.creator_id %>
- </p>
</div>
</div>
<% content_for :sidebar do %>
<ul class="actions">
<li><%= link_to t('companies.actions.edit'), edit_referential_company_path(@referential, @company), :class => "edit" %></li>
- <li><%= link_to t('companies.actions.destroy'), referential_company_path(@referential, @company), :method => :delete, :confirm => t('companies.actions.destroy_confirm'), :class => "remove" %></li>
+ <li><%= link_to t('companies.actions.destroy'), referential_company_path(@referential, @company), :method => :delete, :data => {:confirm => t('companies.actions.destroy_confirm')}, :class => "remove" %></li>
<br>
</ul>
+ <%= creation_tag(@company) %>
<% end %>
diff --git a/app/views/connection_links/_connection_link.erb b/app/views/connection_links/_connection_link.erb
index b3b44aed5..01128051a 100644
--- a/app/views/connection_links/_connection_link.erb
+++ b/app/views/connection_links/_connection_link.erb
@@ -17,7 +17,7 @@
<div class="actions">
<%= link_to t("actions.edit"), edit_referential_connection_link_path(@referential, connection_link), :class => "edit" %> |
- <%= link_to t("actions.destroy"), referential_connection_link_path(@referential, connection_link), :method => :delete, :confirm => t('connection_links.actions.destroy_confirm'), :class => "remove" %>
+ <%= link_to t("actions.destroy"), referential_connection_link_path(@referential, connection_link), :method => :delete, :data => {:confirm => t('connection_links.actions.destroy_confirm')}, :class => "remove" %>
</div>
</div>
<% end %>
diff --git a/app/views/connection_links/show.html.erb b/app/views/connection_links/show.html.erb
index 1ae049d99..a41112621 100644
--- a/app/views/connection_links/show.html.erb
+++ b/app/views/connection_links/show.html.erb
@@ -79,22 +79,15 @@
<label><%= @connection_link.human_attribute_name("objectid") %>: </label>
<%= @connection_link.objectid %>
</p>
- <p>
- <label><%= @connection_link.human_attribute_name("creation_time") %>: </label>
- <%= l(@connection_link.creation_time) %>
- </p>
- <p>
- <label><%= @connection_link.human_attribute_name("creator_id") %>: </label>
- <%= @connection_link.creator_id %>
- </p>
</div>
</div>
<% content_for :sidebar do %>
<ul class="actions">
<li><%= link_to t('connection_links.actions.edit'), edit_referential_connection_link_path(@referential, @connection_link), :class => "edit" %></li>
- <li><%= link_to t('connection_links.actions.destroy'), referential_connection_link_path(@referential, @connection_link), :method => :delete, :confirm => t('connection_links.actions.destroy_confirm'), :class => "remove" %></li>
+ <li><%= link_to t('connection_links.actions.destroy'), referential_connection_link_path(@referential, @connection_link), :method => :delete, :data => {:confirm => t('connection_links.actions.destroy_confirm')}, :class => "remove" %></li>
<li><%= link_to t('connection_links.actions.select_areas'), select_areas_referential_connection_link_path(@referential, @connection_link), :class => "select_areas" %></li>
<br>
</ul>
+ <%= creation_tag(@connection_link) %>
<% end %>
diff --git a/app/views/errors/not_found.html.erb b/app/views/errors/not_found.html.erb
new file mode 100644
index 000000000..8d761413f
--- /dev/null
+++ b/app/views/errors/not_found.html.erb
@@ -0,0 +1,13 @@
+ <div class="error">
+ <h2>D&eacute;sol&eacute;, la page demand&eacute;e n'existe pas</h2>
+ <a href="http://www.chouette.mobi/spip.php?rubrique38" target="_blank">N'h&eacute;sitez pas &agrave; nous d&eacute;crire le probl&egrave;me</a>, nous essaierons de le r&eacute;soudre.<br/>Merci d'avance<br/> <br/>
+ Vous pouvez n&eacute;anmoins continuer &agrave; utiliser l'application CHOUETTE<br/>
+ <br/>
+ <br/>
+ <br/>
+ <br/>
+ <h2>The page you were looking for doesn't exist.</h2>
+ You may have mistyped the address or the page may have moved. <br/>
+ <a href="http://www.chouette.mobi/spip.php?rubrique38" target="_blank">Please describe us what happened</a>, we'll try to come back with an answer. <br/>Thank you. <br/> <br/>
+ You can still continue the use the CHOUETTE application. <br/>
+ </div>
diff --git a/app/views/errors/server_error.html.erb b/app/views/errors/server_error.html.erb
new file mode 100644
index 000000000..0a000df2e
--- /dev/null
+++ b/app/views/errors/server_error.html.erb
@@ -0,0 +1,14 @@
+ <div class="error">
+ <h2>D&eacute;sol&eacute;, une erreur est survenue</h2>
+ <a href="http://www.chouette.mobi/spip.php?rubrique38" target="_blank">N'h&eacute;sitez pas &agrave; nous d&eacute;crire le probl&egrave;me</a>, nous essaierons de le r&eacute;soudre.<br/>Merci d'avance<br/> <br/>
+ Vous pouvez n&eacute;anmoins continuer &agrave; utiliser l'application CHOUETTE<br/>
+ <br/>
+ <br/>
+ <br/>
+ <br/>
+ <h2>We're sorry, but something went wrong.</h2>
+ You may have mistyped the address or the page may have moved. <br/>
+ <a href="http://www.chouette.mobi/spip.php?rubrique38" target="_blank">Please describe us what happened</a>, we'll try to come back with an answer. <br/>Thank you. <br/> <br/>
+ You can still continue the use the CHOUETTE application. <br/>
+ </div>
+
diff --git a/app/views/exports/_export.erb b/app/views/exports/_export.erb
index 5b1bd0fcc..e8e5d4656 100644
--- a/app/views/exports/_export.erb
+++ b/app/views/exports/_export.erb
@@ -10,7 +10,7 @@
<% if export.status == 'completed' %>
<%= link_to t("exports.actions.download"), referential_export_path(@referential, export, :format => :zip), :class => "download" %>
<% end %>
- <%= link_to t("actions.destroy"), referential_export_path(@referential, export), :method => :delete, :confirm => t('exports.actions.destroy_confirm'), :class => "remove" %>
+ <%= link_to t("actions.destroy"), referential_export_path(@referential, export), :method => :delete, :data => {:confirm => t('exports.actions.destroy_confirm')}, :class => "remove" %>
</div>
</div>
<% end %>
diff --git a/app/views/exports/index.html.erb b/app/views/exports/index.html.erb
index 25db2e1ba..b7847b70e 100644
--- a/app/views/exports/index.html.erb
+++ b/app/views/exports/index.html.erb
@@ -1,5 +1,5 @@
<%= title_tag t('.title') %>
-
+<div class="warning"><%= t('.warning') %> </div>
<div class="page_info">
<span class="search"> <%= t("will_paginate.page_entries_info.search") %></span> <%= page_entries_info @exports %>
</div>
diff --git a/app/views/exports/new.html.erb b/app/views/exports/new.html.erb
index a62116ed7..e0e37fb34 100644
--- a/app/views/exports/new.html.erb
+++ b/app/views/exports/new.html.erb
@@ -1,9 +1,9 @@
<%= title_tag t(".title") %>
-<%= form_for([@referential, @export], :as => :export, :url => new_referential_export_path(@referential), :method => :get) do |form| %>
- <%= form.label :type %>
- <%= form.collection_select :type, Export.types, :to_s, :to_s %>
- <%= form.submit "Sélectionner", :id => "export_type_submit" %>
+<%= semantic_form_for([@referential, @export], :as => :export, :url => new_referential_export_path(@referential), :method => :get) do |form| %>
+ <%= form.inputs do %>
+ <%= form.input :type, :as => :select, :collection => Export.types.map { |format| [ Export.format_name(format), format]}, :required => true, :include_blank => false %>
+ <% end %>
<% end %>
<% @available_exports.each do |export| %>
diff --git a/app/views/exports/new.js.coffee b/app/views/exports/new.js.coffee
index 4a1d59f92..f3d815d82 100644
--- a/app/views/exports/new.js.coffee
+++ b/app/views/exports/new.js.coffee
@@ -1,4 +1,4 @@
jQuery ->
<% Export.references_types.each do |type| %>
- $("textarea.<%= export_references_type(type).input_class %>").tokenInput('<%= references_referential_exports_path(@referential, :type => export_references_type(type).relation_name, :format => :json) %>', { prePopulate: $('#').data('pre'), minChars: 3 });
+ $("textarea.<%= export_references_type(type).input_class %>").tokenInput('<%= references_referential_exports_path(@referential, :type => export_references_type(type).relation_name, :format => :json) %>', { prePopulate: $('#').data('pre'), minChars: 1 });
<% end %>
diff --git a/app/views/exports/show.html.erb b/app/views/exports/show.html.erb
index 5439a64e8..a4695b75b 100644
--- a/app/views/exports/show.html.erb
+++ b/app/views/exports/show.html.erb
@@ -47,6 +47,6 @@
<% if @export.status == 'completed' %>
<li><%= link_to t('exports.actions.download'), referential_export_path(@referential, @export, :format => :zip), :class => "download" %></li>
<% end %>
- <li><%= link_to t('exports.actions.destroy'), referential_export_path(@referential, @export), :method => :delete, :confirm => t('exports.actions.destroy_confirm'), :class => "remove" %></li>
+ <li><%= link_to t('exports.actions.destroy'), referential_export_path(@referential, @export), :method => :delete, :data => {:confirm => t('exports.actions.destroy_confirm')}, :class => "remove" %></li>
</ul>
<% end %>
diff --git a/app/views/file_validations/_file_validation.erb b/app/views/file_validations/_file_validation.erb
index 3e895f445..7ffed1417 100644
--- a/app/views/file_validations/_file_validation.erb
+++ b/app/views/file_validations/_file_validation.erb
@@ -7,7 +7,7 @@
<%= l file_validation.created_at %><br/>
<%= file_validation.file_name %>
<div class="actions">
- <%= link_to t("actions.destroy"), file_validation_path(file_validation), :method => :delete, :confirm => t('file_validations.actions.destroy_confirm'), :class => "remove" %>
+ <%= link_to t("actions.destroy"), file_validation_path(file_validation), :method => :delete, :data => {:confirm => t('file_validations.actions.destroy_confirm')}, :class => "remove" %>
</div>
</div>
<% end %>
diff --git a/app/views/file_validations/index.html.erb b/app/views/file_validations/index.html.erb
index e1416fa96..2e0cefbe8 100644
--- a/app/views/file_validations/index.html.erb
+++ b/app/views/file_validations/index.html.erb
@@ -1,5 +1,5 @@
<%= title_tag t('.title') %>
-
+<div class="warning"><%= t('.warning') %> </div>
<div class="pagination">
<div class="page_info">
<%= page_entries_info @file_validations %>
diff --git a/app/views/file_validations/show.html.erb b/app/views/file_validations/show.html.erb
index e3d69c0f0..d3d53fde5 100644
--- a/app/views/file_validations/show.html.erb
+++ b/app/views/file_validations/show.html.erb
@@ -144,7 +144,7 @@
</div>
<% content_for :sidebar do %>
<ul class="actions">
- <li><%= link_to t('file_validations.actions.destroy'), file_validation_path(@file_validation), :method => :delete, :confirm => t('file_validations.actions.destroy_confirm'), :class => "remove" %></li>
+ <li><%= link_to t('file_validations.actions.destroy'), file_validation_path(@file_validation), :method => :delete, :data => {:confirm => t('file_validations.actions.destroy_confirm')}, :class => "remove" %></li>
</ul>
<%= render :partial => "test_sheet_toc" %>
diff --git a/app/views/group_of_lines/_form.erb b/app/views/group_of_lines/_form.erb
new file mode 100644
index 000000000..0dcdc9379
--- /dev/null
+++ b/app/views/group_of_lines/_form.erb
@@ -0,0 +1,27 @@
+<%= semantic_form_for [@referential, @group_of_line] do |form| %>
+ <%= form.inputs do %>
+ <%= form.input :name %>
+ <%= form.input :comment %>
+ <%= form.input :objectid, :required => !@group_of_line.new_record?, :input_html => { :disabled => !@group_of_line.new_record? } %>
+ <% end %>
+
+ <%= form.inputs do %>
+ <%= form.input :line_tokens, :label => t('.lines'), :as => :text, :input_html => { :"data-pre" => ( @group_of_line.lines.map { |line| { :id => line.id, :name => line.published_name } } ).to_json } %>
+ <% end %>
+
+ <%= form.actions do %>
+ <%= form.action :submit, :as => :button %>
+ <%= form.action :cancel, :as => :link %>
+ <% end %>
+<% end %>
+
+<script>
+ $(function() {
+ $( "#group_of_line_line_tokens" ).tokenInput('<%= name_filter_referential_lines_path(@referential, :format => :json) %>', {
+ crossDomain: false,
+ prePopulate: $('#line_tokens').data('pre'),
+ minChars: 3,
+ preventDuplicates: true,
+ });
+ });
+</script>
diff --git a/app/views/group_of_lines/_group_of_line.erb b/app/views/group_of_lines/_group_of_line.erb
new file mode 100644
index 000000000..a1933744a
--- /dev/null
+++ b/app/views/group_of_lines/_group_of_line.erb
@@ -0,0 +1,12 @@
+<%= div_for(group_of_line) do %>
+ <%= link_to group_of_line.name, [@referential, group_of_line] %>
+ <div class="info">
+ <%= group_of_line.human_attribute_name('line_count') %>:<%= group_of_line.lines.count %>
+ <% if @line.nil? %>
+ <div class="actions">
+ <%= link_to t("actions.edit"), edit_referential_group_of_line_path(@referential, group_of_line), :class => "edit" %> |
+ <%= link_to t("actions.destroy"), referential_group_of_line_path(@referential, group_of_line), :method => :delete, :data => {:confirm => t('group_of_lines.actions.destroy_confirm')}, :class => "remove" %>
+ </div>
+ <% end %>
+ </div>
+<% end %>
diff --git a/app/views/group_of_lines/_lines_detail.html.erb b/app/views/group_of_lines/_lines_detail.html.erb
new file mode 100644
index 000000000..4d4058540
--- /dev/null
+++ b/app/views/group_of_lines/_lines_detail.html.erb
@@ -0,0 +1,10 @@
+ <div class="page_info">
+ <span class="search"> <%= t("will_paginate.page_entries_info.list") %></span> <%= page_entries_info @lines %>
+ </div>
+ <div class="lines paginated_content">
+ <%= render :partial => "lines/line", :collection => @lines %>
+ </div>
+ <div class="pagination">
+ <%= will_paginate @lines, :container => false %>
+ </div>
+
diff --git a/app/views/group_of_lines/edit.html.erb b/app/views/group_of_lines/edit.html.erb
new file mode 100644
index 000000000..541e708ca
--- /dev/null
+++ b/app/views/group_of_lines/edit.html.erb
@@ -0,0 +1,3 @@
+<%= title_tag t('group_of_lines.edit.title', :group_of_line => @group_of_line.name) %>
+
+<%= render "form" %>
diff --git a/app/views/group_of_lines/index.html.erb b/app/views/group_of_lines/index.html.erb
new file mode 100644
index 000000000..6f01455b8
--- /dev/null
+++ b/app/views/group_of_lines/index.html.erb
@@ -0,0 +1,26 @@
+<%= title_tag t('group_of_lines.index.title') %>
+
+<%= search_form_for @q, :url => referential_group_of_lines_path(@referential), :html => {:method => :get} do |f| %>
+ <%= f.label :name_cont, "#{t('.name')} :" %>
+ <%= f.text_field :name_cont %>
+
+ <%= f.submit t('actions.search') %> <%= t("or") %>
+ <%= link_to t("cancel"), referential_group_of_lines_path(@referential) %>
+<% end %>
+
+<div class="page_info">
+ <span class="search"> <%= t("will_paginate.page_entries_info.search") %></span> <%= page_entries_info @group_of_lines %>
+</div>
+<div class="group_of_lines paginated_content">
+ <%= render :partial => "group_of_line", :collection => @group_of_lines %>
+</div>
+<div class="pagination">
+ <%= will_paginate @group_of_lines, :container => false %>
+</div>
+
+<% content_for :sidebar do %>
+<ul class="actions">
+ <li><%= link_to t('group_of_lines.actions.new'), new_referential_group_of_line_path(@referential), :class => "add" %></li>
+ <br>
+</ul>
+<% end %>
diff --git a/app/views/group_of_lines/new.html.erb b/app/views/group_of_lines/new.html.erb
new file mode 100644
index 000000000..a2da652af
--- /dev/null
+++ b/app/views/group_of_lines/new.html.erb
@@ -0,0 +1,3 @@
+<%= title_tag t('group_of_lines.new.title') %>
+
+<%= render "form" %>
diff --git a/app/views/group_of_lines/show.html.erb b/app/views/group_of_lines/show.html.erb
new file mode 100644
index 000000000..5e77bfe78
--- /dev/null
+++ b/app/views/group_of_lines/show.html.erb
@@ -0,0 +1,39 @@
+<%= title_tag t('group_of_lines.show.title', :group_of_line => @group_of_line.name )%>
+
+<div class="group_of_line_show">
+ <%= @map.to_html %>
+ <div class="summary">
+ <p>
+ <label><%= @group_of_line.human_attribute_name("name") %>: </label>
+ <%= @group_of_line.name %>
+ </p>
+ <p>
+ <label><%= @group_of_line.human_attribute_name("comment") %>: </label>
+ <%= @group_of_line.comment %>
+ </p>
+ <p>
+ <label><%= @group_of_line.human_attribute_name("objectid") %>: </label>
+ <%= @group_of_line.objectid %>
+ </p>
+ </div>
+
+ <p class="after_map" />
+ <h3 class="group_of_line_lines">
+ <a class="lines"><%= t('.lines') %>
+ <%= image_tag("icons/plus.png" , :class => "switcher") %>
+ <%= image_tag("icons/minus.png" , :class => "switcher" , :style => "display: none;") %>
+ </a>
+ </h3>
+ <div class="lines_detail" style="display: none;">
+ <%= render :partial => "lines_detail" %>
+ </div>
+</div>
+
+<% content_for :sidebar do %>
+<ul class="actions">
+ <li><%= link_to t('group_of_lines.actions.edit'), edit_referential_group_of_line_path(@referential, @group_of_line), :class => "edit" %></li>
+ <li><%= link_to t('group_of_lines.actions.destroy'), referential_group_of_line_path(@referential, @group_of_line), :method => :delete, :data => {:confirm => t('group_of_lines.actions.destroy_confirm')} , :class => "remove" %></li>
+ <br>
+</ul>
+ <%= creation_tag(@group_of_line) %>
+<% end %>
diff --git a/app/views/group_of_lines/show.js.erb b/app/views/group_of_lines/show.js.erb
new file mode 100644
index 000000000..bd8ac5a7f
--- /dev/null
+++ b/app/views/group_of_lines/show.js.erb
@@ -0,0 +1,4 @@
+$(function (){
+ $(".lines_detail").html("<%= escape_javascript(render(:partial => "lines_detail")) %>");
+});
+
diff --git a/app/views/group_of_lines/show.kml.erb b/app/views/group_of_lines/show.kml.erb
new file mode 100644
index 000000000..6b1a34688
--- /dev/null
+++ b/app/views/group_of_lines/show.kml.erb
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<kml xmlns="http://www.opengis.net/kml/2.2">
+ <Document>
+ <% @group_of_line.commercial_stop_areas.each do |stop_area| %>
+ <Placemark id="<%= stop_area.id %>" >
+ <name><%= stop_area.name %></name>
+ <stop_area_type><%= stop_area.area_type.underscore %></stop_area_type>
+ <%= (stop_area.position or stop_area.default_position).kml_representation.html_safe %>
+ </Placemark>
+ <% end %>
+ </Document>
+</kml>
+
diff --git a/app/views/help/access_links.textile b/app/views/help/access_links.textile
new file mode 100644
index 000000000..960f3484b
--- /dev/null
+++ b/app/views/help/access_links.textile
@@ -0,0 +1,66 @@
+---
+layout: default
+title: Liens entre arrêts et accès
+---
+
+* "Définition":#def
+* "Attributs":#attr
+* "Mode opératoire":#ope
+
+h3(#def). Définition
+
+Un *lien arrêt-accès* est, dans un voyage en transports en commun, le cheminement piéton permettant dans une infrastructure lourde de passer de la voirie à l'arrêt physique (point d'embarquement ou quai) et vice versa.
+
+Le lien permet de définir les caractéristiques du parcours entre un arrêt physique et un accès
+Cette liaison n'existe qu'au sein d'une zone d'arrêts (arrêt commercial ou pôle d'échange)
+Si la liaison est générique sur la zone, elle s'applique à tous les arrêts (selon le sens) qui n'ont pas un lien spécifique
+
+La liaison est orientée, il est donc nécessaire dans le cas où l'accès est bi-directionnel de définir 2 liens, un pour chaque sens
+
+h3(#attr). Attributs
+
+- Accès := nom de l'accès
+- Arrêt := nom de l'arrêt
+- Nom := nom du lien ( par défaut, chouette propose de le nommer _nom de la source -> nom de la cible_)
+- Type := liste de choix parmi << Aérien >>, << Souterrain>> ou mixte << Aérien et souterrain >>
+- Commentaire := zone de texte libre
+- Distance := distance en mètres
+- Durée moyenne := champ de type horaire hh:mm
+- Durée pour un voyageur à mobilité réduite := champ de type horaire hh:mm
+- Durée pour un voyageur occasionnel := champ de type horaire hh:mm
+- Durée pour un habitué := champ de type horaire hh:mm
+- Ascenseur := indicateur (Oui ou Non)
+- Accès pour personne à mobilité réduite := indicateur (Oui ou Non)
+- Escalator disponible := indicateur (Oui ou Non)
+
+p(attr_data). Données de gestion :
+
+- Identifiant Neptune :=
+clé unique pérenne identifiant la correspondance pour les échanges Neptune
+cet identifiant est composé de 3 parties : préfixe:type:id_technique
+* préfixe : clé identifiant un producteur de données unique
+* type = AccessLink : clé identifiant le type d'objet (valeur imposée)
+* id_technique : valeur identifiant un seul objet d'un type donné pour un même producteur
+ce champ obligatoire est automatiquement généré s'il n'est pas renseigné
+il est possible aussi de ne renseigner que l'identifiant technique, auquel cas la valeur sera complétée automatiquement.
+=:
+- Date de création := date à laquelle l'objet a été créé ou modifié pour la dernière fois
+- Version := version de l'objet (auto incrémenté à chaque modification)
+- Créé par := compte utilisateur ayant procédé à la dernière modification
+
+h3(#ope). Mode opératoire
+
+h4. Création/consultation
+
+Lors de la consultation d'une zone d'arrêts possédant au moins un accès,
+l'action <<Gérer les liens arrêt-accès>> affiche deux matrices :
+* _Liens génériques_ : les différentes combinaisons de liens entre les accès et la zone;
+* _Liens détaillés_ : les différentes combinaisons de liens entre les accès et les arrêts inclus dans la zone.
+
+Chaque lien est représenté par une flêche orientée représentant l'existance ou non de ce lien:
+
+* !gray_left_arrow.png! ou !gray_right_arrow.png! lien non défini; la flèche est un lien vers l'écran de création de ce lien
+* !green_left_arrow.png! ou !green_right_arrow.png! lien existant; la flèche est un lien vers l'écran de consultation/modification/suppression de ce lien
+* !disabled_left_arrow.png! ou !disabled_right_arrow.png! lien interdit; la flèche est inopérante dans le sens qui contredirait le type d'accès (entrée ou sortie seule)
+
+Lors de la consultation d'un accès, les liens arrêt-accès de cet accès sont affichés selon la même présentation
diff --git a/app/views/help/access_points.textile b/app/views/help/access_points.textile
new file mode 100644
index 000000000..b32e0ae8e
--- /dev/null
+++ b/app/views/help/access_points.textile
@@ -0,0 +1,74 @@
+---
+layout: default
+title: Accès
+---
+
+* "Définition":#def
+* "Attributs":#attr
+* "Mode opératoire":#ope
+
+h3(#def). Définition
+
+Un *accès* est un élément d'infrastructure donnant sur la voirie et permettant d'accéder à un ou plusieurs arrêts physiques (point d'embarquement ou quai) non accessibles directement.
+
+Dans Chouette, les accès sont rattachés à une zone d'arrêt (arrêt commercial ou pôle d'échange) et peuvent être reliés par des liens arrêt-accès :
+
+* sous forme générique à la zone; ce qui donnera des valeurs par défaut pour tous les arrêts de celle-ci
+* sous forme spécifique à tout ou partie des arrêts physiques de cette zone, pour ceux qui nécessitent des précisions par rapport au cas général.
+
+h3(#attr). Attributs
+
+- Zone d'arrêt := nom de la zone d'arrêt contenant l'accès
+- Nom := nom de l'accès
+- Commentaire := zone de texte libre
+- Nom de la rue := nom de la rue de l'accès
+- Code INSEE := code INSEE de la commune de l'accès
+- Type d'accès := sens de circulation de l'accès
+
+* !access_in.png! entrée
+* !access_out.png! sortie
+* !access_in_out.png! entrée-sortie
+
+- Horaire d'ouverture := horaire d'ouverture de l'accès (hh:mm)
+- Horaire de fermeture := horaire d'ouverture de l'accès (hh:mm)
+- Ascenseur := indicateur (Oui ou Non)
+- Accès pour personne à mobilité réduite := indicateur (Oui ou Non)
+- Escalator disponible := indicateur (Oui ou Non)
+
+p(attr_data). Données géographiques :
+
+- Position X := coordonnée horizontale de l'accès dans le référentiel de projection de l'espace de données
+- Position Y := coordonnée verticale de l'accès dans le référentiel de projection de l'espace de données
+- Longitude := longitude de l'accès dans le référentiel WGS84
+- latitude := latitude de l'accès dans le référentiel WGS84
+
+p(attr_data). Données de gestion :
+
+- Identifiant Neptune :=
+clé unique pérenne identifiant la ligne pour les échanges Neptune
+cet identifiant est composé de 3 parties : préfixe:type:id_technique
+* préfixe : clé identifiant un producteur de données unique
+* type = AccessPoint : clé identifiant le type d'objet (valeur imposée)
+* id_technique : valeur identifiant un seul objet d'un type donné pour un même producteur
+ce champ obligatoire est automatiquement généré s'il n'est pas renseigné
+il est possible aussi de ne renseigner que l'identifiant technique, auquel cas la valeur sera complétée automatiquement.
+=:
+- Date de création := date à laquelle l'objet a été créé ou modifié pour la dernière fois
+- Version := version de l'objet (auto incrémenté à chaque modification)
+- Créé par := compte utilisateur ayant procédé à la dernière modification
+
+h3(#ope). Mode opératoire
+
+h4. Création
+
+la création est accessible dans l'écran de consultation d'une zone d'arrêt;
+lors de la création, la carte n'est pas disponible; pour localiser un accès sur la carte, il faut le créer puis le modifier.
+en modification, si l'accès n'a pas été positionné, il est proposé à l'emplacement de la zone d'arrêt associée ou par défaut au centre géographique de l'emprise de l'espace de données.
+
+h4. Déplacement sur la carte
+
+* activer le déplacement en cliquant sur l'accès -> le curseur prend la forme d'une quadruple flèche
+* appuyer sur le bouton gauche de la souris et maintenir appuyer lors du déplacement -> l'accès suit la souris
+* relâcher le bouton -> l'accès a une nouvelle position fixe
+* cliquer sur la carte -> sortie du mode déplacement; les coordonnées sont actualisées dans le formulaire
+
diff --git a/app/views/help/companies.textile b/app/views/help/companies.textile
index 54d20b2ed..704c3554a 100644
--- a/app/views/help/companies.textile
+++ b/app/views/help/companies.textile
@@ -5,8 +5,8 @@ title: Transporteurs
h3. Définition
-Dans la réalité, le transporteur est l'entité en charge de l'exploitation d'une ou plusieurs lignes de transport.
-Ce principe se retrouve dans ce logiciel.
+Dans la réalité, le *transporteur* est l'entité en charge de l'exploitation d'une ou plusieurs lignes de transport.
+Ce principe se retrouve dans le logiciel CHOUETTE.
* Il s'agit de l'exploitant de la ligne; chaque ligne est rattachée à un seul transporteur, un transporteur pouvant évidemment gérer plusieurs lignes.
* Chaque transporteur dispose d'un identifiant fonctionnel (<< numéro d'enregistrement >>) qui est utilisé dans les échanges XML pour identifier le transporteur et le mettre à jour. Cet identifiant est unique pour toute la base CHOUETTE, quel que soit le réseau ; il est donc important que le gestionnaire de la base CHOUETTE le renseigne d'une manière bien définie et pérenne.
@@ -18,7 +18,7 @@ h3. Attributs
- Nom d'unité := nom de l'unité de gestion dans la société de transport
- Nom du département := nom du département dans la société de transport
- Code postal := code postal de l'adresse de la société de transport
-- Numéro de téléphone := Numréro de téléphone de l'unité de gestion
+- Numéro de téléphone := Numéro de téléphone de l'unité de gestion
- Numéro de fax := Numéro de fax de l'unité de gestion
- Email := adresse électronique de l'unité de gestion de l'unité de gestion
- Numéro d'enregistrement := code référençant un transporteur au sein d'une autorité supérieure
@@ -30,9 +30,9 @@ clé unique pérenne identifiant le transporteur pour les échanges Neptune
cet identifiant est composé de 3 parties : préfixe:type:id_technique
* préfixe : clé identifiant un producteur de données unique
* type = Company : clé identifiant le type d'objet (valeur imposée)
-* id_technique : valeur identifiant un seul object d'un type donné pour un même producteur
+* id_technique : valeur identifiant un seul objet d'un type donné pour un même producteur
ce champ obligatoire est automatiquement généré s'il n'est pas renseigné
-il est possible aussi de ne renseigner que l'identifiant technique auquel cas la valeur sera complétée automatiquement.
+il est possible aussi de ne renseigner que l'identifiant technique, auquel cas la valeur sera complétée automatiquement.
=:
- Date de création := date à laquelle l'objet a été créé ou modifié pour la dernière fois
- Version := version de l'objet (auto incrémenté à chaque modification)
diff --git a/app/views/help/connection_links.textile b/app/views/help/connection_links.textile
index 112e2de1f..129b9c6d5 100644
--- a/app/views/help/connection_links.textile
+++ b/app/views/help/connection_links.textile
@@ -5,7 +5,7 @@ title: Correspondances
h3. Définition
-Une correspondance ou un changement est, dans un voyage en transports en commun, une étape nécessitant de changer de ligne. Le changement peut se faire soit au sein du même réseau, soit de manière intermodale, c'est-à-dire en changeant également de mode de transport.
+Une *correspondance* ou un changement est, dans un voyage en transports en commun, une étape nécessitant de changer de ligne. Le changement peut se faire soit au sein du même réseau, soit de manière intermodale, c'est-à-dire en changeant également de mode de transport.
La correspondance permet d'établir une liaison entre un arrêt physique (ou une zone d'arrêt de type << arrêt commercial >> ou de type << pôle d'échange >>) et un autre arrêt physique (ou une autre zone d'arrêt de type << arrêt commercial >> ou de type << pôle d'échange >>).
Cette liaison définit aussi une durée de parcours entre les arrêts (ou zones) reliés.
@@ -32,9 +32,9 @@ clé unique pérenne identifiant la correspondance pour les échanges Neptune
cet identifiant est composé de 3 parties : préfixe:type:id_technique
* préfixe : clé identifiant un producteur de données unique
* type = ConnectionLink : clé identifiant le type d'objet (valeur imposée)
-* id_technique : valeur identifiant un seul object d'un type donné pour un même producteur
+* id_technique : valeur identifiant un seul objet d'un type donné pour un même producteur
ce champ obligatoire est automatiquement généré s'il n'est pas renseigné
-il est possible aussi de ne renseigner que l'identifiant technique auquel cas la valeur sera complétée automatiquement.
+il est possible aussi de ne renseigner que l'identifiant technique, auquel cas la valeur sera complétée automatiquement.
=:
- Date de création := date à laquelle l'objet a été créé ou modifié pour la dernière fois
- Version := version de l'objet (auto incrémenté à chaque modification)
diff --git a/app/views/help/csv.textile b/app/views/help/csv.textile
index 053bf8865..9852b96b6 100644
--- a/app/views/help/csv.textile
+++ b/app/views/help/csv.textile
@@ -3,4 +3,97 @@ layout: default
title: Format d'échange CSV
---
-Rédaction ultérieure \ No newline at end of file
+Le format CSV utilise un caractère comme séparateur de champs, c'est le caractère « ; » qui est utilisé par défaut.
+Ce séparateur est configurable sur l'application WEB. Il est donc possible de le changer et le nouveau séparateur est pris en compte après redémarrage.
+Le format CSV est décrit par l'exemple ci-dessous (attention, le format est 'strict' ! et l'encodage attendu est en UTF-8)
+
+<notextile>
+<pre width="100%">
+
+;;;;;;;"Nom du réseau";"RER";;;;;
+;;;;;;;"Code Réseau";500;;;;;
+;;;;;;;"Description du réseau";"Réseau Express Régional ,exploités par la RATP et la SNCF";;;;;
+;;;;;;;;;;;;;
+;;;;;;;"Nom de l'entreprise de transport";"Régie Autonome des Transports Parisiens";;;;;
+;;;;;;;"Code Transporteur";100;;;;;
+;;;;;;;"Nom court";"RATP";;;;;
+;;;;;;;"Description du transporteur";"X";;;;;
+;;;;;;;"Code postal";75599;;;;;
+;;;;;;;"Téléphone";"01.01.01.01.01";;;;;
+;;;;;;;"Fax";"01.01.01.01.01";;;;;
+;;;;;;;"Email";"service@ratp.fr";;;;;
+;;;;;;;;;;;;;
+;;;;;;;"Nom de la ligne";"RER A";;;;;
+;;;;;;;"Nom public";"RER A";;;;;
+;;;;;;;"Numero de la ligne";"A";;;;;
+;;;;;;;"Commentaire de la ligne";"Ligne RER A";;;;;
+;;;;;;;"Mode de Transport (BUS,METRO,RER,TRAIN ou TRAMWAY)";"RER";;;;;
+;;;;;;;;;;;;;
+;;;;;;;"Horaires des courses";"Horaires";"Horaires";"Horaires";"Horaires";"Horaires";"Horaires"
+;;;;;;;"Nom de l'itinéraire";"X";;"X";"X";"X";"X"
+;;;;;;;"Nom public de l'itinéraire";"Marne-la-Valée-Chessy Cergy";;"Marne-la-Valée-Chessy Poissy";"X";"Poissy Marne-la-Valée-Chessy ";"X"
+;;;;;;;"Commentaire de l'itinéraire";"X";;"X";"X";"X";"X"
+;;;;;;;"Direction (ALLER/RETOUR)";"ALLER";"ALLER";"ALLER";"ALLER";"RETOUR";"RETOUR"
+;;;;;;;"Nom de la mission";"X";"X";"X";"X";"X";"X"
+;;;;;;;"Nom public de la mission";"UBUS";"X";"TROC";"X";"QENO";"X"
+;;;;;;;"Date de début d'application";26/07/04;;26/07/04;;30/08/04;
+;;;;;;;"Date de fin d'application";20/08/04;;20/08/04;;04/07/05;
+;;;;;;;"Commentaire sur la course";"X";"X";"X";"X";"X";"X"
+;;;;;;;"Lundi (O/N)";"O";;"O";;"N";
+;;;;;;;"Mardi (O/N)";"O";;"O";;"N";
+;;;;;;;"Mercredi (O/N)";"O";;"O";;"N";
+;;;;;;;"Jeudi (O/N)";"O";;"O";;"N";
+;;;;;;;"Vendredi (O/N)";"O";;"O";;"N";
+;;;;;;;"Samedi (O/N)";"N";;"O";;"O";
+;;;;;;;"Dimanche (O/N)";"N";;"O";;"O";
+;;;;;;;"Jour férié (O/N)";"N";;"O";;"O";
+;;;;;;;"Libellé du tableau de marche";"Vacances scolaires ";;"Vacances scolaires ";;"Les jours fériés et le weekend";
+"Code Postal";"Commentaire";"X";"Y";"latitude";"longitude";"Distance";"Liste des arrêts";"heure d'arrivée";"heure de départ";"heure d'arrivée";"heure de départ";"heure d'arrivée";"heure de départ"
+;;;;;;;"Marne-la-Valée-Chessy";;;;;;
+;;;;;;;"Val d'Europe";;;;;;
+;;;;;;;"Bussy-Saint-Georges";;;;;;
+;;"524286.00";"1840940.00";;;;"Torcy";09:30:00;09:30:00;10:20:00;10:20:00;07:12:00;07:12:00
+;;;;;;;"Lognes";09:31:00;09:31:00;10:21:00;10:21:00;07:11:00;07:11:00
+;;;;;;;"Noisiel";09:32:00;09:32:00;10:22:00;10:22:00;07:10:00;07:10:00
+;;;;;;;"Noisy-Champs";09:33:00;09:33:00;10:23:00;10:23:00;07:09:00;07:09:00
+;;;;;;;"Noisy-le-Grand--Mont d'Est";09:34:00;09:34:00;10:24:00;10:24:00;07:08:00;07:08:00
+;;;;;;;"Bry-sur-Marne ";09:35:00;09:35:00;10:25:00;10:25:00;07:07:00;07:07:00
+;;;;;;;"Neuilly-Plaisance";09:36:00;09:36:00;10:26:00;10:26:00;07:06:00;07:06:00
+;;;;;;;"Val de Fontenay";09:37:00;09:37:00;10:27:00;10:27:00;07`:05:00;07:05:00
+;;;;;;;"Boissy-Saint-Léger";;;;;;
+;;;;;;;"Sucy-Bonneuil";;;;;;
+;;;;;;;"La Varenne-Chennevières";;;;;;
+;;;;;;;"Champigny";;;;;;
+;;;;;;;"La Parc de Saint-maur";;;;;;
+;;;;;;;"Saint-Maur-Créteil";;;;;;
+;;;;;;;"Joinville-le-Pont";;;;;;
+;;;;;;;"Nogent-sur-Marne";;;;;;
+;;;;;;;"Fontenay-Sous-Bois";;;;;;
+;;;;;;;"Vincennes";09:38:00;09:38:00;10:27:30;10:27:30;06:55:00;06:55:00
+;;;;;;;"Nation";09:39:00;09:39:00;10:28:00;10:28:00;06:54:00;06:54:00
+;;;;;;;"Gare de Lyon";09:40:00;09:40:00;10:28:30;10:28:30;06:53:00;06:53:00
+;;;;;;;"Châtelet-Les-Halles";09:41:00;09:41:00;10:29:00;10:29:00;06:52:00;06:52:00
+;;;;;;;"Auber";09:42:00;09:42:00;10:29:30;10:29:30;06:51:00;06:51:00
+;;;;;;;"Charles de Gaulle-Etoile";09:43:00;09:43:00;10:30:00;10:30:00;06:50:00;06:50:00
+;;;;;;;"La Défense";09:44:00;09:44:00;10:30:30;10:30:30;06:49:00;06:49:00
+;;;;;;;"Nanterre-Préfecture";09:45:00;09:45:00;10:31:00;10:31:00;06:48:00;06:48:00
+;;;;;;;"Nanterre-Université";;;;;;
+;;;;;;;"Nanterre-Ville";;;;;;
+;;;;;;;"Rueil-Malmaison";;;;;;
+;;;;;;;"Chatou-Croissy";;;;;;
+;;;;;;;"Le vésinet-Centre";;;;;;
+;;;;;;;"Le vésinet-Le Pecq";;;;;;
+;;;;;;;"Saint-Germain-en-Laye";;;;;;
+;;;;;;;"Houilles-Carrières/Sine";09:46:00;09:46:00;10:32:00;10:32:00;06:40:00;06:40:00
+;;;;;;;"Sartrouville";09:47:00;09:47:00;10:33:00;10:33:00;06:39:00;06:39:00
+;;;;;;;"Maisons-Laffitte";09:48:00;09:48:00;10:34:00;10:34:00;06:38:00;06:38:00
+;;;;;;;"Achères-Ville";09:49:00;09:49:00;;;;
+;;;;;;;"Conflans-Fin d'Oise";09:50:00;09:50:00;;;;
+;;;;;;;"Neuville-Université";09:51:00;09:51:00;;;;
+;;;;;;;"Cergy-Préfecture";09:52:00;09:52:00;;;;
+;;;;;;;"Cergy-Saint-Christophe";09:53:00;09:53:00;;;;
+;;;;;;;"Cergy-le Haut";09:54:00;09:54:00;;;;
+;;;;;;;"Achères-Grand Cormier";;;10:35:00;10:35:00;06:31:00;06:31:00
+;;;;;;;"Poissy";;;10:36:00;10:36:00;06:30:00;06:30:00
+</pre>
+ </notextile> \ No newline at end of file
diff --git a/app/views/help/dataspaces.textile b/app/views/help/dataspaces.textile
index baa53e8af..3daf61b2e 100644
--- a/app/views/help/dataspaces.textile
+++ b/app/views/help/dataspaces.textile
@@ -5,7 +5,7 @@ title: Espaces de données
h3. Définition
-p. un espace de données est le lieu de stockage d'un ensemble de données de transport connectées entre elles.
+p. Un *espace de données* est le lieu de stockage d'un ensemble de données de transport connectées entre elles. Plusieurs attributs sont définis au niveau d'un espace de données.
h3. Attributs
@@ -15,12 +15,11 @@ h3. Attributs
- Projection géographique := référentiel de projection des coordonnées cartographiques en complément du WGS84
- Fuseau horaire := fuseau horaire applicable pour les horaires des courses. (cf "Tz_database":http://fr.wikipedia.org/wiki/Tz_database)
- Emprise par défaut := emprise (en WGS84) utilisée pour positionner les cartes lorsqu'il n'y a pas d'élément à afficher.
-- Import Neptune := fichier pour activer un "import":imports dès la création de la base (ce champs n'est pas conservé dans la base)
+- Import Neptune := fichier pour activer un "import":imports dès la création de la base (ce champ n'est pas conservé dans la base)
h3. Implémentation
-p. L'espace de données est concrétisé dans la base de données par un schéma au sens SQL portant le nom definit par l'attribut code,
-les attributs sont enregistrés dans la table REFERENTIALS du schema 'public'
+p. L'espace de données est concrétisé dans la base de données par un schéma au sens SQL portant le nom défini par l'attribut code, les attributs sont enregistrés dans la table REFERENTIALS du schema 'public'
-p. Les limitations de Posgres imposent qu'un nom de schéma soit en minuscule, commence par une lettre et les préfixes 'pg_' ainsi que 'public' sont réservés.
+p. Les limitations de PosgreSQL imposent qu'un nom de schéma soit en minuscule et commence par une lettre; les préfixes 'pg_' ainsi que 'public' sont réservés.
diff --git a/app/views/help/documentation.textile b/app/views/help/documentation.textile
index 2b3d1ff93..722b6c277 100644
--- a/app/views/help/documentation.textile
+++ b/app/views/help/documentation.textile
@@ -3,4 +3,6 @@ layout: default
title: Documentation
---
-La documentation de Chouette est disponible sur le site "Chouette.mobi":http://www.chouette.mobi/spip.php?rubrique15 \ No newline at end of file
+La documentation de Chouette (y compris le présent manuel utilisateur) est disponible sur le site "Chouette.mobi":http://www.chouette.mobi/spip.php?rubrique15
+
+Le présent manuel Utilisateur est par ailleurs livré sous forme d'aide en ligne avec l'application web. \ No newline at end of file
diff --git a/app/views/help/exports.textile b/app/views/help/exports.textile
index 3cd703bb4..79dda1b20 100644
--- a/app/views/help/exports.textile
+++ b/app/views/help/exports.textile
@@ -11,11 +11,11 @@ h3. Formats disponibles
- Neptune := format normalisé des échanges de données de transport en commun pour la France (cf "Normalisation":normalisation)
- CSV := format tabulaire spécifique à Chouette (cf "CSV":csv)
-- GTFS := format destiné à Google Transit (cf "GTFS":https://developers.google.com/transit/gtfs/)
+- GTFS := format destiné à ["Google Transit":https://developers.google.com/transit/gtfs/?hl=fr]
h3. Consultation des résultats
-p. L'iexport est lancé en différé; son état d'avancement est affiché sous la forme d'une icône donc la couleur dépend de l'état:
+p. L'export est lancé en différé; son état d'avancement est affiché sous la forme d'une icône donc la couleur dépend de l'état:
- bleu : en cours
- vert : terminé correctement; un lien de téléchargement est alors disponible
@@ -23,5 +23,5 @@ p. L'iexport est lancé en différé; son état d'avancement est affiché sous l
p. La consultation du résultat de l'export donnera la liste des éléments exportés ou les motifs de l'échec.
-p. le résultat est conservé ainsi que le fichier produit tant que l'export n'est pas supprimé.
+p. Le résultat est conservé ainsi que le fichier produit tant que l'export n'est pas supprimé.
diff --git a/app/views/help/faq.textile b/app/views/help/faq.textile
index c6a96e045..74bf2c8ff 100644
--- a/app/views/help/faq.textile
+++ b/app/views/help/faq.textile
@@ -3,4 +3,6 @@ layout: default
title: Foire aux questions
---
-Rédaction ultérieure \ No newline at end of file
+N'hésitez pas à nous solliciter pour toute question, nous compléterons la FAQ progressivement !
+
+"FAQ de chouette.mobi":http://www.chouette.mobi/spip.php?rubrique38 \ No newline at end of file
diff --git a/app/views/help/group_of_lines.textile b/app/views/help/group_of_lines.textile
new file mode 100644
index 000000000..efef28bb8
--- /dev/null
+++ b/app/views/help/group_of_lines.textile
@@ -0,0 +1,37 @@
+---
+layout: default
+title: Groupes de lignes
+---
+
+h3. Définition
+
+Un groupe de lignes regroupe un ensemble de lignes assurant un type de service commun ; ces lignes ne sont pas forcément du même réseau.
+Note 1: dans NeTex, le réseau est un groupe de ligne parmi les autres.
+
+Note 2: dans Neptune, une ligne ne peut appartenir qu'à un seul groupe de ligne; donc dans l'export Neptune, un seul groupe sera exporté.
+
+
+h3. Attributs
+
+- Nom := nom du groupe de lignes
+- Lignes := liste des "lignes":lines affectées au groupe
+
+p(attr_data). Données de gestion :
+
+- Identifiant Neptune :=
+clé unique pérenne identifiant le groupe de lignes pour les échanges Neptune
+cet identifiant est composé de 3 parties : préfixe:type:id_technique
+* préfixe : clé identifiant un producteur de données unique
+* type = GroupOfLine : clé identifiant le type d'objet (valeur imposée)
+* id_technique : valeur identifiant un seul objet d'un type donné pour un même producteur
+ce champ obligatoire est automatiquement généré s'il n'est pas renseigné
+il est possible aussi de ne renseigner que l'identifiant technique auquel cas la valeur sera complétée automatiquement.
+=:
+- Date de création := date à laquelle l'objet a été créé ou modifié pour la dernière fois
+- Version := version de l'objet (auto incrémenté à chaque modification)
+- Créé par := compte utilisateur ayant procédé à la dernière modification
+
+h3. Implémentation
+
+p. TODO
+
diff --git a/app/views/help/imports.textile b/app/views/help/imports.textile
index bdf2937a5..9412dfdb3 100644
--- a/app/views/help/imports.textile
+++ b/app/views/help/imports.textile
@@ -5,12 +5,13 @@ title: Imports
h3. Rôle
-p. L'import permet d'enregistrer dans la base un ensemble de données selon un format
+p. L'import permet d'enregistrer dans la base un ensemble de données selon un format au choix
h3. Formats disponibles
- Neptune := format normalisé des échanges de données de transport en commun pour la France (cf "Normalisation":normalisation)
- CSV := format tabulaire spécifique à Chouette (cf "CSV":csv)
+- GTFS := format originaire de ["Google Transit":https://developers.google.com/transit/gtfs/?hl=fr]
h3. Consultation des résultats
@@ -22,6 +23,6 @@ p. L'import est lancé en différé; son état d'avancement est affiché sous la
p. La consultation du résultat de l'import donnera les éléments importés ou les motifs de l'échec.
-p. le résultat est conservé tant que l'import n'est pas supprimé.
+p. Le résultat est conservé tant que l'import n'est pas supprimé.
-p. Note : la suppression d'un import ne fait que supprimer le rapport; les données sonot conservées
+p. Note : la suppression d'un import ne fait que supprimer le rapport; les données sont conservées
diff --git a/app/views/help/index.textile b/app/views/help/index.textile
index 06a54a636..f26bc6350 100644
--- a/app/views/help/index.textile
+++ b/app/views/help/index.textile
@@ -3,7 +3,7 @@ layout: default
title: Chouette v2
---
-Version 2.0.0
+Version 2.0.3
h3. Logiciel libre propriété de :
@@ -21,3 +21,32 @@ Ce logiciel est régi par la licence CeCILL-B soumise au droit français et resp
En contrepartie de l'accessibilité au code source et des droits de copie, de modification et de redistribution accordés par cette licence, il n'est offert aux utilisateurs qu'une garantie limitée. Pour les mêmes raisons, seule une responsabilité restreinte pèse sur l'auteur du programme, le titulaire des droits patrimoniaux et les concédants successifs.
A cet égard l'attention de l'utilisateur est attirée sur les risques associés au chargement, à l'utilisation, à la modification et/ou au développement et à la reproduction du logiciel par l'utilisateur étant donné sa spécificité de logiciel libre, qui peut le rendre complexe à manipuler et qui le réserve donc à des développeurs et des professionnels avertis possédant des connaissances informatiques approfondies. Les utilisateurs sont donc invités à charger et tester l'adéquation du logiciel à leurs besoins dans des conditions permettant d'assurer la sécurité de leurs systèmes et ou de leurs données et, plus généralement, à l'utiliser et l'exploiter dans les mêmes conditions de sécurité.
+
+h3. Notes de version
+
+h4. V2.0.3
+
+* Ajout des imports/export NeTex
+* Fonctionnement sous windows
+* Prise en compte de grandes quantités de calendriers.
+* Reprise des logs d'import Neptune
+
+h4. V2.0.2
+
+* Ajout de l'import GTFS (expérimental, ne traite pas les stations)
+* Ajout d'API Rest pour accéder aux données depuis une autre application
+
+h4. V2.0.1
+
+* Ajout de la gestion des groupes de lignes
+* Ajout de la gestion des accès et des relations arrêts-accès
+* Ajout d'une vue calendaire des calendriers d'application
+* Améliorations ergonomiques et cartographiques
+* L'import Neptune accepte les principaux formats d'encodage : ISO-8859-1, UTF-8, ...
+
+h4. V2.0.0
+
+* refonte de l'interface graphique
+* ajout d'une gestion simplifiée d'utilisateurs :
+** ajout d'une notion d'organisation
+** ajout d'une notion d'espace de données
diff --git a/app/views/help/introduction.textile b/app/views/help/introduction.textile
index 8cda121c5..ffa00ae49 100644
--- a/app/views/help/introduction.textile
+++ b/app/views/help/introduction.textile
@@ -3,13 +3,7 @@ layout: default
title: Introduction
---
-CHOUETTE est un logiciel libre développé à l'initiative du ministère français chargé des transports (et du développement durable),
-dans le but de faciliter l'échange de données d'offre (théorique) de transport collectif (TC),
-en s'appuyant pour cela sur la norme NFP 99506, dite Neptune, qui spécifie un profil d'échange XML.
-
-Les utilisateurs visés sont les collectivités locales Autorités Organisatrices de Transport (AOT),
-les exploitants des réseaux TC ,et leurs prestataires (bureaux d'étude ou société de services).
-D'autres utilisateurs potentiels sont néanmoins identifiés : services de l'état, éditeurs de logiciels,
-opérateurs de services d'information, chercheurs...
-
+CHOUETTE est un logiciel libre développé à l'initiative du ministère français chargé des transports (et du développement durable), dans le but de faciliter l'échange de données d'offre (théorique) de transport collectif (TC), en s'appuyant pour cela sur la norme NFP 99506, dite Neptune, qui spécifie un profil d'échange XML.
+Les utilisateurs visés sont les collectivités locales Autorités Organisatrices de Transport (AOT), les exploitants des réseaux TC ,et leurs prestataires (bureaux d'étude ou société de services).
+D'autres utilisateurs potentiels sont néanmoins identifiés : services de l'état, éditeurs de logiciels, opérateurs de services d'information, chercheurs...
diff --git a/app/views/help/journeypatterns.textile b/app/views/help/journeypatterns.textile
index d491fc7db..f9278ad75 100644
--- a/app/views/help/journeypatterns.textile
+++ b/app/views/help/journeypatterns.textile
@@ -5,7 +5,7 @@ title: Missions
h3. Définition
-Si on considère la suite ordonnée des arrêts d'une séquence d'arrêts, la mission se définit comme une suite extraite. Autrement dit, toutes les courses d'une séquence d'arrêts qui desservent les mêmes arrêts et dans le même ordre, à des horaires différents éventuellement, référencent la même mission. La mission correspond donc à une suite ordonnée d'arrêts de la séquence d'arrêts.
+Une *mission* se définit comme une suite extraite de la suite ordonnée des arrêts d’une "séquence d’arrêts":routes. Autrement dit, toutes les courses d'une séquence d'arrêts qui desservent les mêmes arrêts et dans le même ordre, à des horaires différents éventuellement, référencent la même mission. La mission correspond donc à une suite ordonnée d'arrêts de la séquence d'arrêts.
h3. Attributs
@@ -21,9 +21,9 @@ clé unique pérenne identifiant la mission pour les échanges Neptune
cet identifiant est composé de 3 parties : préfixe:type:id_technique
* préfixe : clé identifiant un producteur de données unique
* type = JourneyPattern : clé identifiant le type d'objet (valeur imposée)
-* id_technique : valeur identifiant un seul object d'un type donné pour un même producteur
+* id_technique : valeur identifiant un seul objet d'un type donné pour un même producteur
ce champ obligatoire est automatiquement généré s'il n'est pas renseigné
-il est possible aussi de ne renseigner que l'identifiant technique auquel cas la valeur sera complétée automatiquement.
+il est possible aussi de ne renseigner que l'identifiant technique, auquel cas la valeur sera complétée automatiquement.
=:
- Date de création := date à laquelle l'objet a été créé ou modifié pour la dernière fois
- Version := version de l'objet (auto incrémenté à chaque modification)
diff --git a/app/views/help/lines.textile b/app/views/help/lines.textile
index 7263dd04b..b75aca883 100644
--- a/app/views/help/lines.textile
+++ b/app/views/help/lines.textile
@@ -5,7 +5,7 @@ title: Lignes
h3. Définition
-Une ligne référence un réseau et un transporteur; par ailleurs la ligne se compose d'un ou plusieurs itinéraires.
+Une *ligne* référence un réseau et un transporteur; par ailleurs la ligne se compose d'un ou plusieurs itinéraires.
La ligne dispose aussi d'un identifiant fonctionnel (<< numéro d'enregistrement >>) qui est utilisé dans les échanges XML pour identifier la ligne et la mettre à jour; il est donc important que le gestionnaire de la base CHOUETTE le renseigne d'une manière bien définie et pérenne.
h3. Attributs
@@ -13,7 +13,7 @@ h3. Attributs
- Réseau := réseau d'appartenance de la ligne
- Transporteur :=
transporteur principal exploitant la ligne
-les autres transporteurs de la lignes sont référencés au niveau de chaque course
+les autres transporteurs de la lignes peuvent être référencés au niveau de chaque course
=:
- Nom := nom de la ligne
- Nom public := nom de la ligne connu des usagers
@@ -21,9 +21,10 @@ les autres transporteurs de la lignes sont référencés au niveau de chaque cou
- Indice := indice de la ligne
- Mode de transport :=
mode de transport principal de la ligne
-les modes de transports particuliers sont indiqués au niveau de chaque course
+d'autres modes de transports particuliers peuvent être indiqués au niveau de chaque course
=:
- Commentaire := zone de texte libre sur la ligne
+- Groupes de lignes := "groupes de lignes":group_of_lines auxquels appartient la ligne
p(attr_data). Données de gestion :
@@ -32,9 +33,9 @@ clé unique pérenne identifiant la ligne pour les échanges Neptune
cet identifiant est composé de 3 parties : préfixe:type:id_technique
* préfixe : clé identifiant un producteur de données unique
* type = Line : clé identifiant le type d'objet (valeur imposée)
-* id_technique : valeur identifiant un seul object d'un type donné pour un même producteur
+* id_technique : valeur identifiant un seul objet d'un type donné pour un même producteur
ce champ obligatoire est automatiquement généré s'il n'est pas renseigné
-il est possible aussi de ne renseigner que l'identifiant technique auquel cas la valeur sera complétée automatiquement.
+il est possible aussi de ne renseigner que l'identifiant technique, auquel cas la valeur sera complétée automatiquement.
=:
- Date de création := date à laquelle l'objet a été créé ou modifié pour la dernière fois
- Version := version de l'objet (auto incrémenté à chaque modification)
diff --git a/app/views/help/networks.textile b/app/views/help/networks.textile
index adf7bb5a8..aabd3cab8 100644
--- a/app/views/help/networks.textile
+++ b/app/views/help/networks.textile
@@ -5,9 +5,9 @@ title: Réseaux
h3. Définition
-Un réseau est constitué par les "lignes":lines, les "séquences d'arrêts":routes, les "Interdictions de Trafic Local":stop_areas (ITL), les "horaires":vehiclejourneys, et les "courses":vehiclejourneys qui le définissent.
+Un *réseau* est constitué par les "lignes":lines, les "séquences d'arrêts":routes, les "Interdictions de Trafic Local":stop_areas (ITL), les "horaires":vehiclejourneys, et les "courses":vehiclejourneys qui le définissent.
-Chaque réseau dispose d'un identifiant fonctionnel (<< numéro d'enregistrement >>) qui est utilisé dans les échanges XML pour identifier le réseau et le mettre à jour. Il est donc important que le gestionnaire le renseigne d'une manière bien définie et pérenne.
+Chaque réseau dispose d'un identifiant fonctionnel (<< numéro d'enregistrement >>) qui est utilisé dans les échanges XML pour identifier le réseau et le mettre à jour. Il est très important que le gestionnaire le renseigne d'une manière bien définie et pérenne.
h3. Attributs
@@ -27,9 +27,9 @@ clé unique pérenne identifiant le réseau pour les échanges Neptune
cet identifiant est composé de 3 parties : préfixe:type:id_technique
* préfixe : clé identifiant un producteur de données unique
* type = GroupOfLine : clé identifiant le type d'objet (valeur imposée)
-* id_technique : valeur identifiant un seul object d'un type donné pour un même producteur
+* id_technique : valeur identifiant un seul objet d'un type donné pour un même producteur
ce champ obligatoire est automatiquement généré s'il n'est pas renseigné
-il est possible aussi de ne renseigner que l'identifiant technique auquel cas la valeur sera complétée automatiquement.
+il est possible aussi de ne renseigner que l'identifiant technique, auquel cas la valeur sera complétée automatiquement.
=:
- Date de création := date à laquelle l'objet a été créé ou modifié pour la dernière fois
- Version := version de l'objet (auto incrémenté à chaque modification)
diff --git a/app/views/help/normalisation.textile b/app/views/help/normalisation.textile
index 875a52cfc..fb8f7d6e3 100644
--- a/app/views/help/normalisation.textile
+++ b/app/views/help/normalisation.textile
@@ -5,15 +5,17 @@ title: Normalisation
Le projet Chouette a été développé dans le cadre de la normalisation de l'information sur les transports publics (AFNOR/BNEVT CN03/GT7), en vue de faciliter l'interopérabilité des systèmes et en particulier les échanges de données entre Systèmes d'Information Multimodale.
+Le site web "www.normes-donnees-tc.org":http://www.normes-donnees-tc.org, maintenu en parallèle du site "www.chouette.mobi":http://www.chouette.mobi, est un bon point d'entrée pour trouver les informations concernant la normalisation des données pour les transports publics.
+
h3. TRANSMODEL (EN12896)
La norme européenne TRANSMODEL constitue le modèle conceptuel de données sur lequel s'appuie l'ensemble des travaux normatifs (Neptune, SIRI, IFOPT, NETEX) . Elle est actuellement validée dans sa version 5.1.
-Elle a pour objectif de décrire les différents concepts utilisés au sein des multiples métiers du transport public (aussi bien dans le domaine de l'exploitation, de la régulation que dans celui de l'information voyageur) en usant de la modélisation UML. Cette description a abouti à la constitution d'un "dictionnaire" dans lequel chacun peut venir piocher la terminologie adéquate pour pouvoir désigner, quels que soient la structure et le métier de l'intéressé, de façon homogène et non ambigu&eumlc; les concepts qu'il va décliner dans son application.
+Elle a pour objectif de décrire les différents concepts utilisés au sein des multiples métiers du transport public (aussi bien dans le domaine de l'exploitation, de la régulation que dans celui de l'information voyageur) en usant de la modélisation UML. Cette description a abouti à la constitution d'un "dictionnaire" dans lequel chacun peut venir piocher la terminologie adéquate pour pouvoir désigner, quels que soient la structure et le métier de l'intéressé, de façon homogène et non ambiguëe les concepts qu'il va décliner dans son application.
h3. de TRIDENT à NEPTUNE (PR NF P99-506)
-Dans le cadre de la commission de normalisation CN03 pour les applications télématiques dans les transports publics, miroir du groupe européen CEN TC278 / WG3, un groupe de travail GT7 a été créé en 2002 pour normaliser les échanges de données concernant l'information aux voyageurs entre exploitants et Autorités Organisatrices de transport.
+Dans le cadre de la "commission de normalisation CN03 pour les applications télématiques dans les transports publics":http://www2.afnor.org/espace_normalisation/structure.aspx?commid=86672, miroir du groupe européen CEN TC278 / WG3, un groupe de travail GT7 a été créé en 2002 pour normaliser les échanges de données concernant l'information aux voyageurs entre exploitants et Autorités Organisatrices de transport.
Après examen des travaux en cours au niveau européen, il est apparu au groupe que les spécifications d'échange élaborées dans le cadre du projet européen TRIDENT étaient la meilleure base de travail sur laquelle s'appuyer pour la normalisation.
Ces spécifications d'échange couvrent l'information VP et TC, théorique et en situation perturbée; elles s'appuient sur :
@@ -21,23 +23,23 @@ Ces spécifications d'échange couvrent l'information VP et TC, théorique et en
* un modèle de données orienté objets décrit en UML, reprenant pour ce qui concerne les transports publics, le modèle conceptuel de données Transmodel V4.0, normalisé au niveau européen ;
* un format d'échange XML spécifié sous forme de schémas XSD.
-Les spécifications TRIDENT ont été implémentées dans plusieurs pays européens, et en France ont été mises en &oelig;uvre par la RATP pour son système d'information sur les situations perturbées SIPRE, et également pour les échanges d'information au niveau francilien en cours entre les systèmes de la RATP et du STIF, pour ce qui concerne l'information théorique.
+Les spécifications TRIDENT ont été implémentées dans plusieurs pays européens, et en France ont été mises en oeuvre par la RATP pour son système d'information sur les situations perturbées SIPRE, et également pour les échanges d'information au niveau francilien en cours entre les systèmes de la RATP et du STIF, pour ce qui concerne l'information théorique.
Le travail du groupe GT7 a abouti à des spécifications de profil d'échange TRIDENT / Chouette en 2006, qui ont servi de référence pour implémenter le logiciel CHOUETTE et sont utilisées depuis lors par plusieurs projets de SIM en France.
Lors des discussions précédant l'enquête probatoire AFNOR en 2009 en vue faire de ces spécifications une norme française, ces spécifications ont été complétées par quelques éléments de données relatifs à l'accessibilité des transports : le nouveau profil d'échange baptisé *NEPTUNE* (PR NF99-506 Décembre 2009) a été adopté en janvier 2010. Il y a compatibilité ascendante avec les fichiers au profil Trident/Chouette dont Neptune est une extension.
-h3. Le profile d'échange NEPTUNE
+h3. Le profil d'échange NEPTUNE
-Le développement des Systèmes d'Information Multimodale a conduit les partenaires des transports publics en France (AOT et opérateurs, représentants d'utilisateurs et administrations publiques) dans leur ensemble à demander l'inscription de ce profil d'échange en tant que 'norme pleine'. L'adoption de ce statut de norme est d'autant plus important aujourd'hui, que les outils précités vont connaître des périodes d'évolution et d'adaptation.
+Le développement des Systèmes d'Information Multimodale a conduit les acteurs des transports publics en France (AOT et opérateurs, représentants d'utilisateurs et administrations publiques) dans leur ensemble à demander l'inscription de ce profil d'échange en tant que 'norme pleine'. L'adoption de ce statut de norme est d'autant plus important aujourd'hui, que les outils précités vont connaître des périodes d'évolution et d'adaptation.
-Dans le cadre du processus de normalisation, le profil d'échange a été rebaptisé NEPTUNE et complété . Le processus s'est conclu début 2010 par l'adoption d'un document AFNOR (cf. PR NF P99-506) .
+Dans le cadre du processus de normalisation, le profil d'échange a été rebaptisé NEPTUNE et complété. Le processus s'est conclu début 2010 par l'adoption d'un document AFNOR (cf. PR NF P99-506) .
En pratique, l'essentiel est de savoir que le profil TRIDENT/CHOUETTE est compatible avec NEPTUNE : Neptune reprend l'essentiel de Trident profil Chouette, et n'a été complété qu'en ce qui concerne l'information sur l'accessibilité aux Personnes à Mobilité Réduite et les accès. En particulier, le nommage des éléments de données du profil XSD n'a pas été modifié.
Ce profil résulte d'un consensus entre les différentes parties prenantes participant au groupe de travail de normalisation CN03/GT7. Il est rédigé en français. Dans certains cas, pour éviter des confusions ou des contre-sens, les concepts de la norme TRANSMODEL qui ont été manipulés sont rappelés dans leur terminologie, voire leur définition en anglais dans le texte original de la norme TRANSMODEL V5.1 qui vaut référence. Les rapprochements nécessaires ont été faits avec la version provisoire en français de la norme TRANSMODEL en cours de validation.
-Ce profil sera sans doute amené à évoluer en fonction des travaux réalisés dans le cadre des travaux de normalisation européens ou internationaux en cours. Ceux-ci touchent tout à la fois la représentation topographique des réseaux de transport, les interfaces entre les données d'exploitation et l'information diffusée vers le voyageur avant et pendant le voyage (NeTEX ), la description des points d'arrêts et points fixes (IFOPT2) , les interfaces avec la billettique et les autres échanges de données envisageables dans les métiers des transports publics (TRANSMODEL).
+Ce profil sera sans doute amené à évoluer en fonction des travaux réalisés dans le cadre des travaux de normalisation européens ou internationaux en cours. Ceux-ci touchent tout à la fois la représentation topographique des réseaux de transport, les interfaces entre les données d'exploitation et l'information diffusée vers le voyageur avant et pendant le voyage (NeTEX), la description des points d'arrêts et points fixes (IFOPT) , les interfaces avec la billettique et les autres échanges de données envisageables dans les métiers des transports publics (TRANSMODEL).
Le profil d'échange NEPTUNE (PR NF P99-506 Décembre 2009) et donc l'outil CHOUETTE se limitent aux échanges d'information concernant la description " statique " de l'offre TC (réseau, horaires), et ne couvrent pas l'information en temps réel.
diff --git a/app/views/help/prerequisite.textile b/app/views/help/prerequisite.textile
new file mode 100644
index 000000000..463a93009
--- /dev/null
+++ b/app/views/help/prerequisite.textile
@@ -0,0 +1,18 @@
+---
+layout: default
+title: Pré-requis (Navigateur Internet)
+---
+
+L'utilisation de l'application nécessite de disposer d'un navigateur ayant les caractéristiques suivantes :
+
+* Internet Explorer (Version 8 et +)
+* Mozilla FireFox (Version 12 et +)
+* Chrome (Version 8 et +)
+
+Le navigateur doit autoriser l'exécution de Javascript.
+
+L'utilisateur peut utiliser l'application CHOUETTE depuis le site www.chouette.mobi ou bien procéder à l'installation du logiciel directement sur son environnement personnel, en tant que serveur ou machine virtuelle. CHOUETTE est également disponible sans la web application, en ligne de commande (documentation séparée).
+
+Une fois identifié, l'utilisateur accède à un écran organisé autour des données à gérer : un onglet permet de gérer (créer, modifier, supprimer) chaque type de données. L'application est disponible également en version anglaise et comprend la présente aide en ligne (en français uniquement).
+
+Le manuel Utilisateur est organisé par sections correspond aux principales données gérées par l'application Chouette : Utilisateurs et Organisations, Espace de données, Réseaux, Transporteurs, Lignes, Arrêts, Correspondances, Calendriers, complété par des points divers : jeux de données, format CSV, FAQ. \ No newline at end of file
diff --git a/app/views/help/restapis.textile b/app/views/help/restapis.textile
index 07bfccd93..2bd3d2d2d 100644
--- a/app/views/help/restapis.textile
+++ b/app/views/help/restapis.textile
@@ -3,28 +3,57 @@ layout: default
title: API Rest
---
-h3. Syntaxe
+h3. Présentation
+
+Rails offre une interface Rest native permettant d'accéder aux objets du modèle selon des règles simples
+
+Celles-ci sont disponibles mais se limitent aux règles de navigation de l'IHM de Chouette, elle est donc déconseillée.
+
+Une API dédiée à des accès automatisés est donc ajoutée afin de permettre des développement externes exploitant les données de Chouette sans s'inclure dans l'application ni devoir disposer d'un accès direct à la base.
+
+h3. API REST Chouette
+
+h4. Principe
+
+Ces interfaces externes REST (notées API) sont des Web Service (noté WS) qui donnent un accès en consultation à la topologie d’un référentiel.
+
+Les WS proposent 2 sortes de requêtes REST
+* la requête « index » qui liste des éléments de topologie avec éventuellement un paramètre de filtre
+* la requête « show » qui donne le détail d’un élément de topologie
+
+Pour garantir la sécurité, ces API nécessitent une clé d'authentification créée à partir du tableau de bord du référentiel.
+La clé doit être positionnée dans la propriété HTTP_AUTHORIZATION de l'entête de la requête.
+* Token token = [clé]
+Cette clé permet de garantir la sécurité et de diriger l'API rest sur le bon référentiel.
+
+Ces API sont plus amplement décrites dans le document SFT-Chouette Définition des API REST V1 disponible sur "chouette.mobi":http://chouette.mobi
+
+h4. Syntaxe
Les différents objets Neptune sont accessibles dans Chouette par l'URL Rest:
-??[URL_server]/[referential_id]/[Objects]/[id].[format]??
+??[URL_server]/api/v1/[Objects]/[objectId].[format]??
la liste des objets d'un même type peut être obtenue par l'URL REST :
-??[URL_server]/[referential_id]/[Objects].[format]??
+??[URL_server]/api/v1/[Objects].[format][?q filtre]??
où :
* URL_server : l'adresse web d'installation du serveur Chouette
-* referential_id: l'identifiant de l'espace de données
* Objects: le type d'objet demandé (au pluriel)
** networks
** lines
** companies
** ...
-* id : l'identifiant de l'objet désiré
+* objectId : l'identifiant Neptune de l'objet désiré
* format : le format de sortie :
** json
** xml
+* filtre : filtre de sélection "ransack":https://github.com/ernie/ransack/wiki/Basic-Searching
+
+h4. exemples
-h3. Exemples
+* http://chouette.mobi/chouette2/api/v1/lines.xml?q%5Bname_or_number_cont%5D=34
+Dans cet exemple le critère porte sur les champs « name » et « number » dont l'un des 2 doit contenir la chaine « 34 ».
+(note: 5B et 5D sont les codes ascii des crochets ouvrants [ et fermants ] )
-??http://chouette.dryade.net/chouette2/referentials/4/lines/674.json??
-??http://chouette.dryade.net/chouette2/referentials/4/lines/674.xml??
+* http://localhost:3000/api/v1/lines/Tatrobus:Line:3.json
+Cet exemple retourne les attributs de la ligne 3 du réseau Tatrobus au format json
diff --git a/app/views/help/routes.textile b/app/views/help/routes.textile
index 6397ffe71..6edc24ce6 100644
--- a/app/views/help/routes.textile
+++ b/app/views/help/routes.textile
@@ -5,7 +5,9 @@ title: Séquence d'arrêts
h3. Définition
-La séquence d'arrêts est une sélection ordonnée de références aux points d'arrêt (exemple: itinéraires aller et retour d'une ligne). Une séquence d'arrêts est spécifique à une ligne; les séquences d'arrêts peuvent référencer des arrêts communs.
+La *séquence d'arrêts* est une sélection ordonnée de références aux "points d'arrêt":stop_areas (exemple: itinéraires aller et retour d'une ligne). Une séquence d'arrêts est spécifique à une "ligne":line; les séquences d'arrêts peuvent référencer des arrêts communs.
+
+(Dans les versions antérieures de Chouette jusqu'à la 1.6, la séquence d'arrêts était intitulée 'itinéraire')
h3. Attributs
@@ -24,9 +26,9 @@ clé unique pérenne identifiant la séquence d'arrêts pour les échanges Neptu
cet identifiant est composé de 3 parties : préfixe:type:id_technique
* préfixe : clé identifiant un producteur de données unique
* type = Route : clé identifiant le type d'objet (valeur imposée)
-* id_technique : valeur identifiant un seul object d'un type donné pour un même producteur
+* id_technique : valeur identifiant un seul objet d'un type donné pour un même producteur
ce champ obligatoire est automatiquement généré s'il n'est pas renseigné
-il est possible aussi de ne renseigner que l'identifiant technique auquel cas la valeur sera complétée automatiquement.
+il est possible aussi de ne renseigner que l'identifiant technique, auquel cas la valeur sera complétée automatiquement.
=:
- Date de création := date à laquelle l'objet a été créé ou modifié pour la dernière fois
- Version := version de l'objet (auto incrémenté à chaque modification)
diff --git a/app/views/help/schema.textile b/app/views/help/schema.textile
index 1ee7f365d..8ac1ad6fa 100644
--- a/app/views/help/schema.textile
+++ b/app/views/help/schema.textile
@@ -3,4 +3,6 @@ layout: default
title: Vue d'ensemble
---
-Rédaction ultérieure \ No newline at end of file
+L'IHM ne reflète pas l'intégralité des données existant en base.
+
+Par ailleurs lorsque l'application est utilisée par un administrateur central traitant de plusieurs réseaux, il sera utile d'établir lors d'une discussion initiale des accords locaux entre les partenaires pour une dénomination et des processus de saisie homogènes. \ No newline at end of file
diff --git a/app/views/help/stop_areas.textile b/app/views/help/stop_areas.textile
index 2377cfd8d..8bed87b65 100644
--- a/app/views/help/stop_areas.textile
+++ b/app/views/help/stop_areas.textile
@@ -7,22 +7,22 @@ title: Arrêts
* "Attributs":#attr
* "Mode opératoire":#ope
-h3(#def). Définition
+h3(#def). Définitions
Le référentiel des arrêts constitue un maillon essentiel du réseau, et se compose de plusieurs éléments de niveaux différents.
On recense tout d'abord les arrêts physiques, qualifiés de *point d'embarquement* ou de *quai*.
-Du fait de l'existence de deux concepts dans TRIDENT, cet arrêt physique sera considéré par l'application comme une *zone d'arrêt de premier niveau*. Cette notion est nécessaire pour gérer les *points d'arrêts sur itinéraire* utilisés par certains réseaux.
+Du fait de l'existence de deux concepts dans le schéma TRIDENT, cet arrêt physique sera considéré par l'application comme une *zone d'arrêt de premier niveau*. Cette notion est nécessaire pour gérer les *points d'arrêts sur itinéraire* utilisés par certains réseaux.
L'application gère ensuite les points d'arrêts sur itinéraire à partir de ces arrêts physiques, en assurant le regroupement des points d'arrêt sur itinéraire dans un arrêt physique (cas de plusieurs lignes passant par le même arrêt physique).
-Par la suite, vous pourrez regrouper deux (ou plus) arrêts physiques au sein d'un *arrêt commercial* (par exemple pour regrouper les points d'arrêt physiques correspondant à deux poteaux d'arrêt de la même ligne situés de part et d'autre d'une chaussée mais aussi pour regrouper l'ensemble des points d'arrêt physiques d'un quai de gare routière pour lesquels vous considérez que le temps de correspondance est nul). Vous aurez ainsi constitué une zone d'arrêt, avec qualification arrêt commercial, de deuxième niveau.
+Par la suite, on peut regrouper deux (ou plus) arrêts physiques au sein d'un *arrêt commercial* (par exemple pour regrouper les points d'arrêt physiques correspondant à deux poteaux d'arrêt de la même ligne situés de part et d'autre d'une chaussée mais aussi pour regrouper l'ensemble des points d'arrêt physiques d'un quai de gare routière pour lesquels on considère que le temps de correspondance est nul). Vous aurez ainsi constitué une *zone d'arrêt*, avec qualification *arrêt commercial*, de deuxième niveau.
-Enfin, CHOUETTE vous offre la possibilité de regrouper les lieux d'arrêt agglomérés ainsi créés au sein d'une *zone d'arrêt de troisième niveau* pour constituer des *pôles d'échange*.
+Enfin, CHOUETTE offre la possibilité de regrouper les lieux d'arrêt agglomérés ainsi créés au sein d'une *zone d'arrêt de troisième niveau* pour constituer des *pôles d'échange*.
Ainsi on obtient les possibilités de regroupements suivants:
-* un arrêt physique regroupe plusieurs arrêts itinéraire.
+* un arrêt physique regroupe plusieurs arrêts sur itinéraire (ou séquence d'arrêts).
* un arrêt commercial regroupe plusieurs arrêts physiques (quai, embarquement).
* un pôle d'échange regroupe plusieurs arrêts commerciaux.
@@ -30,7 +30,7 @@ Pour ne pas aboutir à un système trop complexe, les règles suivantes sont pos
* un pôle d'échange peut contenir des arrêts commerciaux et/ou des pôles d'échanges (qui ne peuvent pas en contenir d'autres).
* un arrêt commercial ne peut contenir que des arrêts physiques.
-Un dernier regourpement est *l'ITL* :
+Un dernier regroupement est *l'ITL* :
*L'interdiction de trafic local* est l'interdiction faite à un service routier de prendre et de laisser un même voyageur à l'intérieur du périmètre des transports urbains _(cf. Décret n°49-1473 du 14 novembre 1949)_ .
Ainsi dans CHOUETTE:
@@ -69,10 +69,10 @@ p(attr_data). Données de gestion :
clé unique pérenne identifiant la ligne pour les échanges Neptune
cet identifiant est composé de 3 parties : préfixe:type:id_technique
* préfixe : clé identifiant un producteur de données unique
-* type = Line : clé identifiant le type d'objet (valeur imposée)
-* id_technique : valeur identifiant un seul object d'un type donné pour un même producteur
+* type = StopArea : clé identifiant le type d'objet (valeur imposée)
+* id_technique : valeur identifiant un seul objet d'un type donné pour un même producteur
ce champ obligatoire est automatiquement généré s'il n'est pas renseigné
-il est possible aussi de ne renseigner que l'identifiant technique auquel cas la valeur sera complétée automatiquement.
+il est possible aussi de ne renseigner que l'identifiant technique, auquel cas la valeur sera complétée automatiquement.
=:
- Date de création := date à laquelle l'objet a été créé ou modifié pour la dernière fois
- Version := version de l'objet (auto incrémenté à chaque modification)
@@ -82,8 +82,8 @@ h3(#ope). Mode opératoire
h4. Déplacement sur la carte
-* activer le déplacement en cliquant sur l'arrêt -> le curseur prend la forme d'une quadruple flêche
+* activer le déplacement en cliquant sur l'arrêt -> le curseur prend la forme d'une quadruple flèche
* appuyer sur le bouton gauche de la souris et maintenir appuyer lors du déplacement -> l'arrêt suit la souris
-* relacher le bouton -> l'arrêt a une nouvelle position fixe
+* relâcher le bouton -> l'arrêt a une nouvelle position fixe
* cliquer sur la carte -> sortie du mode déplacement; les coordonnées sont actualisées dans le formulaire
diff --git a/app/views/help/timetables.textile b/app/views/help/timetables.textile
index 9bd187943..e3d56eed9 100644
--- a/app/views/help/timetables.textile
+++ b/app/views/help/timetables.textile
@@ -5,7 +5,7 @@ title: Calendriers d'application
h3. Définition
-Un calendrier d'application permet de définir la période de validité des horaires d'une course.
+Un *calendrier* d'application permet de définir la période de validité des horaires d'une "course":vehicle_journeys.
Les calendriers d'application sont donc définis indépendamment des lignes, à l'instar du référentiel des arrêts.
La manière de définir un calendrier d'application est restreinte.
@@ -13,7 +13,7 @@ Les calendriers sont caractérisés par :
* une liste de quantièmes (jours calendaires dans l'année)
* une liste de jours d'application (lundis, mardis, etc.)
-* une liste de périodes
+* une liste de périodes sur lesquelles s'appliquent les jours d'application
L'utilisateur doit donc faire attention au nommage de ses différents calendriers d'application.
@@ -41,9 +41,9 @@ cet identifiant est composé de 3 parties : préfixe:type:id_technique
* préfixe : clé identifiant un producteur de données unique
* type = Timetable : clé identifiant le type d'objet (valeur imposée)
-* id_technique : valeur identifiant un seul object d'un type donné pour un même producteur
+* id_technique : valeur identifiant un seul objet d'un type donné pour un même producteur
ce champ obligatoire est automatiquement généré s'il n'est pas renseigné
-il est possible aussi de ne renseigner que l'identifiant technique auquel cas la valeur sera complétée automatiquement.
+il est possible aussi de ne renseigner que l'identifiant technique, auquel cas la valeur sera complétée automatiquement.
=:
- Date de création := date à laquelle l'objet a été créé ou modifié pour la dernière fois
- Version := version de l'objet (auto incrémenté à chaque modification)
diff --git a/app/views/help/toc.textile b/app/views/help/toc.textile
index e8e99c609..beb8f152d 100644
--- a/app/views/help/toc.textile
+++ b/app/views/help/toc.textile
@@ -9,9 +9,11 @@ h3. Sommaire
## "Normalisation":normalisation
## "Documentation":documentation
## "Vue d'ensemble":schema
+## "Pré-requis":prerequisite
# "Utilisateurs et Organisations":users
# "Espaces de données":dataspaces
# "Réseaux":networks
+# "Groupes de lignes":group_of_lines
# "Transporteurs":companies
# "Lignes":lines
## "Séquences d'arrêts":routes
@@ -19,12 +21,15 @@ h3. Sommaire
## "Courses/Horaires":vehiclejourneys
# "Arrêts":stop_areas
## "Correspondances":connection_links
+## "Accès":access_points
+## "Liens Arrêts-Accès":access_links
# "Calendriers d'application":timetables
# Outils
## "Imports":imports
## "Exports":exports
## "Validation":validations
# Divers
+## "Tutoriel/Démonstrateur":tutorial
## "API Rest":restapis
## "format d'échange CSV":csv
## "FAQ":faq
diff --git a/app/views/help/tutorial.textile b/app/views/help/tutorial.textile
new file mode 100644
index 000000000..8cf0f6a7a
--- /dev/null
+++ b/app/views/help/tutorial.textile
@@ -0,0 +1,15 @@
+---
+layout: default
+title: Tutoriel / Démonstrateur / Jeux de données
+---
+
+Afin que l'utilisateur puisse se familiariser rapidement avec l'environnement de l'outil CHOUETTE, un réseau de transport « fictif » , « Tatrobus », a été créé.
+Ce réseau est composé d'un réseau principal, « LE GRAND RESEAU », et d'un réseau secondaire « LE PETIT METRO » opérés par un transporteur « TATROBUS ».
+Les deux réseaux comprennent plusieurs lignes, qui s'organisent autour d'un référentiel d'arrêts prédéfini qui inclut de nombreux pôles d'échanges.
+Des courses, horaires, missions, Interdictions de Trafic Local et calendriers d'application s'attachant à ces lignes ont également été renseignés.
+
+L'utilisateur a alors la possibilité de découvrir et de modifier à souhait ces éléments afin d'expérimenter les différentes fonctions et possibilités de l'outil CHOUETTE.
+
+La démonstration est disponible en ligne sur "www.chouette.mobi":www.chouette.mobi
+Les données 'Tatrobus' sont disponibles ["ici":http://www.chouette.mobi/spip.php?rubrique46]
+A noter également que des données Neptune sont disponibles au format Neptune sous licence open data, cf. par exemple ["ici":http://www.chouette.mobi/spip.php?rubrique84] \ No newline at end of file
diff --git a/app/views/help/users.textile b/app/views/help/users.textile
index dbdf07d4c..be401b202 100644
--- a/app/views/help/users.textile
+++ b/app/views/help/users.textile
@@ -5,13 +5,13 @@ title: Utilisateurs et Organisations
h3. Définitions
-L'organisation est une entité qui possède un ensemble d'"espaces de données":dataspaces .
+Une *organisation* est une entité qui possède un ensemble "d'espaces de données":dataspaces.
-un utilisateur est affecté à une organisation
+Un *utilisateur* est affecté à une organisation
h3. Comportement
-Lorsqu'un utilisateur s'enregistre dans l'application, il crée alors une organisation qui lui appartient
+Lorsqu'un utilisateur s'enregistre dans l'application, il crée alors une organisation qui lui appartient.
Il peut ensuite inviter des personnes à y accéder en créant leur compte dans l'onglet Organisation.
diff --git a/app/views/help/validations.textile b/app/views/help/validations.textile
index eba93dffd..f9708be76 100644
--- a/app/views/help/validations.textile
+++ b/app/views/help/validations.textile
@@ -7,10 +7,11 @@ h3. Rôle
p. La validation permet d'effectuer un ensemble de contrôles syntaxiques, sématiques et structurels sur une offre de transport.
-- Phase 1: l'offre de transport est importée depuis le format Neptune et subit les contrôles syntaxiques vis-à-vis du format XML et du Schéma spécifique Neptune
-- Phase 2 : l'offre est analysée dans sa structure et subit des contrôles de complétude et de conexité des données.
+- Phase 1 : les données d'offre de transport sont importées depuis le format Neptune et subit les contrôles syntaxiques vis-à-vis du format XML et du Schéma spécifique Neptune
+- Phase 2 : les données d'offre sont analysées (structure, contrôles de complétude et de connexité des données).
- Phase 3 : l'offre est analysée dans ses fonctionnalités et subit des contrôles de réalisme.
+Les tests de validation sont décrits dans l'aide en ligne de l'application, onglet 'Validation'. Ils sont également disponibles sur le site "chouette.mobi":http://www.chouette.mobi/spip.php?rubrique24
h3. Formats disponibles
@@ -26,4 +27,4 @@ p. La validation est lancée en différé; son état d'avancement est affiché s
p. La consultation du résultat de la validation donnera le bilan des contrôles ou les motifs de l'échec.
-p. le résultat est conservé tant que la validation n'est pas supprimée.
+p. Le résultat est conservé tant que la validation n'est pas supprimée.
diff --git a/app/views/help/vehiclejourneys.textile b/app/views/help/vehiclejourneys.textile
index a2f611dc9..74322ea88 100644
--- a/app/views/help/vehiclejourneys.textile
+++ b/app/views/help/vehiclejourneys.textile
@@ -5,8 +5,8 @@ title: Courses
h3. Définition
-Une course décrit le déplacement d'un véhicule de transport public sur une séquence d'arrêts de la ligne. La course parcourt les arrêts de la séquence d'arrêts dans l'ordre, sans nécessairement s'arrêter à chacun des arrêts. A chaque arrêt desservi, la course précise l'horaire de passage.
-De plus, la course est rattachée à un nombre variable de calendriers d'application.
+Une *course* décrit le déplacement d'un véhicule de transport public sur une "séquence d'arrêts":routes de la "ligne":lines. La course parcourt les arrêts de la séquence d'arrêts dans l'ordre, sans nécessairement s'arrêter à chacun des arrêts. A chaque arrêt desservi, la course précise l'horaire de passage.
+De plus, la course est rattachée à un nombre variable de "calendriers d'application":time_tables.
h3. Attributs
@@ -23,9 +23,9 @@ clé unique pérenne identifiant la course pour les échanges Neptune
cet identifiant est composé de 3 parties : préfixe:type:id_technique
* préfixe : clé identifiant un producteur de données unique
* type = VehicleJourney : clé identifiant le type d'objet (valeur imposée)
-* id_technique : valeur identifiant un seul object d'un type donné pour un même producteur
+* id_technique : valeur identifiant un seul objet d'un type donné pour un même producteur
ce champ obligatoire est automatiquement généré s'il n'est pas renseigné
-il est possible aussi de ne renseigner que l'identifiant technique auquel cas la valeur sera complétée automatiquement.
+il est possible aussi de ne renseigner que l'identifiant technique, auquel cas la valeur sera complétée automatiquement.
=:
- Date de création := date à laquelle l'objet a été créé ou modifié pour la dernière fois
- Version := version de l'objet (auto incrémenté à chaque modification)
diff --git a/app/views/imports/_fields_gtfs_import.erb b/app/views/imports/_fields_gtfs_import.erb
new file mode 100644
index 000000000..dd75a41a5
--- /dev/null
+++ b/app/views/imports/_fields_gtfs_import.erb
@@ -0,0 +1,7 @@
+<%= form.input :objectid_prefix, :input_html => { :value => @referential.prefix } %>
+<%= form.input :max_distance_for_commercial , :as => :number , :input_html => { :value => 50 } %>
+<%= form.input :ignore_last_word , :as => :boolean , :input_html => { :value => false }%>
+<%= form.input :ignore_end_chars , :as => :number , :input_html => { :value => 0 }%>
+<%= form.input :max_distance_for_connection_link , :as => :number , :input_html => { :value => 100 }%>
+
+
diff --git a/app/views/imports/_import.erb b/app/views/imports/_import.erb
index 7723badc0..87e7c3190 100644
--- a/app/views/imports/_import.erb
+++ b/app/views/imports/_import.erb
@@ -7,7 +7,7 @@
<%= l import.created_at %>
<div class="actions">
- <%= link_to t("actions.destroy"), referential_import_path(@referential, import), :method => :delete, :confirm => t('imports.actions.destroy_confirm'), :class => "remove" %>
+ <%= link_to t("actions.destroy"), referential_import_path(@referential, import), :method => :delete, :data => {:confirm => t('imports.actions.destroy_confirm')}, :class => "remove" %>
</div>
</div>
<% end %>
diff --git a/app/views/imports/index.html.erb b/app/views/imports/index.html.erb
index 7e0d366a3..8469fbd7b 100644
--- a/app/views/imports/index.html.erb
+++ b/app/views/imports/index.html.erb
@@ -1,5 +1,5 @@
<%= title_tag t('.title') %>
-
+<div class="warning"><%= t('.warning') %> </div>
<div class="page_info">
<span class="search"> <%= t("will_paginate.page_entries_info.search") %></span> <%= page_entries_info @imports %>
</div>
diff --git a/app/views/imports/new.html.erb b/app/views/imports/new.html.erb
index 206967073..23fb3b0cd 100644
--- a/app/views/imports/new.html.erb
+++ b/app/views/imports/new.html.erb
@@ -1,9 +1,9 @@
<%= title_tag t(".title") %>
-<%= form_for([@referential, @import], :as => :import, :url => new_referential_import_path(@referential), :method => :get) do |form| %>
- <%= form.label :type %>
- <%= form.collection_select :type, Import.types, :to_s, :to_s %>
- <%= form.submit "Sélectionner", :id => "import_type_submit" %>
+<%= semantic_form_for([@referential, @import], :as => :import, :url => new_referential_import_path(@referential), :method => :get) do |form| %>
+ <%= form.inputs do %>
+ <%= form.input :type, :as => :select, :collection => Import.types.map { |format| [ Import.format_name(format), format]}, :required => true, :include_blank => false %>
+ <% end %>
<% end %>
<% @available_imports.each do |import| %>
diff --git a/app/views/imports/show.html.erb b/app/views/imports/show.html.erb
index fe2c89a39..d1c907b02 100644
--- a/app/views/imports/show.html.erb
+++ b/app/views/imports/show.html.erb
@@ -33,6 +33,6 @@
<% content_for :sidebar do %>
<ul class="actions">
- <li><%= link_to t('imports.actions.destroy'), referential_import_path(@referential, @import), :method => :delete, :confirm => t('imports.actions.destroy_confirm'), :class => "remove" %></li>
+ <li><%= link_to t('imports.actions.destroy'), referential_import_path(@referential, @import), :method => :delete, :data => {:confirm => t('imports.actions.destroy_confirm')}, :class => "remove" %></li>
</ul>
<% end %>
diff --git a/app/views/journey_patterns/_journey_pattern.html.erb b/app/views/journey_patterns/_journey_pattern.html.erb
index 0734a9a8b..046f87958 100644
--- a/app/views/journey_patterns/_journey_pattern.html.erb
+++ b/app/views/journey_patterns/_journey_pattern.html.erb
@@ -6,7 +6,7 @@
<% end %><br>
<%= t('.stop_count', :count => journey_pattern.stop_points.count, :route_count => @route.stop_points.count) %> | <%= t('.vehicle_journeys_count', :count => journey_pattern.vehicle_journeys.count) %>
<div class="actions">
- <%= link_to t("actions.destroy"), referential_line_route_journey_pattern_path(@referential, @line, @route, journey_pattern), :method => :delete, :confirm => t('journey_patterns.actions.destroy_confirm'), :class => "remove" %>
+ <%= link_to t("actions.destroy"), referential_line_route_journey_pattern_path(@referential, @line, @route, journey_pattern), :method => :delete, :data => {:confirm => t('journey_patterns.actions.destroy_confirm')}, :class => "remove" %>
<% if journey_pattern.vehicle_journeys.count > 0 %>
| <%= link_to t('journey_patterns.journey_pattern.vehicle_journey_at_stops'), referential_line_route_vehicle_journeys_path(@referential, @line, @route, :q => {:journey_pattern_id_eq => journey_pattern.id}), :class => "link" %>
<% end %>
diff --git a/app/views/journey_patterns/show.html.erb b/app/views/journey_patterns/show.html.erb
index 149f9df6a..eb8f40cc1 100644
--- a/app/views/journey_patterns/show.html.erb
+++ b/app/views/journey_patterns/show.html.erb
@@ -32,14 +32,6 @@
<label><%= @journey_pattern.human_attribute_name("objectid") %>: </label>
<%= @journey_pattern.objectid %>
</p>
- <p>
- <label><%= @journey_pattern.human_attribute_name("creation_time") %>: </label>
- <%= l @journey_pattern.creation_time %>
- </p>
- <p>
- <label><%= @journey_pattern.human_attribute_name("creator_id") %>: </label>
- <%= @journey_pattern.creator_id %>
- </p>
</div>
</div>
@@ -53,8 +45,9 @@
<% content_for :sidebar do %>
<ul class="actions">
<li><%= link_to t('journey_patterns.actions.edit'), edit_referential_line_route_journey_pattern_path(@referential, @line, @route, @journey_pattern), :class => "edit" %></li>
- <li><%= link_to t('journey_patterns.actions.destroy'), referential_line_route_journey_pattern_path(@referential, @line, @route, @journey_pattern), :method => :delete, :confirm => t('journey_patterns.actions.destroy_confirm'), :class => "remove" %></li>
+ <li><%= link_to t('journey_patterns.actions.destroy'), referential_line_route_journey_pattern_path(@referential, @line, @route, @journey_pattern), :method => :delete, :data => {:confirm => t('journey_patterns.actions.destroy_confirm')}, :class => "remove" %></li>
<li><%= link_to t('journey_patterns.journey_pattern.vehicle_journey_at_stops'), referential_line_route_vehicle_journeys_path(@referential, @line, @route, :q => {:journey_pattern_id_eq => @journey_pattern.id}), :class => "link" %></li>
</ul>
+ <%= creation_tag(@journey_pattern) %>
<% end %>
diff --git a/app/views/layouts/_logos.erb b/app/views/layouts/_logos.erb
index 9c8aec154..0420e78a6 100644
--- a/app/views/layouts/_logos.erb
+++ b/app/views/layouts/_logos.erb
@@ -1,5 +1,3 @@
<ul class="logos">
- <li><%= image_tag "logoMedad.gif" %></li>
- <li><%= image_tag "logoPredim.gif" %></li>
- <li><%= image_tag "logoCertu.gif" %></li>
+ <li><%= image_tag "logoMEDDE.jpg" %></li>
</ul> \ No newline at end of file
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 5df5f6b41..77873a855 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -47,6 +47,7 @@
<li><%= link_to t("layouts.tabs.dashboard").capitalize, referential_path(@referential), :class => ("current" if current_page?(referential_path(@referential))) %></li>
<li><%= tab_link_to Chouette::Network, referential_networks_path(@referential) %></li>
<li><%= tab_link_to Chouette::Company, referential_companies_path(@referential) %></li>
+ <li><%= tab_link_to Chouette::GroupOfLine, referential_group_of_lines_path(@referential) %></li>
<li><%= tab_link_to Chouette::Line, referential_lines_path(@referential) %></li>
<li><%= tab_link_to Chouette::StopArea, referential_stop_areas_path(@referential) %></li>
<li><%= tab_link_to Chouette::ConnectionLink, referential_connection_links_path(@referential) %></li>
diff --git a/app/views/lines/_form.erb b/app/views/lines/_form.erb
index 898f04223..f44c038d7 100644
--- a/app/views/lines/_form.erb
+++ b/app/views/lines/_form.erb
@@ -12,8 +12,23 @@
<%= form.input :objectid, :required => !@line.new_record?, :input_html => { :disabled => !@line.new_record? } %>
<% end %>
+ <%= form.inputs do %>
+ <%= form.input :group_of_line_tokens, :label => t('.group_of_lines'), :as => :text, :input_html => { :"data-pre" => ( @line.group_of_lines.map { |group_of_line| { :id => group_of_line.id, :name => group_of_line.name } } ).to_json } %>
+ <% end %>
+
<%= form.actions do %>
<%= form.action :submit, :as => :button %>
<%= form.action :cancel, :as => :link %>
<% end %>
<% end %>
+
+<script>
+ $(function() {
+ $( "#line_group_of_line_tokens" ).tokenInput('<%= name_filter_referential_group_of_lines_path(@referential, :format => :json) %>', {
+ crossDomain: false,
+ prePopulate: $('#group_of_line_tokens').data('pre'),
+ minChars: 3,
+ preventDuplicates: true,
+ });
+ });
+</script>
diff --git a/app/views/lines/_line.erb b/app/views/lines/_line.erb
index 9fe32ce83..88e222686 100644
--- a/app/views/lines/_line.erb
+++ b/app/views/lines/_line.erb
@@ -21,9 +21,20 @@
<% else %>
<%= line.human_attribute_name('company') %> <%= link_to_if( line.company, line.company.name, referential_company_path(@referential, line.company), :title => "#{line.human_attribute_name('company')} #{line.company.name}" ) %>
<% end %>
+ <br/>
+ <% if line.group_of_lines.count == 0 %>
+ <%= t('lines.form.no_group_of_line') %>
+ <% elsif line.group_of_lines.count == 1 %>
+ <%= line.human_attribute_name('group_of_line') %>
+ <%= link_to_if( line.group_of_lines.first, line.group_of_lines.first.name, referential_group_of_line_path(@referential, line.group_of_lines.first), :title => "#{line.human_attribute_name('group_of_line')} #{line.group_of_lines.first.name}") %>
+ <% else %>
+ <%= t('lines.form.several_group_of_lines', :count => line.group_of_lines.count) %>
+ <% end %>
+ <% if @group_of_line.nil? %>
<div class="actions">
<%= link_to t("actions.edit"), edit_referential_line_path(@referential, line), :class => "edit" %> |
- <%= link_to t("actions.destroy"), referential_line_path(@referential, line), :method => :delete, :confirm => t('lines.actions.destroy_confirm'), :class => "remove" %>
+ <%= link_to t("actions.destroy"), referential_line_path(@referential, line), :method => :delete, :data => {:confirm => t('lines.actions.destroy_confirm')}, :class => "remove" %>
</div>
+ <% end %>
</div>
<% end %>
diff --git a/app/views/lines/index.html.erb b/app/views/lines/index.html.erb
index 665411b1b..ff14e8749 100644
--- a/app/views/lines/index.html.erb
+++ b/app/views/lines/index.html.erb
@@ -6,6 +6,7 @@
<%= f.hidden_field :company_id_eq %>
<%= f.hidden_field :network_id_eq %>
+ <%= f.hidden_field :group_of_lines_id_eq %>
<%= f.submit t('actions.search') %> <%= t("or") %>
<%= link_to t("cancel"), referential_lines_path(@referential) %>
@@ -23,6 +24,12 @@
</p>
<% end %>
+<% if @q.group_of_lines_id_eq.present? %>
+<p>
+ <%= Chouette::Line.human_attribute_name('group_of_line') %> : <%= @referential.group_of_lines.find(@q.group_of_lines_id_eq).name %>
+</p>
+<% end %>
+
<div class="page_info">
<span class="search"> <%= t("will_paginate.page_entries_info.search") %></span> <%= page_entries_info @lines %>
</div>
@@ -62,6 +69,17 @@
<li><%= link_with_search t(".selection_all"), {"network_id_eq" => nil}, :class => "all" %></li>
</ul>
+<% if @referential.group_of_lines.count > 0 %>
+ <h4><%= Chouette::GroupOfLine.model_name.human.pluralize %></h4>
+
+ <ul class="selection">
+ <% @referential.group_of_lines.each do |group_of_line| %>
+ <li><%= link_with_search group_of_line.name, "group_of_lines_id_eq" => group_of_line.id %></li>
+ <% end %>
+ <li><%= link_with_search t(".selection_all"), {"group_of_lines_id_eq" => nil}, :class => "all" %></li>
+ </ul>
+<% end %>
+
<div id="multiple_selection_menu">
<h3><%= t(".multi_selection") %> </h3>
<div class="disabled">
diff --git a/app/views/lines/show.html.erb b/app/views/lines/show.html.erb
index 6da0bf61e..668eaebdc 100644
--- a/app/views/lines/show.html.erb
+++ b/app/views/lines/show.html.erb
@@ -48,14 +48,6 @@
<label><%= @line.human_attribute_name("objectid") %>: </label>
<%= @line.objectid %>
</p>
- <p>
- <label><%= @line.human_attribute_name("creation_time") %>: </label>
- <%= l(@line.creation_time) %>
- </p>
- <p>
- <label><%= @line.human_attribute_name("creator_id") %>: </label>
- <%= @line.creator_id %>
- </p>
</div>
</div>
@@ -66,11 +58,20 @@
<%= render :partial => "routes/route", :collection => @routes %>
</div>
+<% if @line.group_of_lines.any? %>
+ <h3 class="line_group_of_lines"><%= t('.group_of_lines') %>
+ </h3>
+ <div class="group_of_lines_detail">
+ <%= render :partial => "group_of_lines/group_of_line", :collection => @group_of_lines %>
+ </div>
+<% end %>
+
<% content_for :sidebar do %>
<ul class="actions">
<li><%= link_to t('lines.actions.edit'), edit_referential_line_path(@referential, @line), :class => "edit" %></li>
- <li><%= link_to t('lines.actions.destroy'), referential_line_path(@referential, @line), :method => :delete, :confirm => t('lines.actions.destroy_confirm'), :class => "remove" %></li>
+ <li><%= link_to t('lines.actions.destroy'), referential_line_path(@referential, @line), :method => :delete, :data => {:confirm => t('lines.actions.destroy_confirm')}, :class => "remove" %></li>
<li><%= link_to t('routes.actions.new'), new_referential_line_route_path(@referential, @line), :class => "add" %></li>
<br>
</ul>
+ <%= creation_tag(@line) %>
<% end %>
diff --git a/app/views/networks/_network.erb b/app/views/networks/_network.erb
index f3a0b597e..9ae53650e 100644
--- a/app/views/networks/_network.erb
+++ b/app/views/networks/_network.erb
@@ -3,7 +3,7 @@
<div class="info">
<div class="actions">
<%= link_to t("actions.edit"), edit_referential_network_path(@referential, network), :class => "edit" %> |
- <%= link_to t("actions.destroy"), referential_network_path(@referential, network), :method => :delete, :confirm => t('networks.actions.destroy_confirm'), :class => "remove" %>
+ <%= link_to t("actions.destroy"), referential_network_path(@referential, network), :method => :delete, :data => {:confirm => t('networks.actions.destroy_confirm')}, :class => "remove" %>
</div>
</div>
<% end %>
diff --git a/app/views/networks/show.html.erb b/app/views/networks/show.html.erb
index 8c68f7a31..273a04aed 100644
--- a/app/views/networks/show.html.erb
+++ b/app/views/networks/show.html.erb
@@ -37,21 +37,14 @@
<label><%= Chouette::Network.human_attribute_name("objectid") %>: </label>
<%= @network.objectid %>
</p>
- <p>
- <label><%= @network.human_attribute_name("creation_time") %>: </label>
- <%= l @network.creation_time %>
- </p>
- <p>
- <label><%= @network.human_attribute_name("creator_id") %>: </label>
- <%= @network.creator_id %>
- </p>
</div>
</div>
<% content_for :sidebar do %>
<ul class="actions">
<li><%= link_to t('networks.actions.edit'), edit_referential_network_path(@referential, @network), :class => "edit" %></li>
- <li><%= link_to t('networks.actions.destroy'), referential_network_path(@referential, @network), :method => :delete, :confirm => t('networks.actions.destroy_confirm'), :class => "remove" %></li>
+ <li><%= link_to t('networks.actions.destroy'), referential_network_path(@referential, @network), :method => :delete, :data => {:confirm => t('networks.actions.destroy_confirm')}, :class => "remove" %></li>
<br>
</ul>
+ <%= creation_tag(@network) %>
<% end %>
diff --git a/app/views/referentials/_clean.html.erb b/app/views/referentials/_clean.html.erb
index 87a84c17f..ff2cf1185 100644
--- a/app/views/referentials/_clean.html.erb
+++ b/app/views/referentials/_clean.html.erb
@@ -6,9 +6,10 @@
<%= form.input :keep_stops, :as => :boolean %>
<%= form.input :keep_companies, :as => :boolean %>
<%= form.input :keep_networks, :as => :boolean %>
+ <%= form.input :keep_group_of_lines, :as => :boolean %>
<% end %>
<%= form.actions do %>
- <%= form.action :submit, :as => :button, :label => t('clean_ups.actions.clean_up') , :button_html => {:confirm => t('clean_ups.actions.confirm') }%>
+ <%= form.action :submit, :as => :button, :label => t('clean_ups.actions.clean_up') , :button_html => {:data => {:confirm => t('clean_ups.actions.confirm') }}%>
<% end %>
<% end %>
</div>
diff --git a/app/views/referentials/_counts.html.erb b/app/views/referentials/_counts.html.erb
index 5b615d9a5..35841b271 100644
--- a/app/views/referentials/_counts.html.erb
+++ b/app/views/referentials/_counts.html.erb
@@ -15,6 +15,10 @@
<td class="value"> <%= @referential.companies.size %></td>
</tr>
<tr>
+ <td class="object" colspan="2"><%= Referential.human_attribute_name("group_of_lines") %></td>
+ <td class="value"> <%= @referential.group_of_lines.size %></td>
+ </tr>
+ <tr>
<td class="object" colspan="2"><%= Referential.human_attribute_name("lines") %></td>
<td class="value"> <%= @referential.lines.size %></td>
</tr>
@@ -59,5 +63,10 @@
<td class="object"><%= Referential.human_attribute_name("itls") %></td>
<td class="value"> <%= @referential.stop_areas.where("area_type = ?","ITL").size %></td>
</tr>
+ <tr>
+ <td class="image"><%= image_tag "map/access_in_out.png"%></td>
+ <td class="object"><%= Referential.human_attribute_name("access_points") %></td>
+ <td class="value"> <%= @referential.access_points.size %></td>
+ </tr>
</tbody>
</table>
diff --git a/app/views/referentials/_referential.erb b/app/views/referentials/_referential.erb
index 4e74b081c..3bc6fd0dc 100644
--- a/app/views/referentials/_referential.erb
+++ b/app/views/referentials/_referential.erb
@@ -1,13 +1,14 @@
<%= div_for(referential) do %>
<%= link_to referential.name, referential %>
<div class="info">
- <%= t('.lines') %>: <span class="lines_count"></span> -
- <%= t('.networks') %>: <span class="networks_count"></span> -
- <%= t('.vehicle_journeys') %>: <span class="vehicle_journeys_count"></span> -
- <%= t('.time_tables') %>: <span class="time_tables_count"></span>
+ <%= referential.human_attribute_name('lines') %>: <span class="lines_count"></span> -
+ <%= referential.human_attribute_name('networks') %>: <span class="networks_count"></span> -
+ <%= referential.human_attribute_name('vehicle_journeys') %>: <span class="vehicle_journeys_count"></span> -
+ <%= referential.human_attribute_name('time_tables') %>: <span class="time_tables_count"></span>
<div class="actions">
<%= link_to t("actions.edit"), edit_referential_path(referential), :class => "edit" %> |
- <%= link_to t("actions.destroy"), referential_path(referential), :method => :delete, :confirm => t('referentials.actions.destroy_confirm'), :class => "remove" %>
+ <%= link_to t("actions.destroy"), referential_path(referential), :method => :delete, :data => {:confirm => t('referentials.actions.destroy_confirm')}, :class => "remove" %>
</div>
</div>
+<%= javascript_include_tag referential_path(referential,:format => :js) %>
<% end %>
diff --git a/app/views/referentials/show.html.erb b/app/views/referentials/show.html.erb
index 79ea6b587..d8e5dd8df 100644
--- a/app/views/referentials/show.html.erb
+++ b/app/views/referentials/show.html.erb
@@ -39,12 +39,19 @@
</td>
</tr>
</table>
+
+<h3 class="api_keys"><%= t('.api_keys') %></h3>
+
+<div class="api_keys">
+ <%= render :partial => "api_keys/api_key", :collection => @referential.api_keys %>
+</div>
</div>
<% content_for :sidebar do %>
<ul class="actions">
<li><%= link_to t('referentials.actions.edit'), edit_referential_path(@referential), :class => "edit" %></li>
- <li><%= link_to t('referentials.actions.destroy'), referential_path(@referential), :method => :delete, :confirm => t('referentials.actions.destroy_confirm'), :class => "remove" %></li>
+ <li><%= link_to t('referentials.actions.destroy'), referential_path(@referential), :method => :delete, :data => {:confirm => t('referentials.actions.destroy_confirm')}, :class => "remove" %></li>
+ <li><%= link_to t('api_keys.actions.new'), new_referential_api_key_path(@referential), :class => "add" %></li>
<br>
</ul>
diff --git a/app/views/referentials/show.js.erb b/app/views/referentials/show.js.erb
new file mode 100644
index 000000000..d44962b14
--- /dev/null
+++ b/app/views/referentials/show.js.erb
@@ -0,0 +1,25 @@
+$(document).ready(function() {
+
+ jQuery(function() {
+var ref, update_infos, update_referential_details, _i, _len, _ref, _results;
+update_infos = function(json) {
+var info, update_info;
+info = $('#referential_' + json.referential_id + ' .info');
+update_info = function(key, value) {
+if (key.match(/_count$/)) {
+return $(info.find('.' + key)[0]).text(value);
+}
+};
+return $.each(json, update_info);
+};
+update_referential_details = function() {
+return $.getJSON("<%= referential_path(@referential, :format => :json) %>", update_infos);
+};
+
+_results = [];
+_results.push(update_referential_details());
+
+return _results;
+});
+});
+
diff --git a/app/views/routes/_route.html.erb b/app/views/routes/_route.html.erb
index 2c6e810fa..be5bbeb2b 100644
--- a/app/views/routes/_route.html.erb
+++ b/app/views/routes/_route.html.erb
@@ -1,5 +1,7 @@
<%= div_for(route) do %>
- <%= link_to image_tag("icons/#{route.wayback}.png"), referential_line_route_path( @referential, @line, route) %>
+ <% if ( route.wayback_code ) %>
+ <%= link_to image_tag("icons/#{route.wayback}.png"), referential_line_route_path( @referential, @line, route) %>
+ <% end %>
<div>
<%= link_to route.name, referential_line_route_path( @referential, @line, route) %>
</div>
@@ -10,8 +12,12 @@
<% if ! route.direction.blank? %>
<%= route.human_attribute_name('direction_code') %> <%= t('directions.label.'+route.direction_code) %> -
<% end %>
- <%= route.human_attribute_name('wayback_code') %> <%= (route.wayback=="A") ? t('.wayback.positive') : t('.wayback.negative') %>
- <br/>
+ <% if route.wayback_code %>
+ <%= route.human_attribute_name('wayback_code') %> <%= (route.wayback=="A") ? t('.wayback.positive') : t('.wayback.negative') %>
+ <% end %>
+ <% if route.wayback_code || (not route.direction.blank?) || ( not route.number.blank?) %>
+ <br/>
+ <% end %>
<% if route.opposite_route %>
<%= t('.opposite') %> <%= link_to route.opposite_route.name, referential_line_route_path( @referential, @line, route.opposite_route) %>
<% else %>
diff --git a/app/views/routes/show.html.erb b/app/views/routes/show.html.erb
index b2e8457d7..654e3975a 100644
--- a/app/views/routes/show.html.erb
+++ b/app/views/routes/show.html.erb
@@ -52,14 +52,6 @@
<label><%= @route.human_attribute_name("objectid") %>: </label>
<%= @route.objectid %>
</p>
- <p>
- <label><%= @route.human_attribute_name("creation_time") %>: </label>
- <%= l @route.creation_time %>
- </p>
- <p>
- <label><%= @route.human_attribute_name("creator_id") %>: </label>
- <%= @route.creator_id %>
- </p>
</div>
</div>
@@ -89,7 +81,7 @@
<% content_for :sidebar do %>
<ul class="actions">
<li><%= link_to t('routes.actions.edit'), edit_referential_line_route_path(@referential, @line, @route), :class => "edit" %></li>
- <li><%= link_to t('routes.actions.destroy'), referential_line_route_path(@referential, @line, @route), :method => :delete, :confirm => t('routes.actions.destroy_confirm'), :class => "remove" %></li>
+ <li><%= link_to t('routes.actions.destroy'), referential_line_route_path(@referential, @line, @route), :method => :delete, :data => {:confirm => t('routes.actions.destroy_confirm')}, :class => "remove" %></li>
<li>
<%= link_to t('stop_points.actions.sort'), [@referential, @line, @route, :stop_points], :class => "edit" %>
</li>
@@ -104,5 +96,6 @@
</li>
<% end %>
</ul>
+ <%= creation_tag(@route) %>
<% end %>
diff --git a/app/views/stop_areas/_form.html.erb b/app/views/stop_areas/_form.html.erb
index b5541cf20..5fca012f3 100644
--- a/app/views/stop_areas/_form.html.erb
+++ b/app/views/stop_areas/_form.html.erb
@@ -11,17 +11,19 @@
<%= form.input :nearest_topic_name %>
<%= form.input :comment %>
<%= form.input :objectid, :required => !@stop_area.new_record?, :input_html => { :disabled => !@stop_area.new_record? } %>
- <%= form.inputs :name => t('stop_areas.show.geographic_data') do %>
- <% if ! @referential.projection_type_label.empty? %>
- <%= form.inputs :name => @referential.projection_type_label do %>
- <%= form.input :x %>
- <%= form.input :y %>
- <% end %>
- <% end %>
- <%= form.inputs :name => "WGS84" do %>
- <%= form.input :longitude %>
- <%= form.input :latitude %>
- <% end %>
+ <% if !manage_itl %>
+ <%= form.inputs :name => t('stop_areas.show.geographic_data') do %>
+ <% if ! @referential.projection_type_label.empty? %>
+ <%= form.inputs :name => @referential.projection_type_label do %>
+ <%= form.input :x %>
+ <%= form.input :y %>
+ <% end %>
+ <% end %>
+ <%= form.inputs :name => "WGS84" do %>
+ <%= form.input :longitude %>
+ <%= form.input :latitude %>
+ <% end %>
+ <% end %>
<% end %>
<% end %>
diff --git a/app/views/stop_areas/_genealogical.html.erb b/app/views/stop_areas/_genealogical.html.erb
new file mode 100644
index 000000000..3b935ce92
--- /dev/null
+++ b/app/views/stop_areas/_genealogical.html.erb
@@ -0,0 +1,66 @@
+ <h3><%= genealogical_title %></h3>
+
+ <% if @stop_area.parent.present? %>
+ <div class="parent">
+ <%= link_to([@referential, @stop_area.parent]) do %>
+ <%= image_tag "map/" + @stop_area.parent.stop_area_type + ".png" %><span><%= @stop_area.parent.name %></span>
+ <% end %>
+ </div>
+ <div class="link"><%= image_tag "icons/link.png"%></div>
+ <% elsif @stop_area.routing_lines.present? %>
+ <div class="lines">
+ <% @stop_area.routing_lines.each do |line| %>
+ <div class="line">
+ <%= link_to([@referential, line]) do %>
+ <span><%= line.name %></span>
+ <% end %>
+ </div>
+ <% end %>
+ </div>
+ <div class="link"><%= image_tag "icons/link.png"%></div>
+ <% else %>
+ <div class="no_parent">&nbsp;</div>
+ <% end %>
+
+ <div class="target">
+ <%= image_tag "map/" + @stop_area.stop_area_type + ".png"%><span><%= @stop_area.name %></span>
+ </div>
+
+ <% if @stop_area.children.present? %>
+ <div class="link"><%= image_tag "icons/link.png"%></div>
+ <div class="children">
+ <% @stop_area.children.each do |child| %>
+ <div class="child">
+ <%= link_to([@referential, child]) do %>
+ <%= image_tag "map/" + child.stop_area_type + ".png" %><span><%= child.name %></span>
+ <% end %>
+ </div>
+ <% end %>
+ </div>
+ <% elsif @stop_area.routing_stops.present? %>
+ <div class="link"><%= image_tag "icons/link.png"%></div>
+ <div class="children">
+ <% @stop_area.routing_stops.each do |stop| %>
+ <div class="child">
+ <%= link_to([@referential, stop]) do %>
+ <%= image_tag "map/" + stop.stop_area_type + ".png" %><span><%= stop.name %></span>
+ <% end %>
+ </div>
+ <% end %>
+ </div>
+ <% elsif @stop_area.routes.present? %>
+ <div class="link"><%= image_tag "icons/link.png"%></div>
+ <div class="children">
+ <% @stop_area.routes.each do |route| %>
+ <div class="child">
+ <%= link_to([@referential, route.line ]) do %>
+ <span><%= route.line.number %></span>
+ <% end %>
+ &nbsp;
+ <%= link_to([@referential, route.line , route]) do %>
+ <span><%= route.name %></span>
+ <% end %>
+ </div>
+ <% end %>
+ </div>
+ <% end %>
diff --git a/app/views/stop_areas/_stop_area.html.erb b/app/views/stop_areas/_stop_area.html.erb
index c7265ab53..4f2a1a695 100644
--- a/app/views/stop_areas/_stop_area.html.erb
+++ b/app/views/stop_areas/_stop_area.html.erb
@@ -24,7 +24,7 @@
</p>
<div class="actions">
<%= link_to t("actions.edit"), edit_referential_stop_area_path(@referential, stop_area), :class => "edit" %> |
- <%= link_to t("actions.destroy"), referential_stop_area_path(@referential, stop_area), :method => :delete, :confirm => t('stop_areas.actions.destroy_confirm'), :class => "remove" %>
+ <%= link_to t("actions.destroy"), referential_stop_area_path(@referential, stop_area), :method => :delete, :data => {:confirm => t('stop_areas.actions.destroy_confirm')}, :class => "remove" %>
</div>
</div>
<% end %>
diff --git a/app/views/stop_areas/access_links.html.erb b/app/views/stop_areas/access_links.html.erb
new file mode 100644
index 000000000..d4727d7db
--- /dev/null
+++ b/app/views/stop_areas/access_links.html.erb
@@ -0,0 +1,33 @@
+<%= title_tag t('stop_areas.access_links.title', :stop_area => @stop_area.name ) %>
+
+<div class="stop_area_show">
+ <h3 class="stop_area_generics">
+ <a class="generics"><%= t('.generic_access_links') %>
+ <%= image_tag("icons/plus.png" , :class => "switcher", :style => "display: none;") %>
+ <%= image_tag("icons/minus.png" , :class => "switcher" ) %>
+ </a>
+
+ </h3>
+ <div class="generics content">
+ <div class="access_link_pairs">
+ <table>
+ <%= render :partial => "access_link_pairs/access_link_pair", :collection => access_links_pairs(@generic_access_links) %>
+ </table>
+ </div>
+ </div>
+ <h3 class="stop_area_generics">
+ <a class="details"><%= t('.detail_access_links') %>
+ <%= image_tag("icons/plus.png" , :class => "switcher") %>
+ <%= image_tag("icons/minus.png" , :class => "switcher", :style => "display: none;" ) %>
+ </a>
+
+ </h3>
+ <div class="details content" style="display: none;">
+ <div class="access_link_pairs">
+ <table>
+ <%= render :partial => "access_link_pairs/access_link_pair", :collection => access_links_pairs(@detail_access_links) %>
+ </table>
+ </div>
+ </div>
+</div>
+
diff --git a/app/views/stop_areas/edit.html.erb b/app/views/stop_areas/edit.html.erb
index 1ec77056d..d08949104 100644
--- a/app/views/stop_areas/edit.html.erb
+++ b/app/views/stop_areas/edit.html.erb
@@ -1,5 +1,6 @@
<%= title_tag t('stop_areas.edit.title', :stop_area => @stop_area.name ) %>
-<%= @map.to_html %>
-
+<% if !manage_itl %>
+ <%= @map.to_html %>
+<% end %>
<%= render "form" %>
diff --git a/app/views/stop_areas/show.html.erb b/app/views/stop_areas/show.html.erb
index 72c0ae168..9d0db8af8 100644
--- a/app/views/stop_areas/show.html.erb
+++ b/app/views/stop_areas/show.html.erb
@@ -1,7 +1,7 @@
<%= title_tag t('stop_areas.show.title', :stop_area => @stop_area.name ) %>
<div class="stop_area_show">
- <% if @stop_area.projection_type != nil || @stop_area.long_lat_type != nil %>
+ <% if show_map? %>
<%= @map.to_html %>
<% end %>
<div class="summary">
@@ -37,143 +37,105 @@
<label><%= @stop_area.human_attribute_name("stop_area_type") %>: </label>
<%= t("area_types.label.#{@stop_area.stop_area_type}") %>
</p>
- <p> <label><%= t('stop_areas.show.geographic_data') %> </label></p>
- <% if @stop_area.projection_type == nil && @stop_area.long_lat_type == nil %>
- <span class='geo_data'><%= t('stop_areas.show.no_geographic_data') %></span>
- <% else %>
- <% if !@stop_area.projection_type.nil? %>
- <p>
- <span class='geo_data'><%= @stop_area.human_attribute_name("projection_type") %>: </span>
- <%= @stop_area.projection_type %>
- </p>
- <p>
- <span class='geo_data'><%= @stop_area.human_attribute_name("x") %>: </span>
- <%= @stop_area.x %>
- </p>
- <p>
- <span class='geo_data'><%= @stop_area.human_attribute_name("y") %>: </span>
- <%= @stop_area.y %>
- </p>
- <% end %>
- <% if !@stop_area.long_lat_type.nil? %>
- <p>
- <span class='geo_data'><%= @stop_area.human_attribute_name("long_lat_type") %>: </span>
- <%= @stop_area.long_lat_type %>
- </p>
- <p>
- <span class='geo_data'><%= @stop_area.human_attribute_name("longitude") %>: </span>
- <%= @stop_area.longitude %>
- </p>
- <p>
- <span class='geo_data'><%= @stop_area.human_attribute_name("latitude") %>: </span>
- <%= @stop_area.latitude %>
- </p>
+ <% if !manage_itl %>
+ <p> <label><%= t('stop_areas.show.geographic_data') %> </label></p>
+ <% if @stop_area.projection_type == nil && @stop_area.long_lat_type == nil %>
+ <span class='geo_data'><%= t('stop_areas.show.no_geographic_data') %></span>
+ <% else %>
+ <% if !@stop_area.projection_type.nil? %>
+ <p>
+ <span class='geo_data'><%= @stop_area.human_attribute_name("projection_type") %>: </span>
+ <%= @stop_area.projection_type %>
+ </p>
+ <p>
+ <span class='geo_data'><%= @stop_area.human_attribute_name("x") %>: </span>
+ <%= @stop_area.x %>
+ </p>
+ <p>
+ <span class='geo_data'><%= @stop_area.human_attribute_name("y") %>: </span>
+ <%= @stop_area.y %>
+ </p>
+ <% end %>
+ <% if !@stop_area.long_lat_type.nil? %>
+ <p>
+ <span class='geo_data'><%= @stop_area.human_attribute_name("long_lat_type") %>: </span>
+ <%= @stop_area.long_lat_type %>
+ </p>
+ <p>
+ <span class='geo_data'><%= @stop_area.human_attribute_name("longitude") %>: </span>
+ <%= @stop_area.longitude %>
+ </p>
+ <p>
+ <span class='geo_data'><%= @stop_area.human_attribute_name("latitude") %>: </span>
+ <%= @stop_area.latitude %>
+ </p>
+ <% end %>
<% end %>
<% end %>
<p>
<label><%= @stop_area.human_attribute_name("objectid") %>: </label>
<%= @stop_area.objectid %>
</p>
- <p>
- <label><%= @stop_area.human_attribute_name("creation_time") %>: </label>
- <%= l(@stop_area.creation_time) %>
- </p>
- <p>
- <label><%= @stop_area.human_attribute_name("creator_id") %>: </label>
- <%= @stop_area.creator_id %>
- </p>
</div>
+ <p class="after_map" />
<div class="genealogical">
- <% if @stop_area.stop_area_type == 'itl' %>
- <h3><%= t(".genealogical_routing") %></h3>
- <% else %>
- <h3><%= t(".genealogical") %></h3>
- <% end %>
-
- <% if @stop_area.parent.present? %>
- <div class="parent">
- <%= link_to([@referential, @stop_area.parent]) do %>
- <%= image_tag "map/" + @stop_area.parent.stop_area_type + ".png" %><span><%= @stop_area.parent.name %></span>
- <% end %>
- </div>
- <div class="link"><%= image_tag "icons/link.png"%></div>
- <% elsif @stop_area.routing_lines.present? %>
- <div class="lines">
- <% @stop_area.routing_lines.each do |line| %>
- <div class="line">
- <%= link_to([@referential, line]) do %>
- <span><%= line.name %></span>
- <% end %>
- </div>
- <% end %>
- </div>
- <div class="link"><%= image_tag "icons/link.png"%></div>
- <% else %>
- <div class="no_parent">&nbsp;</div>
- <% end %>
-
- <div class="target">
- <%= image_tag "map/" + @stop_area.stop_area_type + ".png"%><span><%= @stop_area.name %></span>
- </div>
-
- <% if @stop_area.children.present? %>
- <div class="link"><%= image_tag "icons/link.png"%></div>
- <div class="children">
- <% @stop_area.children.each do |child| %>
- <div class="child">
- <%= link_to([@referential, child]) do %>
- <%= image_tag "map/" + child.stop_area_type + ".png" %><span><%= child.name %></span>
- <% end %>
- </div>
- <% end %>
- </div>
- <% elsif @stop_area.routing_stops.present? %>
- <div class="link"><%= image_tag "icons/link.png"%></div>
- <div class="children">
- <% @stop_area.routing_stops.each do |stop| %>
- <div class="child">
- <%= link_to([@referential, stop]) do %>
- <%= image_tag "map/" + stop.stop_area_type + ".png" %><span><%= stop.name %></span>
- <% end %>
- </div>
- <% end %>
- </div>
- <% elsif @stop_area.routes.present? %>
- <div class="link"><%= image_tag "icons/link.png"%></div>
- <div class="children">
- <% @stop_area.routes.each do |route| %>
- <div class="child">
- <%= link_to([@referential, route.line ]) do %>
- <span><%= route.line.number %></span>
- <% end %>
- &nbsp;
- <%= link_to([@referential, route.line , route]) do %>
- <span><%= route.name %></span>
- <% end %>
- </div>
- <% end %>
- </div>
- <% end %>
+ <%= render "stop_areas/genealogical" %>
</div>
</div>
+
+<% if manage_access_points %>
+ <p class="after_map" />
+<div>
+ <h3><%= t('.access_points') %></h3>
+
+ <div class="access_points paginated_content">
+ <%= render :partial => "access_points/access_point", :collection => @access_points %>
+ </div>
+</div>
+<% end %>
<% content_for :sidebar do %>
-<ul class="actions">
- <li><%= link_to t('stop_areas.actions.edit'), edit_referential_stop_area_path(@referential, @stop_area), :class => "edit" %></li>
- <li><%= link_to t('stop_areas.actions.destroy'), referential_stop_area_path(@referential, @stop_area), :method => :delete, :confirm => t('stop_areas.actions.destroy_confirm'), :class => "remove" %></li>
- <% if @stop_area.stop_area_type == 'itl' %>
- <li><%= link_to t('stop_areas.actions.add_routing_lines'), add_routing_lines_referential_stop_area_path(@referential, @stop_area), :class => "add_routing_lines" %></li>
+ <table>
+ <tr><td>
+ <ul class="actions">
+ <li><%= link_to t('stop_areas.actions.edit'), edit_referential_stop_area_path(@referential, @stop_area), :class => "edit" %></li>
+ <li><%= link_to t('stop_areas.actions.destroy'), referential_stop_area_path(@referential, @stop_area), :method => :delete, :data => {:confirm => t('stop_areas.actions.destroy_confirm')}, :class => "remove" %></li>
+ </ul>
+ </td></tr>
+ <% if manage_itl %>
+ <tr><td>
+ <h3><%= t(".itl_managment") %></h3>
+ <ul class="actions">
+ <li><%= link_to t('stop_areas.actions.add_routing_lines'), add_routing_lines_referential_stop_area_path(@referential, @stop_area), :class => "add_routing_lines" %></li>
+ <li><%= link_to t('stop_areas.actions.add_routing_stops'), add_routing_stops_referential_stop_area_path(@referential, @stop_area), :class => "add_routing_stops" %></li>
+ </ul>
+ </td></tr>
<% else %>
- <li><%= link_to t('stop_areas.actions.select_parent'), select_parent_referential_stop_area_path(@referential, @stop_area), :class => "select_parent" %></li>
- <% end %>
- <% if @stop_area.stop_area_type == 'itl' %>
- <li><%= link_to t('stop_areas.actions.add_routing_stops'), add_routing_stops_referential_stop_area_path(@referential, @stop_area), :class => "add_routing_stops" %></li>
- <% elsif @stop_area.stop_area_type != 'boarding_position' && @stop_area.stop_area_type != 'quay' %>
- <li><%= link_to t('stop_areas.actions.add_children'), add_children_referential_stop_area_path(@referential, @stop_area), :class => "add_children" %></li>
+ <tr><td>
+ <h3><%= t(".stop_managment") %></h3>
+ <ul class="actions">
+ <li><%= link_to t('stop_areas.actions.select_parent'), select_parent_referential_stop_area_path(@referential, @stop_area), :class => "select_parent" %></li>
+ <% if manage_children %>
+ <li><%= link_to t('stop_areas.actions.add_children'), add_children_referential_stop_area_path(@referential, @stop_area), :class => "add_children" %></li>
+ <% end %>
+ </ul>
+ </td></tr>
+
+ <% if manage_access_points %>
+ <tr><td>
+ <h3><%= t(".access_managment") %></h3>
+ <ul class="actions">
+ <li><%= link_to t('access_points.actions.new'), new_referential_stop_area_access_point_path(@referential,@stop_area), :class => "add" %></li>
+ <li><%= link_to t('stop_areas.actions.manage_access_links'), access_links_referential_stop_area_path(@referential,@stop_area), :class => "select_parent" %></li>
+ </ul>
+ </td></tr>
+ <% end %>
+
<% end %>
+ </table>
<br>
-</ul>
+ <%= creation_tag(@stop_area) %>
<% end %>
diff --git a/app/views/stop_areas/show.kml.erb b/app/views/stop_areas/show.kml.erb
index 16613b6bc..39a764bd6 100644
--- a/app/views/stop_areas/show.kml.erb
+++ b/app/views/stop_areas/show.kml.erb
@@ -1,10 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<kml xmlns="http://www.opengis.net/kml/2.2">
<Document>
+ <% if !params["children"].nil? %>
+ <% @stop_area.children.each do |child| %>
+ <Placemark id="<%= child.id %>" >
+ <name><%= child.name %></name>
+ <stop_area_type><%= child.stop_area_type %></stop_area_type>
+ <%= (child.position or child.default_position).kml_representation.html_safe %>
+ </Placemark>
+ <% end %>
+ <% elsif !params["routing"].nil? %>
+ <% @stop_area.routing_stops.each do |child| %>
+ <Placemark id="<%= child.id %>" >
+ <name><%= child.name %></name>
+ <stop_area_type><%= child.stop_area_type %></stop_area_type>
+ <%= (child.position or child.default_position).kml_representation.html_safe %>
+ </Placemark>
+ <% end %>
+ <% else %>
<Placemark id="<%= @stop_area.id %>" >
<name><%= @stop_area.name %></name>
- <stop_area_type><%= @stop_area.type %></stop_area_type>
+ <stop_area_type><%= @stop_area.stop_area_type %></stop_area_type>
<%= (@stop_area.position or @stop_area.default_position).kml_representation.html_safe %>
</Placemark>
+ <% end %>
</Document>
</kml>
diff --git a/app/views/stop_points/_stop_point_draggable.html.erb b/app/views/stop_points/_stop_point_draggable.html.erb
index 7841b6116..eea0e065a 100644
--- a/app/views/stop_points/_stop_point_draggable.html.erb
+++ b/app/views/stop_points/_stop_point_draggable.html.erb
@@ -11,7 +11,7 @@
<%= stop_point.stop_area.human_attribute_name('country_code') %> <%= stop_point.stop_area.country_code %>
<div class="actions">
<%= link_to t("stop_points.actions.show"), referential_stop_area_path(@referential, stop_point.stop_area), :class => "link" %> |
- <%= link_to t("actions.destroy"), referential_line_route_stop_point_path(@referential, @line, @route, stop_point), :method => :delete, :confirm => t('stop_points.actions.destroy_confirm'), :class => "remove" %>
+ <%= link_to t("actions.destroy"), referential_line_route_stop_point_path(@referential, @line, @route, stop_point), :method => :delete, :data => {:confirm => t('stop_points.actions.destroy_confirm')}, :class => "remove" %>
</div>
</div>
<% end %>
diff --git a/app/views/subscriptions/new.html.erb b/app/views/subscriptions/new.html.erb
index 3d137a0d3..686ab8c98 100644
--- a/app/views/subscriptions/new.html.erb
+++ b/app/views/subscriptions/new.html.erb
@@ -3,6 +3,7 @@
<%= semantic_form_for @subscription, :url => subscription_path do |form| %>
<%= form.inputs do %>
<%= form.input :organisation_name %>
+ <%= form.input :user_name %>
<%= form.input :email %>
<%= form.input :password, :as => :password %>
<%= form.input :password_confirmation, :as => :password %>
diff --git a/app/views/test_sheet/1_1.html b/app/views/test_sheet/1_1.html
index e7623184a..4d5b7db97 100644
--- a/app/views/test_sheet/1_1.html
+++ b/app/views/test_sheet/1_1.html
@@ -1,297 +1,88 @@
-<div class=WordSection1>
+<h1 class="western" style="border: 1pt solid rgb(0, 0, 0); padding: 0.05cm 0.12cm; margin-top: 0.21cm;" align="center">
+<font face="Arial, sans-serif"><font style="font-size: 20pt;" size="5"><i>
+ point de contrôle N° 1.1<br>
+conformité à la syntaxe XML suivant les recommandations du W3C<br>
+</i></font></font></h1>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Objectif: </b></u>
+Contrôler que le fichier respecte la syntaxe XML telle que décrite dans les recommandations du W3C<br>
+</font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Priorité: </b></u> Obligatoire</font></p><font face="Arial, sans-serif">
+</font><p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><u><b>Explications:</b></u>
+</font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Un fichier XML doit être correctement constitué&nbsp;:</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Il possède une déclaration comportant le numéro de version XML
+utilisé dans le document ainsi que le nom du jeu de codage de
+caractères utilisé.</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Un nom d'élément ne peut commencer par un chiffre. Si le nom n'est
+composé que d'un seul caractère, ce doit être une lettre comprise entre
+"a" et "z" pour les minuscules, "A" et "Z" pour les majuscules. S'il
+est composé d'au moins deux caractères, le premier peut être "_" ou
+":". Le nom peut ensuite être composé de lettres, chiffres, tirets,
+tirets bas et deux points.</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Les balises n'ayant pas de contenu doivent se terminer par /&gt;.</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Toutes les balises portant un contenu non vide doivent être fermées.</font></font></font></p>
-<p class=MsoTitle style='margin-top:6.0pt;margin-right:0cm;margin-bottom:12.0pt;
-margin-left:0cm'><span style='font-size:14.0pt;font-family:"Tahoma","sans-serif"'>Fiche
-du point de contr&ocirc;le N&deg; 1.1</span></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Les valeurs d'attributs doivent être&nbsp;entre guillemets.</font></font></font></p>
-<p class=MsoNormal>&nbsp;</p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Les noms d'attributs sont&nbsp;en minuscules.</font></font></font></p>
-<table class=MsoNormalTable border=0 cellspacing=0 cellpadding=0 width=616
- style='width:461.65pt;margin-left:-.55pt;border-collapse:collapse'>
- <tr>
- <td width=615 colspan=2 valign=top style='width:461.6pt;border:solid black 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center;layout-grid-mode:char'><i><span
- style='font-family:"Tahoma","sans-serif";color:navy'>Description</span></i></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=109 style='width:81.5pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Intitul&eacute;</span></h1>
- </td>
- <td width=507 style='width:380.1pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>V&eacute;rification
- de la conformit&eacute; &agrave; la syntaxe XML suivant les recommandations du W3C</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=109 style='width:81.5pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Objectif</span></h1>
- </td>
- <td width=507 style='width:380.1pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Contr&ocirc;ler
- que le fichier respecte la syntaxe XML telle que d&eacute;crite dans les
- recommandations du W3C</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=109 style='width:81.5pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>R&eacute;f&eacute;rences</span></h1>
- </td>
- <td width=507 style='width:380.1pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>W3C</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=109 style='width:81.5pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>N&deg; de fiche(s)</span></h1>
- <h1 align=left style='text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>connexe(s)</span></h1>
- </td>
- <td width=507 style='width:380.1pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>&nbsp;</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=109 style='width:81.5pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt;layout-grid-mode:char'><b><span
- style='font-family:"Tahoma","sans-serif"'>Priorit&eacute;</span></b></p>
- </td>
- <td width=507 style='width:380.1pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Obligatoire</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=109 style='width:81.5pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt;layout-grid-mode:char'><b><span
- style='font-family:"Tahoma","sans-serif"'>R&eacute;sultat</span></b></p>
- </td>
- <td width=507 style='width:380.1pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Conforme
- ou non conforme</span></h1>
- </td>
- </tr>
- <tr>
- <td width=615 colspan=2 valign=top style='width:461.6pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center;layout-grid-mode:char'><i><span
- style='color:navy'>Mise en &oelig;uvre</span></i></h1>
- </td>
- </tr>
- <tr>
- <td width=109 valign=top style='width:81.5pt;border-top:none;border-left:
- solid black 1.0pt;border-bottom:solid black 1.0pt;border-right:none;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;layout-grid-mode:char'><span style='font-size:11.0pt'>Explication</span></h1>
- </td>
- <td width=507 valign=top style='width:380.1pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:11.35pt;margin-bottom:6.0pt;
- margin-left:3.4pt;layout-grid-mode:char'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'>Un fichier XML doit
- &ecirc;tre correctement constitu&eacute;&nbsp;: </span></h1>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:11.35pt;margin-bottom:
- 6.0pt;margin-left:3.4pt;text-align:justify'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>- Il poss&egrave;de une d&eacute;claration comportant le
- num&eacute;ro de version XML utilis&eacute; dans le document ainsi que le nom du jeu de
- codage de caract&egrave;res utilis&eacute;.</span></p>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:11.35pt;margin-bottom:
- 6.0pt;margin-left:3.4pt;text-align:justify'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>- Un nom d'&eacute;l&eacute;ment ne peut commencer par
- un chiffre. Si le nom n'est compos&eacute; que d'un seul caract&egrave;re, ce doit &ecirc;tre une
- lettre comprise entre &quot;a&quot; et &quot;z&quot; pour les minuscules,
- &quot;A&quot; et &quot;Z&quot; pour les majuscules. S'il est compos&eacute; d'au
- moins deux caract&egrave;res, le premier peut &ecirc;tre &quot;_&quot; ou &quot;:&quot;.
- Le nom peut ensuite &ecirc;tre compos&eacute; de lettres, chiffres, tirets, tirets bas et
- deux points.</span></p>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:11.35pt;margin-bottom:
- 6.0pt;margin-left:3.4pt;text-align:justify'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>- Les balises n'ayant pas de contenu
- doivent se terminer par /&gt;.</span></p>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:11.35pt;margin-bottom:
- 6.0pt;margin-left:3.4pt;text-align:justify'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>- Toutes les balises portant un contenu
- non vide doivent &ecirc;tre ferm&eacute;es.</span></p>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:11.35pt;margin-bottom:
- 6.0pt;margin-left:3.4pt;text-align:justify'><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'>- Les valeurs d'attributs doivent &ecirc;tre </span><em><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>entre guillemets.</span></em></p>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:11.35pt;margin-bottom:
- 6.0pt;margin-left:3.4pt;text-align:justify'><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'>- Les noms d'attributs sont </span><em><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>en minuscules.</span></em></p>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:11.35pt;margin-bottom:
- 6.0pt;margin-left:3.4pt;text-align:justify'><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'>- Tous les &eacute;l&eacute;ments peuvent contenir un ou
- plusieurs attributs. Chaque &eacute;l&eacute;ment ne peut contenir qu'une fois le m&ecirc;me
- attribut. Un attribut est compos&eacute; d'un nom et d'une valeur. Il ne peut &ecirc;tre
- pr&eacute;sent que dans la balise </span><em><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>ouvrante</span></em><span
- style='font-size:11.0pt;font-family:"Arial","sans-serif"'> de l'&eacute;l&eacute;ment.</span></p>
- </td>
- </tr>
- <tr>
- <td width=109 valign=top style='width:81.5pt;border-top:none;border-left:
- solid black 1.0pt;border-bottom:solid black 1.0pt;border-right:none;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm;layout-grid-mode:char'><b><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>Exemple</span></b></p>
- </td>
- <td width=507 valign=top style='width:380.1pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:3.4pt;text-align:left;layout-grid-mode:char'><span
- class=enteteexemplexml><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Exemple
- de fichier XML</span></span></h1>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:3.4pt;text-align:left'><span class=tag><span style='font-size:
- 10.0pt;font-family:"Courier New";font-weight:normal'>&lt;?xml
- version=&quot;1.0&quot; encoding=&quot;ISO-8859-1&quot;?&gt;</span></span></h1>
- <p class=MsoNormal style='margin-left:3.4pt;text-autospace:ideograph-numeric'><span
- lang=EN-US style='font-size:10.0pt;font-family:"Courier New"'>&lt;ChouettePTNetwork
- xmlns:xsi=&quot;http://www.w3.org/2001/XMLSchema-instance&quot;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>
- xmlns=&quot;http://www.trident.org/schema/trident&quot;
- xsi:schemaLocation=&quot;http://www.trident.org/schema/trident
- /home/marc/workspace/chouette-ninoxe/src/main/castor/Chouette.xsd&quot;&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;PTNetwork&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>
- &lt;objectId&gt;AMIV:PTNetwork:95&lt;/objectId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> </span><span
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;versionDate&gt;2007-03-21&lt;/versionDate&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span class=tag><span
- style='font-size:10.0pt;font-family:"Courier New"'>...</span></span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span class=tag><span
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;/ChouettePTNetwork&gt;</span></span></p>
- </td>
- </tr>
- <tr>
- <td width=615 colspan=2 valign=top style='width:461.6pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h2 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center;layout-grid-mode:char'><i><span lang=EN-US
- style='font-size:14.0pt;color:navy'>Evaluation</span></i></h2>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=109 style='width:81.5pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span lang=EN-US
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>N&deg; test</span></h1>
- </td>
- <td width=507 style='width:380.1pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>1.1.1</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=109 style='width:81.5pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Libell&eacute;</span></h1>
- </td>
- <td width=507 style='width:380.1pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Conformit&eacute;
- &agrave; la syntaxe XML</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=109 style='width:81.5pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Champ
- d&rsquo;application</span></h1>
- </td>
- <td width=507 style='width:380.1pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>S</span><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>yntaxe
- XML suivant les recommandations du W3C</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=109 style='width:81.5pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>V&eacute;rification</span></h1>
- </td>
- <td width=507 style='width:380.1pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>-
- V&eacute;rifier qu'il est possible d'ouvrir le fichier contenant le mod&egrave;le CHOUETTE
- &agrave; analyser avec un &eacute;diteur XML ou directement &agrave; l'aide d'un Framework de
- v&eacute;rification de la syntaxe XML (castor, xerces, etc...). </span></h1>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>-
- Si le fichier respecte la syntaxe W3C alors le test est valid&eacute;, sinon le test
- est invalid&eacute; et produit le message &laquo;&nbsp;test 1.1.1&nbsp;: le fichier n&rsquo;est
- pas correctement form&eacute; selon les recommandations du W3C&nbsp;&raquo;.</span></p>
- <p class=MsoNormal><span style='font-family:"Tahoma","sans-serif"'>&nbsp;</span></p>
- </td>
- </tr>
-</table>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Tous les éléments peuvent contenir un ou plusieurs attributs. Chaque
+élément ne peut contenir qu'une fois le même attribut. Un attribut est
+composé d'un nom et d'une valeur. Il ne peut être présent que dans la
+balise&nbsp;ouvrante&nbsp;de l'élément.</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>Exemple: </u></b></font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Exemple de fichier XML</font></font></font></p>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;?xml version="1.0" encoding="ISO-8859-1"?&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;ChouettePTNetwork xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">xmlns="http://www.trident.org/schema/trident"
+xsi:schemaLocation="http://www.trident.org/schema/trident
+/home/marc/workspace/chouette-ninoxe/src/main/castor/Chouette.xsd"&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;PTNetwork&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;objectId&gt;AMIV:PTNetwork:95&lt;/objectId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif"><br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;versionDate&gt;2007-03-21&lt;/versionDate&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">...<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;/ChouettePTNetwork&gt;<br></font></span>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>N° test:</u></b>
+1.1.1</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Libellé:</u>
+Conformité à la syntaxe XML</font></font></font></p>
-</div>
-
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Champ d’application:</u>
+Syntaxe XML suivant les recommandations du W3C</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Vérification:</u> </font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Vérifier qu'il est possible d'ouvrir le fichier contenant le modèle
+CHOUETTE à analyser avec un éditeur XML ou directement à l'aide d'un
+Framework de vérification de la syntaxe XML (castor, xerces, etc...).</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si le fichier respecte la syntaxe W3C alors le test est validé, sinon
+le test est invalidé et produit le message «&nbsp;test 1.1.1&nbsp;: le
+fichier n’est pas correctement formé selon les recommandations du
+W3C&nbsp;».</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+&nbsp;</font></font></font></p>
diff --git a/app/views/test_sheet/1_2.html b/app/views/test_sheet/1_2.html
index ff1b8ad93..882299eac 100644
--- a/app/views/test_sheet/1_2.html
+++ b/app/views/test_sheet/1_2.html
@@ -1,338 +1,108 @@
+<h1 class="western" style="border: 1pt solid rgb(0, 0, 0); padding: 0.05cm 0.12cm; margin-top: 0.21cm;" align="center">
+<font face="Arial, sans-serif"><font style="font-size: 20pt;" size="5"><i>
+ point de contrôle N° 1.2<br>
+conformité au schéma XML du profil CHOUETTE<br>
+</i></font></font></h1>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Objectif: </b></u>
+Vérifier le fichier d’export XML par rapport à un fichier de référence
+XSD (XML Schema Definition) dans lequel est défini un jeu de règles et
+contraintes.<br>
+</font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Priorité: </b></u> Obligatoire</font></p><font face="Arial, sans-serif">
+</font><p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><u><b>Explications:</b></u>
+</font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Il faut vérifier que le document d’export XML respecte les règles
+décrites dans le document XSD CHOUETTE. Pour cela, il faut mettre en
+place les traitements permettant de vérifier la présence de tous les
+objets et attributs obligatoires des concepts et des attributs
+optionnels visibles d’une part dans le modèle de données, d’autre part
+dans le profil d’échange, si utilisés.</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+La vérification de la conformité XSD permet de valider, entre autre :</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">- que les balises utilisées sont bien connues (définies dans l'XSD)</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">- la présence des balises obligatoires</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- l’arborescence des balises</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- l’ordre des balises</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- la cardinalité des balises</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- le contenu de balise (vérification de type quand il est connu&nbsp;: date, durée, entier, flottant, booléen, pattern, etc.)</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>Exemple: </u></b></font></font></font></p>
-<div class=WordSection1>
-</span>
-
-<p class=MsoTitle><span style='font-size:14.0pt;font-family:"Tahoma","sans-serif"'>Fiche
-du point de contr&ocirc;le N&deg; 1.2</span></p>
-
-<p class=MsoNormal>&nbsp;</p>
-
-<table class=MsoNormalTable border=0 cellspacing=0 cellpadding=0 width=615
- style='width:461.6pt;margin-left:-.5pt;border-collapse:collapse'>
- <tr style='page-break-inside:avoid'>
- <td width=615 colspan=2 valign=top style='width:461.6pt;border:solid black 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center;layout-grid-mode:char'><i><span
- style='font-family:"Tahoma","sans-serif";color:navy'>Description</span></i></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=109 style='width:81.5pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Intitul&eacute;</span></h1>
- </td>
- <td width=507 style='width:380.1pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>V&eacute;rification
- de la conformit&eacute; au sch&eacute;ma XML du profil CHOUETTE</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=109 style='width:81.5pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Objectif</span></h1>
- </td>
- <td width=507 style='width:380.1pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>V&eacute;rifier
- le fichier d&rsquo;export XML par rapport &agrave; un fichier de r&eacute;f&eacute;rence XSD (XML Schema
- Definition) dans lequel est d&eacute;fini un jeu de r&egrave;gles et contraintes.</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=109 style='width:81.5pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>R&eacute;f&eacute;rences</span></h1>
- </td>
- <td width=507 style='width:380.1pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Sch&eacute;ma
- XML CHOUETTE</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=109 style='width:81.5pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>N&deg; de fiche(s)
- connexe(s)</span></h1>
- </td>
- <td width=507 style='width:380.1pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>&nbsp;</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=109 style='width:81.5pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt;layout-grid-mode:char'><b><span
- style='font-family:"Tahoma","sans-serif"'>Priorit&eacute;<span style='color:red'> </span></span></b></p>
- </td>
- <td width=507 style='width:380.1pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Obligatoire</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=109 style='width:81.5pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt;layout-grid-mode:char'><b><span
- style='font-family:"Tahoma","sans-serif"'>R&eacute;sultat</span></b></p>
- </td>
- <td width=507 style='width:380.1pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Conforme
- ou non conforme</span></h1>
- </td>
- </tr>
- <tr style='page-break-inside:avoid'>
- <td width=615 colspan=2 valign=top style='width:461.6pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center;layout-grid-mode:char'><i><span
- style='font-family:"Tahoma","sans-serif";color:navy'>Mise en &oelig;uvre</span></i></h1>
- </td>
- </tr>
- <tr>
- <td width=109 valign=top style='width:81.5pt;border-top:none;border-left:
- solid black 1.0pt;border-bottom:solid black 1.0pt;border-right:none;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;layout-grid-mode:char'><span style='font-size:11.0pt'>Explication</span></h1>
- </td>
- <td width=507 valign=top style='width:380.1pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 11.35pt 0cm 3.5pt'>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm;text-align:justify;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Il faut v&eacute;rifier
- que le document d&rsquo;export XML respecte les r&egrave;gles d&eacute;crites dans le document
- XSD CHOUETTE. Pour cela, il faut mettre en place les traitements permettant
- de v&eacute;rifier la pr&eacute;sence de tous les objets et attributs obligatoires des
- concepts et des attributs optionnels visibles d&rsquo;une part dans le mod&egrave;le de
- donn&eacute;es, d&rsquo;autre part dans le profil d&rsquo;&eacute;change, si utilis&eacute;s. </span></p>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm;text-align:justify'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>La v&eacute;rification de la conformit&eacute; XSD
- permet de valider, entre autre :</span></p>
- <p class=MsoNormal style='margin-left:36.0pt;text-indent:-18.0pt'><span
- style='font-size:10.0pt;font-family:Symbol'>·<span style='font:7.0pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
- </span></span><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>que
- l'encodage est bien ISO-8859-1</span></p>
- <p class=MsoNormal style='margin-left:36.0pt;text-indent:-18.0pt'><span
- style='font-size:10.0pt;font-family:Symbol'>·<span style='font:7.0pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
- </span></span><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>que
- les balises utilis&eacute;es sont bien connues (d&eacute;finies dans l'XSD)</span></p>
- <p class=MsoNormal style='margin-left:36.0pt;text-indent:-18.0pt'><span
- style='font-size:10.0pt;font-family:Symbol'>·<span style='font:7.0pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
- </span></span><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>la
- pr&eacute;sence des balises obligatoires </span></p>
- <p class=MsoNormal style='margin-left:36.0pt;text-indent:-18.0pt'><span
- style='font-size:10.0pt;font-family:Symbol'>·<span style='font:7.0pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
- </span></span><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>l&rsquo;arborescence
- des balises </span></p>
- <p class=MsoNormal style='margin-left:36.0pt;text-indent:-18.0pt'><span
- style='font-size:10.0pt;font-family:Symbol'>·<span style='font:7.0pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
- </span></span><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>l&rsquo;ordre
- des balises </span></p>
- <p class=MsoNormal style='margin-left:35.7pt;text-indent:-17.85pt'><span
- style='font-size:10.0pt;font-family:Symbol'>·<span style='font:7.0pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
- </span></span><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>la
- cardinalit&eacute; des balises</span></p>
- <p class=MsoNormal style='margin-top:0cm;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:35.7pt;text-indent:-17.85pt'><span style='font-size:10.0pt;
- font-family:Symbol'>·<span style='font:7.0pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
- </span></span><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>le
- contenu de balise (v&eacute;rification de type quand il est connu&nbsp;: date,
- dur&eacute;e, entier, flottant, bool&eacute;en, pattern, etc.) </span></p>
- </td>
- </tr>
-</table>
-
-<p class=MsoNormal>&nbsp;</p>
-
-<table class=MsoNormalTable border=0 cellspacing=0 cellpadding=0 width=615
- style='width:461.6pt;margin-left:-.5pt;border-collapse:collapse'>
- <tr>
- <td width=109 valign=top style='width:81.5pt;border:solid black 1.0pt;
- border-right:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm;layout-grid-mode:char'><b><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>Exemple</span></b></p>
- </td>
- <td width=507 valign=top style='width:380.1pt;border:solid black 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <p style='text-align:justify;layout-grid-mode:char'><u><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Un exemple de
- fichier XSD&nbsp;(reseau.xsd)</span></u><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'> :</span></p>
- <p class=MsoNormal style='text-align:justify'><span lang=DE style='font-size:
- 10.0pt;font-family:"Courier New"'>&lt;?xml version=&quot;1.0&quot;
- encoding=&quot;ISO-8859-1&quot;?&gt;</span></p>
- <p class=MsoNormal style='text-align:justify'><span lang=DE style='font-size:
- 10.0pt;font-family:"Courier New"'>&lt;xsd:schema
- xmlns:xsd=&quot;http://www.w3.org/2001/XMLSchema&quot;
- xmlns=&quot;http://www.trident.org/schema/trident&quot;
- xmlns:trd=&quot;http://www.trident.org/schema/trident&quot;
- targetNamespace=&quot;http://www.trident.org/schema/trident&quot;
- elementFormDefault=&quot;qualified&quot; version=&quot;1.00&quot;&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=DE
- style='font-size:10.0pt;font-family:"Courier New"'> </span><span
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;xsd:annotation&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;xsd:documentation
- xml:lang=&quot;en&quot;&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>TRIDENT exchange schema.</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>Request / Answer schema</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>Copyright (c) 2001 TRIDENT
- consortium, All Rights Reserved.</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;/xsd:documentation&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;/xsd:annotation&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;xsd:include
- schemaLocation=&quot;./trident/trident_Global_schema.xsd&quot;/&gt;</span></p>
- <pre style='text-align:justify'>...</pre>
- <p class=MsoNormal style='text-align:justify'><span style='font-size:10.0pt;
- font-family:"Courier New"'>&lt;/xsd:schema&gt;</span></p>
- <p style='text-align:justify'><u><span style='font-size:11.0pt;font-family:
- "Arial","sans-serif"'>Suivi d'un fichier xml valide&nbsp;:</span></u></p>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span class=tag><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New";font-weight:normal'>&lt;?xml
- version=&quot;1.0&quot; encoding=&quot;ISO-8859-1&quot;?&gt;</span></span></h1>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;ChouettePTNetwork
- xmlns:xsi=&quot;http://www.w3.org/2001/XMLSchema-instance&quot;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>
- xmlns=&quot;http://www.trident.org/schema/trident&quot;
- xsi:schemaLocation=&quot;http://www.trident.org/schema/trident
- /home/marc/workspace/chouette-ninoxe/src/main/castor/Chouette.xsd&quot;&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;PTNetwork&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;objectId&gt;AMIV:PTNetwork:95&lt;/objectId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> </span><span
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;versionDate&gt;2007-03-21&lt;/versionDate&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span class=tag><span
- style='font-size:10.0pt;font-family:"Courier New"'>...</span></span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span class=tag><span
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;/ChouettePTNetwork&gt;</span></span></p>
- </td>
- </tr>
- <tr style='page-break-inside:avoid'>
- <td width=615 colspan=2 valign=top style='width:461.6pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h2 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center;layout-grid-mode:char'><i><span lang=EN-US
- style='font-size:14.0pt;color:navy'>Evaluation</span></i></h2>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=109 style='width:81.5pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span lang=EN-US
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>N&deg; test</span></h1>
- </td>
- <td width=507 style='width:380.1pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>1.2.1</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=109 style='width:81.5pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Libell&eacute;</span></h1>
- </td>
- <td width=507 style='width:380.1pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Conformit&eacute;
- au sch&eacute;ma XML du profil CHOUETTE</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=109 style='width:81.5pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Champ
- d&rsquo;application</span></h1>
- </td>
- <td width=507 style='width:380.1pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Sch&eacute;ma
- XML du profil CHOUETTE</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=109 style='width:81.5pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:5.65pt 11.35pt 5.65pt 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>V&eacute;rification</span></h1>
- </td>
- <td width=507 style='width:380.1pt;border:solid black 1.0pt;border-top:none;
- padding:5.65pt 11.35pt 5.65pt 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:11.35pt;margin-bottom:
- 6.0pt;margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>-
- V&eacute;rifier qu'il est possible d'ouvrir le fichier contenant le mod&egrave;le CHOUETTE
- &agrave; analyser avec un &eacute;diteur XML en respectant le sch&eacute;ma CHOUETTE ou
- directement &agrave; l'aide d'un Framework de v&eacute;rification de la syntaxe XML par
- rapport au sch&eacute;ma CHOUETTE (castor, xerces, etc...). </span></h1>
- <p class=MsoNormal style='margin-right:11.35pt'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>- Si le fichier respecte le mod&egrave;le
- CHOUETTE alors le test est valid&eacute;, sinon le test est invalid&eacute; et produit le
- message &laquo;&nbsp;test 1.2.1&nbsp;: le fichier ne respecte pas le mod&egrave;le
- CHOUETTE&raquo;.</span></p>
- </td>
- </tr>
-</table>
-
-
-</div>
-
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Un exemple de fichier XSD&nbsp;(reseau.xsd):</font></font></font></p>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;?xml version="1.0" encoding="ISO-8859-1"?&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;xsd:schema
+xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+xmlns="http://www.trident.org/schema/trident"
+xmlns:trd="http://www.trident.org/schema/trident"
+targetNamespace="http://www.trident.org/schema/trident"
+elementFormDefault="qualified" version="1.00"&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif"><br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;xsd:annotation&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;xsd:documentation xml:lang="en"&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">TRIDENT exchange schema.<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">Request / Answer schema<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">Copyright (c) 2001 TRIDENT consortium, All Rights Reserved.<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;/xsd:documentation&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;/xsd:annotation&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;xsd:include schemaLocation="./trident/trident_Global_schema.xsd"/&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;/xsd:schema&gt;<br></font></span>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Suivi d'un fichier xml valide&nbsp;:</font></font></font></p>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;?xml version="1.0" encoding="ISO-8859-1"?&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;ChouettePTNetwork xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">xmlns="http://www.trident.org/schema/trident"
+xsi:schemaLocation="http://www.trident.org/schema/trident
+/home/marc/workspace/chouette-ninoxe/src/main/castor/Chouette.xsd"&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;PTNetwork&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;objectId&gt;AMIV:PTNetwork:95&lt;/objectId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif"><br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;versionDate&gt;2007-03-21&lt;/versionDate&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">...<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;/ChouettePTNetwork&gt;<br></font></span>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>N° test:</u></b>
+1.2.1</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Libellé:</u>
+Conformité au schéma XML du profil CHOUETTE</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Champ d’application:</u>
+Schéma XML du profil CHOUETTE</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Vérification:</u> </font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Vérifier qu'il est possible d'ouvrir le fichier contenant le modèle
+CHOUETTE à analyser avec un éditeur XML en respectant le schéma
+CHOUETTE ou directement à l'aide d'un Framework de vérification de la
+syntaxe XML par rapport au schéma CHOUETTE (castor, xerces, etc...).</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si le fichier respecte le modèle CHOUETTE alors le test est validé,
+sinon le test est invalidé et produit le message «&nbsp;test
+1.2.1&nbsp;: le fichier ne respecte pas le modèle CHOUETTE».</font></font></font></p>
diff --git a/app/views/test_sheet/2_1.html b/app/views/test_sheet/2_1.html
index b4f3995a8..3b83155b1 100644
--- a/app/views/test_sheet/2_1.html
+++ b/app/views/test_sheet/2_1.html
@@ -1,500 +1,176 @@
+<h1 class="western" style="border: 1pt solid rgb(0, 0, 0); padding: 0.05cm 0.12cm; margin-top: 0.21cm;" align="center">
+<font face="Arial, sans-serif"><font style="font-size: 20pt;" size="5"><i>
+ point de contrôle N° 2.1<br>
+Cohérence entre le réseau et ses composants<br>
+</i></font></font></h1>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Objectif: </b></u>
+Vérification de la correcte référence à des LIGNEs/Chouette (« Line ») dans VERSION DU RÉSEAU («&nbsp;PTNetwork&nbsp;»).<br>
+Vérification de la correcte référence à la VERSION DU RÉSEAU(«&nbsp;PTNetwork&nbsp;») dans LIGNEs/Chouette («Line »).<br>
+</font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Priorité: </b></u> Obligatoire (si la séquence «&nbsp;lineId&nbsp;» est utilisée dans «&nbsp;PTNetwork&nbsp;»)</font></p><font face="Arial, sans-serif">
+</font><p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><u><b>Explications:</b></u>
+</font></font></p><p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+La référence à la LIGNE/Chouette (« Line »), au sein de la classe
+d’objets de VERSION DU RÉSEAU («PTNetwork»), a un caractère optionnel.
+Si cette référence est utilisée, alors elle doit correspondre à une ou
+plusieurs LIGNEs/Chouette (« Line ») effectivement définie(s).</font></font></font></p>
-<div class=WordSection1>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+L’élément permettant d’identifier le réseau (ptNetworkIdShortcut) auquel appartient une LIGNE/Chouette (« Line ») a
+un caractère optionnel. Si cet élément est utilisé, il convient de
+vérifier que sa valeur correspond bien à l’identifiant de la VERSION DU
+RÉSEAU (« PTNetwork ») en question.</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>Exemple: </u></b></font></font></font></p>
-<p class=MsoTitle><span style='font-size:14.0pt;font-family:"Tahoma","sans-serif"'> Fiche
-du point de contr&ocirc;le N&deg; 2.1</span></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+&nbsp;Représentation schématique de l’Objet PTNetwork</font></font></font></p>
+<p><font face="Arial, sans-serif"><img src="image001.jpg" height="482" width="457"></font></p>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">...<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;PTNetwork&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;objectId&gt;SYNTHESE:PTNetwork:6192449487677451&lt;/objectId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;name&gt;MP/TLS - Tisséo&lt;/name&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;lineId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">SYNTHESE:Line:11821949021891693<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;/lineId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;registration&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;registrationNumber&gt;6192449487677451&lt;/registrationNumber&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;/registration&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;/PTNetwork&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">...<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;Line&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;objectId&gt;SYNTHESE:Line:11821949021891693&lt;/objectId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;name&gt;MP/TLS/150&lt;/name&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;publishedName&gt;le taxi-bus Saubens&lt;/publishedName&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;routeId&gt;SYNTHESE:ChouetteRoute:2533274790396714&lt;/routeId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;routeId&gt;SYNTHESE:ChouetteRoute:2533274790396715&lt;/routeId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;routeId&gt;SYNTHESE:ChouetteRoute:2533274790397007&lt;/routeId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;routeId&gt;SYNTHESE:ChouetteRoute:2533274790397008&lt;/routeId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif"><br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;registration&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;registrationNumber&gt;11821949021891693&lt;/registrationNumber&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;/registration&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;/Line&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">...<span style="color: teal;"><br></span>
+</font><p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>Exemple: </u></b></font></font></font></p>
-<p class=MsoNormal>&nbsp;</p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+&nbsp;Représentation schématique de l’Objet Line</font></font></font></p>
+<p><font face="Arial, sans-serif"><img src="image002.jpg" height="498" width="478"></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<span style="text-decoration: none;">&nbsp;</span></font></font></font></p>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">...<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;PTNetwork&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;objectId&gt;AMIV:PTNetwork:95&lt;/objectId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;versionDate&gt;2007-03-21&lt;/versionDate&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">...<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;Line&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;objectId&gt;AMIV:Line:014014012&lt;/objectId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;objectVersion&gt;1&lt;/objectVersion&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;creationTime&gt;2007-03-21T16:05:54.000+01:00&lt;/creationTime&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;name&gt;LIGNE 012&lt;/name&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;publishedName&gt;Les Courriers de l'Ile de France&lt;/publishedName&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;transportModeName&gt;Bus&lt;/transportModeName&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;lineEnd&gt;AMIV:StopPoint:488957A0A237830&lt;/lineEnd&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;ptNetworkIdShortcut&gt;AMIV:PTNetwork:95&lt;/ptNetworkIdShortcut&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;routeId&gt;AMIV:Route:488957&lt;/routeId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif"><br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;routeId&gt;AMIV:Route:488959&lt;/routeId&gt;...<br></font></span>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+&nbsp;</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>N° test:</u></b>
+2.1.1</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Libellé:</u>
+Vérification de la correcte référence à des LIGNEs/Chouette (« Line ») dans VERSION DU RÉSEAU («&nbsp;PTNetwork&nbsp;»).</font></font></font></p>
-<table class=MsoNormalTable border=0 cellspacing=0 cellpadding=0 width=629
- style='width:472.05pt;margin-left:-.75pt;border-collapse:collapse'>
- <tr style='page-break-inside:avoid'>
- <td width=616 colspan=3 valign=top style='width:462.1pt;border:solid black 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center;layout-grid-mode:char'><i><span
- style='font-family:"Tahoma","sans-serif";color:navy'>Description</span></i></h1>
- </td>
- <td style='border:none;padding:0cm 0cm 0cm 0cm' width=13><p class='MsoNormal'>&nbsp;</td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=109 colspan=2 style='width:81.5pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Intitul&eacute;</span></h1>
- </td>
- <td width=507 style='width:380.6pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt;layout-grid-mode:char'><span
- style='font-size:11.0pt;line-height:200%;font-family:"Tahoma","sans-serif"'>Coh&eacute;rence
- entre le r&eacute;seau et ses composants</span></p>
- </td>
- <td style='border:none;padding:0cm 0cm 0cm 0cm' width=13><p class='MsoNormal'>&nbsp;</td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=109 colspan=2 style='width:81.5pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Objectif</span></h1>
- </td>
- <td width=507 style='width:380.6pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:11.35pt;margin-bottom:
- 6.0pt;margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>V&eacute;rification
- de la correcte r&eacute;f&eacute;rence &agrave; des LIGNEs/Chouette (&laquo; Line &raquo;) dans VERSION DU
- R&Eacute;SEAU (&laquo;&nbsp;PTNetwork&nbsp;&raquo;).</span></h1>
- <h1 align=left style='margin-top:6.0pt;margin-right:11.35pt;margin-bottom:
- 6.0pt;margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>V&eacute;rification
- de la correcte r&eacute;f&eacute;rence &agrave; la VERSION DU R&Eacute;SEAU(&laquo;&nbsp;PTNetwork&nbsp;&raquo;)
- dans LIGNEs/Chouette (&laquo; Line &raquo;). </span></h1>
- </td>
- <td style='border:none;padding:0cm 0cm 0cm 0cm' width=13><p class='MsoNormal'>&nbsp;</td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=109 colspan=2 style='width:81.5pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>R&eacute;f&eacute;rences</span></h1>
- </td>
- <td width=507 style='width:380.6pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>TRIDENT/profil
- CHOUETTE/Transmodel V4 et V5.1</span></h1>
- </td>
- <td style='border:none;padding:0cm 0cm 0cm 0cm' width=13><p class='MsoNormal'>&nbsp;</td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=109 colspan=2 style='width:81.5pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>N&deg; de fiche(s)
- connexe(s)</span></h1>
- </td>
- <td width=507 style='width:380.6pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>&nbsp;</span></h1>
- </td>
- <td style='border:none;padding:0cm 0cm 0cm 0cm' width=13><p class='MsoNormal'>&nbsp;</td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=109 colspan=2 style='width:81.5pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:5.65pt 11.35pt 5.65pt 3.5pt;
- height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt;layout-grid-mode:char'><b><span
- style='font-size:11.0pt;line-height:200%;font-family:"Tahoma","sans-serif"'>Priorit&eacute;<span
- style='color:red'> </span></span></b></p>
- </td>
- <td width=507 style='width:380.6pt;border:solid black 1.0pt;border-top:none;
- padding:5.65pt 11.35pt 5.65pt 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Obligatoire
- (si la s&eacute;quence &laquo;&nbsp;lineId&nbsp;&raquo; est utilis&eacute;e dans
- &laquo;&nbsp;PTNetwork&nbsp;&raquo;)</span></h1>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>Obligatoire
- (si l&rsquo;&eacute;l&eacute;ment ptNetworkIdShortCut est utilis&eacute; dans &laquo;&nbsp;Line&nbsp;&raquo;)</span></p>
- </td>
- <td style='border:none;padding:0cm 0cm 0cm 0cm' width=13><p class='MsoNormal'>&nbsp;</td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=109 colspan=2 style='width:81.5pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt;layout-grid-mode:char'><b><span
- style='font-size:11.0pt;line-height:200%;font-family:"Tahoma","sans-serif"'>R&eacute;sultat</span></b></p>
- </td>
- <td width=507 style='width:380.6pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Conforme
- ou non conforme</span></h1>
- </td>
- <td style='border:none;padding:0cm 0cm 0cm 0cm' width=13><p class='MsoNormal'>&nbsp;</td>
- </tr>
- <tr style='page-break-inside:avoid'>
- <td width=616 colspan=3 valign=top style='width:462.1pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center;layout-grid-mode:char'><i><span
- style='font-family:"Tahoma","sans-serif";color:navy'>Mise en &oelig;uvre</span></i></h1>
- </td>
- <td style='border:none;padding:0cm 0cm 0cm 0cm' width=13><p class='MsoNormal'>&nbsp;</td>
- </tr>
- <tr>
- <td width=109 colspan=2 style='width:81.5pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt;layout-grid-mode:char'><b><span
- style='font-size:11.0pt;line-height:200%;font-family:"Tahoma","sans-serif"'>&nbsp;</span></b></p>
- <p class=MsoBodyText2 style='margin-top:6.0pt;layout-grid-mode:char'><b><span
- style='font-size:11.0pt;line-height:200%;font-family:"Tahoma","sans-serif"'>Explication</span></b></p>
- <p class=MsoBodyText2 style='margin-top:6.0pt;layout-grid-mode:char'><b><span
- style='font-size:11.0pt;line-height:200%;font-family:"Tahoma","sans-serif"'>&nbsp;</span></b></p>
- <p class=MsoBodyText2 style='margin-top:6.0pt;layout-grid-mode:char'><b><span
- style='font-size:11.0pt;line-height:200%;font-family:"Tahoma","sans-serif"'>&nbsp;</span></b></p>
- </td>
- <td width=507 valign=top style='width:380.6pt;border:solid black 1.0pt;
- border-top:none;padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:11.35pt;margin-bottom:6.0pt;
- margin-left:0cm;layout-grid-mode:char'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'>La r&eacute;f&eacute;rence &agrave; la
- LIGNE/Chouette (&laquo; Line &raquo;), au sein de la classe d&rsquo;objets de VERSION DU
- R&Eacute;SEAU (&laquo; PTNetwork &raquo;), a un caract&egrave;re optionnel. Si cette r&eacute;f&eacute;rence est
- utilis&eacute;e, alors elle doit correspondre &agrave; une ou plusieurs LIGNEs/Chouette (&laquo;
- Line &raquo;) effectivement d&eacute;finie(s). </span></h1>
- <p class=MsoNormal style='margin-top:0cm;margin-right:11.35pt;margin-bottom:
- 6.0pt;margin-left:0cm;text-align:justify'><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'>L&rsquo;&eacute;l&eacute;ment permettant d&rsquo;identifier le r&eacute;seau
- (ptNetworkIdShortcut) auquel appartient une LIGNE/Chouette (&laquo; Line &raquo;) </span><b><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'> </span></b><span
- style='font-size:11.0pt;font-family:"Arial","sans-serif"'>a un caract&egrave;re
- optionnel. Si cet &eacute;l&eacute;ment est utilis&eacute;, il convient de v&eacute;rifier que sa valeur
- correspond bien &agrave; l&rsquo;identifiant de la VERSION DU R&Eacute;SEAU (&laquo; PTNetwork &raquo;) en
- question.</span></p>
- </td>
- <td style='border:none;padding:0cm 0cm 0cm 0cm' width=13><p class='MsoNormal'>&nbsp;</td>
- </tr>
- <tr style='height:710.7pt'>
- <td width=109 colspan=2 valign=top style='width:81.5pt;border-top:none;
- border-left:solid black 1.0pt;border-bottom:solid black 1.0pt;border-right:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:710.7pt'>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm;layout-grid-mode:char'><b><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>Exemple</span></b></p>
- </td>
- <td width=507 valign=top style='width:380.6pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt;height:710.7pt'>
- <h1 align=left style='margin-left:18.0pt;text-align:left'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>&nbsp;</span></h1>
- <h1 align=left style='margin-left:18.0pt;text-align:left'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Repr&eacute;sentation
- sch&eacute;matique de l&rsquo;Objet PTNetwork </span></h1>
- <p class=MsoNormal align=center style='text-align:center'><img width=457
- height=482 src="BATERI_Neptune_FINAL-V2_0a_fichiers/image001.jpg"></p>
- <h3 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 3.4pt;layout-grid-mode:char'>Exemple de l&rsquo;objet PTNetwork &agrave; partir d&rsquo;un
- fichier XML</h3>
- <p class=MsoNormal style='margin-left:3.4pt'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>...</span></p>
- <p class=MsoNormal style='margin-left:3.4pt'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;PTNetwork&gt;</span></p>
- <p class=MsoNormal style='margin-left:3.4pt;text-autospace:ideograph-numeric'><span
- lang=EN-US style='font-size:10.0pt;font-family:"Courier New"'> &lt;objectId&gt;SYNTHESE:PTNetwork:6192449487677451&lt;/objectId&gt;</span></p>
- <p class=MsoNormal style='margin-left:3.4pt;text-autospace:ideograph-numeric'><span
- lang=EN-US style='font-size:10.0pt;font-family:"Courier New"'> &lt;name&gt;MP/TLS
- - Tiss&eacute;o&lt;/name&gt;</span></p>
- <p class=MsoNormal style='margin-left:3.4pt;text-autospace:ideograph-numeric'><span
- lang=EN-US style='font-size:10.0pt;font-family:"Courier New"'> &lt;lineId&gt;</span><span
- lang=EN-US style='font-size:10.0pt;font-family:"Courier New"'>SYNTHESE:Line:11821949021891693</span><span
- lang=EN-US style='font-size:10.0pt;font-family:"Courier New"'>&lt;/lineId&gt;</span></p>
- <p class=MsoNormal style='margin-left:3.4pt;text-autospace:ideograph-numeric'><span
- lang=EN-US style='font-size:10.0pt;font-family:"Courier New"'> &lt;registration&gt;</span></p>
- <p class=MsoNormal style='margin-left:3.4pt;text-autospace:ideograph-numeric'><span
- lang=EN-US style='font-size:10.0pt;font-family:"Courier New"'> &lt;registrationNumber&gt;6192449487677451&lt;/registrationNumber&gt;</span></p>
- <p class=MsoNormal style='margin-left:3.4pt;text-autospace:ideograph-numeric'><span
- lang=EN-US style='font-size:10.0pt;font-family:"Courier New"'> &lt;/registration&gt;</span></p>
- <p class=MsoNormal style='margin-left:3.4pt;text-autospace:ideograph-numeric'><span
- lang=EN-US style='font-size:10.0pt;font-family:"Courier New"'>&lt;/PTNetwork&gt;</span></p>
- <p class=MsoNormal style='margin-left:3.4pt;text-autospace:ideograph-numeric'><span
- lang=EN-US style='font-size:10.0pt;font-family:"Courier New"'>...</span></p>
- <p class=MsoNormal style='margin-left:3.4pt;text-autospace:ideograph-numeric'><span
- lang=EN-US style='font-size:10.0pt;font-family:"Courier New"'>&lt;Line&gt;</span></p>
- <p class=MsoNormal style='margin-left:3.4pt;text-autospace:ideograph-numeric'><span
- lang=EN-US style='font-size:10.0pt;font-family:"Courier New"'> &lt;objectId&gt;SYNTHESE:Line:11821949021891693&lt;/objectId&gt;</span></p>
- <p class=MsoNormal style='margin-left:3.4pt;text-autospace:ideograph-numeric'><span
- lang=EN-US style='font-size:10.0pt;font-family:"Courier New"'> &lt;name&gt;MP/TLS/150&lt;/name&gt;</span></p>
- <p class=MsoNormal style='margin-left:3.4pt;text-autospace:ideograph-numeric'><span
- lang=EN-US style='font-size:10.0pt;font-family:"Courier New"'> &lt;publishedName&gt;le
- taxi-bus Saubens&lt;/publishedName&gt;</span></p>
- <p class=MsoNormal style='margin-left:3.4pt;text-autospace:ideograph-numeric'><span
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;routeId&gt;SYNTHESE:ChouetteRoute:2533274790396714&lt;/routeId&gt;</span></p>
- <p class=MsoNormal style='margin-left:3.4pt;text-autospace:ideograph-numeric'><span
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;routeId&gt;SYNTHESE:ChouetteRoute:2533274790396715&lt;/routeId&gt;</span></p>
- <p class=MsoNormal style='margin-left:3.4pt;text-autospace:ideograph-numeric'><span
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;routeId&gt;SYNTHESE:ChouetteRoute:2533274790397007&lt;/routeId&gt;</span></p>
- <p class=MsoNormal style='margin-left:3.4pt;text-autospace:ideograph-numeric'><span
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;routeId&gt;SYNTHESE:ChouetteRoute:2533274790397008&lt;/routeId&gt;</span></p>
- <p class=MsoNormal style='margin-left:3.4pt;text-autospace:ideograph-numeric'><span
- style='font-size:10.0pt;font-family:"Courier New"'> </span><span
- lang=EN-US style='font-size:10.0pt;font-family:"Courier New"'>&lt;registration&gt;</span></p>
- <p class=MsoNormal style='margin-left:3.4pt;text-autospace:ideograph-numeric'><span
- lang=EN-US style='font-size:10.0pt;font-family:"Courier New"'>&lt;registrationNumber&gt;11821949021891693&lt;/registrationNumber&gt;</span></p>
- <p class=MsoNormal style='margin-left:3.4pt;text-autospace:ideograph-numeric'><span
- lang=EN-US style='font-size:10.0pt;font-family:"Courier New"'> &lt;/registration&gt;</span></p>
- <p class=MsoNormal style='margin-left:3.4pt;text-autospace:ideograph-numeric'><span
- lang=EN-US style='font-size:10.0pt;font-family:"Courier New"'>&lt;/Line&gt;</span></p>
- <p class=MsoNormal style='margin-left:3.4pt;text-autospace:ideograph-numeric'><span
- style='font-size:10.0pt;font-family:"Courier New"'>...<span style='color:
- teal'> </span></span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span
- style='font-size:10.0pt;font-family:Monospace;color:teal'>&nbsp;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span
- style='font-size:10.0pt;font-family:Monospace;color:teal'>&nbsp;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span
- style='font-size:10.0pt;font-family:Monospace;color:teal'>&nbsp;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span
- style='font-size:10.0pt;font-family:Monospace;color:teal'>&nbsp;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'>&nbsp;</p>
- </td>
- <td style='border:none;border-bottom:solid black 1.0pt' width=13><p class='MsoNormal'>&nbsp;</td>
- </tr>
- <tr>
- <td width=100 valign=top style='width:74.85pt;border-top:none;border-left:
- solid black 1.0pt;border-bottom:solid black 1.0pt;border-right:none;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm;layout-grid-mode:char'><b><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>Exemple</span></b></p>
- </td>
- <td width=530 colspan=3 valign=top style='width:397.2pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=left style='margin-left:18.0pt;text-align:left;layout-grid-mode:
- char'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>&nbsp;</span></h1>
- <h1 align=left style='margin-left:18.0pt;text-align:left'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Repr&eacute;sentation
- sch&eacute;matique de l&rsquo;Objet Line</span></h1>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal align=center style='text-align:center'><img width=478
- height=498 src="BATERI_Neptune_FINAL-V2_0a_fichiers/image002.jpg"></p>
- <p class=MsoNormal><u><span style='font-size:11.0pt'><span style='text-decoration:
- none'>&nbsp;</span></span></u></p>
- <p class=MsoNormal>&nbsp;</p>
- <h3 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 3.4pt'>Exemple de ligne r&eacute;f&eacute;ren&ccedil;ant le r&eacute;seau auquel appartient la ligne</h3>
- <p class=MsoNormal style='margin-left:3.4pt'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>...</span></p>
- <p class=MsoNormal style='margin-left:3.4pt'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;PTNetwork&gt;</span></p>
- <p class=MsoNormal style='margin-left:3.4pt;text-autospace:ideograph-numeric'><span
- lang=EN-US style='font-size:10.0pt;font-family:"Courier New"'> &lt;objectId&gt;AMIV:PTNetwork:95&lt;/objectId&gt;</span></p>
- <p class=MsoNormal style='margin-left:3.4pt;text-autospace:ideograph-numeric'><span
- lang=EN-US style='font-size:10.0pt;font-family:"Courier New"'> &lt;versionDate&gt;2007-03-21&lt;/versionDate&gt;</span></p>
- <p class=MsoNormal style='margin-left:3.4pt'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>...</span></p>
- <p class=MsoNormal style='margin-left:3.4pt'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;Line&gt;</span></p>
- <p class=MsoNormal style='margin-left:3.4pt;text-autospace:ideograph-numeric'><span
- lang=EN-US style='font-size:10.0pt;font-family:"Courier New"'> &lt;objectId&gt;AMIV:Line:014014012&lt;/objectId&gt;</span></p>
- <p class=MsoNormal style='margin-left:3.4pt;text-autospace:ideograph-numeric'><span
- lang=EN-US style='font-size:10.0pt;font-family:"Courier New"'> &lt;objectVersion&gt;1&lt;/objectVersion&gt;</span></p>
- <p class=MsoNormal style='margin-left:3.4pt;text-autospace:ideograph-numeric'><span
- lang=EN-US style='font-size:10.0pt;font-family:"Courier New"'> &lt;creationTime&gt;2007-03-21T16:05:54.000+01:00&lt;/creationTime&gt;</span></p>
- <p class=MsoNormal style='margin-left:3.4pt;text-autospace:ideograph-numeric'><span
- lang=EN-US style='font-size:10.0pt;font-family:"Courier New"'> &lt;name&gt;LIGNE
- 012&lt;/name&gt;</span></p>
- <p class=MsoNormal style='margin-left:3.4pt;text-autospace:ideograph-numeric'><span
- lang=EN-US style='font-size:10.0pt;font-family:"Courier New"'> &lt;publishedName&gt;Les
- Courriers de l'Ile de France&lt;/publishedName&gt;</span></p>
- <p class=MsoNormal style='margin-left:3.4pt;text-autospace:ideograph-numeric'><span
- lang=EN-US style='font-size:10.0pt;font-family:"Courier New"'> &lt;transportModeName&gt;Bus&lt;/transportModeName&gt;</span></p>
- <p class=MsoNormal style='margin-left:3.4pt;text-autospace:ideograph-numeric'><span
- lang=EN-US style='font-size:10.0pt;font-family:"Courier New"'> &lt;lineEnd&gt;AMIV:StopPoint:488957A0A237830&lt;/lineEnd&gt;</span></p>
- <p class=MsoNormal style='margin-left:3.4pt;text-autospace:ideograph-numeric'><span
- lang=EN-US style='font-size:10.0pt;font-family:"Courier New"'> &lt;ptNetworkIdShortcut&gt;AMIV:PTNetwork:95&lt;/ptNetworkIdShortcut&gt;</span></p>
- <p class=MsoNormal style='margin-left:3.4pt;text-autospace:ideograph-numeric'><span
- lang=EN-US style='font-size:10.0pt;font-family:"Courier New"'> &lt;routeId&gt;AMIV:Route:488957&lt;/routeId&gt;</span></p>
- <p class=MsoNormal style='margin-left:3.4pt;text-autospace:ideograph-numeric'><span
- lang=EN-US style='font-size:10.0pt;font-family:"Courier New"'> </span><span
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;routeId&gt;AMIV:Route:488959&lt;/routeId&gt;...</span></p>
- </td>
- </tr>
- <tr height=0>
- <td width=100 style='border:none'></td>
- <td width=7 style='border:none'></td>
- <td width=527 style='border:none'></td>
- <td width=7 style='border:none'></td>
- </tr>
-</table>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Champ d’application:</u>
+&lt;PTNetwork&gt;&nbsp;&lt;Line&gt;</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Vérification:</u> </font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si l’élément «&nbsp;lineId&nbsp;», situé dans l’objet
+«&nbsp;PTNetwork&nbsp;», existe alors poursuivre le test, sinon
+abandonner le test,</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si la valeur de chaque élément «&nbsp;LineId&nbsp;» de la classe
+d’objets «PTNetwork&nbsp;», est identifiée dans l’élément
+«&nbsp;objectId&nbsp;» de la classe d’objets «&nbsp;Line&nbsp;» alors
+le test est validé, sinon le test est invalidé et produit le message
+«&nbsp;test 2.1.1&nbsp;: la valeur de l’élément «&nbsp;LineId&nbsp;» de
+la classe d’objets «PTNetwork&nbsp;» n’a pas été repérée dans l’élément
+«&nbsp;objectId&nbsp;» de la classe d’objets «&nbsp;Line&nbsp;».</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>N° test:</u></b>
+2.1.2</font></font></font></p>
-<p class=MsoNormal><b><span style='font-family:"Tahoma","sans-serif"'>&nbsp;</span></b></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Libellé:</u>
+Vérification de la correcte référence à la VERSION DU RÉSEAU&nbsp;( «&nbsp;PTNetwork&nbsp;»).dans LIGNEs/Chouette («Line »).</font></font></font></p>
-<table class=MsoNormalTable border=0 cellspacing=0 cellpadding=0 width=624
- style='width:467.8pt;margin-left:-3.6pt;border-collapse:collapse'>
- <tr style='page-break-inside:avoid'>
- <td width=624 colspan=2 valign=top style='width:467.8pt;border:solid black 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h2 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center;layout-grid-mode:char'><i><span lang=EN-US
- style='font-size:14.0pt;color:navy'>Evaluation</span></i></h2>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span lang=EN-US
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>N&deg; test</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:5.65pt 11.35pt 5.65pt 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>2.1.1</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Libell&eacute;</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:5.65pt 11.35pt 5.65pt 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>V&eacute;rification
- de la correcte r&eacute;f&eacute;rence &agrave; des LIGNEs/Chouette (&laquo; Line &raquo;) dans VERSION DU
- R&Eacute;SEAU (&laquo;&nbsp;PTNetwork&nbsp;&raquo;).</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span lang=EN-US
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Champ
- d&rsquo;application</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:5.65pt 11.35pt 5.65pt 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;text-align:left;layout-grid-mode:char'><span
- lang=EN-US style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>&lt;PTNetwork&gt;</span></h1>
- <h1 align=left style='text-align:left;layout-grid-mode:char'><span
- lang=EN-US style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>&lt;Line&gt;</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>V&eacute;rification</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:5.65pt 11.35pt 5.65pt 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>-
- Si l&rsquo;&eacute;l&eacute;ment &laquo;&nbsp;lineId&nbsp;&raquo;, situ&eacute; dans l&rsquo;objet
- &laquo;&nbsp;PTNetwork&nbsp;&raquo;, existe alors poursuivre le test, sinon abandonner le
- test,</span></h1>
- <h1 align=left style='margin-bottom:6.0pt;text-align:left;layout-grid-mode:
- char'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>- Si la valeur de chaque &eacute;l&eacute;ment &laquo;&nbsp;LineId&nbsp;&raquo; de
- la classe d&rsquo;objets &laquo;PTNetwork&nbsp;&raquo;, est identifi&eacute;e dans l&rsquo;&eacute;l&eacute;ment
- &laquo;&nbsp;objectId&nbsp;&raquo; de la classe d&rsquo;objets &laquo;&nbsp;Line&nbsp;&raquo; alors le
- test est valid&eacute;, sinon le test est invalid&eacute; et produit le message &laquo;&nbsp;test
- 2.1.1&nbsp;: la valeur de l&rsquo;&eacute;l&eacute;ment &laquo;&nbsp;LineId&nbsp;&raquo; de la classe
- d&rsquo;objets &laquo;PTNetwork&nbsp;&raquo; n&rsquo;a pas &eacute;t&eacute; rep&eacute;r&eacute;e dans l&rsquo;&eacute;l&eacute;ment
- &laquo;&nbsp;objectId&nbsp;&raquo; de la classe d&rsquo;objets &laquo;&nbsp;Line&nbsp;&raquo;.</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=104 style='width:78.0pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span lang=EN-US
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>N&deg; test</span></h1>
- </td>
- <td width=520 style='width:389.8pt;border:solid black 1.0pt;border-top:none;
- padding:5.65pt 11.35pt 5.65pt 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;text-align:left;layout-grid-mode:char'><span
- lang=EN-US style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>2.1.2</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=104 style='width:78.0pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span lang=EN-US
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Libell&eacute;</span></h1>
- </td>
- <td width=520 style='width:389.8pt;border:solid black 1.0pt;border-top:none;
- padding:5.65pt 11.35pt 5.65pt 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>V&eacute;rification
- de la correcte r&eacute;f&eacute;rence &agrave; la VERSION DU R&Eacute;SEAU </span></h1>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>(
- &laquo;&nbsp;PTNetwork&nbsp;&raquo;).dans LIGNEs/Chouette (&laquo; Line &raquo;).</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=104 style='width:78.0pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span lang=EN-US
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Champ
- d&rsquo;application</span></h1>
- </td>
- <td width=520 style='width:389.8pt;border:solid black 1.0pt;border-top:none;
- padding:5.65pt 11.35pt 5.65pt 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span lang=EN-US
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>&lt;Line&gt;</span></h1>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span lang=EN-US
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>&lt;PTNetwork&gt;</span></h1>
- <p class=MsoNormal style='layout-grid-mode:char'><span lang=EN-US
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>&nbsp;</span></p>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=104 style='width:78.0pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>V&eacute;rification</span></h1>
- </td>
- <td width=520 style='width:389.8pt;border:solid black 1.0pt;border-top:none;
- padding:5.65pt 11.35pt 5.65pt 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>-
- Si l&rsquo;&eacute;l&eacute;ment &laquo;PtNetworkIdShortcut&raquo; existe alors poursuivre le test, sinon le
- test est abandonn&eacute;,</span></h1>
- <h1 align=left style='text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>-
- Si la valeur de chaque &laquo;&nbsp;ptNetworkIdShortcut&nbsp;&raquo; pour chaque
- &laquo;&nbsp;Line&nbsp;&raquo;, est identifi&eacute;e dans l&rsquo;&eacute;l&eacute;ment &laquo;&nbsp;objectId&nbsp;&raquo;
- de la classe d&rsquo;objets &laquo;&nbsp;PTNetwork&nbsp;&raquo; alors le test est valid&eacute;,
- sinon le test est invalid&eacute; et produit le message &laquo;&nbsp;test 2.1.2&nbsp;: la
- r&eacute;f&eacute;rence au r&eacute;seau &laquo;&nbsp;PtNetworkIdShortcut&nbsp;&raquo; n&rsquo;a pas &eacute;t&eacute; rep&eacute;r&eacute;e
- dans l&rsquo;&eacute;l&eacute;ment &laquo;&nbsp;objectId&nbsp;&raquo; de la classe d&rsquo;objets &laquo;&nbsp;PtNetwork&raquo;
- &raquo;.</span></h1>
- <h1 align=left style='text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>&nbsp;</span></h1>
- </td>
- </tr>
-</table>
-
-
-</div>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Champ d’application:</u>
+&lt;Line&gt;&nbsp;&lt;PTNetwork&gt;&nbsp;</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Vérification:</u> </font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si l’élément «PtNetworkIdShortcut» existe alors poursuivre le test, sinon le test est abandonné,</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si la valeur de chaque «&nbsp;ptNetworkIdShortcut&nbsp;» pour chaque
+«&nbsp;Line&nbsp;», est identifiée dans l’élément
+«&nbsp;objectId&nbsp;» de la classe d’objets «&nbsp;PTNetwork&nbsp;»
+alors le test est validé, sinon le test est invalidé et produit le
+message «&nbsp;test 2.1.2&nbsp;: la référence au réseau
+«&nbsp;PtNetworkIdShortcut&nbsp;» n’a pas été repérée dans l’élément
+«&nbsp;objectId&nbsp;» de la classe d’objets «&nbsp;PtNetwork» ».</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+&nbsp;</font></font></font></p>
+</span>
diff --git a/app/views/test_sheet/2_10.html b/app/views/test_sheet/2_10.html
index bfe452e12..30f13dca9 100644
--- a/app/views/test_sheet/2_10.html
+++ b/app/views/test_sheet/2_10.html
@@ -1,282 +1,77 @@
-<div class=WordSection1>
-</span>
+<h1 class="western" style="border: 1pt solid rgb(0, 0, 0); padding: 0.05cm 0.12cm; margin-top: 0.21cm;" align="center">
+<font face="Arial, sans-serif"><font style="font-size: 20pt;" size="5"><i>
+ point de contrôle N° 2.10<br>
+Référence à une ligne pour un point d’arrêt<br>
+</i></font></font></h1>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Objectif: </b></u>
+Vérifiication de la correcte référence à une LIGNE/Chouette
+(«&nbsp;Line&nbsp;») pour les POINTS D’ARRÊT SUR PARCOURS («
+StopPoint&nbsp;»&nbsp;).<br>
+</font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Priorité: </b></u> Obligatoire (si l’élément «&nbsp;LineIdShortCut&nbsp;» est existant)</font></p><font face="Arial, sans-serif">
+</font><p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><u><b>Explications:</b></u>
+</font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+La référence à la LIGNE/Chouette («&nbsp;Line&nbsp;»)
+«&nbsp;LineIdShortCut&nbsp;» au sein d'un arrêt POINT D’ARRÊT SUR
+PARCOURS («&nbsp;StopPoint&nbsp;») a un caractère optionnel. Si cette
+référence est utilisée, il convient de vérifier qu'elle correspond à
+l'identifiant «&nbsp;objectId&nbsp;» d’une LIGNE/Chouette
+(«&nbsp;Line&nbsp;»).</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>Exemple: </u></b></font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Représentation schématique de l’Objet «&nbsp;StopPoint&nbsp;»</font></font></font></p>
+<p><font face="Arial, sans-serif"><img src="image009.jpg" height="624" width="450"></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Exemple d'arrêt référençant le raccourci de ligne</font></font></font></p>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">...<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;Line&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;objectId&gt;AMIV:Line:014014012&lt;/objectId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">...<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;StopPoint&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;objectId&gt;AMIV:StopPoint:488957A0A237830&lt;/objectId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;objectVersion&gt;1&lt;/objectVersion&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">...<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;lineIdShortcut&gt;AMIV:Line:014014012&lt;/lineIdShortcut&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;ptNetworkIdShortcut&gt;AMIV:PTNetwork:95&lt;/ptNetworkIdShortcut&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;containedIn&gt;AMIV:StopPoint:237830&lt;/containedIn&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif"><br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;name&gt;Gérard de Nerval&lt;/name&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;/StopPoint&gt;<br></font></span>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>N° test:</u></b>
+2.10.1</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Libellé:</u> Vérification de la correcte référence à une
+LIGNE/Chouette («&nbsp;Line&nbsp;») pour les POINTs D’ARRÊT SUR
+PARCOURS (« StopPoint&nbsp;»&nbsp;).</font></font></font></p>
-<p class=MsoTitle><span style='font-size:14.0pt;font-family:"Tahoma","sans-serif"'>Fiche
-du point de contr&ocirc;le N&deg; 2.10</span></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Champ d’application:</u>
+&lt;StopPoint&gt; &lt;Line&gt;</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Vérification:</u> </font></font></font></p>
-<p class=MsoNormal>&nbsp;</p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si l’élément de référence d’une «&nbsp;Line&nbsp;»
+(«&nbsp;lineIdShortcut&nbsp;») qui est présent dans
+«&nbsp;StopPoint&nbsp;» est identifié à un objet de ligne
+«&nbsp;Line&nbsp;», le test est validé, sinon le test est invalidé et
+produit le message «&nbsp;test 2.10.1&nbsp;: Le point d’arrêt («
+StopPoint ») fait référence à une ligne inexistante».</font></font></font></p>
-<table class=MsoNormalTable border=0 cellspacing=0 cellpadding=0 width=648
- style='width:485.7pt;margin-left:-.25pt;border-collapse:collapse'>
- <tr style='page-break-inside:avoid'>
- <td width=648 colspan=2 valign=top style='width:485.7pt;border:solid black 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center;text-indent:0cm;layout-grid-mode:char'><i><span
- style='font-family:"Tahoma","sans-serif";color:navy'>Description</span></i></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 11.35pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Intitul&eacute;</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt;layout-grid-mode:char'><span
- style='font-size:11.0pt;line-height:200%;font-family:"Tahoma","sans-serif"'>R&eacute;f&eacute;rence
- &agrave; une ligne pour un point d&rsquo;arr&ecirc;t. </span></p>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 11.35pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Objectif</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>V&eacute;rifiication
- de la correcte r&eacute;f&eacute;rence &agrave; une LIGNE/Chouette (&laquo;&nbsp;Line&nbsp;&raquo;) pour les
- POINTS D&rsquo;ARR&Ecirc;T SUR PARCOURS (&laquo; StopPoint&nbsp;&raquo;&nbsp;).</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 11.35pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>R&eacute;f&eacute;rences</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>TRIDENT/profil
- CHOUETTE/Transmodel V4 et V5.1</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 11.35pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:-15.65pt;margin-bottom:
- 6.0pt;margin-left:0cm;text-align:left;layout-grid-mode:char'><span lang=NL
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>N&deg; de fiche(s)</span></h1>
- <p class=MsoNormal><b><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Connexe(s)</span></b></p>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-left:0cm;text-align:left;text-indent:0cm;
- layout-grid-mode:char'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>&nbsp;</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 11.35pt 0cm 3.5pt;
- height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt;layout-grid-mode:char'><b><span
- style='font-size:11.0pt;line-height:200%;font-family:"Tahoma","sans-serif"'>Priorit&eacute;<span
- style='color:red'> </span></span></b></p>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Obligatoire
- (si l&rsquo;&eacute;l&eacute;ment &laquo;&nbsp;LineIdShortCut&nbsp;&raquo; est existant)</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 11.35pt 0cm 3.5pt;
- height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt;layout-grid-mode:char'><b><span
- style='font-size:11.0pt;line-height:200%;font-family:"Tahoma","sans-serif"'>R&eacute;sultat</span></b></p>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Conforme
- ou non conforme</span></h1>
- </td>
- </tr>
- <tr style='page-break-inside:avoid'>
- <td width=648 colspan=2 valign=top style='width:485.7pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center;text-indent:0cm;layout-grid-mode:char'><i><span
- style='font-family:"Tahoma","sans-serif";color:navy'>Mise en &oelig;uvre</span></i></h1>
- </td>
- </tr>
- <tr>
- <td width=100 style='width:74.85pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Explication</span></h1>
- </td>
- <td width=548 style='width:410.85pt;border:solid black 1.0pt;border-top:none;
- padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:11.35pt;margin-bottom:
- 6.0pt;margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>La
- r&eacute;f&eacute;rence &agrave; la LIGNE/Chouette (&laquo;&nbsp;Line&nbsp;&raquo;) &laquo;&nbsp;LineIdShortCut&nbsp;&raquo;
- au sein d'un arr&ecirc;t POINT D&rsquo;ARR&Ecirc;T SUR PARCOURS (&laquo;&nbsp;StopPoint&nbsp;&raquo;) a un
- caract&egrave;re optionnel. Si cette r&eacute;f&eacute;rence est utilis&eacute;e, il convient de v&eacute;rifier
- qu'elle correspond &agrave; l'identifiant &laquo;&nbsp;objectId&nbsp;&raquo; d&rsquo;une
- LIGNE/Chouette (&laquo;&nbsp;Line&nbsp;&raquo;).</span></h1>
- </td>
- </tr>
-</table>
-
-<p class=MsoNormal>&nbsp;</p>
-
-<table class=MsoNormalTable border=0 cellspacing=0 cellpadding=0 width=648
- style='width:485.7pt;margin-left:-.25pt;border-collapse:collapse'>
- <tr>
- <td width=107 valign=top style='width:80.35pt;border:solid black 1.0pt;
- border-right:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm;layout-grid-mode:char'><b><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>Exemple</span></b></p>
- </td>
- <td width=540 valign=top style='width:405.35pt;border:solid black 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=left style='margin-left:18.0pt;text-align:left;text-indent:0cm;
- layout-grid-mode:char'><span style='font-size:11.0pt;font-weight:normal'>&nbsp;</span></h1>
- <h1 align=left style='margin-left:18.0pt;text-align:left;text-indent:0cm'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Repr&eacute;sentation
- sch&eacute;matique de l&rsquo;Objet &laquo;&nbsp;StopPoint&nbsp;&raquo;</span></h1>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal align=center style='text-align:center'><img width=450
- height=624 src="BATERI_Neptune_FINAL-V2_0a_fichiers/image009.jpg"></p>
- <p class=MsoNormal><u><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Exemple
- d'arr&ecirc;t r&eacute;f&eacute;ren&ccedil;ant le raccourci de ligne</span></u></p>
- <p class=MsoNormal><span lang=EN-US style='font-size:10.0pt;font-family:"Courier New";
- color:black'>...</span></p>
- <p class=MsoNormal><span lang=EN-US style='font-size:10.0pt;font-family:"Courier New"'>&lt;Line&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;objectId&gt;AMIV:Line:014014012&lt;/objectId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>...</span></p>
- <p class=MsoNormal><span lang=EN-US style='font-size:10.0pt;font-family:"Courier New"'>&lt;StopPoint&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;objectId&gt;AMIV:StopPoint:488957A0A237830&lt;/objectId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;objectVersion&gt;1&lt;/objectVersion&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> ...</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;lineIdShortcut&gt;AMIV:Line:014014012&lt;/lineIdShortcut&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;ptNetworkIdShortcut&gt;AMIV:PTNetwork:95&lt;/ptNetworkIdShortcut&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;containedIn&gt;AMIV:StopPoint:237830&lt;/containedIn&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New";color:black'> </span><span
- lang=NL style='font-size:10.0pt;font-family:"Courier New"'>&lt;name&gt;G&eacute;rard
- de Nerval&lt;/name&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;/StopPoint&gt;</span></p>
- </td>
- </tr>
- <tr style='page-break-inside:avoid'>
- <td width=648 colspan=2 valign=top style='width:485.7pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h2 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center;text-indent:0cm;layout-grid-mode:char'><i><span
- lang=EN-US style='font-size:14.0pt;color:navy'>Evaluation</span></i></h2>
- </td>
- </tr>
- <tr>
- <td width=107 style='width:80.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- lang=EN-US style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>N&deg; test</span></h1>
- </td>
- <td width=540 style='width:405.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:0cm;
- margin-left:0cm;margin-bottom:.0001pt;text-align:left;text-indent:0cm;
- layout-grid-mode:char'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>2.10.1</span></h1>
- </td>
- </tr>
- <tr>
- <td width=107 style='width:80.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Libell&eacute;</span></h1>
- </td>
- <td width=540 style='width:405.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:0cm;
- margin-left:0cm;margin-bottom:.0001pt;text-align:left;text-indent:0cm;
- layout-grid-mode:char'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>V&eacute;rification de la correcte r&eacute;f&eacute;rence &agrave; une
- LIGNE/Chouette (&laquo;&nbsp;Line&nbsp;&raquo;) pour les POINTs D&rsquo;ARR&Ecirc;T SUR PARCOURS (&laquo;
- StopPoint&nbsp;&raquo;&nbsp;).</span></h1>
- </td>
- </tr>
- <tr>
- <td width=107 style='width:80.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- lang=EN-US style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Champ
- d&rsquo;application</span></h1>
- </td>
- <td width=540 style='width:405.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- lang=EN-US style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>&lt;StopPoint&gt;</span></h1>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- lang=EN-US style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>&lt;Line&gt;</span></h1>
- </td>
- </tr>
- <tr>
- <td width=107 style='width:80.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>V&eacute;rification</span></h1>
- </td>
- <td width=540 style='width:405.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=left style='margin-left:0cm;text-align:left;text-indent:0cm;
- layout-grid-mode:char'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>&nbsp;</span></h1>
- <h1 align=left style='margin-top:0cm;margin-right:11.35pt;margin-bottom:0cm;
- margin-left:0cm;margin-bottom:.0001pt;text-align:left;text-indent:0cm;
- layout-grid-mode:char'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>- Si l&rsquo;&eacute;l&eacute;ment de r&eacute;f&eacute;rence d&rsquo;une &laquo;&nbsp;Line&nbsp;&raquo;
- (&laquo;&nbsp;lineIdShortcut&nbsp;&raquo;) qui est pr&eacute;sent dans &laquo;&nbsp;StopPoint&nbsp;&raquo;
- est identifi&eacute; &agrave; un objet de ligne &laquo;&nbsp;Line&nbsp;&raquo;, le test est valid&eacute;,
- sinon le test est invalid&eacute; et produit le message &laquo;&nbsp;test 2.10.1&nbsp;: Le
- point d&rsquo;arr&ecirc;t (&laquo; StopPoint &raquo;) fait r&eacute;f&eacute;rence &agrave; une ligne inexistante&raquo;.</span></h1>
- <h1 align=left style='margin-left:0cm;text-align:left;text-indent:0cm;
- layout-grid-mode:char'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>&nbsp;</span></h1>
- </td>
- </tr>
-</table>
-
-
-</div>
diff --git a/app/views/test_sheet/2_11.html b/app/views/test_sheet/2_11.html
index c2b5c4308..d74b9685d 100644
--- a/app/views/test_sheet/2_11.html
+++ b/app/views/test_sheet/2_11.html
@@ -1,304 +1,84 @@
-<div class=WordSection1>
-</span>
+<h1 class="western" style="border: 1pt solid rgb(0, 0, 0); padding: 0.05cm 0.12cm; margin-top: 0.21cm;" align="center">
+<font face="Arial, sans-serif"><font style="font-size: 20pt;" size="5"><i>
+ point de contrôle N° 2.11<br>
+Référence à un réseau au point d’arrêt<br>
+</i></font></font></h1>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Objectif: </b></u>
+Vérification de la correcte référence à la VERSION DU RÉSEAU
+(«&nbsp;PTNetwork&nbsp;») pour chaque POINT D’ARRÊT SUR PARCOURS(« StopPoint »). <br>
+</font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Priorité: </b></u> Obligatoire (si l’élément «&nbsp;PTNetworkIdShortCut&nbsp;» est existant</font></p><font face="Arial, sans-serif">
+</font><p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><u><b>Explications:</b></u>
+</font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+La référence au réseau «&nbsp;pTNetworkIdShortCut&nbsp;» au sein d'un
+POINT D’ARRÊT SUR PARCOURS («&nbsp;StopPoint&nbsp;») a un caractère
+optionnel. Si elle est définie, il convient de vérifier qu'elle
+correspond à l'identifiant «&nbsp;objectId&nbsp;» de la VERSION DU
+RÉSEAU («&nbsp;PTNetwork&nbsp;»).</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>Exemple: </u></b></font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Représentation schématique de l’Objet&nbsp;«&nbsp;StopPoint&nbsp;»</font></font></font></p>
+<p><font face="Arial, sans-serif"><img src="image009.jpg" height="624" width="450"></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Exemple d'arrêt référençant le réseau</font></font></font></p>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;?xml version="1.0" encoding="ISO-8859-1"?&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;ChouettePTNetwork
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xmlns="http://www.trident.org/schema/trident"
+xsi:schemaLocation="http://www.trident.org/schema/trident
+/home/marc/workspace/chouette-ninoxe/src/main/castor/Chouette.xsd"&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;PTNetwork&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;objectId&gt;AMIV:PTNetwork:95&lt;/objectId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">...<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;StopPoint&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;objectId&gt;AMIV:StopPoint:488957A0A237830&lt;/objectId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;objectVersion&gt;1&lt;/objectVersion&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">...<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;lineIdShortcut&gt;AMIV:Line:014014012&lt;/lineIdShortcut&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;ptNetworkIdShortcut&gt;AMIV:PTNetwork:95&lt;/ptNetworkIdShortcut&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;containedIn&gt;AMIV:StopPoint:237830&lt;/containedIn&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif"><br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;name&gt;Gérard de Nerval&lt;/name&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;/StopPoint&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">...<br></font></span>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>N° test:</u></b>
+2.11.1</font></font></font></p>
-<p class=MsoTitle><span style='font-size:14.0pt;font-family:"Tahoma","sans-serif"'>Fiche
-du point de contr&ocirc;le N&deg; 2.11</span></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Libellé:</u> Vérification de la correcte référence à la VERSION DU
+RÉSEAU («&nbsp;PTNetwork&nbsp;») pour chaque POINT D’ARRÊT SUR PARCOURS
+(« StopPoint »).</font></font></font></p>
-<p class=MsoNormal>&nbsp;</p>
-<table class=MsoNormalTable border=0 cellspacing=0 cellpadding=0 width=638
- style='width:478.65pt;margin-left:-.25pt;border-collapse:collapse'>
- <tr style='page-break-inside:avoid'>
- <td width=638 colspan=2 valign=top style='width:478.65pt;border:solid black 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center;text-indent:0cm;layout-grid-mode:char'><i><span
- style='font-family:"Tahoma","sans-serif";color:navy'>Description</span></i></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Intitul&eacute;</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt;layout-grid-mode:char'><span
- style='font-family:"Tahoma","sans-serif"'>R&eacute;f&eacute;rence &agrave; un r&eacute;seau au point
- d&rsquo;arr&ecirc;t.</span></p>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Objectif</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>V&eacute;rification
- de la correcte r&eacute;f&eacute;rence &agrave; la VERSION DU R&Eacute;SEAU (&laquo;&nbsp;PTNetwork&nbsp;&raquo;)
- pour chaque POINT D&rsquo;ARR&Ecirc;T SUR PARCOURS </span></h1>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>(&laquo;
- StopPoint &raquo;).</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>R&eacute;f&eacute;rences</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>TRIDENT/profil
- CHOUETTE/Transmodel V4 et V5.1</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:-7.9pt;margin-bottom:
- 6.0pt;margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- lang=NL style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>N&deg; de
- fiche(s)</span></h1>
- <h1 align=left style='margin-top:6.0pt;margin-right:-7.9pt;margin-bottom:
- 6.0pt;margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>connexe(s)</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-left:0cm;text-align:left;text-indent:0cm;
- layout-grid-mode:char'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>&nbsp;</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt;layout-grid-mode:char'><b><span
- style='font-family:"Tahoma","sans-serif"'>Priorit&eacute;<span style='color:red'> </span></span></b></p>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Obligatoire
- (si l&rsquo;&eacute;l&eacute;ment &laquo;&nbsp;PTNetworkIdShortCut&nbsp;&raquo; est existant)</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt;layout-grid-mode:char'><b><span
- style='font-family:"Tahoma","sans-serif"'>R&eacute;sultat</span></b></p>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Conforme
- ou non conforme</span></h1>
- </td>
- </tr>
- <tr style='page-break-inside:avoid'>
- <td width=638 colspan=2 valign=top style='width:478.65pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center;text-indent:0cm;layout-grid-mode:char'><i><span
- style='font-family:"Tahoma","sans-serif";color:navy'>Mise en &oelig;uvre</span></i></h1>
- </td>
- </tr>
- <tr>
- <td width=100 style='width:74.85pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Explication</span></h1>
- </td>
- <td width=538 style='width:403.8pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:11.35pt;margin-bottom:
- 6.0pt;margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>La
- r&eacute;f&eacute;rence au r&eacute;seau &laquo;&nbsp;pTNetworkIdShortCut&nbsp;&raquo; au sein d'un POINT
- D&rsquo;ARR&Ecirc;T SUR PARCOURS (&laquo;&nbsp;StopPoint&nbsp;&raquo;) a un caract&egrave;re optionnel. Si
- elle est d&eacute;finie, il convient de v&eacute;rifier qu'elle correspond &agrave; l'identifiant
- &laquo;&nbsp;objectId&nbsp;&raquo; de la VERSION DU R&Eacute;SEAU (&laquo;&nbsp;PTNetwork&nbsp;&raquo;).</span></h1>
- </td>
- </tr>
-</table>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2"><span style="text-decoration: underline;">
+Champ d’application:</span>&nbsp;&lt;StopPoint&gt;&nbsp;&lt;PTNetwork&gt;</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Vérification:</u></font></font></font></p><p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si l’élément « ptNetworkIdShortcut » existe alors poursuivre le test, sinon le test est abandonné</font></font></font></p>
-<p class=MsoNormal>&nbsp;</p>
-<table class=MsoNormalTable border=0 cellspacing=0 cellpadding=0 width=648
- style='width:485.7pt;margin-left:-.25pt;border-collapse:collapse'>
- <tr>
- <td width=108 valign=top style='width:81.35pt;border:solid black 1.0pt;
- border-right:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm;layout-grid-mode:char'><b><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>Exemple</span></b></p>
- </td>
- <td width=108 valign=top style='width:81.35pt;border:solid black 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=left style='margin-left:18.0pt;text-align:left;text-indent:0cm;
- layout-grid-mode:char'><span style='font-size:11.0pt;font-weight:normal'>&nbsp;</span></h1>
- <h1 align=left style='margin-left:18.0pt;text-align:left;text-indent:0cm'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Repr&eacute;sentation
- sch&eacute;matique de l&rsquo;Objet&nbsp;&laquo;&nbsp;StopPoint&nbsp;&raquo;</span></h1>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal align=center style='text-align:center'><img width=450
- height=624 src="BATERI_Neptune_FINAL-V2_0a_fichiers/image009.jpg"></p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal><u><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>Exemple
- d'arr&ecirc;t r&eacute;f&eacute;ren&ccedil;ant le r&eacute;seau </span></u></p>
- <p class=MsoNormal><u><span style='text-decoration:none'>&nbsp;</span></u></p>
- <p class=MsoNormal><span style='font-size:10.0pt;font-family:"Courier New"'>&lt;?xml
- version=&quot;1.0&quot; encoding=&quot;ISO-8859-1&quot;?&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;ChouettePTNetwork
- xmlns:xsi=&quot;http://www.w3.org/2001/XMLSchema-instance&quot;
- xmlns=&quot;http://www.trident.org/schema/trident&quot;
- xsi:schemaLocation=&quot;http://www.trident.org/schema/trident
- /home/marc/workspace/chouette-ninoxe/src/main/castor/Chouette.xsd&quot;&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;PTNetwork&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;objectId&gt;AMIV:PTNetwork:95&lt;/objectId&gt;</span></p>
- <p class=MsoNormal><span lang=EN-US style='font-size:10.0pt;font-family:"Courier New"'>...</span></p>
- <p class=MsoNormal><span lang=EN-US style='font-size:10.0pt;font-family:"Courier New"'>&lt;StopPoint&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:Monospace;color:black'> </span><span
- lang=EN-US style='font-size:10.0pt;font-family:"Courier New"'>&lt;objectId&gt;AMIV:StopPoint:488957A0A237830&lt;/objectId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;objectVersion&gt;1&lt;/objectVersion&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> ...</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;lineIdShortcut&gt;AMIV:Line:014014012&lt;/lineIdShortcut&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;ptNetworkIdShortcut&gt;AMIV:PTNetwork:95&lt;/ptNetworkIdShortcut&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;containedIn&gt;AMIV:StopPoint:237830&lt;/containedIn&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> </span><span
- lang=NL style='font-size:10.0pt;font-family:"Courier New"'>&lt;name&gt;G&eacute;rard
- de Nerval&lt;/name&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;/StopPoint&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>...</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:Monospace;color:teal'>&nbsp;</span></p>
- </td>
- </tr>
- <tr style='page-break-inside:avoid'>
- <td width=648 colspan=2 valign=top style='width:485.7pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h2 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center;text-indent:0cm;layout-grid-mode:char'><i><span
- lang=EN-US style='font-size:14.0pt;color:navy'>Evaluation</span></i></h2>
- </td>
- </tr>
- <tr>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- solid black 1.0pt;border-bottom:solid black 1.0pt;border-right:none;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm;layout-grid-mode:char'><span lang=EN-US style='font-size:
- 11.0pt'>N&deg; test</span></h1>
- </td>
- <td width=108 valign=top style='width:81.35pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:
- 0cm;margin-bottom:.0001pt;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>2.11.1</span></h1>
- </td>
- </tr>
- <tr>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- solid black 1.0pt;border-bottom:solid black 1.0pt;border-right:none;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm;layout-grid-mode:char'><span style='font-size:11.0pt'>Libell&eacute;</span></h1>
- </td>
- <td width=108 valign=top style='width:81.35pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 11.35pt 0cm 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:
- 0cm;margin-bottom:.0001pt;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>V&eacute;rification
- de la correcte r&eacute;f&eacute;rence &agrave; la VERSION DU R&Eacute;SEAU (&laquo;&nbsp;PTNetwork&nbsp;&raquo;)
- pour chaque POINT D&rsquo;ARR&Ecirc;T SUR PARCOURS </span></h1>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:
- 0cm;margin-bottom:.0001pt;text-indent:0cm;layout-grid-mode:char'><span
- lang=EN-US style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>(&laquo; StopPoint &raquo;).</span></h1>
- </td>
- </tr>
- <tr>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- solid black 1.0pt;border-bottom:solid black 1.0pt;border-right:none;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm;layout-grid-mode:char'><span lang=EN-US style='font-size:
- 11.0pt'>Champ d&rsquo;application</span></h1>
- </td>
- <td width=108 valign=top style='width:81.35pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 11.35pt 0cm 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm;layout-grid-mode:char'><span lang=EN-US style='font-size:
- 11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>&lt;StopPoint&gt;</span></h1>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm;layout-grid-mode:char'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'>&lt;PTNetwork&gt;</span></h1>
- </td>
- </tr>
- <tr>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- solid black 1.0pt;border-bottom:solid black 1.0pt;border-right:none;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm;layout-grid-mode:char'><span style='font-size:11.0pt'>V&eacute;rification</span></h1>
- </td>
- <td width=108 valign=top style='width:81.35pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 11.35pt 0cm 3.5pt'>
- <h1 style='margin-left:0cm;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>&nbsp;</span></h1>
- <h1 style='margin-left:0cm;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>-
- Si l&rsquo;&eacute;l&eacute;ment &laquo; ptNetworkIdShortcut &raquo; existe alors poursuivre le test, sinon le
- test est abandonn&eacute;</span></h1>
- <p class=MsoNormal><span style='font-family:"Tahoma","sans-serif"'>&nbsp;</span></p>
- <h1 style='margin-left:0cm;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>-
- Si l&rsquo;&eacute;l&eacute;ment &laquo;&nbsp;ptNetworkIdShortcut&nbsp;&raquo;, r&eacute;f&eacute;renc&eacute; dans un objet
- &laquo;&nbsp;StopPoint&nbsp;&raquo; est identifi&eacute; au r&eacute;seau &laquo;&nbsp;PtNetwork&nbsp;&raquo;, le
- test est valid&eacute;, sinon le test est invalid&eacute; et produit le message &laquo;&nbsp;test
- 2.11.1&nbsp;: Le point d&rsquo;arr&ecirc;t (&laquo; StopPoint &raquo;) fait r&eacute;f&eacute;rence &agrave; un r&eacute;seau
- inexistant&raquo;.</span></h1>
- <h1 style='layout-grid-mode:char'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif";font-weight:normal'>&nbsp;</span></h1>
- </td>
- </tr>
-</table>
-
-
-</div>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si l’élément «&nbsp;ptNetworkIdShortcut&nbsp;», référencé dans un
+objet «&nbsp;StopPoint&nbsp;» est identifié au réseau
+«&nbsp;PtNetwork&nbsp;», le test est validé, sinon le test est invalidé
+et produit le message «&nbsp;test 2.11.1&nbsp;: Le point d’arrêt («
+StopPoint ») fait référence à un réseau inexistant»<br>&nbsp;</font></font></font></p>
diff --git a/app/views/test_sheet/2_12.html b/app/views/test_sheet/2_12.html
index 12516725e..efce6cf69 100644
--- a/app/views/test_sheet/2_12.html
+++ b/app/views/test_sheet/2_12.html
@@ -1,287 +1,72 @@
+<h1 class="western" style="border: 1pt solid rgb(0, 0, 0); padding: 0.05cm 0.12cm; margin-top: 0.21cm;" align="center">
+<font face="Arial, sans-serif"><font style="font-size: 20pt;" size="5"><i>
+ point de contrôle N° 2.12<br>
+Définition de l'Interdiction de Trafic Local<br>
+</i></font></font></h1>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Objectif: </b></u>
+Vérification de cohérence entre les objets «&nbsp; ITL&nbsp;» et les ARRÊTs/Chouette («&nbsp;StopArea&nbsp;»).<br>
+</font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Priorité: </b></u> Obligatoire (si le réseau contient des Interdictions de Trafic Local «&nbsp;ITL&nbsp;»)</font></p><font face="Arial, sans-serif">
+</font><p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><u><b>Explications:</b></u>
+</font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Les Interdictions de Trafic Local «&nbsp;ITL&nbsp;» sont optionnelles
+dans un réseau. Lorsqu'elles existent, il convient de vérifier pour
+chaque ARRÊT/Chouette («&nbsp;StopArea&nbsp;») de type &nbsp;ITL&nbsp;,
+que l'élément «&nbsp;areaId&nbsp;» qui est à caractère obligatoire,
+correspond à un identifiant «&nbsp;ObjectId&nbsp;» d’ARRÊT/Chouette
+(«&nbsp;StopArea&nbsp;»)» du réseau.</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>Exemple: </u></b></font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Représentation schématique de l’Objet «&nbsp; ITL&nbsp;»</font></font></font></p>
+<p><font face="Arial, sans-serif"><img src="image010.jpg" height="139" width="278"></font></p>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif"><span style="font-style: italic;">Exemple d'ITL dont l'« areaId » référence un point d’arrêt</span><br>...<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;StopArea&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;objectId&gt;AMIV:StopPoint:237814&lt;/objectId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;name&gt;Croix l'Alouettes&lt;/name&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;contains&gt;AMIV:StopPoint:488965A7A23781400&lt;/contains&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">...<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;ITL&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;areaId&gt;AMIV:StopPoint:237814&lt;/areaId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;name&gt;Croix l'Alouettes000&lt;/name&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;lineIdShortCut&gt;AMIV:Line:014014012000&lt;/lineIdShortCut&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;/ITL&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">...<br></font></span>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>N° test:</u></b>
+2.12.1</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Libellé:</u>
+Vérification de cohérence entre les objets «&nbsp; ITL&nbsp;» et les ARRÊTs/Chouette («&nbsp;StopArea&nbsp;»).</font></font></font></p>
-<div class=WordSection1>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Champ d’application:</u>
+&lt;ITL&gt;&nbsp;&lt;StopArea&gt;</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Vérification:</u> </font></font></font></p>
-<p class=MsoTitle><span style='font-size:14.0pt;font-family:"Tahoma","sans-serif"'>Fiche
-du point de contr&ocirc;le N&deg; 2.12</span></p>
-<p class=MsoNormal>&nbsp;</p>
-
-<table class=MsoNormalTable border=0 cellspacing=0 cellpadding=0 width=648
- style='width:485.7pt;margin-left:-.25pt;border-collapse:collapse'>
- <tr style='page-break-inside:avoid'>
- <td width=648 colspan=2 valign=top style='width:485.7pt;border:solid black 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center;text-indent:0cm;layout-grid-mode:char'><i><span
- style='color:navy'>Description</span></i></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Intitul&eacute;</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt;layout-grid-mode:char'><span
- style='font-family:"Tahoma","sans-serif"'>D&eacute;finition de l'Interdiction de
- Trafic Local.</span></p>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Objectif</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>V&eacute;rification
- de coh&eacute;rence entre les objets &laquo;&nbsp; ITL&nbsp;&raquo; et les ARR&Ecirc;Ts/Chouette
- (&laquo;&nbsp;StopArea&nbsp;&raquo;).</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>R&eacute;f&eacute;rences</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>TRIDENT/profil
- CHOUETTE/Transmodel V4 et V5.1</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>N&deg; de fiche(s)
- connexe(s)</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-left:0cm;text-align:left;text-indent:0cm;
- layout-grid-mode:char'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>&nbsp;</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt;layout-grid-mode:char'><b><span
- style='font-family:"Tahoma","sans-serif"'>Priorit&eacute;<span style='color:red'> </span></span></b></p>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Obligatoire
- (si le r&eacute;seau contient des Interdictions de Trafic Local &laquo;&nbsp;ITL&nbsp;&raquo;)</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt;layout-grid-mode:char'><b><span
- style='font-family:"Tahoma","sans-serif"'>R&eacute;sultat</span></b></p>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Conforme
- ou non conforme</span></h1>
- </td>
- </tr>
- <tr style='page-break-inside:avoid'>
- <td width=648 colspan=2 valign=top style='width:485.7pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center;text-indent:0cm;layout-grid-mode:char'><i><span
- style='font-family:"Tahoma","sans-serif";color:navy'>Mise en &oelig;uvre</span></i></h1>
- </td>
- </tr>
- <tr>
- <td width=100 style='width:74.85pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Explication</span></h1>
- </td>
- <td width=548 style='width:410.85pt;border:solid black 1.0pt;border-top:none;
- padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:11.35pt;margin-bottom:
- 6.0pt;margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Les
- Interdictions de Trafic Local &laquo;&nbsp;ITL&nbsp;&raquo; sont optionnelles dans un
- r&eacute;seau. Lorsqu'elles existent, il convient de v&eacute;rifier pour chaque
- ARR&Ecirc;T/Chouette (&laquo;&nbsp;StopArea&nbsp;&raquo;) de type &nbsp;ITL&nbsp;, que
- l'&eacute;l&eacute;ment &laquo;&nbsp;areaId&nbsp;&raquo; qui est &agrave; caract&egrave;re obligatoire, correspond &agrave;
- un identifiant &laquo;&nbsp;ObjectId&nbsp;&raquo; d&rsquo;ARR&Ecirc;T/Chouette
- (&laquo;&nbsp;StopArea&nbsp;&raquo;)&raquo; du r&eacute;seau. </span></h1>
- </td>
- </tr>
-</table>
-
-<p class=MsoNormal>&nbsp;</p>
-
-<table class=MsoNormalTable border=0 cellspacing=0 cellpadding=0 width=638
- style='width:478.65pt;margin-left:-.25pt;border-collapse:collapse'>
- <tr>
- <td width=108 valign=top style='width:81.35pt;border:solid black 1.0pt;
- border-right:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm;layout-grid-mode:char'><b><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>Exemple</span></b></p>
- </td>
- <td width=538 valign=top style='width:403.8pt;border:solid black 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=left style='margin-left:18.0pt;text-align:left;text-indent:0cm;
- layout-grid-mode:char'><span style='font-size:11.0pt;font-weight:normal'>&nbsp;</span></h1>
- <h1 align=left style='margin-left:18.0pt;text-align:left;text-indent:0cm'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Repr&eacute;sentation
- sch&eacute;matique de l&rsquo;Objet &laquo;&nbsp; ITL&nbsp;&raquo;</span></h1>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal align=center style='text-align:center'><img width=278
- height=139 src="BATERI_Neptune_FINAL-V2_0a_fichiers/image010.jpg"></p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <h3 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm'>Exemple d'ITL dont l'&laquo;&nbsp;areaId&nbsp;&raquo; r&eacute;f&eacute;rence un
- point d&rsquo;arr&ecirc;t</h3>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>...</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;StopArea&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;objectId&gt;AMIV:StopPoint:237814&lt;/objectId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;name&gt;Croix
- l'Alouettes&lt;/name&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;contains&gt;AMIV:StopPoint:488965A7A23781400&lt;/contains&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>...</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;ITL&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;areaId&gt;AMIV:StopPoint:237814&lt;/areaId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;name&gt;Croix
- l'Alouettes000&lt;/name&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;lineIdShortCut&gt;AMIV:Line:014014012000&lt;/lineIdShortCut&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;/ITL&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>...</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US>&nbsp;</span></p>
- </td>
- </tr>
- <tr style='page-break-inside:avoid'>
- <td width=108 colspan=2 valign=top style='width:81.35pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h2 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center;text-indent:0cm;layout-grid-mode:char'><i><span
- lang=EN-US style='font-size:14.0pt;color:navy'>Evaluation</span></i></h2>
- </td>
- </tr>
- <tr>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- solid black 1.0pt;border-bottom:solid black 1.0pt;border-right:none;
- padding:0cm 11.35pt 0cm 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm;layout-grid-mode:char'><span lang=EN-US style='font-size:
- 11.0pt'>N&deg; test</span></h1>
- </td>
- <td width=538 valign=top style='width:403.8pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 11.35pt 0cm 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:
- 0cm;margin-bottom:.0001pt;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>2.12.1</span></h1>
- </td>
- </tr>
- <tr>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- solid black 1.0pt;border-bottom:solid black 1.0pt;border-right:none;
- padding:0cm 11.35pt 0cm 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm;layout-grid-mode:char'><span style='font-size:11.0pt'>Libell&eacute;</span></h1>
- </td>
- <td width=538 valign=top style='width:403.8pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 11.35pt 0cm 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:
- 0cm;margin-bottom:.0001pt;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>V&eacute;rification
- de coh&eacute;rence entre les objets &laquo;&nbsp; ITL&nbsp;&raquo; et les ARR&Ecirc;Ts/Chouette
- (&laquo;&nbsp;StopArea&nbsp;&raquo;).</span></h1>
- </td>
- </tr>
- <tr>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- solid black 1.0pt;border-bottom:solid black 1.0pt;border-right:none;
- padding:0cm 11.35pt 0cm 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:-6.7pt;margin-bottom:6.0pt;
- margin-left:0cm;text-indent:0cm;layout-grid-mode:char'><span lang=EN-US
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Champ
- d&rsquo;application</span></h1>
- </td>
- <td width=538 valign=top style='width:403.8pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 11.35pt 0cm 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm;layout-grid-mode:char'><span lang=EN-US style='font-size:
- 11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>&lt;ITL&gt;</span></h1>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm;text-align:justify;layout-grid-mode:char'><span
- lang=EN-US style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>&lt;StopArea&gt;</span></p>
- </td>
- </tr>
- <tr>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- solid black 1.0pt;border-bottom:solid black 1.0pt;border-right:none;
- padding:0cm 11.35pt 0cm 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm;layout-grid-mode:char'><span style='font-size:11.0pt'>V&eacute;rification</span></h1>
- </td>
- <td width=538 valign=top style='width:403.8pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 11.35pt 0cm 3.5pt'>
- <h1 style='margin-left:0cm;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>&nbsp;</span></h1>
- <h1 style='margin-left:0cm;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>-
- Si l&rsquo;objet &laquo;&nbsp;ITL&nbsp;&raquo; existe alors poursuivre le test, sinon le test
- est abandonn&eacute; </span></h1>
- <p class=MsoNormal><span style='font-family:"Tahoma","sans-serif"'>&nbsp;</span></p>
- <h1 style='margin-left:0cm;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>-
- Si l&rsquo;&eacute;l&eacute;ment &laquo;&nbsp;areaId&nbsp;&raquo;, r&eacute;f&eacute;renc&eacute; dans un objet d&rsquo;interdiction de
- trafic local &laquo;&nbsp;ITL&nbsp;&raquo;, poss&egrave;de un identifiant
- &laquo;&nbsp;ObjectId&nbsp;&raquo; dans un objet &laquo;&nbsp;StopArea&nbsp;&raquo; , le test est
- valid&eacute;, sinon le test est invalid&eacute; et produit le message &laquo;&nbsp;test 2.12.1&nbsp;:
- Un objet d&rsquo;interdiction de trafic local &laquo;&nbsp;ITL&nbsp;&raquo; fait r&eacute;f&eacute;rence &agrave;
- un arr&ecirc;t du r&eacute;seau &laquo;&nbsp;StopArea&nbsp;&raquo; inexistant&nbsp;&raquo;.</span></h1>
- <h1 style='margin-left:0cm;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>&nbsp;</span></h1>
- </td>
- </tr>
-</table>
-
-</div>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si l’objet «&nbsp;ITL&nbsp;» existe alors poursuivre le test, sinon le test est abandonné</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si l’élément «&nbsp;areaId&nbsp;», référencé dans un objet
+d’interdiction de trafic local «&nbsp;ITL&nbsp;», possède un
+identifiant «&nbsp;ObjectId&nbsp;» dans un objet «&nbsp;StopArea&nbsp;»
+, le test est validé, sinon le test est invalidé et produit le message
+«&nbsp;test 2.12.1&nbsp;: Un objet d’interdiction de trafic local
+«&nbsp;ITL&nbsp;» fait référence à un arrêt du réseau
+«&nbsp;StopArea&nbsp;» inexistant&nbsp;».</font></font></font></p>
diff --git a/app/views/test_sheet/2_13.html b/app/views/test_sheet/2_13.html
index 613e4f0ac..a7627e6b7 100644
--- a/app/views/test_sheet/2_13.html
+++ b/app/views/test_sheet/2_13.html
@@ -1,299 +1,75 @@
-<body lang=FR link=blue vlink=purple>
+<h1 class="western" style="border: 1pt solid rgb(0, 0, 0); padding: 0.05cm 0.12cm; margin-top: 0.21cm;" align="center">
+<font face="Arial, sans-serif"><font style="font-size: 20pt;" size="5"><i>
+ point de contrôle N° 2.13<br>
+Référence à une ligne des arrêts ITL<br>
+</i></font></font></h1>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Objectif: </b></u>
+Vérification de la correcte référence à la LIGNE/Chouette («&nbsp;Line&nbsp;») pour chaque «&nbsp;ITL&nbsp;».<br>
+</font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Priorité: </b></u> Obligatoire (si le réseau contient des Interdictions de Trafic Local «&nbsp;ITL&nbsp;»)</font></p><font face="Arial, sans-serif">
+</font><p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><u><b>Explications:</b></u>
+</font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Les Interdictions de Trafic Local «&nbsp;ITL&nbsp;» sont optionnelles
+dans un réseau. Lorsqu'elles existent, il convient de vérifier pour
+chaque «&nbsp;ITL&nbsp;» que si l'élément «&nbsp;lineIdShortcut&nbsp;»,
+qui est à caractère optionnel dans l'«&nbsp;ITL&nbsp;», existe, il
+correspond à l'identifiant «&nbsp;ObjectId&nbsp;» d’une LIGNE/Chouette
+(«&nbsp;Line&nbsp;») définie.</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>Exemple: </u></b></font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Représentation schématique de l’Objet «&nbsp;ITL&nbsp;»</font></font></font></p>
+<p><font face="Arial, sans-serif"><img src="image010.jpg" height="139" width="278"></font></p>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif"><span style="font-style: italic;">Exemple d'ITL avec le « lineIdShortcut » référencé dans la ligne du réseau</span><br>...<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;Line&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;objectId&gt;AMIV:Line:014014012&lt;/objectId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;objectVersion&gt;1&lt;/objectVersion&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">...<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;ITL&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;areaId&gt;AMIV:StopPoint:237814&lt;/areaId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;name&gt;Croix l'Alouettes000&lt;/name&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;lineIdShortCut&gt;AMIV:Line:014014012&lt;/lineIdShortCut&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;/ITL&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">...<br></font></span>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>N° test:</u></b>
+2.13.1</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Libellé:</u>
+Vérification de la correcte référence à la LIGNE/Chouette («&nbsp;Line&nbsp;») pour chaque «&nbsp;ITL&nbsp;».</font></font></font></p>
-<div class=WordSection1>
-</span></b>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Champ d’application:</u>
+&lt;ITL&gt;&nbsp;&lt;Line&gt;</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Vérification:</u> </font></font></font></p>
-<p class=MsoTitle><span style='font-size:14.0pt;font-family:"Tahoma","sans-serif"'>Fiche
-du point de contr&ocirc;le N&deg; 2.13</span></p>
-<p class=MsoNormal>&nbsp;</p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si l’objet «&nbsp;ITL&nbsp;» existe alors poursuivre le test, sinon le test est abandonné&nbsp;</font></font></font></p>
-<table class=MsoNormalTable border=0 cellspacing=0 cellpadding=0 width=648
- style='width:485.7pt;margin-left:-.25pt;border-collapse:collapse'>
- <tr style='page-break-inside:avoid'>
- <td width=648 colspan=2 valign=top style='width:485.7pt;border:solid black 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center;text-indent:0cm;layout-grid-mode:char'><i><span
- style='font-family:"Tahoma","sans-serif";color:navy'>Description</span></i></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Intitul&eacute;</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt;layout-grid-mode:char'><span
- style='font-size:11.0pt;line-height:200%;font-family:"Tahoma","sans-serif"'>R&eacute;f&eacute;rence
- &agrave; une ligne des arr&ecirc;ts ITL</span></p>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Objectif</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>V&eacute;rification
- de la correcte r&eacute;f&eacute;rence &agrave; la LIGNE/Chouette (&laquo;&nbsp;Line&nbsp;&raquo;) pour chaque
- &laquo;&nbsp;ITL&nbsp;&raquo;.</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>R&eacute;f&eacute;rences</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>TRIDENT/profil
- CHOUETTE/Transmodel V4 et V5.1</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>N&deg; de fiche(s)
- connexe(s)</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-left:0cm;text-align:left;text-indent:0cm;
- layout-grid-mode:char'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>&nbsp;</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt;layout-grid-mode:char'><b><span
- style='font-size:11.0pt;line-height:200%;font-family:"Tahoma","sans-serif"'>Priorit&eacute;<span
- style='color:red'> </span></span></b></p>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Obligatoire
- (si le r&eacute;seau contient des Interdictions de Trafic Local &laquo;&nbsp;ITL&nbsp;&raquo;)</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt;layout-grid-mode:char'><b><span
- style='font-size:11.0pt;line-height:200%;font-family:"Tahoma","sans-serif"'>R&eacute;sultat</span></b></p>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Conforme
- ou non conforme</span></h1>
- </td>
- </tr>
- <tr style='page-break-inside:avoid'>
- <td width=648 colspan=2 valign=top style='width:485.7pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center;text-indent:0cm;layout-grid-mode:char'><i><span
- style='font-family:"Tahoma","sans-serif";color:navy'>Mise en &oelig;uvre</span></i></h1>
- </td>
- </tr>
- <tr>
- <td width=100 style='width:74.85pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Explication</span></h1>
- </td>
- <td width=548 style='width:410.85pt;border:solid black 1.0pt;border-top:none;
- padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Les
- Interdictions de Trafic Local &laquo;&nbsp;ITL&nbsp;&raquo; sont optionnelles dans un
- r&eacute;seau. Lorsqu'elles existent, il convient de v&eacute;rifier pour chaque
- &laquo;&nbsp;ITL&nbsp;&raquo; que si l'&eacute;l&eacute;ment &laquo;&nbsp;lineIdShortcut&nbsp;&raquo;, qui est &agrave;
- caract&egrave;re optionnel dans l'&laquo;&nbsp;ITL&nbsp;&raquo;, existe, il correspond &agrave; l'identifiant
- &laquo;&nbsp;ObjectId&nbsp;&raquo; d&rsquo;une LIGNE/Chouette (&laquo;&nbsp;Line&nbsp;&raquo;) d&eacute;finie. </span></h1>
- </td>
- </tr>
-</table>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+-&nbsp;Si l’élément de raccourci de ligne «&nbsp;lineIdShortcut&nbsp;»
+existe alors poursuivre le test, sinon le test est abandonné</font></font></font></p>
-<p class=MsoNormal>&nbsp;</p>
-
-<table class=MsoNormalTable border=0 cellspacing=0 cellpadding=0 width=648
- style='width:485.7pt;margin-left:-.25pt;border-collapse:collapse'>
- <tr>
- <td width=108 valign=top style='width:81.35pt;border:solid black 1.0pt;
- border-right:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm;layout-grid-mode:char'><b><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>Exemple</span></b></p>
- </td>
- <td width=108 valign=top style='width:81.35pt;border:solid black 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=left style='margin-left:18.0pt;text-align:left;text-indent:0cm;
- layout-grid-mode:char'><span style='font-size:11.0pt;font-weight:normal'>&nbsp;</span></h1>
- <h1 align=left style='margin-left:18.0pt;text-align:left;text-indent:0cm'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Repr&eacute;sentation
- sch&eacute;matique de l&rsquo;Objet &laquo;&nbsp;ITL&nbsp;&raquo;</span></h1>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal align=center style='text-align:center'><img width=278
- height=139 src="BATERI_Neptune_FINAL-V2_0a_fichiers/image010.jpg"></p>
- <p class=MsoNormal> </p>
- <p class=MsoNormal>&nbsp;</p>
- <h3 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm'>Exemple d'ITL avec le &laquo;&nbsp;lineIdShortcut&nbsp;&raquo;
- r&eacute;f&eacute;renc&eacute; dans la ligne du r&eacute;seau</h3>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>...</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;Line&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;objectId&gt;AMIV:Line:014014012&lt;/objectId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;objectVersion&gt;1&lt;/objectVersion&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>...</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;ITL&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;areaId&gt;AMIV:StopPoint:237814&lt;/areaId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;name&gt;Croix
- l'Alouettes000&lt;/name&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;lineIdShortCut&gt;AMIV:Line:014014012&lt;/lineIdShortCut&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;/ITL&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>...</span></p>
- </td>
- </tr>
- <tr style='page-break-inside:avoid'>
- <td width=648 colspan=2 valign=top style='width:485.7pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h2 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center;text-indent:0cm;layout-grid-mode:char'><i><span
- lang=EN-US style='font-size:14.0pt;color:navy'>Evaluation</span></i></h2>
- </td>
- </tr>
- <tr>
- <td width=100 style='width:74.85pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- lang=EN-US style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>N&deg; test</span></h1>
- </td>
- <td width=548 style='width:410.85pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>2.13.1</span></h1>
- </td>
- </tr>
- <tr>
- <td width=100 style='width:74.85pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Libell&eacute;</span></h1>
- </td>
- <td width=548 style='width:410.85pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>V&eacute;rification
- de la correcte r&eacute;f&eacute;rence &agrave; la LIGNE/Chouette (&laquo;&nbsp;Line&nbsp;&raquo;) pour chaque
- &laquo;&nbsp;ITL&nbsp;&raquo;.</span></h1>
- </td>
- </tr>
- <tr>
- <td width=100 style='width:74.85pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- lang=EN-US style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Champ
- d&rsquo;application</span></h1>
- </td>
- <td width=548 style='width:410.85pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- lang=EN-US style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>&lt;ITL&gt;</span></h1>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm;layout-grid-mode:char'><span lang=EN-US
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>&lt;Line&gt;</span></p>
- </td>
- </tr>
- <tr>
- <td width=100 style='width:74.85pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>V&eacute;rification</span></h1>
- </td>
- <td width=548 style='width:410.85pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=left style='margin-left:0cm;text-align:left;text-indent:0cm;
- layout-grid-mode:char'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>&nbsp;</span></h1>
- <h1 align=left style='margin-top:0cm;margin-right:11.35pt;margin-bottom:0cm;
- margin-left:0cm;margin-bottom:.0001pt;text-align:left;text-indent:0cm;
- layout-grid-mode:char'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>- Si l&rsquo;objet &laquo;&nbsp;ITL&nbsp;&raquo; existe alors poursuivre le
- test, sinon le test est abandonn&eacute; </span></h1>
- <p class=MsoNormal style='margin-right:11.35pt'><span style='font-family:
- "Tahoma","sans-serif"'>&nbsp;</span></p>
- <p class=MsoBodyText2 style='margin-right:11.35pt'><span style='font-family:
- "Tahoma","sans-serif"'>- </span><span style='font-size:11.0pt;line-height:
- 200%;font-family:"Tahoma","sans-serif"'>Si l&rsquo;&eacute;l&eacute;ment de raccourci de ligne
- &laquo;&nbsp;lineIdShortcut&nbsp;&raquo; existe alors poursuivre le test, sinon le test
- est abandonn&eacute;</span></p>
- <p class=MsoNormal style='margin-top:0cm;margin-right:11.35pt;margin-bottom:
- 0cm;margin-left:18.0pt;margin-bottom:.0001pt'><span style='font-family:"Tahoma","sans-serif"'>&nbsp;</span></p>
- <h1 align=left style='margin-top:0cm;margin-right:11.35pt;margin-bottom:0cm;
- margin-left:0cm;margin-bottom:.0001pt;text-align:left;text-indent:0cm;
- layout-grid-mode:char'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>- Si l&rsquo;&eacute;l&eacute;ment de raccourci de ligne
- &laquo;&nbsp;lineIdShortcut&nbsp;&raquo;, r&eacute;f&eacute;renc&eacute; dans un objet d&rsquo;interdiction de
- trafic local &laquo;&nbsp;ITL&nbsp;&raquo;, poss&egrave;de un identifiant
- &laquo;&nbsp;ObjectId&nbsp;&raquo; dans un objet de ligne &laquo;&nbsp;Line&nbsp;&raquo; , le test
- est valid&eacute;, sinon le test est invalid&eacute; et produit le message &laquo;&nbsp;test
- 2.13.1&nbsp;: Un objet d&rsquo;interdiction de trafic local &laquo;&nbsp;ITL&nbsp;&raquo; fait
- r&eacute;f&eacute;rence &agrave; une ligne inexistante&nbsp;&raquo;. </span></h1>
- <h1 align=left style='margin-left:0cm;text-align:left;text-indent:0cm;
- layout-grid-mode:char'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>&nbsp;</span></h1>
- </td>
- </tr>
-</table>
-
-<p class=MsoNormal>&nbsp;</p>
-
-</div>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si l’élément de raccourci de ligne «&nbsp;lineIdShortcut&nbsp;»,
+référencé dans un objet d’interdiction de trafic local
+«&nbsp;ITL&nbsp;», possède un identifiant «&nbsp;ObjectId&nbsp;» dans
+un objet de ligne «&nbsp;Line&nbsp;» , le test est validé, sinon le
+test est invalidé et produit le message «&nbsp;test 2.13.1&nbsp;: Un
+objet d’interdiction de trafic local «&nbsp;ITL&nbsp;» fait référence à
+une ligne inexistante&nbsp;».</font></font></font></p>
diff --git a/app/views/test_sheet/2_14.html b/app/views/test_sheet/2_14.html
index 26a7f1622..5f1d42530 100644
--- a/app/views/test_sheet/2_14.html
+++ b/app/views/test_sheet/2_14.html
@@ -1,399 +1,152 @@
-<div class=WordSection1>
-</span></b>
+<h1 class="western" style="border: 1pt solid rgb(0, 0, 0); padding: 0.05cm 0.12cm; margin-top: 0.21cm;" align="center">
+<font face="Arial, sans-serif"><font style="font-size: 20pt;" size="5"><i>
+ point de contrôle N° 2.14<br>
+Association points d’arrêt, tronçons, itinéraire<br>
+</i></font></font></h1>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Objectif: </b></u>
+Vérification que tout<br>
+POINT D’ARRÊT SUR PARCOURS (« StopPoint »)<br>
+est associé à un<br>
+Itinéraire/Chouette (ChouetteRoute&nbsp;»).<br>
+Analyse de la continuité des <span style="text-transform: uppercase;">tronçons<br>
+</span></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Priorité: </b></u> Obligatoire</font></p><font face="Arial, sans-serif">
+</font><p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><u><b>Explications:</b></u>
+</font></font></p>
-<p class=MsoTitle><span style='font-size:14.0pt;font-family:"Tahoma","sans-serif"'>Fiche
-du point de contr&ocirc;le N&deg; 2.14</span></p>
-<p class=MsoNormal>&nbsp;</p>
-<table class=MsoNormalTable border=1 cellspacing=0 cellpadding=0 width=657
- style='width:492.55pt;border-collapse:collapse;border:none'>
- <tr style='page-break-inside:avoid'>
- <td width=657 colspan=2 valign=top style='width:492.55pt;border:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center;text-indent:0cm'><i><span style='font-family:
- "Tahoma","sans-serif";color:navy'>Description</span></i></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>Intitul&eacute;</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt'><span style='font-size:11.0pt;
- line-height:200%;font-family:"Tahoma","sans-serif"'>Association points
- d&rsquo;arr&ecirc;t, tron&ccedil;ons, itin&eacute;raire.</span></p>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>Objectif</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'>V&eacute;rification que tout </span><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>POINT
- D&rsquo;ARR&Ecirc;T SUR PARCOURS (&laquo; StopPoint &raquo;)</span><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'> est associ&eacute; &agrave; un </span><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Itin&eacute;raire/Chouette
- (ChouetteRoute&nbsp;&raquo;).</span></h1>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'>Analyse de la
- continuit&eacute; des <span style='text-transform:uppercase'>tron&ccedil;ons</span>
- COMMERCIAUX/Chouette (&laquo;&nbsp;PtLink&nbsp;&raquo;) au sein d&rsquo;un Itin&eacute;raire/Chouette
- (ChouetteRoute&nbsp;&raquo;)..</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>R&eacute;f&eacute;rences</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'>TRIDENT/profil
- CHOUETTE/Transmodel V4 et V5.1</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>N&deg; de fiche(s) connexe(s)</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-left:0cm;text-align:left;text-indent:0cm'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>&nbsp;</span></h1>
- <h1 align=left style='margin-left:0cm;text-align:left;text-indent:0cm'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>&nbsp;</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt'><b><span style='font-size:
- 11.0pt;line-height:200%;font-family:"Tahoma","sans-serif"'>Priorit&eacute;<span
- style='color:red'> </span></span></b></p>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'>Obligatoire</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt'><b><span style='font-size:
- 11.0pt;line-height:200%;font-family:"Tahoma","sans-serif"'>R&eacute;sultat</span></b></p>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'>Conforme ou non
- conforme</span></h1>
- </td>
- </tr>
- <tr style='page-break-inside:avoid'>
- <td width=657 colspan=2 valign=top style='width:492.55pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center;text-indent:0cm'><i><span style='font-family:
- "Tahoma","sans-serif";color:navy'>Mise en &oelig;uvre</span></i></h1>
- </td>
- </tr>
- <tr>
- <td width=100 style='width:74.85pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>Explication</span></h1>
- </td>
- <td width=557 style='width:417.7pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 11.35pt 0cm 3.5pt'>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>Ce
- point de contr&ocirc;le v&eacute;rifie que tous les POINTs D&rsquo;ARR&Ecirc;T SUR PARCOURS </span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>(&laquo;
- StopPoint &raquo;) sont bien rattach&eacute;s &agrave; un Itin&eacute;raire/Chouette
- (&laquo;&nbsp;ChouetteRoute&nbsp;&raquo;) et que chaque POINT D&rsquo;ARR&Ecirc;T SUR PARCOURS </span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>(&laquo;
- StopPoint &raquo;) appartient &agrave; un </span><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";text-transform:uppercase'>tron&ccedil;on</span><span
- style='font-size:11.0pt;font-family:"Arial","sans-serif"'>
- COMMERCIAL/Chouette (&laquo;&nbsp;PtLink&nbsp;&raquo;).</span></p>
- <p class=MsoNormal style='margin-top:6.0pt'><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'>D&rsquo;autre part, les POINTs D&rsquo;ARR&Ecirc;T SUR
- PARCOURS (&laquo; StopPoint &raquo;) doivent &ecirc;tre ordonn&eacute;s sur l&rsquo;Itin&eacute;raire/Chouette
- (&laquo;&nbsp;ChouetteRoute&nbsp;&raquo;) et former une s&eacute;quence de tron&ccedil;ons contigus.</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>&nbsp;</span></p>
- </td>
- </tr>
-</table>
-<p class=MsoNormal>&nbsp;</p>
-<table class=MsoNormalTable border=1 cellspacing=0 cellpadding=0 width=647
- style='width:485.45pt;border-collapse:collapse;border:none'>
- <tr>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><b><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Exemple</span></b></p>
- </td>
- <td width=547 valign=top style='width:410.6pt;border:solid windowtext 1.0pt;
- border-left:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=left style='margin-left:18.0pt;text-align:left;text-indent:-18.0pt'><span
- style='font-size:11.0pt;font-weight:normal'>&nbsp;</span></h1>
- <h3 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Exemple
- de d&eacute;finition &agrave; partir d&rsquo;un fichier XML sur le RER A</span></h3>
- <p class=MsoNormal>L&rsquo;&eacute;l&eacute;ment StopPoint poss&egrave;de l&rsquo;identifiant 521850&nbsp;:</p>
- <p class=MsoNormal><span style='font-size:10.0pt'> </span></p>
- <p class=MsoNormal><span lang=EN-US style='font-size:10.0pt;font-family:"Courier New"'>&lt;StopPoint&gt;</span></p>
- <p class=MsoNormal><span lang=EN-US style='font-size:10.0pt;font-family:"Courier New"'>&lt;objectId&gt;NINOXE:StopPoint:521850&lt;/objectId&gt;</span></p>
- <p class=MsoNormal><span lang=EN-US style='font-size:10.0pt;font-family:"Courier New"'>&lt;objectVersion&gt;0&lt;/objectVersion&gt;</span></p>
- <p class=MsoNormal><span lang=EN-US style='font-size:10.0pt;font-family:"Courier New"'>&lt;creationTime&gt;2007-06-28T17:18:56.000+02:00&lt;/creationTime&gt;</span></p>
- <p class=MsoNormal><span lang=EN-US style='font-size:10.0pt;font-family:"Courier New"'>&lt;containedIn&gt;NINOXE:StopArea:521759&lt;/containedIn&gt;</span></p>
- <p class=MsoNormal><span lang=EN-US style='font-size:10.0pt;font-family:"Courier New"'>&lt;/StopPoint&gt;</span></p>
- <p class=MsoNormal><span lang=EN-US style='font-family:"Courier New"'>&nbsp;</span></p>
- <p class=MsoNormal>On le retrouve dans le tron&ccedil;on ci-apr&egrave;s :</p>
- <p class=MsoNormal><span style='font-family:"Courier New"'>&nbsp;</span></p>
- <p class=MsoNormal><span lang=EN-US style='font-size:10.0pt;font-family:"Courier New"'>&lt;PtLink&gt;</span></p>
- <p class=MsoNormal><span lang=EN-US style='font-size:10.0pt;font-family:"Courier New"'>&lt;objectId&gt;NINOXE:PtLink:521850-521851&lt;/objectId&gt;</span></p>
- <p class=MsoNormal><span lang=EN-US style='font-size:10.0pt;font-family:"Courier New"'>&lt;startOfLink&gt;NINOXE:StopPoint:521850&lt;/startOfLink&gt;</span></p>
- <p class=MsoNormal><span lang=EN-US style='font-size:10.0pt;font-family:"Courier New"'>&lt;endOfLink&gt;NINOXE:StopPoint:521851&lt;/endOfLink&gt;</span></p>
- <p class=MsoNormal><span style='font-size:10.0pt;font-family:"Courier New"'>&lt;/PtLink&gt;</span></p>
- <p class=MsoNormal><span style='font-family:"Courier New"'>&nbsp;</span></p>
- <p class=MsoNormal>Et ce m&ecirc;me tron&ccedil;on est int&eacute;gr&eacute; dans l&rsquo;itin&eacute;raire ci-apr&egrave;s
- :</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal><span style='font-size:10.0pt;font-family:"Courier New"'>&lt;ChouetteRoute&gt;</span></p>
- <p class=MsoNormal><span style='font-size:10.0pt;font-family:"Courier New"'>&lt;objectId&gt;NINOXE:Route:521755&lt;/objectId&gt;</span></p>
- <p class=MsoNormal><span lang=EN-US style='font-size:10.0pt;font-family:"Courier New"'>&lt;objectVersion&gt;0&lt;/objectVersion&gt;</span></p>
- <p class=MsoNormal><span lang=EN-US style='font-size:10.0pt;font-family:"Courier New"'>&lt;creationTime&gt;2007-06-28T17:18:56.000+02:00&lt;/creationTime&gt;</span></p>
- <p class=MsoNormal><span lang=EN-US style='font-size:10.0pt;font-family:"Courier New"'>&lt;name&gt;X&lt;/name&gt;</span></p>
- <p class=MsoNormal><span lang=EN-US style='font-size:10.0pt;font-family:"Courier New"'>&lt;publishedName&gt;Marne-la-Vall&eacute;e-Chessy
- Cergy&lt;/publishedName&gt;</span></p>
- <p class=MsoNormal><span lang=EN-US style='font-size:10.0pt;font-family:"Courier New"'>&lt;number&gt;ALLER&lt;/number&gt;</span></p>
- <p class=MsoNormal><span lang=EN-US style='font-size:10.0pt;font-family:"Courier New"'>&lt;ptLinkId&gt;NINOXE:PtLink:521850-521851&lt;/ptLinkId&gt;</span></p>
- <p class=MsoNormal><span lang=EN-US style='font-size:10.0pt;font-family:"Courier New"'>…</span></p>
- <p class=MsoNormal><span lang=EN-US style='font-size:10.0pt;font-family:"Courier New"'>&lt;/ChouetteRoute&gt;</span></p>
- <p class=MsoNormal><span lang=EN-US>&nbsp;</span></p>
- <p class=MsoNormal><span lang=EN-US>&nbsp;</span></p>
- </td>
- </tr>
- <tr style='page-break-inside:avoid'>
- <td width=647 colspan=2 valign=top style='width:485.45pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h2 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center;text-indent:0cm'><i><span lang=EN-US
- style='font-size:14.0pt;color:navy'>Evaluation</span></i></h2>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm'><span lang=EN-US
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>N&deg; test</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-left:0cm;text-align:left;text-indent:0cm'><span
- lang=EN-US style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>Test 2.14.1</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>Libell&eacute;</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-left:0cm;text-align:left;text-indent:0cm'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>V&eacute;rification
- que tout </span><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>POINT D&rsquo;ARR&Ecirc;T SUR PARCOURS (&laquo; StopPoint &raquo;)</span><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>
- est associ&eacute; &agrave; un </span><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>Itin&eacute;raire/Chouette (ChouetteRoute&nbsp;&raquo;).</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm'><span lang=EN-US
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Champ d&rsquo;application</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoNormal><span lang=EN-US style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal><span lang=EN-US style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&lt;StopPoint&gt;</span></p>
- <p class=MsoNormal><span lang=EN-US style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&lt;PtLink&gt;</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&lt;chouetteRoute&gt;</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>&nbsp;</span></p>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>V&eacute;rification</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoBodyText>&nbsp;</p>
- <p class=MsoBodyText>- Si l&rsquo;objet de point d&rsquo;arr&ecirc;t &laquo;&nbsp;StopPoint&nbsp;&raquo;
- mentionn&eacute; dans les champs d&rsquo;application est pr&eacute;sent une ou plusieurs fois,
- poursuivre le test, sinon le test est abandonn&eacute;.</p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>-
- Si l&rsquo;identifiant du point d&rsquo;arr&ecirc;t d&eacute;tect&eacute;, contenu dans l&rsquo;&eacute;l&eacute;ment
- &laquo;&nbsp;StopPoint&nbsp;&raquo;, figure dans l&rsquo;un des &eacute;l&eacute;ments
- &laquo;&nbsp;startOfLink&nbsp;&raquo; ou &laquo;&nbsp;endOfLink&nbsp;&raquo; de l&rsquo;objet de tron&ccedil;on
- &laquo;&nbsp;PTLink&nbsp;&raquo; , poursuivre le test, sinon le test fournit le message
- d&rsquo;alerte &laquo;&nbsp; test 2.14.1 a&nbsp;: le point d&rsquo;arr&ecirc;t (&laquo; StopPoint &raquo;) XX
- n&rsquo;appartient &agrave; aucune extr&eacute;mit&eacute; de tron&ccedil;on&nbsp;&raquo;. La poursuite des tests est
- abandonn&eacute;e. </span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>-
- Si l&rsquo;identifiant du tron&ccedil;on &laquo;&nbsp;PtLink&nbsp;&raquo;, d&eacute;tect&eacute; ci-avant, est
- int&eacute;gr&eacute; dans un objet &laquo;&nbsp;ChouetteRoute&nbsp;&raquo;, le test est valid&eacute;, sinon
- le test est invalid&eacute; et fournit le message &laquo;&nbsp; test 2.14.1 b&nbsp;: le
- tron&ccedil;on XX fait r&eacute;f&eacute;rence &agrave; un itin&eacute;raire inexistant&nbsp;&raquo;.</span></p>
- <p class=MsoBodyText>&nbsp;</p>
- <p class=MsoNormal><b><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>&nbsp;</span></b></p>
- </td>
- </tr>
-</table>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Ce point de contrôle vérifie que tous les POINTs D’ARRÊT SUR PARCOURS&nbsp;(«
+StopPoint ») sont bien rattachés à un Itinéraire/Chouette
+(«&nbsp;ChouetteRoute&nbsp;») et que chaque POINT D’ARRÊT SUR
+PARCOURS&nbsp;(«StopPoint»)&nbsp;appartient à un&nbsp;tronçon&nbsp;COMMERCIAL/Chouette («&nbsp;PtLink&nbsp;»).</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+D’autre part, les POINTs D’ARRÊT SUR PARCOURS (« StopPoint ») doivent
+être ordonnés sur l’Itinéraire/Chouette («&nbsp;ChouetteRoute&nbsp;»)
+et former une séquence de tronçons contigus.</font></font></font></p>
-<p class=MsoNormal>&nbsp;</p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>Exemple: </u></b></font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Exemple de définition à partir d’un fichier XML sur le RER A</font></font></font></p>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;StopPoint&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;objectId&gt;NINOXE:StopPoint:521850&lt;/objectId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;objectVersion&gt;0&lt;/objectVersion&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;creationTime&gt;2007-06-28T17:18:56.000+02:00&lt;/creationTime&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;containedIn&gt;NINOXE:StopArea:521759&lt;/containedIn&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;/StopPoint&gt;</font></span><span style="font-size: 10pt; font-family: &quot;Courier New&quot;;"><font face="Arial, sans-serif"><br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&nbsp;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;PtLink&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;objectId&gt;NINOXE:PtLink:521850-521851&lt;/objectId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;startOfLink&gt;NINOXE:StopPoint:521850&lt;/startOfLink&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;endOfLink&gt;NINOXE:StopPoint:521851&lt;/endOfLink&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;/PtLink&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&nbsp;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;ChouetteRoute&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;objectId&gt;NINOXE:Route:521755&lt;/objectId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;objectVersion&gt;0&lt;/objectVersion&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;creationTime&gt;2007-06-28T17:18:56.000+02:00&lt;/creationTime&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;name&gt;X&lt;/name&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;publishedName&gt;Marne-la-Vallée-Chessy Cergy&lt;/publishedName&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;number&gt;ALLER&lt;/number&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;ptLinkId&gt;NINOXE:PtLink:521850-521851&lt;/ptLinkId&gt;</font></span><span style="font-size: 10pt; font-family: &quot;Courier New&quot;;"><font face="Arial, sans-serif"><br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;/ChouetteRoute&gt;<br></font></span>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>N° test:</u></b>
+Test 2.14.1</font></font></font></p>
-<table class=MsoNormalTable border=1 cellspacing=0 cellpadding=0 width=638
- style='width:478.4pt;border-collapse:collapse;border:none'>
- <tr style='height:37.4pt'>
- <td width=100 style='width:74.85pt;border:solid windowtext 1.0pt;padding:
- 0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm'><span lang=EN-US
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>N&deg; test</span></h1>
- </td>
- <td width=538 style='width:403.55pt;border:solid windowtext 1.0pt;border-left:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-left:0cm;text-align:left;text-indent:0cm'><span
- lang=EN-US style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>Test 2.14.2</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=100 style='width:74.85pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>Libell&eacute;</span></h1>
- </td>
- <td width=538 style='width:403.55pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-left:0cm;text-align:left;text-indent:0cm'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Analyse
- de la continuit&eacute; des </span><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- text-transform:uppercase;font-weight:normal'>tron&ccedil;ons</span><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>
- COMMERCIAUX/Chouette (&laquo;&nbsp;PtLink&nbsp;&raquo;) au sein d&rsquo;un Itin&eacute;raire/Chouette
- (&laquo;&nbsp;ChouetteRoute&nbsp;&raquo;).</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=100 style='width:74.85pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>Champ d&rsquo;application</span></h1>
- </td>
- <td width=538 style='width:403.55pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&lt;PtLink&gt;</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&lt;chouetteRoute&gt;</span></p>
- <p class=MsoNormal><span style='font-family:"Tahoma","sans-serif"'>&nbsp;</span></p>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=100 style='width:74.85pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>V&eacute;rification</span></h1>
- </td>
- <td width=538 style='width:403.55pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoBodyText>&nbsp;</p>
- <p class=MsoBodyText>- Si l&rsquo;&eacute;l&eacute;ment &laquo;&nbsp;ChouetteRoute&nbsp;&raquo; mentionn&eacute;
- dans les champs d&rsquo;application est pr&eacute;sent une ou plusieurs fois, poursuivre
- le test, sinon le test est abandonn&eacute;.</p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>-
- Pour chaque identifiant de tron&ccedil;on &laquo;&nbsp;PtLink&nbsp;&raquo; successif, contenu
- dans l&rsquo;&eacute;l&eacute;ment &laquo;&nbsp;ChouetteRoute&nbsp;&raquo;, si la valeur de l&rsquo;attribut de
- l&rsquo;&eacute;l&eacute;ment &laquo;&nbsp;endOfLink&nbsp;&raquo; du premier tron&ccedil;on &laquo;&nbsp;PtLink&nbsp;&raquo; est
- identique &agrave; la valeur de l&rsquo;attribut de l&rsquo;&eacute;l&eacute;ment &laquo;&nbsp;startOfLink&nbsp;&raquo; du
- deuxi&egrave;me tron&ccedil;on &laquo;&nbsp;PtLink&nbsp;&raquo;, poursuivre le test (se d&eacute;caler d&rsquo;un
- tron&ccedil;on), sinon le test est invalid&eacute; et fournit message&nbsp;: &laquo;&nbsp;test
- 2.14.2&nbsp;: l&rsquo;analyse des tron&ccedil;ons d&rsquo;un itin&eacute;raire fait appara&icirc;tre que la
- valeur de l&rsquo;attribut de l&rsquo;&eacute;l&eacute;ment &laquo;&nbsp;endOfLink&nbsp;&raquo; d&rsquo;un premier
- tron&ccedil;on &laquo;&nbsp;PtLink&nbsp;&raquo; n&rsquo;est pas identique &agrave; la valeur de l&rsquo;attribut de
- l&rsquo;&eacute;l&eacute;ment &laquo;&nbsp;startOfLink&nbsp;&raquo; du deuxi&egrave;me tron&ccedil;on
- &laquo;&nbsp;PtLink&nbsp;&raquo;&nbsp;&raquo;.</span></p>
- <h1 align=left style='margin-left:0cm;text-align:left;text-indent:0cm'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>&nbsp;</span></h1>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>-
- Le test est valid&eacute;</span></p>
- <p class=MsoNormal><span style='font-family:"Tahoma","sans-serif"'>&nbsp;</span></p>
- </td>
- </tr>
-</table>
-<p class=MsoTitle><span style='font-size:12.0pt;font-family:"Times New Roman","serif";
-font-weight:normal'>&nbsp;</span></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Libellé:</u> Vérification que tout&nbsp;POINT D’ARRÊT SUR PARCOURS
+(« StopPoint »)&nbsp;est associé à
+un&nbsp;Itinéraire/Chouette&nbsp;(ChouetteRoute&nbsp;»).&nbsp;</font></font></font></p>
-</div>
+
+
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2"><span style="text-decoration: underline;">
+Champ d’application:</span>&nbsp;&lt;StopPoint&gt;&nbsp;&lt;PtLink&gt;&nbsp;&lt;chouetteRoute&gt;</font></font></font></p>
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Vérification:</u> </font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">-
+Si l’objet de point d’arrêt « StopPoint » mentionné dans les champs
+d’application est présent une ou plusieurs fois, poursuivre le test,
+sinon le test est abandonné.</font></font></font></p><p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">- Si l’identifiant du point d’arrêt détecté, contenu dans l’élément
+«&nbsp;StopPoint&nbsp;», figure dans l’un des éléments
+«&nbsp;startOfLink&nbsp;» ou «&nbsp;endOfLink&nbsp;» de l’objet de
+tronçon «&nbsp;PTLink&nbsp;» , poursuivre le test, sinon le test
+fournit le message d’alerte «&nbsp; test 2.14.1 a&nbsp;: le point
+d’arrêt (« StopPoint ») XX n’appartient à aucune extrémité de
+tronçon&nbsp;». La poursuite des tests est abandonnée.</font></font></font></p>
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si l’identifiant du tronçon «&nbsp;PtLink&nbsp;», détecté ci-avant,
+est intégré dans un objet «&nbsp;ChouetteRoute&nbsp;», le test est
+validé, sinon le test est invalidé et fournit le message «&nbsp; test
+2.14.1 b&nbsp;: le tronçon XX fait référence à un itinéraire
+inexistant&nbsp;».</font></font></font></p>
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>N° test:</u></b>
+Test 2.14.2</font></font></font></p>
+
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Libellé:</u> Analyse de la continuité
+des&nbsp;tronçons&nbsp;COMMERCIAUX/Chouette («&nbsp;PtLink&nbsp;») au
+sein d’un Itinéraire/Chouette («&nbsp;ChouetteRoute&nbsp;»).</font></font></font></p>
+
+
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2"><span style="text-decoration: underline;">
+Champ d’application:</span>&nbsp;&lt;PtLink&gt; &lt;chouetteRoute&gt;</font></font></font></p>
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Vérification:</u> </font></font></font></p>
+
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">-
+Si l’élément « ChouetteRoute » mentionné dans les champs d’application
+est présent une ou plusieurs fois, poursuivre le test, sinon le test
+est abandonné.</font></font></font></p><p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">- Pour chaque identifiant de tronçon «&nbsp;PtLink&nbsp;» successif,
+contenu dans l’élément «&nbsp;ChouetteRoute&nbsp;», si la valeur de
+l’attribut de l’élément «&nbsp;endOfLink&nbsp;» du premier tronçon
+«&nbsp;PtLink&nbsp;» est identique à la valeur de l’attribut de
+l’élément «&nbsp;startOfLink&nbsp;» du deuxième tronçon
+«&nbsp;PtLink&nbsp;», poursuivre le test (se décaler d’un tronçon),
+sinon le test est invalidé et fournit message&nbsp;: «&nbsp;test
+2.14.2&nbsp;: l’analyse des tronçons d’un itinéraire fait apparaître
+que la valeur de l’attribut de l’élément «&nbsp;endOfLink&nbsp;» d’un
+premier tronçon «&nbsp;PtLink&nbsp;» n’est pas identique à la valeur de
+l’attribut de l’élément «&nbsp;startOfLink&nbsp;» du deuxième tronçon
+«&nbsp;PtLink&nbsp;»</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Le test est validé</font></font></font></p>
diff --git a/app/views/test_sheet/2_15.html b/app/views/test_sheet/2_15.html
index 24fb2d502..a0883f072 100644
--- a/app/views/test_sheet/2_15.html
+++ b/app/views/test_sheet/2_15.html
@@ -1,463 +1,181 @@
-<div class=WordSection1>
-</span>
+<h1 class="western" style="border: 1pt solid rgb(0, 0, 0); padding: 0.05cm 0.12cm; margin-top: 0.21cm;" align="center">
+<font face="Arial, sans-serif"><font style="font-size: 20pt;" size="5"><i>
+ point de contrôle N° 2.15<br>
+Cohérence entre points d'arrêt et missions commerciales<br>
+</i></font></font></h1>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Objectif: </b></u>
+Vérification de l’existence de définition des POINTs D’ARRÊT SUR
+PARCOURS (« StopPoint ») d’une mission commerciale
+(«&nbsp;JourneyPattern&nbsp;»). <br>
+Vérification que tout POINT D’ARRÊT SUR PARCOURS (« StopPoint »)
+appartient à une mission&nbsp; commerciale
+(«&nbsp;JourneyPattern&nbsp;»).<br>
+</font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Priorité: </b></u> Obligatoire (si l’objet «&nbsp;JourneyPattern&nbsp;» existe)</font></p><font face="Arial, sans-serif">
+</font><p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><u><b>Explications:</b></u>
+</font></font></p>
-<p class=MsoTitle><span style='font-size:14.0pt;font-family:"Tahoma","sans-serif"'>Fiche
-du point de contr&ocirc;le N&deg; 2.15</span></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+L’objet de MISSION COMMERCIALE (« JourneyPattern ») , a un caractère
+optionnel. Quand elle existe, chaque MISSION COMMERCIALE&nbsp;(«
+JourneyPattern ») référence de manière obligatoire une liste
+«&nbsp;stopPointList&nbsp;» qui contient au moins deux identifiants de
+POINT D’ARRÊT SUR PARCOURS (« StopPoint »). Pour chaque identifiant de
+cette liste, il convient de vérifier qu'il correspond à l'identifiant
+«&nbsp;objectId&nbsp;» d'un POINT D’ARRÊT SUR PARCOURS (« StopPoint »)
+du réseau.</font></font></font></p>
-<p class=MsoNormal>&nbsp;</p>
-<table class=MsoNormalTable border=0 cellspacing=0 cellpadding=0 width=639
- style='width:478.9pt;margin-left:-.5pt;border-collapse:collapse'>
- <tr style='page-break-inside:avoid'>
- <td width=639 colspan=2 valign=top style='width:478.9pt;border:solid black 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center;text-indent:0cm;layout-grid-mode:char'><i><span
- style='font-family:"Tahoma","sans-serif";color:navy'>Description</span></i></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Intitul&eacute;</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt;layout-grid-mode:char'><span
- style='font-size:11.0pt;line-height:200%;font-family:"Tahoma","sans-serif"'>Coh&eacute;rence
- entre points d'arr&ecirc;t et missions commerciales.</span></p>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Objectif</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>V&eacute;rification
- de l&rsquo;existence de d&eacute;finition des POINTs D&rsquo;ARR&Ecirc;T SUR PARCOURS (&laquo; StopPoint
- &raquo;) d&rsquo;une </span><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- text-transform:uppercase;font-weight:normal'>mission commerciale</span><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>
- (&laquo;&nbsp;JourneyPattern&nbsp;&raquo;).</span></h1>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>V&eacute;rification
- que tout POINT D&rsquo;ARR&Ecirc;T SUR PARCOURS (&laquo; StopPoint &raquo;) appartient &agrave; une </span><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";text-transform:
- uppercase;font-weight:normal'>mission commerciale</span><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>
- (&laquo;&nbsp;JourneyPattern&nbsp;&raquo;).</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>R&eacute;f&eacute;rences</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>TRIDENT/profil
- CHOUETTE/Transmodel V4 et V5.1</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>N&deg; de fiche(s)
- connexe(s)</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:0cm;
- margin-left:0cm;margin-bottom:.0001pt;text-align:left;text-indent:0cm;
- layout-grid-mode:char'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>&nbsp;</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt;layout-grid-mode:char'><b><span
- style='font-family:"Tahoma","sans-serif"'>Priorit&eacute;<span style='color:red'> </span></span></b></p>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Obligatoire
- (si l&rsquo;objet &laquo;&nbsp;JourneyPattern&nbsp;&raquo; existe)</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt;layout-grid-mode:char'><b><span
- style='font-family:"Tahoma","sans-serif"'>R&eacute;sultat</span></b></p>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Conforme
- ou non conforme</span></h1>
- </td>
- </tr>
- <tr style='page-break-inside:avoid'>
- <td width=639 colspan=2 valign=top style='width:478.9pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center;text-indent:0cm;layout-grid-mode:char'><i><span
- style='font-family:"Tahoma","sans-serif";color:navy'>Mise en &oelig;uvre</span></i></h1>
- </td>
- </tr>
- <tr>
- <td width=100 style='width:74.85pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Explication</span></h1>
- </td>
- <td width=539 style='width:404.05pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 11.35pt 5.65pt 3.5pt'>
- <h1 align=left style='margin-top:0cm;margin-right:11.35pt;margin-bottom:0cm;
- margin-left:0cm;margin-bottom:.0001pt;text-align:left;text-indent:0cm;
- layout-grid-mode:char'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>L&rsquo;objet de MISSION COMMERCIALE (&laquo; JourneyPattern &raquo;) , a
- un caract&egrave;re optionnel. Quand elle existe, chaque MISSION COMMERCIALE</span></h1>
- <h1 align=left style='margin-top:0cm;margin-right:11.35pt;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>(&laquo;
- JourneyPattern &raquo;) r&eacute;f&eacute;rence de mani&egrave;re obligatoire une liste
- &laquo;&nbsp;stopPointList&nbsp;&raquo; qui contient au moins deux identifiants de POINT
- D&rsquo;ARR&Ecirc;T SUR PARCOURS (&laquo; StopPoint &raquo;). Pour chaque identifiant de cette
- liste, il convient de v&eacute;rifier qu'il correspond &agrave; l'identifiant
- &laquo;&nbsp;objectId&nbsp;&raquo; d'un POINT D&rsquo;ARR&Ecirc;T SUR PARCOURS (&laquo; StopPoint &raquo;) du
- r&eacute;seau. </span></h1>
- <p class=MsoNormal style='margin-right:11.35pt'><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'>Chaque identifiant de POINT D&rsquo;ARR&Ecirc;T SUR
- PARCOURS (&laquo; StopPoint &raquo;) doit appartenir &agrave; la liste des POINTs D&rsquo;ARR&Ecirc;T SUR
- PARCOURS d&rsquo;une MISSION COMMERCIALE (&laquo;&nbsp;StopPointList&nbsp;&raquo; de la </span><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";text-transform:
- uppercase'>mission commerciale</span><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'> &laquo;&nbsp;JourneyPattern&nbsp;&raquo;).</span></p>
- <p class=MsoNormal style='margin-right:11.35pt'><span style='font-family:
- "Tahoma","sans-serif"'>&nbsp;</span></p>
- </td>
- </tr>
-</table>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Chaque identifiant de POINT D’ARRÊT SUR PARCOURS (« StopPoint ») doit
+appartenir à la liste des POINTs D’ARRÊT SUR PARCOURS d’une MISSION
+COMMERCIALE («&nbsp;StopPointList&nbsp;» de la&nbsp;mission commerciale&nbsp;«&nbsp;JourneyPattern&nbsp;»).</font></font></font></p>
-<p class=MsoNormal>&nbsp;</p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>Exemple: </u></b></font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Représentation schématique de l’objet «&nbsp;JourneyPattern&nbsp;»</font></font></font></p>
+<p><font face="Arial, sans-serif"><img src="image008.jpg" height="483" width="487"></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Exemple d'un parcours qui référence sept points d'arrêt</font></font></font></p>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">...<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;StopPoint&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;objectId&gt;AMIV:StopPoint:489111A0A237832&lt;/objectId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;objectVersion&gt;1&lt;/objectVersion&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">...<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;StopPoint&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;objectId&gt;AMIV:StopPoint:489111A1A237807&lt;/objectId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;objectVersion&gt;1&lt;/objectVersion&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">...<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;StopPoint&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;objectId&gt;AMIV:StopPoint:489111A2A237806&lt;/objectId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;objectVersion&gt;1&lt;/objectVersion&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">...<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;StopPoint&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;objectId&gt;AMIV:StopPoint:489111A3A237805&lt;/objectId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;objectVersion&gt;1&lt;/objectVersion&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">...<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;StopPoint&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;objectId&gt;AMIV:StopPoint:489111A4A237804&lt;/objectId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;objectVersion&gt;1&lt;/objectVersion&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">...<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;StopPoint&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;objectId&gt;AMIV:StopPoint:489111A5A237803&lt;/objectId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;objectVersion&gt;1&lt;/objectVersion&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">...<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;StopPoint&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;objectId&gt;AMIV:StopPoint:489111A6A237832&lt;/objectId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;objectVersion&gt;1&lt;/objectVersion&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">...<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;JourneyPattern&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;objectId&gt;AMIV:JourneyPattern:489111M74&lt;/objectId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;routeId&gt;AMIV:Route:489111&lt;/routeId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;stopPointList&gt;AMIV:StopPoint:489111A0A237832&lt;/stopPointList&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;stopPointList&gt;AMIV:StopPoint:489111A1A237807&lt;/stopPointList&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;stopPointList&gt;AMIV:StopPoint:489111A2A237806&lt;/stopPointList&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;stopPointList&gt;AMIV:StopPoint:489111A3A237805&lt;/stopPointList&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;stopPointList&gt;AMIV:StopPoint:489111A4A237804&lt;/stopPointList&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;stopPointList&gt;AMIV:StopPoint:489111A5A237803&lt;/stopPointList&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;stopPointList&gt;AMIV:StopPoint:489111A6A237832&lt;/stopPointList&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;lineIdShortcut&gt;AMIV:Line:014014012&lt;/lineIdShortcut&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;/JourneyPattern&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">...<br></font></span>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>N° test:</u></b>
+2.15.1</font></font></font></p>
-<table class=MsoNormalTable border=0 cellspacing=0 cellpadding=0 width=648
- style='width:485.95pt;margin-left:-.5pt;border-collapse:collapse'>
- <tr>
- <td width=108 colspan=2 valign=top style='width:81.35pt;border:solid black 1.0pt;
- border-right:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm;layout-grid-mode:char'><b><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>Exemple</span></b></p>
- </td>
- <td width=548 colspan=2 valign=top style='width:411.1pt;border:solid black 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=left style='margin-left:18.0pt;text-align:left;text-indent:0cm;
- layout-grid-mode:char'><span style='font-size:11.0pt;font-weight:normal'>&nbsp;</span></h1>
- <h1 align=left style='margin-left:18.0pt;text-align:left;text-indent:0cm'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Repr&eacute;sentation
- sch&eacute;matique de l&rsquo;objet &laquo;&nbsp;JourneyPattern&nbsp;&raquo;</span></h1>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal align=center style='text-align:center'><img width=487
- height=483 src="BATERI_Neptune_FINAL-V2_0a_fichiers/image008.jpg"></p>
- <p class=MsoNormal> </p>
- <p class=MsoNormal>&nbsp;</p>
- <h3 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Exemple
- d'un parcours qui r&eacute;f&eacute;rence sept points d'arr&ecirc;t</span></h3>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>...</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;StopPoint&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;objectId&gt;AMIV:StopPoint:489111A0A237832&lt;/objectId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;objectVersion&gt;1&lt;/objectVersion&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>...</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;StopPoint&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;objectId&gt;AMIV:StopPoint:489111A1A237807&lt;/objectId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;objectVersion&gt;1&lt;/objectVersion&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>...</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;StopPoint&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;objectId&gt;AMIV:StopPoint:489111A2A237806&lt;/objectId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;objectVersion&gt;1&lt;/objectVersion&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>...</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;StopPoint&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;objectId&gt;AMIV:StopPoint:489111A3A237805&lt;/objectId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;objectVersion&gt;1&lt;/objectVersion&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>...</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;StopPoint&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;objectId&gt;AMIV:StopPoint:489111A4A237804&lt;/objectId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;objectVersion&gt;1&lt;/objectVersion&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>...</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;StopPoint&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;objectId&gt;AMIV:StopPoint:489111A5A237803&lt;/objectId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;objectVersion&gt;1&lt;/objectVersion&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>...</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;StopPoint&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;objectId&gt;AMIV:StopPoint:489111A6A237832&lt;/objectId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;objectVersion&gt;1&lt;/objectVersion&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>...</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;JourneyPattern&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;objectId&gt;AMIV:JourneyPattern:489111M74&lt;/objectId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;routeId&gt;AMIV:Route:489111&lt;/routeId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;stopPointList&gt;AMIV:StopPoint:489111A0A237832&lt;/stopPointList&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;stopPointList&gt;AMIV:StopPoint:489111A1A237807&lt;/stopPointList&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;stopPointList&gt;AMIV:StopPoint:489111A2A237806&lt;/stopPointList&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;stopPointList&gt;AMIV:StopPoint:489111A3A237805&lt;/stopPointList&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;stopPointList&gt;AMIV:StopPoint:489111A4A237804&lt;/stopPointList&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;stopPointList&gt;AMIV:StopPoint:489111A5A237803&lt;/stopPointList&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;stopPointList&gt;AMIV:StopPoint:489111A6A237832&lt;/stopPointList&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;lineIdShortcut&gt;AMIV:Line:014014012&lt;/lineIdShortcut&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;/JourneyPattern&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>...</span></p>
- <p class=MsoNormal><span lang=EN-US>&nbsp;</span></p>
- <p class=MsoNormal><span lang=EN-US>&nbsp;</span></p>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 colspan=4 valign=top style='width:81.35pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h2 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center;text-indent:0cm;layout-grid-mode:char'><i><span
- lang=EN-US style='font-size:14.0pt;color:navy'>Evaluation</span></i></h2>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 colspan=2 valign=top style='width:81.35pt;border-top:none;
- border-left:solid black 1.0pt;border-bottom:solid black 1.0pt;border-right:
- none;padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm;layout-grid-mode:char'><span lang=EN-US style='font-size:
- 11.0pt'>N&deg; test</span></h1>
- </td>
- <td width=548 colspan=2 valign=top style='width:411.1pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:
- 0cm;margin-bottom:.0001pt;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>2.15.1</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 colspan=2 valign=top style='width:81.35pt;border-top:none;
- border-left:solid black 1.0pt;border-bottom:solid black 1.0pt;border-right:
- none;padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm;layout-grid-mode:char'><span style='font-size:11.0pt'>Libell&eacute;</span></h1>
- </td>
- <td width=548 colspan=2 valign=top style='width:411.1pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:
- 0cm;margin-bottom:.0001pt;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>V&eacute;rification
- de l&rsquo;existence de d&eacute;finition des POINTs D&rsquo;ARR&Ecirc;T SUR PARCOURS (&laquo; StopPoint
- &raquo;) d&rsquo;une </span><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- text-transform:uppercase;font-weight:normal'>mission commerciale</span><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>
- (&laquo;&nbsp;JourneyPattern&nbsp;&raquo;).</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 colspan=2 valign=top style='width:81.35pt;border-top:none;
- border-left:solid black 1.0pt;border-bottom:solid black 1.0pt;border-right:
- none;padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:-6.95pt;margin-bottom:6.0pt;
- margin-left:0cm;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Champ
- d&rsquo;application</span></h1>
- </td>
- <td width=548 colspan=2 valign=top style='width:411.1pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm;layout-grid-mode:char'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'>&lt;JourneyPattern&gt;</span></h1>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm;text-align:justify;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>&lt;StopPoint&gt;</span></p>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 colspan=2 valign=top style='width:81.35pt;border-top:none;
- border-left:solid black 1.0pt;border-bottom:solid black 1.0pt;border-right:
- none;padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm;layout-grid-mode:char'><span style='font-size:11.0pt'>V&eacute;rification</span></h1>
- </td>
- <td width=548 colspan=2 valign=top style='width:411.1pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-left:0cm;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>&nbsp;</span></h1>
- <h1 style='margin-left:0cm;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>-
- Si l&rsquo;objet de mission commerciale existe, poursuivre le test, sinon
- abandonner le test</span></h1>
- <h1 style='layout-grid-mode:char'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif";font-weight:normal'>&nbsp;</span></h1>
- <p class=MsoBodyText3 align=left style='text-align:left'><span
- style='font-family:"Tahoma","sans-serif"'>- Si la liste des points d&rsquo;arr&ecirc;t
- &laquo;&nbsp;stopPointList&nbsp;&raquo;, r&eacute;f&eacute;renc&eacute;s dans un objet de mission commerciale
- &laquo;&nbsp;JourneyPattern&nbsp;&raquo;, poss&egrave;de des identifiants &laquo;&nbsp;objectId&nbsp;&raquo;
- dans les objets de points d&rsquo;arr&ecirc;t &laquo;&nbsp;StopPoint&nbsp;&raquo;, alors le test est
- valid&eacute;, sinon le test est invalid&eacute; et produit le message &laquo;&nbsp;test
- 2.15.1&nbsp;: La liste de l&rsquo;objet &laquo;&nbsp;JourneyPattern&nbsp;&raquo; fait r&eacute;f&eacute;rence
- &agrave; des points d&rsquo;arr&ecirc;t inexistants&nbsp;&raquo;</span></p>
- <h1 style='margin-left:0cm;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>&nbsp;</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td style='border:none;padding:0cm 0cm 0cm 0cm' width=1><p class='MsoNormal'>&nbsp;</td>
- <td width=108 colspan=2 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm'><span lang=EN-US style='font-size:11.0pt'>N&deg; test</span></h1>
- </td>
- <td width=547 style='width:410.6pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-left:0cm;text-align:left;text-indent:0cm'><span
- lang=EN-US style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>2.15.2</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td style='border:none;padding:0cm 0cm 0cm 0cm' width=1><p class='MsoNormal'>&nbsp;</td>
- <td width=108 colspan=2 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm'><span lang=EN-US style='font-size:11.0pt'>Libell&eacute;</span></h1>
- </td>
- <td width=547 style='width:410.6pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-left:0cm;text-align:left;text-indent:0cm'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>V&eacute;rification
- que tout POINT D&rsquo;ARR&Ecirc;T SUR PARCOURS (&laquo; StopPoint &raquo;) appartient &agrave; une </span><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";text-transform:
- uppercase;font-weight:normal'>mission commerciale</span><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>
- (&laquo;&nbsp;JourneyPattern&nbsp;&raquo;).</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td style='border:none;padding:0cm 0cm 0cm 0cm' width=1><p class='MsoNormal'>&nbsp;</td>
- <td width=108 colspan=2 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:-15.45pt;margin-bottom:6.0pt;
- margin-left:0cm;text-indent:0cm'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>Champ d&rsquo;application</span></h1>
- </td>
- <td width=547 valign=top style='width:410.6pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-left:0cm;text-indent:0cm'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'>&nbsp;</span></h1>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&lt;StopPoint&gt;</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&lt;JourneyPattern&gt;</span></p>
- <p class=MsoNormal><span style='font-family:"Tahoma","sans-serif"'>&nbsp;</span></p>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td style='border:none;padding:0cm 0cm 0cm 0cm' width=1><p class='MsoNormal'>&nbsp;</td>
- <td width=108 colspan=2 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm'><span style='font-size:11.0pt'>V&eacute;rification</span></h1>
- </td>
- <td width=547 valign=top style='width:410.6pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-left:0cm;text-indent:0cm'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'>&nbsp;</span></h1>
- <p class=MsoBodyText>- Si l&rsquo;objet &laquo;&nbsp;StopPoint&nbsp;&raquo;, mentionn&eacute; dans les
- champs d&rsquo;application, est pr&eacute;sent une ou plusieurs fois, poursuivre le test,
- sinon le test est abandonn&eacute;.</p>
- <p class=MsoNormal style='text-align:justify'><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal style='text-align:justify'><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'>- Si l&rsquo;identifiant de l&rsquo;&eacute;l&eacute;ment &laquo;&nbsp;StopPoint&nbsp;&raquo;
- identifi&eacute; est contenu dans la liste des points d&rsquo;arr&ecirc;t (StopPointList) de
- l&rsquo;objet &laquo;&nbsp;JourneyPattern&nbsp;&raquo;, le test est valid&eacute;, sinon le test est
- invalid&eacute; et fournit le message&nbsp;: &laquo;&nbsp;test 2.15.2&nbsp;: un point
- d&rsquo;arr&ecirc;t (&laquo; StopPoint &raquo;) n&rsquo;est pas rattach&eacute; &agrave; une mission
- commerciale&nbsp;&raquo;.</span></p>
- <p class=MsoNormal><b><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>&nbsp;</span></b></p>
- </td>
- </tr>
- <tr height=0>
- <td width=1 style='border:none'></td>
- <td width=108 style='border:none'></td>
- <td width=1 style='border:none'></td>
- <td width=539 style='border:none'></td>
- </tr>
-</table>
-<p class=MsoNormal>&nbsp;</p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Libellé:</u>
+Vérification de l’existence de définition des POINTs D’ARRÊT SUR PARCOURS (« StopPoint ») d’une&nbsp;<br>mission commerciale&nbsp;(«&nbsp;JourneyPattern&nbsp;»).</font></font></font></p>
-</div>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Champ d’application:</u>
+&lt;JourneyPattern&gt;&nbsp;&lt;StopPoint&gt;</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Vérification:</u> </font></font></font></p>
+
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si l’objet de mission commerciale existe, poursuivre le test, sinon abandonner le test</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si la liste des points d’arrêt «&nbsp;stopPointList&nbsp;»,
+référencés dans un objet de mission commerciale
+«&nbsp;JourneyPattern&nbsp;», possède des identifiants
+«&nbsp;objectId&nbsp;» dans les objets de points d’arrêt
+«&nbsp;StopPoint&nbsp;», alors le test est validé, sinon le test est
+invalidé et produit le message «&nbsp;test 2.15.1&nbsp;: La liste de
+l’objet «&nbsp;JourneyPattern&nbsp;» fait référence à des points
+d’arrêt inexistants&nbsp;»</font></font></font></p>
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>N° test:</u></b>
+2.15.2</font></font></font></p>
+
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Libellé:</u> Vérification que tout POINT D’ARRÊT SUR PARCOURS («
+StopPoint ») appartient à une&nbsp;mission
+commerciale&nbsp;(«&nbsp;JourneyPattern&nbsp;»).</font></font></font></p>
+
+
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2"><span style="text-decoration: underline;">
+Champ d’application:</span>&nbsp;&lt;StopPoint&gt; &lt;JourneyPattern&gt;</font></font></font></p>
+
+
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Vérification:</u>&nbsp;</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">-
+Si l’objet « StopPoint », mentionné dans les champs d’application, est
+présent une ou plusieurs fois, poursuivre le test, sinon le test est
+abandonné.</font></font></font></p><p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">- Si l’identifiant de l’élément «&nbsp;StopPoint&nbsp;» identifié est
+contenu dans la liste des points d’arrêt (StopPointList) de l’objet
+«&nbsp;JourneyPattern&nbsp;», le test est validé, sinon le test est
+invalidé et fournit le message&nbsp;: «&nbsp;test 2.15.2&nbsp;: un
+point d’arrêt (« StopPoint ») n’est pas rattaché à une mission
+commerciale&nbsp;».</font></font></font></p>
diff --git a/app/views/test_sheet/2_16.html b/app/views/test_sheet/2_16.html
index c5448bbea..b893c40c9 100644
--- a/app/views/test_sheet/2_16.html
+++ b/app/views/test_sheet/2_16.html
@@ -1,305 +1,94 @@
+<h1 class="western" style="border: 1pt solid rgb(0, 0, 0); padding: 0.05cm 0.12cm; margin-top: 0.21cm;" align="center">
+<font face="Arial, sans-serif"><font style="font-size: 20pt;" size="5"><i>
+ point de contrôle N° 2.16<br>
+Référence à une ligne des missions commerciales<br>
+</i></font></font></h1>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Objectif: </b></u>
+Vérification de la correcte référence à une LIGNE/Chouette
+(«&nbsp;Ligne&nbsp;») pour une MISSION COMMERCIALE
+(«&nbsp;JourneyPattern&nbsp;»).<br>
+</font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Priorité: </b></u> Obligatoire (si l’objet «&nbsp;JourneyPattern&nbsp;» existe et s’il contient l’objet «&nbsp;lineIdShortCut&nbsp;»)</font></p><font face="Arial, sans-serif">
+</font><p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><u><b>Explications:</b></u>
+</font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Lorsque l’objet MISSION COMMERCIALE («&nbsp;JourneyPattern&nbsp;») fait
+référence à une LIGNE/Chouette («&nbsp;Ligne&nbsp;») à travers
+«&nbsp;lineIdShortCut&nbsp;», qui est à caractère optionnel, il
+convient de vérifier que cette référence correspond à l'identifiant
+«&nbsp;objectId&nbsp;» d’une LIGNE /Chouette («&nbsp;Ligne&nbsp;»)
+définie.</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>Exemple: </u></b></font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Représentation schématique de l’objet JourneyPattern</font></font></font></p>
+<p><font face="Arial, sans-serif"><img src="image008.jpg" height="483" width="487"></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>Exemple: </u></b></font></font></font></p>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">...<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;Line&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;objectId&gt;AMIV:Line:014014012&lt;/objectId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;objectVersion&gt;1&lt;/objectVersion&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">...<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;JourneyPattern&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;objectId&gt;AMIV:JourneyPattern:489111M74&lt;/objectId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;routeId&gt;AMIV:Route:489111&lt;/routeId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;stopPointList&gt;AMIV:StopPoint:489111A0A237832&lt;/stopPointList&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;stopPointList&gt;AMIV:StopPoint:489111A1A237807&lt;/stopPointList&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;stopPointList&gt;AMIV:StopPoint:489111A2A237806&lt;/stopPointList&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;stopPointList&gt;AMIV:StopPoint:489111A3A237805&lt;/stopPointList&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;stopPointList&gt;AMIV:StopPoint:489111A4A237804&lt;/stopPointList&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;stopPointList&gt;AMIV:StopPoint:489111A5A237803&lt;/stopPointList&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;stopPointList&gt;AMIV:StopPoint:489111A6A237832&lt;/stopPointList&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;lineIdShortcut&gt;AMIV:Line:014014012&lt;/lineIdShortcut&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;/JourneyPattern&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">...<br></font></span>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>N° test:</u></b>
+2.16.1</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Libellé:</u> Vérification de la correcte référence à une une
+LIGNE/Chouette («&nbsp;Ligne&nbsp;») pour une MISSION COMMERCIALE
+(«&nbsp;JourneyPattern&nbsp;»).</font></font></font></p>
-<div class=WordSection1>
-</span></b>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Champ d’application:</u>
+&lt;JourneyPattern&gt;&nbsp;&lt;Line&gt;</font></font></font></p>
-<p class=MsoTitle><span style='font-size:14.0pt;font-family:"Tahoma","sans-serif"'>Fiche
-du point de contr&ocirc;le N&deg; 2.16</span></p>
-<p class=MsoNormal>&nbsp;</p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Vérification:</u>&nbsp;</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si l’objet de mission commerciale existe, poursuivre le test, sinon abandonner le test</font></font></font></p>
-<table class=MsoNormalTable border=0 cellspacing=0 cellpadding=0 width=648
- style='width:485.95pt;margin-left:-.5pt;border-collapse:collapse'>
- <tr style='height:37.4pt'>
- <td width=108 colspan=2 valign=top style='width:81.35pt;border:solid black 1.0pt;
- padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center;text-indent:0cm;layout-grid-mode:char'><i><span
- style='font-family:"Tahoma","sans-serif";color:navy'>Description</span></i></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 11.35pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Intitul&eacute;</span></h1>
- </td>
- <td width=548 style='width:411.1pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt;layout-grid-mode:char'><span
- style='font-size:11.0pt;line-height:200%;font-family:"Tahoma","sans-serif"'>R&eacute;f&eacute;rence
- &agrave; une ligne des missions commerciales.</span></p>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 11.35pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Objectif</span></h1>
- </td>
- <td width=548 style='width:411.1pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>V&eacute;rification
- de la correcte r&eacute;f&eacute;rence &agrave; une LIGNE/Chouette (&laquo;&nbsp;Ligne&nbsp;&raquo;) pour une
- MISSION COMMERCIALE (&laquo;&nbsp;JourneyPattern&nbsp;&raquo;).</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 11.35pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>R&eacute;f&eacute;rences</span></h1>
- </td>
- <td width=548 style='width:411.1pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>TRIDENT/profil
- CHOUETTE/Transmodel V4 et V5.1</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 11.35pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:-6.9pt;margin-bottom:
- 6.0pt;margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>N&deg; de fiche(s)
- connexe(s)</span></h1>
- </td>
- <td width=548 style='width:411.1pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-left:0cm;text-align:left;text-indent:0cm;
- layout-grid-mode:char'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>&nbsp;</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 11.35pt 0cm 3.5pt;
- height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt;layout-grid-mode:char'><b><span
- style='font-family:"Tahoma","sans-serif"'>Priorit&eacute;<span style='color:red'> </span></span></b></p>
- </td>
- <td width=548 style='width:411.1pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Obligatoire
- (si l&rsquo;objet &laquo;&nbsp;JourneyPattern&nbsp;&raquo; existe et s&rsquo;il contient l&rsquo;objet
- &laquo;&nbsp;lineIdShortCut&nbsp;&raquo;)</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 11.35pt 0cm 3.5pt;
- height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt;layout-grid-mode:char'><b><span
- style='font-family:"Tahoma","sans-serif"'>R&eacute;sultat</span></b></p>
- </td>
- <td width=548 style='width:411.1pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Conforme
- ou non conforme</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 colspan=2 valign=top style='width:81.35pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center;text-indent:0cm;layout-grid-mode:char'><i><span
- style='font-family:"Tahoma","sans-serif";color:navy'>Mise en &oelig;uvre</span></i></h1>
- </td>
- </tr>
- <tr>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 11.35pt 0cm 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Explication</span></h1>
- </td>
- <td width=548 style='width:411.1pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 11.35pt 0cm 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:11.35pt;margin-bottom:
- 6.0pt;margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Lorsque
- l&rsquo;objet MISSION COMMERCIALE (&laquo;&nbsp;JourneyPattern&nbsp;&raquo;) fait r&eacute;f&eacute;rence &agrave;
- une LIGNE/Chouette (&laquo;&nbsp;Ligne&nbsp;&raquo;) &agrave; travers
- &laquo;&nbsp;lineIdShortCut&nbsp;&raquo;, qui est &agrave; caract&egrave;re optionnel, il convient de
- v&eacute;rifier que cette r&eacute;f&eacute;rence correspond &agrave; l'identifiant
- &laquo;&nbsp;objectId&nbsp;&raquo; d&rsquo;une LIGNE /Chouette (&laquo;&nbsp;Ligne&nbsp;&raquo;) d&eacute;finie.</span></h1>
- </td>
- </tr>
-</table>
-<p class=MsoNormal>&nbsp;</p>
-
-<table class=MsoNormalTable border=0 cellspacing=0 cellpadding=0 width=648
- style='width:485.95pt;margin-left:-.5pt;border-collapse:collapse'>
- <tr>
- <td width=108 valign=top style='width:81.35pt;border:solid black 1.0pt;
- border-right:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm;layout-grid-mode:char'><b><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>Exemple</span></b></p>
- </td>
- <td width=548 valign=top style='width:411.1pt;border:solid black 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=left style='margin-left:18.0pt;text-align:left;text-indent:0cm;
- layout-grid-mode:char'><span style='font-size:11.0pt;font-weight:normal'>&nbsp;</span></h1>
- <h1 align=left style='margin-left:18.0pt;text-align:left;text-indent:0cm'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Repr&eacute;sentation
- sch&eacute;matique de l&rsquo;objet JourneyPattern</span></h1>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal align=center style='text-align:center'><img width=487
- height=483 src="BATERI_Neptune_FINAL-V2_0a_fichiers/image008.jpg"></p>
- <p class=MsoNormal><span lang=EN-US> </span></p>
- <h3 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm'><span lang=EN-US style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>Exemple </span></h3>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>...</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;Line&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;objectId&gt;AMIV:Line:014014012&lt;/objectId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;objectVersion&gt;1&lt;/objectVersion&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>...</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;JourneyPattern&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;objectId&gt;AMIV:JourneyPattern:489111M74&lt;/objectId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;routeId&gt;AMIV:Route:489111&lt;/routeId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;stopPointList&gt;AMIV:StopPoint:489111A0A237832&lt;/stopPointList&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;stopPointList&gt;AMIV:StopPoint:489111A1A237807&lt;/stopPointList&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;stopPointList&gt;AMIV:StopPoint:489111A2A237806&lt;/stopPointList&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;stopPointList&gt;AMIV:StopPoint:489111A3A237805&lt;/stopPointList&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;stopPointList&gt;AMIV:StopPoint:489111A4A237804&lt;/stopPointList&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;stopPointList&gt;AMIV:StopPoint:489111A5A237803&lt;/stopPointList&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;stopPointList&gt;AMIV:StopPoint:489111A6A237832&lt;/stopPointList&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;lineIdShortcut&gt;AMIV:Line:014014012&lt;/lineIdShortcut&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;/JourneyPattern&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>...</span></p>
- </td>
- </tr>
- <tr style='page-break-inside:avoid'>
- <td width=108 colspan=2 valign=top style='width:81.35pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h2 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center;text-indent:0cm;layout-grid-mode:char'><i><span
- lang=EN-US style='font-size:14.0pt;color:navy'>Evaluation</span></i></h2>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- solid black 1.0pt;border-bottom:solid black 1.0pt;border-right:none;
- padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm;layout-grid-mode:char'><span lang=EN-US style='font-size:
- 11.0pt'>N&deg; test</span></h1>
- </td>
- <td width=548 valign=top style='width:411.1pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm;layout-grid-mode:char'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'>2.16.1</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- solid black 1.0pt;border-bottom:solid black 1.0pt;border-right:none;
- padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm;layout-grid-mode:char'><span style='font-size:11.0pt'>Libell&eacute;</span></h1>
- </td>
- <td width=548 valign=top style='width:411.1pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm;layout-grid-mode:char'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'>V&eacute;rification de la
- correcte r&eacute;f&eacute;rence &agrave; une une LIGNE/Chouette (&laquo;&nbsp;Ligne&nbsp;&raquo;) pour une
- MISSION COMMERCIALE (&laquo;&nbsp;JourneyPattern&nbsp;&raquo;).</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- solid black 1.0pt;border-bottom:solid black 1.0pt;border-right:none;
- padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:-6.9pt;margin-bottom:6.0pt;
- margin-left:0cm;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Champ
- d&rsquo;application</span></h1>
- </td>
- <td width=548 valign=top style='width:411.1pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm;layout-grid-mode:char'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'>&lt;JourneyPattern&gt;</span></h1>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm;text-align:justify;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>&lt;Line&gt;</span></p>
- <p class=MsoNormal style='text-align:justify;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>&nbsp;</span></p>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- solid black 1.0pt;border-bottom:solid black 1.0pt;border-right:none;
- padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm;layout-grid-mode:char'><span style='font-size:11.0pt'>V&eacute;rification</span></h1>
- </td>
- <td width=548 valign=top style='width:411.1pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-left:0cm;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>&nbsp;</span></h1>
- <h1 style='margin-left:0cm;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>-
- Si l&rsquo;objet de mission commerciale existe, poursuivre le test, sinon
- abandonner le test</span></h1>
- <h1 style='layout-grid-mode:char'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif";font-weight:normal'>&nbsp;</span></h1>
- <h1 style='margin-left:0cm;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>-
- Si le raccourci de ligne &laquo;&nbsp;lineIdShortCut&nbsp;&raquo;, dans l&rsquo;objet
- &laquo;&nbsp;JourneyPattern&nbsp;&raquo;, poursuivre le test, sinon abandonner le test</span></h1>
- <p class=MsoFooter><span style='font-family:"Tahoma","sans-serif"'>&nbsp;</span></p>
- <p class=MsoBodyText3 align=left style='text-align:left'><span
- style='font-family:"Tahoma","sans-serif"'>- Si l&rsquo;&eacute;l&eacute;ment de raccourci de
- ligne &laquo;&nbsp;lineIdShortCut&nbsp;&raquo;<b> </b>, r&eacute;f&eacute;renc&eacute; dans un objet
- &laquo;&nbsp;JourneyPattern&nbsp;&raquo;, poss&egrave;de un identifiant &laquo;&nbsp;objectId&nbsp;&raquo;
- dans un objet de ligne &laquo;&nbsp;Line&nbsp;&raquo;, alors le test est valid&eacute;, sinon le
- test est invalid&eacute; et produit le message &laquo;&nbsp;test 2.16.1&nbsp;: Un objet
- &laquo;&nbsp;JourneyPattern&nbsp;&raquo; fait r&eacute;f&eacute;rence &agrave; une ligne inexistante.&raquo;</span></p>
- <h1 style='margin-left:0cm;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>&nbsp;</span></h1>
- </td>
- </tr>
-</table>
-
-<p class=MsoNormal>&nbsp;</p>
-
-</div>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si le raccourci de ligne «&nbsp;lineIdShortCut&nbsp;», dans l’objet
+«&nbsp;JourneyPattern&nbsp;», poursuivre le test, sinon abandonner le
+test</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si l’élément de raccourci de ligne «&nbsp;lineIdShortCut&nbsp;»<b> </b>,
+référencé dans un objet «&nbsp;JourneyPattern&nbsp;», possède un
+identifiant «&nbsp;objectId&nbsp;» dans un objet de ligne
+«&nbsp;Line&nbsp;», alors le test est validé, sinon le test est
+invalidé et produit le message «&nbsp;test 2.16.1&nbsp;: Un objet
+«&nbsp;JourneyPattern&nbsp;» fait référence à une ligne inexistante.»</font></font></font></p>
diff --git a/app/views/test_sheet/2_17.html b/app/views/test_sheet/2_17.html
index e7d9eb55d..6a87b1132 100644
--- a/app/views/test_sheet/2_17.html
+++ b/app/views/test_sheet/2_17.html
@@ -1,310 +1,98 @@
-<div class=WordSection1>
-</span>
+<h1 class="western" style="border: 1pt solid rgb(0, 0, 0); padding: 0.05cm 0.12cm; margin-top: 0.21cm;" align="center">
+<font face="Arial, sans-serif"><font style="font-size: 20pt;" size="5"><i>
+ point de contrôle N° 2.17<br>
+Cohérence entre itinéraires et courses<br>
+</i></font></font></h1>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Objectif: </b></u>
+Vérification de la correcte référence à l’Itinéraire/Chouette
+(«&nbsp;ChouetteRoute) pour chaque COURSE COMMERCIALE (« VehicleJourney
+» ).<br>
+</font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Priorité: </b></u> Obligatoire (si l'objet «&nbsp;VehicleJourney&nbsp;» existe)</font></p><font face="Arial, sans-serif">
+</font><p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><u><b>Explications:</b></u>
+</font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Lorsqu’une COURSE COMMERCIALE (« VehicleJourney » ) fait référence à un
+Itinéraire/Chouette («&nbsp;ChouetteRoute&nbsp;») il convient de
+vérifier que l'identifiant d'itinéraire «&nbsp;routeId&nbsp;», qui est
+à caractère obligatoire dans la course, correspond à l'identifiant
+«&nbsp;objectId&nbsp;» d'un Itinéraire/Chouette
+(«&nbsp;ChouetteRoute&nbsp;»).</font></font></font></p>
-<p class=MsoTitle><span style='font-size:14.0pt;font-family:"Tahoma","sans-serif"'>Fiche
-du point de contr&ocirc;le N&deg; 2.17</span></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>Exemple: </u></b></font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Représentation schématique de l’Objet «&nbsp;VehicleJourney&nbsp;»</font></font></font></p>
+<p><font face="Arial, sans-serif"><img src="image011.jpg" height="618" width="372"></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Exemple d'une course qui référence une «&nbsp;ChouetteRoute&nbsp;»</font></font></font></p>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">...<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;ChouetteRoute&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;objectId&gt;AMIV:Route:488970&lt;/objectId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;name&gt;0140140120542&lt;/name&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">...<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;VehicleJourney&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;objectId&gt;AMIV:VehicleJourney:8970758&lt;/objectId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;routeId&gt;AMIV:Route:488970&lt;/routeId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;journeyPatternId&gt;AMIV:JourneyPattern:488970M1&lt;/journeyPatternId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;lineIdShortcut&gt;AMIV:Line:014014012&lt;/lineIdShortcut&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;operatorId&gt;AMIV:Company:2422&lt;/operatorId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;timeSlotId&gt;AMIV:TimeSlot:0&lt;/timeSlotId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;vehicleJourneyAtStop&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;stopPointId&gt;AMIV:StopPoint:488970A0A237816&lt;/stopPointId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;vehicleJourneyId&gt;AMIV:VehicleJourney:8970758&lt;/vehicleJourneyId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;arrivalTime&gt;05:45:00&lt;/arrivalTime&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;departureTime&gt;05:45:00&lt;/departureTime&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;order&gt;1&lt;/order&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;/vehicleJourneyAtStop&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;vehicleJourneyAtStop&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;stopPointId&gt;AMIV:StopPoint:488970A1A237817&lt;/stopPointId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;vehicleJourneyId&gt;AMIV:VehicleJourney:8970758&lt;/vehicleJourneyId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">...<br></font></span>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>N° test:</u></b>
+2.17.1</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Libellé:</u> Vérification de la correcte référence à
+l’Itinéraire/Chouette («&nbsp;ChouetteRoute) pour chaque COURSE
+COMMERCIALE (« VehicleJourney » ).</font></font></font></p>
-<p class=MsoNormal>&nbsp;</p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2"><span style="text-decoration: underline;">
+Champ d’application:</span> &nbsp;&lt;VehicleJourney&gt;&nbsp;&lt;ChouetteRoute&gt;</font></font></font></p>
-<table class=MsoNormalTable border=0 cellspacing=0 cellpadding=0 width=648
- style='width:485.7pt;margin-left:-.25pt;border-collapse:collapse'>
- <tr style='page-break-inside:avoid'>
- <td width=648 colspan=2 valign=top style='width:485.7pt;border:solid black 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center;text-indent:0cm;layout-grid-mode:char'><i><span
- style='font-family:"Tahoma","sans-serif";color:navy'>Description</span></i></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Intitul&eacute;</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt;layout-grid-mode:char'><span
- style='font-size:11.0pt;line-height:200%;font-family:"Tahoma","sans-serif"'>Coh&eacute;rence
- entre itin&eacute;raires et courses.</span></p>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Objectif</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>V&eacute;rification
- de la correcte r&eacute;f&eacute;rence &agrave; l&rsquo;Itin&eacute;raire/Chouette (&laquo;&nbsp;ChouetteRoute) pour
- chaque COURSE COMMERCIALE (&laquo; VehicleJourney &raquo; ).</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>R&eacute;f&eacute;rences</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>TRIDENT/profil
- CHOUETTE/Transmodel V4 et V5.1</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>N&deg; de fiche(s)
- connexe(s)</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-left:0cm;text-align:left;text-indent:0cm;
- layout-grid-mode:char'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>&nbsp;</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt;layout-grid-mode:char'><b><span
- style='font-family:"Tahoma","sans-serif"'>Priorit&eacute;<span style='color:red'> </span></span></b></p>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Obligatoire
- (si l'objet &laquo;&nbsp;VehicleJourney&nbsp;&raquo; existe)</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt;layout-grid-mode:char'><b><span
- style='font-family:"Tahoma","sans-serif"'>R&eacute;sultat</span></b></p>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Conforme
- ou non conforme</span></h1>
- </td>
- </tr>
- <tr style='page-break-inside:avoid'>
- <td width=648 colspan=2 valign=top style='width:485.7pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center;text-indent:0cm;layout-grid-mode:char'><i><span
- style='font-family:"Tahoma","sans-serif";color:navy'>Mise en &oelig;uvre</span></i></h1>
- </td>
- </tr>
- <tr>
- <td width=100 valign=top style='width:74.85pt;border-top:none;border-left:
- solid black 1.0pt;border-bottom:solid black 1.0pt;border-right:none;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm;layout-grid-mode:char'><span style='font-size:11.0pt'>Explication</span></h1>
- </td>
- <td width=548 valign=top style='width:410.85pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:11.35pt;margin-bottom:6.0pt;
- margin-left:0cm;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Lorsqu&rsquo;une
- COURSE COMMERCIALE (&laquo; VehicleJourney &raquo; ) fait r&eacute;f&eacute;rence &agrave; un
- Itin&eacute;raire/Chouette (&laquo;&nbsp;ChouetteRoute&nbsp;&raquo;) il convient de v&eacute;rifier que
- l'identifiant d'itin&eacute;raire &laquo;&nbsp;routeId&nbsp;&raquo;, qui est &agrave; caract&egrave;re
- obligatoire dans la course, correspond &agrave; l'identifiant &laquo;&nbsp;objectId&nbsp;&raquo;
- d'un Itin&eacute;raire/Chouette (&laquo;&nbsp;ChouetteRoute&nbsp;&raquo;).</span></h1>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>&nbsp;</span></p>
- </td>
- </tr>
-</table>
-<p class=MsoNormal>&nbsp;</p>
-<table class=MsoNormalTable border=0 cellspacing=0 cellpadding=0 width=648
- style='width:485.7pt;margin-left:-.25pt;border-collapse:collapse'>
- <tr>
- <td width=108 valign=top style='width:81.35pt;border:solid black 1.0pt;
- border-right:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm;layout-grid-mode:char'><b><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>Exemple</span></b></p>
- </td>
- <td width=548 valign=top style='width:410.85pt;border:solid black 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=left style='margin-left:18.0pt;text-align:left;text-indent:0cm;
- layout-grid-mode:char'><span style='font-size:11.0pt;font-weight:normal'>&nbsp;</span></h1>
- <h1 align=left style='margin-left:18.0pt;text-align:left;text-indent:0cm'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Repr&eacute;sentation
- sch&eacute;matique de l&rsquo;Objet &laquo;&nbsp;VehicleJourney&nbsp;&raquo; </span></h1>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal align=center style='text-align:center'><img width=372
- height=618 src="BATERI_Neptune_FINAL-V2_0a_fichiers/image011.jpg"></p>
- <p class=MsoNormal>&nbsp;</p>
- <h3 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm'>&nbsp;</h3>
- <h3 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm'>&nbsp;</h3>
- <h3 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm'>&nbsp;</h3>
- <h3 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm'>&nbsp;</h3>
- <h3 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm'>&nbsp;</h3>
- <h3 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm'>&nbsp;</h3>
- <h3 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm'>&nbsp;</h3>
- <h3 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Exemple
- d'une course qui r&eacute;f&eacute;rence une &laquo;&nbsp;ChouetteRoute&nbsp;&raquo;</span></h3>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>...</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;ChouetteRoute&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;objectId&gt;AMIV:Route:488970&lt;/objectId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;name&gt;0140140120542&lt;/name&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>...</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;VehicleJourney&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;objectId&gt;AMIV:VehicleJourney:8970758&lt;/objectId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;routeId&gt;AMIV:Route:488970&lt;/routeId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;journeyPatternId&gt;AMIV:JourneyPattern:488970M1&lt;/journeyPatternId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;lineIdShortcut&gt;AMIV:Line:014014012&lt;/lineIdShortcut&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;operatorId&gt;AMIV:Company:2422&lt;/operatorId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;timeSlotId&gt;AMIV:TimeSlot:0&lt;/timeSlotId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;vehicleJourneyAtStop&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;stopPointId&gt;AMIV:StopPoint:488970A0A237816&lt;/stopPointId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;vehicleJourneyId&gt;AMIV:VehicleJourney:8970758&lt;/vehicleJourneyId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;arrivalTime&gt;05:45:00&lt;/arrivalTime&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;departureTime&gt;05:45:00&lt;/departureTime&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;order&gt;1&lt;/order&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;/vehicleJourneyAtStop&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;vehicleJourneyAtStop&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;stopPointId&gt;AMIV:StopPoint:488970A1A237817&lt;/stopPointId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;vehicleJourneyId&gt;AMIV:VehicleJourney:8970758&lt;/vehicleJourneyId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>...</span></p>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 colspan=2 valign=top style='width:81.35pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h2 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center;text-indent:0cm;layout-grid-mode:char'><i><span
- lang=EN-US style='font-size:14.0pt;color:navy'>Evaluation</span></i></h2>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm'><span lang=EN-US style='font-size:11.0pt'>N&deg; test</span></h1>
- </td>
- <td width=547 style='width:410.6pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-left:0cm;text-align:left;text-indent:0cm'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>2.17.1</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm'><span style='font-size:11.0pt'>Libell&eacute;</span></h1>
- </td>
- <td width=547 style='width:410.6pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-left:0cm;text-align:left;text-indent:0cm'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>V&eacute;rification
- de la correcte r&eacute;f&eacute;rence &agrave; l&rsquo;Itin&eacute;raire/Chouette (&laquo;&nbsp;ChouetteRoute) pour
- chaque COURSE COMMERCIALE (&laquo; VehicleJourney &raquo; ).</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm'><span style='font-size:11.0pt'>Champs d&rsquo;application</span></h1>
- </td>
- <td width=547 valign=top style='width:410.6pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&lt;VehicleJourney&gt;</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&lt;ChouetteRoute&gt;</span></p>
- <p class=MsoNormal><span style='font-family:"Tahoma","sans-serif"'>&nbsp;</span></p>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm'><span style='font-size:11.0pt'>V&eacute;rification</span></h1>
- </td>
- <td width=547 valign=top style='width:410.6pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-left:0cm;text-indent:0cm'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'>&nbsp;</span></h1>
- <p class=MsoBodyText>- Si l&rsquo;objet &laquo;&nbsp;VehicleJourney&nbsp;&raquo; mentionn&eacute; dans
- les champs d&rsquo;application est pr&eacute;sent une ou plusieurs fois, poursuivre le
- test, sinon le test est abandonn&eacute;.</p>
- <p class=MsoNormal style='text-align:justify'><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal style='text-align:justify'><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'>- Si chaque &eacute;l&eacute;ment &laquo;&nbsp;RouteId&nbsp;&raquo;
- est associ&eacute; &agrave; un objet &laquo;&nbsp;ChouetteRoute&nbsp;&raquo;, le test est valid&eacute;, sinon
- le test est invalid&eacute; et fournit le message&nbsp;: &laquo;&nbsp;test 2.17.1&nbsp;:
- la course XX fait r&eacute;f&eacute;rence &agrave; un itin&eacute;raire inexistant&nbsp;&raquo;.</span></p>
- <p class=MsoNormal><span style='font-family:"Tahoma","sans-serif"'>&nbsp;</span></p>
- </td>
- </tr>
-</table>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Vérification:</u></font></font></font></p>
-<h1 style='margin-left:0cm;text-indent:0cm'><i><span style='font-size:11.0pt'>&nbsp;</span></i></h1>
-</div>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">-
+Si l’objet « VehicleJourney » mentionné dans les champs d’application
+est présent une ou plusieurs fois, poursuivre le test, sinon le test
+est abandonné.</font></font></font></p><p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">- Si chaque élément «&nbsp;RouteId&nbsp;» est associé à un objet
+«&nbsp;ChouetteRoute&nbsp;», le test est validé, sinon le test est
+invalidé et fournit le message&nbsp;: «&nbsp;test 2.17.1&nbsp;: la
+course XX fait référence à un itinéraire inexistant&nbsp;»</font></font></font></p>
diff --git a/app/views/test_sheet/2_18.html b/app/views/test_sheet/2_18.html
index 4bab93f36..f6bfa04eb 100644
--- a/app/views/test_sheet/2_18.html
+++ b/app/views/test_sheet/2_18.html
@@ -1,549 +1,160 @@
-<div class=WordSection1>
-</span>
+<h1 class="western" style="border: 1pt solid rgb(0, 0, 0); padding: 0.05cm 0.12cm; margin-top: 0.21cm;" align="center">
+<font face="Arial, sans-serif"><font style="font-size: 20pt;" size="5"><i>
+ point de contrôle N° 2.18<br>
+Cohérence entre missions commerciales et&nbsp;courses<br>
+</i></font></font></h1>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Objectif: </b></u>
+Vérification de l’existence d’une MISSION COMMERCIALE
+(«&nbsp;JourneyPattern&nbsp;«&nbsp;) pour chaque COURSE COMMERCIALE
+(«&nbsp;VehicleJourney&nbsp;»).<br>
+Vérification de la cohérence de points entre MISSION COMMERCIALE
+(«&nbsp;JourneyPattern&nbsp;«&nbsp;) et COURSE COMMERCIALE
+(«&nbsp;VehicleJourney&nbsp;»).<br>
+</font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Priorité: </b></u> Obligatoire (si l'objet «&nbsp;VehicleJourney&nbsp;» existe et contient l'élément «&nbsp;journeyPatternId&nbsp;»)</font></p><font face="Arial, sans-serif">
+</font><p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><u><b>Explications:</b></u>
+</font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Lorsqu’une COURSE COMMERCIALE (« VehicleJourney » ) est définie, il
+convient de vérifier que si l’élément «&nbsp;journeyPatternId&nbsp;» de
+MISSION COMMERCIALE («&nbsp;JourneyPattern&nbsp;») , qui est à
+caractère optionnel dans la course, existe (c’est-à-dire si on fait
+référence à une MISSION COMMERCIALE) alors il doit correspondre à une
+MISSION COMMERCIALE («&nbsp;JourneyPattern&nbsp;») définie .</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Par ailleurs, les points d’une COURSE COMMERCIALE (« VehicleJourney »)
+doivent appartenir à la MISSION COMMERCIALE
+(«&nbsp;JourneyPattern&nbsp;») à laquelle la COURSE COMMERCIALE («
+VehicleJourney ») est associée.</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>Exemple: </u></b></font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Représentation schématique de l’objet «&nbsp;VehicleJourney&nbsp;»</font></font></font></p>
+<p><font face="Arial, sans-serif"><img src="image011.jpg" height="618" width="372"></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+&nbsp;</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Exemple d'une course qui référence une mission</font></font></font></p>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">...<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;VehicleJourney&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;objectId&gt;AMIV:VehicleJourney:8970758&lt;/objectId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;routeId&gt;AMIV:Route:488970&lt;/routeId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;journeyPatternId&gt;AMIV:JourneyPattern:488970M1&lt;/journeyPatternId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;lineIdShortcut&gt;AMIV:Line:014014012&lt;/lineIdShortcut&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;operatorId&gt;AMIV:Company:2422&lt;/operatorId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;timeSlotId&gt;AMIV:TimeSlot:0&lt;/timeSlotId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;vehicleJourneyAtStop&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;stopPointId&gt;AMIV:StopPoint:488970A0A237816&lt;/stopPointId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;vehicleJourneyId&gt;AMIV:VehicleJourney:8970758&lt;/vehicleJourneyId&gt;
+&lt;arrivalTime&gt;05:45:00&lt;/arrivalTime&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;departureTime&gt;05:45:00&lt;/departureTime&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;order&gt;1&lt;/order&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;/vehicleJourneyAtStop&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;vehicleJourneyAtStop&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;stopPointId&gt;AMIV:StopPoint:488970A1A237817&lt;/stopPointId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;vehicleJourneyId&gt;AMIV:VehicleJourney:8970758&lt;/vehicleJourneyId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">...<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;JourneyPattern&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;objectId&gt;AMIV:JourneyPattern:488970M1&lt;/objectId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif"><br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;routeId&gt;AMIV:Route:488970&lt;/routeId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">...</font></span><span style="font-size: 10pt; font-family: &quot;Courier New&quot;;"></span><br><p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">L’objet «&nbsp;JourneyPattern&nbsp;» référence une liste de point d’arrêt et l’identifiant d’un itinéraire&nbsp;:</font></font></font></p>
-<p class=MsoTitle><span style='font-size:14.0pt;font-family:"Tahoma","sans-serif"'>Fiche
-du point de contr&ocirc;le N&deg; 2.18</span></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<img src="image008.jpg" height="483" width="487"></font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<span style="text-decoration: none;">&nbsp;</span></font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Ces mêmes identifiants de points d’arrêt sont référencés dans les
+objets «&nbsp;vehicleJourneyAtStop&nbsp;» dépendant de la course
+«&nbsp;vehicleJourney&nbsp;» qui contient l’identifiant de la mission.</font></font></font></p>
+<p><font face="Arial, sans-serif"><img src="image012.jpg" height="338" width="433"></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>N° test:</u></b>
+2.18.1</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Libellé:</u> Vérification de l’existence d’une MISSION COMMERCIALE
+(«&nbsp;JourneyPattern&nbsp;«&nbsp;) pour chaque COURSE COMMERCIALE
+(«&nbsp;VehicleJourney&nbsp;»).</font></font></font></p>
-<p class=MsoNormal>&nbsp;</p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Champ d’application:</u>
+&lt;VehicleJourney&gt;&nbsp;&lt;JourneyPattern&gt;</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Vérification:</u> </font></font></font></p>
-<table class=MsoNormalTable border=0 cellspacing=0 cellpadding=0 width=657
- style='width:493.05pt;margin-left:-.5pt;border-collapse:collapse'>
- <tr style='page-break-inside:avoid'>
- <td width=657 colspan=2 valign=top style='width:493.05pt;border:solid black 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center;text-indent:0cm;layout-grid-mode:char'><i><span
- style='font-family:"Tahoma","sans-serif";color:navy'>Description</span></i></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 11.35pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Intitul&eacute;</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt;layout-grid-mode:char'><span
- style='font-size:11.0pt;line-height:200%;font-family:"Tahoma","sans-serif"'>Coh&eacute;rence
- entre les missions commerciales et les courses.</span></p>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 11.35pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Objectif</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>V&eacute;rification
- de l&rsquo;existence d&rsquo;une MISSION COMMERCIALE (&laquo;&nbsp;JourneyPattern&nbsp;&laquo;&nbsp;)
- pour chaque COURSE COMMERCIALE (&laquo;&nbsp;VehicleJourney&nbsp;&raquo;).</span></h1>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>V&eacute;rification
- de la coh&eacute;rence de points entre MISSION COMMERCIALE
- (&laquo;&nbsp;JourneyPattern&nbsp;&laquo;&nbsp;) et COURSE COMMERCIALE
- (&laquo;&nbsp;VehicleJourney&nbsp;&raquo;).</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 11.35pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>R&eacute;f&eacute;rences</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>TRIDENT/profil
- CHOUETTE/Transmodel V4 et V5.1</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 11.35pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:-12.5pt;margin-bottom:
- 6.0pt;margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>N&deg; de fiche(s)
- connexe(s)</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-left:0cm;text-align:left;text-indent:0cm;
- layout-grid-mode:char'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>&nbsp;</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 11.35pt 0cm 3.5pt;
- height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt;layout-grid-mode:char'><b><span
- style='font-size:11.0pt;line-height:200%;font-family:"Tahoma","sans-serif"'>Priorit&eacute;<span
- style='color:red'> </span></span></b></p>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Obligatoire
- (si l'objet &laquo;&nbsp;VehicleJourney&nbsp;&raquo; existe et contient l'&eacute;l&eacute;ment
- &laquo;&nbsp;journeyPatternId&nbsp;&raquo;)</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 11.35pt 0cm 3.5pt;
- height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt;layout-grid-mode:char'><b><span
- style='font-size:11.0pt;line-height:200%;font-family:"Tahoma","sans-serif"'>R&eacute;sultat</span></b></p>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Conforme
- ou non conforme</span></h1>
- </td>
- </tr>
- <tr>
- <td width=657 colspan=2 valign=top style='width:493.05pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 11.35pt 0cm 3.5pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center;text-indent:0cm;layout-grid-mode:char'><i><span
- style='font-family:"Tahoma","sans-serif";color:navy'>Mise en &oelig;uvre</span></i></h1>
- </td>
- </tr>
- <tr>
- <td width=100 valign=top style='width:74.85pt;border-top:none;border-left:
- solid black 1.0pt;border-bottom:solid black 1.0pt;border-right:none;
- padding:0cm 11.35pt 0cm 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm;layout-grid-mode:char'><span style='font-size:11.0pt'>Explication</span></h1>
- </td>
- <td width=558 valign=top style='width:418.2pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 11.35pt 0cm 3.5pt'>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>Lorsqu&rsquo;une
- COURSE COMMERCIALE (&laquo; VehicleJourney &raquo; ) est d&eacute;finie, il convient de
- v&eacute;rifier que si l&rsquo;&eacute;l&eacute;ment &laquo;&nbsp;journeyPatternId&nbsp;&raquo; de MISSION
- COMMERCIALE (&laquo;&nbsp;JourneyPattern&nbsp;&raquo;) , qui est &agrave; caract&egrave;re optionnel
- dans la course, existe (c&rsquo;est-&agrave;-dire si on fait r&eacute;f&eacute;rence &agrave; une MISSION
- COMMERCIALE) alors il doit correspondre &agrave; une MISSION COMMERCIALE
- (&laquo;&nbsp;JourneyPattern&nbsp;&raquo;) d&eacute;finie .</span></p>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Par
- ailleurs, les points d&rsquo;une COURSE COMMERCIALE (&laquo; VehicleJourney &raquo;) doivent
- appartenir &agrave; la MISSION COMMERCIALE (&laquo;&nbsp;JourneyPattern&nbsp;&raquo;) &agrave;
- laquelle la COURSE COMMERCIALE (&laquo; VehicleJourney &raquo;) est associ&eacute;e.</span></h1>
- </td>
- </tr>
-</table>
-<p class=MsoNormal>&nbsp;</p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si l’objet de course «&nbsp;VehicleJourney&nbsp;» existe, poursuivre le test, sinon abandonner le test</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si l’élément «&nbsp;JourneyPatternId&nbsp;» existe dans l’objet de
+course «&nbsp;VehicleJourney&nbsp;», poursuivre le test, sinon
+abandonner le test</font></font></font></p>
-<table class=MsoNormalTable border=0 cellspacing=0 cellpadding=0 width=657
- style='width:493.05pt;margin-left:-.5pt;border-collapse:collapse'>
- <tr>
- <td width=108 colspan=2 valign=top style='width:81.35pt;border:solid black 1.0pt;
- border-right:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm;layout-grid-mode:char'><b><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>Exemple</span></b></p>
- </td>
- <td width=558 valign=top style='width:418.15pt;border:solid black 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=left style='margin-left:18.0pt;text-align:left;text-indent:0cm;
- layout-grid-mode:char'><span style='font-size:11.0pt;font-weight:normal'>&nbsp;</span></h1>
- <h1 align=left style='margin-left:18.0pt;text-align:left;text-indent:0cm'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Repr&eacute;sentation
- sch&eacute;matique de l&rsquo;objet &laquo;&nbsp;VehicleJourney&nbsp;&raquo;</span></h1>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal> </p>
- <p class=MsoNormal align=center style='text-align:center'><img width=372
- height=618 src="BATERI_Neptune_FINAL-V2_0a_fichiers/image011.jpg"></p>
- <h1 align=left style='margin-left:18.0pt;text-align:left;text-indent:0cm'><span
- style='font-size:11.0pt;font-weight:normal'>&nbsp;</span></h1>
- <h1 align=left style='text-align:left'><span style='font-size:11.0pt;
- font-weight:normal'>&nbsp;</span></h1>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal style='margin-left:18.0pt;text-indent:-18.0pt'><span
- style='font-size:11.0pt'>&nbsp;</span></p>
- <h3 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Exemple
- d'une course qui r&eacute;f&eacute;rence une mission</span></h3>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>...</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;VehicleJourney&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>
- &lt;objectId&gt;AMIV:VehicleJourney:8970758&lt;/objectId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>
- &lt;routeId&gt;AMIV:Route:488970&lt;/routeId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>
- &lt;journeyPatternId&gt;AMIV:JourneyPattern:488970M1&lt;/journeyPatternId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;lineIdShortcut&gt;AMIV:Line:014014012&lt;/lineIdShortcut&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>
- &lt;operatorId&gt;AMIV:Company:2422&lt;/operatorId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>
- &lt;timeSlotId&gt;AMIV:TimeSlot:0&lt;/timeSlotId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>
- &lt;vehicleJourneyAtStop&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>
- &lt;stopPointId&gt;AMIV:StopPoint:488970A0A237816&lt;/stopPointId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>
- &lt;vehicleJourneyId&gt;AMIV:VehicleJourney:8970758&lt;/vehicleJourneyId&gt; &lt;arrivalTime&gt;05:45:00&lt;/arrivalTime&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;departureTime&gt;05:45:00&lt;/departureTime&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;order&gt;1&lt;/order&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>
- &lt;/vehicleJourneyAtStop&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>
- &lt;vehicleJourneyAtStop&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>
- &lt;stopPointId&gt;AMIV:StopPoint:488970A1A237817&lt;/stopPointId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;vehicleJourneyId&gt;AMIV:VehicleJourney:8970758&lt;/vehicleJourneyId&gt;</span></p>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><span lang=EN-US style='font-size:10.0pt;font-family:
- "Courier New"'>...</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;JourneyPattern&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;objectId&gt;AMIV:JourneyPattern:488970M1&lt;/objectId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> </span><span
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;routeId&gt;AMIV:Route:488970&lt;/routeId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span
- style='font-size:10.0pt;font-family:"Courier New"'>...</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span
- style='font-size:10.0pt;font-family:"Courier New"'>&nbsp;</span></p>
- <p class=MsoNormal><u><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'><span
- style='text-decoration:none'>&nbsp;</span></span></u></p>
- <p class=MsoNormal><u><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'><span
- style='text-decoration:none'>&nbsp;</span></span></u></p>
- <p class=MsoNormal><u><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'><span
- style='text-decoration:none'>&nbsp;</span></span></u></p>
- <p class=MsoNormal><u><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'><span
- style='text-decoration:none'>&nbsp;</span></span></u></p>
- <p class=MsoNormal><u><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'><span
- style='text-decoration:none'>&nbsp;</span></span></u></p>
- <p class=MsoNormal><u><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'><span
- style='text-decoration:none'>&nbsp;</span></span></u></p>
- <p class=MsoNormal><u><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'><span
- style='text-decoration:none'>&nbsp;</span></span></u></p>
- <p class=MsoNormal><u><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'><span
- style='text-decoration:none'>&nbsp;</span></span></u></p>
- <p class=MsoNormal><u><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'><span
- style='text-decoration:none'>&nbsp;</span></span></u></p>
- <p class=MsoNormal><u><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'><span
- style='text-decoration:none'>&nbsp;</span></span></u></p>
- <p class=MsoNormal><u><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'><span
- style='text-decoration:none'>&nbsp;</span></span></u></p>
- <p class=MsoNormal><u><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'><span
- style='text-decoration:none'>&nbsp;</span></span></u></p>
- <p class=MsoNormal><u><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'><span
- style='text-decoration:none'>&nbsp;</span></span></u></p>
- <p class=MsoNormal><u><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'><span
- style='text-decoration:none'>&nbsp;</span></span></u></p>
- <p class=MsoNormal><u><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'><span
- style='text-decoration:none'>&nbsp;</span></span></u></p>
- <p class=MsoNormal><u><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'><span
- style='text-decoration:none'>&nbsp;</span></span></u></p>
- <p class=MsoNormal><u><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'><span
- style='text-decoration:none'>&nbsp;</span></span></u></p>
- <p class=MsoNormal><u><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'><span
- style='text-decoration:none'>&nbsp;</span></span></u></p>
- <p class=MsoNormal><u><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'><span
- style='text-decoration:none'>&nbsp;</span></span></u></p>
- <p class=MsoNormal><u><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'><span
- style='text-decoration:none'>&nbsp;</span></span></u></p>
- <p class=MsoNormal><u><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'><span
- style='text-decoration:none'>&nbsp;</span></span></u></p>
- <p class=MsoNormal><u><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'><span
- style='text-decoration:none'>&nbsp;</span></span></u></p>
- <p class=MsoNormal><u><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'><span
- style='text-decoration:none'>&nbsp;</span></span></u></p>
- <p class=MsoNormal><u><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'><span
- style='text-decoration:none'>&nbsp;</span></span></u></p>
- <p class=MsoNormal><u><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'><span
- style='text-decoration:none'>&nbsp;</span></span></u></p>
- <p class=MsoNormal><u><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'><span
- style='text-decoration:none'>&nbsp;</span></span></u></p>
- <p class=MsoNormal><u><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'><span
- style='text-decoration:none'>&nbsp;</span></span></u></p>
- <p class=MsoNormal><u><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'><span
- style='text-decoration:none'>&nbsp;</span></span></u></p>
- <p class=MsoNormal><u><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'><span
- style='text-decoration:none'>&nbsp;</span></span></u></p>
- <p class=MsoNormal><u><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'><span
- style='text-decoration:none'>&nbsp;</span></span></u></p>
- <p class=MsoNormal><u><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>L&rsquo;objet
- &laquo;&nbsp;JourneyPattern&nbsp;&raquo; r&eacute;f&eacute;rence une liste de point d&rsquo;arr&ecirc;t et
- l&rsquo;identifiant d&rsquo;un itin&eacute;raire&nbsp;:</span></u></p>
- <p class=MsoNormal><u><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'><span
- style='text-decoration:none'>&nbsp;</span></span></u></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span
- style='font-size:11.0pt;font-family:"Arial","sans-serif"'><img width=487
- height=483 src="BATERI_Neptune_FINAL-V2_0a_fichiers/image008.jpg"></span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><u><span
- style='font-size:11.0pt;font-family:"Arial","sans-serif"'><span
- style='text-decoration:none'>&nbsp;</span></span></u></p>
- <p class=MsoBodyText3>&nbsp;</p>
- <p class=MsoBodyText3>&nbsp;</p>
- <p class=MsoBodyText3>&nbsp;</p>
- <p class=MsoBodyText3>&nbsp;</p>
- <p class=MsoBodyText3>&nbsp;</p>
- <p class=MsoBodyText3>&nbsp;</p>
- <p class=MsoBodyText3>&nbsp;</p>
- <p class=MsoBodyText3>&nbsp;</p>
- <p class=MsoBodyText3>&nbsp;</p>
- <p class=MsoBodyText3>&nbsp;</p>
- <p class=MsoBodyText3>&nbsp;</p>
- <p class=MsoBodyText3>&nbsp;</p>
- <p class=MsoBodyText3>&nbsp;</p>
- <p class=MsoBodyText3>&nbsp;</p>
- <p class=MsoBodyText3>&nbsp;</p>
- <p class=MsoBodyText3>&nbsp;</p>
- <p class=MsoBodyText3>&nbsp;</p>
- <p class=MsoBodyText3>&nbsp;</p>
- <p class=MsoBodyText3>&nbsp;</p>
- <p class=MsoBodyText3>&nbsp;</p>
- <p class=MsoBodyText3>&nbsp;</p>
- <p class=MsoBodyText3>&nbsp;</p>
- <p class=MsoBodyText3 align=left style='text-align:left'><span
- style='font-family:"Tahoma","sans-serif"'>Ces m&ecirc;mes identifiants de points
- d&rsquo;arr&ecirc;t sont r&eacute;f&eacute;renc&eacute;s dans les objets &laquo;&nbsp;vehicleJourneyAtStop&nbsp;&raquo;
- d&eacute;pendant de la course &laquo;&nbsp;vehicleJourney&nbsp;&raquo; qui contient
- l&rsquo;identifiant de la mission.</span></p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><img width=433
- height=338 src="BATERI_Neptune_FINAL-V2_0a_fichiers/image012.jpg"></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:Monospace;color:teal'>&nbsp;</span></p>
- </td>
- </tr>
- <tr style='page-break-inside:avoid'>
- <td width=657 colspan=3 valign=top style='width:493.05pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h2 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center;text-indent:0cm;layout-grid-mode:char'><i><span
- lang=EN-US style='font-size:14.0pt;color:navy'>Evaluation</span></i></h2>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 colspan=2 valign=top style='width:81.35pt;border-top:none;
- border-left:solid black 1.0pt;border-bottom:solid black 1.0pt;border-right:
- none;padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm;layout-grid-mode:char'><span lang=EN-US style='font-size:
- 11.0pt'>N&deg; test</span></h1>
- </td>
- <td width=108 valign=top style='width:81.35pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm;layout-grid-mode:char'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'>2.18.1</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 colspan=2 valign=top style='width:81.35pt;border-top:none;
- border-left:solid black 1.0pt;border-bottom:solid black 1.0pt;border-right:
- none;padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm;layout-grid-mode:char'><span style='font-size:11.0pt'>Libell&eacute;</span></h1>
- </td>
- <td width=108 valign=top style='width:81.35pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm;layout-grid-mode:char'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'>V&eacute;rification de
- l&rsquo;existence d&rsquo;une MISSION COMMERCIALE (&laquo;&nbsp;JourneyPattern&nbsp;&laquo;&nbsp;)
- pour chaque COURSE COMMERCIALE (&laquo;&nbsp;VehicleJourney&nbsp;&raquo;).</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 colspan=2 valign=top style='width:81.35pt;border-top:none;
- border-left:solid black 1.0pt;border-bottom:solid black 1.0pt;border-right:
- none;padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:-15.5pt;margin-bottom:6.0pt;
- margin-left:0cm;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Champ
- d&rsquo;application</span></h1>
- </td>
- <td width=108 valign=top style='width:81.35pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm;layout-grid-mode:char'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'>&lt;VehicleJourney&gt;</span></h1>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm;text-align:justify;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>&lt;JourneyPattern&gt;</span></p>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 colspan=2 valign=top style='width:81.35pt;border-top:none;
- border-left:solid black 1.0pt;border-bottom:solid black 1.0pt;border-right:
- none;padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm;layout-grid-mode:char'><span style='font-size:11.0pt'>V&eacute;rification</span></h1>
- </td>
- <td width=108 valign=top style='width:81.35pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-left:0cm;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>&nbsp;</span></h1>
- <h1 style='margin-left:0cm;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>-
- Si l&rsquo;objet de course &laquo;&nbsp;VehicleJourney&nbsp;&raquo; existe, poursuivre le test,
- sinon abandonner le test</span></h1>
- <p class=MsoNormal><span style='font-family:"Tahoma","sans-serif"'>&nbsp;</span></p>
- <h1 style='margin-left:0cm;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>-
- Si l&rsquo;&eacute;l&eacute;ment &laquo;&nbsp;JourneyPatternId&nbsp;&raquo; existe dans l&rsquo;objet de course
- &laquo;&nbsp;VehicleJourney&nbsp;&raquo;, poursuivre le test, sinon abandonner le test</span></h1>
- <p class=MsoNormal><span style='font-family:"Tahoma","sans-serif"'>&nbsp;</span></p>
- <p class=MsoBodyText3 align=left style='text-align:left'><span
- style='font-family:"Tahoma","sans-serif"'>- Si un &eacute;l&eacute;ment
- &laquo;&nbsp;JourneyPatternId&nbsp;&raquo;<b> </b>, r&eacute;f&eacute;renc&eacute; dans un objet de course
- &laquo;&nbsp;VehicleJourney&nbsp;&raquo;, poss&egrave;de un identifiant &laquo;&nbsp;objectId&nbsp;&raquo;
- dans un objet &laquo;&nbsp;JourneyPattern&nbsp;&raquo;, alors le test est valid&eacute;, sinon
- le test est invalid&eacute; et produit le message &laquo;&nbsp;test 2.18.1&nbsp;: la
- course XX fait r&eacute;f&eacute;rence &agrave; une mission commerciale inexistante&nbsp;&raquo;</span></p>
- <h1 style='margin-left:0cm;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>&nbsp;</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td style='border:none;padding:0cm 0cm 0cm 0cm' width=1><p class='MsoNormal'>&nbsp;</td>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm'><span lang=EN-US style='font-size:11.0pt'>N&deg; test</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoNormal><span lang=EN-US style='font-size:11.0pt;font-family:"Arial","sans-serif"'>Test
- 2.18.2</span></p>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td style='border:none;padding:0cm 0cm 0cm 0cm' width=1><p class='MsoNormal'>&nbsp;</td>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm'><span style='font-size:11.0pt'>Libell&eacute;</span></h1>
- </td>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>V&eacute;rification
- de la coh&eacute;rence de points entre MISSION COMMERCIALE
- (&laquo;&nbsp;JourneyPattern&nbsp;&laquo;&nbsp;) et COURSE COMMERCIALE
- (&laquo;&nbsp;VehicleJourney&nbsp;&raquo;).</span></p>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td style='border:none;padding:0cm 0cm 0cm 0cm' width=1><p class='MsoNormal'>&nbsp;</td>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:-15.5pt;margin-bottom:6.0pt;
- margin-left:0cm;text-indent:0cm'><span lang=EN-US style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>Champ d&rsquo;application</span></h1>
- </td>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><span lang=EN-US style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>&lt;StopPoint&gt;</span></p>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><span lang=EN-US style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>&lt;JourneyPattern&gt;</span></p>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><span lang=EN-US style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>&lt;vehicleJourneyAtStop&gt;</span></p>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><span lang=EN-US style='font-size:11.0pt;font-family:
- "Arial","sans-serif"'>&lt;vehicleJourney&gt;</span></p>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td style='border:none;padding:0cm 0cm 0cm 0cm' width=1><p class='MsoNormal'>&nbsp;</td>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm'><span style='font-size:11.0pt'>V&eacute;rification</span></h1>
- </td>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:5.65pt 11.35pt 5.65pt 3.5pt;height:37.4pt'>
- <p class=MsoNormal><b><span style='font-family:"Tahoma","sans-serif"'>&nbsp;</span></b></p>
- <p class=MsoNormal style='text-align:justify'><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'>- Si &laquo;&nbsp;StopPoint&nbsp;&raquo; mentionn&eacute; dans
- les champs d&rsquo;application est pr&eacute;sent une ou plusieurs fois, poursuivre le
- test, sinon le test est abandonn&eacute;.</span></p>
- <p class=MsoNormal style='text-align:justify'><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal style='text-align:justify'><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'>- Si l&rsquo;identifiant du &laquo; StopPoint &raquo;
- d&eacute;tect&eacute; figure dans la liste des points d&rsquo;arr&ecirc;ts &laquo;&nbsp;stopPointList&nbsp;&raquo;
- de &laquo;&nbsp;JourneyPattern&nbsp;&raquo;, poursuivre le test, sinon le test est
- invalid&eacute; et fournit le message&nbsp;:&nbsp;&raquo; test 2.18.2.1a&nbsp;:
- l&rsquo;identifiant (&laquo; StopPoint &raquo;) d&eacute;tect&eacute; dans un objet &laquo;&nbsp;StopPoint&nbsp;&raquo;
- ne figure pas dans la liste des points d&rsquo;arr&ecirc;ts &laquo;&nbsp;stopPointList&nbsp;&raquo;
- de &laquo;&nbsp;JourneyPattern&nbsp;&raquo;&nbsp;&raquo;.</span></p>
- <p class=MsoNormal style='text-align:justify'><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal style='text-align:justify'><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'>- Si l&rsquo;identifiant du &laquo; StopPoint &raquo;
- figure dans l&rsquo;&eacute;l&eacute;ment &laquo;&nbsp;stopPointId&nbsp;&raquo; d&rsquo;un objet
- &laquo;&nbsp;vehicleJourneyAtStop&nbsp;&raquo;, poursuivre le test, sinon le test est
- invalid&eacute; et fournit le message&nbsp;: &laquo;&nbsp;test 2.18.2b&nbsp;:
- l&rsquo;identifiant (&laquo; StopPoint &raquo;) ne figure pas dans l&rsquo;&eacute;l&eacute;ment
- &laquo;&nbsp;stopPointId&nbsp;&raquo; d&rsquo;un objet
- &laquo;&nbsp;vehicleJourneyAtStop&nbsp;&raquo;&nbsp;&raquo;.</span></p>
- </td>
- </tr>
- <tr height=0>
- <td width=1 style='border:none'></td>
- <td width=106 style='border:none'></td>
- <td width=551 style='border:none'></td>
- </tr>
-</table>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si un élément «&nbsp;JourneyPatternId&nbsp;»<b> </b>,
+référencé dans un objet de course «&nbsp;VehicleJourney&nbsp;», possède
+un identifiant «&nbsp;objectId&nbsp;» dans un objet
+«&nbsp;JourneyPattern&nbsp;», alors le test est validé, sinon le test
+est invalidé et produit le message «&nbsp;test 2.18.1&nbsp;: la course
+XX fait référence à une mission commerciale inexistante&nbsp;»</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>N° test:</u></b>
+Test 2.18.2</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Libellé:</u>
+Vérification de la cohérence de points entre MISSION COMMERCIALE («&nbsp;JourneyPattern&nbsp;</font></font></font><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">»</font></font></font><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">&nbsp;) et COURSE COMMERCIALE («&nbsp;VehicleJourney&nbsp;»).</font></font></font></p>
-</div>
+
+
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2"><span style="text-decoration: underline;">
+Champ d’application:</span> &nbsp;&lt;StopPoint&gt; &lt;JourneyPattern&gt;&nbsp;&lt;vehicleJourneyAtStop&gt;&nbsp;&lt;vehicleJourney&gt;&nbsp;</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Vérification:</u> </font></font></font></p>
+
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si «&nbsp;StopPoint&nbsp;» mentionné dans les champs d’application
+est présent une ou plusieurs fois, poursuivre le test, sinon le test
+est abandonné.</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si l’identifiant du « StopPoint » détecté figure dans la liste des
+points d’arrêts «&nbsp;stopPointList&nbsp;» de
+«&nbsp;JourneyPattern&nbsp;», poursuivre le test, sinon le test est
+invalidé et fournit le message&nbsp;:&nbsp;» test 2.18.2.1a&nbsp;:
+l’identifiant (« StopPoint ») détecté dans un objet
+«&nbsp;StopPoint&nbsp;» ne figure pas dans la liste des points d’arrêts
+«&nbsp;stopPointList&nbsp;» de «&nbsp;JourneyPattern&nbsp;».</font></font></font></p>
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si l’identifiant du « StopPoint » figure dans l’élément
+«&nbsp;stopPointId&nbsp;» d’un objet
+«&nbsp;vehicleJourneyAtStop&nbsp;», poursuivre le test, sinon le test
+est invalidé et fournit le message&nbsp;: «&nbsp;test 2.18.2b&nbsp;:
+l’identifiant (« StopPoint ») ne figure pas dans l’élément
+«&nbsp;stopPointId&nbsp;» d’un objet «&nbsp;vehicleJourneyAtStop&nbsp;».</font></font></font></p>
diff --git a/app/views/test_sheet/2_19.html b/app/views/test_sheet/2_19.html
index f19939744..a269d35ea 100644
--- a/app/views/test_sheet/2_19.html
+++ b/app/views/test_sheet/2_19.html
@@ -1,322 +1,97 @@
-<div class=WordSection1>
-</span></b>
+<h1 class="western" style="border: 1pt solid rgb(0, 0, 0); padding: 0.05cm 0.12cm; margin-top: 0.21cm;" align="center">
+<font face="Arial, sans-serif"><font style="font-size: 20pt;" size="5"><i>
+ point de contrôle N° 2.19<br>
+Référence à une ligne pour chaque course<br>
+</i></font></font></h1>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Objectif: </b></u>Vérification de la référence à une LIGNE/Chouette (« Line ») pour une COURSE COMMERCIALE (« VehicleJourney »)<span style="color: rgb(51, 51, 153);"><br>
+</span></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Priorité: </b></u> Obligatoire (si l’objet «&nbsp;VehicleJourney&nbsp;» existe et s’il contient l’élément «&nbsp;lineIdShortCut&nbsp;»)</font></p><font face="Arial, sans-serif">
+</font><p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><u><b>Explications:</b></u>
+</font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Lorsque l’objet de course COURSE COMMERCIALE (« VehicleJourney » ) fait
+référence à une LIGNE/Chouette («&nbsp;Line&nbsp;») à travers
+«&nbsp;lineIdShortCut&nbsp;», qui est à caractère optionnel, il
+convient de vérifier qu'il correspond à l'identifiant
+«&nbsp;objectId&nbsp;» d’une LIGNE/Chouette («&nbsp;Line&nbsp;» ) du
+réseau.</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>Exemple: </u></b></font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Représentation schématique de l’objet «&nbsp;VehicleJourney&nbsp;»</font></font></font></p>
+<p><font face="Arial, sans-serif"><img src="image011.jpg" height="618" width="372"></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Exemple d'une course qui référence la ligne</font></font></font></p>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">...<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;Line&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;objectId&gt;AMIV:Line:014014012&lt;/objectId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;objectVersion&gt;1&lt;/objectVersion&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">...<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;VehicleJourney&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;objectId&gt;AMIV:VehicleJourney:8970758&lt;/objectId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;routeId&gt;AMIV:Route:488970&lt;/routeId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;journeyPatternId&gt;AMIV:JourneyPattern:488970M1&lt;/journeyPatternId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;lineIdShortcut&gt;AMIV:Line:014014012&lt;/lineIdShortcut&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;operatorId&gt;AMIV:Company:2422&lt;/operatorId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;timeSlotId&gt;AMIV:TimeSlot:0&lt;/timeSlotId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;vehicleJourneyAtStop&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;stopPointId&gt;AMIV:StopPoint:488970A0A237816&lt;/stopPointId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;vehicleJourneyId&gt;AMIV:VehicleJourney:8970758&lt;/vehicleJourneyId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;arrivalTime&gt;05:45:00&lt;/arrivalTime&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;departureTime&gt;05:45:00&lt;/departureTime&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;order&gt;1&lt;/order&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;/vehicleJourneyAtStop&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;vehicleJourneyAtStop&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;stopPointId&gt;AMIV:StopPoint:488970A1A237817&lt;/stopPointId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;vehicleJourneyId&gt;AMIV:VehicleJourney:8970758&lt;/vehicleJourneyId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">...<br></font></span>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>N° test:</u></b>
+2.19.1</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Libellé:</u> &nbsp;&nbsp;&nbsp; Vérification de la référence à une LIGNE/Chouette (« Line ») pour une COURSE COMMERCIALE (« VehicleJourney »).<span style="color: rgb(51, 51, 153);"></span></font></font></font></p>
-<p class=MsoTitle><span style='font-size:14.0pt;font-family:"Tahoma","sans-serif"'>Fiche
-du point de contr&ocirc;le N&deg; 2.19</span></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Champ d’application:</u>
+&lt;VehicleJourney&gt;&nbsp;&lt;Line&gt;</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Vérification:</u> </font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si l’objet «&nbsp;VehicleJourney&nbsp;» existe, poursuivre le test, sinon abandonner le test</font></font></font></p>
-<p class=MsoNormal>&nbsp;</p>
-<table class=MsoNormalTable border=0 cellspacing=0 cellpadding=0 width=657
- style='width:492.8pt;margin-left:-.25pt;border-collapse:collapse'>
- <tr style='page-break-inside:avoid'>
- <td width=657 colspan=2 valign=top style='width:492.8pt;border:solid black 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center;text-indent:0cm;layout-grid-mode:char'><i><span
- style='font-family:"Tahoma","sans-serif";color:navy'>Description</span></i></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- solid black 1.0pt;border-bottom:solid black 1.0pt;border-right:none;
- padding:5.65pt 11.35pt 5.65pt 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm;layout-grid-mode:char'><span style='font-size:11.0pt'>Intitul&eacute;</span></h1>
- </td>
- <td width=108 valign=top style='width:81.35pt;border:solid black 1.0pt;
- border-top:none;padding:5.65pt 11.35pt 5.65pt 3.5pt;height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt;text-align:justify;layout-grid-mode:
- char'><span style='font-size:11.0pt;line-height:200%;font-family:"Tahoma","sans-serif"'>R&eacute;f&eacute;rence
- &agrave; une ligne pour chaque course.</span></p>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- solid black 1.0pt;border-bottom:solid black 1.0pt;border-right:none;
- padding:5.65pt 11.35pt 5.65pt 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm;layout-grid-mode:char'><span style='font-size:11.0pt'>Objectif</span></h1>
- </td>
- <td width=108 valign=top style='width:81.35pt;border:solid black 1.0pt;
- border-top:none;padding:5.65pt 11.35pt 5.65pt 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm;layout-grid-mode:char'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'>V&eacute;rification de<span
- style='color:#333399'> </span>la r&eacute;f&eacute;rence &agrave; une LIGNE/Chouette (&laquo; Line &raquo;)
- pour une COURSE COMMERCIALE (&laquo;&nbsp;VehicleJourney&nbsp;&raquo;).</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- solid black 1.0pt;border-bottom:solid black 1.0pt;border-right:none;
- padding:5.65pt 11.35pt 5.65pt 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm;layout-grid-mode:char'><span style='font-size:11.0pt'>R&eacute;f&eacute;rences</span></h1>
- </td>
- <td width=108 valign=top style='width:81.35pt;border:solid black 1.0pt;
- border-top:none;padding:5.65pt 11.35pt 5.65pt 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm;layout-grid-mode:char'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'>TRIDENT/profil
- CHOUETTE/Transmodel V4 et V5.1</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:5.65pt 11.35pt 5.65pt 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:-6.65pt;margin-bottom:
- 6.0pt;margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>N&deg; de fiche(s)
- connexe(s)</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:5.65pt 11.35pt 5.65pt 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-left:0cm;text-align:left;text-indent:0cm;
- layout-grid-mode:char'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>&nbsp;</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- solid black 1.0pt;border-bottom:solid black 1.0pt;border-right:none;
- padding:5.65pt 11.35pt 5.65pt 3.5pt;height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt;layout-grid-mode:char'><b><span
- style='font-family:"Tahoma","sans-serif"'>Priorit&eacute;<span style='color:red'> </span></span></b></p>
- </td>
- <td width=108 valign=top style='width:81.35pt;border:solid black 1.0pt;
- border-top:none;padding:5.65pt 11.35pt 5.65pt 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm;layout-grid-mode:char'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'>Obligatoire (si l&rsquo;objet
- &laquo;&nbsp;VehicleJourney&nbsp;&raquo; existe et s&rsquo;il contient l&rsquo;&eacute;l&eacute;ment
- &laquo;&nbsp;lineIdShortCut&nbsp;&raquo;)</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- solid black 1.0pt;border-bottom:solid black 1.0pt;border-right:none;
- padding:5.65pt 11.35pt 5.65pt 3.5pt;height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt;layout-grid-mode:char'><b><span
- style='font-family:"Tahoma","sans-serif"'>R&eacute;sultat</span></b></p>
- </td>
- <td width=108 valign=top style='width:81.35pt;border:solid black 1.0pt;
- border-top:none;padding:5.65pt 11.35pt 5.65pt 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm;layout-grid-mode:char'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'>Conforme ou non
- conforme</span></h1>
- </td>
- </tr>
- <tr style='page-break-inside:avoid'>
- <td width=657 colspan=2 valign=top style='width:492.8pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center;text-indent:0cm;layout-grid-mode:char'><i><span
- style='font-family:"Tahoma","sans-serif";color:navy'>Mise en &oelig;uvre</span></i></h1>
- </td>
- </tr>
- <tr>
- <td width=100 valign=top style='width:74.85pt;border-top:none;border-left:
- solid black 1.0pt;border-bottom:solid black 1.0pt;border-right:none;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm;layout-grid-mode:char'><span style='font-size:11.0pt'>Explication</span></h1>
- </td>
- <td width=557 valign=top style='width:417.95pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:11.35pt;margin-bottom:6.0pt;
- margin-left:0cm;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Lorsque
- l&rsquo;objet de course COURSE COMMERCIALE (&laquo; VehicleJourney &raquo; ) fait r&eacute;f&eacute;rence &agrave;
- une LIGNE/Chouette (&laquo;&nbsp;Line&nbsp;&raquo;) &agrave; travers
- &laquo;&nbsp;lineIdShortCut&nbsp;&raquo;, qui est &agrave; caract&egrave;re optionnel, il convient de
- v&eacute;rifier qu'il correspond &agrave; l'identifiant &laquo;&nbsp;objectId&nbsp;&raquo; d&rsquo;une
- LIGNE/Chouette (&laquo;&nbsp;Line&nbsp;&raquo; ) du r&eacute;seau.</span></h1>
- </td>
- </tr>
-</table>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si l’élément de raccourci de ligne «&nbsp;lineIdShortcut&nbsp;»
+existe dans l’objet «&nbsp;VehicleJourney&nbsp;», poursuivre le test,
+sinon abandonner le test</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si un élément de raccourci de ligne «&nbsp;lineIdShortcut&nbsp;»<b> </b>,
+référencé dans un objet «&nbsp;VehicleJourney&nbsp;», possède un
+identifiant «&nbsp;objectId&nbsp;» dans un objet de ligne
+«&nbsp;Line&nbsp;», alors le test est validé, sinon le test est
+invalidé et produit le message «&nbsp;test 2.19.1&nbsp;: le raccourci
+de ligne d’une course XX fait référence à une ligne inexistante&nbsp;».</font></font></font></p>
-<p class=MsoNormal>&nbsp;</p>
-
-<table class=MsoNormalTable border=0 cellspacing=0 cellpadding=0 width=638
- style='width:478.65pt;margin-left:-.25pt;border-collapse:collapse'>
- <tr>
- <td width=108 valign=top style='width:81.35pt;border:solid black 1.0pt;
- border-right:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm;layout-grid-mode:char'><b><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>Exemple</span></b></p>
- </td>
- <td width=548 valign=top style='width:411.1pt;border:solid black 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=left style='margin-left:18.0pt;text-align:left;text-indent:0cm;
- layout-grid-mode:char'><span style='font-size:11.0pt;font-weight:normal'>&nbsp;</span></h1>
- <h1 align=left style='margin-left:18.0pt;text-align:left;text-indent:0cm'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Repr&eacute;sentation
- sch&eacute;matique de l&rsquo;objet &laquo;&nbsp;VehicleJourney&nbsp;&raquo;</span></h1>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal> </p>
- <p class=MsoNormal align=center style='text-align:center'><img width=372
- height=618 src="BATERI_Neptune_FINAL-V2_0a_fichiers/image011.jpg"></p>
- <h1 align=left style='margin-left:18.0pt;text-align:left;text-indent:0cm'><span
- style='font-size:11.0pt;font-weight:normal'>&nbsp;</span></h1>
- <h1 align=left style='text-align:left'><span style='font-size:11.0pt;
- font-weight:normal'>&nbsp;</span></h1>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <h3 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Exemple
- d'une course qui r&eacute;f&eacute;rence la ligne</span></h3>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>...</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;Line&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;objectId&gt;AMIV:Line:014014012&lt;/objectId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;objectVersion&gt;1&lt;/objectVersion&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>...</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;VehicleJourney&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;objectId&gt;AMIV:VehicleJourney:8970758&lt;/objectId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;routeId&gt;AMIV:Route:488970&lt;/routeId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>
- &lt;journeyPatternId&gt;AMIV:JourneyPattern:488970M1&lt;/journeyPatternId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;lineIdShortcut&gt;AMIV:Line:014014012&lt;/lineIdShortcut&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;operatorId&gt;AMIV:Company:2422&lt;/operatorId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;timeSlotId&gt;AMIV:TimeSlot:0&lt;/timeSlotId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;vehicleJourneyAtStop&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;stopPointId&gt;AMIV:StopPoint:488970A0A237816&lt;/stopPointId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;vehicleJourneyId&gt;AMIV:VehicleJourney:8970758&lt;/vehicleJourneyId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;arrivalTime&gt;05:45:00&lt;/arrivalTime&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;departureTime&gt;05:45:00&lt;/departureTime&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;order&gt;1&lt;/order&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;/vehicleJourneyAtStop&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;vehicleJourneyAtStop&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;stopPointId&gt;AMIV:StopPoint:488970A1A237817&lt;/stopPointId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>
- &lt;vehicleJourneyId&gt;AMIV:VehicleJourney:8970758&lt;/vehicleJourneyId&gt;</span></p>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><span lang=EN-US style='font-size:10.0pt;font-family:
- "Courier New"'>...</span></p>
- </td>
- </tr>
- <tr style='page-break-inside:avoid'>
- <td width=638 colspan=2 valign=top style='width:478.65pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h2 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center;text-indent:0cm;layout-grid-mode:char'><i><span
- lang=EN-US style='font-size:14.0pt;color:navy'>Evaluation</span></i></h2>
- </td>
- </tr>
- <tr>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- solid black 1.0pt;border-bottom:solid black 1.0pt;border-right:none;
- padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm;layout-grid-mode:char'><span lang=EN-US style='font-size:
- 11.0pt'>N&deg; test</span></h1>
- </td>
- <td width=108 valign=top style='width:81.35pt;border:solid black 1.0pt;
- border-top:none;padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm;layout-grid-mode:char'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'>2.19.1</span></h1>
- </td>
- </tr>
- <tr>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- solid black 1.0pt;border-bottom:solid black 1.0pt;border-right:none;
- padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm;layout-grid-mode:char'><span style='font-size:11.0pt'>Libell&eacute;</span></h1>
- </td>
- <td width=108 valign=top style='width:81.35pt;border:solid black 1.0pt;
- border-top:none;padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm;layout-grid-mode:char'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'>V&eacute;rification de<span
- style='color:#333399'> </span>la r&eacute;f&eacute;rence &agrave; une LIGNE/Chouette (&laquo; Line &raquo;)
- pour une COURSE COMMERCIALE (&laquo;&nbsp;VehicleJourney&nbsp;&raquo;).</span></h1>
- </td>
- </tr>
- <tr>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- solid black 1.0pt;border-bottom:solid black 1.0pt;border-right:none;
- padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:-7.7pt;margin-bottom:6.0pt;
- margin-left:0cm;text-indent:0cm;layout-grid-mode:char'><span lang=EN-US
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Champ
- d&rsquo;application</span></h1>
- </td>
- <td width=108 valign=top style='width:81.35pt;border:solid black 1.0pt;
- border-top:none;padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm;layout-grid-mode:char'><span lang=EN-US style='font-size:
- 11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>&lt;VehicleJourney&gt;</span></h1>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm;text-align:justify;layout-grid-mode:char'><span
- lang=EN-US style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>&lt;Line&gt;</span></p>
- </td>
- </tr>
- <tr>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- solid black 1.0pt;border-bottom:solid black 1.0pt;border-right:none;
- padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm;layout-grid-mode:char'><span style='font-size:11.0pt'>V&eacute;rification</span></h1>
- </td>
- <td width=108 valign=top style='width:81.35pt;border:solid black 1.0pt;
- border-top:none;padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 style='margin-left:0cm;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>-
- Si l&rsquo;objet &laquo;&nbsp;VehicleJourney&nbsp;&raquo; existe, poursuivre le test, sinon
- abandonner le test</span></h1>
- <p class=MsoFooter><span style='font-family:"Tahoma","sans-serif"'>&nbsp;</span></p>
- <h1 style='margin-left:0cm;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>-
- Si l&rsquo;&eacute;l&eacute;ment de raccourci de ligne &laquo;&nbsp;lineIdShortcut&nbsp;&raquo; existe dans
- l&rsquo;objet &laquo;&nbsp;VehicleJourney&nbsp;&raquo;, poursuivre le test, sinon abandonner le
- test</span></h1>
- <p class=MsoNormal><span style='font-family:"Tahoma","sans-serif"'>&nbsp;</span></p>
- <p class=MsoBodyText3 align=left style='text-align:left'><span
- style='font-family:"Tahoma","sans-serif"'>- Si un &eacute;l&eacute;ment de raccourci de
- ligne &laquo;&nbsp;lineIdShortcut&nbsp;&raquo;<b> </b>, r&eacute;f&eacute;renc&eacute; dans un objet
- &laquo;&nbsp;VehicleJourney&nbsp;&raquo;, poss&egrave;de un identifiant &laquo;&nbsp;objectId&nbsp;&raquo;
- dans un objet de ligne &laquo;&nbsp;Line&nbsp;&raquo;, alors le test est valid&eacute;, sinon le
- test est invalid&eacute; et produit le message &laquo;&nbsp;test 2.19.1&nbsp;: le
- raccourci de ligne d&rsquo;une course XX fait r&eacute;f&eacute;rence &agrave; une ligne
- inexistante&nbsp;&raquo;.</span></p>
- <h1 style='margin-left:0cm;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>&nbsp;</span></h1>
- </td>
- </tr>
-</table>
-
-
-</div>
diff --git a/app/views/test_sheet/2_2.html b/app/views/test_sheet/2_2.html
index a03053d70..c4b83a0c8 100644
--- a/app/views/test_sheet/2_2.html
+++ b/app/views/test_sheet/2_2.html
@@ -1,286 +1,70 @@
+<h1 class="western" style="border: 1pt solid rgb(0, 0, 0); padding: 0.05cm 0.12cm; margin-top: 0.21cm;" align="center">
+<font face="Arial, sans-serif"><font style="font-size: 20pt;" size="5"><i>
+ point de contrôle N° 2.2<br>
+Cohérence entre le regroupement de lignes et ses composants<br>
+</i></font></font></h1>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Objectif: </b></u>
+Vérification de la correcte référence à des LIGNEs/Chouette (« Line ») dans GROUPE DE LIGNES (« GroupOfLine »).<br>
+</font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Priorité: </b></u> Obligatoire (si l’objet «&nbsp;GroupOfLine&nbsp;» existe)</font></p><font face="Arial, sans-serif">
+</font><p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><u><b>Explications:</b></u>
+</font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Si la classe d’objets de GROUPE DE LIGNES (« GroupOfLine ») existe, il
+convient de vérifier que les LIGNEs/Chouette (« Line ») référencées
+dans cette classe, sont réellement définies, en vérifiant l’existence
+de leurs identifiants.</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>Exemple: </u></b></font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Représentation schématique de l’Objet «&nbsp;GroupOfLIne&nbsp;»</font></font></font></p>
+<p><font face="Arial, sans-serif"><img src="image003.jpg" height="261" width="291"></font></p>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">...<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;GroupOfLine&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;objectId&gt;AMIV:GroupOfLine:1&lt;/objectId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;name&gt;SERVICE URBAIN&lt;/name&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;lineId&gt;AMIV:Line:014014012&lt;/lineId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;/GroupOfLine&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">...<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;Line&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;objectId&gt;AMIV:Line:014014012&lt;/objectId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif"><br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">...<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;/Line&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">...<br></font></span>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>N° test:</u></b>
+2.2.1</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Libellé:</u>
+Vérification de la correcte référence à des LIGNEs/Chouette (« Line ») dans GROUPE DE LIGNES («GroupOfLine »).</font></font></font></p>
-<div class=WordSection1>
-</span>
-
-<p class=MsoTitle><span style='font-size:14.0pt;font-family:"Tahoma","sans-serif"'>Fiche
-du point de contr&ocirc;le N&deg; 2.2</span></p>
-
-<p class=MsoNormal><span style='font-size:14.0pt;font-family:"Tahoma","sans-serif"'>&nbsp;</span></p>
-
-<table class=MsoNormalTable border=0 cellspacing=0 cellpadding=0 width=616
- style='width:462.1pt;margin-left:-.75pt;border-collapse:collapse'>
- <tr style='page-break-inside:avoid;height:34.0pt'>
- <td width=616 colspan=2 valign=top style='width:462.1pt;border:solid black 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:34.0pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center;layout-grid-mode:char'><i><span
- style='font-family:"Tahoma","sans-serif";color:navy'>Description</span></i></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=109 style='width:81.5pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Intitul&eacute;</span></h1>
- </td>
- <td width=507 style='width:380.6pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt;layout-grid-mode:char'><span
- style='font-size:11.0pt;line-height:200%;font-family:"Tahoma","sans-serif"'>Coh&eacute;rence
- entre le regroupement de lignes et ses composants</span></p>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=109 style='width:81.5pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Objectif</span></h1>
- </td>
- <td width=507 style='width:380.6pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:11.35pt;margin-bottom:
- 6.0pt;margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>V&eacute;rification
- de la correcte r&eacute;f&eacute;rence &agrave; des LIGNEs/Chouette (&laquo; Line &raquo;) dans GROUPE DE
- LIGNES (&laquo; GroupOfLine &raquo;).</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=109 style='width:81.5pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>R&eacute;f&eacute;rences</span></h1>
- </td>
- <td width=507 style='width:380.6pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>TRIDENT/profil
- CHOUETTE/Transmodel V4 et V5.1</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=109 style='width:81.5pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span lang=NL
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>N&deg; de fiche(s)</span></h1>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>connexe(s)</span></h1>
- </td>
- <td width=507 style='width:380.6pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>&nbsp;</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=109 style='width:81.5pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt;layout-grid-mode:char'><b><span
- style='font-size:11.0pt;line-height:200%;font-family:"Tahoma","sans-serif"'>Priorit&eacute;<span
- style='color:red'> </span></span></b></p>
- </td>
- <td width=507 style='width:380.6pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Obligatoire
- (si l&rsquo;objet &laquo;&nbsp;GroupOfLine&nbsp;&raquo; existe)</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=109 style='width:81.5pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt;layout-grid-mode:char'><b><span
- style='font-size:11.0pt;line-height:200%;font-family:"Tahoma","sans-serif"'>R&eacute;sultat</span></b></p>
- </td>
- <td width=507 style='width:380.6pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Conforme
- ou non conforme</span></h1>
- </td>
- </tr>
- <tr style='height:34.0pt'>
- <td width=616 colspan=2 valign=top style='width:462.1pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt;height:34.0pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center;layout-grid-mode:char'><i><span
- style='font-family:"Tahoma","sans-serif";color:navy'>Mise en &oelig;uvre</span></i></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=109 valign=top style='width:81.5pt;border-top:none;border-left:
- solid black 1.0pt;border-bottom:solid black 1.0pt;border-right:none;
- padding:5.65pt 11.35pt 5.65pt 3.5pt;height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt;layout-grid-mode:char'><b><span
- style='font-size:11.0pt;line-height:200%;font-family:"Tahoma","sans-serif"'>Explication</span></b></p>
- </td>
- <td width=507 valign=top style='width:380.6pt;border:solid black 1.0pt;
- border-top:none;padding:5.65pt 11.35pt 5.65pt 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:11.35pt;margin-bottom:6.0pt;
- margin-left:0cm;layout-grid-mode:char'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'>Si la classe d&rsquo;objets
- de GROUPE DE LIGNES (&laquo; GroupOfLine &raquo;) existe, il convient de v&eacute;rifier que les
- LIGNEs/Chouette (&laquo; Line &raquo;) r&eacute;f&eacute;renc&eacute;es dans cette classe, sont r&eacute;ellement
- d&eacute;finies, en v&eacute;rifiant l&rsquo;existence de leurs identifiants.</span></h1>
- </td>
- </tr>
- <tr style='height:710.75pt'>
- <td width=109 valign=top style='width:81.5pt;border-top:none;border-left:
- solid black 1.0pt;border-bottom:solid black 1.0pt;border-right:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:710.75pt'>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm;layout-grid-mode:char'><b><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>Exemple</span></b></p>
- </td>
- <td width=507 valign=top style='width:380.6pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt;height:710.75pt'>
- <h1 align=left style='margin-left:18.0pt;text-align:left;layout-grid-mode:
- char'><span style='font-size:11.0pt;font-weight:normal'>&nbsp;</span></h1>
- <h1 align=left style='margin-left:18.0pt;text-align:left'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Repr&eacute;sentation
- sch&eacute;matique de l&rsquo;Objet &laquo;&nbsp;GroupOfLIne&nbsp;&raquo; </span></h1>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal align=center style='text-align:center'><img width=291
- height=261 src="BATERI_Neptune_FINAL-V2_0a_fichiers/image003.jpg"></p>
- <p class=MsoNormal>&nbsp;</p>
- <h3 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 3.4pt;layout-grid-mode:char'>Exemple de l&rsquo;objet &laquo;&nbsp;GroupOfLine&nbsp;&raquo; &agrave;
- partir d&rsquo;un fichier XML</h3>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:3.4pt;layout-grid-mode:char'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>...</span></p>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:3.4pt;layout-grid-mode:char'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;GroupOfLine&gt;</span></p>
- <p class=MsoNormal style='margin-left:3.4pt;text-autospace:ideograph-numeric'><span
- lang=EN-US style='font-size:10.0pt;font-family:"Courier New"'> &lt;objectId&gt;AMIV:GroupOfLine:1&lt;/objectId&gt;</span></p>
- <p class=MsoNormal style='margin-left:3.4pt;text-autospace:ideograph-numeric'><span
- lang=EN-US style='font-size:10.0pt;font-family:"Courier New"'> &lt;name&gt;SERVICE
- URBAIN&lt;/name&gt;</span></p>
- <p class=MsoNormal style='margin-left:3.4pt;text-autospace:ideograph-numeric'><span
- lang=EN-US style='font-size:10.0pt;font-family:"Courier New"'> &lt;lineId&gt;AMIV:Line:014014012&lt;/lineId&gt;</span></p>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:3.4pt;layout-grid-mode:char'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;/GroupOfLine&gt;</span></p>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:3.4pt;layout-grid-mode:char'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>...</span></p>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:3.4pt;layout-grid-mode:char'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;Line&gt;</span></p>
- <p class=MsoNormal style='margin-left:3.4pt;text-autospace:ideograph-numeric'><span
- lang=EN-US style='font-size:10.0pt;font-family:"Courier New"'> &lt;objectId&gt;AMIV:Line:014014012&lt;/objectId&gt;</span></p>
- <p class=MsoNormal style='margin-left:3.4pt;text-autospace:ideograph-numeric'><span
- lang=EN-US style='font-size:10.0pt;font-family:"Courier New"'> </span><span
- style='font-size:10.0pt;font-family:"Courier New"'>...</span></p>
- <p class=MsoNormal style='margin-left:3.4pt;text-autospace:ideograph-numeric'><span
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;/Line&gt;</span></p>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:3.4pt;layout-grid-mode:char'><span style='font-size:10.0pt;
- font-family:"Courier New"'>...</span></p>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 3.4pt;layout-grid-mode:char'><span style='font-size:11.0pt;font-weight:normal'>Dans
- cet exemple, &laquo;&nbsp;lineId&nbsp;&raquo; est utilis&eacute; dans l&rsquo;objet
- &laquo;&nbsp;GroupOfLine&nbsp;&raquo;</span></h1>
- </td>
- </tr>
- <tr style='page-break-inside:avoid'>
- <td width=616 colspan=2 valign=top style='width:462.1pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h2 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center;layout-grid-mode:char'><i><span lang=EN-US
- style='font-size:14.0pt;color:navy'>Evaluation</span></i></h2>
- </td>
- </tr>
- <tr>
- <td width=109 style='width:81.5pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span lang=EN-US
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>N&deg; test</span></h1>
- </td>
- <td width=507 valign=top style='width:380.6pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;layout-grid-mode:char'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>2.2.1</span></h1>
- </td>
- </tr>
- <tr>
- <td width=109 style='width:81.5pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Libell&eacute;</span></h1>
- </td>
- <td width=507 valign=top style='width:380.6pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;layout-grid-mode:char'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>V&eacute;rification de la correcte r&eacute;f&eacute;rence &agrave; des
- LIGNEs/Chouette (&laquo; Line &raquo;) dans GROUPE DE LIGNES (&laquo; GroupOfLine &raquo;).</span></h1>
- </td>
- </tr>
- <tr>
- <td width=109 style='width:81.5pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Champ
- d&rsquo;application</span></h1>
- </td>
- <td width=507 valign=top style='width:380.6pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;layout-grid-mode:char'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>&lt;GroupOfLine&gt;</span></h1>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm;text-align:justify;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>&lt;Line&gt;</span></p>
- </td>
- </tr>
- <tr>
- <td width=109 style='width:81.5pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>V&eacute;rification</span></h1>
- </td>
- <td width=507 valign=top style='width:380.6pt;border:solid black 1.0pt;
- border-top:none;padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:11.35pt;margin-bottom:6.0pt;
- margin-left:0cm;layout-grid-mode:char'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'>- Si la classe d&rsquo;objets
- &laquo;&nbsp;GroupOfLine&nbsp;&raquo; existe alors poursuivre le test, sinon abandonner le
- test,</span></h1>
- <p class=MsoBodyText2 style='margin-top:6.0pt;margin-right:11.35pt;
- margin-bottom:6.0pt;margin-left:0cm;line-height:normal'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>- Si la valeur de
- chaque &eacute;l&eacute;ment &laquo;&nbsp;LineId&nbsp;&raquo; de la classe d&rsquo;objets
- &laquo;&nbsp;GroupOfLine&nbsp;&raquo;, est identifi&eacute;e dans l&rsquo;&eacute;l&eacute;ment
- &laquo;&nbsp;objectId&nbsp;&raquo; de la classe d&rsquo;objets &laquo;&nbsp;Line&nbsp;&raquo; alors le
- test est valid&eacute;, sinon le test est invalid&eacute; et produit le message &laquo;&nbsp;test
- 2.2.1&nbsp;: la valeur de l&rsquo;&eacute;l&eacute;ment &laquo;&nbsp;lineId&nbsp;&raquo; de la classe
- d&rsquo;objets &laquo;&nbsp;GroupOfLine&nbsp;&raquo; n&rsquo;a pas &eacute;t&eacute; rep&eacute;r&eacute;e dans l&rsquo;&eacute;l&eacute;ment
- &laquo;&nbsp;objectId&nbsp;&raquo; de la classe d&rsquo;objets &laquo;&nbsp;Line&nbsp;&raquo;.</span></p>
- </td>
- </tr>
-</table>
-
-
-</div>
-
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Champ d’application:</u>
+&lt;GroupOfLine&gt; &lt;Line&gt;</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Vérification:</u> </font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si la classe d’objets «&nbsp;GroupOfLine&nbsp;» existe alors poursuivre le test, sinon abandonner le test,</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si la valeur de chaque élément «&nbsp;LineId&nbsp;» de la classe
+d’objets «&nbsp;GroupOfLine&nbsp;», est identifiée dans l’élément
+«&nbsp;objectId&nbsp;» de la classe d’objets «&nbsp;Line&nbsp;» alors
+le test est validé, sinon le test est invalidé et produit le message
+«&nbsp;test 2.2.1&nbsp;: la valeur de l’élément «&nbsp;lineId&nbsp;» de
+la classe d’objets «&nbsp;GroupOfLine&nbsp;» n’a pas été repérée dans
+l’élément «&nbsp;objectId&nbsp;» de la classe d’objets
+«&nbsp;Line&nbsp;».</font></font></font></p>
diff --git a/app/views/test_sheet/2_20.html b/app/views/test_sheet/2_20.html
index 7d433e7ff..709a92621 100644
--- a/app/views/test_sheet/2_20.html
+++ b/app/views/test_sheet/2_20.html
@@ -1,336 +1,110 @@
-<div class=WordSection1>
-</span></b>
+<h1 class="western" style="border: 1pt solid rgb(0, 0, 0); padding: 0.05cm 0.12cm; margin-top: 0.21cm;" align="center">
+<font face="Arial, sans-serif"><font style="font-size: 20pt;" size="5"><i>
+ point de contrôle N° 2.20<br>
+Vérification des identifiants d'exploitants que référencent les courses<br>
+</i></font></font></h1>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Objectif:</b></u></font><font face="Arial, sans-serif">
+&nbsp; Vérification de la correcte référence à l’EXPLOITANT/Chouette («
+Company ») dans une COURSE COMMERCIALE (« VehicleJourney » )</font><font face="Arial, sans-serif">
+<span style="color: rgb(51, 51, 153);">
+</span></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Priorité: </b></u> Obligatoire (si l’objet «&nbsp;VehicleJourney&nbsp;» existe et s’il contient l’objet «&nbsp;operatorId&nbsp;»</font></p><font face="Arial, sans-serif">
+</font><p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><u><b>Explications:</b></u>
+</font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Lorsque l’objet de course COURSE COMMERCIALE (« VehicleJourney » )
+existe, et lorsque l'identifiant EXPLOITANT/Chouette
+(«&nbsp;Company&nbsp;») - «&nbsp;operatorId&nbsp;» -qui est à caractère
+optionnel dans la COURSE COMMERCIALE (« VehicleJourney » ) , est
+référencé, il convient de vérifier qu'il correspond à l'identifiant
+«&nbsp;objectId&nbsp;» d'un EXPLOITANT/Chouette
+(«&nbsp;Company&nbsp;»)défini.</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>Exemple: </u></b></font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Représentation schématique de l’objet «&nbsp;VehicleJourney&nbsp;»</font></font></font></p>
+<p><font face="Arial, sans-serif"><img src="image011.jpg" height="618" width="372"></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Exemple d'une course qui référence un opérateur exploitant la ligne</font></font></font></p>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">...<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;Company&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;objectId&gt;AMIV:Company:2422&lt;/objectId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;name&gt;CIF 93 - TREMBLAY&lt;/name&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;registration&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;registrationNumber&gt;014&lt;/registrationNumber&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;/registration&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;/Company&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">...<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;VehicleJourney&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;objectId&gt;AMIV:VehicleJourney:8970758&lt;/objectId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;routeId&gt;AMIV:Route:488970&lt;/routeId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;journeyPatternId&gt;AMIV:JourneyPattern:488970M1&lt;/journeyPatternId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;lineIdShortcut&gt;AMIV:Line:014014012&lt;/lineIdShortcut&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;operatorId&gt;AMIV:Company:2422&lt;/operatorId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;timeSlotId&gt;AMIV:TimeSlot:0&lt;/timeSlotId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;vehicleJourneyAtStop&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;stopPointId&gt;AMIV:StopPoint:488970A0A237816&lt;/stopPointId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;vehicleJourneyId&gt;AMIV:VehicleJourney:8970758&lt;/vehicleJourneyId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;arrivalTime&gt;05:45:00&lt;/arrivalTime&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;departureTime&gt;05:45:00&lt;/departureTime&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;order&gt;1&lt;/order&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;/vehicleJourneyAtStop&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;vehicleJourneyAtStop&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;stopPointId&gt;AMIV:StopPoint:488970A1A237817&lt;/stopPointId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;vehicleJourneyId&gt;AMIV:VehicleJourney:8970758&lt;/vehicleJourneyId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">...<br></font></span>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>N° test:</u></b>
+2.20.1</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Libellé:</u> &nbsp; Vérification de la correcte référence à
+l’EXPLOITANT/Chouette (« Company ») dans une COURSE COMMERCIALE («
+VehicleJourney » ) <span style="color: rgb(51, 51, 153);"></span></font></font></font></p>
-<p class=MsoTitle><span style='font-size:14.0pt;font-family:"Tahoma","sans-serif"'>Fiche
-du point de contr&ocirc;le N&deg; 2.20</span></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Champ d’application:</u>
+&lt;VehicleJourney&gt;&nbsp;&lt;Company&gt;</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Vérification:</u> </font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si l’objet «&nbsp;VehicleJourney&nbsp;» existe, poursuivre le test, sinon abandonner le test</font></font></font></p>
-<p class=MsoNormal>&nbsp;</p>
-<table class=MsoNormalTable border=0 cellspacing=0 cellpadding=0 width=657
- style='width:492.8pt;margin-left:-.25pt;border-collapse:collapse'>
- <tr style='height:37.4pt'>
- <td width=657 colspan=2 valign=top style='width:492.8pt;border:solid black 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center;text-indent:0cm;layout-grid-mode:char'><i><span
- style='font-family:"Tahoma","sans-serif";color:navy'>Description</span></i></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 11.35pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Intitul&eacute;</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt;layout-grid-mode:char'><span
- style='font-size:11.0pt;line-height:200%;font-family:"Tahoma","sans-serif"'>V&eacute;rification
- des identifiants d'exploitants que r&eacute;f&eacute;rencent les courses.</span></p>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 11.35pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Objectif</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>V&eacute;rification<span
- style='color:#333399'> </span>de la correcte r&eacute;f&eacute;rence &agrave;
- l&rsquo;EXPLOITANT/Chouette (&laquo;&nbsp;Company&nbsp;&raquo;) dans une COURSE COMMERCIALE (&laquo;
- VehicleJourney &raquo; ).</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 11.35pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>R&eacute;f&eacute;rences</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>TRIDENT/profil
- CHOUETTE/Transmodel V4 et V5.1</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 11.35pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:-15.65pt;margin-bottom:
- 6.0pt;margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>N&deg; de fiche(s)
- connexe(s)</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-left:0cm;text-align:left;text-indent:0cm;
- layout-grid-mode:char'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>&nbsp;</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 11.35pt 0cm 3.5pt;
- height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt;layout-grid-mode:char'><b><span
- style='font-family:"Tahoma","sans-serif"'>Priorit&eacute;<span style='color:red'> </span></span></b></p>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Obligatoire
- (si l&rsquo;objet &laquo;&nbsp;VehicleJourney&nbsp;&raquo; existe et s&rsquo;il contient l&rsquo;objet
- &laquo;&nbsp;operatorId&nbsp;&raquo;)</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 11.35pt 0cm 3.5pt;
- height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt;layout-grid-mode:char'><b><span
- style='font-family:"Tahoma","sans-serif"'>R&eacute;sultat</span></b></p>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Conforme
- ou non conforme</span></h1>
- </td>
- </tr>
- <tr style='page-break-inside:avoid'>
- <td width=657 colspan=2 valign=top style='width:492.8pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center;text-indent:0cm;layout-grid-mode:char'><i><span
- style='font-family:"Tahoma","sans-serif";color:navy'>Mise en &oelig;uvre</span></i></h1>
- </td>
- </tr>
- <tr>
- <td width=100 valign=top style='width:74.85pt;border-top:none;border-left:
- solid black 1.0pt;border-bottom:solid black 1.0pt;border-right:none;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm;layout-grid-mode:char'><span style='font-size:11.0pt'>Explication</span></h1>
- </td>
- <td width=557 valign=top style='width:417.95pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:11.35pt;margin-bottom:6.0pt;
- margin-left:0cm;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Lorsque
- l&rsquo;objet de course COURSE COMMERCIALE (&laquo; VehicleJourney &raquo; ) existe, et
- lorsque l'identifiant EXPLOITANT/Chouette (&laquo;&nbsp;Company&nbsp;&raquo;) -
- &laquo;&nbsp;operatorId&nbsp;&raquo; -qui est &agrave; caract&egrave;re optionnel dans la COURSE
- COMMERCIALE (&laquo; VehicleJourney &raquo; ) , est r&eacute;f&eacute;renc&eacute;, il convient de v&eacute;rifier
- qu'il correspond &agrave; l'identifiant &laquo;&nbsp;objectId&nbsp;&raquo; d'un
- EXPLOITANT/Chouette (&laquo;&nbsp;Company&nbsp;&raquo;)d&eacute;fini.</span></h1>
- </td>
- </tr>
-</table>
-
-<p class=MsoNormal>&nbsp;</p>
-
-<table class=MsoNormalTable border=0 cellspacing=0 cellpadding=0 width=657
- style='width:492.8pt;margin-left:-.25pt;border-collapse:collapse'>
- <tr>
- <td width=108 valign=top style='width:81.35pt;border:solid black 1.0pt;
- border-right:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm;layout-grid-mode:char'><b><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>Exemple</span></b></p>
- </td>
- <td width=557 valign=top style='width:417.95pt;border:solid black 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=left style='margin-left:18.0pt;text-align:left;text-indent:0cm;
- layout-grid-mode:char'><span style='font-size:11.0pt;font-weight:normal'>&nbsp;</span></h1>
- <h1 align=left style='margin-left:18.0pt;text-align:left;text-indent:0cm'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Repr&eacute;sentation
- sch&eacute;matique de l&rsquo;objet &laquo;&nbsp;VehicleJourney&nbsp;&raquo;</span></h1>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal> </p>
- <p class=MsoNormal align=center style='text-align:center'><img width=372
- height=618 src="BATERI_Neptune_FINAL-V2_0a_fichiers/image011.jpg"></p>
- <h1 align=left style='margin-left:18.0pt;text-align:left;text-indent:0cm'><span
- style='font-size:11.0pt;font-weight:normal'>&nbsp;</span></h1>
- <h1 align=left style='text-align:left'><span style='font-size:11.0pt;
- font-weight:normal'>&nbsp;</span></h1>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <h3 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Exemple
- d'une course qui r&eacute;f&eacute;rence un op&eacute;rateur exploitant la ligne</span></h3>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>...</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;Company&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;objectId&gt;AMIV:Company:2422&lt;/objectId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;name&gt;CIF 93 -
- TREMBLAY&lt;/name&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;registration&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;registrationNumber&gt;014&lt;/registrationNumber&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;/registration&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;/Company&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>...</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;VehicleJourney&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>
- &lt;objectId&gt;AMIV:VehicleJourney:8970758&lt;/objectId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>
- &lt;routeId&gt;AMIV:Route:488970&lt;/routeId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>
- &lt;journeyPatternId&gt;AMIV:JourneyPattern:488970M1&lt;/journeyPatternId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;lineIdShortcut&gt;AMIV:Line:014014012&lt;/lineIdShortcut&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;operatorId&gt;AMIV:Company:2422&lt;/operatorId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;timeSlotId&gt;AMIV:TimeSlot:0&lt;/timeSlotId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;vehicleJourneyAtStop&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;stopPointId&gt;AMIV:StopPoint:488970A0A237816&lt;/stopPointId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>
- &lt;vehicleJourneyId&gt;AMIV:VehicleJourney:8970758&lt;/vehicleJourneyId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;arrivalTime&gt;05:45:00&lt;/arrivalTime&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;departureTime&gt;05:45:00&lt;/departureTime&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;order&gt;1&lt;/order&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;/vehicleJourneyAtStop&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;vehicleJourneyAtStop&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;stopPointId&gt;AMIV:StopPoint:488970A1A237817&lt;/stopPointId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;vehicleJourneyId&gt;AMIV:VehicleJourney:8970758&lt;/vehicleJourneyId&gt;</span></p>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><span lang=EN-US style='font-size:10.0pt;font-family:
- "Courier New"'>...</span></p>
- </td>
- </tr>
- <tr>
- <td width=108 colspan=2 valign=top style='width:81.35pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h2 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center;text-indent:0cm;layout-grid-mode:char'><i><span
- lang=EN-US style='font-size:14.0pt;color:navy'>Evaluation</span></i></h2>
- </td>
- </tr>
- <tr>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- solid black 1.0pt;border-bottom:solid black 1.0pt;border-right:none;
- padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm;layout-grid-mode:char'><span lang=EN-US style='font-size:
- 11.0pt'>N&deg; test</span></h1>
- </td>
- <td width=557 valign=top style='width:417.95pt;border:solid black 1.0pt;
- border-top:none;padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm;layout-grid-mode:char'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'>2.20.1</span></h1>
- </td>
- </tr>
- <tr>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- solid black 1.0pt;border-bottom:solid black 1.0pt;border-right:none;
- padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm;layout-grid-mode:char'><span style='font-size:11.0pt'>Libell&eacute;</span></h1>
- </td>
- <td width=557 valign=top style='width:417.95pt;border:solid black 1.0pt;
- border-top:none;padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm;layout-grid-mode:char'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'>V&eacute;rification<span
- style='color:#333399'> </span>de la correcte r&eacute;f&eacute;rence &agrave;
- l&rsquo;EXPLOITANT/Chouette (&laquo;&nbsp;Company&nbsp;&raquo;) dans une COURSE COMMERCIALE (&laquo;
- VehicleJourney &raquo; ).</span></h1>
- </td>
- </tr>
- <tr>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- solid black 1.0pt;border-bottom:solid black 1.0pt;border-right:none;
- padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:-6.65pt;margin-bottom:6.0pt;
- margin-left:0cm;text-indent:0cm;layout-grid-mode:char'><span lang=EN-US
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Champ
- d&rsquo;application</span></h1>
- </td>
- <td width=557 valign=top style='width:417.95pt;border:solid black 1.0pt;
- border-top:none;padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm;layout-grid-mode:char'><span lang=EN-US style='font-size:
- 11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>&lt;VehicleJourney&gt;</span></h1>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm;text-align:justify;layout-grid-mode:char'><span
- lang=EN-US style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>&lt;Company&gt;</span></p>
- </td>
- </tr>
- <tr>
- <td width=108 valign=top style='width:81.35pt;border:solid black 1.0pt;
- border-top:none;padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm;layout-grid-mode:char'><span style='font-size:11.0pt'>V&eacute;rification</span></h1>
- </td>
- <td width=557 valign=top style='width:417.95pt;border-top:none;border-left:
- none;border-bottom:solid black 1.0pt;border-right:solid black 1.0pt;
- padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 style='margin-left:0cm;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>-
- Si l&rsquo;objet &laquo;&nbsp;VehicleJourney&nbsp;&raquo; existe, poursuivre le test, sinon
- abandonner le test</span></h1>
- <p class=MsoNormal><span style='font-family:"Tahoma","sans-serif"'>&nbsp;</span></p>
- <h1 style='margin-left:0cm;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>-
- Si l&rsquo;&eacute;l&eacute;ment d&eacute;signant l&rsquo;exploitant &laquo;&nbsp;operatorId&nbsp;&raquo; existe dans
- l&rsquo;objet &laquo;&nbsp;VehicleJourney&nbsp;&raquo;, poursuivre le test, sinon abandonner le
- test</span></h1>
- <p class=MsoNormal><span style='font-family:"Tahoma","sans-serif"'>&nbsp;</span></p>
- <p class=MsoBodyText3 align=left style='text-align:left'><span
- style='font-family:"Tahoma","sans-serif"'>- Si un &eacute;l&eacute;ment d&eacute;signant
- l&rsquo;exploitant &laquo;&nbsp;operatorId&nbsp;&raquo;<b> </b>, r&eacute;f&eacute;renc&eacute; dans un objet
- &laquo;&nbsp;VehicleJourney&nbsp;&raquo;, poss&egrave;de un identifiant &laquo;&nbsp;objectId&nbsp;&raquo;
- dans un objet &laquo;&nbsp;Company&nbsp;&raquo;, alors le test est valid&eacute;, sinon le test
- est invalid&eacute; et produit le message &laquo;&nbsp;test 2.20.1&nbsp;: la course XX
- fait r&eacute;f&eacute;rence &agrave; un exploitant inexistant&nbsp;&raquo;.</span></p>
- </td>
- </tr>
-</table>
-
-
-</div>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si l’élément désignant l’exploitant «&nbsp;operatorId&nbsp;» existe
+dans l’objet «&nbsp;VehicleJourney&nbsp;», poursuivre le test, sinon
+abandonner le test</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si un élément désignant l’exploitant «&nbsp;operatorId&nbsp;»<b> </b>,
+référencé dans un objet «&nbsp;VehicleJourney&nbsp;», possède un
+identifiant «&nbsp;objectId&nbsp;» dans un objet «&nbsp;Company&nbsp;»,
+alors le test est validé, sinon le test est invalidé et produit le
+message «&nbsp;test 2.20.1&nbsp;: la course XX fait référence à un
+exploitant inexistant&nbsp;».</font></font></font></p>
diff --git a/app/views/test_sheet/2_21.html b/app/views/test_sheet/2_21.html
index c083741eb..eac7e6cff 100644
--- a/app/views/test_sheet/2_21.html
+++ b/app/views/test_sheet/2_21.html
@@ -1,325 +1,98 @@
-<div class=WordSection1>
-</span></b>
+<h1 class="western" style="border: 1pt solid rgb(0, 0, 0); padding: 0.05cm 0.12cm; margin-top: 0.21cm;" align="center">
+<font face="Arial, sans-serif"><font style="font-size: 20pt;" size="5"><i>
+ point de contrôle N° 2.21<br>
+Référence à une tranche horaire pour les courses<br>
+</i></font></font></h1>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Objectif: </b></u>
+Vérification de la correcte référence des COURSEs COMMERCIALEs (« VehicleJourney » ) à des TRANCHEs HORAIREs («&nbsp;TimeSlot&nbsp;»).<br>
+</font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Priorité: </b></u> Obligatoire (si l’objet «&nbsp;VehicleJourney&nbsp;» existe et s’il contient l’élément «&nbsp;timeSlotId&nbsp;»)</font></p><font face="Arial, sans-serif">
+</font><p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><u><b>Explications:</b></u>
+</font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Lorsque COURSE COMMERCIALE (« VehicleJourney » ), existe, et lorsque
+l’élément «&nbsp;timeSlotId&nbsp;», qui est à caractère optionnel dans
+la COURSE COMMERCIALE (« VehicleJourney » ), est référencé, il convient
+de vérifier qu'il identifie un objet TRANCHE HORAIRE
+(«&nbsp;TimeSlot&nbsp;» ) du réseau.</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>Exemple: </u></b></font></font></font></p>
-<p class=MsoTitle><span style='font-size:14.0pt;font-family:"Tahoma","sans-serif"'>Fiche
-du point de contr&ocirc;le N&deg; 2.21</span></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Représentation schématique de l’objet «&nbsp;VehicleJourney&nbsp;»</font></font></font></p>
+<p><font face="Arial, sans-serif"><img src="image011.jpg" height="618" width="372"></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Exemple d'une course qui référence une tranche horaire</font></font></font></p>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;TimeSlot&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;objectId&gt;AMIV:TimeSlot:0&lt;/objectId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">...<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;VehicleJourney&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;objectId&gt;AMIV:VehicleJourney:8970758&lt;/objectId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;routeId&gt;AMIV:Route:488970&lt;/routeId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;journeyPatternId&gt;AMIV:JourneyPattern:488970M1&lt;/journeyPatternId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;lineIdShortcut&gt;AMIV:Line:014014012&lt;/lineIdShortcut&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;operatorId&gt;AMIV:Company:2422&lt;/operatorId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;timeSlotId&gt;AMIV:TimeSlot:0&lt;/timeSlotId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&nbsp;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;vehicleJourneyAtStop&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;stopPointId&gt;AMIV:StopPoint:488970A0A237816&lt;/stopPointId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;vehicleJourneyId&gt;AMIV:VehicleJourney:8970758&lt;/vehicleJourneyId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;arrivalTime&gt;05:45:00&lt;/arrivalTime&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;departureTime&gt;05:45:00&lt;/departureTime&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;order&gt;1&lt;/order&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;/vehicleJourneyAtStop&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&nbsp;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;vehicleJourneyAtStop&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;stopPointId&gt;AMIV:StopPoint:488970A1A237817&lt;/stopPointId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;vehicleJourneyId&gt;AMIV:VehicleJourney:8970758&lt;/vehicleJourneyId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">...<br></font></span>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>N° test:</u></b>
+2.21.1</font></font></font></p>
-<p class=MsoNormal>&nbsp;</p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Libellé:</u>
+Vérification de la correcte référence des COURSEs COMMERCIALEs&nbsp;<br>(« VehicleJourney » ) à des TRANCHEs HORAIREs («&nbsp;TimeSlot&nbsp;»).</font></font></font></p>
-<table class=MsoNormalTable border=0 cellspacing=0 cellpadding=0 width=648
- style='width:485.7pt;margin-left:-.25pt;border-collapse:collapse'>
- <tr style='page-break-inside:avoid'>
- <td width=648 colspan=2 valign=top style='width:485.7pt;border:solid black 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center;text-indent:0cm;layout-grid-mode:char'><i><span
- style='font-family:"Tahoma","sans-serif";color:navy'>Description</span></i></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 11.35pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Intitul&eacute;</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt;layout-grid-mode:char'><span
- style='font-size:11.0pt;line-height:200%;font-family:"Tahoma","sans-serif"'>R&eacute;f&eacute;rence
- &agrave; une tranche horaire pour les courses.</span></p>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 11.35pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Objectif</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>V&eacute;rification
- de la correcte r&eacute;f&eacute;rence des COURSEs COMMERCIALEs </span></h1>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>(&laquo;
- VehicleJourney &raquo; ) &agrave; des TRANCHEs HORAIREs (&laquo;&nbsp;TimeSlot&nbsp;&raquo;).</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 11.35pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>R&eacute;f&eacute;rences</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>TRIDENT/profil
- CHOUETTE/Transmodel V4 et V5.1</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 11.35pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:-6.65pt;margin-bottom:
- 6.0pt;margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>N&deg; de fiche(s)
- connexe(s)</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-left:0cm;text-align:left;text-indent:0cm;
- layout-grid-mode:char'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>&nbsp;</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 11.35pt 0cm 3.5pt;
- height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt;layout-grid-mode:char'><b><span
- style='font-family:"Tahoma","sans-serif"'>Priorit&eacute;<span style='color:red'> </span></span></b></p>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Obligatoire
- (si l&rsquo;objet &laquo;&nbsp;VehicleJourney&nbsp;&raquo; existe et s&rsquo;il contient l&rsquo;&eacute;l&eacute;ment
- &laquo;&nbsp;timeSlotId&nbsp;&raquo;)</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 11.35pt 0cm 3.5pt;
- height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt;layout-grid-mode:char'><b><span
- style='font-family:"Tahoma","sans-serif"'>R&eacute;sultat</span></b></p>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Conforme
- ou non conforme</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=648 colspan=2 valign=top style='width:485.7pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center;text-indent:0cm;layout-grid-mode:char'><i><span
- style='font-family:"Tahoma","sans-serif";color:navy'>Mise en &oelig;uvre</span></i></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=100 valign=top style='width:74.85pt;border-top:none;border-left:
- solid black 1.0pt;border-bottom:solid black 1.0pt;border-right:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm;layout-grid-mode:char'><span style='font-size:11.0pt'>Explication</span></h1>
- </td>
- <td width=548 valign=top style='width:410.85pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm;layout-grid-mode:char'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'>Lorsque COURSE
- COMMERCIALE (&laquo; VehicleJourney &raquo; ), existe, et lorsque l&rsquo;&eacute;l&eacute;ment
- &laquo;&nbsp;timeSlotId&nbsp;&raquo;, qui est &agrave; caract&egrave;re optionnel dans la COURSE
- COMMERCIALE (&laquo; VehicleJourney &raquo; ), est r&eacute;f&eacute;renc&eacute;, il convient de v&eacute;rifier
- qu'il identifie un objet TRANCHE HORAIRE (&laquo;&nbsp;TimeSlot&nbsp;&raquo; ) du r&eacute;seau.</span></h1>
- </td>
- </tr>
-</table>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Champ d’application:</u>
+&lt;VehicleJourney&gt;&nbsp;&lt;TimeSlot&gt;</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Vérification:</u> </font></font></font></p>
-<p class=MsoNormal>&nbsp;</p>
-
-<table class=MsoNormalTable border=0 cellspacing=0 cellpadding=0 width=630
- style='width:472.45pt;margin-left:-.25pt;border-collapse:collapse'>
- <tr>
- <td width=108 valign=top style='width:81.35pt;border:solid black 1.0pt;
- border-right:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm;layout-grid-mode:char'><b><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>Exemple</span></b></p>
- </td>
- <td width=108 valign=top style='width:81.35pt;border:solid black 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=left style='margin-left:18.0pt;text-align:left;text-indent:0cm;
- layout-grid-mode:char'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>&nbsp;</span></h1>
- <h1 align=left style='margin-left:18.0pt;text-align:left;text-indent:0cm'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Repr&eacute;sentation
- sch&eacute;matique de l&rsquo;objet &laquo;&nbsp;VehicleJourney&nbsp;&raquo;</span></h1>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal> </p>
- <p class=MsoNormal align=center style='text-align:center'><img width=372
- height=618 src="BATERI_Neptune_FINAL-V2_0a_fichiers/image011.jpg"></p>
- <h1 align=left style='margin-left:18.0pt;text-align:left;text-indent:0cm'><span
- style='font-size:11.0pt;font-weight:normal'>&nbsp;</span></h1>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <h3 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Exemple
- d'une course qui r&eacute;f&eacute;rence une tranche horaire</span></h3>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;TimeSlot&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;objectId&gt;AMIV:TimeSlot:0&lt;/objectId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>...</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;VehicleJourney&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;objectId&gt;AMIV:VehicleJourney:8970758&lt;/objectId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;routeId&gt;AMIV:Route:488970&lt;/routeId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;journeyPatternId&gt;AMIV:JourneyPattern:488970M1&lt;/journeyPatternId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;lineIdShortcut&gt;AMIV:Line:014014012&lt;/lineIdShortcut&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;operatorId&gt;AMIV:Company:2422&lt;/operatorId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;timeSlotId&gt;AMIV:TimeSlot:0&lt;/timeSlotId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&nbsp;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;vehicleJourneyAtStop&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;stopPointId&gt;AMIV:StopPoint:488970A0A237816&lt;/stopPointId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;vehicleJourneyId&gt;AMIV:VehicleJourney:8970758&lt;/vehicleJourneyId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;arrivalTime&gt;05:45:00&lt;/arrivalTime&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;departureTime&gt;05:45:00&lt;/departureTime&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;order&gt;1&lt;/order&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;/vehicleJourneyAtStop&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&nbsp;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;vehicleJourneyAtStop&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;stopPointId&gt;AMIV:StopPoint:488970A1A237817&lt;/stopPointId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;vehicleJourneyId&gt;AMIV:VehicleJourney:8970758&lt;/vehicleJourneyId&gt;</span></p>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><span lang=EN-US style='font-size:10.0pt;font-family:
- "Courier New"'>...</span></p>
- </td>
- </tr>
- <tr style='page-break-inside:avoid'>
- <td width=630 colspan=2 valign=top style='width:472.45pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h2 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center;text-indent:0cm;layout-grid-mode:char'><i><span
- lang=EN-US style='font-size:14.0pt;color:navy'>Evaluation</span></i></h2>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- solid black 1.0pt;border-bottom:solid black 1.0pt;border-right:none;
- padding:5.65pt 11.35pt 5.65pt 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm;layout-grid-mode:char'><span lang=EN-US style='font-size:
- 11.0pt'>N&deg; test</span></h1>
- </td>
- <td width=108 valign=top style='width:81.35pt;border:solid black 1.0pt;
- border-top:none;padding:5.65pt 11.35pt 5.65pt 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm;layout-grid-mode:char'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'>2.21.1</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- solid black 1.0pt;border-bottom:solid black 1.0pt;border-right:none;
- padding:5.65pt 11.35pt 5.65pt 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm;layout-grid-mode:char'><span style='font-size:11.0pt'>Libell&eacute;</span></h1>
- </td>
- <td width=108 valign=top style='width:81.35pt;border:solid black 1.0pt;
- border-top:none;padding:5.65pt 11.35pt 5.65pt 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm;layout-grid-mode:char'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'>V&eacute;rification de la
- correcte r&eacute;f&eacute;rence des COURSEs COMMERCIALEs </span></h1>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm;layout-grid-mode:char'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'>(&laquo; VehicleJourney &raquo; ) &agrave;
- des TRANCHEs HORAIREs (&laquo;&nbsp;TimeSlot&nbsp;&raquo;).</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- solid black 1.0pt;border-bottom:solid black 1.0pt;border-right:none;
- padding:5.65pt 11.35pt 5.65pt 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:-14.75pt;margin-bottom:6.0pt;
- margin-left:0cm;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Champ
- d&rsquo;application</span></h1>
- </td>
- <td width=108 valign=top style='width:81.35pt;border:solid black 1.0pt;
- border-top:none;padding:5.65pt 11.35pt 5.65pt 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm;layout-grid-mode:char'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'>&lt;VehicleJourney&gt;</span></h1>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm;text-align:justify;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>&lt;TimeSlot&gt;</span></p>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- solid black 1.0pt;border-bottom:solid black 1.0pt;border-right:none;
- padding:5.65pt 11.35pt 5.65pt 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm;layout-grid-mode:char'><span style='font-size:11.0pt'>V&eacute;rification</span></h1>
- </td>
- <td width=108 valign=top style='width:81.35pt;border:solid black 1.0pt;
- border-top:none;padding:5.65pt 11.35pt 5.65pt 3.5pt;height:37.4pt'>
- <h1 style='layout-grid-mode:char'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif";font-weight:normal'>&nbsp;</span></h1>
- <h1 style='margin-left:0cm;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>-
- Si l&rsquo;objet de course &laquo;&nbsp;VehicleJourney&nbsp;&raquo; existe, poursuivre le test,
- sinon abandonner le test</span></h1>
- <h1 style='margin-left:0cm;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>-
- Si l&rsquo;&eacute;l&eacute;ment de fr&eacute;quence &laquo;&nbsp;timeSlotId&nbsp;&raquo; existe dans l&rsquo;objet de
- course &laquo;&nbsp;VehicleJourney&nbsp;&raquo;, poursuivre le test, sinon abandonner le
- test</span></h1>
- <p class=MsoBodyText3 align=left style='text-align:left'><span
- style='font-family:"Tahoma","sans-serif"'>- Si un &eacute;l&eacute;ment de fr&eacute;quence
- &laquo;&nbsp;timeSlotId&nbsp;&raquo;<b> </b>, r&eacute;f&eacute;renc&eacute; dans un objet de course
- &laquo;&nbsp;VehicleJourney&nbsp;&raquo;, poss&egrave;de un identifiant &laquo;&nbsp;objectId&nbsp;&raquo;
- dans un objet de fr&eacute;quence &laquo;&nbsp;TimeSlot&nbsp;&raquo;, alors le test est valid&eacute;,
- sinon le test est invalid&eacute; et produit le message &laquo;&nbsp;test 2.21.1&nbsp;: la
- course XX fait r&eacute;f&eacute;rence &agrave; une tranche horaire inexistante&nbsp;&raquo;.</span></p>
- </td>
- </tr>
-</table>
-
-
-</div>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si l’objet de course «&nbsp;VehicleJourney&nbsp;» existe, poursuivre le test, sinon abandonner le test</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si l’élément de fréquence «&nbsp;timeSlotId&nbsp;» existe dans
+l’objet de course «&nbsp;VehicleJourney&nbsp;», poursuivre le test,
+sinon abandonner le test</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si un élément de fréquence «&nbsp;timeSlotId&nbsp;»<b> </b>,
+référencé dans un objet de course «&nbsp;VehicleJourney&nbsp;», possède
+un identifiant «&nbsp;objectId&nbsp;» dans un objet de fréquence
+«&nbsp;TimeSlot&nbsp;», alors le test est validé, sinon le test est
+invalidé et produit le message «&nbsp;test 2.21.1&nbsp;: la course XX
+fait référence à une tranche horaire inexistante&nbsp;».</font></font></font></p>
diff --git a/app/views/test_sheet/2_22.html b/app/views/test_sheet/2_22.html
index 258bb16e9..916b26628 100644
--- a/app/views/test_sheet/2_22.html
+++ b/app/views/test_sheet/2_22.html
@@ -1,350 +1,104 @@
-<div class=WordSection1>
-</span></b>
+<h1 class="western" style="border: 1pt solid rgb(0, 0, 0); padding: 0.05cm 0.12cm; margin-top: 0.21cm;" align="center">
+<font face="Arial, sans-serif"><font style="font-size: 20pt;" size="5"><i>
+ point de contrôle N° 2.22<br>
+Cohérence entre les points d'arrêts et les heures de passage<br>
+</i></font></font></h1>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Objectif: </b></u>
+Vérifier la correcte référence à un POINT D’ARRÊT SUR PARCOURS
+(«&nbsp;StopPoint&nbsp;») pour les HEUREs DE PASSAGE GRAPHIQUées/Chouette («&nbsp;VehicleJourneyAtStop&nbsp;»).<br>
+</font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Priorité: </b></u> Obligatoire (si l’objet «&nbsp;VehicleJourney&nbsp;»)</font></p><font face="Arial, sans-serif">
+</font><p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><u><b>Explications:</b></u>
+</font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Lorsque l’objet de course COURSE COMMERCIALE (« VehicleJourney » )
+existe, et pour chaque «&nbsp;VehicleJourneyAtStop&nbsp;», qui est à
+caractère obligatoire dans la course, il convient de vérifier que
+l'identifiant «&nbsp;stopPointId&nbsp;», qui est à son tour obligatoire
+dans les «&nbsp;VehicleJourneyAtStop&nbsp;», correspond à l'identifiant
+«&nbsp;objectId&nbsp;» d'un «&nbsp;StopPoint&nbsp;» du réseau.</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>Exemple: </u></b></font></font></font></p>
-<p class=MsoTitle><span style='font-size:14.0pt;font-family:"Tahoma","sans-serif"'>Fiche
-du point de contr&ocirc;le N&deg; 2.22</span></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+&nbsp;Représentation schématique de l’objet «&nbsp;VehicleJourneyAtStop&nbsp;»</font></font></font></p>
+<p><font face="Arial, sans-serif"><img src="image012.jpg" height="338" width="433"></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Exemple d'un heure de passage qui référence un point d'arrêt</font></font></font></p>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">...<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;StopPoint&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;objectId&gt;AMIV:StopPoint:488970A0A237816&lt;/objectId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;objectVersion&gt;1&lt;/objectVersion&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">...<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;VehicleJourney&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;objectId&gt;AMIV:VehicleJourney:8970758&lt;/objectId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;routeId&gt;AMIV:Route:488970&lt;/routeId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;journeyPatternId&gt;AMIV:JourneyPattern:488970M1&lt;/journeyPatternId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;lineIdShortcut&gt;AMIV:Line:014014012&lt;/lineIdShortcut&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;operatorId&gt;AMIV:Company:2422&lt;/operatorId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;timeSlotId&gt;AMIV:TimeSlot:0&lt;/timeSlotId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&nbsp;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;vehicleJourneyAtStop&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;stopPointId&gt;AMIV:StopPoint:488970A0A237816&lt;/stopPointId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;vehicleJourneyId&gt;AMIV:VehicleJourney:8970758&lt;/vehicleJourneyId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;arrivalTime&gt;05:45:00&lt;/arrivalTime&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;departureTime&gt;05:45:00&lt;/departureTime&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;order&gt;1&lt;/order&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;/vehicleJourneyAtStop&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&nbsp;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;vehicleJourneyAtStop&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;stopPointId&gt;AMIV:StopPoint:488970A1A237817&lt;/stopPointId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;vehicleJourneyId&gt;AMIV:VehicleJourney:8970758&lt;/vehicleJourneyId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">...<br></font></span>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>N° test:</u></b>
+2.22.1</font></font></font></p>
-<p class=MsoSubtitle>&nbsp;</p>
-<p class=MsoNormal>&nbsp;</p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Libellé:</u>
+Vérifier la correcte référence à un POINT D’ARRÊT SUR PARCOURS («&nbsp;StopPoint&nbsp;») pour les HEUREs DE PASSAGE GRAPHIQUées/Chouette («&nbsp;VehicleJourneyAtStop&nbsp;»).</font></font></font></p>
-<table class=MsoNormalTable border=0 cellspacing=0 cellpadding=0 width=657
- style='width:492.8pt;margin-left:-.25pt;border-collapse:collapse'>
- <tr style='page-break-inside:avoid'>
- <td width=657 colspan=2 valign=top style='width:492.8pt;border:solid black 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center;text-indent:0cm;layout-grid-mode:char'><i><span
- style='font-family:"Tahoma","sans-serif";color:navy'>Description</span></i></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 11.35pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Intitul&eacute;</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt;layout-grid-mode:char'><span
- style='font-size:11.0pt;line-height:200%;font-family:"Tahoma","sans-serif"'>Coh&eacute;rence
- entre les points d'arr&ecirc;ts et les heures de passage.</span></p>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 11.35pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Objectif</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>V&eacute;rifier
- la correcte r&eacute;f&eacute;rence &agrave; un POINT D&rsquo;ARR&Ecirc;T SUR PARCOURS
- (&laquo;&nbsp;StopPoint&nbsp;&raquo;) pour les HEUREs DE PASSAGE GRAPHIQU</span><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";text-transform:
- uppercase;font-weight:normal'>&eacute;e</span><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'>s/Chouette
- (&laquo;&nbsp;VehicleJourneyAtStop&nbsp;&raquo;).</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 11.35pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>R&eacute;f&eacute;rences</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>TRIDENT/profil
- CHOUETTE/Transmodel V4 et V5.1</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 11.35pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:-6.65pt;margin-bottom:
- 6.0pt;margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>N&deg;de fiche(s)
- connexe(s)</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:0cm;
- margin-left:0cm;margin-bottom:.0001pt;text-align:left;text-indent:0cm;
- layout-grid-mode:char'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>1.2 (v&eacute;rifier qu&rsquo;il existe au moins 2 HEURES DE PASSAGE
- GRAPHIQUEES/Chouette pour une COURSE COMMERCIALE (&laquo; VehicleJourney &raquo; )</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 11.35pt 0cm 3.5pt;
- height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt;layout-grid-mode:char'><b><span
- style='font-family:"Tahoma","sans-serif"'>Priorit&eacute;<span style='color:red'> </span></span></b></p>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Obligatoire
- (si l&rsquo;objet &laquo;&nbsp;VehicleJourney&nbsp;&raquo;)</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 11.35pt 0cm 3.5pt;
- height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt;layout-grid-mode:char'><b><span
- style='font-family:"Tahoma","sans-serif"'>R&eacute;sultat</span></b></p>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Conforme
- ou non conforme</span></h1>
- </td>
- </tr>
- <tr style='page-break-inside:avoid'>
- <td width=657 colspan=2 valign=top style='width:492.8pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center;text-indent:0cm;layout-grid-mode:char'><i><span
- style='font-family:"Tahoma","sans-serif";color:navy'>Mise en &oelig;uvre</span></i></h1>
- </td>
- </tr>
- <tr>
- <td width=100 valign=top style='width:74.85pt;border-top:none;border-left:
- solid black 1.0pt;border-bottom:solid black 1.0pt;border-right:none;
- padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm;layout-grid-mode:char'><span style='font-size:11.0pt'>Explication</span></h1>
- </td>
- <td width=557 valign=top style='width:417.95pt;border:solid black 1.0pt;
- border-top:none;padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm;layout-grid-mode:char'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'>Lorsque l&rsquo;objet de
- course COURSE COMMERCIALE (&laquo; VehicleJourney &raquo; ) existe, et pour chaque
- &laquo;&nbsp;VehicleJourneyAtStop&nbsp;&raquo;, qui est &agrave; caract&egrave;re obligatoire dans la
- course, il convient de v&eacute;rifier que l'identifiant &laquo;&nbsp;stopPointId&nbsp;&raquo;,
- qui est &agrave; son tour obligatoire dans les &laquo;&nbsp;VehicleJourneyAtStop&nbsp;&raquo;,
- correspond &agrave; l'identifiant &laquo;&nbsp;objectId&nbsp;&raquo; d'un &laquo;&nbsp;StopPoint&nbsp;&raquo;
- du r&eacute;seau.</span></h1>
- </td>
- </tr>
-</table>
-<p class=MsoNormal>&nbsp;</p>
-<table class=MsoNormalTable border=0 cellspacing=0 cellpadding=0 width=648
- style='width:485.7pt;margin-left:-.25pt;border-collapse:collapse'>
- <tr>
- <td width=108 valign=top style='width:81.35pt;border:solid black 1.0pt;
- border-right:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm;layout-grid-mode:char'><b><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>Exemple</span></b></p>
- </td>
- <td width=548 valign=top style='width:410.85pt;border:solid black 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=left style='margin-left:18.0pt;text-align:left;text-indent:0cm;
- layout-grid-mode:char'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>&nbsp;</span></h1>
- <h1 align=left style='margin-left:18.0pt;text-align:left;text-indent:0cm'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Repr&eacute;sentation
- sch&eacute;matique de l&rsquo;objet &laquo;&nbsp;VehicleJourneyAtStop&nbsp;&raquo;</span></h1>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
- <p class=MsoNormal align=center style='text-align:center'><img width=433
- height=338 src="BATERI_Neptune_FINAL-V2_0a_fichiers/image012.jpg"></p>
- <p class=MsoNormal> </p>
- <h1 align=left style='margin-left:18.0pt;text-align:left;text-indent:0cm'><span
- style='font-size:11.0pt;font-weight:normal'>&nbsp;</span></h1>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <h3 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Exemple
- d'un heure de passage qui r&eacute;f&eacute;rence un point d'arr&ecirc;t</span></h3>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>...</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;StopPoint&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;objectId&gt;AMIV:StopPoint:488970A0A237816&lt;/objectId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;objectVersion&gt;1&lt;/objectVersion&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>...</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;VehicleJourney&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;objectId&gt;AMIV:VehicleJourney:8970758&lt;/objectId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;routeId&gt;AMIV:Route:488970&lt;/routeId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;journeyPatternId&gt;AMIV:JourneyPattern:488970M1&lt;/journeyPatternId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;lineIdShortcut&gt;AMIV:Line:014014012&lt;/lineIdShortcut&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;operatorId&gt;AMIV:Company:2422&lt;/operatorId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;timeSlotId&gt;AMIV:TimeSlot:0&lt;/timeSlotId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&nbsp;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;vehicleJourneyAtStop&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;stopPointId&gt;AMIV:StopPoint:488970A0A237816&lt;/stopPointId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;vehicleJourneyId&gt;AMIV:VehicleJourney:8970758&lt;/vehicleJourneyId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;arrivalTime&gt;05:45:00&lt;/arrivalTime&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;departureTime&gt;05:45:00&lt;/departureTime&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;order&gt;1&lt;/order&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;/vehicleJourneyAtStop&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&nbsp;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;vehicleJourneyAtStop&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;stopPointId&gt;AMIV:StopPoint:488970A1A237817&lt;/stopPointId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;vehicleJourneyId&gt;AMIV:VehicleJourney:8970758&lt;/vehicleJourneyId&gt;</span></p>
- <h3 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm'><span lang=EN-US style='font-size:10.0pt;font-family:
- "Courier New"'>...</span><span lang=EN-US> </span></h3>
- </td>
- </tr>
- <tr style='page-break-inside:avoid'>
- <td width=648 colspan=2 valign=top style='width:485.7pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h2 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center;text-indent:0cm;layout-grid-mode:char'><i><span
- lang=EN-US style='font-size:14.0pt;color:navy'>Evaluation</span></i></h2>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- solid black 1.0pt;border-bottom:solid black 1.0pt;border-right:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm;layout-grid-mode:char'><span lang=EN-US style='font-size:
- 11.0pt'>N&deg; test</span></h1>
- </td>
- <td width=108 valign=top style='width:81.35pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm;layout-grid-mode:char'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'>2.22.1</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- solid black 1.0pt;border-bottom:solid black 1.0pt;border-right:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm;layout-grid-mode:char'><span style='font-size:11.0pt'>Libell&eacute;</span></h1>
- </td>
- <td width=108 valign=top style='width:81.35pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm;layout-grid-mode:char'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'>V&eacute;rifier la correcte
- r&eacute;f&eacute;rence &agrave; un POINT D&rsquo;ARR&Ecirc;T SUR PARCOURS (&laquo;&nbsp;StopPoint&nbsp;&raquo;) pour les
- HEUREs DE PASSAGE GRAPHIQU</span><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif";text-transform:uppercase;font-weight:normal'>&eacute;e</span><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>s/Chouette
- (&laquo;&nbsp;VehicleJourneyAtStop&nbsp;&raquo;).</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- solid black 1.0pt;border-bottom:solid black 1.0pt;border-right:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm;layout-grid-mode:char'><span lang=EN-US style='font-size:
- 11.0pt'>Champ d&rsquo;application</span></h1>
- </td>
- <td width=108 valign=top style='width:81.35pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm;layout-grid-mode:char'><span lang=EN-US style='font-size:
- 11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>&lt;VehicleJourneyAtStop&gt;</span></h1>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm;layout-grid-mode:char'><span lang=EN-US style='font-size:
- 11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>&lt;VehicleJourney&gt;</span></h1>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm;layout-grid-mode:char'><span lang=EN-US style='font-size:
- 11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>&lt;StopPoint&gt;</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- solid black 1.0pt;border-bottom:solid black 1.0pt;border-right:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm;layout-grid-mode:char'><span style='font-size:11.0pt'>V&eacute;rification</span></h1>
- </td>
- <td width=108 valign=top style='width:81.35pt;border:solid black 1.0pt;
- border-top:none;padding:5.65pt 11.35pt 5.65pt 3.5pt;height:37.4pt'>
- <h1 style='margin-left:0cm;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>&nbsp;</span></h1>
- <h1 style='margin-left:0cm;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>-
- Si l&rsquo;objet de course &laquo;&nbsp;VehicleJourney&nbsp;&raquo; existe, poursuivre le test,
- sinon abandonner le test</span></h1>
- <p class=MsoNormal><span style='font-family:"Tahoma","sans-serif"'>&nbsp;</span></p>
- <p class=MsoBodyText3 align=left style='text-align:left'><span
- style='font-family:"Tahoma","sans-serif"'>- Si &laquo;&nbsp;StopPointId&nbsp;&raquo;<b> </b>r&eacute;f&eacute;renc&eacute;
- dans &laquo;&nbsp;VehicleJourneyAtStop&nbsp;&raquo;, correspond &agrave; un identifiant
- &laquo;&nbsp;objectId&nbsp;&raquo; dans &laquo;&nbsp;StopPoint&nbsp;&raquo;, alors le test est
- valid&eacute;, sinon le test est invalid&eacute; et produit le message &laquo;&nbsp;test
- 2.22.1&nbsp;: une heure de passage XX fait r&eacute;f&eacute;rence &agrave; un point d&rsquo;arr&ecirc;t (&laquo;
- StopPoint &raquo;) inexistant&nbsp;&raquo;.</span></p>
- <h1 style='margin-left:0cm;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>&nbsp;</span></h1>
- </td>
- </tr>
-</table>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2"><span style="text-decoration: underline;">
+Champ d’application:</span>&nbsp;&lt;VehicleJourneyAtStop&gt;&nbsp;&lt;VehicleJourney&gt;&nbsp;&lt;StopPoint&gt;</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Vérification:</u> </font></font></font></p>
-</div>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si l’objet de course «&nbsp;VehicleJourney&nbsp;» existe, poursuivre le test, sinon abandonner le test</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si «&nbsp;StopPointId&nbsp;»<b> </b>référencé
+dans «&nbsp;VehicleJourneyAtStop&nbsp;», correspond à un identifiant
+«&nbsp;objectId&nbsp;» dans «&nbsp;StopPoint&nbsp;», alors le test est
+validé, sinon le test est invalidé et produit le message «&nbsp;test
+2.22.1&nbsp;: une heure de passage XX fait référence à un point d’arrêt
+(« StopPoint ») inexistant&nbsp;».</font></font></font></p>
+
diff --git a/app/views/test_sheet/2_23.html b/app/views/test_sheet/2_23.html
index dc5d20ad6..ef2a4e775 100644
--- a/app/views/test_sheet/2_23.html
+++ b/app/views/test_sheet/2_23.html
@@ -1,354 +1,99 @@
-<div class=WordSection1>
-</span></b>
+<h1 class="western" style="border: 1pt solid rgb(0, 0, 0); padding: 0.05cm 0.12cm; margin-top: 0.21cm;" align="center">
+<font face="Arial, sans-serif"><font style="font-size: 20pt;" size="5"><i>
+ point de contrôle N° 2.23<br>
+Cohérence entre les courses et des heures de passage<br>
+</i></font></font></h1>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Objectif: </b></u>
+Vérification de la correcte référence à une COURSE COMMERCIALE («
+VehicleJourney ») dans HEURE DE PASSAGE GRAPHIQUEE/Chouette
+(«&nbsp;VehicleJourneyAtStop&nbsp;»).<br>
+</font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Priorité: </b></u>
+Obligatoire (si l’objet «&nbsp;VehicleJourney&nbsp;» existe et si ses
+«&nbsp;VehicleJourneyAtStop&nbsp;» référencent l'identifiant
+«&nbsp;vehicleJourneyId&nbsp;»)</font></p><font face="Arial, sans-serif">
+</font><p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><u><b>Explications:</b></u>
+</font></font></p>
-<p class=MsoTitle><span style='font-size:14.0pt;font-family:"Tahoma","sans-serif"'>Fiche
-du point de contr&ocirc;le N&deg; 2.23</span></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Pour chaque HEURE DE PASSAGE GRAPHIQUEE/Chouette
+(«&nbsp;VehicleJourneyAtStop&nbsp;») la référence à la COURSE
+COMMERCIALE&nbsp;(«
+VehicleJourney » ) à travers «&nbsp;vehicleJourneyId&nbsp;», est
+optionnelle. Si elle est utilisée, vérifier qu’elle correspond à un
+identifiant de COURSE COMMERCIALE (« VehicleJourney » ) définie.</font></font></font></p>
-<p class=MsoNormal>&nbsp;</p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>Exemple: </u></b></font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Représentation schématique de l’objet «&nbsp;VehicleJourneyAtStop&nbsp;»</font></font></font></p>
+<p><font face="Arial, sans-serif"><img src="image012.jpg" height="338" width="433"></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Exemple d'un temps d'attente qui référence la course qui le contient</font></font></font></p>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">...<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;VehicleJourney&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;objectId&gt;AMIV:VehicleJourney:8970758&lt;/objectId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;routeId&gt;AMIV:Route:488970&lt;/routeId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;journeyPatternId&gt;AMIV:JourneyPattern:488970M1&lt;/journeyPatternId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;lineIdShortcut&gt;AMIV:Line:014014012&lt;/lineIdShortcut&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;operatorId&gt;AMIV:Company:2422&lt;/operatorId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;timeSlotId&gt;AMIV:TimeSlot:0&lt;/timeSlotId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&nbsp;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;vehicleJourneyAtStop&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;stopPointId&gt;AMIV:StopPoint:488970A0A237816&lt;/stopPointId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;vehicleJourneyId&gt;AMIV:VehicleJourney:8970758&lt;/vehicleJourneyId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;arrivalTime&gt;05:45:00&lt;/arrivalTime&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;departureTime&gt;05:45:00&lt;/departureTime&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;order&gt;1&lt;/order&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;/vehicleJourneyAtStop&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&nbsp;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;vehicleJourneyAtStop&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;stopPointId&gt;AMIV:StopPoint:488970A1A237817&lt;/stopPointId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;vehicleJourneyId&gt;AMIV:VehicleJourney:8970758&lt;/vehicleJourneyId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">...<br></font></span>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>N° test:</u></b>
+2.23.1</font></font></font></p>
-<table class=MsoNormalTable border=0 cellspacing=0 cellpadding=0 width=657
- style='width:492.8pt;margin-left:-.25pt;border-collapse:collapse'>
- <tr style='page-break-inside:avoid'>
- <td width=657 colspan=2 valign=top style='width:492.8pt;border:solid black 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center;text-indent:0cm;layout-grid-mode:char'><i><span
- style='font-family:"Tahoma","sans-serif";color:navy'>Description</span></i></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 11.35pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Intitul&eacute;</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt;layout-grid-mode:char'><span
- style='font-size:11.0pt;line-height:200%;font-family:"Tahoma","sans-serif"'>Coh&eacute;rence
- entre les courses et des heures de passage.</span></p>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 11.35pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Objectif</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>V&eacute;rification
- de la correcte r&eacute;f&eacute;rence &agrave; une COURSE COMMERCIALE (&laquo; VehicleJourney &raquo;) dans
- HEURE DE PASSAGE GRAPHIQUEE/Chouette (&laquo;&nbsp;VehicleJourneyAtStop&nbsp;&raquo;).</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 11.35pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>R&eacute;f&eacute;rences</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>TRIDENT/profil
- CHOUETTE/Transmodel V4 et V5.1</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 11.35pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:-6.65pt;margin-bottom:
- 6.0pt;margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>N&deg; de fiche(s)
- connexe(s)</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-left:0cm;text-align:left;text-indent:0cm;
- layout-grid-mode:char'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>&nbsp;</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 11.35pt 0cm 3.5pt;
- height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt;layout-grid-mode:char'><b><span
- style='font-family:"Tahoma","sans-serif"'>Priorit&eacute;<span style='color:red'> </span></span></b></p>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Obligatoire
- (si l&rsquo;objet &laquo;&nbsp;VehicleJourney&nbsp;&raquo; existe et si ses
- &laquo;&nbsp;VehicleJourneyAtStop&nbsp;&raquo; r&eacute;f&eacute;rencent l'identifiant
- &laquo;&nbsp;vehicleJourneyId&nbsp;&raquo;)</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 11.35pt 0cm 3.5pt;
- height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt;layout-grid-mode:char'><b><span
- style='font-family:"Tahoma","sans-serif"'>R&eacute;sultat</span></b></p>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Conforme
- ou non conforme</span></h1>
- </td>
- </tr>
- <tr style='page-break-inside:avoid'>
- <td width=657 colspan=2 valign=top style='width:492.8pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center;text-indent:0cm;layout-grid-mode:char'><i><span
- style='font-family:"Tahoma","sans-serif";color:navy'>Mise en &oelig;uvre</span></i></h1>
- </td>
- </tr>
- <tr>
- <td width=100 valign=top style='width:74.85pt;border-top:none;border-left:
- solid black 1.0pt;border-bottom:solid black 1.0pt;border-right:none;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm;layout-grid-mode:char'><span style='font-size:11.0pt'>Explication</span></h1>
- </td>
- <td width=557 valign=top style='width:417.95pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:11.35pt;margin-bottom:6.0pt;
- margin-left:0cm;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Pour
- chaque HEURE DE PASSAGE GRAPHIQUEE/Chouette
- (&laquo;&nbsp;VehicleJourneyAtStop&nbsp;&raquo;) la r&eacute;f&eacute;rence &agrave; la COURSE COMMERCIALE</span></h1>
- <h1 style='margin-top:6.0pt;margin-right:11.35pt;margin-bottom:6.0pt;
- margin-left:0cm;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>(&laquo;
- VehicleJourney &raquo; ) &agrave; travers &laquo;&nbsp;vehicleJourneyId&nbsp;&raquo;, est
- optionnelle. Si elle est utilis&eacute;e, v&eacute;rifier qu&rsquo;elle correspond &agrave; un
- identifiant de COURSE COMMERCIALE (&laquo; VehicleJourney &raquo; ) d&eacute;finie. </span></h1>
- <h1 style='margin-top:6.0pt;margin-right:11.35pt;margin-bottom:6.0pt;
- margin-left:0cm;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>&nbsp;</span></h1>
- </td>
- </tr>
-</table>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Libellé:</u>
+Vérification de la correcte référence à une COURSE COMMERCIALE&nbsp;(« VehicleJourney ») dans HEURE DE PASSAGE GRAPHIQUEE/Chouette («&nbsp;VehicleJourneyAtStop&nbsp;»).</font></font></font></p>
-<p class=MsoNormal>&nbsp;</p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Champ d’application:</u>
+&lt;VehicleJourneyAtStop&gt;&nbsp;&lt;VehicleJourney&gt;</font></font></font></p>
-<table class=MsoNormalTable border=0 cellspacing=0 cellpadding=0 width=648
- style='width:485.7pt;margin-left:-.25pt;border-collapse:collapse'>
- <tr>
- <td width=108 valign=top style='width:81.35pt;border:solid black 1.0pt;
- border-right:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm;layout-grid-mode:char'><b><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>Exemple</span></b></p>
- </td>
- <td width=548 valign=top style='width:410.85pt;border:solid black 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=left style='margin-left:18.0pt;text-align:left;text-indent:0cm;
- layout-grid-mode:char'><span style='font-size:11.0pt;font-weight:normal'>&nbsp;</span></h1>
- <h1 align=left style='margin-left:18.0pt;text-align:left;text-indent:0cm'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Repr&eacute;sentation
- sch&eacute;matique de l&rsquo;objet &laquo;&nbsp;VehicleJourneyAtStop&nbsp;&raquo;</span></h1>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
- <p class=MsoNormal align=center style='text-align:center'><img width=433
- height=338 src="BATERI_Neptune_FINAL-V2_0a_fichiers/image012.jpg"></p>
- <p class=MsoNormal> </p>
- <h1 align=left style='margin-left:18.0pt;text-align:left;text-indent:0cm'><span
- style='font-size:11.0pt;font-weight:normal'>&nbsp;</span></h1>
- <h3 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm'>&nbsp;</h3>
- <h3 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm'>&nbsp;</h3>
- <h3 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm'>&nbsp;</h3>
- <h3 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm'>&nbsp;</h3>
- <h3 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm'>&nbsp;</h3>
- <h3 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm'>&nbsp;</h3>
- <h3 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm'>&nbsp;</h3>
- <h3 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm'>&nbsp;</h3>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <h3 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm'>&nbsp;</h3>
- <h3 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm'>&nbsp;</h3>
- <h3 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm'>&nbsp;</h3>
- <h3 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm'>&nbsp;</h3>
- <h3 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm'>&nbsp;</h3>
- <h3 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm'>&nbsp;</h3>
- <h3 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm'>&nbsp;</h3>
- <h3 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm'>&nbsp;</h3>
- <h3 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm'>&nbsp;</h3>
- <h3 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Exemple
- d'un temps d'attente qui r&eacute;f&eacute;rence la course qui le contient</span></h3>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>...</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;VehicleJourney&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;objectId&gt;AMIV:VehicleJourney:8970758&lt;/objectId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;routeId&gt;AMIV:Route:488970&lt;/routeId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;journeyPatternId&gt;AMIV:JourneyPattern:488970M1&lt;/journeyPatternId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;lineIdShortcut&gt;AMIV:Line:014014012&lt;/lineIdShortcut&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;operatorId&gt;AMIV:Company:2422&lt;/operatorId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;timeSlotId&gt;AMIV:TimeSlot:0&lt;/timeSlotId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&nbsp;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;vehicleJourneyAtStop&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;stopPointId&gt;AMIV:StopPoint:488970A0A237816&lt;/stopPointId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;vehicleJourneyId&gt;AMIV:VehicleJourney:8970758&lt;/vehicleJourneyId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;arrivalTime&gt;05:45:00&lt;/arrivalTime&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;departureTime&gt;05:45:00&lt;/departureTime&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;order&gt;1&lt;/order&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;/vehicleJourneyAtStop&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&nbsp;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;vehicleJourneyAtStop&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;stopPointId&gt;AMIV:StopPoint:488970A1A237817&lt;/stopPointId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;vehicleJourneyId&gt;AMIV:VehicleJourney:8970758&lt;/vehicleJourneyId&gt;</span></p>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><span lang=EN-US style='font-size:10.0pt;font-family:
- "Courier New"'>...</span><span lang=EN-US> </span></p>
- </td>
- </tr>
- <tr style='page-break-inside:avoid'>
- <td width=100 colspan=2 valign=top style='width:74.85pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h2 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center;text-indent:0cm;layout-grid-mode:char'><i><span
- lang=EN-US style='font-size:14.0pt;color:navy'>Evaluation</span></i></h2>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- solid black 1.0pt;border-bottom:solid black 1.0pt;border-right:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm;layout-grid-mode:char'><span lang=EN-US style='font-size:
- 11.0pt'>N&deg; test</span></h1>
- </td>
- <td width=108 valign=top style='width:81.35pt;border:solid black 1.0pt;
- border-top:none;padding:5.65pt 11.35pt 5.65pt 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm;layout-grid-mode:char'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'>2.23.1</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- solid black 1.0pt;border-bottom:solid black 1.0pt;border-right:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm;layout-grid-mode:char'><span style='font-size:11.0pt'>Libell&eacute;</span></h1>
- </td>
- <td width=108 valign=top style='width:81.35pt;border:solid black 1.0pt;
- border-top:none;padding:5.65pt 11.35pt 5.65pt 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm;layout-grid-mode:char'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'>V&eacute;rification de la
- correcte r&eacute;f&eacute;rence &agrave; une COURSE COMMERCIALE </span></h1>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm;layout-grid-mode:char'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'>(&laquo; VehicleJourney &raquo;)
- dans HEURE DE PASSAGE GRAPHIQUEE/Chouette
- (&laquo;&nbsp;VehicleJourneyAtStop&nbsp;&raquo;).</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- solid black 1.0pt;border-bottom:solid black 1.0pt;border-right:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm;layout-grid-mode:char'><span style='font-size:11.0pt'>Champ
- d&rsquo;application</span></h1>
- </td>
- <td width=108 valign=top style='width:81.35pt;border:solid black 1.0pt;
- border-top:none;padding:5.65pt 11.35pt 5.65pt 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm;layout-grid-mode:char'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'>&lt;VehicleJourneyAtStop&gt;</span></h1>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm;layout-grid-mode:char'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'>&lt;VehicleJourney&gt;</span></h1>
- <h1 style='margin-left:0cm;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>&nbsp;</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- solid black 1.0pt;border-bottom:solid black 1.0pt;border-right:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm;layout-grid-mode:char'><span style='font-size:11.0pt'>V&eacute;rification</span></h1>
- </td>
- <td width=108 valign=top style='width:81.35pt;border:solid black 1.0pt;
- border-top:none;padding:5.65pt 11.35pt 5.65pt 3.5pt;height:37.4pt'>
- <h1 style='margin-left:0cm;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>&nbsp;</span></h1>
- <h1 style='margin-left:0cm;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>-
- Si l&rsquo;objet de course &laquo;&nbsp;VehicleJourney&nbsp;&raquo; existe, poursuivre le test,
- sinon abandonner le test</span></h1>
- <p class=MsoBodyText3 align=left style='text-align:left'><span
- style='font-family:"Tahoma","sans-serif"'>- Si un &eacute;l&eacute;ment
- &laquo;&nbsp;VehicleJourneyId&nbsp;&raquo;, r&eacute;f&eacute;renc&eacute; dans un objet
- &laquo;&nbsp;VehicleJourneyAtStop&nbsp;&raquo;, correspond &agrave; un identifiant
- &laquo;&nbsp;objectId&nbsp;&raquo; dans l&rsquo;objet de course &laquo;&nbsp;VehicleJourney&nbsp;&raquo;
- qui contient l&rsquo;objet de heure de passage au point d&rsquo;arr&ecirc;t, alors le test est
- valid&eacute;, sinon le test est invalid&eacute; et produit le message &laquo;&nbsp;test
- 2.23.1&nbsp;:&nbsp;un heure de passage XX fait r&eacute;f&eacute;rence &agrave; une course
- inexistante&nbsp;&raquo; </span></p>
- <h1 style='margin-left:0cm;text-indent:0cm;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>&nbsp;</span></h1>
- </td>
- </tr>
-</table>
-
-</div>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Vérification:</u>&nbsp;</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si l’objet de course «&nbsp;VehicleJourney&nbsp;» existe, poursuivre le test, sinon abandonner le test</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si un élément «&nbsp;VehicleJourneyId&nbsp;», référencé dans un objet
+«&nbsp;VehicleJourneyAtStop&nbsp;», correspond à un identifiant
+«&nbsp;objectId&nbsp;» dans l’objet de course
+«&nbsp;VehicleJourney&nbsp;» qui contient l’objet de heure de passage
+au point d’arrêt, alors le test est validé, sinon le test est invalidé
+et produit le message «&nbsp;test 2.23.1&nbsp;:&nbsp;un heure de
+passage XX fait référence à une course inexistante&nbsp;»</font></font></font></p>
diff --git a/app/views/test_sheet/2_24.html b/app/views/test_sheet/2_24.html
index 04280b8ca..04385c598 100644
--- a/app/views/test_sheet/2_24.html
+++ b/app/views/test_sheet/2_24.html
@@ -1,282 +1,67 @@
-<div class=WordSection1>
-</span></b>
+<h1 class="western" style="border: 1pt solid rgb(0, 0, 0); padding: 0.05cm 0.12cm; margin-top: 0.21cm;" align="center">
+<font face="Arial, sans-serif"><font style="font-size: 20pt;" size="5"><i>
+ point de contrôle N° 2.24<br>
+Cohérence entre la mission commerciale de la course et l’itinéraire de la course <br>
+</i></font></font></h1>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Objectif: </b></u>
+Vérification de la cohérence de la référence un Itinéraire/Chouette
+pour une COURSE COMMERCIALE («&nbsp;VehicleJourney&nbsp;») et la
+MISSION COMMERCIALE («&nbsp;JourneyPattern&nbsp;») correspondante.<br>
+</font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Priorité: </b></u> Obligatoire</font></p><font face="Arial, sans-serif">
+</font><p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><u><b>Explications:</b></u>
+</font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+La MISSION COMMERCIALE («&nbsp;JourneyPattern&nbsp;») correspondant à
+une COURSE COMMERCIALE («&nbsp;VehicleJourney&nbsp;») possède un
+identifiant d’Itinéraire. Ce même identifiant se retrouve dans la
+COURSE COMMERCIALE qui est associée à cette MISSION COMMERCIALE.</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Ce point de contrôle consiste donc à vérifier la cohérence de deux identifiants.</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>Exemple: </u></b></font></font></font></p>
-<p class=MsoTitle><span style='font-size:14.0pt;font-family:"Tahoma","sans-serif"'>Fiche
-du point de contr&ocirc;le N&deg; 2.24</span></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+La mission possède un identifiant d’Itinéraire (RouteId)&nbsp;:</font></font></font></p>
+<p><font face="Arial, sans-serif"><img src="image008.jpg" height="483" width="487"></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+La course associée à la mission commerciale possède le même identifiant d’Itinéraire (RouteId)</font></font></font></p>
+<p><font face="Arial, sans-serif"><img src="image011.jpg" height="618" width="372"></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>N° test:</u></b>
+Test 2.24.1</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Libellé:</u> Vérification de la cohérence de la référence un
+Itinéraire/Chouette pour une COURSE COMMERCIALE
+(«&nbsp;VehicleJourney&nbsp;») et la MISSION COMMERCIALE
+(«&nbsp;JourneyPattern&nbsp;») correspondante.</font></font></font></p>
-<p class=MsoNormal>&nbsp;</p>
-<table class=MsoNormalTable border=1 cellspacing=0 cellpadding=0 width=657
- style='width:492.55pt;border-collapse:collapse;border:none'>
- <tr style='page-break-inside:avoid'>
- <td width=657 colspan=2 valign=top style='width:492.55pt;border:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center;text-indent:0cm'><i><span style='font-family:
- "Tahoma","sans-serif";color:navy'>Description</span></i></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>Intitul&eacute;</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt'><span style='font-size:11.0pt;
- line-height:200%;font-family:"Tahoma","sans-serif"'>Coh&eacute;rence entre la
- mission commerciale de la course et l&rsquo;itin&eacute;raire de la course </span></p>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>Objectif</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'>V&eacute;rification de la
- coh&eacute;rence de la r&eacute;f&eacute;rence un Itin&eacute;raire/Chouette pour une COURSE COMMERCIALE
- (&laquo;&nbsp;VehicleJourney&nbsp;&raquo;) et la MISSION COMMERCIALE
- (&laquo;&nbsp;JourneyPattern&nbsp;&raquo;) correspondante.</span><span style='font-size:
- 11.0pt;font-family:"Tahoma","sans-serif"'> </span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>R&eacute;f&eacute;rences</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'>TRIDENT/profil
- CHOUETTE/Transmodel V4 et V5.1</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>N&deg; de fiche(s) connexe(s)</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-left:0cm;text-align:left;text-indent:0cm'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>&nbsp;</span></h1>
- <h1 align=left style='margin-left:0cm;text-align:left;text-indent:0cm'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>&nbsp;</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt'><b><span style='font-family:
- "Tahoma","sans-serif"'>Priorit&eacute;<span style='color:red'> </span></span></b></p>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'>Obligatoire</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt'><b><span style='font-family:
- "Tahoma","sans-serif"'>R&eacute;sultat</span></b></p>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'>Conforme ou non
- conforme</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 colspan=2 style='width:81.35pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center;text-indent:0cm'><i><span style='font-family:
- "Tahoma","sans-serif";color:navy'>Mise en &oelig;uvre</span></i></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;text-indent:0cm'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>Explication</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:5.65pt 11.35pt 5.65pt 3.5pt;height:37.4pt'>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>La
- MISSION COMMERCIALE (&laquo;&nbsp;JourneyPattern&nbsp;&raquo;) correspondant &agrave; une COURSE
- COMMERCIALE (&laquo;&nbsp;VehicleJourney&nbsp;&raquo;) poss&egrave;de un identifiant
- d&rsquo;Itin&eacute;raire. Ce m&ecirc;me identifiant se retrouve dans la COURSE COMMERCIALE qui
- est associ&eacute;e &agrave; cette MISSION COMMERCIALE.</span></p>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Ce
- point de contr&ocirc;le consiste donc &agrave; v&eacute;rifier la coh&eacute;rence de deux identifiants.
- </span></p>
- </td>
- </tr>
-</table>
-<p class=MsoNormal>&nbsp;</p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2"><span style="text-decoration: underline;">
+Champ d’application:</span>&nbsp;&lt;JourneyPattern&gt;&nbsp;&lt;VehicleJourney&gt;</font></font></font></p>
-<table class=MsoNormalTable border=1 cellspacing=0 cellpadding=0 width=657
- style='width:492.55pt;border-collapse:collapse;border:none'>
- <tr>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><b><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Exemple</span></b></p>
- </td>
- <td width=557 valign=top style='width:417.7pt;border:solid windowtext 1.0pt;
- border-left:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=left style='margin-left:18.0pt;text-align:left;text-indent:-18.0pt'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>&nbsp;</span></h1>
- <p class=MsoBodyText2><span style='font-size:11.0pt;line-height:200%;
- font-family:"Tahoma","sans-serif"'>La mission poss&egrave;de un identifiant
- d&rsquo;Itin&eacute;raire (RouteId)&nbsp;:</span></p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal align=center style='text-align:center'><img width=487
- height=483 src="BATERI_Neptune_FINAL-V2_0a_fichiers/image008.jpg"></p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoBodyText2><span style='font-size:11.0pt;line-height:200%;
- font-family:"Tahoma","sans-serif"'>La course associ&eacute;e &agrave; la mission
- commerciale poss&egrave;de le m&ecirc;me identifiant d&rsquo;Itin&eacute;raire (RouteId)</span></p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal align=center style='text-align:center'><img width=372
- height=618 src="BATERI_Neptune_FINAL-V2_0a_fichiers/image011.jpg"></p>
- </td>
- </tr>
- <tr style='page-break-inside:avoid'>
- <td width=657 colspan=2 valign=top style='width:492.55pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h2 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center;text-indent:0cm'><i><span lang=EN-US
- style='font-size:14.0pt;color:navy'>Evaluation</span></i></h2>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm'><span lang=EN-US style='font-size:11.0pt'>N&deg; test</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>Test
- 2.24.1</span></p>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm'><span style='font-size:11.0pt'>Libell&eacute;</span></h1>
- </td>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>V&eacute;rification
- de la coh&eacute;rence de la r&eacute;f&eacute;rence un Itin&eacute;raire/Chouette pour une COURSE
- COMMERCIALE (&laquo;&nbsp;VehicleJourney&nbsp;&raquo;) et la MISSION COMMERCIALE
- (&laquo;&nbsp;JourneyPattern&nbsp;&raquo;) correspondante. </span></p>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm'><span style='font-size:11.0pt'>Champ d&rsquo;application</span></h1>
- </td>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&lt;JourneyPattern&gt;</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&lt;VehicleJourney&gt;</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>&nbsp;</span></p>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm'><span style='font-size:11.0pt'>V&eacute;rification</span></h1>
- </td>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>-
- Si l&rsquo;objet &laquo;&nbsp;JourneyPattern&nbsp;&raquo; mentionn&eacute; dans les champs
- d&rsquo;application est pr&eacute;sent une ou plusieurs fois, poursuivre le test, sinon le
- test est abandonn&eacute;.</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>-
- Si l&rsquo;objet &laquo;&nbsp;vehicleJourney&nbsp;&raquo; mentionn&eacute; dans les champs
- d&rsquo;application est pr&eacute;sent une ou plusieurs fois, poursuivre le test, sinon le
- test est abandonn&eacute;.</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>-
- Si pour chaque objet &laquo;&nbsp;JourneyPattern&nbsp;&raquo;, il existe un objet
- &laquo;&nbsp;vehicleJourney&nbsp;&raquo; dont la valeur de l&rsquo;attribut de l&rsquo;&eacute;l&eacute;ment
- &laquo;&nbsp;RouteId&nbsp;&raquo; est &eacute;gale &agrave; la valeur de l&rsquo;&eacute;l&eacute;ment
- &laquo;&nbsp;RouteId&nbsp;&raquo; de l&rsquo;objet de r&eacute;f&eacute;rence &laquo;&nbsp;JourneyPattern&nbsp;&raquo;
- alors le test est valid&eacute;, sinon le test est invalid&eacute; et fournit le
- message&nbsp;: &laquo;&nbsp;test 2.24.1&nbsp;: un objet
- &laquo;&nbsp;vehicleJourney&nbsp;&raquo; poss&egrave;de une valeur de l&rsquo;attribut de l&rsquo;&eacute;l&eacute;ment
- &laquo;&nbsp;RouteId&nbsp;&raquo;. Cette valeur ne se retrouve dans un &eacute;l&eacute;ment
- &laquo;&nbsp;RouteId&nbsp;&raquo; d&rsquo;un objet &laquo;&nbsp;JourneyPattern&nbsp;&raquo;&nbsp;&raquo;&nbsp;</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>&nbsp;</span></p>
- </td>
- </tr>
-</table>
-</div>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Vérification:</u>&nbsp;</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si l’objet «&nbsp;JourneyPattern&nbsp;» mentionné dans les champs
+d’application est présent une ou plusieurs fois, poursuivre le test,
+sinon le test est abandonné.</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si l’objet «&nbsp;vehicleJourney&nbsp;» mentionné dans les champs
+d’application est présent une ou plusieurs fois, poursuivre le test,
+sinon le test est abandonné.</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si pour chaque objet «&nbsp;JourneyPattern&nbsp;», il existe un objet
+«&nbsp;vehicleJourney&nbsp;» dont la valeur de l’attribut de l’élément
+«&nbsp;RouteId&nbsp;» est égale à la valeur de l’élément
+«&nbsp;RouteId&nbsp;» de l’objet de référence
+«&nbsp;JourneyPattern&nbsp;» alors le test est validé, sinon le test
+est invalidé et fournit le message&nbsp;: «&nbsp;test 2.24.1&nbsp;: un
+objet «&nbsp;vehicleJourney&nbsp;» possède une valeur de l’attribut de
+l’élément «&nbsp;RouteId&nbsp;». Cette valeur ne se retrouve dans un
+élément «&nbsp;RouteId&nbsp;» d’un objet
+«&nbsp;JourneyPattern&nbsp;»&nbsp;</font></font></font></p>
diff --git a/app/views/test_sheet/2_25.html b/app/views/test_sheet/2_25.html
index 4413a2710..de2890f25 100644
--- a/app/views/test_sheet/2_25.html
+++ b/app/views/test_sheet/2_25.html
@@ -1,320 +1,67 @@
+<h1 class="western" style="border: 1pt solid rgb(0, 0, 0); padding: 0.05cm 0.12cm; margin-top: 0.21cm;" align="center">
+<font face="Arial, sans-serif"><font style="font-size: 20pt;" size="5"><i>
+ point de contrôle N° 2.25<br>
+Définition des liens d’accès<br>
+</i></font></font></h1>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Objectif: </b></u>
+Vérification de la correcte référence aux Accès/ARRÊTs/NEPTUNE
+(«&nbsp;AccessPoint&nbsp;» / « StopArea ») définissant des
+LiensAccèsZoneArrêt /NEPTUNE («&nbsp;AccessLink&nbsp;») .<br>
+</font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Priorité: </b></u> Obligatoire (si l’objet «&nbsp;AccessLink&nbsp;» existe)</font></p><font face="Arial, sans-serif">
+</font><p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><u><b>Explications:</b></u>
+</font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+La liste des LiensAccèsZoneArrêt /Chouette («&nbsp;AccessLink&nbsp;»)
+définie dans un «&nbsp;ChouettePTNetwork&nbsp;» est optionnelle. Les
+éléments «&nbsp;startOfLink&nbsp;» et «&nbsp;endOfLink&nbsp;» de chaque
+LiensAccèsZoneArrêt /NEPTUNE («&nbsp;AccessLink&nbsp;») sont
+obligatoires.</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Lorsque la liste des LiensAccèsZoneArrêt /NEPTUNE
+(«&nbsp;AccessLink&nbsp;») est non vide, il convient de vérifier que
+pour chaque LiensAccèsZoneArrêt /NEPTUNE («&nbsp;AccessLink&nbsp;»)
+«&nbsp;startOfLink&nbsp;» et «&nbsp;endOfLink&nbsp;» correspondent à un
+identifiant d’ARRÊTs/NEPTUNE (« StopArea ») ou à un identifiant
+d’ACCES/NEPTUNE («AccessPoint&nbsp;»).</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>Exemple: </u></b></font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Représentation schématique de l’Objet «&nbsp;AccessLink&nbsp;» dans le schéma XSD CHOUETTE</font></font></font></p>
+<p><font face="Arial, sans-serif"><img src="image013.jpg" height="529" width="364"></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Exemple d’un arrêt et d’un point d’accès connectés lien d’accès</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>N° test:</u></b>
+2.25.1</font></font></font></p>
-<div class=WordSection1>
-</span></i></b>
-<p class=MsoTitle><span style='font-size:14.0pt;font-family:"Tahoma","sans-serif"'>Fiche
-du point de contr&ocirc;le N&deg; 2.25</span></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Libellé:</u>
+Vérification de la correcte référence aux ARRÊTs/Chouette (« StopArea ») et&nbsp;ACCES/NEPTUNE («AccessPoint&nbsp;»)&nbsp;définissant des LiensAccèsZoneArrêt/NEPTUNE («&nbsp;AccessLink&nbsp;») .</font></font></font></p>
-<p class=MsoNormal>&nbsp;</p>
-
-<table class=MsoNormalTable border=0 cellspacing=0 cellpadding=0 width=648
- style='width:485.7pt;margin-left:-.25pt;border-collapse:collapse'>
- <tr style='page-break-inside:avoid'>
- <td width=648 colspan=2 valign=top style='width:485.7pt;border:solid black 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center;layout-grid-mode:char'><i><span
- style='font-family:"Tahoma","sans-serif";color:navy'>Description</span></i></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Intitul&eacute;</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt;layout-grid-mode:char'><span
- style='font-size:11.0pt;line-height:200%;font-family:"Tahoma","sans-serif"'>D&eacute;finition
- des liens d&rsquo;acc&egrave;s.</span></p>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Objectif</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>V&eacute;rification
- de la correcte r&eacute;f&eacute;rence aux Acc&egrave;s/ARR&Ecirc;Ts/NEPTUNE (&laquo;&nbsp;AccessPoint&nbsp;&raquo;
- / &laquo; StopArea &raquo;) d&eacute;finissant des LiensAcc&egrave;sZoneArr&ecirc;t /NEPTUNE
- (&laquo;&nbsp;AccessLink&nbsp;&raquo;) .</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>R&eacute;f&eacute;rences</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>TRIDENT/profil
- NEPTUNE/Transmodel V4 et V5.1</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>N&deg;de fiche(s)
- connexe(s)</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>&nbsp;</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt;layout-grid-mode:char'><b><span
- style='font-size:11.0pt;line-height:200%;font-family:"Tahoma","sans-serif"'>Priorit&eacute;<span
- style='color:red'> </span></span></b></p>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Obligatoire
- (si l&rsquo;objet &laquo;&nbsp;AccessLink&nbsp;&raquo; existe)</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt;layout-grid-mode:char'><b><span
- style='font-size:11.0pt;line-height:200%;font-family:"Tahoma","sans-serif"'>R&eacute;sultat</span></b></p>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Conforme
- ou non conforme</span></h1>
- </td>
- </tr>
- <tr style='page-break-inside:avoid'>
- <td width=648 colspan=2 style='width:485.7pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center;layout-grid-mode:char'><i><span
- style='font-family:"Tahoma","sans-serif";color:navy'>Mise en &oelig;uvre</span></i></h1>
- </td>
- </tr>
- <tr>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- solid black 1.0pt;border-bottom:solid black 1.0pt;border-right:none;
- padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;layout-grid-mode:char'><span style='font-size:11.0pt'>Explication</span></h1>
- </td>
- <td width=108 valign=top style='width:81.35pt;border:solid black 1.0pt;
- border-top:none;padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:11.35pt;margin-bottom:
- 6.0pt;margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>La
- liste des LiensAcc&egrave;sZoneArr&ecirc;t /Chouette (&laquo;&nbsp;AccessLink&nbsp;&raquo;) d&eacute;finie
- dans un &laquo;&nbsp;ChouettePTNetwork&nbsp;&raquo; est optionnelle. Les &eacute;l&eacute;ments
- &laquo;&nbsp;startOfLink&nbsp;&raquo; et &laquo;&nbsp;endOfLink&nbsp;&raquo; de chaque
- LiensAcc&egrave;sZoneArr&ecirc;t /NEPTUNE (&laquo;&nbsp;AccessLink&nbsp;&raquo;) sont obligatoires.</span></h1>
- <h1 align=left style='margin-top:6.0pt;margin-right:11.35pt;margin-bottom:
- 6.0pt;margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Lorsque
- la liste des LiensAcc&egrave;sZoneArr&ecirc;t /NEPTUNE (&laquo;&nbsp;AccessLink&nbsp;&raquo;) est non
- vide, il convient de v&eacute;rifier que pour chaque LiensAcc&egrave;sZoneArr&ecirc;t /NEPTUNE
- (&laquo;&nbsp;AccessLink&nbsp;&raquo;) &laquo;&nbsp;startOfLink&nbsp;&raquo; et
- &laquo;&nbsp;endOfLink&nbsp;&raquo; correspondent &agrave; un identifiant d&rsquo;ARR&Ecirc;Ts/NEPTUNE (&laquo;
- StopArea &raquo;) ou &agrave; un identifiant d&rsquo;ACCES/NEPTUNE (&laquo;AccessPoint&nbsp;&raquo;).</span></h1>
- </td>
- </tr>
-</table>
-
-<p class=MsoNormal>&nbsp;</p>
-
-<table class=MsoNormalTable border=0 cellspacing=0 cellpadding=0 width=648
- style='width:485.7pt;margin-left:-.25pt;border-collapse:collapse'>
- <tr style='height:688.65pt'>
- <td width=108 valign=top style='width:81.35pt;border:solid black 1.0pt;
- border-right:none;padding:0cm 3.5pt 0cm 3.5pt;height:688.65pt'>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm;layout-grid-mode:char'><b><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>Exemple</span></b></p>
- </td>
- <td width=539 valign=top style='width:404.35pt;border:solid black 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:688.65pt'>
- <h1 align=left style='margin-left:18.0pt;text-align:left;layout-grid-mode:
- char'><span style='font-size:11.0pt;font-weight:normal'>&nbsp;</span></h1>
- <h1 align=left style='margin-left:18.0pt;text-align:left'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Repr&eacute;sentation
- sch&eacute;matique de l&rsquo;Objet &laquo;&nbsp;AccessLink&nbsp;&raquo; dans le sch&eacute;ma XSD CHOUETTE</span></h1>
- <h1 align=left style='margin-left:18.0pt;text-align:left'><span
- style='font-size:11.0pt;font-weight:normal'>&nbsp;</span></h1>
- <p class=MsoNormal align=center style='text-align:center'><img width=364
- height=529 src="BATERI_Neptune_FINAL-V2_0a_fichiers/image013.jpg"></p>
- <h4><span style='font-family:"Tahoma","sans-serif"'>&nbsp;</span></h4>
- <h4><span style='font-family:"Tahoma","sans-serif"'>&nbsp;</span></h4>
- <h4><span style='font-family:"Tahoma","sans-serif"'>&nbsp;</span></h4>
- <h4><span style='font-family:"Tahoma","sans-serif"'>&nbsp;</span></h4>
- <h4><span style='font-family:"Tahoma","sans-serif"'>&nbsp;</span></h4>
- <h4><span style='font-family:"Tahoma","sans-serif"'>&nbsp;</span></h4>
- <h4><span style='font-family:"Tahoma","sans-serif"'>&nbsp;</span></h4>
- <h4><span style='font-family:"Tahoma","sans-serif"'>&nbsp;</span></h4>
- <h4><span style='font-family:"Tahoma","sans-serif"'>&nbsp;</span></h4>
- <h4><span style='font-family:"Tahoma","sans-serif"'>&nbsp;</span></h4>
- <h4><span style='font-family:"Tahoma","sans-serif"'>&nbsp;</span></h4>
- <h4><span style='font-family:"Tahoma","sans-serif"'>&nbsp;</span></h4>
- <h4><span style='font-family:"Tahoma","sans-serif"'>&nbsp;</span></h4>
- <h4><span style='font-family:"Tahoma","sans-serif"'>&nbsp;</span></h4>
- <h4><span style='font-family:"Tahoma","sans-serif"'>&nbsp;</span></h4>
- <h4><span style='font-family:"Tahoma","sans-serif"'>&nbsp;</span></h4>
- <h4><span style='font-family:"Tahoma","sans-serif"'>&nbsp;</span></h4>
- <h4><span style='font-family:"Tahoma","sans-serif"'>&nbsp;</span></h4>
- <h4><span style='font-family:"Tahoma","sans-serif"'>Exemple d&rsquo;un arr&ecirc;t et
- d&rsquo;un point d&rsquo;acc&egrave;s connect&eacute;s lien d&rsquo;acc&egrave;s</span></h4>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><span style='font-size:10.0pt;font-family:Monospace;
- color:black'> A d&eacute;finir</span></p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- </td>
- </tr>
-</table>
-
-<p class=MsoNormal>&nbsp;</p>
-
-<table class=MsoNormalTable border=0 cellspacing=0 cellpadding=0 width=648
- style='width:485.7pt;margin-left:-.25pt;border-collapse:collapse'>
- <tr style='page-break-inside:avoid'>
- <td width=648 colspan=2 valign=top style='width:485.7pt;border:solid black 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h2 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center;layout-grid-mode:char'><i><span lang=EN-US
- style='font-size:14.0pt;color:navy'>Evaluation</span></i></h2>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span lang=EN-US
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>N&deg; test</span></h1>
- </td>
- <td width=539 style='width:404.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>2.25.1</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Libell&eacute;</span></h1>
- </td>
- <td width=539 style='width:404.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>V&eacute;rification
- de la correcte r&eacute;f&eacute;rence aux ARR&Ecirc;Ts/Chouette (&laquo; StopArea &raquo;) et </span><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>ACCES/NEPTUNE
- (&laquo;AccessPoint&nbsp;&raquo;)</span><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'> d&eacute;finissant des LiensAcc&egrave;sZoneArr&ecirc;t/NEPTUNE
- (&laquo;&nbsp;AccessLink&nbsp;&raquo;) .</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span lang=EN-US
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Champ
- d&rsquo;application</span></h1>
- </td>
- <td width=539 style='width:404.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span lang=EN-US
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>&lt;StopArea&gt;</span></h1>
- <p class=MsoNormal><span lang=EN-US style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&lt;AccessPoint&gt;</span></p>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm;layout-grid-mode:char'><span lang=EN-US
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>&lt;AccessLink&gt;</span></p>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:5.65pt 11.35pt 5.65pt 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>V&eacute;rification</span></h1>
- </td>
- <td width=539 style='width:404.35pt;border:solid black 1.0pt;border-top:none;
- padding:5.65pt 11.35pt 5.65pt 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-right:11.35pt;text-align:left;layout-grid-mode:
- char'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>- Si l&rsquo;objet &laquo;&nbsp;AccessLink&nbsp;&raquo; existe alors
- poursuivre le test, sinon le test est abandonn&eacute;,</span></h1>
- <p class=MsoBodyText2 style='margin-top:6.0pt;margin-right:11.35pt;
- margin-bottom:6.0pt;margin-left:0cm;line-height:normal'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>- Si l&rsquo;objet
- &laquo;&nbsp;AccessLink&nbsp;&raquo; poss&egrave;de des identifiants d&rsquo;arr&ecirc;t distincts
- &laquo;&nbsp;StartOfLink&nbsp;&raquo; et &laquo;&nbsp;EndOfLink&nbsp;&raquo; alors poursuivre le test
- sinon le test est invalid&eacute; et produit le message&nbsp;&laquo;&nbsp;test
- 2.25.1.a&nbsp;: il manque au moins un identifiant d&rsquo;arr&ecirc;t ou d&rsquo;acc&egrave;s
- &laquo;&nbsp;StartOfLink&nbsp;&raquo; et &laquo;&nbsp;EndOfLink&nbsp;&raquo; dans &nbsp;l&rsquo;objet
- &laquo;&nbsp;AccessLink&nbsp;&raquo;.&nbsp;&raquo;</span></p>
- <h1 align=left style='margin-top:6.0pt;margin-right:11.35pt;margin-bottom:
- 6.0pt;margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>-
- Si chaque identifiant d&rsquo;arr&ecirc;t &laquo;&nbsp;StartOfLink&nbsp;&raquo; et
- &laquo;&nbsp;EndOfLink&nbsp;&raquo; de l&rsquo;objet &laquo;&nbsp;AccessLink&nbsp;&raquo; est d&eacute;fini dans
- un objet &laquo;&nbsp;StopArea&nbsp;&raquo; ou &laquo;AccessPoint&nbsp;&raquo;&nbsp;, alors le test
- est valid&eacute;, sinon le test est invalid&eacute; et produit le message &laquo;&nbsp;test
- 2.25.1.b&nbsp;: un identifiant d&rsquo;arr&ecirc;t ou d&rsquo;acc&egrave;s &laquo;&nbsp;StartOfLink&nbsp;&raquo;
- ou &laquo;&nbsp;EndOfLink&nbsp;&raquo; de l&rsquo;objet &laquo;&nbsp;AccessLink&raquo; n&rsquo;est pas rep&eacute;r&eacute;
- dans un objet &laquo;&nbsp;StopArea&nbsp;&raquo; ou &laquo;&nbsp;AccessPoint&nbsp;&raquo;.&nbsp;&raquo;</span></h1>
- </td>
- </tr>
-</table>
-
-<h1><span style='font-size:11.0pt;font-weight:normal'>&nbsp;</span></h1>
-
-
-</div>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Champ d’application:</u>
+&lt;StopArea&gt;&nbsp;&lt;AccessPoint&gt;&nbsp;&lt;AccessLink&gt;</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Vérification:</u> </font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si l’objet «&nbsp;AccessLink&nbsp;» existe alors poursuivre le test, sinon le test est abandonné,</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si l’objet «&nbsp;AccessLink&nbsp;» possède des identifiants d’arrêt
+distincts «&nbsp;StartOfLink&nbsp;» et «&nbsp;EndOfLink&nbsp;» alors
+poursuivre le test sinon le test est invalidé et produit le
+message&nbsp;«&nbsp;test 2.25.1.a&nbsp;: il manque au moins un
+identifiant d’arrêt ou d’accès «&nbsp;StartOfLink&nbsp;» et
+«&nbsp;EndOfLink&nbsp;» dans &nbsp;l’objet
+«&nbsp;AccessLink&nbsp;».&nbsp;»</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si chaque identifiant d’arrêt «&nbsp;StartOfLink&nbsp;» et
+«&nbsp;EndOfLink&nbsp;» de l’objet «&nbsp;AccessLink&nbsp;» est défini
+dans un objet «&nbsp;StopArea&nbsp;» ou «AccessPoint&nbsp;»&nbsp;,
+alors le test est validé, sinon le test est invalidé et produit le
+message «&nbsp;test 2.25.1.b&nbsp;: un identifiant d’arrêt ou d’accès
+«&nbsp;StartOfLink&nbsp;» ou «&nbsp;EndOfLink&nbsp;» de l’objet
+«&nbsp;AccessLink» n’est pas repéré dans un objet
+«&nbsp;StopArea&nbsp;» ou «&nbsp;AccessPoint&nbsp;».&nbsp;»</font></font></font></p>
diff --git a/app/views/test_sheet/2_26.html b/app/views/test_sheet/2_26.html
index 6f3034a19..b6ba36176 100644
--- a/app/views/test_sheet/2_26.html
+++ b/app/views/test_sheet/2_26.html
@@ -1,351 +1,73 @@
+<h1 class="western" style="border: 1pt solid rgb(0, 0, 0); padding: 0.05cm 0.12cm; margin-top: 0.21cm;" align="center">
+<font face="Arial, sans-serif"><font style="font-size: 20pt;" size="5"><i>
+ point de contrôle N° 2.26<br>
+Cohérence entre les accès et leurs composants<br>
+</i></font></font></h1>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Objectif: </b></u>
+Vérification de la correcte référence à des ARRÊTs/Chouette (« StopArea
+») et/ou à des LiensAccèsZoneArrêt /NEPTUNE («&nbsp;AccessLink&nbsp;»)
+dans des ACCES/NEPTUNE (« AccessPoint »)<br>
+</font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Priorité: </b></u> Obligatoire</font></p><font face="Arial, sans-serif">
+</font><p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><u><b>Explications:</b></u>
+</font></font></p>
-<div class=WordSection1>
-</span></b>
-<p class=MsoTitle><span style='font-size:14.0pt;font-family:"Tahoma","sans-serif"'>Fiche
-du point de contr&ocirc;le N&deg; 2.26</span></p>
-<p class=MsoNormal>&nbsp;</p>
-<table class=MsoNormalTable border=0 cellspacing=0 cellpadding=0 width=648
- style='width:486.2pt;margin-left:-.75pt;border-collapse:collapse'>
- <tr style='page-break-inside:avoid'>
- <td width=648 colspan=2 valign=top style='width:486.2pt;border:solid black 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center;layout-grid-mode:char'><i><span
- style='font-family:"Tahoma","sans-serif";color:navy'>Description</span></i></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Intitul&eacute;</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoCommentText><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>&nbsp;</span></p>
- <p class=MsoCommentText><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Coh&eacute;rence
- entre les acc&egrave;s et leurs composants. (pour la lisibilit&eacute;, il vaudrait mieux
- que cette colonne soit en gras et la colonne de gauche ne soit pas en gras)</span></p>
- <p class=MsoCommentText><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>&nbsp;</span></p>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Objectif</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>V&eacute;rification
- de la correcte r&eacute;f&eacute;rence &agrave; des ARR&Ecirc;Ts/Chouette (&laquo; StopArea &raquo;) et/ou &agrave; des
- LiensAcc&egrave;sZoneArr&ecirc;t /NEPTUNE (&laquo;&nbsp;AccessLink&nbsp;&raquo;) dans des
- ACCES/NEPTUNE (&laquo; AccessPoint &raquo;) </span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>R&eacute;f&eacute;rences</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>TRIDENT/profil
- NEPTUNE/Transmodel V4 et V5.1</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>N&deg; de fiche(s)
- connexe(s)</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>&nbsp;</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt;layout-grid-mode:char'><b><span
- style='font-size:11.0pt;line-height:200%;font-family:"Tahoma","sans-serif"'>Priorit&eacute;<span
- style='color:red'> </span></span></b></p>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Obligatoire</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt;layout-grid-mode:char'><b><span
- style='font-size:11.0pt;line-height:200%;font-family:"Tahoma","sans-serif"'>R&eacute;sultat</span></b></p>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Conforme
- ou non conforme</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=648 colspan=2 valign=top style='width:486.2pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center;layout-grid-mode:char'><i><span
- style='font-family:"Tahoma","sans-serif";color:navy'>Mise en &oelig;uvre</span></i></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- solid black 1.0pt;border-bottom:solid black 1.0pt;border-right:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;layout-grid-mode:char'><span style='font-size:11.0pt'>Explication</span></h1>
- </td>
- <td width=548 valign=top style='width:411.35pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:11.35pt;margin-bottom:6.0pt;
- margin-left:0cm;layout-grid-mode:char'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'>Si un </span><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>ACCES/NEPTUNE
- </span><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>(&laquo; AccessPoint &raquo;) est d&eacute;fini, il r&eacute;f&eacute;rence soit au moins
- un autre ARR&Ecirc;T/Chouette (&laquo; StopArea &raquo;), soit au moins un </span><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>LiensAcc&egrave;sZoneArr&ecirc;t
- /NEPTUNE (&laquo;&nbsp;AccessLink&nbsp;&raquo;)</span><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'>.</span></h1>
- <h1 style='margin-top:6.0pt;margin-right:11.35pt;margin-bottom:6.0pt;
- margin-left:0cm;layout-grid-mode:char'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'>Il convient alors de
- v&eacute;rifier que les &eacute;l&eacute;ments r&eacute;f&eacute;renc&eacute;s trouvent une description dans la classe
- d&rsquo;objets qui les concernent.</span></h1>
- </td>
- </tr>
-</table>
-<p class=MsoNormal>&nbsp;</p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Si un&nbsp;ACCES/NEPTUNE&nbsp;(« AccessPoint ») est défini, il
+référence soit au moins un autre ARRÊT/Chouette (« StopArea »), soit au
+moins un&nbsp;LiensAccèsZoneArrêt /NEPTUNE («&nbsp;AccessLink&nbsp;»)<br>Il convient alors de vérifier que les éléments référencés trouvent une description dans la classe d’objets qui les concernent.</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>Exemple: </u></b></font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Représentation schématique de l’Objet «&nbsp;AccessPoint&nbsp;»</font></font></font></p>
+<p><font face="Arial, sans-serif"><img src="image014.jpg" height="586" width="369"></font></p>
-<table class=MsoNormalTable border=1 cellspacing=0 cellpadding=0 width=619
- style='width:464.4pt;border-collapse:collapse;border:none'>
- <tr>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- padding:0cm 5.4pt 0cm 5.4pt'>
- <p class=MsoNormal><b><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Exemple</span></b></p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- </td>
- <td width=511 valign=top style='width:383.05pt;border:solid windowtext 1.0pt;
- border-left:none;padding:0cm 5.4pt 0cm 5.4pt'>
- <h1 align=left style='margin-left:18.0pt;text-align:left'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Repr&eacute;sentation
- sch&eacute;matique de l&rsquo;Objet &laquo;&nbsp;AccessPoint&nbsp;&raquo; </span></h1>
- <p class=MsoNormal align=center style='text-align:center'><img width=369
- height=586 src="BATERI_Neptune_FINAL-V2_0a_fichiers/image014.jpg"></p>
- <p class=MsoNormal><u><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>Exemple
- de AccessPoint avec </span></u><u><span style='font-size:11.0pt;font-family:
- "Arial","sans-serif"'>containedIn</span></u><u><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'> de </span></u><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'>StopArea</span><b><span style='font-size:
- 11.0pt;font-family:"Tahoma","sans-serif"'> </span></b><u><span
- style='font-size:11.0pt;font-family:"Arial","sans-serif"'>associ&eacute;</span></u></p>
- <p class=MsoNormal><span lang=EN-US style='font-size:10.0pt;font-family:"Courier New"'>...</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>A d&eacute;finir</span></p>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm;layout-grid-mode:char'><span lang=EN-US
- style='font-size:10.0pt;font-family:Monospace'>...</span></p>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm;layout-grid-mode:char'>&nbsp;</p>
- </td>
- </tr>
-</table>
-<p class=MsoNormal>&nbsp;</p>
-<p class=MsoNormal>&nbsp;</p>
-</div>
-<b><span style='font-size:14.0pt;font-family:"Tahoma","sans-serif"'><br
-clear=all>
-</span></b>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Exemple de AccessPoint avec&nbsp;containedIn et StopArea&nbsp;associé</font></font></font></p>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">...<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">A définir</font></span>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>N° test:</u></b>
+2.26.1</font></font></font></p>
-<div class=WordSection9>
-<table class=MsoNormalTable border=0 cellspacing=0 cellpadding=0 width=629
- style='width:472.05pt;margin-left:-.75pt;border-collapse:collapse'>
- <tr style='page-break-inside:avoid'>
- <td width=629 colspan=2 valign=top style='width:472.05pt;border:solid black 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h2 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center;layout-grid-mode:char'><i><span lang=EN-US
- style='font-size:14.0pt;color:navy'>Evaluation</span></i></h2>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span lang=EN-US
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>N&deg; test</span></h1>
- </td>
- <td width=530 style='width:397.2pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>2.26.1</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:5.65pt 11.35pt 5.65pt 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Libell&eacute;</span></h1>
- </td>
- <td width=530 style='width:397.2pt;border:solid black 1.0pt;border-top:none;
- padding:5.65pt 11.35pt 5.65pt 3.5pt;height:37.4pt'>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>V&eacute;rification
- de la correcte r&eacute;f&eacute;rence &agrave; des ARR&Ecirc;Ts/Chouette (&laquo; StopArea &raquo;) et/ou &agrave; des L</span><span
- style='font-size:11.0pt;font-family:"Arial","sans-serif"'>iensAcc&egrave;sZoneArr&ecirc;t</span><span
- style='font-size:11.0pt;font-family:"Arial","sans-serif"'>/NEPTUNE
- (&laquo;&nbsp;AccessLink&nbsp;&raquo;) dans les ACCES/NEPTUNE (&laquo; AccessPoint &raquo;) </span></p>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span lang=EN-US
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Champ
- d&rsquo;application</span></h1>
- </td>
- <td width=530 style='width:397.2pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span lang=EN-US
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>&lt;AccessPoint&gt;</span></h1>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span lang=EN-US
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>&lt;StopArea&gt;</span></h1>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm;layout-grid-mode:char'><span lang=EN-US
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>&lt;AccessLink&gt; </span></p>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:5.65pt 11.35pt 5.65pt 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>V&eacute;rification</span></h1>
- </td>
- <td width=530 style='width:397.2pt;border:solid black 1.0pt;border-top:none;
- padding:5.65pt 11.35pt 5.65pt 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:11.35pt;margin-bottom:
- 6.0pt;margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>-
- Si la classe d&rsquo;objets &laquo;&nbsp;</span><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif";font-weight:normal'>AccessPoint</span><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>&raquo;
- existe alors poursuivre le test, sinon abandonner le test,</span></h1>
- <h1 align=left style='margin-top:6.0pt;margin-right:11.35pt;margin-bottom:
- 6.0pt;margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>-
- Si chaque &eacute;l&eacute;ment &laquo;&nbsp;containedIn&raquo; contient une ou plusieurs valeurs,
- alors le test est valid&eacute; si ces valeurs se retrouvent dans des &eacute;l&eacute;ments
- &laquo;&nbsp;objectId&nbsp;&raquo; des classes d&rsquo;objets &laquo;&nbsp;StopArea&nbsp;&raquo; ou
- &laquo;&nbsp;</span><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>AccessLink&nbsp;</span><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'>&raquo; sinon le test est
- invalid&eacute; et produit le message &laquo;&nbsp;test 2.26.1&nbsp;: une ou plusieurs
- valeurs de l&rsquo;&eacute;l&eacute;ment &laquo;&nbsp;containedIn&raquo; de la classe d&rsquo;objets &laquo;&nbsp;</span><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>AccessPoint</span><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>&raquo;
- n&rsquo;est pas rep&eacute;r&eacute;e dans la classe d&rsquo;objets correspondante
- &laquo;&nbsp;StopArea&nbsp;&raquo; ou &laquo;&nbsp;</span><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'>AccessLink&nbsp;</span><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>&raquo;.&nbsp;&raquo;
- </span></h1>
- </td>
- </tr>
-</table>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Libellé:</u>
+Vérification de la correcte référence à des ARRÊTs/Chouette (« StopArea ») et/ou à des LiensAccèsZoneArrêt&nbsp;/NEPTUNE («&nbsp;AccessLink&nbsp;») dans les ACCES/NEPTUNE (« AccessPoint »)</font></font></font></p>
-</div>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Champ d’application:</u>
+&lt;AccessPoint&gt;&nbsp;&lt;StopArea&gt;&nbsp;&lt;AccessLink&gt;&nbsp;</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Vérification:</u> </font></font></font></p>
+
+
+
+
+
+
+
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si la classe d’objets «&nbsp;AccessPoint&nbsp;» existe alors poursuivre le test, sinon abandonner le test,&nbsp;<br>-
+Si chaque élément «&nbsp;containedIn» contient une ou plusieurs
+valeurs, alors le test est validé si ces valeurs se retrouvent dans des
+éléments «&nbsp;objectId&nbsp;» des classes d’objets
+«&nbsp;StopArea&nbsp;» ou «&nbsp;AccessLink &nbsp;» sinon le test est
+invalidé et produit le message «&nbsp;test 2.26.1&nbsp;: une ou
+plusieurs valeurs de l’élément «&nbsp;containedIn» de la classe
+d’objets «&nbsp;AccessPoint&nbsp;» n’est pas repérée dans la classe
+d’objets correspondante «&nbsp;StopArea&nbsp;» ou
+«&nbsp;AccessLink&nbsp;».&nbsp;</font></font></font></p>
diff --git a/app/views/test_sheet/2_27.html b/app/views/test_sheet/2_27.html
index 1c7440555..115526d24 100644
--- a/app/views/test_sheet/2_27.html
+++ b/app/views/test_sheet/2_27.html
@@ -1,345 +1,65 @@
+<h1 class="western" style="border: 1pt solid rgb(0, 0, 0); padding: 0.05cm 0.12cm; margin-top: 0.21cm;" align="center">
+<font face="Arial, sans-serif"><font style="font-size: 20pt;" size="5"><i>
+ point de contrôle N° 2.27<br>
+Référence aux arrêts dans les équipements<br>
+</i></font></font></h1>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Objectif: </b></u>
+Vérification de la correcte référence à des ARRÊTs/Chouette (« StopArea ») dans des FACILITYs/NEPTUNE (« Facility »)<br>
+</font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Priorité: </b></u> Obligatoire</font></p><font face="Arial, sans-serif">
+</font><p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><u><b>Explications:</b></u>
+</font></font></p>
-<div class=WordSection1>
-</span></b>
-<p class=MsoTitle><span style='font-size:14.0pt;font-family:"Tahoma","sans-serif"'>Fiche
-du point de contr&ocirc;le N&deg; 2.27</span></p>
-<p class=MsoNormal>&nbsp;</p>
-<table class=MsoNormalTable border=0 cellspacing=0 cellpadding=0 width=648
- style='width:486.2pt;margin-left:-.75pt;border-collapse:collapse'>
- <tr style='page-break-inside:avoid'>
- <td width=648 colspan=2 valign=top style='width:486.2pt;border:solid black 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center;layout-grid-mode:char'><i><span
- style='font-family:"Tahoma","sans-serif";color:navy'>Description</span></i></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Intitul&eacute;</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoCommentText><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>&nbsp;</span></p>
- <p class=MsoCommentText><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>R&eacute;f&eacute;rence
- aux arr&ecirc;ts dans les &eacute;quipements</span></p>
- <p class=MsoCommentText><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>&nbsp;</span></p>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Objectif</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>V&eacute;rification
- de la correcte r&eacute;f&eacute;rence &agrave; des ARR&Ecirc;Ts/Chouette (&laquo; StopArea &raquo;) dans des
- FACILITYs/NEPTUNE (&laquo; Facility &raquo;) </span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>R&eacute;f&eacute;rences</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>TRIDENT/profil
- NEPTUNE/Transmodel V4 et V5.1</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>N&deg; de fiche(s)
- connexe(s)</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>&nbsp;</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt;layout-grid-mode:char'><b><span
- style='font-size:11.0pt;line-height:200%;font-family:"Tahoma","sans-serif"'>Priorit&eacute;<span
- style='color:red'> </span></span></b></p>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Obligatoire</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt;layout-grid-mode:char'><b><span
- style='font-size:11.0pt;line-height:200%;font-family:"Tahoma","sans-serif"'>R&eacute;sultat</span></b></p>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Conforme
- ou non conforme</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=648 colspan=2 valign=top style='width:486.2pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center;layout-grid-mode:char'><i><span
- style='font-family:"Tahoma","sans-serif";color:navy'>Mise en &oelig;uvre</span></i></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- solid black 1.0pt;border-bottom:solid black 1.0pt;border-right:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;layout-grid-mode:char'><span style='font-size:11.0pt'>Explication</span></h1>
- </td>
- <td width=548 valign=top style='width:411.35pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:11.35pt;margin-bottom:6.0pt;
- margin-left:0cm;layout-grid-mode:char'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'>Si un &eacute;quipement </span><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>/NEPTUNE
- </span><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>(&laquo;</span><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>Facility</span><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif";font-weight:normal'>&raquo;) est d&eacute;fini et que
- &laquo;&nbsp;facilityLocation&nbsp;&raquo; est d&eacute;fini, il r&eacute;f&eacute;rence au moins un autre
- ARR&Ecirc;T/Chouette (&laquo; StopArea&nbsp;&raquo;).</span></h1>
- <h1 style='margin-top:6.0pt;margin-right:11.35pt;margin-bottom:6.0pt;
- margin-left:0cm;layout-grid-mode:char'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'>Il convient alors de
- v&eacute;rifier que les &eacute;l&eacute;ments r&eacute;f&eacute;renc&eacute;s trouvent une description dans la classe
- d&rsquo;objets qui les concernent.</span></h1>
- </td>
- </tr>
-</table>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Si un équipement&nbsp;/NEPTUNE&nbsp;(«&nbsp;Facility&nbsp;»)
+est défini et que «&nbsp;facilityLocation&nbsp;» est défini, il
+référence au moins un autre ARRÊT/Chouette (« StopArea&nbsp;»).</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Il convient alors de vérifier que les éléments référencés trouvent une description dans la classe d’objets qui les concernent.</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>Exemple: </u></b></font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Représentation schématique de l’Objet «&nbsp;Facility&nbsp;»</font></font></font></p>
+<p><font face="Arial, sans-serif"><img src="image015.jpg" height="756" width="438"></font></p>
-<p class=MsoNormal>&nbsp;</p>
-<table class=MsoNormalTable border=1 cellspacing=0 cellpadding=0 width=619
- style='width:464.4pt;border-collapse:collapse;border:none'>
- <tr>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- padding:0cm 5.4pt 0cm 5.4pt'>
- <p class=MsoNormal><b><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Exemple</span></b></p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- </td>
- <td width=511 valign=top style='width:383.05pt;border:solid windowtext 1.0pt;
- border-left:none;padding:0cm 5.4pt 0cm 5.4pt'>
- <h1 align=left style='margin-left:18.0pt;text-align:left'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Repr&eacute;sentation
- sch&eacute;matique de l&rsquo;Objet &laquo;&nbsp;Facility&nbsp;&raquo; </span></h1>
- <p class=MsoNormal align=center style='text-align:center'><img width=438
- height=756 src="BATERI_Neptune_FINAL-V2_0a_fichiers/image015.jpg"></p>
- <p class=MsoNormal><u><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>Exemple
- de Facility avec </span></u><u><span style='font-size:11.0pt;font-family:
- "Arial","sans-serif"'>containedIn</span></u><u><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'> et de </span></u><u><span
- style='font-size:11.0pt;font-family:"Arial","sans-serif"'>StopArea</span></u><u><span
- style='font-size:11.0pt;font-family:"Arial","sans-serif"'> associ&eacute;</span></u></p>
- <p class=MsoNormal><span style='font-size:10.0pt;font-family:"Courier New"'>...</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span
- style='font-size:10.0pt;font-family:"Courier New"'>A d&eacute;finir</span></p>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm;layout-grid-mode:char'><span style='font-size:10.0pt;
- font-family:Monospace'>...</span></p>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm;layout-grid-mode:char'>&nbsp;</p>
- </td>
- </tr>
-</table>
-<p class=MsoNormal>&nbsp;</p>
-<p class=MsoNormal>&nbsp;</p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Exemple de Facility avec&nbsp;containedIn&nbsp;et de&nbsp;StopArea&nbsp;associé</font></font></font></p>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">...<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">A définir</font></span>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>N° test:</u></b>
+2.27.1</font></font></font></p>
-</div>
-<b><span style='font-size:14.0pt;font-family:"Tahoma","sans-serif"'><br
-clear=all>
-</span></b>
-<div class=WordSection10>
-<table class=MsoNormalTable border=0 cellspacing=0 cellpadding=0 width=629
- style='width:472.05pt;margin-left:-.75pt;border-collapse:collapse'>
- <tr style='page-break-inside:avoid'>
- <td width=629 colspan=2 valign=top style='width:472.05pt;border:solid black 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h2 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center;layout-grid-mode:char'><i><span
- style='font-size:14.0pt;color:navy'>Evaluation</span></i></h2>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>N&deg; test</span></h1>
- </td>
- <td width=530 style='width:397.2pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>2.27.1</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:5.65pt 11.35pt 5.65pt 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Libell&eacute;</span></h1>
- </td>
- <td width=530 style='width:397.2pt;border:solid black 1.0pt;border-top:none;
- padding:5.65pt 11.35pt 5.65pt 3.5pt;height:37.4pt'>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>V&eacute;rification
- de la correcte r&eacute;f&eacute;rence &agrave; des ARR&Ecirc;Ts/Chouette (&laquo; StopArea &raquo;) dans les
- EQUIPEMENTs /NEPTUNE </span><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>(&laquo;</span><span
- style='font-size:11.0pt;font-family:"Arial","sans-serif"'>Facility</span><span
- style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&raquo;)</span></p>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span lang=EN-US
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Champ
- d&rsquo;application</span></h1>
- </td>
- <td width=530 style='width:397.2pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span lang=EN-US
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>&lt;StopArea&gt;</span></h1>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm;layout-grid-mode:char'><span lang=EN-US
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>&lt;Facility&gt; </span></p>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:5.65pt 11.35pt 5.65pt 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>V&eacute;rification</span></h1>
- </td>
- <td width=530 style='width:397.2pt;border:solid black 1.0pt;border-top:none;
- padding:5.65pt 11.35pt 5.65pt 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:11.35pt;margin-bottom:
- 6.0pt;margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>-
- Si la classe d&rsquo;objets &laquo;&nbsp;</span><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif";font-weight:normal'>Facility</span><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>&raquo;
- existe alors poursuivre le test, sinon abandonner le test,</span></h1>
- <h1 align=left style='margin-top:6.0pt;margin-right:11.35pt;margin-bottom:
- 6.0pt;margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>-
- Si l&rsquo;&eacute;l&eacute;ment &laquo;&nbsp;facilityLocation&nbsp;&raquo; n&rsquo;est pas d&eacute;fini&nbsp;:
- abandonner le test,</span></h1>
- <h1 align=left style='margin-top:6.0pt;margin-right:11.35pt;margin-bottom:
- 6.0pt;margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>-
- Si chaque &eacute;l&eacute;ment &laquo;&nbsp;containedIn&raquo; contient une valeur, alors le test est
- valid&eacute; si ces valeurs se retrouvent dans des &eacute;l&eacute;ments &laquo;&nbsp;objectId&nbsp;&raquo;
- de la classe d&rsquo;objet &laquo;&nbsp;StopArea&nbsp;&raquo; sinon le test est invalid&eacute; et
- produit le message &laquo;&nbsp;test 2.27.1&nbsp;: une valeur de l&rsquo;&eacute;l&eacute;ment
- &laquo;&nbsp;containedIn&raquo; de la classe d&rsquo;objets &laquo;&nbsp;</span><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Facility</span><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>&raquo;
- n&rsquo;est pas rep&eacute;r&eacute;e dans la classe d&rsquo;objets correspondante
- &laquo;&nbsp;StopArea&nbsp;&raquo;.&nbsp;&raquo; </span></h1>
- </td>
- </tr>
-</table>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Libellé:</u>
+Vérification de la correcte référence à des ARRÊTs/Chouette (« StopArea ») dans les EQUIPEMENTs /NEPTUNE&nbsp;(«&nbsp;Facility&nbsp;»)&nbsp;</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2"><u>Champ d’application:</u>
+&lt;StopArea&gt;&nbsp;&lt;Facility&gt;</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Vérification:</u> </font></font></font></p>
-</div>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si la classe d’objets « &nbsp;Facility&nbsp;» existe alors poursuivre le test, sinon abandonner le test,</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si l’élément «&nbsp;facilityLocation&nbsp;» n’est pas défini&nbsp;: abandonner le test,</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si chaque élément «&nbsp;containedIn» contient une valeur, alors le
+test est validé si ces valeurs se retrouvent dans des éléments
+«&nbsp;objectId&nbsp;» de la classe d’objet «&nbsp;StopArea&nbsp;»
+sinon le test est invalidé et produit le message «&nbsp;test
+2.27.1&nbsp;: une valeur de l’élément «&nbsp;containedIn» de la classe
+d’objets «&nbsp;Facility&nbsp;» n’est pas repérée dans la classe d’objets correspondante «&nbsp;StopArea&nbsp;».&nbsp;</font></font></font></p>
diff --git a/app/views/test_sheet/2_28.html b/app/views/test_sheet/2_28.html
index 461c913e6..fe29813ad 100644
--- a/app/views/test_sheet/2_28.html
+++ b/app/views/test_sheet/2_28.html
@@ -1,399 +1,104 @@
+<h1 class="western" style="border: 1pt solid rgb(0, 0, 0); padding: 0.05cm 0.12cm; margin-top: 0.21cm;" align="center">
+<font face="Arial, sans-serif"><font style="font-size: 20pt;" size="5"><i>
+ point de contrôle N° 2.28<br>
+Référencement correct des composants dans les équipements<br>
+</i></font></font></h1>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Objectif: </b></u>
+Vérification de la correcte référence à des ARRÊTs/Chouette (« StopArea
+») ou à des LIGNEs/Chouette (« Line ») ou à des POINTs D’ARRÊT SUR
+PARCOURS («&nbsp;StopPoint&nbsp;») ou à<br>
+des TronçonsDeCorrespondance/Chouette («&nbsp;ConnectionLink&nbsp;») dans des EQUIPEMENTs/NEPTUNE («&nbsp;Facility »)<br>
+</font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Priorité: </b></u> Obligatoire</font></p><font face="Arial, sans-serif">
+</font><p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><u><b>Explications:</b></u>
+</font></font></p>
-<div class=WordSection1>
-</span></b>
-
-<p class=MsoTitle><span style='font-size:14.0pt;font-family:"Tahoma","sans-serif"'>Fiche
-du point de contr&ocirc;le N&deg; 2.28</span></p>
-
-<p class=MsoNormal>&nbsp;</p>
-
-<table class=MsoNormalTable border=0 cellspacing=0 cellpadding=0 width=648
- style='width:486.2pt;margin-left:-.75pt;border-collapse:collapse'>
- <tr style='page-break-inside:avoid'>
- <td width=648 colspan=2 valign=top style='width:486.2pt;border:solid black 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center;layout-grid-mode:char'><i><span
- style='font-family:"Tahoma","sans-serif";color:navy'>Description</span></i></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Intitul&eacute;</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoCommentText><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>&nbsp;</span></p>
- <p class=MsoCommentText><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>R&eacute;f&eacute;rencement
- correct des composants dans les &eacute;quipements</span></p>
- <p class=MsoCommentText><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>&nbsp;</span></p>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Objectif</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>V&eacute;rification
- de la correcte r&eacute;f&eacute;rence &agrave; des ARR&Ecirc;Ts/Chouette (&laquo; StopArea &raquo;) ou &agrave; des
- LIGNEs/Chouette (&laquo; Line &raquo;) ou </span><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'>&agrave; des POINTs D&rsquo;ARR&Ecirc;T
- SUR PARCOURS (&laquo;&nbsp;StopPoint&nbsp;&raquo;) ou &agrave; </span><span style='font-size:
- 11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>des
- Tron&ccedil;onsDeCorrespondance/Chouette (&laquo;&nbsp;ConnectionLink&nbsp;&raquo;) </span><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'> </span><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>dans
- des EQUIPEMENTs/NEPTUNE (&laquo; Facility &raquo;) </span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>R&eacute;f&eacute;rences</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>TRIDENT/profil
- NEPTUNE/Transmodel V4 et V5.1</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>N&deg; de fiche(s)
- connexe(s)</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>&nbsp;</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt;layout-grid-mode:char'><b><span
- style='font-size:11.0pt;line-height:200%;font-family:"Tahoma","sans-serif"'>Priorit&eacute;<span
- style='color:red'> </span></span></b></p>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Obligatoire</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt;layout-grid-mode:char'><b><span
- style='font-size:11.0pt;line-height:200%;font-family:"Tahoma","sans-serif"'>R&eacute;sultat</span></b></p>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Conforme
- ou non conforme</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=648 colspan=2 valign=top style='width:486.2pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center;layout-grid-mode:char'><i><span
- style='font-family:"Tahoma","sans-serif";color:navy'>Mise en &oelig;uvre</span></i></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- solid black 1.0pt;border-bottom:solid black 1.0pt;border-right:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;layout-grid-mode:char'><span style='font-size:11.0pt'>Explication</span></h1>
- </td>
- <td width=548 valign=top style='width:411.35pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:11.35pt;margin-bottom:6.0pt;
- margin-left:0cm;layout-grid-mode:char'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'>Si un </span><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>EQUIPEMENTs
- /NEPTUNE </span><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>(&laquo;</span><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>Facility</span><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif";font-weight:normal'>&raquo;) est d&eacute;fini, il r&eacute;f&eacute;rence au
- moins un autre ARR&Ecirc;T/Chouette (&laquo; StopArea&nbsp;&raquo;) ou une </span><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>autre
- LIGNEs/Chouette (&laquo; Line &raquo;) ou un autre</span><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'> POINTs D&rsquo;ARR&Ecirc;T SUR
- PARCOURS (&laquo;&nbsp;StopPoint&nbsp;&raquo;) ou un autre</span><span style='font-size:
- 11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>
- Tron&ccedil;onsDeCorrespondance/Chouette (&laquo;&nbsp;ConnectionLink&nbsp;&raquo;)</span><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>.</span></h1>
- <h1 style='margin-top:6.0pt;margin-right:11.35pt;margin-bottom:6.0pt;
- margin-left:0cm;layout-grid-mode:char'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'>Il convient alors de
- v&eacute;rifier que l&rsquo;&eacute;l&eacute;ment r&eacute;f&eacute;renc&eacute; trouve une description dans la classe
- d&rsquo;objets qui le concerne.</span></h1>
- </td>
- </tr>
-</table>
-<br />
-<table class=MsoNormalTable border=1 cellspacing=0 cellpadding=0 width=619
- style='width:464.4pt;border-collapse:collapse;border:none'>
- <tr>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- padding:0cm 5.4pt 0cm 5.4pt'>
- <p class=MsoNormal><b><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Exemple</span></b></p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- </td>
- <td width=511 valign=top style='width:383.05pt;border:solid windowtext 1.0pt;
- border-left:none;padding:0cm 5.4pt 0cm 5.4pt'>
- <h1 align=left style='margin-left:18.0pt;text-align:left'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Repr&eacute;sentation
- sch&eacute;matique de l&rsquo;Objet &laquo;&nbsp;Facility&nbsp;&raquo; </span></h1>
- <p class=MsoNormal align=center style='text-align:center'><img width=438
- height=756 src="BATERI_Neptune_FINAL-V2_0a_fichiers/image016.jpg"></p>
- <p class=MsoNormal><u><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>Exemple
- de Facility et de </span></u><u><span style='font-size:11.0pt;font-family:
- "Arial","sans-serif"'>StopPointId</span></u><u><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'> associ&eacute;</span></u></p>
- <p class=MsoNormal><span lang=EN-US style='font-size:10.0pt;font-family:"Courier New"'>...</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>A d&eacute;finir</span></p>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm;layout-grid-mode:char'><span lang=EN-US
- style='font-size:10.0pt;font-family:Monospace'>...</span></p>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm;layout-grid-mode:char'>&nbsp;</p>
- </td>
- </tr>
-</table>
-
-<p class=MsoNormal>&nbsp;</p>
-
-<p class=MsoNormal>&nbsp;</p>
-
-</div>
-
-<b><span style='font-size:14.0pt;font-family:"Tahoma","sans-serif"'><br
-clear=all>
-</span></b>
-
-<div class=WordSection11>
-
-<table class=MsoNormalTable border=0 cellspacing=0 cellpadding=0 width=629
- style='width:472.05pt;margin-left:-.75pt;border-collapse:collapse'>
- <tr style='page-break-inside:avoid'>
- <td width=629 colspan=2 valign=top style='width:472.05pt;border:solid black 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h2 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center;layout-grid-mode:char'><i><span lang=EN-US
- style='font-size:14.0pt;color:navy'>Evaluation</span></i></h2>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span lang=EN-US
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>N&deg; test</span></h1>
- </td>
- <td width=530 style='width:397.2pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>2.28.1</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:5.65pt 11.35pt 5.65pt 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Libell&eacute;</span></h1>
- </td>
- <td width=530 style='width:397.2pt;border:solid black 1.0pt;border-top:none;
- padding:5.65pt 11.35pt 5.65pt 3.5pt;height:37.4pt'>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>V&eacute;rification
- de la correcte r&eacute;f&eacute;rence &agrave; un ARR&Ecirc;T/Chouette (&laquo; StopArea &raquo;) ou &agrave; une
- LIGNE/Chouette (&laquo; Line &raquo;) ou </span><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'>&agrave; un POINT D&rsquo;ARR&Ecirc;T SUR PARCOURS
- (&laquo;&nbsp;StopPoint&nbsp;&raquo;) ou &agrave; un</span><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'> Tron&ccedil;onsDeCorrespondance/Chouette
- (&laquo;&nbsp;ConnectionLink&nbsp;&raquo;) dans les FACILITYs /NEPTUNE </span><span
- style='font-size:11.0pt;font-family:"Arial","sans-serif"'>(&laquo;</span><span
- style='font-size:11.0pt;font-family:"Arial","sans-serif"'>Facility</span><span
- style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&raquo;)</span></p>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span lang=EN-US
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Champ
- d&rsquo;application</span></h1>
- </td>
- <td width=530 style='width:397.2pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span lang=EN-US
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>&lt;StopArea&gt;</span></h1>
- <p class=MsoNormal><span lang=EN-US>&lt;</span><span lang=EN-US
- style='font-size:11.0pt;font-family:"Arial","sans-serif"'>
- StopPoint&nbsp;&gt;</span></p>
- <p class=MsoNormal><span lang=EN-US style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&lt;</span><span
- lang=EN-US style='font-size:11.0pt;font-family:"Arial","sans-serif"'>
- Line&gt;</span></p>
- <p class=MsoNormal><span lang=EN-US style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&lt;
- ConnectionLink&nbsp;&gt;</span></p>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm;layout-grid-mode:char'><span lang=EN-US
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>&lt;Facility&gt; </span></p>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:5.65pt 11.35pt 5.65pt 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>V&eacute;rification</span></h1>
- </td>
- <td width=530 style='width:397.2pt;border:solid black 1.0pt;border-top:none;
- padding:5.65pt 11.35pt 5.65pt 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:11.35pt;margin-bottom:
- 6.0pt;margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>-
- Si la classe d&rsquo;objets &laquo;&nbsp;</span><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif";font-weight:normal'>Facility</span><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>&raquo;
- existe alors poursuivre le test, sinon abandonner le test,</span></h1>
- <h1 align=left style='margin-top:0cm;margin-right:11.35pt;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>-
- Si chaque &eacute;l&eacute;ment &laquo;&nbsp;stopAreaId&raquo; contient une valeur, alors le test est
- valid&eacute; si ces valeurs se retrouvent dans des &eacute;l&eacute;ments &laquo;&nbsp;objectId&nbsp;&raquo;
- de la classe d&rsquo;objet &laquo;&nbsp;StopArea&nbsp;&raquo; sinon le test est invalid&eacute; et
- produit le message &laquo;&nbsp;test 2.28.1&nbsp;: une valeur de l&rsquo;&eacute;l&eacute;ment
- &laquo;&nbsp;stopAreaId&raquo; de la classe d&rsquo;objets &laquo;&nbsp;</span><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Facility</span><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>&raquo;
- n&rsquo;est pas rep&eacute;r&eacute;e dans la classe d&rsquo;objets correspondant &laquo;&nbsp;StopArea&nbsp;&raquo;.&nbsp;&raquo;
- </span></h1>
- <p class=MsoNormal style='margin-top:12.0pt'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>- Si chaque &eacute;l&eacute;ment &laquo;&nbsp;</span><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>lineId&raquo; contient
- une valeur, alors le test est valid&eacute; si ces valeurs se retrouvent dans des
- &eacute;l&eacute;ments &laquo;&nbsp;objectId&nbsp;&raquo; de la classe d&rsquo;objet &laquo;&nbsp;</span><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Line</span><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>&raquo; sinon le test
- est invalid&eacute; et produit le message &laquo;&nbsp;test 2.28.2&nbsp;: une valeur de l&rsquo;&eacute;l&eacute;ment
- &laquo;&nbsp;</span><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>lineId&raquo;
- de la classe d&rsquo;objets &laquo;&nbsp;</span><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>Facility</span><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>&raquo; n&rsquo;est pas rep&eacute;r&eacute;e dans la classe
- d&rsquo;objets correspondant &laquo;&nbsp;</span><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>Line</span><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>&raquo;.&nbsp;&raquo;</span></p>
- <p class=MsoNormal style='margin-top:12.0pt'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>- Si chaque &eacute;l&eacute;ment &laquo;&nbsp;</span><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>connectionLinkId&raquo;
- contient une valeur, alors le test est valid&eacute; si ces valeurs se retrouvent
- dans des &eacute;l&eacute;ments &laquo;&nbsp;objectId&nbsp;&raquo; de la classe d&rsquo;objet &laquo;&nbsp;</span><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>ConnectionLink&nbsp;</span><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>&raquo; sinon le test
- est invalid&eacute; et produit le message &laquo;&nbsp;test 2.28.3&nbsp;: une valeur de
- l&rsquo;&eacute;l&eacute;ment &laquo;&nbsp;</span><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>connectionLinkId&raquo;
- de la classe d&rsquo;objets &laquo;&nbsp;</span><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>Facility</span><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>&raquo; n&rsquo;est pas rep&eacute;r&eacute;e dans la classe
- d&rsquo;objets correspondant &laquo;&nbsp;</span><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>ConnectionLink&nbsp;</span><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>&raquo;.&nbsp;&raquo;</span></p>
- <p class=MsoNormal style='margin-top:12.0pt'><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'>- Si chaque &eacute;l&eacute;ment &laquo;&nbsp;</span><span
- style='font-size:11.0pt;font-family:"Arial","sans-serif"'>stopPointId&raquo;
- contient une valeur, alors le test est valid&eacute; si ces valeurs se retrouvent
- dans des &eacute;l&eacute;ments &laquo;&nbsp;objectId&nbsp;&raquo; de la classe d&rsquo;objet
- &laquo;&nbsp;StopPoint&nbsp;&raquo; sinon le test est invalid&eacute; et produit le message
- &laquo;&nbsp;test 2.28.4&nbsp;: une valeur de l&rsquo;&eacute;l&eacute;ment &laquo;&nbsp;stopPointId&raquo; de la
- classe d&rsquo;objets &laquo;&nbsp;</span><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>Facility</span><span
- style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&raquo; n&rsquo;est pas rep&eacute;r&eacute;e
- dans la classe d&rsquo;objets correspondant &laquo;&nbsp;StopPoint&nbsp;&raquo;.&nbsp;&raquo;</span></p>
- </td>
- </tr>
-</table>
-
-</div>
+
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Si un EQUIPEMENTs /NEPTUNE («&nbsp;Facility») est défini, il référence au moins un autre ARRÊT/Chouette («StopArea&nbsp;») ou une&nbsp;autre LIGNEs/Chouette (« Line ») ou un autre&nbsp;POINTs D’ARRÊT SUR PARCOURS («&nbsp;StopPoint&nbsp;») ou un autre&nbsp;TronçonsDeCorrespondance/Chouette («&nbsp;ConnectionLink&nbsp;»).</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Il convient alors de vérifier que l’élément référencé trouve une description dans la classe d’objets qui le concerne.</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>Exemple: </u></b></font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Représentation schématique de l’Objet «&nbsp;Facility&nbsp;»</font></font></font></p>
+<p><font face="Arial, sans-serif"><img src="image016.jpg" height="756" width="438"></font></p>
+
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Exemple de Facility et de&nbsp;StopPointId&nbsp;associé</font></font></font></p>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">...<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">A définir</font></span>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>N° test:</u></b>
+2.28.1</font></font></font></p>
+
+
+
+
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Libellé:</u>
+Vérification de la correcte référence à un ARRÊT/Chouette (« StopArea ») ou à une LIGNE/Chouette («Line») ou&nbsp;à un POINT D’ARRÊT SUR PARCOURS («&nbsp;StopPoint&nbsp;») ou à&nbsp;un&nbsp;TronçonsDeCorrespondance/Chouette («&nbsp;ConnectionLink&nbsp;») dans les FACILITYs /NEPTUNE&nbsp;(«&nbsp;Facility&nbsp;»)</font></font></font></p>
+
+
+
+
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Champ d’application:</u>
+&lt;StopArea&gt; &lt;StopPoint&nbsp;&gt;&nbsp;&lt;&nbsp;Line&gt;&nbsp;&lt; ConnectionLink&nbsp;&gt;&nbsp;&lt;Facility&gt;</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Vérification:</u> </font></font></font></p>
+
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si la classe d’objets «&nbsp;Facility&nbsp;» existe alors poursuivre le test, sinon abandonner le test,</font></font></font></p>
+
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si chaque élément «&nbsp;stopAreaId» contient une valeur, alors le
+test est validé si ces valeurs se retrouvent dans des éléments
+«&nbsp;objectId&nbsp;» de la classe d’objet «&nbsp;StopArea&nbsp;»
+sinon le test est invalidé et produit le message «&nbsp;test
+2.28.1&nbsp;: une valeur de l’élément «&nbsp;stopAreaId» de la classe
+d’objets «&nbsp;Facility&nbsp;» n’est pas repérée dans la classe d’objets correspondant «&nbsp;StopArea&nbsp;».&nbsp;</font></font></font></p>
+
+
+
+
+
+
+
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si chaque élément «&nbsp;lineId»
+contient une valeur, alors le test est validé si ces valeurs se
+retrouvent dans des éléments «&nbsp;objectId&nbsp;» de la classe
+d’objet «&nbsp;Line» sinon le test est invalidé et produit le message «&nbsp;test 2.28.2&nbsp;: une valeur de l’élément «&nbsp;lineId» de la classe d’objets «&nbsp;Facility» n’est pas repérée dans la classe d’objets correspondant «&nbsp;Line».&nbsp;</font></font></font></p>
+
+
+
+
+
+
+
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si chaque élément « &nbsp;connectionLinkId»
+contient une valeur, alors le test est validé si ces valeurs se
+retrouvent dans des éléments «&nbsp;objectId&nbsp;» de la classe
+d’objet «&nbsp;ConnectionLink&nbsp;» sinon le test est invalidé et produit le message «&nbsp;test 2.28.3&nbsp;: une valeur de l’élément «&nbsp;connectionLinkId» de la classe d’objets « &nbsp;Facility» n’est pas repérée dans la classe d’objets correspondant «&nbsp;ConnectionLink&nbsp;».&nbsp;</font></font></font></p>
+
+
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si chaque élément «&nbsp;stopPointId»
+contient une valeur, alors le test est validé si ces valeurs se
+retrouvent dans des éléments «&nbsp;objectId&nbsp;» de la classe
+d’objet «&nbsp;StopPoint&nbsp;» sinon le test est invalidé et produit
+le message «&nbsp;test 2.28.4&nbsp;: une valeur de l’élément
+«&nbsp;stopPointId» de la classe d’objets «&nbsp;Facility» n’est pas repérée dans la classe d’objets correspondant «&nbsp;StopPoint&nbsp;».&nbsp;</font></font></font></p>
diff --git a/app/views/test_sheet/2_3.html b/app/views/test_sheet/2_3.html
index 8785be94f..cbedb8ebb 100644
--- a/app/views/test_sheet/2_3.html
+++ b/app/views/test_sheet/2_3.html
@@ -1,354 +1,97 @@
+<h1 class="western" style="border: 1pt solid rgb(0, 0, 0); padding: 0.05cm 0.12cm; margin-top: 0.21cm;" align="center">
+<font face="Arial, sans-serif"><font style="font-size: 20pt;" size="5"><i>
+ point de contrôle N° 2.3<br>Cohérence entre les arrêts et leurs composants&nbsp;<br>
+</i></font></font></h1>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Objectif: </b></u>
+Vérification de la correcte référence à des ARRÊTs/Chouette (« StopArea
+») et/ou à des POINTs D’ARRÊT SUR PARCOURS («&nbsp;StopPoint&nbsp;»)
+dans les ARRÊTs/Chouette (« StopArea »)<br>
+</font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Priorité: </b></u> Obligatoire</font></p><font face="Arial, sans-serif">
+</font><p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><u><b>Explications:</b></u>
+</font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Si un ARRÊT/Chouette (« StopArea ») est défini, il référence soit au
+moins un autre ARRÊT/Chouette (« StopArea »), soit au moins un POINT
+D’ARRÊT SUR PARCOURS (« StopPoint »).</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Il convient alors de vérifier que les éléments référencés trouvent une description dans la classe d’objets qui les concernent.</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>Exemple: </u></b></font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Représentation schématique de l’Objet «&nbsp;StopArea&nbsp;»</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<img src="image004.jpg" height="466" width="464"></font></font></font></p>
-<div class=WordSection1>
-<p class=MsoTitle><span style='font-size:14.0pt;font-family:"Tahoma","sans-serif"'>Fiche
-du point de contr&ocirc;le N&deg; 2.3</span></p>
-<p class=MsoNormal>&nbsp;</p>
-<table class=MsoNormalTable border=0 cellspacing=0 cellpadding=0 width=648
- style='width:486.2pt;margin-left:-.75pt;border-collapse:collapse'>
- <tr style='page-break-inside:avoid'>
- <td width=648 colspan=2 valign=top style='width:486.2pt;border:solid black 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center;layout-grid-mode:char'><i><span
- style='font-family:"Tahoma","sans-serif";color:navy'>Description</span></i></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Intitul&eacute;</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoCommentText><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>&nbsp;</span></p>
- <p class=MsoCommentText><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Coh&eacute;rence
- entre les arr&ecirc;ts et leurs composants.</span></p>
- <p class=MsoCommentText><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>&nbsp;</span></p>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Objectif</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>V&eacute;rification
- de la correcte r&eacute;f&eacute;rence &agrave; des ARR&Ecirc;Ts/Chouette (&laquo; StopArea &raquo;) et/ou &agrave; des
- POINTs D&rsquo;ARR&Ecirc;T SUR PARCOURS (&laquo;&nbsp;StopPoint&nbsp;&raquo;) dans les
- ARR&Ecirc;Ts/Chouette (&laquo; StopArea &raquo;)</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>R&eacute;f&eacute;rences</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>TRIDENT/profil
- CHOUETTE/Transmodel V4 et V5.1</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>N&deg; de fiche(s)
- connexe(s)</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>&nbsp;</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt;layout-grid-mode:char'><b><span
- style='font-size:11.0pt;line-height:200%;font-family:"Tahoma","sans-serif"'>Priorit&eacute;<span
- style='color:red'> </span></span></b></p>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Obligatoire</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt;layout-grid-mode:char'><b><span
- style='font-size:11.0pt;line-height:200%;font-family:"Tahoma","sans-serif"'>R&eacute;sultat</span></b></p>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Conforme
- ou non conforme</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=648 colspan=2 valign=top style='width:486.2pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center;layout-grid-mode:char'><i><span
- style='font-family:"Tahoma","sans-serif";color:navy'>Mise en &oelig;uvre</span></i></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- solid black 1.0pt;border-bottom:solid black 1.0pt;border-right:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;layout-grid-mode:char'><span style='font-size:11.0pt'>Explication</span></h1>
- </td>
- <td width=548 valign=top style='width:411.35pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:11.35pt;margin-bottom:6.0pt;
- margin-left:0cm;layout-grid-mode:char'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'>Si un ARR&Ecirc;T/Chouette (&laquo;
- StopArea &raquo;) est d&eacute;fini, il r&eacute;f&eacute;rence soit au moins un autre ARR&Ecirc;T/Chouette (&laquo;
- StopArea &raquo;), soit au moins un POINT D&rsquo;ARR&Ecirc;T SUR PARCOURS (&laquo; StopPoint &raquo;).</span></h1>
- <h1 style='margin-top:6.0pt;margin-right:11.35pt;margin-bottom:6.0pt;
- margin-left:0cm;layout-grid-mode:char'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'>Il convient alors de
- v&eacute;rifier que les &eacute;l&eacute;ments r&eacute;f&eacute;renc&eacute;s trouvent une description dans la classe
- d&rsquo;objets qui les concernent.</span></h1>
- </td>
- </tr>
-</table>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Exemple de StopArea avec&nbsp;contains&nbsp;et&nbsp;StopPoint&nbsp;associé</font></font></font></p>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">...<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;ChouetteArea&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;StopArea&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;objectId&gt;AMIV:StopPoint:237814&lt;/objectId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;name&gt;Croix l'Alouettes&lt;/name&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;contains&gt;AMIV:StopPoint:488965A7A237814&lt;/contains&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;centroidOfArea&gt;AMIV:Place:237814&lt;/centroidOfArea&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;StopAreaExtension&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;areaType&gt;Quay&lt;/areaType&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;fareCode&gt;0&lt;/fareCode&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;/StopAreaExtension&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;/StopArea&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">...<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;StopPoint&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;objectId&gt;AMIV:StopPoint:488965A7A237814&lt;/objectId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif"><br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;objectVersion&gt;1&lt;/objectVersion&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;longitude&gt;0&lt;/longitude&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;latitude&gt;0&lt;/latitude&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;longLatType&gt;WGS84&lt;/longLatType&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">...<br></font></span>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>N° test:</u></b>
+2.3.1</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Libellé:</u> Vérification de la correcte référence à des
+ARRÊTs/Chouette (« StopArea ») et/ou à des POINTs D’ARRÊT SUR PARCOURS
+(«&nbsp;StopPoint&nbsp;») dans les ARRÊTs/Chouette (« StopArea »)</font></font></font></p>
-<br />
-
-
-<table class=MsoNormalTable border=1 cellspacing=0 cellpadding=0 width=619
- style='width:464.4pt;border-collapse:collapse;border:none'>
- <tr>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- padding:0cm 5.4pt 0cm 5.4pt'>
- <p class=MsoNormal><b><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Exemple</span></b></p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- </td>
- <td width=511 valign=top style='width:383.05pt;border:solid windowtext 1.0pt;
- border-left:none;padding:0cm 5.4pt 0cm 5.4pt'>
- <h1 align=left style='margin-left:18.0pt;text-align:left'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Repr&eacute;sentation
- sch&eacute;matique de l&rsquo;Objet &laquo;&nbsp;StopArea&nbsp;&raquo; </span></h1>
- <p class=MsoNormal><b><span style='font-size:11.0pt'><img width=464
- height=466 src="BATERI_Neptune_FINAL-V2_0a_fichiers/image004.jpg"></span></b></p>
- <p class=MsoNormal><u><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>Exemple
- de StopArea avec </span></u><u><span style='font-size:11.0pt;font-family:
- "Arial","sans-serif"'>contains</span></u><u><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'> et de </span></u><u><span
- style='font-size:11.0pt;font-family:"Arial","sans-serif"'>StopPoint</span></u><u><span
- style='font-size:11.0pt;font-family:"Arial","sans-serif"'> associ&eacute;</span></u></p>
- <p class=MsoNormal><span lang=EN-US style='font-size:10.0pt;font-family:"Courier New"'>...</span></p>
- <p class=MsoNormal><span lang=EN-US style='font-size:10.0pt;font-family:"Courier New"'>&lt;ChouetteArea&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;StopArea&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;objectId&gt;AMIV:StopPoint:237814&lt;/objectId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;name&gt;Croix
- l'Alouettes&lt;/name&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;contains&gt;AMIV:StopPoint:488965A7A237814&lt;/contains&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;centroidOfArea&gt;AMIV:Place:237814&lt;/centroidOfArea&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;StopAreaExtension&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;areaType&gt;Quay&lt;/areaType&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;fareCode&gt;0&lt;/fareCode&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;/StopAreaExtension&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;/StopArea&gt;</span></p>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm;layout-grid-mode:char'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>...</span></p>
- <p class=MsoNormal><span lang=EN-US style='font-size:10.0pt;font-family:"Courier New"'> &lt;StopPoint&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;objectId&gt;AMIV:StopPoint:488965A7A237814&lt;/objectId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> </span><span
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;objectVersion&gt;1&lt;/objectVersion&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;longitude&gt;0&lt;/longitude&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;latitude&gt;0&lt;/latitude&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;longLatType&gt;WGS84&lt;/longLatType&gt;</span></p>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm;layout-grid-mode:char'><span style='font-size:10.0pt;
- font-family:"Courier New"'>...</span></p>
- <p class=MsoNormal>&nbsp;</p>
- </td>
- </tr>
-</table>
-<br />
-</div>
-<div class=WordSection2>
-
-<table class=MsoNormalTable border=0 cellspacing=0 cellpadding=0 width=629
- style='width:472.05pt;margin-left:-.75pt;border-collapse:collapse'>
- <tr style='page-break-inside:avoid'>
- <td width=629 colspan=2 valign=top style='width:472.05pt;border:solid black 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h2 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center;layout-grid-mode:char'><i><span lang=EN-US
- style='font-size:14.0pt;color:navy'>Evaluation</span></i></h2>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span lang=EN-US
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>N&deg; test</span></h1>
- </td>
- <td width=530 style='width:397.2pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>2.3.1</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:5.65pt 11.35pt 5.65pt 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Libell&eacute;</span></h1>
- </td>
- <td width=530 style='width:397.2pt;border:solid black 1.0pt;border-top:none;
- padding:5.65pt 11.35pt 5.65pt 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>V&eacute;rification
- de la correcte r&eacute;f&eacute;rence &agrave; des ARR&Ecirc;Ts/Chouette (&laquo; StopArea &raquo;) et/ou &agrave; des
- POINTs D&rsquo;ARR&Ecirc;T SUR PARCOURS (&laquo;&nbsp;StopPoint&nbsp;&raquo;) dans les
- ARR&Ecirc;Ts/Chouette (&laquo; StopArea &raquo;) </span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span lang=EN-US
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Champ
- d&rsquo;application</span></h1>
- </td>
- <td width=530 style='width:397.2pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span lang=EN-US
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>&lt;StopArea&gt;</span></h1>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm;layout-grid-mode:char'><span lang=EN-US
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>&lt;StopPoint&gt; </span></p>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:5.65pt 11.35pt 5.65pt 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>V&eacute;rification</span></h1>
- </td>
- <td width=530 style='width:397.2pt;border:solid black 1.0pt;border-top:none;
- padding:5.65pt 11.35pt 5.65pt 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:11.35pt;margin-bottom:
- 6.0pt;margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>-
- Si la classe d&rsquo;objets &laquo;&nbsp;StopArea&nbsp;&raquo; existe alors poursuivre le test,
- sinon abandonner le test,</span></h1>
- <h1 align=left style='margin-top:6.0pt;margin-right:11.35pt;margin-bottom:
- 6.0pt;margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>-
- Si chaque &eacute;l&eacute;ment &laquo;&nbsp;contains&nbsp;&raquo; contient une ou plusieurs valeurs,
- alors le test est valid&eacute; si ces valeurs se retrouvent dans des &eacute;l&eacute;ments
- &laquo;&nbsp;objectId&nbsp;&raquo; des classes d&rsquo;objets &laquo;&nbsp;StopArea&nbsp;&raquo; ou
- &laquo;&nbsp;StopPoint&nbsp;&raquo; sinon le test est invalid&eacute; et produit le message
- &laquo;&nbsp;test 2.3.1&nbsp;: une ou plusieurs valeurs de l&rsquo;&eacute;l&eacute;ment &laquo;&nbsp;contains&nbsp;&raquo;
- de la classe d&rsquo;objets &laquo;&nbsp;StopArea&nbsp;&raquo; n&rsquo;est pas rep&eacute;r&eacute;e dans la classe
- d&rsquo;objets correspondant &laquo;&nbsp;StopPoint&nbsp;&raquo; ou
- &laquo;&nbsp;StopArea&nbsp;&raquo;.&nbsp;&raquo; </span></h1>
- </td>
- </tr>
-</table>
-</div>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Champ d’application:</u>
+&lt;StopArea&gt;&nbsp;&lt;StopPoint&gt;</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Vérification:</u> </font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si la classe d’objets «&nbsp;StopArea&nbsp;» existe alors poursuivre le test, sinon abandonner le test,</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si chaque élément «&nbsp;contains&nbsp;» contient une ou plusieurs
+valeurs, alors le test est validé si ces valeurs se retrouvent dans des
+éléments «&nbsp;objectId&nbsp;» des classes d’objets
+«&nbsp;StopArea&nbsp;» ou «&nbsp;StopPoint&nbsp;» sinon le test est
+invalidé et produit le message «&nbsp;test 2.3.1&nbsp;: une ou
+plusieurs valeurs de l’élément «&nbsp;contains&nbsp;» de la classe
+d’objets «&nbsp;StopArea&nbsp;» n’est pas repérée dans la classe
+d’objets correspondant «&nbsp;StopPoint&nbsp;» ou
+«&nbsp;StopArea&nbsp;».&nbsp;»</font></font></font></p>
diff --git a/app/views/test_sheet/2_4.html b/app/views/test_sheet/2_4.html
index 7bd6d3bea..78b3b862d 100644
--- a/app/views/test_sheet/2_4.html
+++ b/app/views/test_sheet/2_4.html
@@ -1,367 +1,152 @@
+<h1 class="western" style="border: 1pt solid rgb(0, 0, 0); padding: 0.05cm 0.12cm; margin-top: 0.21cm;" align="center">
+<font face="Arial, sans-serif"><font style="font-size: 20pt;" size="5"><i>
+ point de contrôle N° 2.4<br>
+Définition des correspondances<br>
+</i></font></font></h1>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Objectif: </b></u>
+Vérification de la correcte référence aux ARRÊTs/Chouette (« StopArea
+») définissant des TronçonsDeCorrespondance/Chouette
+(«&nbsp;ConnectionLink&nbsp;») .<br>
+</font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Priorité: </b></u> Obligatoire (si l’objet «&nbsp;ConnectionLink&nbsp;» existe)</font><br>
+</p><font face="Arial, sans-serif"></font><p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><u><b>Explications:</b></u>
+</font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+La liste des TronçonsDeCorrespondance/Chouette
+(«&nbsp;ConnectionLink&nbsp;») définie dans un
+«&nbsp;ChouettePTNetwork&nbsp;» est optionnelle. Les éléments
+«&nbsp;startOfLink&nbsp;» et «&nbsp;endOfLink&nbsp;» de chaque
+TronçonDeCorrespondance/Chouette («&nbsp;ConnectionLink&nbsp;») sont
+obligatoires.</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Lorsque la liste des TronçonsDeCorrespondance/Chouette
+(«&nbsp;ConnectionLink&nbsp;») est non vide, il convient de vérifier
+que pour chaque TronçonDeCorrespondance/Chouette
+(«&nbsp;ConnectionLink&nbsp;») «&nbsp;startOfLink&nbsp;» et
+«&nbsp;endOfLink&nbsp;» correspondent à deux identifiants distincts
+d’ARRÊTs/Chouette (« StopArea »).</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>Exemple: </u></b></font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Représentation schématique de l’Objet «&nbsp;ConnectionLink&nbsp;» dans le schéma XSD CHOUETTE</font></font></font></p>
+<p><font face="Arial, sans-serif"><img src="image005.jpg" height="547" width="372"></font></p>
-<div class=WordSection1>
-<p class=MsoTitle><span style='font-size:14.0pt;font-family:"Tahoma","sans-serif"'>&nbsp;</span></p>
-<p class=MsoTitle><span style='font-size:14.0pt;font-family:"Tahoma","sans-serif"'>Fiche
-du point de contr&ocirc;le N&deg; 2.4</span></p>
-<p class=MsoNormal>&nbsp;</p>
-<table class=MsoNormalTable border=0 cellspacing=0 cellpadding=0 width=648
- style='width:485.7pt;margin-left:-.25pt;border-collapse:collapse'>
- <tr style='page-break-inside:avoid'>
- <td width=648 colspan=2 valign=top style='width:485.7pt;border:solid black 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center;layout-grid-mode:char'><i><span
- style='font-family:"Tahoma","sans-serif";color:navy'>Description</span></i></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Intitul&eacute;</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt;layout-grid-mode:char'><span
- style='font-size:11.0pt;line-height:200%;font-family:"Tahoma","sans-serif"'>D&eacute;finition
- des correspondances.</span></p>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Objectif</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>V&eacute;rification
- de la correcte r&eacute;f&eacute;rence aux ARR&Ecirc;Ts/Chouette (&laquo; StopArea &raquo;) d&eacute;finissant des
- Tron&ccedil;onsDeCorrespondance/Chouette (&laquo;&nbsp;ConnectionLink&nbsp;&raquo;) .</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>R&eacute;f&eacute;rences</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>TRIDENT/profil
- CHOUETTE/Transmodel V4 et V5.1</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>N&deg;de fiche(s)
- connexe(s)</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>&nbsp;</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt;layout-grid-mode:char'><b><span
- style='font-size:11.0pt;line-height:200%;font-family:"Tahoma","sans-serif"'>Priorit&eacute;<span
- style='color:red'> </span></span></b></p>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Obligatoire
- (si l&rsquo;objet &laquo;&nbsp;ConnectionLink&nbsp;&raquo; existe)</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt;layout-grid-mode:char'><b><span
- style='font-size:11.0pt;line-height:200%;font-family:"Tahoma","sans-serif"'>R&eacute;sultat</span></b></p>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Conforme
- ou non conforme</span></h1>
- </td>
- </tr>
- <tr style='page-break-inside:avoid'>
- <td width=648 colspan=2 style='width:485.7pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center;layout-grid-mode:char'><i><span
- style='font-family:"Tahoma","sans-serif";color:navy'>Mise en &oelig;uvre</span></i></h1>
- </td>
- </tr>
- <tr>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- solid black 1.0pt;border-bottom:solid black 1.0pt;border-right:none;
- padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;layout-grid-mode:char'><span style='font-size:11.0pt'>Explication</span></h1>
- </td>
- <td width=108 valign=top style='width:81.35pt;border:solid black 1.0pt;
- border-top:none;padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:11.35pt;margin-bottom:
- 6.0pt;margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>La
- liste des Tron&ccedil;onsDeCorrespondance/Chouette (&laquo;&nbsp;ConnectionLink&nbsp;&raquo;)
- d&eacute;finie dans un &laquo;&nbsp;ChouettePTNetwork&nbsp;&raquo; est optionnelle. Les &eacute;l&eacute;ments
- &laquo;&nbsp;startOfLink&nbsp;&raquo; et &laquo;&nbsp;endOfLink&nbsp;&raquo; de chaque
- Tron&ccedil;onDeCorrespondance/Chouette (&laquo;&nbsp;ConnectionLink&nbsp;&raquo;) sont
- obligatoires.</span></h1>
- <h1 align=left style='margin-top:6.0pt;margin-right:11.35pt;margin-bottom:
- 6.0pt;margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Lorsque
- la liste des Tron&ccedil;onsDeCorrespondance/Chouette (&laquo;&nbsp;ConnectionLink&nbsp;&raquo;)
- est non vide, il convient de v&eacute;rifier que pour chaque
- Tron&ccedil;onDeCorrespondance/Chouette (&laquo;&nbsp;ConnectionLink&nbsp;&raquo;)
- &laquo;&nbsp;startOfLink&nbsp;&raquo; et &laquo;&nbsp;endOfLink&nbsp;&raquo; correspondent &agrave; deux
- identifiants distincts d&rsquo;ARR&Ecirc;Ts/Chouette (&laquo; StopArea &raquo;).</span></h1>
- </td>
- </tr>
-</table>
-<br />
-<table class=MsoNormalTable border=0 cellspacing=0 cellpadding=0 width=648
- style='width:485.7pt;margin-left:-.25pt;border-collapse:collapse'>
- <tr style='height:688.65pt'>
- <td width=108 valign=top style='width:81.35pt;border:solid black 1.0pt;
- border-right:none;padding:0cm 3.5pt 0cm 3.5pt;height:688.65pt'>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm;layout-grid-mode:char'><b><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>Exemple</span></b></p>
- </td>
- <td width=108 valign=top style='width:81.35pt;border:solid black 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:688.65pt'>
- <h1 align=left style='margin-left:18.0pt;text-align:left;layout-grid-mode:
- char'><span style='font-size:11.0pt;font-weight:normal'>&nbsp;</span></h1>
- <h1 align=left style='margin-left:18.0pt;text-align:left'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Repr&eacute;sentation
- sch&eacute;matique de l&rsquo;Objet &laquo;&nbsp;ConnectionLink&nbsp;&raquo; dans le sch&eacute;ma XSD
- CHOUETTE</span></h1>
- <h1 align=left style='margin-left:18.0pt;text-align:left'><span
- style='font-size:11.0pt;font-weight:normal'>&nbsp;</span></h1>
- <p class=MsoNormal align=center style='text-align:center'><img width=372
- height=547 src="BATERI_Neptune_FINAL-V2_0a_fichiers/image005.jpg"></p>
- <h4><span style='font-family:"Tahoma","sans-serif"'>&nbsp;</span></h4>
- <h4><span style='font-family:"Tahoma","sans-serif"'>&nbsp;</span></h4>
- <h4><span style='font-family:"Tahoma","sans-serif"'>&nbsp;</span></h4>
- <h4><span style='font-family:"Tahoma","sans-serif"'>&nbsp;</span></h4>
- <h4><span style='font-family:"Tahoma","sans-serif"'>&nbsp;</span></h4>
- <h4><span style='font-family:"Tahoma","sans-serif"'>&nbsp;</span></h4>
- <h4><span style='font-family:"Tahoma","sans-serif"'>&nbsp;</span></h4>
- <h4><span style='font-family:"Tahoma","sans-serif"'>&nbsp;</span></h4>
- <h4><span style='font-family:"Tahoma","sans-serif"'>&nbsp;</span></h4>
- <h4><span style='font-family:"Tahoma","sans-serif"'>&nbsp;</span></h4>
- <h4><span style='font-family:"Tahoma","sans-serif"'>&nbsp;</span></h4>
- <h4><span style='font-family:"Tahoma","sans-serif"'>&nbsp;</span></h4>
- <h4><span style='font-family:"Tahoma","sans-serif"'>&nbsp;</span></h4>
- <h4><span style='font-family:"Tahoma","sans-serif"'>&nbsp;</span></h4>
- <h4><span style='font-family:"Tahoma","sans-serif"'>&nbsp;</span></h4>
- <h4><span style='font-family:"Tahoma","sans-serif"'>&nbsp;</span></h4>
- <h4><span style='font-family:"Tahoma","sans-serif"'>&nbsp;</span></h4>
- <h4><span style='font-family:"Tahoma","sans-serif"'>Exemple de deux arr&ecirc;ts connect&eacute;s
- par une correspondance</span></h4>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><span lang=EN-US style='font-size:10.0pt;font-family:
- "Courier New"'>&lt;StopArea&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;objectId&gt;AMIV:StopPoint:237803&lt;/objectId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;name&gt;ZAE
- Robert Moinon&lt;/name&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;contains&gt;AMIV:StopPoint:488973A5A237803&lt;/contains&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;contains&gt;AMIV:StopPoint:489111A5A237803&lt;/contains&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;contains&gt;AMIV:StopPoint:488962A4A237803&lt;/contains&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;centroidOfArea&gt;AMIV:Place:237803&lt;/centroidOfArea&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;StopAreaExtension&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;areaType&gt;Quay&lt;/areaType&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;fareCode&gt;0&lt;/fareCode&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;/StopAreaExtension&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;/StopArea&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>...</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;StopArea&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;objectId&gt;AMIV:StopPoint:237804&lt;/objectId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;name&gt;ZAE
- REP&lt;/name&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;contains&gt;AMIV:StopPoint:488973A4A237804&lt;/contains&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;contains&gt;AMIV:StopPoint:489111A4A237804&lt;/contains&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;contains&gt;AMIV:StopPoint:488962A3A237804&lt;/contains&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;centroidOfArea&gt;AMIV:Place:237804&lt;/centroidOfArea&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;StopAreaExtension&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;areaType&gt;Quay&lt;/areaType&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;fareCode&gt;0&lt;/fareCode&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;/StopAreaExtension&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;/StopArea&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>...</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;ConnectionLink&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;objectId&gt;AMIV:ConnectionLink:02378030237804&lt;/objectId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;startOfLink&gt;AMIV:StopPoint:237803&lt;/startOfLink&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;endOfLink&gt;AMIV:StopPoint:237804&lt;/endOfLink&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;defaultDuration&gt;PT2M53S&lt;/defaultDuration&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;/ConnectionLink&gt;</span></p>
- <p class=MsoHeader style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'>&nbsp;</p>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>La
- correspondance '</span><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>AMIV:ConnectionLink:02378030237804'
- </span><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>connecte
- deux arr&ecirc;ts du r&eacute;seau '</span><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>AMIV:StopPoint:237803'
- et 'AMIV:StopPoint:237804'.</span></p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- </td>
- </tr>
- <tr style='page-break-inside:avoid'>
- <td width=648 colspan=2 valign=top style='width:485.7pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h2 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center;layout-grid-mode:char'><i><span lang=EN-US
- style='font-size:14.0pt;color:navy'>Evaluation</span></i></h2>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span lang=EN-US
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>N&deg; test</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>2.4.1</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Libell&eacute;</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>V&eacute;rification
- de la correcte r&eacute;f&eacute;rence aux ARR&Ecirc;Ts/Chouette (&laquo; StopArea &raquo;) d&eacute;finissant des
- Tron&ccedil;onsDeCorrespondance/Chouette (&laquo;&nbsp;ConnectionLink&nbsp;&raquo;) .</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span lang=EN-US
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Champ
- d&rsquo;application</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span lang=EN-US
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>&lt;StopArea&gt;</span></h1>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm;layout-grid-mode:char'><span lang=EN-US
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>&lt;ConnectionLink&gt;</span></p>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:5.65pt 11.35pt 5.65pt 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>V&eacute;rification</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:5.65pt 11.35pt 5.65pt 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-right:11.35pt;text-align:left;layout-grid-mode:
- char'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>- Si l&rsquo;objet &laquo;&nbsp;ConnectionLink&nbsp;&raquo; existe alors
- poursuivre le test, sinon le test est abandonn&eacute;,</span></h1>
- <p class=MsoBodyText2 style='margin-top:6.0pt;margin-right:11.35pt;
- margin-bottom:6.0pt;margin-left:0cm;line-height:normal'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>- Si l&rsquo;objet
- &laquo;&nbsp;ConnectionLink&nbsp;&raquo; poss&egrave;de des identifiants d&rsquo;arr&ecirc;t distincts
- &laquo;&nbsp;StartOfLink&nbsp;&raquo; et &laquo;&nbsp;EndOfLink&nbsp;&raquo; alors poursuivre le test
- sinon le test est invalid&eacute; et produit le message&nbsp;&laquo;&nbsp;test
- 2.4.1.a&nbsp;: il manque au moins un identifiant d&rsquo;arr&ecirc;t
- &laquo;&nbsp;StartOfLink&nbsp;&raquo; et &laquo;&nbsp;EndOfLink&nbsp;&raquo; dans &nbsp;l&rsquo;objet
- &laquo;&nbsp;ConnectionLink&nbsp;&raquo;.&nbsp;&raquo;</span></p>
- <h1 align=left style='margin-top:6.0pt;margin-right:11.35pt;margin-bottom:
- 6.0pt;margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>-
- Si chaque identifiant d&rsquo;arr&ecirc;t &laquo;&nbsp;StartOfLink&nbsp;&raquo; et
- &laquo;&nbsp;EndOfLink&nbsp;&raquo; de l&rsquo;objet &laquo;&nbsp;ConnectionLink&nbsp;&raquo; est d&eacute;fini
- dans un objet &laquo;&nbsp;StopArea&nbsp;&raquo;, alors le test est valid&eacute;, sinon le test
- est invalid&eacute; et produit le message &laquo;&nbsp;test 2.4.1.b&nbsp;: un identifiant
- d&rsquo;arr&ecirc;t &laquo;&nbsp;StartOfLink&nbsp;&raquo; ou &laquo;&nbsp;EndOfLink&nbsp;&raquo; de l&rsquo;objet
- &laquo;&nbsp;ConnectionLink&raquo; n&rsquo;est pas rep&eacute;r&eacute; dans un objet
- &laquo;&nbsp;StopArea&nbsp;&raquo;.&nbsp;&raquo;</span></h1>
- </td>
- </tr>
-</table>
-</div> \ No newline at end of file
+
+
+
+
+
+
+
+
+
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+&nbsp;Exemple de deux arrêts connectés par une correspondance</font></font></font></p>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;StopArea&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;objectId&gt;AMIV:StopPoint:237803&lt;/objectId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;name&gt;ZAE Robert Moinon&lt;/name&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;contains&gt;AMIV:StopPoint:488973A5A237803&lt;/contains&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;contains&gt;AMIV:StopPoint:489111A5A237803&lt;/contains&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;contains&gt;AMIV:StopPoint:488962A4A237803&lt;/contains&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;centroidOfArea&gt;AMIV:Place:237803&lt;/centroidOfArea&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;StopAreaExtension&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;areaType&gt;Quay&lt;/areaType&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;fareCode&gt;0&lt;/fareCode&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;/StopAreaExtension&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;/StopArea&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">...<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;StopArea&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;objectId&gt;AMIV:StopPoint:237804&lt;/objectId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;name&gt;ZAE REP&lt;/name&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;contains&gt;AMIV:StopPoint:488973A4A237804&lt;/contains&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;contains&gt;AMIV:StopPoint:489111A4A237804&lt;/contains&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;contains&gt;AMIV:StopPoint:488962A3A237804&lt;/contains&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;centroidOfArea&gt;AMIV:Place:237804&lt;/centroidOfArea&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;StopAreaExtension&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;areaType&gt;Quay&lt;/areaType&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;fareCode&gt;0&lt;/fareCode&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;/StopAreaExtension&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;/StopArea&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">...<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;ConnectionLink&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;objectId&gt;AMIV:ConnectionLink:02378030237804&lt;/objectId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;startOfLink&gt;AMIV:StopPoint:237803&lt;/startOfLink&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;endOfLink&gt;AMIV:StopPoint:237804&lt;/endOfLink&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;defaultDuration&gt;PT2M53S&lt;/defaultDuration&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;/ConnectionLink&gt;<br></font></span>
+
+
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+La correspondance 'AMIV:ConnectionLink:02378030237804' connecte deux
+arrêts du réseau 'AMIV:StopPoint:237803' et 'AMIV:StopPoint:237804'.</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>N° test:</u></b>
+2.4.1</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Libellé:</u> Vérification de la correcte référence aux
+ARRÊTs/Chouette (« StopArea ») définissant des
+TronçonsDeCorrespondance/Chouette («&nbsp;ConnectionLink&nbsp;») .</font></font></font></p>
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Champ d’application:</u>
+&lt;StopArea&gt;&nbsp;&lt;ConnectionLink&gt;</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Vérification:</u> </font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si l’objet «&nbsp;ConnectionLink&nbsp;» existe alors poursuivre le test, sinon le test est abandonné,</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si l’objet «&nbsp;ConnectionLink&nbsp;» possède des identifiants
+d’arrêt distincts «&nbsp;StartOfLink&nbsp;» et «&nbsp;EndOfLink&nbsp;»
+alors poursuivre le test sinon le test est invalidé et produit le
+message&nbsp;«&nbsp;test 2.4.1.a&nbsp;: il manque au moins un
+identifiant d’arrêt «&nbsp;StartOfLink&nbsp;» et
+«&nbsp;EndOfLink&nbsp;» dans &nbsp;l’objet
+«&nbsp;ConnectionLink&nbsp;».&nbsp;»</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si chaque identifiant d’arrêt «&nbsp;StartOfLink&nbsp;» et
+«&nbsp;EndOfLink&nbsp;» de l’objet «&nbsp;ConnectionLink&nbsp;» est
+défini dans un objet «&nbsp;StopArea&nbsp;», alors le test est validé,
+sinon le test est invalidé et produit le message «&nbsp;test
+2.4.1.b&nbsp;: un identifiant d’arrêt «&nbsp;StartOfLink&nbsp;» ou
+«&nbsp;EndOfLink&nbsp;» de l’objet «&nbsp;ConnectionLink» n’est pas
+repéré dans un objet «&nbsp;StopArea&nbsp;».&nbsp;»</font></font></font></p>
diff --git a/app/views/test_sheet/2_5.html b/app/views/test_sheet/2_5.html
index cff209e5d..ddd59d1e8 100644
--- a/app/views/test_sheet/2_5.html
+++ b/app/views/test_sheet/2_5.html
@@ -1,465 +1,204 @@
+<h1 class="western" style="border: 1pt solid rgb(0, 0, 0); padding: 0.05cm 0.12cm; margin-top: 0.21cm;" align="center">
+<font face="Arial, sans-serif"><font style="font-size: 20pt;" size="5"><i>
+ point de contrôle N° 2.5<br>
+Cohérence entre les courses et les horaires<br>
+</i></font></font></h1>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Objectif: </b></u>
+Vérification de la correcte référence aux COURSES COMMERCIALES
+(«&nbsp;VehicleJourney&nbsp;») dans les VERSIONs DES HORAIRES/Chouette
+(« Timetable »).<br>
+Vérifier que chaque COURSE COMMERCIALE («&nbsp;VehicleJourney&nbsp;»)
+est référencée dans une VERSION DES HORAIRES/Chouette («
+Timetable&nbsp;»).<br>
+</font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Priorité: </b></u>
+Obligatoire (si «&nbsp;Timetable&nbsp;» existe et si l’identifiant de
+course «&nbsp;VehicleJourneyId&nbsp;» existe dans
+«&nbsp;Timetable&nbsp;»)</font></p><font face="Arial, sans-serif">
+</font><p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><u><b>Explications:</b></u>
+</font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+La liste des données horaires VERSION DES HORAIRES/Chouette («
+Timetable ») est optionnelle. Lorsque cette liste est non vide, chaque
+valeur d’attribut doit alors être référencée dans un objet COURSE
+COMMERCIALE («VehicleJourney ») du réseau.</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Chaque COURSE COMMERCIALE identifiée doit être référencée dans une VERSION DES HORAIRES/Chouette.</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>Exemple: </u></b></font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Représentation schématique de l’Objet «&nbsp;Timetable&nbsp;»</font></font></font></p>
+<p><font face="Arial, sans-serif"><img src="image006.jpg" height="454" width="432"></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Exemple de VERSION DES HORAIRES/Chouette avec une liste d'identifiants de COURSEs COMMERCIALEs:</font></font></font></p>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;Timetable&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;objectId&gt;AMIV:Timetable:146357&lt;/objectId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;period&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;startOfPeriod&gt;2006-09-18&lt;/startOfPeriod&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;endOfPeriod&gt;2007-12-21&lt;/endOfPeriod&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif"><br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;/period&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;calendarDay&gt;2006-09-18&lt;/calendarDay&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;calendarDay&gt;2006-09-19&lt;/calendarDay&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">...<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;vehicleJourneyId&gt;AMIV:VehicleJourney:8970777&lt;/vehicleJourneyId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;vehicleJourneyId&gt;AMIV:VehicleJourney:8970778&lt;/vehicleJourneyId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;vehicleJourneyId&gt;AMIV:VehicleJourney:8970779&lt;/vehicleJourneyId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">...<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;/Timetable&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">...<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;Timetable&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;objectId&gt;AMIV:Timetable:146358&lt;/objectId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">...<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;/Timetable&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">...<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;VehicleJourney&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;objectId&gt;AMIV:VehicleJourney:8970777&lt;/objectId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;routeId&gt;AMIV:Route:488970&lt;/routeId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">...<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;VehicleJourney&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;objectId&gt;AMIV:VehicleJourney:8970778&lt;/objectId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">...<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;VehicleJourney&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;objectId&gt;AMIV:VehicleJourney:8970779&lt;/objectId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif"><br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">...<br></font></span>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Exemple de COURSE COMMERCIALE référencée dans une VERSION DES HORAIRES/Chouette</font></font></font></p>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&nbsp;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;VehicleJourney&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;objectId&gt;NINOXE:VehicleJourney:521875&lt;/objectId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;objectVersion&gt;0&lt;/objectVersion&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;creationTime&gt;2007-06-28T17:18:56.000+02:00&lt;/creationTime&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;routeId&gt;NINOXE:Route:521753&lt;/routeId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;number&gt;0&lt;/number&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;vehicleJourneyAtStop&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;stopPointId&gt;NINOXE:StopPoint:521802&lt;/stopPointId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;vehicleJourneyId&gt;NINOXE:VehicleJourney:521875&lt;/vehicleJourneyId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&nbsp;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;/vehicleJourneyAtStop&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&nbsp;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;VehicleJourney&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&nbsp;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;Timetable&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;objectId&gt;NINOXE:Timetable:521973&lt;/objectId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;objectVersion&gt;0&lt;/objectVersion&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;creationTime&gt;2007-06-28T17:18:56.000+02:00&lt;/creationTime&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;vehicleJourneyId&gt;<b>NINOXE:VehicleJourney:521875</b>&lt;/vehicleJourneyId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;vehicleJourneyId&gt;NINOXE:VehicleJourney:521876&lt;/vehicleJourneyId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;vehicleJourneyId&gt;NINOXE:VehicleJourney:521877&lt;/vehicleJourneyId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;vehicleJourneyId&gt;NINOXE:VehicleJourney:521878&lt;/vehicleJourneyId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;comment&gt;Vacances scolaires &lt;/comment&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;/Timetable&gt;<br></font></span>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>N° test:</u></b>
+2.5.1</font></font></font></p>
-<div class=WordSection1>
-</span>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Libellé:</u> Vérification de la correcte référence aux COURSES
+COMMERCIALES («&nbsp;VehicleJourney&nbsp;» ) dans les VERSIONs DES
+HORAIRES/Chouette&nbsp;(« Timetable »).</font></font></font></p>
-<p class=MsoTitle><span style='font-size:14.0pt;font-family:"Tahoma","sans-serif"'>Fiche
-du point de contr&ocirc;le N&deg; 2.5</span></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Champ d’application:</u>
+&lt;Timetable&gt;&nbsp;&lt;VehicleJourney&gt;</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Vérification:</u> </font></font></font></p>
-<p class=MsoNormal>&nbsp;</p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+&nbsp;- Si l’objet «&nbsp;Timetable » existe alors poursuivre le test, sinon le test est abandonné,</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si l’élément «VehicleJourneyId&nbsp;&nbsp;» existe alors poursuivre le test, sinon le test est abandonné,</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si chaque identifiant de course, dans l’objet
+«&nbsp;Timetable&nbsp;», est référencé dans un objet
+«&nbsp;VehicleJourney&nbsp;» alors le test est validé, sinon le test
+est invalidé et produit le message «&nbsp;test 2.5.1&nbsp;: un
+identifiant de course, situé dans l’objet «&nbsp;Timetable&nbsp;»,
+n’est pas référencé dans un objet «&nbsp;VehicleJourney&nbsp;»».</font></font></font></p>
-<table class=MsoNormalTable border=0 cellspacing=0 cellpadding=0 width=648
- style='width:485.95pt;margin-left:-.5pt;border-collapse:collapse'>
- <tr style='page-break-inside:avoid'>
- <td width=648 colspan=2 valign=top style='width:485.95pt;border:solid black 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center;layout-grid-mode:char'><i><span
- style='font-family:"Tahoma","sans-serif";color:navy'>Description</span></i></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Intitul&eacute;</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt;layout-grid-mode:char'><span
- style='font-size:11.0pt;line-height:200%;font-family:"Tahoma","sans-serif"'>Coh&eacute;rence
- entre les courses et les horaires.</span></p>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Objectif</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>V&eacute;rification
- de la correcte r&eacute;f&eacute;rence aux COURSES COMMERCIALES
- (&laquo;&nbsp;VehicleJourney&nbsp;&raquo;) dans les VERSIONs DES HORAIRES/Chouette </span></h1>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>(&laquo;
- Timetable &raquo;).</span></h1>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>V&eacute;rifier
- que chaque COURSE COMMERCIALE (&laquo;&nbsp;VehicleJourney&nbsp;&raquo;) est r&eacute;f&eacute;renc&eacute;e
- dans une VERSION DES HORAIRES/Chouette (&laquo; Timetable&nbsp;&raquo;).</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>R&eacute;f&eacute;rences</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>TRIDENT/profil
- CHOUETTE/Transmodel V4 et V5.1</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>N&deg; de fiche(s)
- connexe(s)</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>&nbsp;</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt;layout-grid-mode:char'><b><span
- style='font-size:11.0pt;line-height:200%;font-family:"Tahoma","sans-serif"'>Priorit&eacute;<span
- style='color:red'> </span></span></b></p>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Obligatoire
- (si &laquo;&nbsp;Timetable&nbsp;&raquo; existe et si l&rsquo;identifiant de course
- &laquo;&nbsp;VehicleJourneyId&nbsp;&raquo; existe dans &laquo;&nbsp;Timetable&nbsp;&raquo;)</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt;layout-grid-mode:char'><b><span
- style='font-size:11.0pt;line-height:200%;font-family:"Tahoma","sans-serif"'>R&eacute;sultat</span></b></p>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Conforme
- ou non conforme ou message d&rsquo;avertissement si une course est absente d&rsquo;une
- VERSION DES HORAIRES/Chouette</span></h1>
- </td>
- </tr>
- <tr>
- <td width=108 colspan=2 valign=top style='width:81.35pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center;layout-grid-mode:char'><i><span
- style='font-family:"Tahoma","sans-serif";color:navy'>Mise en &oelig;uvre</span></i></h1>
- </td>
- </tr>
- <tr>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- solid black 1.0pt;border-bottom:solid black 1.0pt;border-right:none;
- padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;layout-grid-mode:char'><span style='font-size:11.0pt'>Explication</span></h1>
- </td>
- <td width=108 valign=top style='width:81.35pt;border:solid black 1.0pt;
- border-top:none;padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:11.35pt;margin-bottom:6.0pt;
- margin-left:0cm;layout-grid-mode:char'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'>La liste des donn&eacute;es
- horaires VERSION DES HORAIRES/Chouette (&laquo;
- Timetable &raquo;) est optionnelle. Lorsque cette liste est non vide, chaque
- valeur d&rsquo;attribut doit alors &ecirc;tre r&eacute;f&eacute;renc&eacute;e dans un objet COURSE
- COMMERCIALE (&laquo; VehicleJourney &raquo;) du r&eacute;seau.</span></h1>
- <p class=MsoNormal style='margin-right:11.35pt'><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'>Chaque COURSE COMMERCIALE identifi&eacute;e doit
- &ecirc;tre r&eacute;f&eacute;renc&eacute;e dans une VERSION DES HORAIRES/Chouette.</span></p>
- </td>
- </tr>
-</table>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+&nbsp;<br><b><u>N° test:</u></b>
+Test 2.5.2</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Libellé:</u> Vérifier que chaque COURSE COMMERCIALE
+(«&nbsp;VehicleJourney&nbsp;» ) est référencée dans une VERSION DES
+HORAIRES/Chouette (« Timetable&nbsp;»).</font></font></font></p>
-<p class=MsoNormal>&nbsp;</p>
-<table class=MsoNormalTable border=0 cellspacing=0 cellpadding=0 width=657
- style='width:493.05pt;margin-left:-.5pt;border-collapse:collapse'>
- <tr>
- <td width=108 colspan=2 valign=top style='width:81.35pt;border:solid black 1.0pt;
- border-right:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm;layout-grid-mode:char'><b><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>Exemple</span></b></p>
- </td>
- <td width=108 colspan=2 valign=top style='width:81.35pt;border:solid black 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=left style='margin-left:18.0pt;text-align:left;layout-grid-mode:
- char'><span style='font-size:11.0pt;font-weight:normal'>&nbsp;</span></h1>
- <h1 align=left style='margin-left:18.0pt;text-align:left'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Repr&eacute;sentation
- sch&eacute;matique de l&rsquo;Objet &laquo;&nbsp;Timetable&nbsp;&raquo;</span></h1>
- <h1 align=left style='margin-left:18.0pt;text-align:left'><span
- style='font-size:11.0pt;font-weight:normal'>&nbsp;</span></h1>
- <p class=MsoNormal align=center style='text-align:center'><img width=432
- height=454 src="BATERI_Neptune_FINAL-V2_0a_fichiers/image006.jpg"></p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal>&nbsp;</p>
- <h1 align=left style='margin-left:18.0pt;text-align:left'><span
- style='font-size:11.0pt;font-weight:normal'>&nbsp;</span></h1>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal><u><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Exemple
- de VERSION DES HORAIRES/Chouette avec une liste d'identifiants de COURSEs
- COMMERCIALEs:</span></u></p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;Timetable&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;objectId&gt;AMIV:Timetable:146357&lt;/objectId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=SV
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;period&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=SV
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;startOfPeriod&gt;2006-09-18&lt;/startOfPeriod&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=SV
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;endOfPeriod&gt;2007-12-21&lt;/endOfPeriod&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=SV
- style='font-size:10.0pt;font-family:"Courier New"'> </span><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;/period&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;calendarDay&gt;2006-09-18&lt;/calendarDay&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;calendarDay&gt;2006-09-19&lt;/calendarDay&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> ...</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;vehicleJourneyId&gt;AMIV:VehicleJourney:8970777&lt;/vehicleJourneyId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;vehicleJourneyId&gt;AMIV:VehicleJourney:8970778&lt;/vehicleJourneyId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;vehicleJourneyId&gt;AMIV:VehicleJourney:8970779&lt;/vehicleJourneyId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> ...</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;/Timetable&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>...</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;Timetable&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;objectId&gt;AMIV:Timetable:146358&lt;/objectId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> ...</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;/Timetable&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>...</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;VehicleJourney&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;objectId&gt;AMIV:VehicleJourney:8970777&lt;/objectId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;routeId&gt;AMIV:Route:488970&lt;/routeId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> ...</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;VehicleJourney&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;objectId&gt;AMIV:VehicleJourney:8970778&lt;/objectId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> ...</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;VehicleJourney&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;objectId&gt;AMIV:VehicleJourney:8970779&lt;/objectId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> </span><span
- style='font-size:10.0pt;font-family:"Courier New"'>...</span></p>
- <p class=MsoNormal>&nbsp;</p>
- <h3 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Exemple
- de COURSE COMMERCIALE r&eacute;f&eacute;renc&eacute;e dans une VERSION DES HORAIRES/Chouette</span></h3>
- <p class=MsoNormal><span style='font-size:10.0pt;font-family:"Courier New"'>&nbsp;</span></p>
- <p class=MsoNormal><span lang=EN-GB style='font-size:10.0pt;font-family:"Courier New"'>&lt;VehicleJourney&gt;</span></p>
- <p class=MsoNormal><span lang=EN-US style='font-size:10.0pt;font-family:"Courier New"'>&lt;objectId&gt;NINOXE:VehicleJourney:521875&lt;/objectId&gt;</span></p>
- <p class=MsoNormal><span lang=EN-US style='font-size:10.0pt;font-family:"Courier New"'>&lt;objectVersion&gt;0&lt;/objectVersion&gt;</span></p>
- <p class=MsoNormal><span lang=EN-US style='font-size:10.0pt;font-family:"Courier New"'>&lt;creationTime&gt;2007-06-28T17:18:56.000+02:00&lt;/creationTime&gt;</span></p>
- <p class=MsoHeader><span lang=EN-US style='font-size:10.0pt;font-family:"Courier New"'>&lt;routeId&gt;NINOXE:Route:521753&lt;/routeId&gt;</span></p>
- <p class=MsoNormal><span lang=EN-US style='font-size:10.0pt;font-family:"Courier New"'>&lt;number&gt;0&lt;/number&gt;</span></p>
- <p class=MsoNormal><span lang=EN-US style='font-size:10.0pt;font-family:"Courier New"'>&lt;vehicleJourneyAtStop&gt;</span></p>
- <p class=MsoNormal><span lang=EN-US style='font-size:10.0pt;font-family:"Courier New"'>&lt;stopPointId&gt;NINOXE:StopPoint:521802&lt;/stopPointId&gt;</span></p>
- <p class=MsoNormal><span lang=EN-US style='font-size:10.0pt;font-family:"Courier New"'>&lt;vehicleJourneyId&gt;NINOXE:VehicleJourney:521875&lt;/vehicleJourneyId&gt;</span></p>
- <p class=MsoNormal><span lang=EN-US style='font-size:10.0pt;font-family:"Courier New"'>&nbsp;</span></p>
- <p class=MsoNormal><span lang=EN-US style='font-size:10.0pt;font-family:"Courier New"'>&lt;/vehicleJourneyAtStop&gt;</span></p>
- <p class=MsoNormal><span lang=EN-GB style='font-size:10.0pt;font-family:"Courier New"'>&nbsp;</span></p>
- <p class=MsoNormal><span lang=EN-GB style='font-size:10.0pt;font-family:"Courier New"'>&lt;VehicleJourney&gt;</span></p>
- <p class=MsoNormal><span lang=EN-GB style='font-size:10.0pt;font-family:"Courier New"'>&nbsp;</span></p>
- <p class=MsoNormal><span lang=EN-US style='font-size:10.0pt;font-family:"Courier New"'>&lt;Timetable&gt;</span></p>
- <p class=MsoNormal><span lang=EN-US style='font-size:10.0pt;font-family:"Courier New"'>&lt;objectId&gt;NINOXE:Timetable:521973&lt;/objectId&gt;</span></p>
- <p class=MsoNormal><span lang=EN-US style='font-size:10.0pt;font-family:"Courier New"'>&lt;objectVersion&gt;0&lt;/objectVersion&gt;</span></p>
- <p class=MsoNormal><span lang=EN-US style='font-size:10.0pt;font-family:"Courier New"'>&lt;creationTime&gt;2007-06-28T17:18:56.000+02:00&lt;/creationTime&gt;</span></p>
- <p class=MsoNormal><span lang=EN-US style='font-size:10.0pt;font-family:"Courier New"'>&lt;vehicleJourneyId&gt;<b>NINOXE:VehicleJourney:521875</b>&lt;/vehicleJourneyId&gt;</span></p>
- <p class=MsoNormal><span lang=EN-US style='font-size:10.0pt;font-family:"Courier New"'>&lt;vehicleJourneyId&gt;NINOXE:VehicleJourney:521876&lt;/vehicleJourneyId&gt;</span></p>
- <p class=MsoNormal><span lang=EN-US style='font-size:10.0pt;font-family:"Courier New"'>&lt;vehicleJourneyId&gt;NINOXE:VehicleJourney:521877&lt;/vehicleJourneyId&gt;</span></p>
- <p class=MsoNormal><span lang=EN-US style='font-size:10.0pt;font-family:"Courier New"'>&lt;vehicleJourneyId&gt;NINOXE:VehicleJourney:521878&lt;/vehicleJourneyId&gt;</span></p>
- <p class=MsoNormal><span style='font-size:10.0pt;font-family:"Courier New"'>&lt;comment&gt;Vacances
- scolaires &lt;/comment&gt;</span></p>
- <p class=MsoNormal><span style='font-size:10.0pt;font-family:"Courier New"'>&lt;/Timetable&gt;</span></p>
- <p class=MsoNormal>&nbsp;</p>
- </td>
- </tr>
- <tr style='page-break-inside:avoid'>
- <td width=657 colspan=4 valign=top style='width:493.05pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h2 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center;layout-grid-mode:char'><i><span lang=EN-US
- style='font-size:14.0pt;color:navy'>Evaluation</span></i></h2>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 colspan=2 style='width:81.35pt;border-top:none;border-left:
- solid black 1.0pt;border-bottom:solid black 1.0pt;border-right:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span lang=EN-US
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>N&deg; test</span></h1>
- </td>
- <td width=108 colspan=2 style='width:81.35pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>2.5.1</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 colspan=2 style='width:81.35pt;border-top:none;border-left:
- solid black 1.0pt;border-bottom:solid black 1.0pt;border-right:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Libell&eacute;</span></h1>
- </td>
- <td width=108 colspan=2 style='width:81.35pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>V&eacute;rification
- de la correcte r&eacute;f&eacute;rence aux COURSES COMMERCIALES
- (&laquo;&nbsp;VehicleJourney&nbsp;&raquo; ) dans les VERSIONs DES HORAIRES/Chouette </span></h1>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>(&laquo;
- Timetable &raquo;).</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 colspan=2 style='width:81.35pt;border-top:none;border-left:
- solid black 1.0pt;border-bottom:solid black 1.0pt;border-right:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Champ
- d&rsquo;application</span></h1>
- </td>
- <td width=108 colspan=2 style='width:81.35pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>&lt;Timetable&gt;</span></h1>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm;layout-grid-mode:char'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>&lt;VehicleJourney&gt;</span></p>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 colspan=2 style='width:81.35pt;border-top:none;border-left:
- solid black 1.0pt;border-bottom:solid black 1.0pt;border-right:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>V&eacute;rification</span></h1>
- </td>
- <td width=108 colspan=2 style='width:81.35pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>&nbsp;</span></h1>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>-
- Si l&rsquo;objet &laquo;&nbsp;Timetable &raquo; existe alors poursuivre le test, sinon le test
- est abandonn&eacute;,</span></h1>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>-
- Si l&rsquo;&eacute;l&eacute;ment &laquo;VehicleJourneyId&nbsp;&nbsp;&raquo; existe alors poursuivre le test,
- sinon le test est abandonn&eacute;,</span></h1>
- <h1 align=left style='text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>-
- Si chaque identifiant de course, dans l&rsquo;objet &laquo;&nbsp;Timetable&nbsp;&raquo;, est
- r&eacute;f&eacute;renc&eacute; dans un objet &laquo;&nbsp;VehicleJourney&nbsp;&raquo; alors le test est
- valid&eacute;, sinon le test est invalid&eacute; et produit le message &laquo;&nbsp;test
- 2.5.1&nbsp;: un identifiant de course, situ&eacute; dans l&rsquo;objet
- &laquo;&nbsp;Timetable&nbsp;&raquo;, n&rsquo;est pas r&eacute;f&eacute;renc&eacute; dans un objet
- &laquo;&nbsp;VehicleJourney&nbsp;&raquo;&raquo;.</span></h1>
- <p class=MsoNormal style='layout-grid-mode:char'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>&nbsp;</span></p>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td style='border:none;padding:0cm 0cm 0cm 0cm' width=1><p class='MsoNormal'>&nbsp;</td>
- <td width=108 colspan=2 style='width:81.35pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span lang=EN-US style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>N&deg; test</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoNormal><span lang=EN-US style='font-size:11.0pt;font-family:"Arial","sans-serif"'>Test
- 2.5.2</span></p>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td style='border:none;padding:0cm 0cm 0cm 0cm' width=1><p class='MsoNormal'>&nbsp;</td>
- <td width=108 colspan=2 style='width:81.35pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>Libell&eacute;</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoHeader style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>V&eacute;rifier
- que chaque COURSE COMMERCIALE (&laquo;&nbsp;VehicleJourney&nbsp;&raquo; ) est r&eacute;f&eacute;renc&eacute;e
- dans une VERSION DES HORAIRES/Chouette (&laquo; Timetable&nbsp;&raquo;).</span></p>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td style='border:none;padding:0cm 0cm 0cm 0cm' width=1><p class='MsoNormal'>&nbsp;</td>
- <td width=108 colspan=2 style='width:81.35pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>Champ d&rsquo;application</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>&lt;VehicleJourney&gt;</span></p>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>&lt;Timetable&gt;</span></p>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td style='border:none;padding:0cm 0cm 0cm 0cm' width=1><p class='MsoNormal'>&nbsp;</td>
- <td width=108 colspan=2 style='width:81.35pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>V&eacute;rification</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>-
- Si l&rsquo;objet de course &laquo;&nbsp;VehicleJourney&nbsp;&raquo; mentionn&eacute; dans les champs
- d&rsquo;application est pr&eacute;sent une ou plusieurs fois, poursuivre le test, sinon le
- test est abandonn&eacute;.</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>-
- Si l&rsquo;identifiant &laquo;&nbsp;objectId&nbsp;&raquo; de l&rsquo;objet
- &laquo;&nbsp;VehicleJourney&nbsp;&raquo; pr&eacute;c&eacute;dent est d&eacute;tect&eacute; dans l&rsquo;&eacute;l&eacute;ment
- &laquo;&nbsp;vehicleJourneyId&nbsp;&raquo; d&rsquo;un objet &laquo;&nbsp;Timetable&nbsp;&raquo; alors le
- test est valid&eacute;, sinon le test est invalid&eacute; et fournit le message
- d&rsquo;avertissement&nbsp;: &laquo;&nbsp;test 3.12.1&nbsp;: une course n&rsquo;est pas
- r&eacute;f&eacute;renc&eacute;e dans aucun &laquo;&nbsp;TimeTable&nbsp;&raquo;&raquo;.</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>&nbsp;</span></p>
- </td>
- </tr>
- <tr height=0>
- <td width=1 style='border:none'></td>
- <td width=108 style='border:none'></td>
- <td width=1 style='border:none'></td>
- <td width=548 style='border:none'></td>
- </tr>
-</table>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2"><span style="text-decoration: underline;">
+Champ d’application</span>: &lt;VehicleJourney&gt;&nbsp;&lt;Timetable&gt;</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Vérification:</u> </font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si l’objet de course «&nbsp;VehicleJourney&nbsp;» mentionné dans les
+champs d’application est présent une ou plusieurs fois, poursuivre le
+test, sinon le test est abandonné.</font></font></font></p>
-</div>
-
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si l’identifiant «&nbsp;objectId&nbsp;» de l’objet
+«&nbsp;VehicleJourney&nbsp;» précédent est détecté dans l’élément
+«&nbsp;vehicleJourneyId&nbsp;» d’un objet «&nbsp;Timetable&nbsp;» alors
+le test est validé, sinon le test est invalidé et fournit le message
+d’avertissement&nbsp;: «&nbsp;test 3.12.1&nbsp;: une course n’est pas
+référencée dans aucun «&nbsp;TimeTable&nbsp;»».</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+&nbsp;</font></font></font></p>
diff --git a/app/views/test_sheet/2_6.html b/app/views/test_sheet/2_6.html
index 2b2a7a852..f1824cc74 100644
--- a/app/views/test_sheet/2_6.html
+++ b/app/views/test_sheet/2_6.html
@@ -1,355 +1,94 @@
+<h1 class="western" style="border: 1pt solid rgb(0, 0, 0); padding: 0.05cm 0.12cm; margin-top: 0.21cm;" align="center">
+<font face="Arial, sans-serif"><font style="font-size: 20pt;" size="5"><i>
+ point de contrôle N° 2.6<br>
+Définition des terminus<br>
+</i></font></font></h1>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Objectif: </b></u>
+Vérification de la correcte définition du terminus de LIGNE/Chouette (« Line »).<br>
+</font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Priorité: </b></u> Obligatoire (si «&nbsp;LineEnd&nbsp;» existe)</font></p><font face="Arial, sans-serif">
+</font><p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><u><b>Explications:</b></u>
+</font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+L’ensemble des éléments de fin des LIGNEs/Chouette (« Line »)
+(«&nbsp;LineEnd&nbsp;») a un caractère optionnel. Si ces éléments
+existent, il convient de vérifier que chacun d’entre eux possède une
+valeur d’attribut qui identifie un POINT D’ARRÊT SUR PARCOURS («
+StopPoint »)</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>Exemple: </u></b></font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Représentation schématique de l’Objet «&nbsp;Line&nbsp;»</font></font></font></p>
+<p><font face="Arial, sans-serif"><img src="image002.jpg" height="498" width="478"></font></p>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;Line&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;objectId&gt;AMIV:Line:014014012&lt;/objectId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;objectVersion&gt;1&lt;/objectVersion&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;creationTime&gt;2007-03-21T16:05:54.000+01:00&lt;/creationTime&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;name&gt;LIGNE 012&lt;/name&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;publishedName&gt;Les Courriers de l'Ile de France&lt;/publishedName&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;transportModeName&gt;Bus&lt;/transportModeName&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;lineEnd&gt;AMIV:StopPoint:488957A0A237830&lt;/lineEnd&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">...<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;StopPoint&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;objectId&gt;AMIV:StopPoint:488957A0A237830&lt;/objectId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif"><br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;objectVersion&gt;1&lt;/objectVersion&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">...<br></font></span>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>N° test:</u></b>
+2.6.1</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Libellé:</u>
+Vérification de la correcte définition du terminus de LIGNE/Chouette (« Line »).</font></font></font></p>
-<div class=WordSection1>
-</span>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Champ d’application:</u>
+&lt;Line&gt;&nbsp;&lt;StopPoint&gt;</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Vérification:</u> </font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si l’élément «LineEnd» existe alors poursuivre le test, sinon le test est abandonné,</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si chaque identifiant de fin de trajet dans l’élément
+«&nbsp;LineEnd&nbsp;» de l’objet «&nbsp;Line&nbsp;», est repéré dans un
+objet «&nbsp;StopPoint&nbsp;» alors le test est validé, sinon le test
+est invalidé et produit le message «&nbsp;test 2.6.1&nbsp;: un
+identifiant de point d’arrêt de fin de trajet n’est pas repéré dans un
+objet «&nbsp;StopPoint&nbsp;»».</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>N° test:</u></b>
+2.6.2</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Libellé:</u>
+Vérification du caractère terminus des points de fin de trajet des LIGNEs/Chouette (« Line »).</font></font></font></p>
-<p class=MsoTitle><span style='font-size:14.0pt;font-family:"Tahoma","sans-serif"'>Fiche
-du point de contr&ocirc;le N&deg; 2.6</span></p>
-
-<p class=MsoNormal>&nbsp;</p>
-
-<table class=MsoNormalTable border=0 cellspacing=0 cellpadding=0 width=657
- style='width:492.8pt;margin-left:-.25pt;border-collapse:collapse'>
- <tr style='height:37.4pt'>
- <td width=657 colspan=2 valign=top style='width:492.8pt;border:solid black 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center;layout-grid-mode:char'><i><span
- style='font-family:"Tahoma","sans-serif";color:navy'>Description</span></i></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Intitul&eacute;</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt;layout-grid-mode:char'><span
- style='font-size:11.0pt;line-height:200%;font-family:"Tahoma","sans-serif"'>D&eacute;finition
- des terminus</span></p>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Objectif</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>V&eacute;rification
- de la correcte d&eacute;finition du terminus de LIGNE/Chouette (&laquo; Line &raquo;).</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>R&eacute;f&eacute;rences</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>TRIDENT/profil
- CHOUETTE/Transmodel V4 et V5.1</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>N&deg;de fiche(s)
- connexe(s)</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>&nbsp;</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt;layout-grid-mode:char'><b><span
- style='font-size:11.0pt;line-height:200%;font-family:"Tahoma","sans-serif"'>Priorit&eacute;<span
- style='color:red'> </span></span></b></p>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Obligatoire
- (si &laquo;&nbsp;LineEnd&nbsp;&raquo; existe)</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt;layout-grid-mode:char'><b><span
- style='font-size:11.0pt;line-height:200%;font-family:"Tahoma","sans-serif"'>R&eacute;sultat</span></b></p>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Conforme
- ou non conforme</span></h1>
- </td>
- </tr>
- <tr>
- <td width=108 colspan=2 style='width:81.35pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center;layout-grid-mode:char'><i><span
- style='font-family:"Tahoma","sans-serif";color:navy'>Mise en &oelig;uvre</span></i></h1>
- </td>
- </tr>
- <tr>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Explication</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:11.35pt;margin-bottom:
- 6.0pt;margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>L&rsquo;ensemble
- des &eacute;l&eacute;ments de fin des LIGNEs/Chouette (&laquo; Line &raquo;) (&laquo;&nbsp;LineEnd&nbsp;&raquo;) a
- un caract&egrave;re optionnel. Si ces &eacute;l&eacute;ments existent, il convient de v&eacute;rifier que
- chacun d&rsquo;entre eux poss&egrave;de une valeur d&rsquo;attribut qui identifie un POINT
- D&rsquo;ARR&Ecirc;T SUR PARCOURS (&laquo; StopPoint &raquo;)</span></h1>
- </td>
- </tr>
-</table>
-
-<p class=MsoNormal>&nbsp;</p>
-
-<table class=MsoNormalTable border=0 cellspacing=0 cellpadding=0 width=648
- style='width:485.7pt;margin-left:-.25pt;border-collapse:collapse'>
- <tr>
- <td width=90 valign=top style='width:67.45pt;border:solid black 1.0pt;
- border-right:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm;layout-grid-mode:char'><b><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>Exemple</span></b></p>
- </td>
- <td width=558 valign=top style='width:418.25pt;border:solid black 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=left style='margin-left:18.0pt;text-align:left;layout-grid-mode:
- char'><span style='font-size:11.0pt;font-weight:normal'>&nbsp;</span></h1>
- <h1 align=left style='margin-left:18.0pt;text-align:left'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Repr&eacute;sentation
- sch&eacute;matique de l&rsquo;Objet &laquo;&nbsp;Line&nbsp;&raquo;</span></h1>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal align=center style='text-align:center'><img width=478
- height=498 src="BATERI_Neptune_FINAL-V2_0a_fichiers/image002.jpg"></p>
- <p class=MsoNormal> </p>
- <h3 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'>Exemple de &nbsp;&laquo;&nbsp;Line&nbsp;&raquo; avec un arr&ecirc;t de fin de trajet
- d&eacute;fini plus loin :</h3>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;Line&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;objectId&gt;AMIV:Line:014014012&lt;/objectId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;objectVersion&gt;1&lt;/objectVersion&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;creationTime&gt;2007-03-21T16:05:54.000+01:00&lt;/creationTime&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;name&gt;LIGNE
- 012&lt;/name&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;publishedName&gt;Les
- Courriers de l'Ile de France&lt;/publishedName&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;transportModeName&gt;Bus&lt;/transportModeName&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;lineEnd&gt;AMIV:StopPoint:488957A0A237830&lt;/lineEnd&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>...</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;StopPoint&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;objectId&gt;AMIV:StopPoint:488957A0A237830&lt;/objectId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> </span><span
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;objectVersion&gt;1&lt;/objectVersion&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span
- style='font-size:10.0pt;font-family:"Courier New"'>...</span></p>
- <p class=MsoNormal>&nbsp;</p>
- </td>
- </tr>
- <tr style='page-break-inside:avoid'>
- <td width=648 colspan=2 valign=top style='width:485.7pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h2 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center;layout-grid-mode:char'><i><span
- style='font-size:14.0pt;color:navy'>Evaluation</span></i></h2>
- </td>
- </tr>
- <tr>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>N&deg; test</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>2.6.1</span></h1>
- </td>
- </tr>
- <tr>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Libell&eacute;</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>V&eacute;rification
- de la correcte d&eacute;finition du terminus de LIGNE/Chouette (&laquo; Line &raquo;).</span></h1>
- </td>
- </tr>
- <tr>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span lang=EN-US
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Champ
- d&rsquo;application</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span lang=EN-US
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>&lt;Line&gt;</span></h1>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm;layout-grid-mode:char'><span lang=EN-US
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>&lt;StopPoint&gt;</span></p>
- </td>
- </tr>
- <tr>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>V&eacute;rification</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>-
- Si l&rsquo;&eacute;l&eacute;ment &laquo;LineEnd&raquo; existe alors poursuivre le test, sinon le test est
- abandonn&eacute;,</span></h1>
- <h1 align=left style='margin-bottom:6.0pt;text-align:left;layout-grid-mode:
- char'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>- Si chaque identifiant de fin de trajet dans l&rsquo;&eacute;l&eacute;ment
- &laquo;&nbsp;LineEnd&nbsp;&raquo; de l&rsquo;objet &laquo;&nbsp;Line&nbsp;&raquo;, est rep&eacute;r&eacute; dans un objet
- &laquo;&nbsp;StopPoint&nbsp;&raquo; alors le test est valid&eacute;, sinon le test est invalid&eacute;
- et produit le message &laquo;&nbsp;test 2.6.1&nbsp;: un identifiant de point
- d&rsquo;arr&ecirc;t de fin de trajet n&rsquo;est pas rep&eacute;r&eacute; dans un objet
- &laquo;&nbsp;StopPoint&nbsp;&raquo;&raquo;.</span></h1>
- </td>
- </tr>
- <tr>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span lang=EN-US
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>N&deg; test</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;text-align:left;layout-grid-mode:char'><span
- lang=EN-US style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>2.6.2</span></h1>
- </td>
- </tr>
- <tr>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span lang=EN-US
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Libell&eacute;</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>V&eacute;rification
- du caract&egrave;re terminus des points de fin de trajet des LIGNEs/Chouette (&laquo; Line
- &raquo;).</span></h1>
- </td>
- </tr>
- <tr>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span lang=EN-US
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Champ
- d&rsquo;application</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span lang=EN-US
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>&lt;Line&gt;</span></h1>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm;layout-grid-mode:char'><span lang=EN-US
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>&lt;StopPoint&gt;</span></p>
- </td>
- </tr>
- <tr>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>V&eacute;rification</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:11.35pt;margin-bottom:
- 6.0pt;margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>-
- Si l&rsquo;&eacute;l&eacute;ment &laquo;LineEnd&raquo; existe alors poursuivre le test, sinon le test est
- abandonn&eacute;,</span></h1>
- <h1 align=left style='margin-top:0cm;margin-right:11.35pt;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>-
- Si chaque identifiant de fin de trajet dans l&rsquo;&eacute;l&eacute;ment &laquo;&nbsp;LineEnd&nbsp;&raquo;
- de l&rsquo;objet &laquo;&nbsp;Line&nbsp;&raquo;, est rep&eacute;r&eacute; une et une seule fois dans un objet
- &laquo;&nbsp;startOfLink&nbsp;&raquo; ou bien dans un objet &laquo;&nbsp;endOfLink&nbsp;&raquo; d&rsquo;un
- tron&ccedil;on &laquo;&nbsp;PTLink&nbsp;&raquo; alors le test est valid&eacute;, sinon le test est
- invalid&eacute; et produit le message &laquo;&nbsp;test 2.6.2&nbsp;: un identifiant de
- point d&rsquo;arr&ecirc;t de fin de trajet n&rsquo;est pas rep&eacute;r&eacute; comme d&eacute;but ou comme fin d&rsquo;un
- trajet&raquo;.</span></h1>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>&nbsp;</span></p>
- </td>
- </tr>
-</table>
-
-
-</div>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Champ d’application:</u>
+&lt;Line&gt;&nbsp;&lt;StopPoint&gt;</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Vérification:</u> </font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si l’élément «LineEnd» existe alors poursuivre le test, sinon le test est abandonné,</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si chaque identifiant de fin de trajet dans l’élément
+«&nbsp;LineEnd&nbsp;» de l’objet «&nbsp;Line&nbsp;», est repéré une et
+une seule fois dans un objet «&nbsp;startOfLink&nbsp;» ou bien dans un
+objet «&nbsp;endOfLink&nbsp;» d’un tronçon «&nbsp;PTLink&nbsp;» alors
+le test est validé, sinon le test est invalidé et produit le message
+«&nbsp;test 2.6.2&nbsp;: un identifiant de point d’arrêt de fin de
+trajet n’est pas repéré comme début ou comme fin d’un trajet».</font></font></font></p>
diff --git a/app/views/test_sheet/2_7.html b/app/views/test_sheet/2_7.html
index 7618e3356..5a53a3ac0 100644
--- a/app/views/test_sheet/2_7.html
+++ b/app/views/test_sheet/2_7.html
@@ -1,322 +1,92 @@
-<div class=WordSection1>
+<h1 class="western" style="border: 1pt solid rgb(0, 0, 0); padding: 0.05cm 0.12cm; margin-top: 0.21cm;" align="center">
+<font face="Arial, sans-serif"><font style="font-size: 20pt;" size="5"><i>
+ point de contrôle N° 2.7<br>
+Cohérence entre les Itinéraires/Chouette<b> </b>et les LIGNEs/Chouette<br>
+</i></font></font></h1>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Objectif: </b></u>
+Vérification de la correcte référence aux Itinéraires/Chouette
+(«&nbsp;ChouetteRoute&nbsp;») pour chaque LIGNE/Chouette (« Line ») .<br>
+</font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Priorité: </b></u> Obligatoire</font></p><font face="Arial, sans-serif">
+</font><p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><u><b>Explications:</b></u>
+</font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+L’élément «&nbsp;RouteId&nbsp;» au sein de l'objet «&nbsp;Line&nbsp;» a
+un caractère obligatoire. Il convient de vérifier que chaque élément
+«&nbsp;RouteId&nbsp;» correspond à un identifiant
+«&nbsp;ObjectId&nbsp;» d’un Itinéraire/Chouette
+(«&nbsp;ChouetteRoute&nbsp;»).</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>Exemple: </u></b></font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Représentation schématique de l’Objet «&nbsp;Line&nbsp;»</font></font></font></p>
+<p><font face="Arial, sans-serif"><img src="image002.jpg" height="498" width="478"></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+&nbsp;</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Exemple de définition de «&nbsp;routeId&nbsp;» dans une «&nbsp;Line&nbsp;»</font></font></font></p>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;Line&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;objectId&gt;AMIV:Line:014014012&lt;/objectId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;objectVersion&gt;1&lt;/objectVersion&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;creationTime&gt;2007-03-21T16:05:54.000+01:00&lt;/creationTime&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;name&gt;LIGNE 012&lt;/name&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;publishedName&gt;Les Courriers de l'Ile de France&lt;/publishedName&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;transportModeName&gt;Bus&lt;/transportModeName&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;lineEnd&gt;AMIV:StopPoint:488957A0A237830&lt;/lineEnd&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;ptNetworkIdShortcut&gt;AMIV:PTNetwork:95&lt;/ptNetworkIdShortcut&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;routeId&gt;AMIV:Route:488957&lt;/routeId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;routeId&gt;AMIV:Route:488959&lt;/routeId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;routeId&gt;AMIV:Route:488961&lt;/routeId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">...<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;ChouetteRoute&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;objectId&gt;AMIV:Route:488957&lt;/objectId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">...<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;ChouetteRoute&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;objectId&gt;AMIV:Route:488959&lt;/objectId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">...<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;ChouetteRoute&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;objectId&gt;AMIV:Route:488961&lt;/objectId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">...<br></font></span>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>N° test:</u></b>
+2.7.1</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Libellé:</u> Vérification de la correcte référence aux
+Itinéraires/Chouette («&nbsp;ChouetteRoute&nbsp;») pour chaque
+LIGNE/Chouette (« Line ») .</font></font></font></p>
-<p class=MsoTitle><span style='font-size:14.0pt;font-family:"Tahoma","sans-serif"'>Fiche
-du point de contr&ocirc;le N&deg; 2.7</span></p>
-<p class=MsoNormal>&nbsp;</p>
-
-<table class=MsoNormalTable border=0 cellspacing=0 cellpadding=0 width=648
- style='width:485.7pt;margin-left:-.25pt;border-collapse:collapse'>
- <tr style='page-break-inside:avoid'>
- <td width=648 colspan=2 valign=top style='width:485.7pt;border:solid black 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center;layout-grid-mode:char'><i><span
- style='font-family:"Tahoma","sans-serif";color:navy'>Description</span></i></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Intitul&eacute;</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt;layout-grid-mode:char'><span
- style='font-size:11.0pt;line-height:200%;font-family:"Tahoma","sans-serif"'>Coh&eacute;rence
- entre les Itin&eacute;raires/Chouette<b> </b>et les LIGNEs/Chouette.</span></p>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Objectif</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>V&eacute;rification
- de la correcte r&eacute;f&eacute;rence aux Itin&eacute;raires/Chouette (&laquo;&nbsp;ChouetteRoute&nbsp;&raquo;)
- pour chaque LIGNE/Chouette (&laquo; Line &raquo;) .</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>R&eacute;f&eacute;rences</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>TRIDENT/profil
- CHOUETTE/Transmodel V4 et V5.1</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span lang=NL
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>N&deg;de fiche(s)</span></h1>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>connexe(s)</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>1.2
- (v&eacute;rifier qu&rsquo;il y a au moins un &eacute;l&eacute;ment d&rsquo;itin&eacute;raire &laquo;&nbsp;RouteId&nbsp;&raquo;
- dans l&rsquo;objet &laquo;&nbsp;Line)</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt;layout-grid-mode:char'><b><span
- style='font-size:11.0pt;line-height:200%;font-family:"Tahoma","sans-serif"'>Priorit&eacute;<span
- style='color:red'> </span></span></b></p>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Obligatoire
- </span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt;layout-grid-mode:char'><b><span
- style='font-size:11.0pt;line-height:200%;font-family:"Tahoma","sans-serif"'>R&eacute;sultat</span></b></p>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Conforme
- ou non conforme</span></h1>
- </td>
- </tr>
- <tr>
- <td width=108 colspan=2 style='width:81.35pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center;layout-grid-mode:char'><i><span
- style='font-family:"Tahoma","sans-serif";color:navy'>Mise en &oelig;uvre</span></i></h1>
- </td>
- </tr>
- <tr>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Explication</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>L&rsquo;&eacute;l&eacute;ment
- &laquo;&nbsp;RouteId&nbsp;&raquo; au sein de l'objet &laquo;&nbsp;Line&nbsp;&raquo; a un caract&egrave;re
- obligatoire. Il convient de v&eacute;rifier que chaque &eacute;l&eacute;ment &laquo;&nbsp;RouteId&nbsp;&raquo;
- correspond &agrave; un identifiant &laquo;&nbsp;ObjectId&nbsp;&raquo; d&rsquo;un Itin&eacute;raire/Chouette (&laquo;&nbsp;ChouetteRoute&nbsp;&raquo;).
- </span></h1>
- </td>
- </tr>
-</table>
-
-<p class=MsoNormal>&nbsp;</p>
-
-<table class=MsoNormalTable border=0 cellspacing=0 cellpadding=0 width=648
- style='width:485.7pt;margin-left:-.25pt;border-collapse:collapse'>
- <tr>
- <td width=100 valign=top style='width:74.85pt;border:solid black 1.0pt;
- border-right:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm;layout-grid-mode:char'><b><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>Exemple</span></b></p>
- </td>
- <td width=548 valign=top style='width:410.85pt;border:solid black 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=left style='margin-left:18.0pt;text-align:left'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Repr&eacute;sentation
- sch&eacute;matique de l&rsquo;Objet &laquo;&nbsp;Line&nbsp;&raquo;</span></h1>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal align=center style='text-align:center'><img width=478
- height=498 src="BATERI_Neptune_FINAL-V2_0a_fichiers/image002.jpg"></p>
- <p class=MsoNormal> </p>
- <h3 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'>&nbsp;</h3>
- <h3 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'>&nbsp;</h3>
- <h3 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'>&nbsp;</h3>
- <h3 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'>&nbsp;</h3>
- <h3 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'>&nbsp;</h3>
- <h3 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'>&nbsp;</h3>
- <h3 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'>&nbsp;</h3>
- <h3 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'>&nbsp;</h3>
- <h3 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'>&nbsp;</h3>
- <h3 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'>&nbsp;</h3>
- <h3 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'>&nbsp;</h3>
- <h3 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'>&nbsp;</h3>
- <h3 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'>&nbsp;</h3>
- <h3 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>&nbsp;</span></h3>
- <h3 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Exemple
- de d&eacute;finition de &laquo;&nbsp;routeId&nbsp;&raquo; dans une &laquo;&nbsp;Line&nbsp;&raquo;</span></h3>
- <p class=MsoHeader><span lang=EN-US style='font-size:10.0pt;font-family:"Courier New"'>&lt;Line&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;objectId&gt;AMIV:Line:014014012&lt;/objectId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;objectVersion&gt;1&lt;/objectVersion&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;creationTime&gt;2007-03-21T16:05:54.000+01:00&lt;/creationTime&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;name&gt;LIGNE
- 012&lt;/name&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;publishedName&gt;Les
- Courriers de l'Ile de France&lt;/publishedName&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;transportModeName&gt;Bus&lt;/transportModeName&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;lineEnd&gt;AMIV:StopPoint:488957A0A237830&lt;/lineEnd&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;ptNetworkIdShortcut&gt;AMIV:PTNetwork:95&lt;/ptNetworkIdShortcut&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;routeId&gt;AMIV:Route:488957&lt;/routeId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;routeId&gt;AMIV:Route:488959&lt;/routeId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;routeId&gt;AMIV:Route:488961&lt;/routeId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>...</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;ChouetteRoute&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;objectId&gt;AMIV:Route:488957&lt;/objectId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>...</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;ChouetteRoute&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;objectId&gt;AMIV:Route:488959&lt;/objectId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>...</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;ChouetteRoute&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;objectId&gt;AMIV:Route:488961&lt;/objectId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>...</span></p>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm;text-autospace:ideograph-numeric'><u><span lang=EN-US><span
- style='text-decoration:none'>&nbsp;</span></span></u></p>
- <p class=MsoNormal><span lang=EN-US>&nbsp;</span></p>
- <p class=MsoNormal><span lang=EN-US>&nbsp;</span></p>
- </td>
- </tr>
- <tr style='page-break-inside:avoid'>
- <td width=648 colspan=2 valign=top style='width:485.7pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h2 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center;layout-grid-mode:char'><i><span lang=EN-US
- style='font-size:14.0pt;color:navy'>Evaluation</span></i></h2>
- </td>
- </tr>
- <tr>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- solid black 1.0pt;border-bottom:solid black 1.0pt;border-right:none;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;layout-grid-mode:char'><span lang=EN-US style='font-size:11.0pt'>N&deg; test</span></h1>
- </td>
- <td width=108 valign=top style='width:81.35pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 style='margin-top:6.0pt;layout-grid-mode:char'><span style='font-size:
- 11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>2.7.1</span></h1>
- </td>
- </tr>
- <tr>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- solid black 1.0pt;border-bottom:solid black 1.0pt;border-right:none;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;layout-grid-mode:char'><span style='font-size:11.0pt'>Libell&eacute;</span></h1>
- </td>
- <td width=108 valign=top style='width:81.35pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 style='margin-top:6.0pt;layout-grid-mode:char'><span style='font-size:
- 11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>V&eacute;rification de
- la correcte r&eacute;f&eacute;rence aux Itin&eacute;raires/Chouette (&laquo;&nbsp;ChouetteRoute&nbsp;&raquo;)
- pour chaque LIGNE/Chouette (&laquo; Line &raquo;) .</span></h1>
- </td>
- </tr>
- <tr>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- solid black 1.0pt;border-bottom:solid black 1.0pt;border-right:none;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;layout-grid-mode:char'><span style='font-size:11.0pt'>Champ d&rsquo;application</span></h1>
- </td>
- <td width=108 valign=top style='width:81.35pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;layout-grid-mode:char'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>&lt;Line&gt;</span></h1>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm;text-align:justify;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>&lt;ChouetteRoute&gt;</span></p>
- </td>
- </tr>
- <tr>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- solid black 1.0pt;border-bottom:solid black 1.0pt;border-right:none;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;layout-grid-mode:char'><span style='font-size:11.0pt'>V&eacute;rification</span></h1>
- </td>
- <td width=108 valign=top style='width:81.35pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;layout-grid-mode:char'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>- Si chaque identifiant d&rsquo;Itin&eacute;raire
- &laquo;&nbsp;RouteId&nbsp;&raquo; au sein de l'objet &laquo;&nbsp;Line&nbsp;&raquo; est identifi&eacute;
- dans l&rsquo;objet &laquo;&nbsp;ChouetteRoute&nbsp;&raquo; alors le test est valid&eacute;, sinon le
- test est invalid&eacute; et produit le message &laquo;&nbsp;test 2.7.1&nbsp;: un
- identifiant d&rsquo;Itin&eacute;raire &laquo;&nbsp;RouteId&nbsp;&raquo; situ&eacute; dans l&rsquo;objet
- &laquo;&nbsp;Line&nbsp;&raquo; n&rsquo;est pas identifi&eacute; dans l&rsquo;objet
- &laquo;&nbsp;ChouetteRoute&nbsp;&raquo;&nbsp;&raquo;. </span></h1>
- </td>
- </tr>
-</table>
-
-</div>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2"><span style="text-decoration: underline;">
+Champ d’application:</span> &lt;Line&gt;&nbsp;&lt;ChouetteRoute&gt;</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Vérification:</u> </font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si chaque identifiant d’Itinéraire «&nbsp;RouteId&nbsp;» au sein de
+l'objet «&nbsp;Line&nbsp;» est identifié dans l’objet
+«&nbsp;ChouetteRoute&nbsp;» alors le test est validé, sinon le test est
+invalidé et produit le message «&nbsp;test 2.7.1&nbsp;: un identifiant
+d’Itinéraire «&nbsp;RouteId&nbsp;» situé dans l’objet
+«&nbsp;Line&nbsp;» n’est pas identifié dans l’objet
+«&nbsp;ChouetteRoute&nbsp;»&nbsp;».</font></font></font></p>
diff --git a/app/views/test_sheet/2_8.html b/app/views/test_sheet/2_8.html
index 372ec6429..64ad8a277 100644
--- a/app/views/test_sheet/2_8.html
+++ b/app/views/test_sheet/2_8.html
@@ -1,572 +1,222 @@
-<div class=WordSection1>
-</span>
+<h1 class="western" style="border: 1pt solid rgb(0, 0, 0); padding: 0.05cm 0.12cm; margin-top: 0.21cm;" align="center">
+<font face="Arial, sans-serif"><font style="font-size: 20pt;" size="5"><i>
+ point de contrôle N° 2.8<br>
+Cohérence entre les missions commerciales et les itinéraires<br>
+</i></font></font></h1>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Objectif: </b></u>
+Vérification de la correcte référence des MISSIONs COMMERCIALEs
+(«&nbsp;JourneyPattern&nbsp;») par les Itinéraires/Chouette
+(«&nbsp;ChouetteRoute&nbsp;»).<br>
+Vérification de la correcte référence des Itinéraires/Chouette
+(«&nbsp;ChouetteRoute&nbsp;») que référencent les MISSIONs COMMERCIALEs
+(«&nbsp;JourneyPattern&nbsp;»).<br>
+Vérification de la cohérence de la séquence des POINTs D’ARRÊT SUR
+PARCOURS (« StopPoint ») d’une MISSION COMMERCIALE et celle de l’
+Itinéraire/Chouette («&nbsp;ChouetteRoute&nbsp;») correspondant.<br>
+</font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Priorité: </b></u> Obligatoire (en partie si l’objet «&nbsp;JourneyPattern&nbsp;» existe)</font></p><font face="Arial, sans-serif">
+</font><p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><u><b>Explications:</b></u>
+</font></font></p>
-<p class=MsoTitle><span style='font-size:14.0pt;font-family:"Tahoma","sans-serif"'>Fiche
-du point de contr&ocirc;le N&deg; 2.8</span></p>
-<p class=MsoNormal>&nbsp;</p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+L’élément «&nbsp;journeyPatternId&nbsp;» au sein de l'Itinéraire/Chouette
+(«&nbsp;ChouetteRoute&nbsp;») a un caractère obligatoire. Il convient
+de vérifier qu'il existe une MISSION COMMERCIALE
+(«&nbsp;JourneyPattern&nbsp;») correspondante.</font></font></font></p>
-<table class=MsoNormalTable border=0 cellspacing=0 cellpadding=0 width=648
- style='width:485.95pt;margin-left:-.5pt;border-collapse:collapse'>
- <tr style='page-break-inside:avoid'>
- <td width=648 colspan=2 valign=top style='width:485.95pt;border:solid black 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center;layout-grid-mode:char'><i><span
- style='font-family:"Tahoma","sans-serif";color:navy'>Description</span></i></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Intitul&eacute;</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt;layout-grid-mode:char'><span
- style='font-family:"Tahoma","sans-serif"'>Coh&eacute;rence entre les missions
- commerciales et les itin&eacute;raires.</span></p>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Objectif</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>V&eacute;rification
- de la correcte r&eacute;f&eacute;rence des MISSIONs COMMERCIALEs
- (&laquo;&nbsp;JourneyPattern&nbsp;&raquo;) par les Itin&eacute;raires/Chouette
- (&laquo;&nbsp;ChouetteRoute&nbsp;&raquo;).</span></h1>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>V&eacute;rification
- de la correcte r&eacute;f&eacute;rence des Itin&eacute;raires/Chouette
- (&laquo;&nbsp;ChouetteRoute&nbsp;&raquo;) que r&eacute;f&eacute;rencent les MISSIONs COMMERCIALEs
- (&laquo;&nbsp;JourneyPattern&nbsp;&raquo;).</span></h1>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>V&eacute;rification
- de la coh&eacute;rence de la s&eacute;quence des POINTs D&rsquo;ARR&Ecirc;T SUR PARCOURS (&laquo; StopPoint
- &raquo;) d&rsquo;une MISSION COMMERCIALE et celle de l&rsquo; Itin&eacute;raire/Chouette
- (&laquo;&nbsp;ChouetteRoute&nbsp;&raquo;) correspondant.</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>R&eacute;f&eacute;rences</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>TRIDENT/profil
- CHOUETTE/Transmodel V4 et V5.1</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span lang=NL
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>N&deg; de fiche(s)</span></h1>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>connexe(s)</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>&nbsp;</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt;layout-grid-mode:char'><b><span
- style='font-family:"Tahoma","sans-serif"'>Priorit&eacute;<span style='color:red'> </span></span></b></p>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Obligatoire
- (en partie si l&rsquo;objet &laquo;&nbsp;JourneyPattern&nbsp;&raquo; existe)</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt;layout-grid-mode:char'><b><span
- style='font-family:"Tahoma","sans-serif"'>R&eacute;sultat</span></b></p>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Conforme
- ou non conforme</span></h1>
- </td>
- </tr>
- <tr style='page-break-inside:avoid'>
- <td width=648 colspan=2 valign=top style='width:485.95pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center;layout-grid-mode:char'><i><span
- style='font-family:"Tahoma","sans-serif";color:navy'>Mise en &oelig;uvre</span></i></h1>
- </td>
- </tr>
- <tr>
- <td width=100 style='width:74.85pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Explication</span></h1>
- </td>
- <td width=548 style='width:411.1pt;border:solid black 1.0pt;border-top:none;
- padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:11.35pt;margin-bottom:
- 6.0pt;margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>L&rsquo;&eacute;l&eacute;ment
- &laquo;&nbsp;journeyPatternId&nbsp;&raquo; au sein de l'</span><span style='font-family:
- "Tahoma","sans-serif";font-weight:normal'> </span><span style='font-size:
- 11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Itin&eacute;raire/Chouette
- (&laquo;&nbsp;ChouetteRoute&nbsp;&raquo;) a un caract&egrave;re obligatoire. Il convient de
- v&eacute;rifier qu'il existe une MISSION COMMERCIALE (&laquo;&nbsp;JourneyPattern&nbsp;&raquo;)
- correspondante. </span></h1>
- <p class=MsoNormal style='margin-right:11.35pt'><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'>Inversement, la r&eacute;f&eacute;rence &agrave; </span><span
- style='font-size:11.0pt;font-family:"Arial","sans-serif"'>un </span><span
- style='font-family:"Tahoma","sans-serif"'>Itin&eacute;raire/Chouette</span><span
- style='font-size:11.0pt;font-family:"Arial","sans-serif"'>
- (&laquo;&nbsp;ChouetteRoute&nbsp;&raquo;)</span><span style='font-size:11.0pt;font-family:
- "Arial","sans-serif"'> pour chaque </span><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";text-transform:uppercase'>mission
- commerciale</span><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>
- &laquo;&nbsp;JourneyPattern&nbsp;&raquo;, doit correspondre &agrave; un Itin&eacute;raire/Chouette
- (&laquo;&nbsp;ChouetteRoute&nbsp;&raquo;). </span></p>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:11.35pt;margin-bottom:
- 0cm;margin-left:0cm;margin-bottom:.0001pt'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>L&rsquo;ordre des points d&eacute;finissant
- &laquo;&nbsp;JourneyPattern&nbsp;&raquo; et</span><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'> &laquo;&nbsp;ChouetteRoute&nbsp;&raquo; </span><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>doit &ecirc;tre
- respect&eacute;.</span></p>
- </td>
- </tr>
-</table>
-<p class=MsoNormal>&nbsp;</p>
-<table class=MsoNormalTable border=0 cellspacing=0 cellpadding=0 width=657
- style='width:493.05pt;margin-left:-.5pt;border-collapse:collapse'>
- <tr>
- <td width=100 colspan=2 valign=top style='width:74.85pt;border:solid black 1.0pt;
- border-right:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm;layout-grid-mode:char'><b><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'>Exemple</span></b></p>
- </td>
- <td width=558 colspan=3 valign=top style='width:418.2pt;border:solid black 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=left style='margin-left:18.0pt;text-align:left'><span
- style='font-size:11.0pt;font-weight:normal'>Repr&eacute;sentation sch&eacute;matique de
- l&rsquo;Objet &laquo;&nbsp;ChouetteRoute&nbsp;&raquo;</span></h1>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal align=center style='text-align:center'><img width=402
- height=502 src="BATERI_Neptune_FINAL-V2_0a_fichiers/image007.jpg"></p>
- <h3 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm'>Exemple d'identifiant de mission commerciale
- &laquo;&nbsp;journeyPatternId&nbsp;&raquo; dans un objet &laquo;&nbsp;ChouetteRoute&nbsp;&raquo;
- correspondant &agrave; un &laquo;&nbsp;ObjectId&nbsp;&raquo; dans un objet
- &laquo;&nbsp;JourneyPattern&nbsp;&raquo;</h3>
- <p class=MsoNormal><span lang=EN-US style='font-size:10.0pt;font-family:"Courier New"'>...</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;ChouetteRoute&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;objectId&gt;AMIV:Route:488957&lt;/objectId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;name&gt;0140140120535&lt;/name&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;publishedName&gt;GOUSSAINVILLE
- RER - CHAUMONTEL&lt;/publishedName&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;ptLinkId&gt;AMIV:PTLink:488957A0A02378300237816&lt;/ptLinkId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;ptLinkId&gt;AMIV:PTLink:488957A1A02378160237817&lt;/ptLinkId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;journeyPatternId&gt;AMIV:JourneyPattern:488957M102&lt;/journeyPatternId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>...</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;JourneyPattern&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;objectId&gt;AMIV:JourneyPattern:488957M102&lt;/objectId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;routeId&gt;AMIV:Route:488957&lt;/routeId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;stopPointList&gt;AMIV:StopPoint:488957A0A237830&lt;/stopPointList&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;stopPointList&gt;AMIV:StopPoint:488957A1A237816&lt;/stopPointList&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;stopPointList&gt;AMIV:StopPoint:488957A2A237817&lt;/stopPointList&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;/JourneyPattern&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span
- style='font-size:10.0pt;font-family:"Courier New"'>...</span></p>
- <h1 align=left style='margin-left:18.0pt;text-align:left'><span
- style='font-size:11.0pt;font-weight:normal'>Repr&eacute;sentation sch&eacute;matique de
- l&rsquo;objet JourneyPattern</span></h1>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><img width=487
- height=483 src="BATERI_Neptune_FINAL-V2_0a_fichiers/image008.jpg"></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'>&nbsp;</p>
- <h3 style='text-indent:0cm'>Exemple d'une mission qui r&eacute;f&eacute;rence une
- ChouetteRoute</h3>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>...</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;ChouetteRoute&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;objectId&gt;AMIV:Route:489111&lt;/objectId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;name&gt;0140140120996&lt;/name&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>...</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;JourneyPattern&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;objectId&gt;AMIV:JourneyPattern:489111M74&lt;/objectId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;routeId&gt;AMIV:Route:489111&lt;/routeId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;stopPointList&gt;AMIV:StopPoint:489111A0A237832&lt;/stopPointList&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;stopPointList&gt;AMIV:StopPoint:489111A1A237807&lt;/stopPointList&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;stopPointList&gt;AMIV:StopPoint:489111A2A237806&lt;/stopPointList&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;stopPointList&gt;AMIV:StopPoint:489111A3A237805&lt;/stopPointList&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;stopPointList&gt;AMIV:StopPoint:489111A4A237804&lt;/stopPointList&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;stopPointList&gt;AMIV:StopPoint:489111A5A237803&lt;/stopPointList&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;stopPointList&gt;AMIV:StopPoint:489111A6A237832&lt;/stopPointList&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;lineIdShortcut&gt;AMIV:Line:014014012&lt;/lineIdShortcut&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;/JourneyPattern&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>...</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:Monospace;color:teal'>&nbsp;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:Monospace;color:teal'>&nbsp;</span></p>
- </td>
- </tr>
- <tr style='page-break-inside:avoid'>
- <td width=657 colspan=5 valign=top style='width:493.05pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h2 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center;layout-grid-mode:char'><i><span lang=EN-US
- style='font-size:14.0pt;color:navy'>Evaluation</span></i></h2>
- </td>
- </tr>
- <tr>
- <td width=108 colspan=2 style='width:81.35pt;border-top:none;border-left:
- solid black 1.0pt;border-bottom:solid black 1.0pt;border-right:none;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span lang=EN-US
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>N&deg; test</span></h1>
- </td>
- <td width=108 colspan=3 style='width:81.35pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>2.8.1</span></h1>
- </td>
- </tr>
- <tr>
- <td width=108 colspan=2 style='width:81.35pt;border-top:none;border-left:
- solid black 1.0pt;border-bottom:solid black 1.0pt;border-right:none;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Libell&eacute;</span></h1>
- </td>
- <td width=108 colspan=3 style='width:81.35pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>V&eacute;rification
- de la correcte r&eacute;f&eacute;rence des MISSIONs COMMERCIALEs
- (&laquo;&nbsp;JourneyPattern&nbsp;&raquo;) par les Itin&eacute;raires/Chouette
- (&laquo;&nbsp;ChouetteRoute&nbsp;&raquo;).</span></h1>
- </td>
- </tr>
- <tr>
- <td width=108 colspan=2 style='width:81.35pt;border-top:none;border-left:
- solid black 1.0pt;border-bottom:solid black 1.0pt;border-right:none;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Champ
- d&rsquo;application</span></h1>
- </td>
- <td width=108 colspan=3 style='width:81.35pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>&lt;ChouetteRoute&gt;</span></h1>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm;layout-grid-mode:char'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>&lt;JourneyPattern&gt;</span></p>
- </td>
- </tr>
- <tr>
- <td width=108 colspan=2 style='width:81.35pt;border-top:none;border-left:
- solid black 1.0pt;border-bottom:solid black 1.0pt;border-right:none;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>V&eacute;rification</span></h1>
- </td>
- <td width=108 colspan=3 style='width:81.35pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=left style='text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>&nbsp;</span></h1>
- <h1 align=left style='text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>-
- Si l&rsquo;&eacute;l&eacute;ment &laquo;&nbsp;journeyPatternId&nbsp;&raquo;, r&eacute;f&eacute;renc&eacute; dans l&rsquo;objet
- &laquo;&nbsp;ChouetteRoute&nbsp;&raquo; poss&egrave;de un identifiant &laquo;&nbsp;ObjectId&nbsp;&raquo;
- dans un objet &laquo;&nbsp;JourneyPattern&nbsp;&raquo;, le test est valid&eacute;, sinon le test
- est invalid&eacute; et produit le message &laquo;&nbsp;test 2.8.1&nbsp;: un &eacute;l&eacute;ment
- &laquo;&nbsp;journeyPatternId&nbsp;&raquo; dans un objet d&rsquo;Itin&eacute;raire
- &laquo;&nbsp;ChouetteRoute&nbsp;&raquo; n&rsquo;a pas d&rsquo;identifiant &laquo;&nbsp;ObjectId&nbsp;&raquo; dans
- un objet &laquo;&nbsp;JourneyPattern&raquo; &raquo;.</span></h1>
- <h1 align=left style='text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>&nbsp;</span></h1>
- </td>
- </tr>
- <tr>
- <td width=108 colspan=2 style='width:81.35pt;border-top:none;border-left:
- solid black 1.0pt;border-bottom:solid black 1.0pt;border-right:none;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span lang=EN-US
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>N&deg; test</span></h1>
- </td>
- <td width=108 colspan=3 style='width:81.35pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span lang=EN-US
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>2.8.2</span></h1>
- </td>
- </tr>
- <tr>
- <td width=108 colspan=2 style='width:81.35pt;border-top:none;border-left:
- solid black 1.0pt;border-bottom:solid black 1.0pt;border-right:none;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span lang=EN-US
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Libell&eacute;</span></h1>
- </td>
- <td width=108 colspan=3 style='width:81.35pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>V&eacute;rification
- de la correcte r&eacute;f&eacute;rence des Itin&eacute;raires/Chouette
- (&laquo;&nbsp;ChouetteRoute&nbsp;&raquo;) que r&eacute;f&eacute;rencent les MISSIONs COMMERCIALEs
- (&laquo;&nbsp;JourneyPattern&nbsp;&raquo;).</span></h1>
- </td>
- </tr>
- <tr>
- <td width=108 colspan=2 style='width:81.35pt;border-top:none;border-left:
- solid black 1.0pt;border-bottom:solid black 1.0pt;border-right:none;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Champ
- d&rsquo;application</span></h1>
- </td>
- <td width=108 colspan=3 style='width:81.35pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>&lt;JourneyPattern&gt;</span></h1>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm;layout-grid-mode:char'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>&lt;ChouetteRoute&gt;</span></p>
- </td>
- </tr>
- <tr>
- <td width=108 colspan=2 style='width:81.35pt;border-top:none;border-left:
- solid black 1.0pt;border-bottom:solid black 1.0pt;border-right:none;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>V&eacute;rification</span></h1>
- </td>
- <td width=108 colspan=3 style='width:81.35pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=left style='text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>&nbsp;</span></h1>
- <h1 align=left style='text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>-
- Si l&rsquo;objet de MISSION COMMERCIALE existe, poursuivre le test, sinon
- abandonner le test</span></h1>
- <h1 align=left style='text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>&nbsp;</span></h1>
- <p class=MsoBodyText3 align=left style='text-align:left'><span
- style='font-family:"Tahoma","sans-serif"'>- Si l&rsquo;&eacute;l&eacute;ment d&rsquo;Itin&eacute;raire
- &laquo;&nbsp;routeId&nbsp;&raquo;, r&eacute;f&eacute;renc&eacute; dans un objet &laquo;&nbsp;JourneyPattern&nbsp;&raquo;,
- poss&egrave;de un identifiant &laquo;&nbsp;objectId&nbsp;&raquo; dans l&rsquo;objet d&rsquo;Itin&eacute;raire
- &laquo;&nbsp;ChouetteRoute&nbsp;&raquo;, alors le test est valid&eacute;, sinon le test est
- invalid&eacute; et produit le message &laquo;&nbsp;test 2.8.1&nbsp;: l&rsquo;&eacute;l&eacute;ment
- d&rsquo;Itin&eacute;raire &laquo;&nbsp;routeId&nbsp;&raquo;, r&eacute;f&eacute;renc&eacute; dans un objet
- &laquo;&nbsp;JourneyPattern&nbsp;&raquo;, n&rsquo;a pas d&rsquo;identifiant &laquo;&nbsp;objectId&nbsp;&raquo;
- dans l&rsquo;objet d&rsquo;Itin&eacute;raire &laquo;&nbsp;ChouetteRoute&nbsp;&raquo;&nbsp;&raquo;</span></p>
- <h1 align=left style='text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>&nbsp;</span></h1>
- </td>
- </tr>
- <tr>
- <td style='border:none;padding:0cm 0cm 0cm 0cm' width=1><p class='MsoNormal'>&nbsp;</td>
- <td width=108 colspan=2 style='width:81.35pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span lang=EN-US style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>N&deg; test</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <p class=MsoHeader style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><span lang=EN-US style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>Test 2.8.3</span></p>
- </td>
- <td style='border:none;padding:0cm 0cm 0cm 0cm' width=9><p class='MsoNormal'>&nbsp;</td>
- </tr>
- <tr>
- <td style='border:none;padding:0cm 0cm 0cm 0cm' width=1><p class='MsoNormal'>&nbsp;</td>
- <td width=108 colspan=2 style='width:81.35pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>Libell&eacute;</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <p class=MsoHeader style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>V&eacute;rification
- de la coh&eacute;rence de la s&eacute;quence des POINTs D&rsquo;ARR&Ecirc;T SUR PARCOURS (&laquo; StopPoint
- &raquo;) d&rsquo;une <span style='text-transform:uppercase'>mission commerciale</span>
- et celle de l&rsquo;Itin&eacute;raire/Chouette (&laquo;&nbsp;ChouetteRoute&nbsp;&raquo;)<b> </b>correspondant.</span></p>
- </td>
- <td style='border:none;padding:0cm 0cm 0cm 0cm' width=9><p class='MsoNormal'>&nbsp;</td>
- </tr>
- <tr>
- <td style='border:none;padding:0cm 0cm 0cm 0cm' width=1><p class='MsoNormal'>&nbsp;</td>
- <td width=108 colspan=2 style='width:81.35pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span lang=EN-US style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>Champ d&rsquo;application</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><span lang=EN-US style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>&lt;StopPoint&gt;</span></p>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><span lang=EN-US style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>&lt;JourneyPattern&gt;</span></p>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><span lang=EN-US style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>&lt;ptLink&gt;</span></p>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>&lt;ChouetteRoute&gt;</span></p>
- </td>
- <td style='border:none;padding:0cm 0cm 0cm 0cm' width=9><p class='MsoNormal'>&nbsp;</td>
- </tr>
- <tr>
- <td style='border:none;padding:0cm 0cm 0cm 0cm' width=1><p class='MsoNormal'>&nbsp;</td>
- <td width=100 colspan=2 style='width:74.85pt;border:solid windowtext 1.0pt;
- border-top:none;padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>V&eacute;rification</span></h1>
- </td>
- <td width=547 style='width:410.6pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>-
- Si l&rsquo;&eacute;l&eacute;ment &laquo;&nbsp;StopPoint&nbsp;&raquo; mentionn&eacute; dans les champs d&rsquo;application
- est pr&eacute;sent une ou plusieurs fois, poursuivre le test, sinon le test est
- abandonn&eacute;.</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>-
- Si l&rsquo;identifiant du &laquo; StopPoint &raquo; d&eacute;tect&eacute;, figure dans la liste des points
- d&rsquo;arr&ecirc;ts de l&rsquo;objet &laquo;&nbsp;JourneyPattern&nbsp;&raquo;, poursuivre le test, sinon
- le test est invalid&eacute; et fournit le message&nbsp;: &laquo;&nbsp;test 2.8.3 a&nbsp;:
- l&rsquo;identifiant du &laquo; StopPoint &raquo; d&eacute;tect&eacute; dans l&rsquo;objet &laquo;&nbsp;StopPoint&nbsp;&raquo;
- ne figure pas dans la liste des points d&rsquo;arr&ecirc;t de l&rsquo;objet
- &laquo;&nbsp;JourneyPattern&nbsp;&raquo;&nbsp;&raquo;.</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'> </span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>-
- Si l&rsquo;identifiant du &laquo; StopPoint &raquo; figure dans l&rsquo;un des &eacute;l&eacute;ments
- &laquo;&nbsp;startOfLink&nbsp;&raquo; ou &laquo;&nbsp;endOfLink&nbsp;&raquo; du tron&ccedil;on
- &laquo;&nbsp;PtLink&nbsp;&raquo;, poursuivre le test, sinon le test est invalid&eacute; et
- fournit le message&nbsp;: &laquo;&nbsp;test 2.8.3 b: l&rsquo;identifiant du &laquo; StopPoint
- &raquo; ne figure pas dans l&rsquo;un des &eacute;l&eacute;ments &laquo;&nbsp;startOfLink&nbsp;&raquo; ou
- &laquo;&nbsp;endOfLink&nbsp;&raquo; du tron&ccedil;on &laquo;&nbsp;PtLink&nbsp;&raquo;&nbsp;&raquo;.</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>-
- Si l&rsquo;identifiant du tron&ccedil;on &laquo;&nbsp;PtLink&nbsp;&raquo;, d&eacute;tect&eacute; ci-avant, est
- int&eacute;gr&eacute; dans un Itin&eacute;raire &laquo;&nbsp;ChouetteRoute&nbsp;&raquo;, poursuivre le test,
- sinon le test est invalid&eacute; et fournit le message&nbsp;: &laquo;&nbsp;test 2.8.3
- c&nbsp;: l&rsquo;identifiant du tron&ccedil;on &laquo;&nbsp;PtLink&nbsp;&raquo;, d&eacute;tect&eacute; dans le test
- 3.3.1b, n&rsquo;est pas int&eacute;gr&eacute; dans un Itin&eacute;raire
- &laquo;&nbsp;ChouetteRoute&nbsp;&raquo;&nbsp;&raquo;.</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>-
- Si l&rsquo;identifiant d&rsquo;Itin&eacute;raire &laquo;&nbsp;ChouetteRoute&nbsp;&raquo;, d&eacute;tect&eacute; ci-avant,
- est le m&ecirc;me que celui d&eacute;tect&eacute; ci-avant dans la MISSION COMMERCIALE
- &laquo;&nbsp;JourneyPattern&nbsp;&raquo;, le test est valid&eacute;, sinon le test est invalid&eacute;
- et fournit le message&nbsp;: &laquo;&nbsp;test 2.8.3 d&nbsp;: l&rsquo;identifiant
- d&rsquo;Itin&eacute;raire &laquo;&nbsp;ChouetteRoute&nbsp;&raquo; n&rsquo;est le m&ecirc;me que celui d&eacute;tect&eacute; dans
- la MISSION COMMERCIALE &laquo;&nbsp;JourneyPattern&nbsp;&raquo;&nbsp;&raquo;</span></p>
- </td>
- <td style='border:none;padding:0cm 0cm 0cm 0cm' width=9><p class='MsoNormal'>&nbsp;</td>
- </tr>
- <tr height=0>
- <td width=1 style='border:none'></td>
- <td width=108 style='border:none'></td>
- <td width=1 style='border:none'></td>
- <td width=543 style='border:none'></td>
- <td width=5 style='border:none'></td>
- </tr>
-</table>
-</div>
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Inversement, la référence à
+un&nbsp;Itinéraire/Chouette&nbsp;(«&nbsp;ChouetteRoute&nbsp;»)&nbsp;pour
+chaque&nbsp;mission commerciale&nbsp;«&nbsp;JourneyPattern&nbsp;», doit
+correspondre à un Itinéraire/Chouette («&nbsp;ChouetteRoute&nbsp;»).</font></font></font></p>
+
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+L’ordre des points définissant «&nbsp;JourneyPattern&nbsp;» et &nbsp;«&nbsp;ChouetteRoute&nbsp;» doit être respecté.</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>Exemple: </u></b></font></font></font></p>
+<p><font face="Arial, sans-serif"><img src="image007.jpg" height="502" width="402"></font></p>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif"><span style="font-style: italic;">Exemple
+d'identifiant de mission commerciale « journeyPatternId » dans un objet
+« ChouetteRoute » correspondant à un « ObjectId » dans un objet «
+JourneyPattern »</span><br>...<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;ChouetteRoute&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;objectId&gt;AMIV:Route:488957&lt;/objectId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;name&gt;0140140120535&lt;/name&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;publishedName&gt;GOUSSAINVILLE RER - CHAUMONTEL&lt;/publishedName&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;ptLinkId&gt;AMIV:PTLink:488957A0A02378300237816&lt;/ptLinkId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;ptLinkId&gt;AMIV:PTLink:488957A1A02378160237817&lt;/ptLinkId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;journeyPatternId&gt;AMIV:JourneyPattern:488957M102&lt;/journeyPatternId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">...<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;JourneyPattern&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;objectId&gt;AMIV:JourneyPattern:488957M102&lt;/objectId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;routeId&gt;AMIV:Route:488957&lt;/routeId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;stopPointList&gt;AMIV:StopPoint:488957A0A237830&lt;/stopPointList&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;stopPointList&gt;AMIV:StopPoint:488957A1A237816&lt;/stopPointList&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;stopPointList&gt;AMIV:StopPoint:488957A2A237817&lt;/stopPointList&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;/JourneyPattern&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">...<br></font></span>
+<p><font face="Arial, sans-serif"><img src="image008.jpg" height="483" width="487"></font></p>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif"><span style="font-style: italic;">Exemple d'une mission qui référence une ChouetteRoute</span><br>...<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;ChouetteRoute&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;objectId&gt;AMIV:Route:489111&lt;/objectId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;name&gt;0140140120996&lt;/name&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">...<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;JourneyPattern&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;objectId&gt;AMIV:JourneyPattern:489111M74&lt;/objectId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;routeId&gt;AMIV:Route:489111&lt;/routeId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;stopPointList&gt;AMIV:StopPoint:489111A0A237832&lt;/stopPointList&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;stopPointList&gt;AMIV:StopPoint:489111A1A237807&lt;/stopPointList&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;stopPointList&gt;AMIV:StopPoint:489111A2A237806&lt;/stopPointList&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;stopPointList&gt;AMIV:StopPoint:489111A3A237805&lt;/stopPointList&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;stopPointList&gt;AMIV:StopPoint:489111A4A237804&lt;/stopPointList&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;stopPointList&gt;AMIV:StopPoint:489111A5A237803&lt;/stopPointList&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;stopPointList&gt;AMIV:StopPoint:489111A6A237832&lt;/stopPointList&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;lineIdShortcut&gt;AMIV:Line:014014012&lt;/lineIdShortcut&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;/JourneyPattern&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">...<br></font></span>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>N° test:</u></b>
+2.8.1</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Libellé:</u> Vérification de la correcte référence des MISSIONs
+COMMERCIALEs («&nbsp;JourneyPattern&nbsp;») par les
+Itinéraires/Chouette («&nbsp;ChouetteRoute&nbsp;»).</font></font></font></p>
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Champ d’application:</u>
+&lt;ChouetteRoute&gt;&nbsp;&lt;JourneyPattern&gt;</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Vérification:</u> </font></font></font></p>
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+&nbsp;-
+Si l’élément «&nbsp;journeyPatternId&nbsp;», référencé dans l’objet
+«&nbsp;ChouetteRoute&nbsp;» possède un identifiant
+«&nbsp;ObjectId&nbsp;» dans un objet «&nbsp;JourneyPattern&nbsp;», le
+test est validé, sinon le test est invalidé et produit le message
+«&nbsp;test 2.8.1&nbsp;: un élément «&nbsp;journeyPatternId&nbsp;» dans
+un objet d’Itinéraire «&nbsp;ChouetteRoute&nbsp;» n’a pas d’identifiant
+«&nbsp;ObjectId&nbsp;» dans un objet «&nbsp;JourneyPattern» ».</font></font></font></p>
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>N° test:</u></b>
+2.8.2</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Libellé:</u> Vérification de la correcte référence des
+Itinéraires/Chouette («&nbsp;ChouetteRoute&nbsp;») que référencent les
+MISSIONs COMMERCIALEs («&nbsp;JourneyPattern&nbsp;»).</font></font></font></p>
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Champ d’application:</u>
+&lt;JourneyPattern&gt; &lt;ChouetteRoute&gt;</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Vérification:</u> </font></font></font></p>
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+&nbsp;- Si l’objet de MISSION COMMERCIALE existe, poursuivre le test, sinon abandonner le test</font></font></font></p>
+
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si l’élément d’Itinéraire «&nbsp;routeId&nbsp;», référencé dans un
+objet «&nbsp;JourneyPattern&nbsp;», possède un identifiant
+«&nbsp;objectId&nbsp;» dans l’objet d’Itinéraire
+«&nbsp;ChouetteRoute&nbsp;», alors le test est validé, sinon le test
+est invalidé et produit le message «&nbsp;test 2.8.1&nbsp;: l’élément
+d’Itinéraire «&nbsp;routeId&nbsp;», référencé dans un objet
+«&nbsp;JourneyPattern&nbsp;», n’a pas d’identifiant
+«&nbsp;objectId&nbsp;» dans l’objet d’Itinéraire
+«&nbsp;ChouetteRoute&nbsp;»&nbsp;</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>N° test:</u></b>
+Test 2.8.3</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Libellé:</u>
+Vérification de la cohérence de la séquence des POINTs D’ARRÊT SUR PARCOURS (« StopPoint ») d’une <span style="text-transform: uppercase;">mission commerciale</span></font></font></font></p>
+
+
+
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2"><span style="text-decoration: underline;">
+Champ d’application:</span>&nbsp;&lt;StopPoint&gt;&nbsp;&lt;JourneyPattern&gt; &nbsp;&lt;ptLink&gt; &lt;ChouetteRoute&gt;</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Vérification:</u> </font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si l’élément «&nbsp;StopPoint&nbsp;» mentionné dans les champs
+d’application est présent une ou plusieurs fois, poursuivre le test,
+sinon le test est abandonné.</font></font></font></p>
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si l’identifiant du « StopPoint » détecté, figure dans la liste des
+points d’arrêts de l’objet «&nbsp;JourneyPattern&nbsp;», poursuivre le
+test, sinon le test est invalidé et fournit le message&nbsp;:
+«&nbsp;test 2.8.3 a&nbsp;: l’identifiant du « StopPoint » détecté dans
+l’objet «&nbsp;StopPoint&nbsp;» ne figure pas dans la liste des points
+d’arrêt de l’objet «&nbsp;JourneyPattern&nbsp;».</font></font></font></p>
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si l’identifiant du « StopPoint » figure dans l’un des éléments
+«&nbsp;startOfLink&nbsp;» ou «&nbsp;endOfLink&nbsp;» du tronçon
+«&nbsp;PtLink&nbsp;», poursuivre le test, sinon le test est invalidé et
+fournit le message&nbsp;: «&nbsp;test 2.8.3 b: l’identifiant du «
+StopPoint » ne figure pas dans l’un des éléments
+«&nbsp;startOfLink&nbsp;» ou «&nbsp;endOfLink&nbsp;» du tronçon
+«&nbsp;PtLink&nbsp;».</font></font></font></p>
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si l’identifiant du tronçon «&nbsp;PtLink&nbsp;», détecté ci-avant,
+est intégré dans un Itinéraire «&nbsp;ChouetteRoute&nbsp;», poursuivre
+le test, sinon le test est invalidé et fournit le message&nbsp;:
+«&nbsp;test 2.8.3 c&nbsp;: l’identifiant du tronçon
+«&nbsp;PtLink&nbsp;», détecté dans le test 3.3.1b, n’est pas intégré
+dans un Itinéraire «&nbsp;ChouetteRoute&nbsp;»&nbsp;</font></font></font></p>
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si l’identifiant d’Itinéraire «&nbsp;ChouetteRoute&nbsp;», détecté
+ci-avant, est le même que celui détecté ci-avant dans la MISSION
+COMMERCIALE «&nbsp;JourneyPattern&nbsp;», le test est validé, sinon le
+test est invalidé et fournit le message&nbsp;: «&nbsp;test 2.8.3
+d&nbsp;: l’identifiant d’Itinéraire «&nbsp;ChouetteRoute&nbsp;» n’est
+le même que celui détecté dans la MISSION COMMERCIALE
+«&nbsp;JourneyPattern&nbsp;»</font></font></font></p>
diff --git a/app/views/test_sheet/2_9.html b/app/views/test_sheet/2_9.html
index 1650f0a9a..cf7f15840 100644
--- a/app/views/test_sheet/2_9.html
+++ b/app/views/test_sheet/2_9.html
@@ -1,298 +1,98 @@
+<h1 class="western" style="border: 1pt solid rgb(0, 0, 0); padding: 0.05cm 0.12cm; margin-top: 0.21cm;" align="center">
+<font face="Arial, sans-serif"><font style="font-size: 20pt;" size="5"><i>
+ point de contrôle N° 2.9<br>
+Définition de l’itinéraire retour<br>
+</i></font></font></h1>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Objectif: </b></u>
+Vérifier la correcte référence à un Itinéraire/Chouette
+(«&nbsp;ChouetteRoute&nbsp;») dans le cas d’un itinéraire de retour.<br>
+</font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Priorité: </b></u> Obligatoire (si l’identifiant «&nbsp;wayBackRouteId&nbsp;» existe)</font></p><font face="Arial, sans-serif">
+</font><p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><u><b>Explications:</b></u>
+</font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+L’élément d’Itinéraire de retour «&nbsp;wayBackRouteId&nbsp;» au sein
+de l’objet Itinéraire/Chouette («&nbsp;ChouetteRoute&nbsp;») a un
+caractère optionnel. Si une valeur d’attribut est définie, il convient
+de s'assurer qu’elle correspond à un Itinéraire/Chouette
+(«&nbsp;ChouetteRoute&nbsp;») dans le même réseau.</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>Exemple: </u></b></font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Représentation schématique de l’Objet «&nbsp;ChouetteRoute&nbsp;»</font></font></font></p>
+<p><font face="Arial, sans-serif"><img src="image007.jpg" height="502" width="402"></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Exemple d'itinéraire de retour</font></font></font></p>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">...<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;ChouetteRoute&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif"><br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;objectId&gt;AMIV:Route:488957&lt;/objectId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;name&gt;0140140120535&lt;/name&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;publishedName&gt;GOUSSAINVILLE RER - CHAUMONTEL&lt;/publishedName&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;ptLinkId&gt;AMIV:PTLink:488957A0A02378300237816&lt;/ptLinkId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;ptLinkId&gt;AMIV:PTLink:488957A1A02378160237817&lt;/ptLinkId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;journeyPatternId&gt;AMIV:JourneyPattern:488957M10200&lt;/journeyPatternId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;comment&gt;12 Lycée Gérard de Nerval – Cyprien Réthoré&lt;/comment&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif"><br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;wayBackRouteId&gt;AMIV:Route:488959&lt;/wayBackRouteId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;RouteExtension&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;wayBack&gt;R&lt;/wayBack&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;/RouteExtension&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;/ChouetteRoute&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;ChouetteRoute&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif"><br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;objectId&gt;AMIV:Route:488959&lt;/objectId&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">&lt;name&gt;0140140120536&lt;/name&gt;<br></font></span>
+<span style="font-size: 10pt; font-family: &quot;Courier New&quot;;">
+<font face="Arial, sans-serif">...<br></font></span>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>N° test:</u></b>
+2.9.1</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Libellé:</u>
+Vérifier la correcte référence à un Itinéraire/Chouette («&nbsp;ChouetteRoute&nbsp;») dans le cas d’un Itinéraire de retour.</font></font></font></p>
-<div class=WordSection1>
-</span></b>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2"><span style="text-decoration: underline;">
+Champ d’application:</span>&nbsp;&lt;ChouetteRoute&gt;</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Vérification:</u> </font></font></font></p>
-<p class=MsoTitle><span style='font-size:14.0pt;font-family:"Tahoma","sans-serif"'>Fiche
-du point de contr&ocirc;le N&deg; 2.9</span></p>
-<p class=MsoNormal>&nbsp;</p>
-<table class=MsoNormalTable border=0 cellspacing=0 cellpadding=0 width=648
- style='width:485.7pt;margin-left:-.25pt;border-collapse:collapse'>
- <tr style='page-break-inside:avoid'>
- <td width=648 colspan=2 valign=top style='width:485.7pt;border:solid black 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center;layout-grid-mode:char'><i><span
- style='color:navy'>Description</span></i></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Intitul&eacute;</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt;layout-grid-mode:char'><span
- style='font-size:11.0pt;line-height:200%;font-family:"Tahoma","sans-serif"'>D&eacute;finition
- de l&rsquo;itin&eacute;raire retour.</span></p>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Objectif</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>V&eacute;rifier
- la correcte r&eacute;f&eacute;rence &agrave; un Itin&eacute;raire/Chouette (&laquo;&nbsp;ChouetteRoute&nbsp;&raquo;)
- dans le cas d&rsquo;un itin&eacute;raire de retour.</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>R&eacute;f&eacute;rences</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>TRIDENT/profil
- CHOUETTE/Transmodel V4 et V5.1</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span lang=NL
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>N&deg;de fiche(s)</span></h1>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>connexe(s)</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>&nbsp;</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt;layout-grid-mode:char'><b><span
- style='font-size:11.0pt;line-height:200%;font-family:"Tahoma","sans-serif"'>Priorit&eacute;<span
- style='color:red'> </span></span></b></p>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Obligatoire
- (si l&rsquo;identifiant &laquo;&nbsp;wayBackRouteId&nbsp;&raquo; existe)</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:0cm 3.5pt 0cm 3.5pt;
- height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt;layout-grid-mode:char'><b><span
- style='font-size:11.0pt;line-height:200%;font-family:"Tahoma","sans-serif"'>R&eacute;sultat</span></b></p>
- </td>
- <td width=108 style='width:81.35pt;border:solid black 1.0pt;border-top:none;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Conforme
- ou non conforme</span></h1>
- </td>
- </tr>
- <tr style='page-break-inside:avoid'>
- <td width=648 colspan=2 valign=top style='width:485.7pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center;layout-grid-mode:char'><i><span
- style='font-family:"Tahoma","sans-serif";color:navy'>Mise en &oelig;uvre</span></i></h1>
- </td>
- </tr>
- <tr>
- <td width=100 style='width:74.85pt;border-top:none;border-left:solid black 1.0pt;
- border-bottom:solid black 1.0pt;border-right:none;padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Explication</span></h1>
- </td>
- <td width=548 style='width:410.85pt;border:solid black 1.0pt;border-top:none;
- padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:11.35pt;margin-bottom:
- 6.0pt;margin-left:0cm;text-align:left;layout-grid-mode:char'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>L&rsquo;&eacute;l&eacute;ment
- d&rsquo;Itin&eacute;raire de retour &laquo;&nbsp;wayBackRouteId&nbsp;&raquo; au sein de l&rsquo;objet
- Itin&eacute;raire/Chouette (&laquo;&nbsp;ChouetteRoute&nbsp;&raquo;) a un caract&egrave;re optionnel.
- Si une valeur d&rsquo;attribut est d&eacute;finie, il convient de s'assurer qu&rsquo;elle
- correspond &agrave; un Itin&eacute;raire/Chouette (&laquo;&nbsp;ChouetteRoute&nbsp;&raquo;) dans le
- m&ecirc;me r&eacute;seau.</span></h1>
- </td>
- </tr>
-</table>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si l’élément d’Itinéraire de retour «wayBackRouteId&nbsp;»&nbsp;est
+présent dans l’objet «&nbsp;ChouetteRoute&nbsp;» alors poursuivre le
+test, sinon le test est abandonné</font></font></font></p>
-<p class=MsoNormal>&nbsp;</p>
-
-<table class=MsoNormalTable border=0 cellspacing=0 cellpadding=0 width=657
- style='width:492.8pt;margin-left:-.25pt;border-collapse:collapse'>
- <tr>
- <td width=108 valign=top style='width:81.35pt;border:solid black 1.0pt;
- border-right:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm;layout-grid-mode:char'><b><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>Exemple</span></b></p>
- </td>
- <td width=557 valign=top style='width:417.95pt;border:solid black 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=left style='margin-left:18.0pt;text-align:left;layout-grid-mode:
- char'><span style='font-size:11.0pt;font-weight:normal'>&nbsp;</span></h1>
- <h1 align=left style='margin-left:18.0pt;text-align:left'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Repr&eacute;sentation
- sch&eacute;matique de l&rsquo;Objet &laquo;&nbsp;ChouetteRoute&nbsp;&raquo;</span></h1>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal align=center style='text-align:center'><img width=402
- height=502 src="BATERI_Neptune_FINAL-V2_0a_fichiers/image007.jpg"></p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal><u><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Exemple
- d'itin&eacute;raire de retour</span></u></p>
- <p class=MsoNormal><span style='font-size:10.0pt;font-family:"Courier New"'>...</span></p>
- <p class=MsoNormal><span style='font-size:10.0pt;font-family:"Courier New"'>&lt;ChouetteRoute&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span
- style='font-size:10.0pt;font-family:"Courier New"'> </span><span
- lang=EN-US style='font-size:10.0pt;font-family:"Courier New"'>&lt;objectId&gt;AMIV:Route:488957&lt;/objectId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;name&gt;0140140120535&lt;/name&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;publishedName&gt;GOUSSAINVILLE
- RER - CHAUMONTEL&lt;/publishedName&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;ptLinkId&gt;AMIV:PTLink:488957A0A02378300237816&lt;/ptLinkId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;ptLinkId&gt;AMIV:PTLink:488957A1A02378160237817&lt;/ptLinkId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;journeyPatternId&gt;AMIV:JourneyPattern:488957M10200&lt;/journeyPatternId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;comment&gt;12
- Lyc&eacute;e G&eacute;rard de Nerval &ndash; Cyprien R&eacute;thor&eacute;&lt;/comment&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span
- style='font-size:10.0pt;font-family:"Courier New"'> </span><span
- lang=EN-US style='font-size:10.0pt;font-family:"Courier New"'>&lt;wayBackRouteId&gt;AMIV:Route:488959&lt;/wayBackRouteId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;RouteExtension&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;wayBack&gt;R&lt;/wayBack&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;/RouteExtension&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;/ChouetteRoute&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'>&lt;ChouetteRoute&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-US
- style='font-size:10.0pt;font-family:"Courier New"'> </span><span
- lang=EN-GB style='font-size:10.0pt;font-family:"Courier New"'>&lt;objectId&gt;AMIV:Route:488959&lt;/objectId&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-GB
- style='font-size:10.0pt;font-family:"Courier New"'> &lt;name&gt;0140140120536&lt;/name&gt;</span></p>
- <p class=MsoNormal style='text-autospace:ideograph-numeric'><span lang=EN-GB
- style='font-size:10.0pt;font-family:"Courier New"'>...</span></p>
- </td>
- </tr>
- <tr style='page-break-inside:avoid'>
- <td width=108 colspan=2 valign=top style='width:81.35pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h2 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center;layout-grid-mode:char'><i><span lang=EN-GB
- style='font-size:14.0pt;color:navy'>Evaluation</span></i></h2>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- solid black 1.0pt;border-bottom:solid black 1.0pt;border-right:none;
- padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;layout-grid-mode:char'><span lang=EN-GB style='font-size:11.0pt'>N&deg; test</span></h1>
- </td>
- <td width=557 valign=top style='width:417.95pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;layout-grid-mode:char'><span style='font-size:
- 11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>2.9.1</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- solid black 1.0pt;border-bottom:solid black 1.0pt;border-right:none;
- padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;layout-grid-mode:char'><span style='font-size:11.0pt'>Libell&eacute;</span></h1>
- </td>
- <td width=557 valign=top style='width:417.95pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;layout-grid-mode:char'><span style='font-size:
- 11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>V&eacute;rifier la
- correcte r&eacute;f&eacute;rence &agrave; un Itin&eacute;raire/Chouette (&laquo;&nbsp;ChouetteRoute&nbsp;&raquo;)
- dans le cas d&rsquo;un Itin&eacute;raire de retour.</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- solid black 1.0pt;border-bottom:solid black 1.0pt;border-right:none;
- padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:-6.65pt;margin-bottom:6.0pt;
- margin-left:0cm;layout-grid-mode:char'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>Champ d&rsquo;application</span></h1>
- </td>
- <td width=557 valign=top style='width:417.95pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;layout-grid-mode:char'><span style='font-size:
- 11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>&lt;ChouetteRoute&gt;</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- solid black 1.0pt;border-bottom:solid black 1.0pt;border-right:none;
- padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;layout-grid-mode:char'><span style='font-size:11.0pt'>V&eacute;rification</span></h1>
- </td>
- <td width=557 valign=top style='width:417.95pt;border:solid black 1.0pt;
- border-top:none;padding:0cm 11.35pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='layout-grid-mode:char'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif";font-weight:normal'>&nbsp;</span></h1>
- <h1 style='layout-grid-mode:char'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif";font-weight:normal'>- Si l&rsquo;&eacute;l&eacute;ment d&rsquo;Itin&eacute;raire de
- retour &laquo;</span><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>wayBackRouteId&nbsp;&raquo;</span><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'>&nbsp;est pr&eacute;sent dans
- l&rsquo;objet &laquo;&nbsp;ChouetteRoute&nbsp;&raquo; alors poursuivre le test, sinon le test
- est abandonn&eacute;</span></h1>
- <h1 style='layout-grid-mode:char'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif";font-weight:normal'>&nbsp;</span></h1>
- <h1 style='layout-grid-mode:char'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif";font-weight:normal'>- Si l&nbsp;&eacute;l&eacute;ment d&rsquo;Itin&eacute;raire de
- retour &laquo;&nbsp;wayBackRouteId&nbsp;&raquo;, r&eacute;f&eacute;renc&eacute; dans un objet d&rsquo;Itin&eacute;raire
- &laquo;&nbsp;ChouetteRoute&nbsp;&raquo; poss&egrave;de un identifiant &laquo;&nbsp;ObjectId&nbsp;&raquo;
- dans un autre objet d&rsquo;Itin&eacute;raire &laquo;&nbsp;ChouetteRoute&nbsp;&raquo;, le test est
- valid&eacute;, sinon le test est invalid&eacute; et produit le message &laquo;&nbsp;test
- 2.9.1&nbsp;: un &eacute;l&eacute;ment d&rsquo;Itin&eacute;raire de retour &laquo;&nbsp;wayBackRouteId&nbsp;&raquo;
- dans un objet d&rsquo;Itin&eacute;raire &laquo;&nbsp;ChouetteRoute&nbsp;&raquo; n&rsquo;a pas d&rsquo;identifiant
- &laquo;&nbsp;ObjectId&nbsp;&raquo; dans un autre objet d&rsquo;Itin&eacute;raire
- &laquo;&nbsp;&nbsp;ChouetteRoute &raquo;.</span></h1>
- <h1 style='layout-grid-mode:char'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif";font-weight:normal'>&nbsp;</span></h1>
- </td>
- </tr>
-</table>
-
-
-</div>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si l&nbsp;élément d’Itinéraire de retour
+«&nbsp;wayBackRouteId&nbsp;», référencé dans un objet d’Itinéraire
+«&nbsp;ChouetteRoute&nbsp;» possède un identifiant
+«&nbsp;ObjectId&nbsp;» dans un autre objet d’Itinéraire
+«&nbsp;ChouetteRoute&nbsp;», le test est validé, sinon le test est
+invalidé et produit le message «&nbsp;test 2.9.1&nbsp;: un élément
+d’Itinéraire de retour «&nbsp;wayBackRouteId&nbsp;» dans un objet
+d’Itinéraire «&nbsp;ChouetteRoute&nbsp;» n’a pas d’identifiant
+«&nbsp;ObjectId&nbsp;» dans un autre objet d’Itinéraire
+«&nbsp;&nbsp;ChouetteRoute ».</font></font></font></p>
diff --git a/app/views/test_sheet/3_1.html b/app/views/test_sheet/3_1.html
index 7467796ea..40da276ab 100644
--- a/app/views/test_sheet/3_1.html
+++ b/app/views/test_sheet/3_1.html
@@ -1,244 +1,56 @@
-<div class=WordSection1>
-</span></i>
-
-<p class=MsoTitle><span style='font-size:14.0pt;font-family:"Tahoma","sans-serif"'>Fiche
-du point de contr&ocirc;le N&deg; 3.1</span></p>
-
-<p class=MsoNormal>&nbsp;</p>
-
-<table class=MsoNormalTable border=1 cellspacing=0 cellpadding=0 width=647
- style='width:485.45pt;border-collapse:collapse;border:none'>
- <tr style='page-break-inside:avoid'>
- <td width=647 colspan=2 valign=top style='width:485.45pt;border:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center'><i><span style='font-family:"Tahoma","sans-serif";
- color:navy'>Description</span></i></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>Intitul&eacute;</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt'><span style='font-size:11.0pt;
- line-height:200%;font-family:"Tahoma","sans-serif"'>Points d&rsquo;arr&ecirc;t de
- d&eacute;nomination diff&eacute;rente et tr&egrave;s proches</span></p>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>Objectif</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif";font-weight:normal'>Signaler la pr&eacute;sence de POINTs
- D&rsquo;ARR&Ecirc;T SUR PARCOURS (&laquo;&nbsp;StopPoint&nbsp;&raquo;) tr&egrave;s proches et de
- d&eacute;nomination diff&eacute;rente sur un m&ecirc;me r&eacute;seau.</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>R&eacute;f&eacute;rences</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif";font-weight:normal'>TRIDENT/profil CHOUETTE/Transmodel
- V4 et V5.1</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>N&deg; de fiche(s) connexe(s)</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='text-align:left'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'>&nbsp;</span></h1>
- <h1 align=left style='text-align:left'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'>&nbsp;</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt'><b><span style='font-family:
- "Tahoma","sans-serif"'>Priorit&eacute;<span style='color:red'> </span></span></b></p>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif";font-weight:normal'>Obligatoire</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt'><b><span style='font-family:
- "Tahoma","sans-serif"'>R&eacute;sultat</span></b></p>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif";font-weight:normal'>D&eacute;livrance d&rsquo;un avertissement de
- mise en garde sur des cons&eacute;quences &eacute;ventuelles de dysfonctionnement</span></h1>
- </td>
- </tr>
- <tr style='page-break-inside:avoid'>
- <td width=647 colspan=2 valign=top style='width:485.45pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center'><i><span style='font-family:"Tahoma","sans-serif";
- color:navy'>Mise en &oelig;uvre</span></i></h1>
- </td>
- </tr>
- <tr>
- <td width=100 style='width:74.85pt;border:solid windowtext 1.0pt;border-top:
- none;padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>Explication</span></h1>
- </td>
- <td width=547 style='width:410.6pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Chaque
- POINT D&rsquo;ARR&Ecirc;T SUR PARCOURS (&laquo;&nbsp;StopPoint&nbsp;&raquo;) est localis&eacute; gr&acirc;ce &agrave; ses
- coordonn&eacute;es en latitude et en longitude. La mise en &oelig;uvre de ce point de
- contr&ocirc;le consiste &agrave; v&eacute;rifier la pr&eacute;sence de POINT D&rsquo;ARR&Ecirc;T SUR PARCOURS
- proches et de d&eacute;nomination diff&eacute;rente. Pour cela un rayon de proximit&eacute; entre
- POINT D&rsquo;ARR&Ecirc;T SUR PARCOURS est &agrave; d&eacute;terminer.</span></p>
- </td>
- </tr>
-</table>
-
-<p class=MsoNormal>&nbsp;</p>
-
-<table class=MsoNormalTable border=1 cellspacing=0 cellpadding=0 width=628
- style='width:471.3pt;border-collapse:collapse;border:none'>
- <tr>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><b><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Exemple</span></b></p>
- </td>
- <td width=529 valign=top style='width:396.45pt;border:solid windowtext 1.0pt;
- border-left:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=left style='margin-left:18.0pt;text-align:left;text-indent:-18.0pt'><span
- style='font-size:11.0pt;font-weight:normal'>&nbsp;</span></h1>
- <p class=MsoNormal align=center style='text-align:center'><img width=450
- height=624 src="BATERI_Neptune_FINAL-V2_0a_fichiers/image017.jpg"></p>
- <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
- </td>
- </tr>
- <tr style='page-break-inside:avoid'>
- <td width=628 colspan=2 valign=top style='width:471.3pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h2 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center'><i><span lang=EN-US style='font-size:14.0pt;
- color:navy'>Evaluation</span></i></h2>
- </td>
- </tr>
- <tr>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span lang=EN-US style='font-size:11.0pt'>N&deg; test</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>Test
- 3.1.1</span></p>
- </td>
- </tr>
- <tr>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt'>Libell&eacute;</span></h1>
- </td>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>V&eacute;rifier
- que 2 POINTs D&rsquo;ARR&Ecirc;T SUR PARCOURS (&laquo;&nbsp;StopPoint&nbsp;&raquo;) tr&egrave;s proches
- porte le m&ecirc;me nom/m&ecirc;me adresse</span></p>
- </td>
- </tr>
- <tr>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt'>Champ d&rsquo;application</span></h1>
- </td>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>&lt;StopPoint&gt;</span></p>
- </td>
- </tr>
- <tr>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt'>V&eacute;rification</span></h1>
- </td>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>-
- Si l&rsquo;&eacute;l&eacute;ment &laquo;&nbsp;StopPoint&nbsp;&raquo; mentionn&eacute; dans les champs d&rsquo;application
- est pr&eacute;sent une ou plusieurs fois, poursuivre le test, sinon le test est
- abandonn&eacute;.</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>-
- Si pour chaque &eacute;l&eacute;ment &laquo;&nbsp;StopPoint&nbsp;&raquo;, la distance spatiale calcul&eacute;e
- &agrave; partir de la valeur de l&rsquo;attribut des &eacute;l&eacute;ments &laquo;&nbsp;longitude&nbsp;&raquo;,
- &laquo;&nbsp;latitude&nbsp;&raquo; et &laquo;&nbsp;longLatType&nbsp;&raquo; entre lui et tous les
- autres objets &laquo;&nbsp;stopPoint&nbsp;&raquo; est inf&eacute;rieure &agrave; une valeur
- param&eacute;trable XX alors v&eacute;rifier que la valeur de l&rsquo;attribut de l&rsquo;&eacute;l&eacute;ment
- &laquo;&nbsp;name&nbsp;&raquo; de ces deux objets &laquo;&nbsp;StopPoint&nbsp;&raquo; est identique.
- Si elle est diff&eacute;rente, le test fournit le message d&rsquo;avertissement&nbsp;:
- &laquo;&nbsp;test 3.1.1&nbsp;: deux points d&rsquo;arr&ecirc;t s&eacute;par&eacute;s par une distance
- inf&eacute;rieure &agrave; une valeur param&eacute;trable XX ne portent pas le m&ecirc;me nom&nbsp;&raquo;. </span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal style='margin-bottom:6.0pt'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>- Sinon le test est valid&eacute;</span></p>
- </td>
- </tr>
-</table>
-
-<h1><i><span style='font-size:11.0pt'>&nbsp;</span></i></h1>
-
-</div>
-
+<h1 class="western" style="border: 1pt solid rgb(0, 0, 0); padding: 0.05cm 0.12cm; margin-top: 0.21cm;" align="center">
+<font face="Arial, sans-serif"><font style="font-size: 20pt;" size="5"><i>
+ point de contrôle N° 3.1<br>
+Points d’arrêt de dénomination différente et très proches<br>
+</i></font></font></h1>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Objectif: </b></u>
+Signaler la présence de POINTs D’ARRÊT SUR PARCOURS
+(«&nbsp;StopPoint&nbsp;») très proches et de dénomination différente
+sur un même réseau.<br>
+</font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Priorité: </b></u> Obligatoire</font></p><font face="Arial, sans-serif">
+</font><p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><u><b>Explications:</b></u>
+</font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Chaque POINT D’ARRÊT SUR PARCOURS («&nbsp;StopPoint&nbsp;») est
+localisé grâce à ses coordonnées en latitude et en longitude. La mise
+en œuvre de ce point de contrôle consiste à vérifier la présence de
+POINT D’ARRÊT SUR PARCOURS proches et de dénomination différente. Pour
+cela un rayon de proximité entre POINT D’ARRÊT SUR PARCOURS est à
+déterminer.</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>Exemple: </u></b></font></font></font></p>
+<p><font face="Arial, sans-serif"><img src="image017.jpg" height="624" width="450"></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>N° test:</u></b>
+Test 3.1.1</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Libellé:</u>
+Vérifier que 2 POINTs D’ARRÊT SUR PARCOURS («&nbsp;StopPoint&nbsp;») très proches porte le même nom/même adresse</font></font></font></p>
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2"><span style="text-decoration: underline;">
+Champ d’application:</span> &lt;StopPoint&gt;&nbsp;</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Vérification:</u> </font></font></font></p>
+
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si l’élément «&nbsp;StopPoint&nbsp;» mentionné dans les champs
+d’application est présent une ou plusieurs fois, poursuivre le test,
+sinon le test est abandonné.</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si pour chaque élément «&nbsp;StopPoint&nbsp;», la distance spatiale
+calculée à partir de la valeur de l’attribut des éléments
+«&nbsp;longitude&nbsp;», «&nbsp;latitude&nbsp;» et
+«&nbsp;longLatType&nbsp;» entre lui et tous les autres objets
+«&nbsp;stopPoint&nbsp;» est inférieure à une valeur paramétrable XX
+alors vérifier que la valeur de l’attribut de l’élément
+«&nbsp;name&nbsp;» de ces deux objets «&nbsp;StopPoint&nbsp;» est
+identique. Si elle est différente, le test fournit le message
+d’avertissement&nbsp;: «&nbsp;test 3.1.1&nbsp;: deux points d’arrêt
+séparés par une distance inférieure à une valeur paramétrable XX ne
+portent pas le même nom&nbsp;».</font></font></font></p>
+
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Sinon le test est validé<br>&nbsp;</font></font></font></p>
diff --git a/app/views/test_sheet/3_10.html b/app/views/test_sheet/3_10.html
index 22180a1aa..d3d8fd179 100644
--- a/app/views/test_sheet/3_10.html
+++ b/app/views/test_sheet/3_10.html
@@ -1,432 +1,126 @@
-<div class=WordSection1>
-</span></b>
+<h1 class="western" style="border: 1pt solid rgb(0, 0, 0); padding: 0.05cm 0.12cm; margin-top: 0.21cm;" align="center">
+<font face="Arial, sans-serif"><font style="font-size: 20pt;" size="5"><i>
+ point de contrôle N° 3.10<br>
+Détection des boucles <br>
+</i></font></font></h1>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Objectif: </b></u>
+Vérifier si chaque Itinéraire/Chouette («&nbsp;ChouetteRoute&nbsp;») contient des boucles.<br>
+</font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Priorité: </b></u> Obligatoire</font></p><font face="Arial, sans-serif">
+</font><p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><u><b>Explications:</b></u>
+</font></font></p>
-<p class=MsoTitle><span style='font-size:14.0pt;font-family:"Tahoma","sans-serif"'>Fiche
-du point de contr&ocirc;le N&deg; 3.10</span></p>
-<p class=MsoNormal>&nbsp;</p>
-<table class=MsoNormalTable border=1 cellspacing=0 cellpadding=0 width=647
- style='width:485.45pt;border-collapse:collapse;border:none'>
- <tr style='page-break-inside:avoid'>
- <td width=647 colspan=2 valign=top style='width:485.45pt;border:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center'><i><span style='color:navy'>Description</span></i></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>Intitul&eacute;</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt'><span style='font-size:11.0pt;
- line-height:200%;font-family:"Tahoma","sans-serif"'>D&eacute;tection des boucles </span></p>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>Objectif</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif";font-weight:normal'>V&eacute;rifier </span><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>si
- chaque Itin&eacute;raire/Chouette (&laquo;&nbsp;ChouetteRoute&nbsp;&raquo;) contient des boucles.</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>R&eacute;f&eacute;rences</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif";font-weight:normal'>TRIDENT/profil CHOUETTE/Transmodel
- V4 et V5.1</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>N&deg; de fiche(s) connexe(s)</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='text-align:left'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'>&nbsp;</span></h1>
- <h1 align=left style='text-align:left'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'>&nbsp;</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt'><b><span style='font-family:
- "Tahoma","sans-serif"'>Priorit&eacute;<span style='color:red'> </span></span></b></p>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif";font-weight:normal'>Obligatoire</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt'><b><span style='font-family:
- "Tahoma","sans-serif"'>R&eacute;sultat</span></b></p>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif";font-weight:normal'>D&eacute;livrance d&rsquo;un avertissement de
- mise en garde sur des cons&eacute;quences &eacute;ventuelles de dysfonctionnement</span></h1>
- </td>
- </tr>
- <tr style='page-break-inside:avoid'>
- <td width=647 colspan=2 valign=top style='width:485.45pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center'><i><span style='color:navy'>Mise en &oelig;uvre</span></i></h1>
- </td>
- </tr>
- <tr>
- <td width=100 style='width:74.85pt;border:solid windowtext 1.0pt;border-top:
- none;padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>Explication</span></h1>
- </td>
- <td width=547 style='width:410.6pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>Dans
- le cas d&rsquo;une boucle, l&rsquo;Itin&eacute;raire/Chouette</span><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'> (&laquo;&nbsp;ChouetteRoute&nbsp;&raquo;)</span><b><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'> </span></b><span
- style='font-size:11.0pt;font-family:"Arial","sans-serif"'> comporte une
- intersection avec lui-m&ecirc;me. Toutefois, &agrave; l&rsquo;endroit de l&rsquo;intersection, un
- POINT D&rsquo;ARR&Ecirc;T SUR PARCOURS (&laquo;&nbsp;StopPoint&nbsp;&raquo;) suppl&eacute;mentaire doit &ecirc;tre
- cr&eacute;&eacute;. </span></p>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm;text-align:justify'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>Il faut donc v&eacute;rifier, &agrave; l&rsquo;intersection,
- que le POINT D&rsquo;ARR&Ecirc;T SUR PARCOURS (&laquo;&nbsp;StopPoint&nbsp;&raquo;) du premier
- passage et POINT D&rsquo;ARR&Ecirc;T SUR PARCOURS (&laquo;&nbsp;StopPoint&nbsp;&raquo;) qui assure
- l&rsquo;intersection se trouvent au m&ecirc;me emplacement. Dans ce type d&rsquo;</span><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Itin&eacute;raire/Chouette
- (&laquo;&nbsp;ChouetteRoute&nbsp;&raquo;)</span><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>, il y a au moins deux POINTs D&rsquo;ARR&Ecirc;T SUR PARCOURS qui
- ont (ou pratiquement &ndash; la fourchette reste &agrave; d&eacute;finir) les m&ecirc;mes coordonn&eacute;es.</span></p>
- </td>
- </tr>
-</table>
-<p class=MsoNormal>&nbsp;</p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Dans le cas d’une boucle, l’Itinéraire/Chouette &nbsp;(«&nbsp;ChouetteRoute&nbsp;»)&nbsp;comporte
+une intersection avec lui-même. Toutefois, à l’endroit de
+l’intersection, un POINT D’ARRÊT SUR PARCOURS («&nbsp;StopPoint&nbsp;»)
+supplémentaire doit être créé.</font></font></font></p>
-<table class=MsoNormalTable border=1 cellspacing=0 cellpadding=0 width=657
- style='width:492.55pt;border-collapse:collapse;border:none'>
- <tr>
- <td width=115 valign=top style='width:86.0pt;border:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><b><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Exemple</span></b></p>
- </td>
- <td width=542 valign=top style='width:406.55pt;border:solid windowtext 1.0pt;
- border-left:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=left style='margin-left:18.0pt;text-align:left;text-indent:-18.0pt'><span
- style='font-size:11.0pt;font-weight:normal'>&nbsp;</span></h1>
- <p class=MsoNormal align=center style='text-align:center'><img width=450
- height=624 src="BATERI_Neptune_FINAL-V2_0a_fichiers/image017.jpg"></p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal align=center style='text-align:center'><img width=302
- height=306 src="BATERI_Neptune_FINAL-V2_0a_fichiers/image022.jpg"></p>
- <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
- <p class=MsoNormal align=center style='text-align:center'><img width=402
- height=502 src="BATERI_Neptune_FINAL-V2_0a_fichiers/image023.jpg"></p>
- </td>
- </tr>
- <tr style='page-break-inside:avoid'>
- <td width=657 colspan=2 valign=top style='width:492.55pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h2 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center'><i><span lang=EN-US style='font-size:14.0pt;
- color:navy'>Evaluation</span></i></h2>
- </td>
- </tr>
- <tr>
- <td width=115 valign=top style='width:86.0pt;border:solid windowtext 1.0pt;
- border-top:none;padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span lang=EN-US style='font-size:11.0pt'>N&deg; test</span></h1>
- </td>
- <td width=542 style='width:406.55pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>Test
- 3.10.1</span></p>
- </td>
- </tr>
- <tr>
- <td width=115 valign=top style='width:86.0pt;border:solid windowtext 1.0pt;
- border-top:none;padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt'>Libell&eacute;</span></h1>
- </td>
- <td width=542 valign=top style='width:406.55pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>V&eacute;rification
- de l&rsquo;utilisation unique dans un Itin&eacute;raire</span><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>/Chouette</span><span style='font-size:
- 11.0pt;font-family:"Tahoma","sans-serif"'> (&laquo;&nbsp;ChouetteRoute&nbsp;&raquo;) d&rsquo;un
- POINT D&rsquo;ARR&Ecirc;T SUR PARCOURS (&laquo;&nbsp;StopPoint&nbsp;&raquo;)</span></p>
- </td>
- </tr>
- <tr>
- <td width=115 valign=top style='width:86.0pt;border:solid windowtext 1.0pt;
- border-top:none;padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span lang=EN-US style='font-size:11.0pt'>Champ d&rsquo;application</span></h1>
- </td>
- <td width=542 valign=top style='width:406.55pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><span lang=EN-US style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>&lt;StopPoint&gt;</span></p>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><span lang=EN-US style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>&lt;PtLink&gt;</span></p>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>&lt;ChouetteRoute&gt;</span></p>
- </td>
- </tr>
- <tr>
- <td width=115 valign=top style='width:86.0pt;border:solid windowtext 1.0pt;
- border-top:none;padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt'>V&eacute;rification</span></h1>
- </td>
- <td width=542 valign=top style='width:406.55pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal style='text-align:justify'><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'>- Si l&rsquo;&eacute;l&eacute;ment &laquo;&nbsp;StopPoint&nbsp;&raquo;
- mentionn&eacute; dans les champs d&rsquo;application est pr&eacute;sent une ou plusieurs fois,
- poursuivre le test, sinon le test est abandonn&eacute; </span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal style='text-align:justify'><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'>- Si l&rsquo;identifiant du point d&rsquo;arr&ecirc;t
- d&eacute;tect&eacute;, figure dans un ou deux tron&ccedil;ons &laquo;&nbsp;PtLink&nbsp;&raquo;, poursuivre le
- test, sinon le test est invalid&eacute; et fournit le message&nbsp;: &laquo;&nbsp;test
- 3.10.1a&nbsp;: le point d&rsquo;arr&ecirc;t d&rsquo;identifiant &laquo;&nbsp;ObjectId&nbsp;&raquo; est d&eacute;fini
- de mani&egrave;re unique et ne retrouve pas dans au moins deux tron&ccedil;ons&raquo;.</span></p>
- <p class=MsoNormal style='text-align:justify'><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal style='text-align:justify'><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'>- Si le ou les identifiants de tron&ccedil;ons
- identifi&eacute;s pr&eacute;c&eacute;demment sont r&eacute;f&eacute;renc&eacute;s dans un m&ecirc;me &eacute;l&eacute;ment
- &laquo;&nbsp;chouetteRoute&nbsp;&raquo; alors le test est valid&eacute;, sinon le test est
- invalid&eacute; et fournit le message&nbsp;; &laquo;&nbsp;test 3.10.1b&nbsp;: les
- identifiants de tron&ccedil;on identifi&eacute;s dans le 3.10.1a ne sont pas pr&eacute;sents dans
- un m&ecirc;me itin&eacute;raire&nbsp;&raquo;.</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>&nbsp;</span></p>
- </td>
- </tr>
- <tr>
- <td width=115 valign=top style='width:86.0pt;border:solid windowtext 1.0pt;
- border-top:none;padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1><span style='font-size:11.0pt;font-weight:normal'>&nbsp;</span></h1>
- </td>
- <td width=542 valign=top style='width:406.55pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <p class=MsoNormal><b><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&nbsp;</span></b></p>
- </td>
- </tr>
- <tr>
- <td width=115 valign=top style='width:86.0pt;border:solid windowtext 1.0pt;
- border-top:none;padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span lang=EN-US style='font-size:11.0pt'>N&deg; test</span></h1>
- </td>
- <td width=542 style='width:406.55pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <p class=MsoNormal><span lang=EN-US style='font-size:11.0pt;font-family:"Arial","sans-serif"'>Test
- 3.10.2</span></p>
- </td>
- </tr>
- <tr>
- <td width=115 valign=top style='width:86.0pt;border:solid windowtext 1.0pt;
- border-top:none;padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt'>Libell&eacute;</span></h1>
- </td>
- <td width=542 valign=top style='width:406.55pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <p class=MsoNormal style='margin-top:6.0pt'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>V&eacute;rification de boucle dans un itin&eacute;raire</span><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>/Chouette</span></p>
- </td>
- </tr>
- <tr>
- <td width=115 valign=top style='width:86.0pt;border:solid windowtext 1.0pt;
- border-top:none;padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span lang=EN-US style='font-size:11.0pt'>Champ d&rsquo;application</span></h1>
- </td>
- <td width=542 valign=top style='width:406.55pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><span lang=EN-US style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>&lt;StopPoint&gt;</span></p>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><span lang=EN-US style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>&lt;PtLink&gt;</span></p>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>&lt;ChouetteRoute&gt;</span></p>
- </td>
- </tr>
- <tr>
- <td width=115 valign=top style='width:86.0pt;border:solid windowtext 1.0pt;
- border-top:none;padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt'>V&eacute;rification</span></h1>
- </td>
- <td width=542 valign=top style='width:406.55pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>-
- Si l&rsquo;&eacute;l&eacute;ment &laquo;&nbsp;ChouetteRoute&nbsp;&raquo; mentionn&eacute; dans les champs
- d&rsquo;application est pr&eacute;sent une ou plusieurs fois, poursuivre le test, sinon le
- test est abandonn&eacute;.</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal style='text-align:justify'><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'>- Si pour l&rsquo;&eacute;l&eacute;ment
- &laquo;&nbsp;chouetteRoute&nbsp;&raquo;, la liste des tron&ccedil;ons &laquo;&nbsp;PtLink&nbsp;&raquo;
- utilise des points d&rsquo;arr&ecirc;t &laquo;&nbsp;StopPoint&nbsp;&raquo; ayant la m&ecirc;me valeur
- d&rsquo;attribut que l&rsquo;&eacute;l&eacute;ment &laquo;&nbsp;containedIn&nbsp;&raquo; alors le test fournit le
- message d&rsquo;avertissement&nbsp;: &laquo;&nbsp; test 3.10.2&nbsp;: des tron&ccedil;ons
- &laquo;&nbsp;PtLink&nbsp;&raquo; utilisent des points d&rsquo;arr&ecirc;t &laquo;&nbsp;StopPoint&nbsp;&raquo;
- ayant la m&ecirc;me valeur d&rsquo;attribut que l&rsquo;&eacute;l&eacute;ment
- &laquo;&nbsp;containedIn&nbsp;&raquo;&nbsp;&raquo;.</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>-
- Sinon le test est valid&eacute;</span></p>
- </td>
- </tr>
- <tr>
- <td width=115 valign=top style='width:86.0pt;border:solid windowtext 1.0pt;
- border-top:none;padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span lang=EN-US style='font-size:11.0pt'>N&deg; test</span></h1>
- </td>
- <td width=542 style='width:406.55pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <p class=MsoNormal><span lang=EN-US style='font-size:11.0pt;font-family:"Arial","sans-serif"'>Test
- 3.10.3</span></p>
- </td>
- </tr>
- <tr>
- <td width=115 valign=top style='width:86.0pt;border:solid windowtext 1.0pt;
- border-top:none;padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt'>Libell&eacute;</span></h1>
- </td>
- <td width=542 valign=top style='width:406.55pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>V&eacute;rification
- de la distance entre points d&rsquo;arr&ecirc;t d&rsquo;un m&ecirc;me itin&eacute;raire</span><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>/Chouette</span></p>
- </td>
- </tr>
- <tr>
- <td width=115 valign=top style='width:86.0pt;border:solid windowtext 1.0pt;
- border-top:none;padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span lang=EN-US style='font-size:11.0pt'>Champ d&rsquo;application</span></h1>
- </td>
- <td width=542 valign=top style='width:406.55pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><span lang=EN-US style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>&lt;StopPoint&gt;</span></p>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><span lang=EN-US style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>&lt;PtLink&gt;</span></p>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>&lt;ChouetteRoute&gt;</span></p>
- </td>
- </tr>
- <tr>
- <td width=115 valign=top style='width:86.0pt;border:solid windowtext 1.0pt;
- border-top:none;padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt'>V&eacute;rification</span></h1>
- </td>
- <td width=542 valign=top style='width:406.55pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>-
- Si l&rsquo;&eacute;l&eacute;ment &laquo;&nbsp;chouetteRoute&nbsp;&raquo; mentionn&eacute; dans les champs
- d&rsquo;application est pr&eacute;sent une ou plusieurs fois, poursuivre le test, sinon le
- test est abandonn&eacute;.</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>-
- Si pour l&rsquo;objet &laquo;&nbsp;chouetteRoute&nbsp;&raquo;, la liste des tron&ccedil;ons
- &laquo;&nbsp;PtLink&nbsp;&raquo; utilise des points d&rsquo;arr&ecirc;t &laquo;&nbsp;StopPoint&nbsp;&raquo;
- proches entre eux (la distance spatiale entre point d&rsquo;arr&ecirc;t &agrave; partir des
- valeurs des attributs des &eacute;l&eacute;ments &laquo;&nbsp;longitude&nbsp;&raquo;, &laquo;&nbsp;latitude&raquo;
- et &laquo;&nbsp;lonLatType&nbsp;&raquo; inf&eacute;rieure &agrave; XX) alors le test fournit le message
- d&rsquo;avertissement &laquo;&nbsp;des points d&rsquo;arr&ecirc;t &laquo;&nbsp;StopPoint&nbsp;&raquo;, utilis&eacute;s
- par des tron&ccedil;ons d&rsquo;itin&eacute;raire, sont proches les uns des autres d&rsquo;une distance
- inf&eacute;rieure &agrave; une valeur param&eacute;trable XX&nbsp;&raquo;.</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>-
- Sinon le test est valid&eacute;</span></p>
- </td>
- </tr>
-</table>
-<p class=MsoNormal>&nbsp;</p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Il faut donc vérifier, à l’intersection, que le POINT D’ARRÊT SUR
+PARCOURS («&nbsp;StopPoint&nbsp;») du premier passage et POINT D’ARRÊT
+SUR PARCOURS («&nbsp;StopPoint&nbsp;») qui assure l’intersection se
+trouvent au même emplacement. Dans ce type d’&nbsp;Itinéraire/Chouette («&nbsp;ChouetteRoute&nbsp;»),
+il y a au moins deux POINTs D’ARRÊT SUR PARCOURS qui ont (ou
+pratiquement – la fourchette reste à définir) les mêmes coordonnées.</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>Exemple: </u></b></font></font></font></p>
+<p><font face="Arial, sans-serif"><img src="image017.jpg" height="624" width="450"></font></p>
+<p><font face="Arial, sans-serif"><img src="image022.jpg" height="306" width="302"></font></p>
+<p><font face="Arial, sans-serif"><img src="image023.jpg" height="502" width="402"></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>N° test:</u></b>
+Test 3.10.1</font></font></font></p>
-</div>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Libellé:</u>
+Vérification de l’utilisation unique dans un Itinéraire /Chouette&nbsp;(«&nbsp;ChouetteRoute&nbsp;») d’un POINT D’ARRÊT SUR PARCOURS («&nbsp;StopPoint&nbsp;»)</font></font></font></p>
+
+
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2"><span style="text-decoration: underline;">
+Champ d’application:</span>&nbsp;&lt;StopPoint&gt;&nbsp;&lt;PtLink&gt;&nbsp;&lt;ChouetteRoute&gt;</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Vérification:</u> </font></font></font></p>
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si l’élément «&nbsp;StopPoint&nbsp;» mentionné dans les champs
+d’application est présent une ou plusieurs fois, poursuivre le test,
+sinon le test est abandonné</font></font></font></p>
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si l’identifiant du point d’arrêt détecté, figure dans un ou deux
+tronçons «&nbsp;PtLink&nbsp;», poursuivre le test, sinon le test est
+invalidé et fournit le message&nbsp;: «&nbsp;test 3.10.1a&nbsp;: le
+point d’arrêt d’identifiant «&nbsp;ObjectId&nbsp;» est défini de
+manière unique et ne retrouve pas dans au moins deux tronçons».</font></font></font></p>
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si le ou les identifiants de tronçons identifiés précédemment sont
+référencés dans un même élément «&nbsp;chouetteRoute&nbsp;» alors le
+test est validé, sinon le test est invalidé et fournit le
+message&nbsp;; «&nbsp;test 3.10.1b&nbsp;: les identifiants de tronçon
+identifiés dans le 3.10.1a ne sont pas présents dans un même
+itinéraire&nbsp;».</font></font></font></p><p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>N° test:</u></b>
+Test 3.10.2</font></font></font></p>
+
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Libellé:</u>
+Vérification de boucle dans un itinéraire&nbsp;/Chouette&nbsp;</font></font></font></p>
+
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2"><span style="text-decoration: underline;">Champ d’application:</span>&nbsp;&lt;StopPoint&gt;&nbsp;&lt;PtLink&gt;&nbsp;&lt;ChouetteRoute&gt;</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Vérification:</u> </font></font></font></p>
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si l’élément «&nbsp;ChouetteRoute&nbsp;» mentionné dans les champs
+d’application est présent une ou plusieurs fois, poursuivre le test,
+sinon le test est abandonné.</font></font></font></p><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">-
+Si pour l’élément «&nbsp;chouetteRoute&nbsp;», la liste des tronçons
+«&nbsp;PtLink&nbsp;» utilise des points d’arrêt «&nbsp;StopPoint&nbsp;»
+ayant la même valeur d’attribut que l’élément «&nbsp;containedIn&nbsp;»
+alors le test fournit le message d’avertissement&nbsp;: «&nbsp; test
+3.10.2&nbsp;: des tronçons «&nbsp;PtLink&nbsp;» utilisent des points
+d’arrêt «&nbsp;StopPoint&nbsp;» ayant la même valeur d’attribut que
+l’élément «&nbsp;containedIn&nbsp;»&nbsp;».</font></font></font><br><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">- Sinon le test est validé</font></font></font>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>N° test:</u></b>
+Test 3.10.3</font></font></font></p>
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Libellé:</u>
+Vérification de la distance entre points d’arrêt d’un même itinéraire&nbsp;/Chouette</font></font></font></p>
+
+
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2"><span style="text-decoration: underline;">
+Champ d’application:</span>&nbsp;&lt;StopPoint&gt;&nbsp;&lt;PtLink&gt;&nbsp;&lt;ChouetteRoute&gt;</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Vérification:</u> </font></font></font></p>
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si l’élément «&nbsp;chouetteRoute&nbsp;» mentionné dans les champs
+d’application est présent une ou plusieurs fois, poursuivre le test,
+sinon le test est abandonné.</font></font></font></p>
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si pour l’objet «&nbsp;chouetteRoute&nbsp;», la liste des tronçons
+«&nbsp;PtLink&nbsp;» utilise des points d’arrêt «&nbsp;StopPoint&nbsp;»
+proches entre eux (la distance spatiale entre point d’arrêt à partir
+des valeurs des attributs des éléments «&nbsp;longitude&nbsp;»,
+«&nbsp;latitude» et «&nbsp;lonLatType&nbsp;» inférieure à XX) alors le
+test fournit le message d’avertissement «&nbsp;des points d’arrêt
+«&nbsp;StopPoint&nbsp;», utilisés par des tronçons d’itinéraire, sont
+proches les uns des autres d’une distance inférieure à une valeur
+paramétrable XX&nbsp;».</font></font></font></p>
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Sinon le test est validé</font></font></font></p>
diff --git a/app/views/test_sheet/3_11.html b/app/views/test_sheet/3_11.html
index 56d5e2ef6..ee8e2b5b1 100644
--- a/app/views/test_sheet/3_11.html
+++ b/app/views/test_sheet/3_11.html
@@ -1,257 +1,61 @@
-<div class=WordSection1>
-</span></b>
-
-<p class=MsoTitle><span style='font-size:14.0pt;font-family:"Tahoma","sans-serif"'>Fiche
-du point de contr&ocirc;le N&deg; 3.11</span></p>
-
-<p class=MsoNormal>&nbsp;</p>
-
-<table class=MsoNormalTable border=1 cellspacing=0 cellpadding=0 width=647
- style='width:485.45pt;border-collapse:collapse;border:none'>
- <tr style='page-break-inside:avoid'>
- <td width=647 colspan=2 valign=top style='width:485.45pt;border:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center'><i><span style='color:navy'>Description</span></i></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>Intitul&eacute;</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt'><span style='font-size:11.0pt;
- line-height:200%;font-family:"Tahoma","sans-serif"'>D&eacute;tection des retours en
- arri&egrave;re </span></p>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>Objectif</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif";font-weight:normal'>Signaler que sur un
- Itin&eacute;raire/Chouette (&laquo;&nbsp;ChouetteRoute&nbsp;&raquo;) le ou les MISSIONs
- COMMERCIALEs (&laquo;&nbsp;JourneyPattern&nbsp;&raquo;) comportent des retours en arri&egrave;re</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>R&eacute;f&eacute;rences</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif";font-weight:normal'>TRIDENT/profil CHOUETTE/Transmodel
- V4 et V5.1</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>N&deg; de fiche(s) connexe(s)</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='text-align:left'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'>&nbsp;</span></h1>
- <h1 align=left style='text-align:left'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'>&nbsp;</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt'><b><span style='font-family:
- "Tahoma","sans-serif"'>Priorit&eacute;<span style='color:red'> </span></span></b></p>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif";font-weight:normal'>Obligatoire</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt'><b><span style='font-family:
- "Tahoma","sans-serif"'>R&eacute;sultat</span></b></p>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif";font-weight:normal'>D&eacute;livrance d&rsquo;un avertissement de
- mise en garde sur des cons&eacute;quences &eacute;ventuelles de dysfonctionnement</span></h1>
- </td>
- </tr>
- <tr style='page-break-inside:avoid'>
- <td width=647 colspan=2 valign=top style='width:485.45pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center'><i><span style='color:navy'>Mise en &oelig;uvre</span></i></h1>
- </td>
- </tr>
- <tr>
- <td width=100 style='width:74.85pt;border:solid windowtext 1.0pt;border-top:
- none;padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>Explication</span></h1>
- </td>
- <td width=547 style='width:410.6pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <p class=MsoBodyText>Une MISSION COMMERCIALE (&laquo;&nbsp;JourneyPattern&nbsp;&raquo;)
- comporte une liste de POINTs D&rsquo;ARR&Ecirc;T SUR PARCOURS (&laquo;&nbsp;StopPoint&nbsp;&raquo;)
- ordonn&eacute;s, d&eacute;crivant le plan de d&eacute;placement pour les v&eacute;hicules de transport
- public. Une MISSION COMMERCIALE (&laquo;&nbsp;JourneyPattern&nbsp;&raquo;) peut passer
- par un POINT D&rsquo;ARR&Ecirc;T SUR PARCOURS (&laquo;&nbsp;StopPoint&nbsp;&raquo;) plus d&rsquo;une fois.
- Un retour en arri&egrave;re consiste donc &agrave; repasser sur des POINTs D&rsquo;ARR&Ecirc;T SUR
- PARCOURS (&laquo;&nbsp;StopPoint&nbsp;&raquo;) d&eacute;j&agrave; utilis&eacute;s. </p>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>On
- peut donc signaler les MISSIONs COMMERCIALEs qui comportent des POINTs
- D&rsquo;ARR&Ecirc;T SUR PARCOURS utilis&eacute;s au moins deux fois (POINTs D&rsquo;ARR&Ecirc;T SUR PARCOURS
- dont les identifiants sont identiques).</span></p>
- </td>
- </tr>
-</table>
-
-<p class=MsoNormal>&nbsp;</p>
-
-<table class=MsoNormalTable border=1 cellspacing=0 cellpadding=0 width=638
- style='width:478.4pt;border-collapse:collapse;border:none'>
- <tr>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><b><span lang=EN-US style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>Exemple</span></b></p>
- </td>
- <td width=538 valign=top style='width:403.55pt;border:solid windowtext 1.0pt;
- border-left:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 style='margin-left:18.0pt;text-indent:-18.0pt'><span lang=EN-US
- style='font-size:11.0pt;font-weight:normal'><img width=302 height=306
- src="BATERI_Neptune_FINAL-V2_0a_fichiers/image022.jpg"></span></h1>
- <p class=MsoNormal><span lang=EN-US>&nbsp;</span></p>
- <h1><span lang=EN-US><img width=402 height=502
- src="BATERI_Neptune_FINAL-V2_0a_fichiers/image023.jpg"></span></h1>
- </td>
- </tr>
- <tr style='page-break-inside:avoid'>
- <td width=638 colspan=2 valign=top style='width:478.4pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h2 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center'><i><span lang=EN-US style='font-size:14.0pt;
- color:navy'>Evaluation</span></i></h2>
- </td>
- </tr>
- <tr>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- border-top:none;padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span lang=EN-US style='font-size:11.0pt'>N&deg; test</span></h1>
- </td>
- <td width=538 style='width:403.55pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <p class=MsoNormal style='text-align:justify'><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'>Test 3.11.1</span></p>
- </td>
- </tr>
- <tr>
- <td width=100 valign=top style='width:74.85pt;border:solid windowtext 1.0pt;
- border-top:none;padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt'>Libell&eacute;</span></h1>
- </td>
- <td width=538 style='width:403.55pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <p class=MsoNormal style='text-align:justify'><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'>V&eacute;rification de l&rsquo;utilisation r&eacute;p&eacute;titive de</span><span
- style='font-size:11.0pt;font-family:"Arial","sans-serif"'> POINTs D&rsquo;ARR&Ecirc;T SUR
- PARCOURS</span><span style='font-family:"Tahoma","sans-serif"'> </span><span
- style='font-size:11.0pt;font-family:"Arial","sans-serif"'> d&rsquo;un Itin&eacute;raire</span><span
- style='font-size:11.0pt;font-family:"Arial","sans-serif"'>/Chouette</span><span
- style='font-size:11.0pt;font-family:"Arial","sans-serif"'>
- (&laquo;&nbsp;ChouetteRoute&nbsp;&raquo;)</span></p>
- </td>
- </tr>
- <tr>
- <td width=100 valign=top style='width:74.85pt;border:solid windowtext 1.0pt;
- border-top:none;padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt'>Champ d&rsquo;application</span></h1>
- </td>
- <td width=538 valign=top style='width:403.55pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm;text-align:justify'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>&lt;PtLink&gt;</span></p>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm;text-align:justify'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>&lt;ChouetteRoute&gt;</span></p>
- </td>
- </tr>
- <tr>
- <td width=100 valign=top style='width:74.85pt;border:solid windowtext 1.0pt;
- border-top:none;padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt'>V&eacute;rification</span></h1>
- </td>
- <td width=538 valign=top style='width:403.55pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <p class=MsoNormal style='text-align:justify'><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal style='text-align:justify'><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'>- Si l&rsquo;&eacute;l&eacute;ment &laquo;&nbsp;ChouetteRoute&nbsp;&raquo;
- mentionn&eacute; dans les champs d&rsquo;application est pr&eacute;sent une ou plusieurs fois,
- poursuivre le test, sinon le test est abandonn&eacute;.</span></p>
- <p class=MsoNormal style='text-align:justify'><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal style='text-align:justify'><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'>- Si pour l&rsquo;objet
- &laquo;&nbsp;ChouetteRoute&nbsp;&raquo;, la liste des tron&ccedil;ons &laquo;&nbsp;PtLink&nbsp;&raquo;
- utilise des points d&rsquo;arr&ecirc;t &laquo;&nbsp;StopPoint&nbsp;&raquo; identiques plus de deux
- fois alors le test fournit le message d&rsquo;avertissement &laquo;&nbsp;test
- 3.11.1&nbsp;: les tron&ccedil;ons &laquo;&nbsp;PtLink&nbsp;&raquo; d&rsquo;un itin&eacute;raire utilisent des
- points d&rsquo;arr&ecirc;t &laquo;&nbsp;StopPoint&nbsp;&raquo; identiques plus de deux fois&nbsp;&raquo;.</span></p>
- <p class=MsoNormal style='text-align:justify'><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal style='text-align:justify'><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'>- Sinon le test est valid&eacute;</span></p>
- </td>
- </tr>
-</table>
-
-<p class=MsoNormal>&nbsp;</p>
-
-</div>
-
+<h1 class="western" style="border: 1pt solid rgb(0, 0, 0); padding: 0.05cm 0.12cm; margin-top: 0.21cm;" align="center">
+<font face="Arial, sans-serif"><font style="font-size: 20pt;" size="5"><i>
+ point de contrôle N° 3.11<br>
+Détection des retours en arrière <br>
+</i></font></font></h1>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Objectif: </b></u>
+Signaler que sur un Itinéraire/Chouette («&nbsp;ChouetteRoute&nbsp;»)
+le ou les MISSIONs COMMERCIALEs («&nbsp;JourneyPattern&nbsp;»)
+comportent des retours en arrière<br>
+</font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Priorité: </b></u> Obligatoire</font></p><font face="Arial, sans-serif">
+</font><p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><u><b>Explications:</b></u>
+</font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">Une
+MISSION COMMERCIALE (« JourneyPattern ») comporte une liste de POINTs
+D’ARRÊT SUR PARCOURS (« StopPoint ») ordonnés, décrivant le plan de
+déplacement pour les véhicules de transport public. Une MISSION
+COMMERCIALE (« JourneyPattern ») peut passer par un POINT D’ARRÊT SUR
+PARCOURS (« StopPoint ») plus d’une fois. Un retour en arrière consiste
+donc à repasser sur des POINTs D’ARRÊT SUR PARCOURS (« StopPoint »)
+déjà utilisés.&nbsp;</font></font></font></p><p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">On peut donc signaler les MISSIONs COMMERCIALEs qui comportent des
+POINTs D’ARRÊT SUR PARCOURS utilisés au moins deux fois (POINTs D’ARRÊT
+SUR PARCOURS dont les identifiants sont identiques).</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>Exemple: </u></b></font></font></font></p>
+<p><font face="Arial, sans-serif"><img src="image022.jpg" height="306" width="302"></font></p>
+<p><font face="Arial, sans-serif"><img src="image023.jpg" height="502" width="402"></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>N° test:</u></b>
+Test 3.11.1</font></font></font></p>
+
+
+
+
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Libellé:</u> Vérification de l’utilisation répétitive de&nbsp;POINTs
+D’ARRÊT SUR PARCOURS&nbsp;d’un
+Itinéraire&nbsp;/Chouette&nbsp;(«&nbsp;ChouetteRoute&nbsp;»)&nbsp;</font></font></font></p>
+
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2"><span style="text-decoration: underline;">
+Champ d’application:</span>&nbsp;&lt;PtLink&gt;&nbsp;&lt;ChouetteRoute&gt;</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Vérification:</u> </font></font></font></p>
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si l’élément «&nbsp;ChouetteRoute&nbsp;» mentionné dans les champs
+d’application est présent une ou plusieurs fois, poursuivre le test,
+sinon le test est abandonné.</font></font></font></p>
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si pour l’objet «&nbsp;ChouetteRoute&nbsp;», la liste des tronçons
+«&nbsp;PtLink&nbsp;» utilise des points d’arrêt «&nbsp;StopPoint&nbsp;»
+identiques plus de deux fois alors le test fournit le message
+d’avertissement «&nbsp;test 3.11.1&nbsp;: les tronçons
+«&nbsp;PtLink&nbsp;» d’un itinéraire utilisent des points d’arrêt
+«&nbsp;StopPoint&nbsp;» identiques plus de deux fois&nbsp;».</font></font></font></p>
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Sinon le test est validé</font></font></font></p>
diff --git a/app/views/test_sheet/3_12.html b/app/views/test_sheet/3_12.html
index 9a93c2888..1f790e3a8 100644
--- a/app/views/test_sheet/3_12.html
+++ b/app/views/test_sheet/3_12.html
@@ -1,255 +1,56 @@
-<div class=WordSection1>
-</span></b>
+<h1 class="western" style="border: 1pt solid rgb(0, 0, 0); padding: 0.05cm 0.12cm; margin-top: 0.21cm;" align="center">
+<font face="Arial, sans-serif"><font style="font-size: 20pt;" size="5"><i>
+ point de contrôle N° 3.12<br>
+Connexité du graphe des lignes et des points d’arrêt<br>
+</i></font></font></h1>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Objectif: </b></u>
+Vérifier que les POINTs D’ARRÊT SUR PARCOURS («&nbsp;StopPoint&nbsp;») <span style="color: black;">sont
+accessibles par les voyageurs quel que soit leur point de départ, sans
+tenir compte des HEUREs DE PASSAGE&nbsp;GRAPHIQUEEs/Chouette
+(«&nbsp;VehicleJourneyAtStop&nbsp;»)<br>
+</span></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Priorité: </b></u> Obligatoire</font></p><font face="Arial, sans-serif">
+</font><p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><u><b>Explications:</b></u>
+</font></font></p>
-<p class=MsoTitle><span style='font-size:14.0pt;font-family:"Tahoma","sans-serif"'>Fiche
-du point de contr&ocirc;le N&deg; 3.12</span></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Le réseau est décrit dans le fichier XML par des POINTs D’ARRÊT SUR
+PARCOURS (« StopPoint ») , des TRONCONS COMMERCIAUX/Chouette (« PtLink
+»), et des TronçonDeCorrespondances/Chouette (« ConnectionLink »).</font></font></font></p><p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">Il faut vérifier la connexité de ces éléments&nbsp;en prenant des
+POINTs D’ARRÊT SUR PARCOURS et en créant un cheminement vers les autres
+POINTs D’ARRÊT SUR PARCOURS.</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>Exemple: </u></b></font></font></font></p>
+<p><font face="Arial, sans-serif"><img src="image017.jpg" height="624" width="450"></font></p>
+<p><font face="Arial, sans-serif"><img src="image022.jpg" height="306" width="302"></font></p>
+<p><font face="Arial, sans-serif"><img src="image021.jpg" height="547" width="372"></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>N° test:</u></b>
+Test 3.12.1</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Libellé:</u>
+Construction d’un graphe à partir de chaque POINTs D’ARRÊT SUR PARCOURS</font></font></font></p>
-<p class=MsoNormal>&nbsp;</p>
-<table class=MsoNormalTable border=1 cellspacing=0 cellpadding=0 width=628
- style='width:471.3pt;border-collapse:collapse;border:none'>
- <tr style='page-break-inside:avoid'>
- <td width=628 colspan=2 valign=top style='width:471.3pt;border:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center'><i><span style='color:navy'>Description</span></i></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>Intitul&eacute;</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt'><span style='font-size:11.0pt;
- line-height:200%;font-family:"Tahoma","sans-serif"'>Connexit&eacute; du graphe des
- lignes et des points d&rsquo;arr&ecirc;t</span></p>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>Objectif</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif";color:black;font-weight:normal'>V&eacute;rifier que les </span><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>POINTs
- D&rsquo;ARR&Ecirc;T SUR PARCOURS (&laquo;&nbsp;StopPoint&nbsp;&raquo;) <span style='color:black'>sont
- accessibles par les voyageurs quel que soit leur point de d&eacute;part, sans tenir
- compte des HEUREs DE PASSAGE GRAPHIQUEEs/Chouette
- (&laquo;&nbsp;VehicleJourneyAtStop&nbsp;&raquo;)</span></span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>R&eacute;f&eacute;rences</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif";font-weight:normal'>TRIDENT/profil CHOUETTE/Transmodel
- V4 et V5.1</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>N&deg; de fiche(s) connexe(s)</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='text-align:left'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'>&nbsp;</span></h1>
- <h1 align=left style='text-align:left'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'>&nbsp;</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt'><b><span style='font-family:
- "Tahoma","sans-serif"'>Priorit&eacute;<span style='color:red'> </span></span></b></p>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif";font-weight:normal'>Obligatoire</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt'><b><span style='font-family:
- "Tahoma","sans-serif"'>R&eacute;sultat</span></b></p>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif";font-weight:normal'>D&eacute;livrance d&rsquo;un avertissement de
- mise en garde sur des cons&eacute;quences &eacute;ventuelles de dysfonctionnement</span></h1>
- </td>
- </tr>
- <tr style='page-break-inside:avoid'>
- <td width=628 colspan=2 valign=top style='width:471.3pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center'><i><span style='color:navy'>Mise en &oelig;uvre</span></i></h1>
- </td>
- </tr>
- <tr>
- <td width=100 style='width:74.85pt;border:solid windowtext 1.0pt;border-top:
- none;padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>Explication</span></h1>
- </td>
- <td width=529 style='width:396.45pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <p class=MsoBodyText style='margin-top:6.0pt'>Le r&eacute;seau est d&eacute;crit dans le
- fichier XML par des POINTs D&rsquo;ARR&Ecirc;T SUR PARCOURS (&laquo;&nbsp;StopPoint&nbsp;&raquo;)<b><span
- style='font-family:"Tahoma","sans-serif"'> </span></b>, des TRONCONS
- COMMERCIAUX/Chouette (&laquo;&nbsp;PtLink&nbsp;&raquo;), et des Tron&ccedil;onDeCorrespondances/Chouette
- (&laquo;&nbsp;ConnectionLink&nbsp;&raquo;).</p>
- <p class=MsoBodyText3 align=left style='margin-top:6.0pt;margin-right:0cm;
- margin-bottom:6.0pt;margin-left:0cm;text-align:left'><span style='font-family:
- "Tahoma","sans-serif"'>Il faut v&eacute;rifier la connexit&eacute; de ces &eacute;l&eacute;ments&nbsp;en
- prenant des POINTs D&rsquo;ARR&Ecirc;T SUR PARCOURS et en cr&eacute;ant un cheminement vers les
- autres POINTs D&rsquo;ARR&Ecirc;T SUR PARCOURS.</span></p>
- </td>
- </tr>
-</table>
-<p class=MsoNormal>&nbsp;</p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2"><span style="text-decoration: underline;">
+Champ d’application:</span> &nbsp;&lt;StopPoint&gt;&nbsp;&lt;PtLink&gt;&nbsp;&lt;ConnectionLink&gt;</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Vérification:</u> </font></font></font></p>
-<table class=MsoNormalTable border=1 cellspacing=0 cellpadding=0 width=600
- style='width:450.05pt;border-collapse:collapse;border:none'>
- <tr>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><b><span lang=EN-US style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>Exemple</span></b></p>
- </td>
- <td width=500 valign=top style='width:375.2pt;border:solid windowtext 1.0pt;
- border-left:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 style='margin-left:18.0pt;text-indent:-18.0pt'><span lang=EN-US>&nbsp;</span></h1>
- <h1 style='margin-left:18.0pt;text-indent:-18.0pt'><span lang=EN-US><img
- width=450 height=624 src="BATERI_Neptune_FINAL-V2_0a_fichiers/image017.jpg"></span></h1>
- <p class=MsoNormal align=center style='text-align:center'><span lang=EN-US>&nbsp;</span></p>
- <p class=MsoNormal align=center style='text-align:center'><span lang=EN-US><img
- width=302 height=306 src="BATERI_Neptune_FINAL-V2_0a_fichiers/image022.jpg"></span></p>
- <p class=MsoNormal align=center style='text-align:center'><span lang=EN-US>&nbsp;</span></p>
- <p class=MsoNormal align=center style='text-align:center'><span lang=EN-US><img
- width=372 height=547 src="BATERI_Neptune_FINAL-V2_0a_fichiers/image021.jpg"></span></p>
- <p class=MsoNormal align=center style='text-align:center'><span lang=EN-US>&nbsp;</span></p>
- </td>
- </tr>
- <tr style='page-break-inside:avoid'>
- <td width=600 colspan=2 valign=top style='width:450.05pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h2 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center'><i><span lang=EN-US style='font-size:14.0pt;
- color:navy'>Evaluation</span></i></h2>
- </td>
- </tr>
- <tr>
- <td width=100 valign=top style='width:74.85pt;border:solid windowtext 1.0pt;
- border-top:none;padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span lang=EN-US style='font-size:11.0pt'>N&deg; test</span></h1>
- </td>
- <td width=500 style='width:375.2pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>Test
- 3.12.1</span></p>
- </td>
- </tr>
- <tr>
- <td width=100 valign=top style='width:74.85pt;border:solid windowtext 1.0pt;
- border-top:none;padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt'>Libell&eacute;</span></h1>
- </td>
- <td width=500 valign=top style='width:375.2pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Construction
- d&rsquo;un graphe &agrave; partir de chaque POINTs D&rsquo;ARR&Ecirc;T SUR PARCOURS</span></p>
- </td>
- </tr>
- <tr>
- <td width=100 valign=top style='width:74.85pt;border:solid windowtext 1.0pt;
- border-top:none;padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span lang=EN-US style='font-size:11.0pt'>Champ d&rsquo;application</span></h1>
- </td>
- <td width=500 valign=top style='width:375.2pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><span lang=EN-US style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>&lt;StopPoint&gt;</span></p>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><span lang=EN-US style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>&lt;PtLink&gt;</span></p>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>&lt;ConnectionLink&gt;</span></p>
- </td>
- </tr>
- <tr>
- <td width=100 valign=top style='width:74.85pt;border:solid windowtext 1.0pt;
- border-top:none;padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt'>V&eacute;rification</span></h1>
- </td>
- <td width=500 valign=top style='width:375.2pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>-
- Si l&rsquo;&eacute;l&eacute;ment &laquo;&nbsp;StopPoint&nbsp;&raquo; mentionn&eacute; dans les champs d&rsquo;application
- est pr&eacute;sent une ou plusieurs fois, poursuivre le test, sinon le test est
- abandonn&eacute;.</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>-
- Construire le graphe entre chaque &laquo;&nbsp;StopPoint&nbsp;&raquo; &agrave; partir des objets
- de tron&ccedil;on &laquo;&nbsp;PtLink&nbsp;&raquo; et des correspondances &laquo;&nbsp;ConnectionLink&raquo;</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal style='text-align:justify'><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'>- Si le graphe ainsi constitu&eacute; est connexe,
- alors le test est valid&eacute;, sinon le test est invalid&eacute; et fournit le message
- &laquo;&nbsp;test 3.12.1&nbsp;: le graphe constitu&eacute; entre chaque point d&rsquo;arr&ecirc;t
- n&rsquo;est pas satisfaisant&nbsp;&raquo;.</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>&nbsp;</span></p>
- </td>
- </tr>
-</table>
-<p class=MsoNormal>&nbsp;</p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si l’élément «&nbsp;StopPoint&nbsp;» mentionné dans les champs
+d’application est présent une ou plusieurs fois, poursuivre le test,
+sinon le test est abandonné</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Construire le graphe entre chaque «&nbsp;StopPoint&nbsp;» à partir
+des objets de tronçon «&nbsp;PtLink&nbsp;» et des correspondances
+«&nbsp;ConnectionLink»</font></font></font></p>
-</div>
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si le graphe ainsi constitué est connexe, alors le test est validé,
+sinon le test est invalidé et fournit le message «&nbsp;test
+3.12.1&nbsp;: le graphe constitué entre chaque point d’arrêt n’est pas
+satisfaisant&nbsp;»<br>&nbsp;</font></font></font></p>
diff --git a/app/views/test_sheet/3_13.html b/app/views/test_sheet/3_13.html
index 5f3a51bcd..b14a9553e 100644
--- a/app/views/test_sheet/3_13.html
+++ b/app/views/test_sheet/3_13.html
@@ -1,278 +1,67 @@
-<div class=WordSection1>
-</span></b>
+<h1 class="western" style="border: 1pt solid rgb(0, 0, 0); padding: 0.05cm 0.12cm; margin-top: 0.21cm;" align="center">
+<font face="Arial, sans-serif"><font style="font-size: 20pt;" size="5"><i>
+ point de contrôle N° 3.13<br>
+Connexité du graphe des lignes et des points d’arrêt avec intégration des horaires<br>
+</i></font></font></h1>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Objectif: </b></u>
+Vérifier que les POINTs D’ARRÊT SUR PARCOURS<span style="color: black;">
+(«&nbsp;StopPoint&nbsp;») du réseau sont accessibles par les voyageurs
+quel que soit leur point de départ. Cette connexité est établie en
+tenant compte des HEUREs DE PASSAGE GRAPHIQUEEs/Chouette
+(«&nbsp;VehicleJourneyAtStop&nbsp;»)<br>
+</span></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Priorité: </b></u> Obligatoire</font></p><font face="Arial, sans-serif">
+</font><p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><u><b>Explications:</b></u>
+</font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">Le
+réseau est décrit dans le fichier XML par des POINTs D’ARRÊT SUR
+PARCOURS (« StopPoint »), des TRONCONS COMMERCIAUX/Chouette (« PtLink
+»), et TronçonsDeCorrespondance/Chouette (« ConnectionLink ») mais
+aussi des COURSES (« VehicleJourney ») et des HEUREs DE PASSAGE
+GRAPHIQUEEs/Chouette (« VehicleJourneyAtStop »)<b> </b></font></font></font></p>
-<p class=MsoTitle><span style='font-size:14.0pt;font-family:"Tahoma","sans-serif"'>Fiche
-du point de contr&ocirc;le N&deg; 3.13</span></p>
-<p class=MsoNormal>&nbsp;</p>
-<table class=MsoNormalTable border=1 cellspacing=0 cellpadding=0 width=638
- style='width:478.4pt;border-collapse:collapse;border:none'>
- <tr style='page-break-inside:avoid'>
- <td width=638 colspan=2 valign=top style='width:478.4pt;border:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center'><i><span style='color:navy'>Description</span></i></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>Intitul&eacute;</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt'><span style='font-size:11.0pt;
- line-height:200%;font-family:"Tahoma","sans-serif"'>Connexit&eacute; du graphe des
- lignes et des points d&rsquo;arr&ecirc;t avec int&eacute;gration des horaires</span></p>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>Objectif</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif";color:black;font-weight:normal'>V&eacute;rifier que les </span><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>POINTs
- D&rsquo;ARR&Ecirc;T SUR PARCOURS<span style='color:black'> (&laquo;&nbsp;StopPoint&nbsp;&raquo;) du
- r&eacute;seau sont accessibles par les voyageurs quel que soit leur point de d&eacute;part.
- Cette connexit&eacute; est &eacute;tablie en tenant compte des HEUREs DE PASSAGE
- GRAPHIQUEEs/Chouette (&laquo;&nbsp;VehicleJourneyAtStop&nbsp;&raquo;)</span></span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>R&eacute;f&eacute;rences</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif";font-weight:normal'>TRIDENT/profil CHOUETTE/Transmodel
- V4 et V5.1</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>N&deg; de fiche(s) connexe(s)</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='text-align:left'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'>&nbsp;</span></h1>
- <h1 align=left style='text-align:left'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'>&nbsp;</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt'><b><span style='font-family:
- "Tahoma","sans-serif"'>Priorit&eacute;<span style='color:red'> </span></span></b></p>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif";font-weight:normal'>Obligatoire</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt'><b><span style='font-family:
- "Tahoma","sans-serif"'>R&eacute;sultat</span></b></p>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif";font-weight:normal'>D&eacute;livrance d&rsquo;un avertissement de
- mise en garde sur des cons&eacute;quences &eacute;ventuelles de dysfonctionnement</span></h1>
- </td>
- </tr>
- <tr style='page-break-inside:avoid'>
- <td width=638 colspan=2 valign=top style='width:478.4pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center'><i><span style='color:navy'>Mise en &oelig;uvre</span></i></h1>
- </td>
- </tr>
- <tr>
- <td width=100 style='width:74.85pt;border:solid windowtext 1.0pt;border-top:
- none;padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>Explication</span></h1>
- </td>
- <td width=538 style='width:403.55pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <p class=MsoBodyText>Le r&eacute;seau est d&eacute;crit dans le fichier XML par des POINTs
- D&rsquo;ARR&Ecirc;T SUR PARCOURS (&laquo;&nbsp;StopPoint&nbsp;&raquo;), des TRONCONS
- COMMERCIAUX/Chouette (&laquo;&nbsp;PtLink&nbsp;&raquo;), et
- Tron&ccedil;onsDeCorrespondance/Chouette (&laquo;&nbsp;ConnectionLink&nbsp;&raquo;) mais aussi
- des COURSES (&laquo;&nbsp;VehicleJourney&nbsp;&raquo;) et des <span style='font-family:
- "Tahoma","sans-serif";color:black'>HEUREs DE PASSAGE GRAPHIQUEEs/Chouette
- (&laquo;&nbsp;VehicleJourneyAtStop&nbsp;&raquo;)<b> </b></span></p>
- <p class=MsoNormal style='margin-top:6.0pt;text-align:justify;text-autospace:
- none'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- color:black'>Le principe est le m&ecirc;me que pour la fiche 3.11 mais avec une
- dimension temporelle en plus. Il faut v&eacute;rifier la connexit&eacute; de ces
- &eacute;l&eacute;ments&nbsp;en prenant chacun des </span><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'>POINTs D&rsquo;ARR&Ecirc;T SUR PARCOURS
- (&laquo;&nbsp;StopPoint&nbsp;&raquo;)</span><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif";color:black'> et en cr&eacute;ant un cheminement vers les
- autres </span><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>POINTs
- D&rsquo;ARR&Ecirc;T SUR PARCOURS (&laquo;&nbsp;StopPoint&nbsp;&raquo;)</span><span style='font-size:
- 11.0pt;font-family:"Tahoma","sans-serif";color:black'>.</span></p>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>&nbsp;</span></p>
- </td>
- </tr>
-</table>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Le principe est le même que pour la fiche 3.11 mais avec une dimension
+temporelle en plus. Il faut vérifier la connexité de ces
+éléments&nbsp;en prenant chacun des&nbsp;POINTs D’ARRÊT SUR PARCOURS («&nbsp;StopPoint&nbsp;»)&nbsp;et en créant un cheminement vers les autres&nbsp;POINTs D’ARRÊT SUR PARCOURS («&nbsp;StopPoint&nbsp;»)</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>Exemple: </u></b></font></font></font></p>
+<p><font face="Arial, sans-serif"><img src="image017.jpg" height="624" width="450"></font></p>
+<p><font face="Arial, sans-serif"><img src="image019.jpg" height="618" width="372"></font></p>
+<p><font face="Arial, sans-serif"><img src="image020.jpg" height="338" width="433"></font></p>
+<p><font face="Arial, sans-serif"><img src="image024.jpg" height="547" width="372"></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>N° test:</u></b>
+Test 3.13.1</font></font></font></p>
-<p class=MsoNormal>&nbsp;</p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Libellé:</u>
+Construction d’un graphe à partir de chaque POINTs D’ARRÊT SUR PARCOURS («&nbsp;StopPoint&nbsp;») en tenant compte des&nbsp;HEUREs DE PASSAGE GRAPHIQUEEs/Chouette («&nbsp;VehicleJourneyAtStop&nbsp;»)&nbsp;</font></font></font></p>
-<table class=MsoNormalTable border=1 cellspacing=0 cellpadding=0 width=638
- style='width:478.4pt;border-collapse:collapse;border:none'>
- <tr>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><b><span lang=EN-US style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>Exemple</span></b></p>
- </td>
- <td width=538 valign=top style='width:403.55pt;border:solid windowtext 1.0pt;
- border-left:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 style='margin-left:18.0pt;text-indent:-18.0pt'><span lang=EN-US
- style='font-size:11.0pt;font-weight:normal'>&nbsp;</span></h1>
- <h1 style='margin-left:18.0pt;text-indent:-18.0pt'><span lang=EN-US
- style='font-size:11.0pt;font-weight:normal'><img width=450 height=624
- src="BATERI_Neptune_FINAL-V2_0a_fichiers/image017.jpg"></span></h1>
- <p class=MsoNormal align=center style='text-align:center'><span lang=EN-US>&nbsp;</span></p>
- <p class=MsoNormal align=center style='text-align:center'><span lang=EN-US><img
- width=372 height=618 src="BATERI_Neptune_FINAL-V2_0a_fichiers/image019.jpg"></span></p>
- <p class=MsoNormal align=center style='text-align:center'><span lang=EN-US>&nbsp;</span></p>
- <p class=MsoNormal align=center style='text-align:center'><span lang=EN-US><img
- width=433 height=338 src="BATERI_Neptune_FINAL-V2_0a_fichiers/image020.jpg"></span></p>
- <p class=MsoNormal align=center style='text-align:center'><span lang=EN-US>&nbsp;</span></p>
- <p class=MsoNormal align=center style='text-align:center'><span lang=EN-US><img
- width=372 height=547 src="BATERI_Neptune_FINAL-V2_0a_fichiers/image024.jpg"></span></p>
- <p class=MsoNormal align=center style='text-align:center'><span lang=EN-US>&nbsp;</span></p>
- </td>
- </tr>
- <tr style='page-break-inside:avoid'>
- <td width=638 colspan=2 valign=top style='width:478.4pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h2 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center'><i><span lang=EN-US style='font-size:14.0pt;
- color:navy'>Evaluation</span></i></h2>
- </td>
- </tr>
- <tr>
- <td width=100 valign=top style='width:74.85pt;border:solid windowtext 1.0pt;
- border-top:none;padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span lang=EN-US style='font-size:11.0pt'>N&deg; test</span></h1>
- </td>
- <td width=538 style='width:403.55pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>Test
- 3.13.1</span></p>
- </td>
- </tr>
- <tr>
- <td width=100 valign=top style='width:74.85pt;border:solid windowtext 1.0pt;
- border-top:none;padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt'>Libell&eacute;</span></h1>
- </td>
- <td width=538 valign=top style='width:403.55pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>Construction
- d&rsquo;un graphe &agrave; partir de chaque POINTs D&rsquo;ARR&Ecirc;T SUR PARCOURS
- (&laquo;&nbsp;StopPoint&nbsp;&raquo;) en tenant compte des </span><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";color:black'>HEUREs
- DE PASSAGE GRAPHIQUEEs/Chouette (&laquo;&nbsp;VehicleJourneyAtStop&nbsp;&raquo;)</span></p>
- </td>
- </tr>
- <tr>
- <td width=100 valign=top style='width:74.85pt;border:solid windowtext 1.0pt;
- border-top:none;padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span lang=EN-US style='font-size:11.0pt'>Champ d&rsquo;application</span></h1>
- </td>
- <td width=538 valign=top style='width:403.55pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><span lang=EN-US style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>&lt;StopPoint&gt;</span></p>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><span lang=EN-US style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>&lt;VehicleJourney&gt;</span></p>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><span lang=EN-US style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>&lt;VehicleJourneyAtStop&gt;</span></p>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><span lang=EN-US style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>&lt;ConnectionLink&gt;</span></p>
- </td>
- </tr>
- <tr>
- <td width=100 valign=top style='width:74.85pt;border:solid windowtext 1.0pt;
- border-top:none;padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt'>V&eacute;rification</span></h1>
- </td>
- <td width=538 valign=top style='width:403.55pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>-
- Si l&rsquo;&eacute;l&eacute;ment &laquo;&nbsp;StopPoint&nbsp;&raquo; mentionn&eacute; dans les champs d&rsquo;application
- est pr&eacute;sent une ou plusieurs fois, poursuivre le test, sinon le test est
- abandonn&eacute;.</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>-
- Construire le graph entre chaque point d&rsquo;arr&ecirc;t &laquo;&nbsp;StopPoint&nbsp;&raquo; &agrave;
- partir des objets &laquo;&nbsp;VehicleJourney&nbsp;&raquo;,
- &laquo;&nbsp;VehicleJourneyAtStop&nbsp;&raquo; et des correspondances
- &laquo;&nbsp;ConnectionLink&nbsp;&raquo;.</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>-
- Si le graph ainsi constitu&eacute; est connexe, alors le test est valid&eacute;, sinon le
- test est invalid&eacute; et fournit le message&nbsp;; &laquo;&nbsp;test 3.13.1&nbsp;: le
- graphe constitu&eacute; entre chaque point d&rsquo;arr&ecirc;t n&rsquo;est pas satisfaisant&nbsp;&raquo;.</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>&nbsp;</span></p>
- </td>
- </tr>
-</table>
-<p class=MsoNormal>&nbsp;</p>
-</div>
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2"><span style="text-decoration: underline;">
+Champ d’application:</span>&nbsp;&lt;StopPoint&gt;&nbsp;&lt;VehicleJourney&gt;&nbsp;&lt;VehicleJourneyAtStop&gt;&nbsp;&lt;ConnectionLink&gt;</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Vérification:</u> </font></font></font></p>
+
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si l’élément «&nbsp;StopPoint&nbsp;» mentionné dans les champs
+d’application est présent une ou plusieurs fois, poursuivre le test,
+sinon le test est abandonné</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Construire le graphe entre chaque point d’arrêt
+«&nbsp;StopPoint&nbsp;» à partir des objets
+«&nbsp;VehicleJourney&nbsp;», «&nbsp;VehicleJourneyAtStop&nbsp;» et des
+correspondances «&nbsp;ConnectionLink&nbsp;».</font></font></font></p>
+
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si le graphe ainsi constitué est connexe, alors le test est validé,
+sinon le test est invalidé et fournit le message&nbsp;; «&nbsp;test
+3.13.1&nbsp;: le graphe constitué entre chaque point d’arrêt n’est pas
+satisfaisant&nbsp;»<br>&nbsp;</font></font></font></p>
diff --git a/app/views/test_sheet/3_14.html b/app/views/test_sheet/3_14.html
index feaee5be7..60157a9e5 100644
--- a/app/views/test_sheet/3_14.html
+++ b/app/views/test_sheet/3_14.html
@@ -1,258 +1,55 @@
-<div class=WordSection1>
-</span></b>
-
-<p class=MsoTitle><span style='font-size:14.0pt;font-family:"Tahoma","sans-serif"'>Fiche
-du point de contr&ocirc;le N&deg; 3.14</span></p>
-
-<p class=MsoNormal>&nbsp;</p>
-
-<table class=MsoNormalTable border=1 cellspacing=0 cellpadding=0 width=638
- style='width:478.4pt;border-collapse:collapse;border:none'>
- <tr style='page-break-inside:avoid'>
- <td width=638 colspan=2 valign=top style='width:478.4pt;border:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center'><i><span style='color:navy'>Description</span></i></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>Intitul&eacute;</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt'><span style='font-size:11.0pt;
- line-height:200%;font-family:"Tahoma","sans-serif";color:black'>Carte
- isochrone du fichier de donn&eacute;es</span></p>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>Objectif</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif";font-weight:normal'>Dessin du graphe des </span><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";color:black;
- font-weight:normal'>HEUREs DE PASSAGE GRAPHIQUEEs/Chouette
- (&laquo;&nbsp;VehicleJourneyAtStop&nbsp;&raquo;)</span><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'> par rapport au point
- centre de tous les </span><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>POINTs D&rsquo;ARR&Ecirc;T SUR PARCOURS (&laquo;&nbsp;StopPoint&nbsp;&raquo;)</span><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>.</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>R&eacute;f&eacute;rences</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif";font-weight:normal'>TRIDENT/profil CHOUETTE/Transmodel
- V4 et V5.1</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>N&deg; de fiche(s) connexe(s)</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='text-align:left'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'>&nbsp;</span></h1>
- <h1 align=left style='text-align:left'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'>&nbsp;</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt'><b><span style='font-family:
- "Tahoma","sans-serif"'>Priorit&eacute;<span style='color:red'> </span></span></b></p>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif";font-weight:normal'>Obligatoire</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt'><b><span style='font-family:
- "Tahoma","sans-serif"'>R&eacute;sultat</span></b></p>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif";font-weight:normal'>Indication pour appr&eacute;ciation</span></h1>
- </td>
- </tr>
- <tr style='page-break-inside:avoid'>
- <td width=638 colspan=2 valign=top style='width:478.4pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center'><i><span style='color:navy'>Mise en &oelig;uvre</span></i></h1>
- </td>
- </tr>
- <tr>
- <td width=100 style='width:74.85pt;border:solid windowtext 1.0pt;border-top:
- none;padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>Explication</span></h1>
- </td>
- <td width=538 style='width:403.55pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <p class=MsoNormal style='margin-top:6.0pt;text-align:justify;text-autospace:
- none'><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>La
- carte des isochrones est obtenu en fonction des POINTs D&rsquo;ARR&Ecirc;T SUR PARCOURS
- (&laquo;&nbsp;StopPoint&nbsp;&raquo;) et des </span><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";color:black'>HEUREs DE PASSAGE
- GRAPHIQUEEs/Chouette (&laquo;&nbsp;VehicleJourneyAtStop&nbsp;&raquo;)</span><span
- style='font-size:11.0pt;font-family:"Arial","sans-serif"'> des COURSEs</span></p>
- <p class=MsoNormal style='margin-top:6.0pt;text-autospace:none'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>&nbsp;</span></p>
- </td>
- </tr>
-</table>
-
-<p class=MsoNormal>&nbsp;</p>
-
-<table class=MsoNormalTable border=1 cellspacing=0 cellpadding=0 width=647
- style='width:485.45pt;border-collapse:collapse;border:none'>
- <tr>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><b><span lang=EN-US style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>Exemple</span></b></p>
- </td>
- <td width=547 valign=top style='width:410.6pt;border:solid windowtext 1.0pt;
- border-left:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 style='margin-left:18.0pt;text-indent:-18.0pt'><span lang=EN-US
- style='font-size:11.0pt;font-weight:normal'>&nbsp;</span></h1>
- <h1 style='margin-left:18.0pt;text-indent:-18.0pt'><span lang=EN-US><img
- width=450 height=624 src="BATERI_Neptune_FINAL-V2_0a_fichiers/image017.jpg"></span></h1>
- <p class=MsoNormal align=center style='text-align:center'><span lang=EN-US>&nbsp;</span></p>
- <p class=MsoNormal align=center style='text-align:center'><span lang=EN-US><img
- width=372 height=618 src="BATERI_Neptune_FINAL-V2_0a_fichiers/image019.jpg"></span></p>
- <p class=MsoNormal align=center style='text-align:center'><span lang=EN-US>&nbsp;</span></p>
- <p class=MsoNormal align=center style='text-align:center'><span lang=EN-US><img
- width=433 height=338 src="BATERI_Neptune_FINAL-V2_0a_fichiers/image020.jpg"></span></p>
- <p class=MsoNormal align=center style='text-align:center'><span lang=EN-US>&nbsp;</span></p>
- </td>
- </tr>
- <tr style='page-break-inside:avoid'>
- <td width=647 colspan=2 valign=top style='width:485.45pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h2 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center'><i><span lang=EN-US style='font-size:14.0pt;
- color:navy'>Evaluation</span></i></h2>
- </td>
- </tr>
- <tr>
- <td width=100 valign=top style='width:74.85pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span lang=EN-US style='font-size:11.0pt'>N&deg; test</span></h1>
- </td>
- <td width=547 style='width:410.6pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>Test
- 3.14.1</span></p>
- </td>
- </tr>
- <tr>
- <td width=100 valign=top style='width:74.85pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt'>Libell&eacute;</span></h1>
- </td>
- <td width=547 style='width:410.6pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>Rendu
- graphique du r&eacute;seau &agrave; l&rsquo;aide des isochrones</span></p>
- </td>
- </tr>
- <tr>
- <td width=100 valign=top style='width:74.85pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt'>Champ d&rsquo;application</span></h1>
- </td>
- <td width=547 style='width:410.6pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>&lt;StopPoint&gt;</span></p>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>&lt;VehicleJourney&gt;</span></p>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>&lt;VehicleJourneyAtStop&gt;</span></p>
- </td>
- </tr>
- <tr>
- <td width=100 valign=top style='width:74.85pt;border:solid windowtext 1.0pt;
- border-top:none;padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt'>V&eacute;rification</span></h1>
- </td>
- <td width=547 valign=top style='width:410.6pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>-
- Si l&rsquo;&eacute;l&eacute;ment &laquo;&nbsp;StopPoint&nbsp;&raquo; mentionn&eacute; dans les champs d&rsquo;application
- est pr&eacute;sent une ou plusieurs fois, poursuivre le test, sinon le test est
- abandonn&eacute;.</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal style='text-align:justify'><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'>- Construire le graphe des isochrones des temps
- minimum entre &laquo;&nbsp;StopPoint&nbsp;&raquo; &agrave; partir des objets
- &laquo;&nbsp;VehicleJourney&nbsp;&raquo; et &laquo;&nbsp;VehicleJourneyAtStop&nbsp;&raquo;.</span></p>
- <p class=MsoNormal style='text-align:justify'><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal style='text-align:justify'><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'>- Construire le graphe des isochrones des
- temps maximum entre &laquo;&nbsp;StopPoint&nbsp;&raquo; &agrave; partir des objets
- &laquo;&nbsp;VehicleJourney&nbsp;&raquo;, &laquo;&nbsp;VehicleJourneyAtStop&nbsp;&raquo;.</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>-
- Interpr&eacute;ter manuellement le rendu des deux graphes.</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>&nbsp;</span></p>
- </td>
- </tr>
-</table>
-
-<p class=MsoNormal>&nbsp;</p>
-
-</div>
+<h1 class="western" style="border: 1pt solid rgb(0, 0, 0); padding: 0.05cm 0.12cm; margin-top: 0.21cm;" align="center">
+<font face="Arial, sans-serif"><font style="font-size: 20pt;" size="5"><i>
+ point de contrôle N° 3.14<br>
+Carte isochrone du fichier de données<br>
+</i></font></font></h1>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Objectif: </b></u>
+Dessin du graphe des HEUREs DE
+PASSAGE&nbsp;GRAPHIQUEEs/Chouette&nbsp;(«&nbsp;VehicleJourneyAtStop&nbsp;»)
+par rapport au point centre de tous les<br>
+POINTs D’ARRÊT SUR PARCOURS («&nbsp;StopPoint&nbsp;»)<br>
+</font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Priorité: </b></u> Obligatoire</font></p><font face="Arial, sans-serif">
+</font><p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><u><b>Explications:</b></u>
+</font></font></p>
+
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+La carte des isochrones est obtenu en fonction des POINTs D’ARRÊT SUR PARCOURS («&nbsp;StopPoint&nbsp;») et des&nbsp;<br>HEUREs DE PASSAGE GRAPHIQUEEs/Chouette («&nbsp;VehicleJourneyAtStop&nbsp;»)&nbsp;des COURSEs</font></font></font></p>
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>Exemple: </u></b></font></font></font></p>
+<p><font face="Arial, sans-serif"><img src="image017.jpg" height="624" width="450"></font></p>
+<p><font face="Arial, sans-serif"><img src="image019.jpg" height="618" width="372"></font></p>
+<p><font face="Arial, sans-serif"><img src="image020.jpg" height="338" width="433"></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>N° test:</u></b>
+Test 3.14.1</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Libellé:</u>
+Rendu graphique du réseau à l’aide des isochrones</font></font></font></p>
+
+
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2"><span style="text-decoration: underline;">
+Champ d’application</span>:&nbsp;&lt;StopPoint&gt;&nbsp;&lt;VehicleJourney&gt;&nbsp;&lt;VehicleJourneyAtStop&gt;</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Vérification:</u> </font></font></font></p><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">-
+Si l’élément «&nbsp;StopPoint&nbsp;» mentionné dans les champs
+d’application est présent une ou plusieurs fois, poursuivre le test,
+sinon le test est abandonné.</font></font></font>
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Construire le graphe des isochrones des temps minimum entre
+«&nbsp;StopPoint&nbsp;» à partir des objets
+«&nbsp;VehicleJourney&nbsp;» et «&nbsp;VehicleJourneyAtStop&nbsp;».</font></font></font></p>
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+&nbsp;-
+Construire le graphe des isochrones des temps maximum entre
+«&nbsp;StopPoint&nbsp;» à partir des objets
+«&nbsp;VehicleJourney&nbsp;», «&nbsp;VehicleJourneyAtStop&nbsp;».</font></font></font></p>
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+&nbsp;- Interpréter manuellement le rendu des deux graphes.</font></font></font></p>
diff --git a/app/views/test_sheet/3_15.html b/app/views/test_sheet/3_15.html
index da861b959..30203ca45 100644
--- a/app/views/test_sheet/3_15.html
+++ b/app/views/test_sheet/3_15.html
@@ -1,286 +1,60 @@
-<div class=WordSection1>
-</span></b>
+<h1 class="western" style="border: 1pt solid rgb(0, 0, 0); padding: 0.05cm 0.12cm; margin-top: 0.21cm;" align="center">
+<font face="Arial, sans-serif"><font style="font-size: 20pt;" size="5"><i>
+ point de contrôle N° 3.15<br>
+Cohérence des horaires<br>
+</i></font></font></h1>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Objectif: </b></u>
+Vérifier que les <span style="color: black;">HEUREs DE PASSAGE GRAPHIQUEEs/Chouette («&nbsp;VehicleJourneyAtStop&nbsp;») <br>
+sont cohérentes (pas de temps de parcours aberrant et pas de retour en arrière dans le temps)<br>
+</span></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Priorité: </b></u> Obligatoire</font><br>
+</p><font face="Arial, sans-serif"></font><p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><u><b>Explications:</b></u>
+</font></font></p>
-<p class=MsoTitle><span style='font-size:14.0pt;font-family:"Tahoma","sans-serif"'>Fiche
-du point de contr&ocirc;le N&deg; 3.15</span></p>
-<p class=MsoNormal>&nbsp;</p>
-<table class=MsoNormalTable border=1 cellspacing=0 cellpadding=0 width=647
- style='width:485.45pt;border-collapse:collapse;border:none'>
- <tr style='page-break-inside:avoid'>
- <td width=647 colspan=2 valign=top style='width:485.45pt;border:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center'><i><span style='color:navy'>Description</span></i></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>Intitul&eacute;</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt'><span style='font-size:11.0pt;
- line-height:200%;font-family:"Tahoma","sans-serif"'>Coh&eacute;rence des horaires</span></p>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>Objectif</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif";font-weight:normal'>V&eacute;rifier que les <span
- style='color:black'>HEUREs DE PASSAGE GRAPHIQUEEs/Chouette
- (&laquo;&nbsp;VehicleJourneyAtStop&nbsp;&raquo;)</span></span><span style='font-size:
- 11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'> </span><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'> sont
- coh&eacute;rentes (pas de temps de parcours aberrant et pas de retour en arri&egrave;re
- dans le temps)</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>R&eacute;f&eacute;rences</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif";font-weight:normal'>TRIDENT/profil CHOUETTE/Transmodel
- V4 et V5.1</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>N&deg; de fiche(s) connexe(s)</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='text-align:left'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'>&nbsp;</span></h1>
- <h1 align=left style='text-align:left'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'>&nbsp;</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt'><b><span style='font-family:
- "Tahoma","sans-serif"'>Priorit&eacute;<span style='color:red'> </span></span></b></p>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif";font-weight:normal'>Obligatoire</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt'><b><span style='font-family:
- "Tahoma","sans-serif"'>R&eacute;sultat</span></b></p>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif";font-weight:normal'>D&eacute;livrance d&rsquo;un avertissement de
- mise en garde sur des cons&eacute;quences &eacute;ventuelles de dysfonctionnement</span></h1>
- </td>
- </tr>
- <tr style='page-break-inside:avoid'>
- <td width=647 colspan=2 valign=top style='width:485.45pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center'><i><span style='color:navy'>Mise en &oelig;uvre</span></i></h1>
- </td>
- </tr>
- <tr>
- <td width=100 style='width:74.85pt;border:solid windowtext 1.0pt;border-top:
- none;padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>Explication</span></h1>
- </td>
- <td width=547 style='width:410.6pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>Dans
- chaque COURSE (&laquo;&nbsp;VehicleJourney&nbsp;&raquo;) du fichier , il faut v&eacute;rifier
- que les </span><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- color:black'>HEUREs DE PASSAGE GRAPHIQUEEs/Chouette
- (&laquo;&nbsp;VehicleJourneyAtStop&nbsp;&raquo;)</span><b><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'> </span></b><b><span style='font-size:
- 11.0pt;font-family:"Tahoma","sans-serif"'> </span></b><span style='font-size:
- 11.0pt;font-family:"Arial","sans-serif"'>pour chaque POINT D&rsquo;ARR&Ecirc;T SUR
- PARCOURS (&laquo;&nbsp;StopPoint&nbsp;&raquo;)</span><b><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'> </span></b><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'> sont dans un ordre chronologique et que
- les &eacute;carts horaires entre 2 POINTs D&rsquo;ARR&Ecirc;T SUR PARCOURS
- (&laquo;&nbsp;StopPoint&nbsp;&raquo;)</span><span style='font-size:11.0pt;font-family:
- "Arial","sans-serif"'> </span><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'> cons&eacute;cutifs
- ne sont pas aberrants (fixer pour cela un seuil)</span></p>
- </td>
- </tr>
-</table>
-<p class=MsoNormal>&nbsp;</p>
-<table class=MsoNormalTable border=1 cellspacing=0 cellpadding=0 width=638
- style='width:478.4pt;border-collapse:collapse;border:none'>
- <tr>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><b><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Exemple</span></b></p>
- </td>
- <td width=538 valign=top style='width:403.55pt;border:solid windowtext 1.0pt;
- border-left:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h3 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm;text-indent:0cm'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Exemple
- de d&eacute;finition &agrave; partir d&rsquo;un fichier XML sur le RER A</span></h3>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal><span lang=EN-US>&lt;VehicleJourney&gt;</span></p>
- <p class=MsoNormal><span lang=EN-US>&lt;objectId&gt;NINOXE:VehicleJourney:521875&lt;/objectId&gt;</span></p>
- <p class=MsoNormal><span lang=EN-US>&lt;objectVersion&gt;0&lt;/objectVersion&gt;</span></p>
- <p class=MsoNormal><span lang=EN-US>&lt;creationTime&gt;2007-06-28T17:18:56.000+02:00&lt;/creationTime&gt;</span></p>
- <p class=MsoNormal><span lang=EN-US>&lt;routeId&gt;NINOXE:Route:521753&lt;/routeId&gt;</span></p>
- <p class=MsoNormal><span lang=EN-US>&lt;number&gt;0&lt;/number&gt;</span></p>
- <p class=MsoNormal><span lang=EN-US>&lt;vehicleJourneyAtStop&gt;</span></p>
- <p class=MsoNormal><span lang=EN-US>&lt;stopPointId&gt;NINOXE:StopPoint:521802&lt;/stopPointId&gt;</span></p>
- <p class=MsoNormal><span lang=EN-US>&lt;vehicleJourneyId&gt;NINOXE:VehicleJourney:521875&lt;/vehicleJourneyId&gt;</span></p>
- <p class=MsoNormal><span lang=EN-US>&lt;arrivalTime&gt;08:00:00&lt;/arrivalTime&gt;</span></p>
- <p class=MsoNormal><span lang=EN-US>&lt;departureTime&gt;08:00:00&lt;/departureTime&gt;</span></p>
- <p class=MsoNormal><span lang=EN-US>&lt;/vehicleJourneyAtStop&gt;</span></p>
- <p class=MsoNormal><span lang=EN-US>&lt;vehicleJourneyAtStop&gt;</span></p>
- <p class=MsoNormal><span lang=EN-US>&lt;stopPointId&gt;NINOXE:StopPoint:521803&lt;/stopPointId&gt;</span></p>
- <p class=MsoNormal><span lang=EN-US>&lt;vehicleJourneyId&gt;NINOXE:VehicleJourney:521875&lt;/vehicleJourneyId&gt;</span></p>
- <p class=MsoNormal><span lang=EN-US>&lt;arrivalTime&gt;08:01:00&lt;/arrivalTime&gt;</span></p>
- <p class=MsoNormal>&lt;departureTime&gt;08:01:00&lt;/departureTime&gt;</p>
- <p class=MsoNormal>&lt;/vehicleJourneyAtStop&gt;</p>
- <p class=MsoNormal>……..</p>
- <p class=MsoNormal>………</p>
- <p class=MsoNormal>&lt;VehicleJourney&gt;</p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>L&rsquo;horaire
- du premier point d&rsquo;arr&ecirc;t dans la course est 8H00, l&rsquo;horaire du second est
- 8H01. On constate que les horaires sont chronologiques</span></p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal align=center style='text-align:center'><img width=433
- height=338 src="BATERI_Neptune_FINAL-V2_0a_fichiers/image020.jpg"></p>
- <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
- </td>
- </tr>
- <tr style='page-break-inside:avoid'>
- <td width=638 colspan=2 valign=top style='width:478.4pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h2 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center'><i><span lang=EN-US style='font-size:14.0pt;
- color:navy'>Evaluation</span></i></h2>
- </td>
- </tr>
- <tr>
- <td width=100 valign=top style='width:74.85pt;border:solid windowtext 1.0pt;
- border-top:none;padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span lang=EN-US style='font-size:11.0pt'>N&deg; test</span></h1>
- </td>
- <td width=538 style='width:403.55pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 align=left style='text-align:left'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'>Test 3.15.1</span></h1>
- </td>
- </tr>
- <tr>
- <td width=100 valign=top style='width:74.85pt;border:solid windowtext 1.0pt;
- border-top:none;padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt'>Libell&eacute;</span></h1>
- </td>
- <td width=538 style='width:403.55pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif";font-weight:normal'>V&eacute;rification de coh&eacute;rence des <span
- style='color:black'>HEUREs DE PASSAGE GRAPHIQUEEs/Chouette
- (&laquo;&nbsp;VehicleJourneyAtStop&nbsp;&raquo;)</span></span><span style='font-size:
- 11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'> </span><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'> d&rsquo;une
- COURSE (&laquo;&nbsp;VehicleJourney&nbsp;&raquo;) pour chaque POINT D&rsquo;ARR&Ecirc;T SUR PARCOURS
- (&laquo;&nbsp;StopPoint&nbsp;&raquo;)</span></h1>
- </td>
- </tr>
- <tr>
- <td width=100 valign=top style='width:74.85pt;border:solid windowtext 1.0pt;
- border-top:none;padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt'>Champ d&rsquo;application</span></h1>
- </td>
- <td width=538 valign=top style='width:403.55pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&lt;VehicleJourneyAtStop&gt;</span></p>
- <h1><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>&nbsp;</span></h1>
- </td>
- </tr>
- <tr>
- <td width=100 valign=top style='width:74.85pt;border:solid windowtext 1.0pt;
- border-top:none;padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt'>V&eacute;rification</span></h1>
- </td>
- <td width=538 valign=top style='width:403.55pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <p class=MsoBodyText>&nbsp;</p>
- <p class=MsoBodyText>- Si l&rsquo;&eacute;l&eacute;ment &laquo;&nbsp;VehicleJourneyAtStop&nbsp;&raquo;,
- mentionn&eacute; dans les champs d&rsquo;application, est pr&eacute;sent une ou plusieurs fois,
- poursuivre le test, sinon le test est abandonn&eacute;.</p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&nbsp;</span></p>
- <p class=MsoBodyText3 style='text-align:justify'><span style='font-family:
- "Tahoma","sans-serif"'>- Si dans l&rsquo;&eacute;l&eacute;ment &laquo;&nbsp;VehicleJourneyAtStop&nbsp;&raquo;
- identifi&eacute;, la diff&eacute;rence absolue entre la valeur de l&rsquo;attribut de l&rsquo;&eacute;l&eacute;ment
- &laquo;&nbsp;arrivalTime&nbsp;&raquo; et la valeur de l&rsquo;attribut de l&rsquo;&eacute;l&eacute;ment
- &laquo;&nbsp;departureTime&nbsp;&raquo; est inf&eacute;rieure &agrave; une valeur param&eacute;trable XX, le
- test est valid&eacute;, sinon le test est invalid&eacute; et fournit le message&nbsp;:
- &laquo;&nbsp;test 3.15.1&nbsp;: la diff&eacute;rence absolue entre la valeur de l&rsquo;attribut
- de l&rsquo;&eacute;l&eacute;ment &laquo;&nbsp;arrivalTime&nbsp;&raquo; et la valeur de l&rsquo;attribut de
- l&rsquo;&eacute;l&eacute;ment &laquo;&nbsp;departureTime&nbsp;&raquo; est sup&eacute;rieure &agrave; une valeur
- param&eacute;trable XX&nbsp;&raquo;.</span></p>
- <h1 align=left style='text-align:left'><i><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>&nbsp;</span></i></h1>
- <p class=MsoNormal><b><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>&nbsp;</span></b></p>
- </td>
- </tr>
-</table>
-</div>
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Dans chaque COURSE («&nbsp;VehicleJourney&nbsp;») du fichier , il faut vérifier que les&nbsp;HEUREs DE PASSAGE GRAPHIQUEEs/Chouette («&nbsp;VehicleJourneyAtStop&nbsp;»)&nbsp;pour chaque POINT D’ARRÊT SUR PARCOURS («&nbsp;StopPoint&nbsp;»)&nbsp;sont
+dans un ordre chronologique et que les écarts horaires entre 2 POINTs
+D’ARRÊT SUR PARCOURS («&nbsp;StopPoint&nbsp;»)&nbsp;consécutifs ne sont pas aberrants (fixer pour cela un seuil)</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>Exemple: </u></b></font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Exemple de définition à partir d’un fichier XML sur le RER A</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+L’horaire du premier point d’arrêt dans la course est 8H00, l’horaire
+du second est 8H01. On constate que les horaires sont chronologiques</font></font></font></p>
+<p><font face="Arial, sans-serif"><img src="image020.jpg" height="338" width="433"></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>N° test:</u></b>
+Test 3.15.1</font></font></font></p>
+
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Libellé:</u>
+Vérification de cohérence des <span style="color: black;">HEUREs DE PASSAGE GRAPHIQUEEs/Chouette («&nbsp;VehicleJourneyAtStop&nbsp;»)</span> d’une COURSE («&nbsp;VehicleJourney&nbsp;») pour chaque POINT D’ARRÊT SUR PARCOURS («&nbsp;StopPoint&nbsp;»)</font></font></font></p>
+
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2"><span style="text-decoration: underline;">
+Champ d’application:</span>&nbsp;&lt;VehicleJourneyAtStop&gt;</font></font></font></p>
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Vérification:</u> </font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si l’élément «&nbsp;VehicleJourneyAtStop&nbsp;», mentionné dans les
+champs d’application, est présent une ou plusieurs fois, poursuivre le
+test, sinon le test est abandonné.</font></font></font></p><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2"> </font></font></font><p class="MsoBodyText3" style="text-align: justify;"><span style="font-family: &quot;Tahoma&quot;,&quot;sans-serif&quot;;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">-
+Si dans l’élément «&nbsp;VehicleJourneyAtStop&nbsp;» identifié, la
+différence absolue entre la valeur de l’attribut de l’élément
+«&nbsp;arrivalTime&nbsp;» et la valeur de l’attribut de l’élément
+«&nbsp;departureTime&nbsp;» est inférieure à une valeur paramétrable
+XX, le test est validé, sinon le test est invalidé et fournit le
+message&nbsp;: «&nbsp;test 3.15.1&nbsp;: la différence absolue entre la
+valeur de l’attribut de l’élément «&nbsp;arrivalTime&nbsp;» et la
+valeur de l’attribut de l’élément «&nbsp;departureTime&nbsp;» est
+supérieure à une valeur paramétrable XX&nbsp;».</font></font></font></span></p>
diff --git a/app/views/test_sheet/3_16.html b/app/views/test_sheet/3_16.html
index 6b007bfcb..348ce9658 100644
--- a/app/views/test_sheet/3_16.html
+++ b/app/views/test_sheet/3_16.html
@@ -1,465 +1,160 @@
-<div class=WordSection1>
-</span></b>
-
-<p class=MsoTitle><span style='font-size:14.0pt;font-family:"Tahoma","sans-serif"'>Fiche
-du point de contr&ocirc;le N&deg;3.16</span></p>
-
-<p class=MsoNormal>&nbsp;</p>
-
-<table class=MsoNormalTable border=1 cellspacing=0 cellpadding=0 width=647
- style='width:485.45pt;border-collapse:collapse;border:none'>
- <tr style='page-break-inside:avoid'>
- <td width=647 colspan=2 valign=top style='width:485.45pt;border:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center'><i><span style='color:navy'>Description</span></i></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>Intitul&eacute;</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt'><span style='font-size:11.0pt;
- line-height:200%;font-family:"Tahoma","sans-serif"'>Coh&eacute;rence des courses</span></p>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:5.65pt 11.35pt 5.65pt 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>Objectif</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:5.65pt 11.35pt 5.65pt 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>V&eacute;rifier que les COURSEs (&laquo;&nbsp;VehicleJourney&nbsp;&raquo;)
- sont coh&eacute;rentes entre elles c&rsquo;est &agrave; dire que si deux COURSEs utilisent le
- m&ecirc;me TRONCON COMMERCIAL/Chouette (&laquo;&nbsp;PtLink&nbsp;&raquo;) A -&gt; B, les temps
- de parcours entre un POINT D&rsquo;ARR&Ecirc;T SUR PARCOURS (&laquo;&nbsp;StopPoint&nbsp;&raquo;) A
- et un POINT D&rsquo;ARR&Ecirc;T SUR PARCOURS (&laquo;&nbsp;StopPoint&nbsp;&raquo;) B doivent &ecirc;tre
- coh&eacute;rents et signaler les journ&eacute;es sans COURSE.</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>R&eacute;f&eacute;rences</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif";font-weight:normal'>TRIDENT/profil CHOUETTE/Transmodel
- V4 et V5.1</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>N&deg; de fiche(s) connexe(s)</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='text-align:left'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'>&nbsp;</span></h1>
- <h1 align=left style='text-align:left'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'>&nbsp;</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt'><b><span style='font-family:
- "Tahoma","sans-serif"'>Priorit&eacute;<span style='color:red'> </span></span></b></p>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif";font-weight:normal'>Obligatoire</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt'><b><span style='font-family:
- "Tahoma","sans-serif"'>R&eacute;sultat</span></b></p>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif";font-weight:normal'>D&eacute;livrance d&rsquo;un avertissement de
- mise en garde sur des cons&eacute;quences &eacute;ventuelles de dysfonctionnement</span></h1>
- </td>
- </tr>
- <tr style='page-break-inside:avoid'>
- <td width=647 colspan=2 valign=top style='width:485.45pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center'><i><span style='font-family:"Tahoma","sans-serif";
- color:navy'>Mise en &oelig;uvre</span></i></h1>
- </td>
- </tr>
- <tr>
- <td width=100 style='width:74.85pt;border:solid windowtext 1.0pt;border-top:
- none;padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>Explication</span></h1>
- </td>
- <td width=547 style='width:410.6pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt;text-align:justify;line-height:
- normal'><span style='font-family:"Tahoma","sans-serif"'>Si un TRONCON
- COMMERCIAL/Chouette (&laquo;&nbsp;PtLink&nbsp;&raquo;) A -&gt; B se retrouve dans
- plusieurs COURSEs(&laquo;&nbsp;VehicleJourney&nbsp;&raquo;), il faut v&eacute;rifier que les
- &eacute;carts horaires entre ces 2 POINTs D&rsquo;ARR&Ecirc;T SUR PARCOURS
- (&laquo;&nbsp;StopPoint&nbsp;&raquo;)<b> </b>sont coh&eacute;rents (fixer une fourchette de
- tol&eacute;rance). </span></p>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm;text-align:justify'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>On v&eacute;rifie qu&rsquo;il y a des COURSEs pour une
- journ&eacute;e donn&eacute;e dans la VERSION DES HORAIRES/Chouette
- (&laquo;&nbsp;Timetable&nbsp;&raquo;).</span></p>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>&nbsp;</span></p>
- </td>
- </tr>
-</table>
-
-<p class=MsoNormal>&nbsp;</p>
-
-<table class=MsoNormalTable border=1 cellspacing=0 cellpadding=0 width=647
- style='width:485.45pt;border-collapse:collapse;border:none'>
- <tr>
- <td width=115 valign=top style='width:86.0pt;border:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><b><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Exemple</span></b></p>
- </td>
- <td width=533 valign=top style='width:399.45pt;border:solid windowtext 1.0pt;
- border-left:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=left style='margin-left:18.0pt;text-align:left;text-indent:-18.0pt'><span
- style='font-size:11.0pt;font-weight:normal'>&nbsp;</span></h1>
- <p class=MsoNormal align=center style='text-align:center'><img width=432
- height=454 src="BATERI_Neptune_FINAL-V2_0a_fichiers/image025.jpg"></p>
- <p class=MsoNormal>&nbsp;</p>
- <p class=MsoNormal align=center style='text-align:center'><img width=433
- height=338 src="BATERI_Neptune_FINAL-V2_0a_fichiers/image020.jpg"></p>
- <p class=MsoNormal>&nbsp;</p>
- </td>
- </tr>
- <tr style='page-break-inside:avoid'>
- <td width=647 colspan=2 valign=top style='width:485.45pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h2 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center'><i><span lang=EN-US style='font-size:14.0pt;
- color:navy'>Evaluation</span></i></h2>
- </td>
- </tr>
- <tr>
- <td width=115 valign=top style='width:86.0pt;border:solid windowtext 1.0pt;
- border-top:none;padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span lang=EN-US style='font-size:11.0pt'>N&deg; test</span></h1>
- </td>
- <td width=533 style='width:399.45pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 align=left style='text-align:left'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'>Test 3.16.1</span></h1>
- </td>
- </tr>
- <tr>
- <td width=115 valign=top style='width:86.0pt;border:solid windowtext 1.0pt;
- border-top:none;padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt'>Libell&eacute;</span></h1>
- </td>
- <td width=533 style='width:399.45pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif";font-weight:normal'>Coh&eacute;rence horaire pour 2 COURSEs
- (&laquo;&nbsp;VehicleJourney&nbsp;&raquo;) utilisant le m&ecirc;me couple de POINTs D&rsquo;ARR&Ecirc;T SUR
- PARCOURS (&laquo;&nbsp;StopPoint&nbsp;&raquo;)</span></h1>
- </td>
- </tr>
- <tr>
- <td width=115 valign=top style='width:86.0pt;border:solid windowtext 1.0pt;
- border-top:none;padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt'>Champ d&rsquo;application</span></h1>
- </td>
- <td width=533 valign=top style='width:399.45pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>&nbsp;</span></h1>
- <h1><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>&lt;</span><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif";font-weight:normal'>vehicleJourneyAtStop</span><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>&gt;</span></h1>
- <p class=MsoNormal><span style='font-family:"Tahoma","sans-serif"'>&nbsp;</span></p>
- </td>
- </tr>
- <tr>
- <td width=115 valign=top style='width:86.0pt;border:solid windowtext 1.0pt;
- border-top:none;padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt'>V&eacute;rification</span></h1>
- </td>
- <td width=533 valign=top style='width:399.45pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>&nbsp;</span></h1>
- <p class=MsoNormal style='text-align:justify'><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'>- Si le fichier contient au moins deux
- objets &laquo;&nbsp;vehicleJourney&nbsp;&raquo; incluant au moins deux objets
- &laquo;&nbsp;vehicleJourneyAtStop&nbsp;&raquo; cons&eacute;cutifs, poursuivre le test, sinon le
- test est abandonn&eacute;.</span></p>
- <p class=MsoNormal style='text-align:justify'><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal style='text-align:justify'><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'>- Si pour deux objets
- &laquo;&nbsp;vehicleJourneyAtStop&nbsp;&raquo; successifs d&rsquo;une course
- &laquo;&nbsp;vehicleJourney&nbsp;&raquo;, il existe un autre couple
- &laquo;&nbsp;vehicleJourneyAtStop&nbsp;&raquo; successifs d&rsquo;une autre course
- &laquo;&nbsp;vehicleJourney&nbsp;&raquo; tel que les deux premiers
- &laquo;&nbsp;vehicleJourneyAtStop&nbsp;&raquo; poss&egrave;dent la m&ecirc;me valeur de l&rsquo;attribut de
- l&rsquo;&eacute;l&eacute;ment &laquo;&nbsp;stopPointId&nbsp;&raquo; et que les deux deuxi&egrave;mes
- &laquo;&nbsp;vehicleJourneyAtStop&nbsp;&raquo; poss&egrave;dent la m&ecirc;me valeur de l&rsquo;attribut de
- l&rsquo;&eacute;l&eacute;ment &lt;stopPointId&gt;, alors la diff&eacute;rence absolue entre la valeur de
- l&rsquo;attribut de l&rsquo;&eacute;l&eacute;ment &laquo;&nbsp;departureTime&nbsp;&raquo; du premier point d&rsquo;arr&ecirc;t
- et la valeur de l&rsquo;attribut de l&rsquo;&eacute;l&eacute;ment &laquo;&nbsp;arrivalTime&nbsp;&raquo; du second
- point d&rsquo;arr&ecirc;t du premier couple &laquo;&nbsp;vehicleJourneyAtStop&nbsp;&raquo; doit &ecirc;tre
- proche de la diff&eacute;rence absolue entre la valeur de l&rsquo;attribut de l&rsquo;&eacute;l&eacute;ment
- &laquo;&nbsp;departureTime&nbsp;&raquo; du premier point d&rsquo;arr&ecirc;t et la valeur de
- l&rsquo;attribut de l&rsquo;&eacute;l&eacute;ment &laquo;&nbsp;arrivalTime&nbsp;&raquo; du second point d&rsquo;arr&ecirc;t du
- deuxi&egrave;me couple &laquo;&nbsp;vehicleJourneyAtStop&nbsp;&raquo;, le test est valid&eacute;, sinon
- le test est invalid&eacute; et fournit le message d&rsquo;avertissement&nbsp;: &laquo;&nbsp;test
- 3.16.1&nbsp;: pour deux courses qui utilisent le m&ecirc;me couple de points A
- -&gt; B, les temps de parcours entre le point A et le point B ne sont pas
- coh&eacute;rents&nbsp;&raquo;.</span></p>
- <p class=MsoNormal style='text-align:justify'><b><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>&nbsp;</span></b></p>
- </td>
- </tr>
- <tr>
- <td width=115 valign=top style='width:86.0pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1><span style='font-size:11.0pt;font-weight:normal'>&nbsp;</span></h1>
- </td>
- <td width=533 valign=top style='width:399.45pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1><span style='font-size:11.0pt;font-weight:normal'>&nbsp;</span></h1>
- </td>
- </tr>
- <tr>
- <td width=115 valign=top style='width:86.0pt;border:solid windowtext 1.0pt;
- border-top:none;padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span lang=EN-US style='font-size:11.0pt'>N&deg; test</span></h1>
- </td>
- <td width=533 style='width:399.45pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 align=left style='text-align:left'><span lang=EN-US style='font-size:
- 11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Test 3.16.2</span></h1>
- </td>
- </tr>
- <tr>
- <td width=115 valign=top style='width:86.0pt;border:solid windowtext 1.0pt;
- border-top:none;padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt'>Libell&eacute;</span></h1>
- </td>
- <td width=533 style='width:399.45pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif";font-weight:normal'>V&eacute;rification que la VERSION DES
- HORAIREs/Chouette (&laquo;&nbsp;Timetable&nbsp;&raquo;) contient des COURSEs
- (&laquo;&nbsp;VehicleJourney&nbsp;&raquo;)</span></h1>
- </td>
- </tr>
- <tr>
- <td width=115 valign=top style='width:86.0pt;border:solid windowtext 1.0pt;
- border-top:none;padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt'>Champ d&rsquo;application</span></h1>
- </td>
- <td width=533 valign=top style='width:399.45pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>&nbsp;</span></h1>
- <h1><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>&lt;vehicleJourney&gt;</span></h1>
- <p class=MsoNormal><u><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>&lt;Timetable&gt;</span></u></p>
- <p class=MsoNormal><u><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'><span
- style='text-decoration:none'>&nbsp;</span></span></u></p>
- </td>
- </tr>
- <tr>
- <td width=115 valign=top style='width:86.0pt;border:solid windowtext 1.0pt;
- border-top:none;padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt'>V&eacute;rification</span></h1>
- </td>
- <td width=533 valign=top style='width:399.45pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>&nbsp;</span></h1>
- <p class=MsoBodyText>- Si l&rsquo;&eacute;l&eacute;ment &laquo;&nbsp;vehicleJourney&nbsp;&raquo;, mentionn&eacute;
- dans les champs d&rsquo;application, est pr&eacute;sent une ou plusieurs fois , poursuivre
- le test, sinon le test est abandonn&eacute;.</p>
- <p class=MsoNormal style='text-align:justify'><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal style='text-align:justify'><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'>- Si l&rsquo;identifiant de l&rsquo;objet &laquo;&nbsp;</span><span
- style='font-size:11.0pt;font-family:"Arial","sans-serif"'>vehicleJourney</span><span
- style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&nbsp;&raquo; d&eacute;tect&eacute; est
- pr&eacute;sent dans l&rsquo;objet &laquo;&nbsp;TimeTable&nbsp;&raquo;, le test est valid&eacute;, sinon le
- test est invalid&eacute; et fournit un message d&rsquo;avertissement &laquo;&nbsp;test
- 3.16.2&nbsp;: La course &laquo;&nbsp;</span><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'>vehicleJourney</span><span
- style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&nbsp;&raquo; dont
- l&rsquo;identifiant est &laquo;&nbsp;ObjecId&nbsp;&raquo; n&rsquo;est pas r&eacute;f&eacute;renc&eacute;e dans l&rsquo;objet
- &laquo;&nbsp;TimeTable&nbsp;&raquo;&nbsp;&raquo;.</span></p>
- <p class=MsoNormal style='text-align:justify'><b><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>&nbsp;</span></b></p>
- </td>
- </tr>
- <tr>
- <td width=115 valign=top style='width:86.0pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span lang=EN-US style='font-size:11.0pt'>N&deg; test</span></h1>
- </td>
- <td width=533 style='width:399.45pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=left style='text-align:left'><span lang=EN-US style='font-size:
- 11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>Test 3.16.3</span></h1>
- </td>
- </tr>
- <tr>
- <td width=115 valign=top style='width:86.0pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt'>Libell&eacute;</span></h1>
- </td>
- <td width=533 valign=top style='width:399.45pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif";font-weight:normal'>V&eacute;rification de coh&eacute;rence des
- HEUREs DE PASSAGE GRAPHIQUEEs/Chouette (&laquo;&nbsp;VehicleJourneyAtStop&nbsp;&raquo;)
- entre 2 POINTs D&rsquo;ARR&Ecirc;T SUR PARCOURS (&laquo;&nbsp;StopPoint&nbsp;&raquo;) cons&eacute;cutifs dans
- une COURSE (&laquo;&nbsp;VehicleJourney&nbsp;&raquo;)</span></h1>
- </td>
- </tr>
- <tr>
- <td width=115 valign=top style='width:86.0pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt'>Champ d&rsquo;application</span></h1>
- </td>
- <td width=533 valign=top style='width:399.45pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&lt;VehicleJourney&gt;</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&lt;VehicleJourneyAtStop&gt;</span></p>
- <h1><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>&nbsp;</span></h1>
- </td>
- </tr>
- <tr>
- <td width=115 valign=top style='width:86.0pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt'>V&eacute;rification</span></h1>
- </td>
- <td width=533 valign=top style='width:399.45pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>&nbsp;</span></h1>
- <p class=MsoNormal style='text-align:justify'><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'>- Si le fichier contient un &eacute;l&eacute;ment
- &laquo;&nbsp;vehicleJourney&nbsp;&raquo; incluant au moins deux &eacute;l&eacute;ments
- &laquo;&nbsp;vehicleJourneyAtStop&nbsp;&raquo; cons&eacute;cutifs, poursuivre le test, sinon le
- test est abandonn&eacute;.</span></p>
- <p class=MsoNormal style='text-align:justify'><span style='font-family:"Tahoma","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal style='text-align:justify'><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'>- Si entre deux &eacute;l&eacute;ments
- &laquo;&nbsp;vehicleJourneyAtStop&nbsp;&raquo; successifs, la diff&eacute;rence absolue entre la
- valeur de l&rsquo;attribut de l&rsquo;&eacute;l&eacute;ment &laquo;&nbsp;departureTime&nbsp;&raquo; du premier
- point d&rsquo;arr&ecirc;t et la valeur de l&rsquo;attribut de l&rsquo;&eacute;l&eacute;ment &laquo;&nbsp;arrivalTime&nbsp;&raquo;
- du second point d&rsquo;arr&ecirc;t est inf&eacute;rieur &agrave; une valeur param&eacute;trable ZZ,
- poursuivre le test, sinon le test est invalid&eacute; et fournit le message&nbsp;:
- &laquo;&nbsp;test 3.16.3a&nbsp;: entre deux &eacute;l&eacute;ments
- &laquo;&nbsp;vehicleJourneyAtStop&nbsp;&raquo; successifs, la diff&eacute;rence absolue entre la
- valeur de l&rsquo;attribut de l&rsquo;&eacute;l&eacute;ment &laquo;&nbsp;departureTime&nbsp;&raquo; du premier
- point d&rsquo;arr&ecirc;t et la valeur de l&rsquo;attribut de l&rsquo;&eacute;l&eacute;ment
- &laquo;&nbsp;arrivalTime&nbsp;&raquo; du second point d&rsquo;arr&ecirc;t est sup&eacute;rieure &agrave; une valeur
- param&eacute;trable ZZ&nbsp;&raquo;</span></p>
- <p class=MsoNormal style='text-align:justify'><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal style='text-align:justify'><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'>- Si entre deux &eacute;l&eacute;ments
- &laquo;&nbsp;vehicleJourneyAtStop&nbsp;&raquo; successifs, la valeur de l&rsquo;attribut de
- l&rsquo;&eacute;l&eacute;ment &laquo;&nbsp;departureTime&nbsp;&raquo; du premier point d&rsquo;arr&ecirc;t est inf&eacute;rieure
- (ou &eacute;gale, dans le cas de points rapproch&eacute;s) &agrave; la valeur de l&rsquo;attribut de
- l&rsquo;&eacute;l&eacute;ment &lt;arrivalTime&gt; du second point d&rsquo;arr&ecirc;t alors le test est
- valid&eacute;, sinon poursuivre le test.</span></p>
- <p class=MsoNormal style='text-align:justify'><span style='font-family:"Tahoma","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal style='text-align:justify'><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'>- Si entre deux &eacute;l&eacute;ments
- &laquo;&nbsp;vehicleJourneyAtStop&nbsp;&raquo; successifs, la valeur de l&rsquo;attribut de
- l&rsquo;&eacute;l&eacute;ment &laquo;&nbsp;departureTime&nbsp;&raquo; du premier point d&rsquo;arr&ecirc;t est sup&eacute;rieure
- &agrave; la valeur de l&rsquo;attribut de l&rsquo;&eacute;l&eacute;ment &laquo;&nbsp;arrivalTime&nbsp;&raquo; du second point
- d&rsquo;arr&ecirc;t et que la valeur de l&rsquo;attribut de l&rsquo;&eacute;l&eacute;ment
- &laquo;&nbsp;arrivalTime&nbsp;&raquo; du second point d&rsquo;arr&ecirc;t est inf&eacute;rieure &agrave; une valeur
- param&eacute;trable WW alors le test est valid&eacute;, sinon le test est invalid&eacute; et
- fournit le message&nbsp;: &laquo;&nbsp;test 3.16.3b&nbsp;: entre deux &eacute;l&eacute;ments
- &laquo;&nbsp;vehicleJourneyAtStop&nbsp;&raquo; successifs, la valeur de l&rsquo;attribut de
- l&rsquo;&eacute;l&eacute;ment &laquo;&nbsp;departureTime&nbsp;&raquo; du premier point d&rsquo;arr&ecirc;t est inf&eacute;rieure
- &agrave; la valeur de l&rsquo;attribut de l&rsquo;&eacute;l&eacute;ment &laquo;&nbsp;arrivalTime&nbsp;&raquo; du second
- point d&rsquo;arr&ecirc;t ou la valeur de l&rsquo;attribut de l&rsquo;&eacute;l&eacute;ment
- &laquo;&nbsp;arrivalTime&nbsp;&raquo; du second point d&rsquo;arr&ecirc;t est sup&eacute;rieure &agrave; une valeur
- param&eacute;trable WW&nbsp;&raquo;</span></p>
- <p class=MsoNormal><b><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>&nbsp;</span></b></p>
- </td>
- </tr>
-</table>
-
-
-</div>
+<h1 class="western" style="border: 1pt solid rgb(0, 0, 0); padding: 0.05cm 0.12cm; margin-top: 0.21cm;" align="center">
+<font face="Arial, sans-serif"><font style="font-size: 20pt;" size="5"><i>
+ point de contrôle N°3.16<br>
+Cohérence des courses<br>
+</i></font></font></h1>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Objectif: </b></u>
+Vérifier que les COURSEs («&nbsp;VehicleJourney&nbsp;») sont cohérentes
+entre elles c’est à dire que si deux COURSEs utilisent le même TRONCON
+COMMERCIAL/Chouette («&nbsp;PtLink&nbsp;») A -&gt; B, les temps de
+parcours entre un POINT D’ARRÊT SUR PARCOURS («&nbsp;StopPoint&nbsp;»)
+A et un POINT D’ARRÊT SUR PARCOURS («&nbsp;StopPoint&nbsp;») B doivent
+être cohérents et signaler les journées sans COURSE.<br>
+</font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Priorité: </b></u> Obligatoire</font></p><font face="Arial, sans-serif">
+</font><p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><u><b>Explications:</b></u>
+</font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Si un TRONCON COMMERCIAL/Chouette («&nbsp;PtLink&nbsp;») A -&gt; B se
+retrouve dans plusieurs COURSEs («&nbsp;VehicleJourney&nbsp;»), il faut
+vérifier que les écarts horaires entre ces 2 POINTs D’ARRÊT SUR
+PARCOURS («&nbsp;StopPoint&nbsp;»)<b> </b>sont cohérents (fixer une fourchette de tolérance).</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+On vérifie qu’il y a des COURSEs pour une journée donnée dans la VERSION DES HORAIRES/Chouette («&nbsp;Timetable&nbsp;»).</font></font></font></p>
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>Exemple: </u></b></font></font></font></p>
+<p><font face="Arial, sans-serif"><img src="image025.jpg" height="454" width="432"></font></p>
+<p><font face="Arial, sans-serif"><img src="image020.jpg" height="338" width="433"></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>N° test:</u></b>
+Test 3.16.1</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Libellé:</u> Cohérence horaire pour 2 COURSEs
+(«&nbsp;VehicleJourney&nbsp;») utilisant le même couple de POINTs
+D’ARRÊT SUR PARCOURS («&nbsp;StopPoint&nbsp;»)</font></font></font></p>
+
+
+
+
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2"><span style="text-decoration: underline;">
+Champ d’application:</span>&nbsp;&lt;VehicleJourneyAtStop&gt;&nbsp;&nbsp;</font></font></font></p>
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Vérification:</u>&nbsp;</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si le fichier contient au moins deux objets
+«&nbsp;vehicleJourney&nbsp;» incluant au moins deux objets
+«&nbsp;vehicleJourneyAtStop&nbsp;» consécutifs, poursuivre le test,
+sinon le test est abandonné.</font></font></font></p>
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si pour deux objets «&nbsp;vehicleJourneyAtStop&nbsp;» successifs
+d’une course «&nbsp;vehicleJourney&nbsp;», il existe un autre couple
+«&nbsp;vehicleJourneyAtStop&nbsp;» successifs d’une autre course
+«&nbsp;vehicleJourney&nbsp;» tel que les deux premiers
+«&nbsp;vehicleJourneyAtStop&nbsp;» possèdent la même valeur de
+l’attribut de l’élément «&nbsp;stopPointId&nbsp;» et que les deux
+deuxièmes «&nbsp;vehicleJourneyAtStop&nbsp;» possèdent la même valeur
+de l’attribut de l’élément &lt;stopPointId&gt;, alors la différence
+absolue entre la valeur de l’attribut de l’élément
+«&nbsp;departureTime&nbsp;» du premier point d’arrêt et la valeur de
+l’attribut de l’élément «&nbsp;arrivalTime&nbsp;» du second point
+d’arrêt du premier couple «&nbsp;vehicleJourneyAtStop&nbsp;» doit être
+proche de la différence absolue entre la valeur de l’attribut de
+l’élément «&nbsp;departureTime&nbsp;» du premier point d’arrêt et la
+valeur de l’attribut de l’élément «&nbsp;arrivalTime&nbsp;» du second
+point d’arrêt du deuxième couple «&nbsp;vehicleJourneyAtStop&nbsp;», le
+test est validé, sinon le test est invalidé et fournit le message
+d’avertissement&nbsp;: «&nbsp;test 3.16.1&nbsp;: pour deux courses qui
+utilisent le même couple de points A -&gt; B, les temps de parcours
+entre le point A et le point B ne sont pas cohérents&nbsp;».</font></font></font></p>
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>N° test:</u></b>
+Test 3.16.2</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Libellé:</u> Vérification que la VERSION DES HORAIREs/Chouette
+(«&nbsp;Timetable&nbsp;») contient des COURSEs
+(«&nbsp;VehicleJourney&nbsp;»)</font></font></font></p>
+
+
+
+
+
+
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Champ d’application:&nbsp;&lt;vehicleJourney&gt; &lt;Timetable&gt;<br><br><u>Vérification:</u>&nbsp;</font></font></font></p>
+
+
+
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">-
+Si l’élément « vehicleJourney », mentionné dans les champs
+d’application, est présent une ou plusieurs fois , poursuivre le test,
+sinon le test est abandonné.</font></font></font></p><p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">- Si l’identifiant de l’objet «&nbsp;vehicleJourney&nbsp;»
+détecté est présent dans l’objet «&nbsp;TimeTable&nbsp;», le test est
+validé, sinon le test est invalidé et fournit un message
+d’avertissement «&nbsp;test 3.16.2&nbsp;: La course «&nbsp;vehicleJourney&nbsp;» dont l’identifiant est «&nbsp;ObjecId&nbsp;» n’est pas référencée dans l’objet «&nbsp;TimeTable&nbsp;».</font></font></font></p>
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>N° test:</u></b>
+Test 3.16.3</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Libellé:</u> Vérification de cohérence des HEUREs DE PASSAGE
+GRAPHIQUEEs/Chouette («&nbsp;VehicleJourneyAtStop&nbsp;») entre 2
+POINTs D’ARRÊT SUR PARCOURS («&nbsp;StopPoint&nbsp;») consécutifs dans
+une COURSE («&nbsp;VehicleJourney&nbsp;»)</font></font></font></p>
+
+
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2"><span style="text-decoration: underline;">
+Champ d’application:&nbsp;</span>&nbsp;&lt;VehicleJourney&gt;&nbsp;&lt;VehicleJourneyAtStop&gt;</font></font></font></p>
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Vérification:</u> </font></font></font></p>
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si le fichier contient un élément «&nbsp;vehicleJourney&nbsp;»
+incluant au moins deux éléments «&nbsp;vehicleJourneyAtStop&nbsp;»
+consécutifs, poursuivre le test, sinon le test est abandonné.</font></font></font></p>
+
+
+
+
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si entre deux éléments «&nbsp;vehicleJourneyAtStop&nbsp;» successifs,
+la différence absolue entre la valeur de l’attribut de l’élément
+«&nbsp;departureTime&nbsp;» du premier point d’arrêt et la valeur de
+l’attribut de l’élément «&nbsp;arrivalTime&nbsp;» du second point
+d’arrêt est inférieur à une valeur paramétrable ZZ, poursuivre le test,
+sinon le test est invalidé et fournit le message&nbsp;: «&nbsp;test
+3.16.3a&nbsp;: entre deux éléments «&nbsp;vehicleJourneyAtStop&nbsp;»
+successifs, la différence absolue entre la valeur de l’attribut de
+l’élément «&nbsp;departureTime&nbsp;» du premier point d’arrêt et la
+valeur de l’attribut de l’élément «&nbsp;arrivalTime&nbsp;» du second
+point d’arrêt est supérieure à une valeur paramétrable ZZ&nbsp;</font></font></font></p><p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">-
+Si entre deux éléments «&nbsp;vehicleJourneyAtStop&nbsp;» successifs,
+la valeur de l’attribut de l’élément «&nbsp;departureTime&nbsp;» du
+premier point d’arrêt est inférieure (ou égale, dans le cas de points
+rapprochés) à la valeur de l’attribut de l’élément &lt;arrivalTime&gt;
+du second point d’arrêt alors le test est validé, sinon poursuivre le
+test.</font></font></font></p><p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">-
+Si entre deux éléments «&nbsp;vehicleJourneyAtStop&nbsp;» successifs,
+la valeur de l’attribut de l’élément «&nbsp;departureTime&nbsp;» du
+premier point d’arrêt est supérieure à la valeur de l’attribut de
+l’élément «&nbsp;arrivalTime&nbsp;» du second point d’arrêt et que la
+valeur de l’attribut de l’élément «&nbsp;arrivalTime&nbsp;» du second
+point d’arrêt est inférieure à une valeur paramétrable WW alors le test
+est validé, sinon le test est invalidé et fournit le message&nbsp;:
+«&nbsp;test 3.16.3b&nbsp;: entre deux éléments
+«&nbsp;vehicleJourneyAtStop&nbsp;» successifs, la valeur de l’attribut
+de l’élément «&nbsp;departureTime&nbsp;» du premier point d’arrêt est
+inférieure à la valeur de l’attribut de l’élément
+«&nbsp;arrivalTime&nbsp;» du second point d’arrêt ou la valeur de
+l’attribut de l’élément «&nbsp;arrivalTime&nbsp;» du second point
+d’arrêt est supérieure à une valeur paramétrable WW&nbsp;»</font></font></font></p>
+
diff --git a/app/views/test_sheet/3_17.html b/app/views/test_sheet/3_17.html
index 530526ca2..be2d52ce6 100644
--- a/app/views/test_sheet/3_17.html
+++ b/app/views/test_sheet/3_17.html
@@ -1,242 +1,51 @@
-<div class=WordSection1>
-</span></b>
-
-<p class=MsoTitle><span style='font-size:14.0pt;font-family:"Tahoma","sans-serif"'>Fiche
-du point de contr&ocirc;le N&deg; 3.17</span></p>
-
-<p class=MsoNormal>&nbsp;</p>
-
-<table class=MsoNormalTable border=1 cellspacing=0 cellpadding=0 width=638
- style='width:478.4pt;border-collapse:collapse;border:none'>
- <tr style='page-break-inside:avoid'>
- <td width=638 colspan=2 valign=top style='width:478.4pt;border:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center'><i><span style='color:navy'>Description</span></i></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>Intitul&eacute;</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt'><span style='font-size:11.0pt;
- line-height:200%;font-family:"Tahoma","sans-serif"'>Mod&egrave;le de repr&eacute;sentation
- des coordonn&eacute;es des points d&rsquo;acc&egrave;s</span></p>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>Objectif</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif";font-weight:normal'>V&eacute;rifier que les coordonn&eacute;es des
- POINTs D&rsquo;ACCES (&laquo;&nbsp;AccessPoint&nbsp;&raquo;) sont dans un m&ecirc;me syst&egrave;me
- g&eacute;od&eacute;sique ou un m&ecirc;me syst&egrave;me de projection</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>R&eacute;f&eacute;rences</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif";font-weight:normal'>TRIDENT/profil NEPTUNE/Transmodel
- V4 et V5.1</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>N&deg; de fiche(s) connexe(s)</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='text-align:left'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'>&nbsp;</span></h1>
- <h1 align=left style='text-align:left'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'>&nbsp;</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt'><b><span style='font-family:
- "Tahoma","sans-serif"'>Priorit&eacute;<span style='color:red'> </span></span></b></p>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif";font-weight:normal'>Obligatoire</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt'><b><span style='font-family:
- "Tahoma","sans-serif"'>R&eacute;sultat</span></b></p>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif";font-weight:normal'>Conforme ou non conforme</span></h1>
- </td>
- </tr>
- <tr style='page-break-inside:avoid'>
- <td width=638 colspan=2 valign=top style='width:478.4pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center'><i><span style='color:navy'>Mise en &oelig;uvre</span></i></h1>
- </td>
- </tr>
- <tr>
- <td width=100 style='width:74.85pt;border:solid windowtext 1.0pt;border-top:
- none;padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>Explication</span></h1>
- </td>
- <td width=538 style='width:403.55pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt;line-height:normal'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Dans un m&ecirc;me jeu
- de donn&eacute;es, chaque POINT D&rsquo;ACCES (&laquo;&nbsp;AccessPoint&nbsp;&raquo;) doit &ecirc;tre
- repr&eacute;sent&eacute; g&eacute;ographiquement de la m&ecirc;me mani&egrave;re et dans un syst&egrave;me de
- repr&eacute;sentation g&eacute;ographique identique. On v&eacute;rifiera &eacute;galement qu&rsquo;il n&rsquo;y a pas
- d&rsquo;aberration comme des coordonn&eacute;es g&eacute;ographiques nulles ou situ&eacute;es hors d&rsquo;une
- zone dont le p&eacute;rim&egrave;tre ou le contour est &agrave; d&eacute;finir.</span></p>
- </td>
- </tr>
-</table>
-
-<p class=MsoNormal>&nbsp;</p>
-
-<table class=MsoNormalTable border=1 cellspacing=0 cellpadding=0 width=638
- style='width:478.4pt;border-collapse:collapse;border:none'>
- <tr>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><b><span lang=EN-US style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>Exemple</span></b></p>
- </td>
- <td width=538 valign=top style='width:403.55pt;border:solid windowtext 1.0pt;
- border-left:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 style='margin-left:18.0pt;text-indent:-18.0pt'><span lang=EN-US>&nbsp;</span></h1>
- <h1 style='margin-left:18.0pt;text-indent:-18.0pt'><span lang=EN-US><img
- width=376 height=595 src="BATERI_Neptune_FINAL-V2_0a_fichiers/image026.jpg"></span></h1>
- <p class=MsoNormal><span lang=EN-US>&nbsp;</span></p>
- </td>
- </tr>
- <tr style='page-break-inside:avoid'>
- <td width=638 colspan=2 valign=top style='width:478.4pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h2 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center'><i><span lang=EN-US style='font-size:14.0pt;
- color:navy'>Evaluation</span></i></h2>
- </td>
- </tr>
- <tr>
- <td width=100 valign=top style='width:74.85pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span lang=EN-US style='font-size:11.0pt'>N&deg; test</span></h1>
- </td>
- <td width=538 style='width:403.55pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>Test
- 3.17.1</span></p>
- </td>
- </tr>
- <tr>
- <td width=100 valign=top style='width:74.85pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt'>Libell&eacute;</span></h1>
- </td>
- <td width=538 valign=top style='width:403.55pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Test
- des coordonn&eacute;es g&eacute;ographiques de chaque POINT D&rsquo;ACCES
- (&laquo;&nbsp;AccessPoint&nbsp;&raquo;) par rapport &agrave; un mod&egrave;le de projection de
- r&eacute;f&eacute;rence.</span></p>
- </td>
- </tr>
- <tr>
- <td width=100 valign=top style='width:74.85pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt'>Champ d&rsquo;application</span></h1>
- </td>
- <td width=538 valign=top style='width:403.55pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <p class=MsoHeader style='margin-top:6.0pt'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>&lt;AccessPoint&gt;</span></p>
- </td>
- </tr>
- <tr>
- <td width=100 valign=top style='width:74.85pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt'>V&eacute;rification</span></h1>
- </td>
- <td width=538 valign=top style='width:403.55pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <p class=MsoNormal><span style='font-family:"Tahoma","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>Soit
- PJ la projection de r&eacute;f&eacute;rence.</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>-
- Si l&rsquo;objet &laquo;&nbsp;AccessPoint&nbsp;&raquo; est pr&eacute;sent une ou plusieurs fois,
- poursuivre le test, sinon le test est abandonn&eacute;.</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>-
- Si la valeur de l&rsquo;attribut de l&rsquo;&eacute;l&eacute;ment &laquo;&nbsp;longLatType&nbsp;&raquo; contenu
- dans l&rsquo;&eacute;l&eacute;ment &laquo;&nbsp;AccessPoint&nbsp;&raquo; est diff&eacute;rente de PJ alors le test
- fournit le message d'avertissement&nbsp;: &laquo;&nbsp;test 3.17.1&nbsp;: le point
- d&rsquo;acc&egrave;s d&rsquo;identifiant &laquo;&nbsp;ObjectId&nbsp;&raquo; n&rsquo;est pas dans le bon syst&egrave;me de
- projection&nbsp;ou ses coordonn&eacute;es g&eacute;ographiques sont nulles ou il est situ&eacute;
- hors d&rsquo;une zone dont le p&eacute;rim&egrave;tre ou le contour est &agrave; d&eacute;finir.&raquo;</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>-
- Sinon le test est valid&eacute;.</span></p>
- </td>
- </tr>
-</table>
-
-<p class=MsoNormal>&nbsp;</p>
-
-</div>
-
+<h1 class="western" style="border: 1pt solid rgb(0, 0, 0); padding: 0.05cm 0.12cm; margin-top: 0.21cm;" align="center">
+<font face="Arial, sans-serif"><font style="font-size: 20pt;" size="5"><i>
+ point de contrôle N° 3.17<br>Représentation des coordonnées des points d’accès<br>
+</i></font></font></h1>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Objectif: </b></u>
+Vérifier que les coordonnées des POINTs D’ACCES
+(«&nbsp;AccessPoint&nbsp;») sont dans un même système géodésique ou un
+même système de projection<br>
+</font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Priorité: </b></u> Obligatoire</font></p><font face="Arial, sans-serif">
+</font><p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><u><b>Explications:</b></u>
+</font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Dans un même jeu de données, chaque POINT D’ACCES
+(«&nbsp;AccessPoint&nbsp;») doit être représenté géographiquement de la
+même manière et dans un système de représentation géographique
+identique. On vérifiera également qu’il n’y a pas d’aberration comme
+des coordonnées géographiques nulles ou situées hors d’une zone dont le
+périmètre ou le contour est à définir.</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>Exemple: </u></b></font></font></font></p>
+<p><font face="Arial, sans-serif"><img src="image026.jpg" height="595" width="376"></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>N° test:</u></b>
+Test 3.17.1</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Libellé:</u> Test des coordonnées géographiques de chaque POINT
+D’ACCES («&nbsp;AccessPoint&nbsp;») par rapport à un modèle de
+projection de référence.</font></font></font></p>
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Champ d’application:&nbsp;&lt;AccessPoint&gt;</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Vérification:</u> </font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Soit PJ la projection de référence.</font></font></font></p>
+
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si l’objet «&nbsp;AccessPoint&nbsp;» est présent une ou plusieurs fois, poursuivre le test, sinon le test est abandonné&nbsp;</font></font></font></p>
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si la valeur de l’attribut de l’élément «&nbsp;longLatType&nbsp;»
+contenu dans l’élément «&nbsp;AccessPoint&nbsp;» est différente de PJ
+alors le test fournit le message d'avertissement&nbsp;: «&nbsp;test
+3.17.1&nbsp;: le point d’accès d’identifiant «&nbsp;ObjectId&nbsp;»
+n’est pas dans le bon système de projection&nbsp;ou ses coordonnées
+géographiques sont nulles ou il est situé hors d’une zone dont le
+périmètre ou le contour est à définir.»&nbsp;</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Sinon le test est validé.</font></font></font></p>
diff --git a/app/views/test_sheet/3_18.html b/app/views/test_sheet/3_18.html
index d9c26f0cb..b40896dfb 100644
--- a/app/views/test_sheet/3_18.html
+++ b/app/views/test_sheet/3_18.html
@@ -1,257 +1,65 @@
-<div class=WordSection1>
-</span></b>
+<h1 class="western" style="border: 1pt solid rgb(0, 0, 0); padding: 0.05cm 0.12cm; margin-top: 0.21cm;" align="center">
+<font face="Arial, sans-serif"><font style="font-size: 20pt;" size="5"><i>
+ point de contrôle N° 3.18<br>
+Localisation des points d’accès dans un périmètre<br>
+</i></font></font></h1>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Objectif: </b></u>
+S’assurer que les coordonnées
+des POINTs D’ACCES («&nbsp;AccessPoint&nbsp;») du jeu de données sont
+situées à l’intérieur d’un périmètre défini.<br>
+</font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Priorité: </b></u> Obligatoire</font></p><font face="Arial, sans-serif">
+</font><p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><u><b>Explications:</b></u>
+</font></font></p>
-<p class=MsoTitle><span style='font-size:14.0pt;font-family:"Tahoma","sans-serif"'>Fiche
-du point de contr&ocirc;le N&deg; 3.18</span></p>
-<p class=MsoNormal>&nbsp;</p>
-<table class=MsoNormalTable border=1 cellspacing=0 cellpadding=0 width=647
- style='width:485.45pt;border-collapse:collapse;border:none'>
- <tr style='page-break-inside:avoid'>
- <td width=647 colspan=2 valign=top style='width:485.45pt;border:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center'><i><span style='color:navy'>Description</span></i></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt'>Intitul&eacute;</span></h1>
- </td>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt;text-align:justify'><span
- style='font-size:11.0pt;line-height:200%;font-family:"Tahoma","sans-serif"'>Localisation
- des points d&rsquo;acc&egrave;s &agrave; l&rsquo;int&eacute;rieur d&rsquo;un p&eacute;rim&egrave;tre d&eacute;fini.</span></p>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt'>Objectif</span></h1>
- </td>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>S&rsquo;assurer que les </span><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'>coordonn&eacute;es des POINTs
- D&rsquo;ACCES (&laquo;&nbsp;AccessPoint&nbsp;&raquo;) du jeu de donn&eacute;es sont situ&eacute;es &agrave;
- l&rsquo;int&eacute;rieur d&rsquo;un p&eacute;rim&egrave;tre d&eacute;fini.</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt'>R&eacute;f&eacute;rences</span></h1>
- </td>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>TRIDENT/profil NEPTUNE/Transmodel V4 et V5.1</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt'>N&deg;de fiche(s) connexe(s)</span></h1>
- </td>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>&nbsp;</span></h1>
- <h1><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>&nbsp;</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt'><b><span style='font-family:
- "Tahoma","sans-serif"'>Priorit&eacute;<span style='color:red'> </span></span></b></p>
- </td>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>Obligatoire</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt'><b><span style='font-family:
- "Tahoma","sans-serif"'>R&eacute;sultat</span></b></p>
- </td>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>D&eacute;livrance d&rsquo;un avertissement de mise en garde sur des
- cons&eacute;quences &eacute;ventuelles de dysfonctionnement</span></h1>
- </td>
- </tr>
- <tr style='page-break-inside:avoid'>
- <td width=647 colspan=2 valign=top style='width:485.45pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center'><i><span style='font-family:"Tahoma","sans-serif";
- color:navy'>Mise en &oelig;uvre</span></i></h1>
- </td>
- </tr>
- <tr>
- <td width=100 style='width:74.85pt;border:solid windowtext 1.0pt;border-top:
- none;padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>Explication</span></h1>
- </td>
- <td width=547 style='width:410.6pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm;text-align:justify'><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'>Si le jeu de donn&eacute;es appartient &agrave; un
- exploitant dont le r&eacute;seau dessert un groupe de communes, les coordonn&eacute;es des </span><span
- style='font-size:11.0pt;font-family:"Arial","sans-serif"'>POINTs D&rsquo;ACCES
- (&laquo;&nbsp;AccessPoint&nbsp;&raquo;)</span><b><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'> </span></b><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'> doivent se situer dans cette zone. </span></p>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm;text-align:justify'><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'>Ce point de contr&ocirc;le consiste donc &agrave;
- v&eacute;rifier que les coordonn&eacute;es en latitude et longitude de chaque </span><span
- style='font-size:11.0pt;font-family:"Arial","sans-serif"'>POINT D&rsquo;ACCES
- (&laquo;&nbsp;AccessPoint&nbsp;&raquo;)</span><b><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'> </span></b><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'>sont incluses dans un territoire d&eacute;limit&eacute;.</span></p>
- </td>
- </tr>
-</table>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Si le jeu de données appartient à un exploitant dont le réseau dessert un groupe de communes, les coordonnées des&nbsp;POINTs D’ACCES («&nbsp;AccessPoint&nbsp;»)&nbsp;doivent se situer dans cette zone.</font></font></font></p>
-<p class=MsoNormal>&nbsp;</p>
-<table class=MsoNormalTable border=1 cellspacing=0 cellpadding=0 width=638
- style='width:478.4pt;border-collapse:collapse;border:none'>
- <tr>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><b><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Exemple</span></b></p>
- </td>
- <td width=538 valign=top style='width:403.55pt;border:solid windowtext 1.0pt;
- border-left:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 style='margin-left:18.0pt;text-indent:-18.0pt'>&nbsp;</h1>
- <h1 style='margin-left:18.0pt;text-indent:-18.0pt'><span lang=EN-US><img
- width=406 height=643 src="BATERI_Neptune_FINAL-V2_0a_fichiers/image027.gif"></span></h1>
- <p class=MsoNormal><span lang=EN-US>&nbsp;</span></p>
- </td>
- </tr>
- <tr style='page-break-inside:avoid'>
- <td width=638 colspan=2 valign=top style='width:478.4pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h2 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center'><i><span lang=EN-US style='font-size:14.0pt;
- color:navy'>Evaluation</span></i></h2>
- </td>
- </tr>
- <tr>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span lang=EN-US style='font-size:11.0pt'>N&deg; test</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>Test
- 3.18.1</span></p>
- </td>
- </tr>
- <tr>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt'>Libell&eacute;</span></h1>
- </td>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>V&eacute;rification
- que les coordonn&eacute;es de chaque </span><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'>POINT D&rsquo;ACCES (&laquo;&nbsp;AccessPoint&nbsp;&raquo;)</span><b><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'> </span></b><span
- style='font-size:11.0pt;font-family:"Arial","sans-serif"'>sont inscrites dans
- une zone d&eacute;termin&eacute;e et qu&rsquo;elles sont dans le bon syst&egrave;me de projection.</span></p>
- </td>
- </tr>
- <tr>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt'>Champ d&rsquo;application</span></h1>
- </td>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <p class=MsoHeader style='margin-top:6.0pt'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>&lt;AccessPoint&gt;</span></p>
- </td>
- </tr>
- <tr>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt'>V&eacute;rification</span></h1>
- </td>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>Soit
- PG le polygone de la zone couverte par le r&eacute;seau dans une projection PJ.</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal style='text-align:justify'><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'>- Si l&rsquo;objet &laquo;&nbsp;AccessPoint&nbsp;&raquo;
- mentionn&eacute; dans les champs d&rsquo;application est pr&eacute;sent une ou plusieurs fois,
- poursuivre le test, sinon le test est abandonn&eacute;.</span></p>
- <p class=MsoNormal style='text-align:justify'><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal style='text-align:justify'><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'>- Si la valeur de l&rsquo;attribut de l&rsquo;&eacute;l&eacute;ment
- &laquo;&nbsp;longLatType&nbsp;&raquo; contenu dans l&rsquo;objet &laquo;&nbsp;AccessPoint&nbsp;&raquo; est
- diff&eacute;rente de PJ alors le test fournit le message d'avertissement &laquo;&nbsp;test
- 3.18.1a&nbsp;: le point d&rsquo;acc&egrave;s d&rsquo;identifiant &laquo;&nbsp;ObjectId&nbsp;&raquo; n&rsquo;est
- pas dans le bon syst&egrave;me de projection&nbsp;&raquo;, sinon poursuivre le test.</span></p>
- <p class=MsoNormal style='text-align:justify'><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal style='text-align:justify'><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'>- Si la projection du point, calcul&eacute;e &agrave;
- partir des valeurs des attributs des &eacute;l&eacute;ments &laquo;&nbsp;longitude&nbsp;&raquo;,
- &laquo;&nbsp;latitude&nbsp;&raquo; contenus dans l&rsquo;objet &laquo;&nbsp;AccessPoint&nbsp;&raquo;, est
- contenue dans le polygone PG le test est valid&eacute;, sinon le test est invalid&eacute;
- et fournit le message&nbsp;: &laquo;&nbsp;test 3.18.1b&nbsp;: le point d&rsquo;acc&egrave;s
- d&rsquo;identifiant &laquo;&nbsp;ObjectId&nbsp;&raquo; a des coordonn&eacute;es qui sont hors du
- polygone de la zone couverte&nbsp;&raquo;.</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>&nbsp;</span></p>
- </td>
- </tr>
-</table>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Ce point de contrôle consiste donc à vérifier que les coordonnées en latitude et longitude de chaque POINT D’ACCES («&nbsp;AccessPoint&nbsp;»)&nbsp;sont incluses dans un territoire délimité.</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>Exemple: </u></b></font></font></font></p>
+<p><font face="Arial, sans-serif"><img src="image027.gif" height="643" width="406"></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>N° test:</u></b>
+Test 3.18.1</font></font></font></p>
-</div>
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Libellé:</u>
+Vérification que les coordonnées de chaque POINT D’ACCES («&nbsp;AccessPoint&nbsp;»)&nbsp;sont inscrites dans une zone déterminée et qu’elles sont dans le bon système de projection.</font></font></font></p>
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2"><span style="text-decoration: underline;">
+Champ d’application:</span>&nbsp;&lt;AccessPoint&gt;</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Vérification:</u> </font></font></font></p>
+
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Soit PG le polygone de la zone couverte par le réseau dans une projection PJ.</font></font></font></p>
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si l’objet «&nbsp;AccessPoint&nbsp;» mentionné dans les champs
+d’application est présent une ou plusieurs fois, poursuivre le test,
+sinon le test est abandonné.&nbsp;</font></font></font></p>
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si la valeur de l’attribut de l’élément «&nbsp;longLatType&nbsp;»
+contenu dans l’objet «&nbsp;AccessPoint&nbsp;» est différente de PJ
+alors le test fournit le message d'avertissement «&nbsp;test
+3.18.1a&nbsp;: le point d’accès d’identifiant «&nbsp;ObjectId&nbsp;»
+n’est pas dans le bon système de projection&nbsp;», sinon poursuivre le
+test.</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si la projection du point, calculée à partir des valeurs des
+attributs des éléments «&nbsp;longitude&nbsp;», «&nbsp;latitude&nbsp;»
+contenus dans l’objet «&nbsp;AccessPoint&nbsp;», est contenue dans le
+polygone PG le test est validé, sinon le test est invalidé et fournit
+le message&nbsp;: «&nbsp;test 3.18.1b&nbsp;: le point d’accès
+d’identifiant «&nbsp;ObjectId&nbsp;» a des coordonnées qui sont hors du
+polygone de la zone couverte&nbsp;».</font></font></font></p> \ No newline at end of file
diff --git a/app/views/test_sheet/3_19.html b/app/views/test_sheet/3_19.html
index ed032f4f5..5c96646c3 100644
--- a/app/views/test_sheet/3_19.html
+++ b/app/views/test_sheet/3_19.html
@@ -1,242 +1,50 @@
-<div class=WordSection1>
-</span></b>
-
-<p class=MsoTitle><span style='font-size:14.0pt;font-family:"Tahoma","sans-serif"'>Fiche
-du point de contr&ocirc;le N&deg; 3.19</span></p>
-
-<p class=MsoNormal>&nbsp;</p>
-
-<table class=MsoNormalTable border=1 cellspacing=0 cellpadding=0 width=638
- style='width:478.4pt;border-collapse:collapse;border:none'>
- <tr style='page-break-inside:avoid'>
- <td width=638 colspan=2 valign=top style='width:478.4pt;border:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center'><i><span style='color:navy'>Description</span></i></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>Intitul&eacute;</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt'><span style='font-size:11.0pt;
- line-height:200%;font-family:"Tahoma","sans-serif"'>Mod&egrave;le de repr&eacute;sentation des
- coordonn&eacute;es des &eacute;quipements</span></p>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>Objectif</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif";font-weight:normal'>V&eacute;rifier que les coordonn&eacute;es des
- EQUIPEMENTs (&laquo;&nbsp;Facility&raquo;) sont dans un m&ecirc;me syst&egrave;me g&eacute;od&eacute;sique ou un
- m&ecirc;me syst&egrave;me de projection</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>R&eacute;f&eacute;rences</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif";font-weight:normal'>TRIDENT/profil NEPTUNE/Transmodel
- V4 et V5.1</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>N&deg; de fiche(s) connexe(s)</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='text-align:left'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'>&nbsp;</span></h1>
- <h1 align=left style='text-align:left'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'>&nbsp;</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt'><b><span style='font-family:
- "Tahoma","sans-serif"'>Priorit&eacute;<span style='color:red'> </span></span></b></p>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif";font-weight:normal'>Obligatoire</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt'><b><span style='font-family:
- "Tahoma","sans-serif"'>R&eacute;sultat</span></b></p>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif";font-weight:normal'>Conforme ou non conforme</span></h1>
- </td>
- </tr>
- <tr style='page-break-inside:avoid'>
- <td width=638 colspan=2 valign=top style='width:478.4pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center'><i><span style='color:navy'>Mise en &oelig;uvre</span></i></h1>
- </td>
- </tr>
- <tr>
- <td width=100 style='width:74.85pt;border:solid windowtext 1.0pt;border-top:
- none;padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>Explication</span></h1>
- </td>
- <td width=538 style='width:403.55pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt;line-height:normal'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Dans un m&ecirc;me jeu
- de donn&eacute;es, chaque EQUIPEMENT (&laquo;&nbsp;Facility&nbsp;&raquo;) doit &ecirc;tre repr&eacute;sent&eacute;
- g&eacute;ographiquement de la m&ecirc;me mani&egrave;re et dans un syst&egrave;me de repr&eacute;sentation
- g&eacute;ographique identique. On v&eacute;rifiera &eacute;galement qu&rsquo;il n&rsquo;y a pas d&rsquo;aberration
- comme des coordonn&eacute;es g&eacute;ographiques nulles ou situ&eacute;es hors d&rsquo;une zone dont le
- p&eacute;rim&egrave;tre ou le contour est &agrave; d&eacute;finir.</span></p>
- </td>
- </tr>
-</table>
-
-<p class=MsoNormal>&nbsp;</p>
-
-<table class=MsoNormalTable border=1 cellspacing=0 cellpadding=0 width=638
- style='width:478.4pt;border-collapse:collapse;border:none'>
- <tr>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><b><span lang=EN-US style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>Exemple</span></b></p>
- </td>
- <td width=538 valign=top style='width:403.55pt;border:solid windowtext 1.0pt;
- border-left:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 style='margin-left:18.0pt;text-indent:-18.0pt'><span lang=EN-US>&nbsp;</span></h1>
- <h1 style='margin-left:18.0pt;text-indent:-18.0pt'><span lang=EN-US><img
- width=493 height=801 src="BATERI_Neptune_FINAL-V2_0a_fichiers/image028.gif"></span></h1>
- <p class=MsoNormal><span lang=EN-US>&nbsp;</span></p>
- </td>
- </tr>
- <tr style='page-break-inside:avoid'>
- <td width=638 colspan=2 valign=top style='width:478.4pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h2 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center'><i><span lang=EN-US style='font-size:14.0pt;
- color:navy'>Evaluation</span></i></h2>
- </td>
- </tr>
- <tr>
- <td width=100 valign=top style='width:74.85pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span lang=EN-US style='font-size:11.0pt'>N&deg; test</span></h1>
- </td>
- <td width=538 style='width:403.55pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>Test
- 3.19.1</span></p>
- </td>
- </tr>
- <tr>
- <td width=100 valign=top style='width:74.85pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt'>Libell&eacute;</span></h1>
- </td>
- <td width=538 valign=top style='width:403.55pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Test
- des coordonn&eacute;es g&eacute;ographiques de chaque EQUIPEMENT (&laquo;&nbsp;Facility&nbsp;&raquo;)
- par rapport &agrave; un mod&egrave;le de projection de r&eacute;f&eacute;rence.</span></p>
- </td>
- </tr>
- <tr>
- <td width=100 valign=top style='width:74.85pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt'>Champ d&rsquo;application</span></h1>
- </td>
- <td width=538 valign=top style='width:403.55pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <p class=MsoHeader style='margin-top:6.0pt'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>&lt;Facility&gt;</span></p>
- </td>
- </tr>
- <tr>
- <td width=100 valign=top style='width:74.85pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt'>V&eacute;rification</span></h1>
- </td>
- <td width=538 valign=top style='width:403.55pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <p class=MsoNormal><span style='font-family:"Tahoma","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>Soit
- PJ la projection de r&eacute;f&eacute;rence.</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>-
- Si l&rsquo;objet &laquo;&nbsp;Facility&nbsp;&raquo; mentionn&eacute; dans les champs d&rsquo;application est
- pr&eacute;sent une ou plusieurs fois, poursuivre le test, sinon le test est
- abandonn&eacute;.</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>-
- Si la valeur de l&rsquo;attribut de l&rsquo;&eacute;l&eacute;ment &laquo;&nbsp;longLatType&nbsp;&raquo; contenu
- dans l&rsquo;&eacute;l&eacute;ment &laquo;&nbsp;Facility&nbsp;&raquo; est diff&eacute;rente de PJ alors le test
- fournit le message d'avertissement&nbsp;: &laquo;&nbsp;test 3.19.1&nbsp;:
- l&rsquo;equipement &laquo;&nbsp;ObjectId&nbsp;&raquo; n&rsquo;est pas dans le bon syst&egrave;me de
- projection&nbsp;ou ses coordonn&eacute;es g&eacute;ographiques sont nulle ou il est situ&eacute;
- hors d&rsquo;une zone dont le p&eacute;rim&egrave;tre ou le contour est &agrave; d&eacute;finir.&raquo;</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>-
- Sinon le test est valid&eacute;.</span></p>
- </td>
- </tr>
-</table>
-
-<p class=MsoNormal>&nbsp;</p>
-
-</div>
-
+<h1 class="western" style="border: 1pt solid rgb(0, 0, 0); padding: 0.05cm 0.12cm; margin-top: 0.21cm;" align="center">
+<font face="Arial, sans-serif"><font style="font-size: 20pt;" size="5"><i>
+ point de contrôle N° 3.19<br>Représentation des coordonnées des équipements<br>
+</i></font></font></h1>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Objectif: </b></u>
+Vérifier que les coordonnées des EQUIPEMENTs («&nbsp;Facility») sont
+dans un même système géodésique ou un même système de projection<br>
+</font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Priorité: </b></u> Obligatoire</font></p><font face="Arial, sans-serif">
+</font><p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><u><b>Explications:</b></u>
+</font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Dans un même jeu de données, chaque EQUIPEMENT («&nbsp;Facility&nbsp;»)
+doit être représenté géographiquement de la même manière et dans un
+système de représentation géographique identique. On vérifiera
+également qu’il n’y a pas d’aberration comme des coordonnées
+géographiques nulles ou situées hors d’une zone dont le périmètre ou le
+contour est à définir.</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>Exemple: </u></b></font></font></font></p>
+<p><font face="Arial, sans-serif"><img src="image028.gif" height="801" width="493"></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>N° test:</u></b>
+Test 3.19.1</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Libellé:</u> Test des coordonnées géographiques de chaque EQUIPEMENT
+(«&nbsp;Facility&nbsp;») par rapport à un modèle de projection de
+référence.</font></font></font></p>
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2"><span style="text-decoration: underline;">
+Champ d’application:</span>&nbsp;&lt;Facility&gt;</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Vérification:</u> </font></font></font></p>
+
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Soit PJ la projection de référence.&nbsp;</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si l’objet «&nbsp;Facility&nbsp;» mentionné dans les champs
+d’application est présent une ou plusieurs fois, poursuivre le test,
+sinon le test est abandonné.</font></font></font></p>
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si la valeur de l’attribut de l’élément «&nbsp;longLatType&nbsp;»
+contenu dans l’élément «&nbsp;Facility&nbsp;» est différente de PJ
+alors le test fournit le message d'avertissement&nbsp;: «&nbsp;test
+3.19.1&nbsp;: l’equipement «&nbsp;ObjectId&nbsp;» n’est pas dans le bon
+système de projection&nbsp;ou ses coordonnées géographiques sont nulle
+ou il est situé hors d’une zone dont le périmètre ou le contour est à
+définir.»</font></font></font></p><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">- Sinon le test est validé.</font></font></font>
diff --git a/app/views/test_sheet/3_2.html b/app/views/test_sheet/3_2.html
index c0866df30..4edff7b45 100644
--- a/app/views/test_sheet/3_2.html
+++ b/app/views/test_sheet/3_2.html
@@ -1,254 +1,60 @@
-<div class=WordSection1>
-</span></b>
-
-<p class=MsoTitle><span style='font-size:14.0pt;font-family:"Tahoma","sans-serif"'>Fiche
-du point de contr&ocirc;le N&deg; 3.2</span></p>
-
-<p class=MsoNormal>&nbsp;</p>
-
-<table class=MsoNormalTable border=1 cellspacing=0 cellpadding=0 width=609
- style='width:457.1pt;border-collapse:collapse;border:none'>
- <tr style='page-break-inside:avoid'>
- <td width=609 colspan=2 valign=top style='width:457.1pt;border:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center'><i><span style='color:navy'>Description</span></i></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>Intitul&eacute;</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt'><span style='font-size:11.0pt;
- line-height:200%;font-family:"Tahoma","sans-serif"'>Points d&rsquo;arr&ecirc;t tr&egrave;s
- proches regroup&eacute;s au sein d&rsquo;une zone d&rsquo;arr&ecirc;t </span></p>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>Objectif</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif";font-weight:normal'>V&eacute;rifier que des POINTs D&rsquo;ARR&Ecirc;T SUR
- PARCOURS (&laquo;&nbsp;StopPoint&nbsp;&raquo;) tr&egrave;s proches, </span><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>portant
- le m&ecirc;me nom ou un nom diff&eacute;rent,</span><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'> sont regroup&eacute;s au sein
- d&rsquo;un m&ecirc;me ARR&Ecirc;T/Choutte.</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>R&eacute;f&eacute;rences</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif";font-weight:normal'>TRIDENT/profil CHOUETTE/Transmodel
- V4 et V5.1</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>N&deg; de fiche(s) connexe(s)</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='text-align:left'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'>&nbsp;</span></h1>
- <h1 align=left style='text-align:left'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'>&nbsp;</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt'><b><span style='font-family:
- "Tahoma","sans-serif"'>Priorit&eacute;<span style='color:red'> </span></span></b></p>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif";font-weight:normal'>Obligatoire</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt'><b><span style='font-family:
- "Tahoma","sans-serif"'>R&eacute;sultat</span></b></p>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif";font-weight:normal'>D&eacute;livrance d&rsquo;un avertissement de
- mise en garde sur des cons&eacute;quences &eacute;ventuelles de dysfonctionnement</span></h1>
- </td>
- </tr>
- <tr style='page-break-inside:avoid'>
- <td width=609 colspan=2 valign=top style='width:457.1pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center'><i><span style='color:navy'>Mise en &oelig;uvre</span></i></h1>
- </td>
- </tr>
- <tr>
- <td width=100 style='width:74.85pt;border:solid windowtext 1.0pt;border-top:
- none;padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>Explication</span></h1>
- </td>
- <td width=510 style='width:382.25pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Chaque
- POINT D&rsquo;ARR&Ecirc;T SUR PARCOURS (&laquo;&nbsp;StopPoint&nbsp;&raquo;) est localis&eacute; gr&acirc;ce &agrave; ses
- coordonn&eacute;es en latitude et en longitude. D&rsquo;autre part, chaque POINT D&rsquo;ARR&Ecirc;T
- SUR PARCOURS est reli&eacute; &agrave; l&rsquo;identifiant de l&rsquo;ARR&Ecirc;T1/Chouette (&laquo;&nbsp;StopArea&nbsp;&raquo;)
- dont il d&eacute;pend (&laquo;&nbsp;ContainedIn&nbsp;&raquo;). Il suffit alors de v&eacute;rifier que
- tous les POINTs D&rsquo;ARR&Ecirc;T SUR PARCOURS (&laquo;&nbsp;StopPoint&nbsp;&raquo;) appartiennent
- &agrave; un m&ecirc;me ARR&Ecirc;T1/Chouette (&laquo;&nbsp;StopArea&nbsp;&raquo;) et qu&rsquo;il n&rsquo;y a pas de
- POINTs D&rsquo;ARR&Ecirc;T SUR PARCOURS isol&eacute;s tr&egrave;s proches d&rsquo;autres POINTs D&rsquo;ARR&Ecirc;T SUR
- PARCOURS (cette distance reste &agrave; d&eacute;terminer et est param&eacute;trable). </span></p>
- </td>
- </tr>
-</table>
-
-<p class=MsoNormal>&nbsp;</p>
-
-<table class=MsoNormalTable border=1 cellspacing=0 cellpadding=0 width=619
- style='width:464.2pt;border-collapse:collapse;border:none'>
- <tr>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><b><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Exemple</span></b></p>
- </td>
- <td width=519 valign=top style='width:389.35pt;border:solid windowtext 1.0pt;
- border-left:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=left style='margin-left:18.0pt;text-align:left;text-indent:-18.0pt'><span
- style='font-size:11.0pt;font-weight:normal'>&nbsp;</span></h1>
- <p class=MsoNormal align=center style='text-align:center'><img width=450
- height=624 src="BATERI_Neptune_FINAL-V2_0a_fichiers/image017.jpg"></p>
- <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
- </td>
- </tr>
- <tr style='page-break-inside:avoid'>
- <td width=619 colspan=2 valign=top style='width:464.2pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h2 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center'><i><span lang=EN-US style='font-size:14.0pt;
- color:navy'>Evaluation</span></i></h2>
- </td>
- </tr>
- <tr>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- border-top:none;padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span lang=EN-US style='font-size:11.0pt'>N&deg; test</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>Test
- 3.2.1</span></p>
- </td>
- </tr>
- <tr>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- border-top:none;padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt'>Libell&eacute;</span></h1>
- </td>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>V&eacute;rifier
- que 2 POINTs D&rsquo;ARR&Ecirc;T SUR PARCOURS (&laquo;&nbsp;StopPoint&nbsp;&raquo;) tr&egrave;s proches
- appartiennent &agrave; un m&ecirc;me ARR&Ecirc;T1/Chouette (&laquo;&nbsp;StopArea&nbsp;&raquo;)</span></p>
- </td>
- </tr>
- <tr>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- border-top:none;padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt'>Champ d&rsquo;application</span></h1>
- </td>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <p class=MsoHeader style='margin-top:6.0pt'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>&lt;StopPoint&gt;</span></p>
- </td>
- </tr>
- <tr>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- border-top:none;padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt'>V&eacute;rification</span></h1>
- </td>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal style='text-align:justify'><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'>- Si l&rsquo;&eacute;l&eacute;ment &laquo;&nbsp;StopPoint&nbsp;&raquo;
- mentionn&eacute; dans les champs d&rsquo;application est pr&eacute;sent une ou plusieurs fois,
- poursuivre le test, sinon le test est abandonn&eacute;.</span></p>
- <p class=MsoNormal style='text-align:justify'><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal style='text-align:justify'><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'>- Si pour chaque &eacute;l&eacute;ment &laquo;&nbsp;StopPoint&nbsp;&raquo;,
- la distance spatiale calcul&eacute;e &agrave; partir de la valeur de l&rsquo;attribut des
- &eacute;l&eacute;ments &laquo;&nbsp;longitude&nbsp;&raquo;, &laquo;&nbsp;latitude&nbsp;&raquo; et
- &laquo;&nbsp;longLatType&nbsp;&raquo; entre lui et tous les autres &eacute;l&eacute;ments
- &laquo;&nbsp;stopPoint&nbsp;&raquo; est inf&eacute;rieure &agrave; une valeur param&eacute;trable XX alors
- v&eacute;rifier que la valeur de l&rsquo;attribut de l&rsquo;&eacute;l&eacute;ment &laquo;&nbsp;containedIn&nbsp;&raquo;
- de ces deux points d&rsquo;arr&ecirc;t &laquo;&nbsp;StopPoint&nbsp;&raquo; est identique. Si elle est
- diff&eacute;rente alors adresser le message d'avertissement&nbsp;: &laquo;&nbsp;test
- 3.2.1&nbsp;: la distance calcul&eacute;e entre un point d&rsquo;arr&ecirc;t et les autres points
- d&rsquo;arr&ecirc;t est inf&eacute;rieure &agrave; une valeur param&eacute;trable XX mais la valeur de
- l&rsquo;attribut de l&rsquo;&eacute;l&eacute;ment &laquo;&nbsp;containedIn&nbsp;&raquo; de ces deux points d&rsquo;arr&ecirc;t
- &laquo;&nbsp;StopPoint&nbsp;&raquo; n&rsquo;est pas identique&nbsp;&raquo;.</span></p>
- <p class=MsoNormal style='text-align:justify'><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal style='text-align:justify'><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'>- Sinon le test est valid&eacute;</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>&nbsp;</span></p>
- </td>
- </tr>
-</table>
-
-<p class=MsoNormal>&nbsp;</p>
-
-</div>
-
+<h1 class="western" style="border: 1pt solid rgb(0, 0, 0); padding: 0.05cm 0.12cm; margin-top: 0.21cm;" align="center">
+<font face="Arial, sans-serif"><font style="font-size: 20pt;" size="5"><i>
+ point de contrôle N° 3.2<br>
+Points d’arrêt très proches regroupés au sein d’une zone d’arrêt <br>
+</i></font></font></h1>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Objectif: </b></u>
+Vérifier que des POINTs D’ARRÊT SUR PARCOURS («&nbsp;StopPoint&nbsp;») très proches,<br>
+portant le même nom ou un nom différent, sont regroupés au sein d’un même ARRÊT/Choutte.<br>
+</font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Priorité: </b></u> Obligatoire</font><br>
+</p><font face="Arial, sans-serif"></font><p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><u><b>Explications:</b></u>
+</font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Chaque POINT D’ARRÊT SUR PARCOURS («&nbsp;StopPoint&nbsp;») est
+localisé grâce à ses coordonnées en latitude et en longitude. D’autre
+part, chaque POINT D’ARRÊT SUR PARCOURS est relié à l’identifiant de
+l’ARRÊT1/Chouette («&nbsp;StopArea&nbsp;») dont il dépend
+(«&nbsp;ContainedIn&nbsp;»). Il suffit alors de vérifier que tous les
+POINTs D’ARRÊT SUR PARCOURS («&nbsp;StopPoint&nbsp;») appartiennent à
+un même ARRÊT1/Chouette («&nbsp;StopArea&nbsp;») et qu’il n’y a pas de
+POINTs D’ARRÊT SUR PARCOURS isolés très proches d’autres POINTs D’ARRÊT
+SUR PARCOURS (cette distance reste à déterminer et est paramétrable).</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>Exemple: </u></b></font></font></font></p>
+<p><font face="Arial, sans-serif"><img src="image017.jpg" height="624" width="450"></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>N° test:</u></b>
+Test 3.2.1</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Libellé:</u> Vérifier que 2 POINTs D’ARRÊT SUR PARCOURS
+(«&nbsp;StopPoint&nbsp;») très proches appartiennent à un même
+ARRÊT1/Chouette («&nbsp;StopArea&nbsp;»)</font></font></font></p>
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2"><span style="text-decoration: underline;">
+Champ d’application:</span> &lt;StopPoint&gt;</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Vérification:</u> </font></font></font></p>
+
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si l’élément «&nbsp;StopPoint&nbsp;» mentionné dans les champs
+d’application est présent une ou plusieurs fois, poursuivre le test,
+sinon le test est abandonné.</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si pour chaque élément «&nbsp;StopPoint&nbsp;», la distance spatiale
+calculée à partir de la valeur de l’attribut des éléments
+«&nbsp;longitude&nbsp;», «&nbsp;latitude&nbsp;» et
+«&nbsp;longLatType&nbsp;» entre lui et tous les autres éléments
+«&nbsp;stopPoint&nbsp;» est inférieure à une valeur paramétrable XX
+alors vérifier que la valeur de l’attribut de l’élément
+«&nbsp;containedIn&nbsp;» de ces deux points d’arrêt
+«&nbsp;StopPoint&nbsp;» est identique. Si elle est différente alors
+adresser le message d'avertissement&nbsp;: «&nbsp;test 3.2.1&nbsp;: la
+distance calculée entre un point d’arrêt et les autres points d’arrêt
+est inférieure à une valeur paramétrable XX mais la valeur de
+l’attribut de l’élément «&nbsp;containedIn&nbsp;» de ces deux points
+d’arrêt «&nbsp;StopPoint&nbsp;» n’est pas identique&nbsp;».</font></font></font></p>
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Sinon le test est validé</font></font></font></p>
diff --git a/app/views/test_sheet/3_20.html b/app/views/test_sheet/3_20.html
index caf922356..9c8046d2a 100644
--- a/app/views/test_sheet/3_20.html
+++ b/app/views/test_sheet/3_20.html
@@ -1,257 +1,63 @@
-<div class=WordSection1>
-</span></b>
+<h1 class="western" style="border: 1pt solid rgb(0, 0, 0); padding: 0.05cm 0.12cm; margin-top: 0.21cm;" align="center">
+<font face="Arial, sans-serif"><font style="font-size: 20pt;" size="5"><i>
+ point de contrôle N° 3.20<br>
+Localisation des équipements dans un périmètre défini<br>
+</i></font></font></h1>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Objectif: </b></u>
+S’assurer que les coordonnées des EQUIPEMENTs («&nbsp;Facility&nbsp;») du jeu de données sont situées à l’intérieur d’un périmètre défini.<br>
+</font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Priorité: </b></u> Obligatoire</font></p><font face="Arial, sans-serif">
+</font><p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><u><b>Explications:</b></u>
+</font></font></p>
-<p class=MsoTitle><span style='font-size:14.0pt;font-family:"Tahoma","sans-serif"'>Fiche
-du point de contr&ocirc;le N&deg; 3.20</span></p>
-<p class=MsoNormal>&nbsp;</p>
-<table class=MsoNormalTable border=1 cellspacing=0 cellpadding=0 width=647
- style='width:485.45pt;border-collapse:collapse;border:none'>
- <tr style='page-break-inside:avoid'>
- <td width=647 colspan=2 valign=top style='width:485.45pt;border:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center'><i><span style='color:navy'>Description</span></i></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt'>Intitul&eacute;</span></h1>
- </td>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt;text-align:justify'><span
- style='font-size:11.0pt;line-height:200%;font-family:"Tahoma","sans-serif"'>Localisation
- des &eacute;quipements &agrave; l&rsquo;int&eacute;rieur d&rsquo;un p&eacute;rim&egrave;tre d&eacute;fini.</span></p>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt'>Objectif</span></h1>
- </td>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>S&rsquo;assurer que les </span><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'>coordonn&eacute;es des
- EQUIPEMENTs (&laquo;&nbsp;Facility&nbsp;&raquo;) du jeu de donn&eacute;es sont situ&eacute;es &agrave;
- l&rsquo;int&eacute;rieur d&rsquo;un p&eacute;rim&egrave;tre d&eacute;fini.</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt'>R&eacute;f&eacute;rences</span></h1>
- </td>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>TRIDENT/profil NEPTUNE/Transmodel V4 et V5.1</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt'>N&deg;de fiche(s) connexe(s)</span></h1>
- </td>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>&nbsp;</span></h1>
- <h1><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>&nbsp;</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt'><b><span style='font-family:
- "Tahoma","sans-serif"'>Priorit&eacute;<span style='color:red'> </span></span></b></p>
- </td>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>Obligatoire</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt'><b><span style='font-family:
- "Tahoma","sans-serif"'>R&eacute;sultat</span></b></p>
- </td>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>D&eacute;livrance d&rsquo;un avertissement de mise en garde sur des
- cons&eacute;quences &eacute;ventuelles de dysfonctionnement</span></h1>
- </td>
- </tr>
- <tr style='page-break-inside:avoid'>
- <td width=647 colspan=2 valign=top style='width:485.45pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center'><i><span style='font-family:"Tahoma","sans-serif";
- color:navy'>Mise en &oelig;uvre</span></i></h1>
- </td>
- </tr>
- <tr>
- <td width=100 style='width:74.85pt;border:solid windowtext 1.0pt;border-top:
- none;padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>Explication</span></h1>
- </td>
- <td width=547 style='width:410.6pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm;text-align:justify'><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'>Si le jeu de donn&eacute;es appartient &agrave; un
- exploitant dont le r&eacute;seau dessert un groupe de communes, les coordonn&eacute;es des </span><span
- style='font-size:11.0pt;font-family:"Arial","sans-serif"'>EQUIPEMENTs
- (&laquo;&nbsp;Facility&nbsp;&raquo;)</span><b><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'> </span></b><span style='font-size:11.0pt;font-family:
- "Arial","sans-serif"'> doivent se situer dans cette zone. </span></p>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm;text-align:justify'><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'>Ce point de contr&ocirc;le consiste donc &agrave;
- v&eacute;rifier que les coordonn&eacute;es en latitude et longitude de chaque </span><span
- style='font-size:11.0pt;font-family:"Arial","sans-serif"'>EQUIPEMENT
- (&laquo;&nbsp;Facility&nbsp;&raquo;)</span><b><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'> </span></b><span style='font-size:11.0pt;font-family:
- "Arial","sans-serif"'>sont incluses dans un territoire d&eacute;limit&eacute;.</span></p>
- </td>
- </tr>
-</table>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Si le jeu de données appartient à un exploitant dont le réseau dessert un groupe de communes, les coordonnées des&nbsp;EQUIPEMENTs («&nbsp;Facility&nbsp;»)&nbsp;doivent se situer dans cette zone.</font></font></font></p>
-<p class=MsoNormal>&nbsp;</p>
-<table class=MsoNormalTable border=1 cellspacing=0 cellpadding=0 width=638
- style='width:478.4pt;border-collapse:collapse;border:none'>
- <tr>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><b><span lang=EN-US style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>Exemple</span></b></p>
- </td>
- <td width=538 valign=top style='width:403.55pt;border:solid windowtext 1.0pt;
- border-left:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 style='margin-left:18.0pt;text-indent:-18.0pt'><span lang=EN-US>&nbsp;</span></h1>
- <h1 style='margin-left:18.0pt;text-indent:-18.0pt'><span lang=EN-US><img
- width=493 height=801 src="BATERI_Neptune_FINAL-V2_0a_fichiers/image028.gif"></span></h1>
- <p class=MsoNormal><span lang=EN-US>&nbsp;</span></p>
- </td>
- </tr>
- <tr style='page-break-inside:avoid'>
- <td width=638 colspan=2 valign=top style='width:478.4pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h2 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center'><i><span lang=EN-US style='font-size:14.0pt;
- color:navy'>Evaluation</span></i></h2>
- </td>
- </tr>
- <tr>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span lang=EN-US style='font-size:11.0pt'>N&deg; test</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>Test
- 3.20.1</span></p>
- </td>
- </tr>
- <tr>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt'>Libell&eacute;</span></h1>
- </td>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>V&eacute;rification
- que les coordonn&eacute;es de chaque </span><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'>EQUIPEMENT (&laquo;&nbsp;Facility&raquo;)</span><b><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'> </span></b><span
- style='font-size:11.0pt;font-family:"Arial","sans-serif"'>sont inscrites dans
- une zone d&eacute;termin&eacute;e et qu&rsquo;elles sont dans le bon syst&egrave;me de projection.</span></p>
- </td>
- </tr>
- <tr>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt'>Champ d&rsquo;application</span></h1>
- </td>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <p class=MsoHeader style='margin-top:6.0pt'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>&lt;Facility&gt;</span></p>
- </td>
- </tr>
- <tr>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt'>V&eacute;rification</span></h1>
- </td>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>Soit
- PG le polygone de la zone couverte par le r&eacute;seau dans une projection PJ.</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal style='text-align:justify'><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'>- Si l&rsquo;objet &laquo;&nbsp;Facility&nbsp;&raquo;
- mentionn&eacute; dans les champs d&rsquo;application est pr&eacute;sent une ou plusieurs fois,
- poursuivre le test, sinon le test est abandonn&eacute;.</span></p>
- <p class=MsoNormal style='text-align:justify'><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal style='text-align:justify'><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'>- Si la valeur de l&rsquo;attribut de l&rsquo;&eacute;l&eacute;ment
- &laquo;&nbsp;longLatType&nbsp;&raquo; contenu dans l&rsquo;objet &laquo;&nbsp;Facility&nbsp;&raquo; est
- diff&eacute;rente de PJ alors le test fournit le message d'avertissement &laquo;&nbsp;test
- 3.20.1a&nbsp;: l&rsquo;equipement d&rsquo;identifiant &laquo;&nbsp;ObjectId&nbsp;&raquo; n&rsquo;est pas
- dans le bon syst&egrave;me de projection&nbsp;&raquo;, sinon poursuivre le test.</span></p>
- <p class=MsoNormal style='text-align:justify'><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal style='text-align:justify'><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'>- Si la projection du point, calcul&eacute;e &agrave;
- partir des valeurs des attributs des &eacute;l&eacute;ments &laquo;&nbsp;longitude&nbsp;&raquo;,
- &laquo;&nbsp;latitude&nbsp;&raquo; contenus dans l&rsquo;objet &laquo;&nbsp;Facility&nbsp;&raquo;, est
- contenue dans le polygone PG le test est valid&eacute;, sinon le test est invalid&eacute;
- et fournit le message&nbsp;: &laquo;&nbsp;test 3.20.1b&nbsp;: l&rsquo;equipement
- d&rsquo;identifiant &laquo;&nbsp;ObjectId&nbsp;&raquo; a des coordonn&eacute;es qui sont hors du
- polygone de la zone couverte&nbsp;&raquo;.</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>&nbsp;</span></p>
- </td>
- </tr>
-</table>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Ce point de contrôle consiste donc à vérifier que les coordonnées en latitude et longitude de chaque&nbsp;EQUIPEMENT («&nbsp;Facility&nbsp;»)&nbsp;sont incluses dans un territoire délimité.</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>Exemple: </u></b></font></font></font></p>
+<p><font face="Arial, sans-serif"><img src="image028.gif" height="801" width="493"></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>N° test:</u></b>
+Test 3.20.1</font></font></font></p>
-</div>
+
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Libellé:</u>
+Vérification que les coordonnées de chaque&nbsp;EQUIPEMENT («&nbsp;Facility»)&nbsp;sont inscrites dans une zone déterminée et qu’elles sont dans le bon système de projection.</font></font></font></p>
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2"><span style="text-decoration: underline;">
+Champ d’application:</span> &lt;Facility&gt;</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Vérification:</u> </font></font></font></p>
+
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Soit PG le polygone de la zone couverte par le réseau dans une projection PJ.</font></font></font></p>
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si l’objet «&nbsp;Facility&nbsp;» mentionné dans les champs
+d’application est présent une ou plusieurs fois, poursuivre le test,
+sinon le test est abandonné.</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si la valeur de l’attribut de l’élément «&nbsp;longLatType&nbsp;»
+contenu dans l’objet «&nbsp;Facility&nbsp;» est différente de PJ alors
+le test fournit le message d'avertissement «&nbsp;test 3.20.1a&nbsp;:
+l’equipement d’identifiant «&nbsp;ObjectId&nbsp;» n’est pas dans le bon
+système de projection&nbsp;», sinon poursuivre le test.</font></font></font></p>
+
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si la projection du point, calculée à partir des valeurs des
+attributs des éléments «&nbsp;longitude&nbsp;», «&nbsp;latitude&nbsp;»
+contenus dans l’objet «&nbsp;Facility&nbsp;», est contenue dans le
+polygone PG le test est validé, sinon le test est invalidé et fournit
+le message&nbsp;: «&nbsp;test 3.20.1b&nbsp;: l’equipement d’identifiant
+«&nbsp;ObjectId&nbsp;» a des coordonnées qui sont hors du polygone de
+la zone couverte&nbsp;»<br>&nbsp;</font></font></font></p>
diff --git a/app/views/test_sheet/3_21.html b/app/views/test_sheet/3_21.html
index 104181277..55f38ecdf 100644
--- a/app/views/test_sheet/3_21.html
+++ b/app/views/test_sheet/3_21.html
@@ -1,282 +1,89 @@
-<div class=WordSection1>
-</span></b>
+<h1 class="western" style="border: 1pt solid rgb(0, 0, 0); padding: 0.05cm 0.12cm; margin-top: 0.21cm;" align="center">
+<font face="Arial, sans-serif"><font style="font-size: 20pt;" size="5"><i>
+ point de contrôle N° 3.21<br>
+Cohérence entre le temps et la distance pour chaque lien accès-zone d’arrêt <br>
+</i></font></font></h1>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Objectif: </b></u>
+Vérifier&nbsp;qu’il y a une cohérence entre le temps et la distance pour chaque LiensAccèsZoneArrêt/NEPTUNE («&nbsp;AccessLink&nbsp;»)<br>
+</font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Priorité: </b></u> Obligatoire</font></p><font face="Arial, sans-serif">
+</font><p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><u><b>Explications:</b></u>
+</font></font></p>
-<p class=MsoTitle><span style='font-size:14.0pt;font-family:"Tahoma","sans-serif"'>Fiche
-du point de contr&ocirc;le N&deg; 3.21</span></p>
-<p class=MsoNormal>&nbsp;</p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Pour&nbsp;chaque LiensAccèsZoneArrêt /NEPTUNE («&nbsp;AccessLink&nbsp;») ,
+le temps de parcours entre 1 ARRÊT/Chouette («&nbsp;StopArea&nbsp;») et
+1 Accès/NEPTUNE («&nbsp;AccessPoint&nbsp;») ne doit pas être aberrant.
+On peut alors fixer une vitesse théorique moyenne (en fonction du temps
+de déplacement en marche à pied, des obstacles rencontrés, de la perte
+de temps liée à la descente du véhicule).</font></font></font></p>
-<table class=MsoNormalTable border=1 cellspacing=0 cellpadding=0 width=638
- style='width:478.4pt;border-collapse:collapse;border:none'>
- <tr style='page-break-inside:avoid'>
- <td width=638 colspan=2 valign=top style='width:478.4pt;border:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center'><i><span style='color:navy'>Description</span></i></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt'>Intitul&eacute;</span></h1>
- </td>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt;text-align:justify'><span
- style='font-size:11.0pt;line-height:200%;font-family:"Tahoma","sans-serif"'>Coh&eacute;rence
- entre le temps et la distance pour chaque lien acc&egrave;s-zone d&rsquo;arr&ecirc;t </span></p>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt'>Objectif</span></h1>
- </td>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>V&eacute;rifier </span><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif";font-weight:normal'>que qu&rsquo;il y a une coh&eacute;rence entre
- le temps et la distance pour chaque LiensAcc&egrave;sZoneArr&ecirc;t/NEPTUNE
- (&laquo;&nbsp;AccessLink&nbsp;&raquo;)</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt'>R&eacute;f&eacute;rences</span></h1>
- </td>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>TRIDENT/profil NEPTUNE</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt'>N&deg;de fiche(s) connexe(s)</span></h1>
- </td>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>&nbsp;</span></h1>
- <h1><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>&nbsp;</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt'><b><span style='font-family:
- "Tahoma","sans-serif"'>Priorit&eacute;<span style='color:red'> </span></span></b></p>
- </td>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>Obligatoire</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt'><b><span style='font-family:
- "Tahoma","sans-serif"'>R&eacute;sultat</span></b></p>
- </td>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>D&eacute;livrance d&rsquo;un message de mise en garde</span></h1>
- </td>
- </tr>
- <tr style='page-break-inside:avoid'>
- <td width=638 colspan=2 valign=top style='width:478.4pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center'><i><span style='color:navy'>Mise en &oelig;uvre</span></i></h1>
- </td>
- </tr>
- <tr>
- <td width=100 style='width:74.85pt;border:solid windowtext 1.0pt;border-top:
- none;padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>Explication</span></h1>
- </td>
- <td width=538 style='width:403.55pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm;text-align:justify'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>Pour </span><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>chaque LiensAcc&egrave;sZoneArr&ecirc;t /NEPTUNE
- (&laquo;&nbsp;AccessLink&nbsp;&raquo;)</span><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>, le temps de parcours entre 1 ARR&Ecirc;T/Chouette
- (&laquo;&nbsp;StopArea&nbsp;&raquo;) et 1 Acc&egrave;s/NEPTUNE (&laquo;&nbsp;AccessPoint&nbsp;&raquo;) ne
- doit pas &ecirc;tre aberrant. On peut alors fixer une vitesse th&eacute;orique moyenne (en
- fonction du temps de d&eacute;placement en marche &agrave; pied, des obstacles rencontr&eacute;s,
- de la perte de temps li&eacute;e &agrave; la descente du v&eacute;hicule …). </span></p>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Ainsi
- la longueur du </span><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>LiensAcc&egrave;sZoneArr&ecirc;t
- /NEPTUNE (&laquo;&nbsp;AccessLink&nbsp;&raquo;) </span><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>qui est la diff&eacute;rence entre les &eacute;l&eacute;ments
- &laquo;&nbsp;EndOfLink&nbsp;&raquo; et &laquo;&nbsp;StartOfLink&nbsp;&raquo; et la dur&eacute;e repr&eacute;sent&eacute;e
- par les &eacute;l&eacute;ments &laquo;&nbsp;DefaultDuration&nbsp;&raquo;,
- &laquo;&nbsp;FrequentTravellerDuration&nbsp;&raquo; ou &laquo;&nbsp;OccasionalTravellerDuration&nbsp;&raquo;,
- &eacute;ventuellement &laquo;&nbsp;MobilityRestrictedTravellerDuration&nbsp;&raquo;, permet de
- calculer une vitesse qui doit s&rsquo;approcher de la vitesse th&eacute;orique (fourchette
- &agrave; d&eacute;finir).</span></p>
- </td>
- </tr>
-</table>
-<p class=MsoNormal>&nbsp;</p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Ainsi la longueur du&nbsp;LiensAccèsZoneArrêt /NEPTUNE («&nbsp;AccessLink&nbsp;»)&nbsp;qui
+est la différence entre les éléments «&nbsp;EndOfLink&nbsp;» et
+«&nbsp;StartOfLink&nbsp;» et la durée représentée par les éléments
+«&nbsp;DefaultDuration&nbsp;»,&nbsp;«&nbsp;FrequentTravellerDuration&nbsp;»
+ou «&nbsp;OccasionalTravellerDuration&nbsp;», éventuellement
+«&nbsp;MobilityRestrictedTravellerDuration&nbsp;», permet de calculer
+une vitesse qui doit s’approcher de la vitesse théorique (fourchette à
+définir).</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>Exemple: </u></b></font></font></font></p>
+<p><font face="Arial, sans-serif"><img src="image029.jpg" height="633" width="435"></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>N° test:</u></b>
+Test 3.21.1</font></font></font></p>
-<table class=MsoNormalTable border=1 cellspacing=0 cellpadding=0 width=638
- style='width:478.4pt;border-collapse:collapse;border:none'>
- <tr>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><b><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Exemple</span></b></p>
- </td>
- <td width=538 valign=top style='width:403.55pt;border:solid windowtext 1.0pt;
- border-left:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=left style='margin-left:18.0pt;text-align:left;text-indent:-18.0pt'><span
- style='font-size:11.0pt;font-weight:normal'>&nbsp;</span></h1>
- <p class=MsoNormal align=center style='text-align:center'><img width=435
- height=633 src="BATERI_Neptune_FINAL-V2_0a_fichiers/image029.jpg"></p>
- <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
- </td>
- </tr>
- <tr style='page-break-inside:avoid'>
- <td width=638 colspan=2 valign=top style='width:478.4pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h2 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center'><i><span lang=EN-US style='font-size:14.0pt;
- color:navy'>Evaluation</span></i></h2>
- </td>
- </tr>
- <tr>
- <td width=100 valign=top style='width:74.85pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span lang=EN-US style='font-size:11.0pt'>N&deg; test</span></h1>
- </td>
- <td width=538 style='width:403.55pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>Test
- 3.21.1</span></p>
- </td>
- </tr>
- <tr>
- <td width=100 valign=top style='width:74.85pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt'>Libell&eacute;</span></h1>
- </td>
- <td width=538 style='width:403.55pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>V&eacute;rifier
- les vitesses calcul&eacute;es &agrave; partir des attributs du </span><span
- style='font-size:11.0pt;font-family:"Arial","sans-serif"'>LiensAcc&egrave;sZoneArr&ecirc;t
- /NEPTUNE (&laquo;&nbsp;AccessLink&nbsp;&raquo;)</span><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'> suivant les param&egrave;tres fix&eacute;s</span></p>
- </td>
- </tr>
- <tr>
- <td width=100 valign=top style='width:74.85pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt'>Champ d&rsquo;application</span></h1>
- </td>
- <td width=538 style='width:403.55pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&lt;AccessLink&gt;</span></p>
- </td>
- </tr>
- <tr>
- <td width=100 valign=top style='width:74.85pt;border:solid windowtext 1.0pt;
- border-top:none;padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt'>V&eacute;rification</span></h1>
- </td>
- <td width=538 style='width:403.55pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>-
- Si l&rsquo;&eacute;l&eacute;ment &laquo;&nbsp;AccessLink&nbsp;&raquo; mentionn&eacute; dans les champs d&rsquo;application
- est pr&eacute;sent une ou plusieurs fois, poursuivre le test, sinon le test est
- abandonn&eacute;.</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>-
- Si la vitesse d&eacute;duite de la distance spatiale entre &laquo;&nbsp;EndOfLink&nbsp;&raquo;
- et &laquo;&nbsp;StartOfLink&nbsp;&raquo; divis&eacute;e par le temps
- &laquo;&nbsp;DefaultDuration&nbsp;&raquo; est proche de la valeur param&eacute;trable XX (+/-
- delta), poursuivre le test, sinon le test est invalid&eacute; et fournit le
- message&nbsp;: &laquo;&nbsp;test 3.21.1a&nbsp;: la vitesse fix&eacute;e par l&rsquo;&eacute;l&eacute;ment
- &laquo;&nbsp;DefaultDuration&nbsp;&raquo; n&rsquo;est pas conforme &agrave; la valeur param&eacute;trable XX
- (+/- delta) fix&eacute;e pour le lien d&rsquo;acc&egrave;s dont l&rsquo;identifiant est &laquo;&nbsp;ObjectId&nbsp;&raquo;.</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>-
- Si la vitesse d&eacute;duite de la distance spatiale entre &laquo;&nbsp;EndOfLink&nbsp;&raquo;
- et &laquo;&nbsp;StartOfLink&nbsp;&raquo; divis&eacute;e par le temps
- &laquo;&nbsp;FrequentTravellerDuration&nbsp;&raquo; est proche de la valeur param&eacute;trable
- YY (+/- delta), poursuivre le test, sinon le test est invalid&eacute; et fournit le
- message&nbsp;: &laquo;&nbsp;test 3.21.1b&nbsp;: la vitesse fix&eacute;e par l&rsquo;&eacute;l&eacute;ment
- &laquo;&nbsp;FrequentTravellerDuration&nbsp;&raquo; n&rsquo;est pas conforme &agrave; la valeur
- param&eacute;trable YY (+/- delta) fix&eacute;e pour le lien d&rsquo;acc&egrave;s dont l&rsquo;identifiant est
- &laquo;&nbsp;ObjectId&nbsp;&raquo;.</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>-
- Si la vitesse d&eacute;duite de la distance spatiale entre &laquo;&nbsp;EndOfLink&nbsp;&raquo; et
- &laquo;&nbsp;StartOfLink&nbsp;&raquo; divis&eacute;e par le temps
- &laquo;&nbsp;OccasionalTravellerDuration&nbsp;&raquo; est proche de la valeur
- param&eacute;trable ZZ (+/- delta), poursuivre le test, sinon le test est invalid&eacute;
- et fournit le message&nbsp;: &laquo;&nbsp;test 3.21.1c&nbsp;: la vitesse fix&eacute;e par
- l&rsquo;&eacute;l&eacute;ment &laquo;&nbsp;OccasionalTravellerDuration&nbsp;&raquo; n&rsquo;est pas conforme &agrave; la
- valeur param&eacute;trable ZZ (+/- delta) fix&eacute;e pour e lien d&rsquo;acc&egrave;s dont
- l&rsquo;identifiant est &laquo;&nbsp;ObjectId&nbsp;&raquo;.&raquo;.</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>-
- Si l&rsquo;&eacute;l&eacute;ment &laquo;&nbsp;MobilityRestrictedTravellerDuration&nbsp;&raquo;&nbsp; est
- d&eacute;fini dans l&rsquo;&eacute;l&eacute;ment &laquo;&nbsp;VehicleJourneyAtStop&nbsp;&raquo; identifi&eacute;,
- poursuivre le test, sinon le test est valid&eacute;.</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>-
- Si la vitesse d&eacute;duite de la distance spatiale entre &laquo;&nbsp;EndOfLink&nbsp;&raquo;
- et &laquo;&nbsp;StartOfLink&nbsp;&raquo; divis&eacute;e par le temps
- &laquo;&nbsp;MobilityRestrictedTravellerDuration&nbsp;&raquo; est proche de la valeur
- param&eacute;trable WW (+/- delta), le test est valid&eacute;, sinon le test est invalid&eacute;
- et fournit le message&nbsp;: &laquo;&nbsp;test 3.8.1d&nbsp;: la vitesse fix&eacute;e par
- l&rsquo;&eacute;l&eacute;ment &laquo;&nbsp;MobilityRestrictedTravellerDuration&nbsp;&raquo; n&rsquo;est pas
- conforme &agrave; la valeur param&eacute;trable WW (+/- delta) fix&eacute;e pour le lien d&rsquo;acc&egrave;s
- dont l&rsquo;identifiant est &laquo;&nbsp;ObjectId&nbsp;&raquo;.&raquo;.</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>&nbsp;</span></p>
- </td>
- </tr>
-</table>
-<p class=MsoNormal>&nbsp;</p>
-</div>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Libellé:</u>
+Vérifier les vitesses calculées à partir des attributs du&nbsp;LiensAccèsZoneArrêt /NEPTUNE («&nbsp;AccessLink&nbsp;»)&nbsp;suivant les paramètres fixés&nbsp;</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2"><span style="text-decoration: underline;">Champ d’application:</span>&nbsp;&lt;AccessLink&gt;</font></font></font></p>
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Vérification:</u><br><br>- Si l’élément «&nbsp;AccessLink&nbsp;»
+mentionné dans les champs d’application est présent une ou plusieurs
+fois, poursuivre le test, sinon le test est abandonné.</font></font></font></p><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2"><br>-
+Si la vitesse déduite de la distance spatiale entre
+«&nbsp;EndOfLink&nbsp;» et «&nbsp;StartOfLink&nbsp;» divisée par le
+temps «&nbsp;DefaultDuration&nbsp;» est proche de la valeur
+paramétrable XX (+/- delta), poursuivre le test, sinon le test est
+invalidé et fournit le message&nbsp;: «&nbsp;test 3.21.1a&nbsp;: la
+vitesse fixée par l’élément «&nbsp;DefaultDuration&nbsp;» n’est pas
+conforme à la valeur paramétrable XX (+/- delta) fixée pour le lien
+d’accès dont l’identifiant est «&nbsp;ObjectId&nbsp;».</font></font></font><br><br><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">-
+Si la vitesse déduite de la distance spatiale entre
+«&nbsp;EndOfLink&nbsp;» et «&nbsp;StartOfLink&nbsp;» divisée par le
+temps «&nbsp;FrequentTravellerDuration&nbsp;» est proche de la valeur
+paramétrable YY (+/- delta), poursuivre le test, sinon le test est
+invalidé et fournit le message&nbsp;: «&nbsp;test 3.21.1b&nbsp;: la
+vitesse fixée par l’élément «&nbsp;FrequentTravellerDuration&nbsp;»
+n’est pas conforme à la valeur paramétrable YY (+/- delta) fixée pour
+le lien d’accès dont l’identifiant est «&nbsp;ObjectId&nbsp;»</font></font></font><span style="font-family: Arial,sans-serif;"><br><br></span><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">-
+Si la vitesse déduite de la distance spatiale entre
+«&nbsp;EndOfLink&nbsp;» et «&nbsp;StartOfLink&nbsp;» divisée par le
+temps «&nbsp;OccasionalTravellerDuration&nbsp;» est proche de la valeur
+paramétrable ZZ (+/- delta), poursuivre le test, sinon le test est
+invalidé et fournit le message&nbsp;: «&nbsp;test 3.21.1c&nbsp;: la
+vitesse fixée par l’élément «&nbsp;OccasionalTravellerDuration&nbsp;»
+n’est pas conforme à la valeur paramétrable ZZ (+/- delta) fixée pour e
+lien d’accès dont l’identifiant est «&nbsp;ObjectId&nbsp;».<br></font></font></font><span style="font-family: Arial,sans-serif;"><br>- </span><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">Si
+l’élément «&nbsp;MobilityRestrictedTravellerDuration&nbsp;»&nbsp; est
+défini dans l’élément «&nbsp;VehicleJourneyAtStop&nbsp;» identifié,
+poursuivre le test, sinon le test est validé</font></font></font><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">&nbsp;</font></font></font>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si la vitesse déduite de la distance spatiale entre
+«&nbsp;EndOfLink&nbsp;» et «&nbsp;StartOfLink&nbsp;» divisée par le
+temps «&nbsp;MobilityRestrictedTravellerDuration&nbsp;» est proche de
+la valeur paramétrable WW (+/- delta), le test est validé, sinon le
+test est invalidé et fournit le message&nbsp;: «&nbsp;test
+3.8.1d&nbsp;: la vitesse fixée par l’élément
+«&nbsp;MobilityRestrictedTravellerDuration&nbsp;» n’est pas conforme à
+la valeur paramétrable WW (+/- delta) fixée pour le lien d’accès dont
+l’identifiant est «&nbsp;ObjectId&nbsp;».</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+&nbsp;</font></font></font></p>
diff --git a/app/views/test_sheet/3_3.html b/app/views/test_sheet/3_3.html
index d54516b4d..46215f88c 100644
--- a/app/views/test_sheet/3_3.html
+++ b/app/views/test_sheet/3_3.html
@@ -1,246 +1,57 @@
-<div class=WordSection1>
-</span></b>
-
-<p class=MsoTitle><span style='font-size:14.0pt;font-family:"Tahoma","sans-serif"'>Fiche
-de contr&ocirc;le N&deg; 3.3</span></p>
-
-<p class=MsoNormal>&nbsp;</p>
-
-<table class=MsoNormalTable border=1 cellspacing=0 cellpadding=0 width=647
- style='width:485.45pt;border-collapse:collapse;border:none'>
- <tr style='page-break-inside:avoid'>
- <td width=647 colspan=2 valign=top style='width:485.45pt;border:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center'><i><span style='color:navy'>Description</span></i></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>Intitul&eacute;</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt'><span style='font-size:11.0pt;
- line-height:200%;font-family:"Tahoma","sans-serif"'>Unicit&eacute; des noms de
- points d&rsquo;arr&ecirc;t </span></p>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>Objectif</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif";font-weight:normal'>V&eacute;rifier que chaque POINT D&rsquo;ARR&Ecirc;T
- SUR PARCOURS (&laquo;&nbsp;StopPoint&nbsp;&raquo;) poss&egrave;de des propri&eacute;t&eacute;s uniques au sein
- d&rsquo;un m&ecirc;me jeu de donn&eacute;es</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>R&eacute;f&eacute;rences</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif";font-weight:normal'>TRIDENT/profil CHOUETTE/Transmodel
- V4 et V5.1</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>N&deg; de fiche(s) connexe(s)</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='text-align:left'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'>&nbsp;</span></h1>
- <h1 align=left style='text-align:left'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'>&nbsp;</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt'><b><span style='font-family:
- "Tahoma","sans-serif"'>Priorit&eacute;<span style='color:red'> </span></span></b></p>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif";font-weight:normal'>Obligatoire</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt'><b><span style='font-family:
- "Tahoma","sans-serif"'>R&eacute;sultat</span></b></p>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif";font-weight:normal'>D&eacute;livrance d&rsquo;un avertissement de
- mise en garde sur des cons&eacute;quences &eacute;ventuelles de dysfonctionnement</span></h1>
- </td>
- </tr>
- <tr style='page-break-inside:avoid'>
- <td width=647 colspan=2 valign=top style='width:485.45pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center'><i><span style='color:navy'>Mise en &oelig;uvre</span></i></h1>
- </td>
- </tr>
- <tr>
- <td width=100 valign=top style='width:74.85pt;border:solid windowtext 1.0pt;
- border-top:none;padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt'>Explication</span></h1>
- </td>
- <td width=547 valign=top style='width:410.6pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <p class=MsoBodyText3 align=left style='margin-top:6.0pt;margin-right:0cm;
- margin-bottom:6.0pt;margin-left:0cm;text-align:left'><span style='font-family:
- "Tahoma","sans-serif"'>Dans un m&ecirc;me jeu de donn&eacute;es et &agrave; fortiori sur un m&ecirc;me
- LIGNE/Chouette (&laquo;&nbsp;Line&nbsp;&raquo;), deux ou plusieurs POINTs D&rsquo;ARR&Ecirc;T SUR
- PARCOURS (&laquo;&nbsp;StopPoint&nbsp;&raquo;) peuvent avoir la m&ecirc;me d&eacute;nomination. Si un
- simple nom ne suffit pas (mairie, &eacute;glise …) &agrave; les d&eacute;partager, alors il faut
- ajouter &agrave; ce nom une adresse et &eacute;ventuellement le nom de la commune. </span></p>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm;text-align:justify'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>Ce point de contr&ocirc;le consiste donc &agrave;
- recenser les POINTs D&rsquo;ARR&Ecirc;T SUR PARCOURS qui poss&egrave;dent les m&ecirc;mes
- caract&eacute;ristiques. </span></p>
- </td>
- </tr>
-</table>
-
-<p class=MsoNormal>&nbsp;</p>
-
-<table class=MsoNormalTable border=1 cellspacing=0 cellpadding=0 width=638
- style='width:478.4pt;border-collapse:collapse;border:none'>
- <tr>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><b><span lang=EN-US style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>Exemple</span></b></p>
- </td>
- <td width=538 valign=top style='width:403.55pt;border:solid windowtext 1.0pt;
- border-left:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <p class=MsoNormal align=center style='text-align:center'><b><span
- lang=EN-US style='font-size:11.0pt'>&nbsp;</span></b></p>
- <p class=MsoNormal align=center style='text-align:center'><b><span
- lang=EN-US style='font-size:11.0pt'><img width=450 height=624
- src="BATERI_Neptune_FINAL-V2_0a_fichiers/image017.jpg"></span></b></p>
- <p class=MsoNormal align=center style='text-align:center'><span lang=EN-US>&nbsp;</span></p>
- </td>
- </tr>
- <tr style='page-break-inside:avoid'>
- <td width=638 colspan=2 valign=top style='width:478.4pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h2 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center'><i><span lang=EN-US style='font-size:14.0pt;
- color:navy'>Evaluation</span></i></h2>
- </td>
- </tr>
- <tr>
- <td width=100 valign=top style='width:74.85pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span lang=EN-US style='font-size:11.0pt'>N&deg; test</span></h1>
- </td>
- <td width=538 style='width:403.55pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>Test
- 3.3.1</span></p>
- </td>
- </tr>
- <tr>
- <td width=100 valign=top style='width:74.85pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt'>Libell&eacute;</span></h1>
- </td>
- <td width=538 valign=top style='width:403.55pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Diff&eacute;rentiation
- de nom pour les POINTs D&rsquo;ARR&Ecirc;T SUR PARCOURS (&laquo;&nbsp;StopPoint&nbsp;&raquo;)</span></p>
- </td>
- </tr>
- <tr>
- <td width=100 valign=top style='width:74.85pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt'>Champ d&rsquo;application</span></h1>
- </td>
- <td width=538 valign=top style='width:403.55pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <p class=MsoHeader style='margin-top:6.0pt'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>&lt;StopPoint&gt;</span></p>
- </td>
- </tr>
- <tr>
- <td width=100 valign=top style='width:74.85pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt'>V&eacute;rification</span></h1>
- </td>
- <td width=538 valign=top style='width:403.55pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>-
- Si l&rsquo;&eacute;l&eacute;ment &laquo;&nbsp;StopPoint&nbsp;&raquo; mentionn&eacute; dans les champs d&rsquo;application
- est pr&eacute;sent une ou plusieurs fois, poursuivre le test, sinon le test est
- abandonn&eacute;.</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>-
- S&rsquo;il existe deux points d&rsquo;arr&ecirc;t &laquo;&nbsp;StopPoint&nbsp;&raquo; dont la valeur de
- l&rsquo;attribut de l&rsquo;&eacute;l&eacute;ment &laquo;&nbsp;names&nbsp;&raquo; est identique et que les valeurs
- de l&rsquo;attribut de l&rsquo;&eacute;l&eacute;ment &lt;containedIn&gt; sont diff&eacute;rentes ou vides,
- alors la valeur de l&rsquo;&eacute;l&eacute;ment &laquo;&nbsp;adresse&nbsp;&raquo; doit &ecirc;tre diff&eacute;renci&eacute;e
- pour les deux objets &laquo;&nbsp;StopPoint&nbsp;&raquo;. Si c&rsquo;est le cas, le test est
- valid&eacute; sinon le test fournit </span><span style='font-size:11.0pt;font-family:
- "Arial","sans-serif"'>message d'avertissement</span><span style='font-size:
- 11.0pt;font-family:"Arial","sans-serif"'>&nbsp;: &laquo;&nbsp;test 3.3.1&nbsp;:
- deux points d&rsquo;arr&ecirc;t &laquo;&nbsp;StopPoint&nbsp;&raquo; de m&ecirc;me nom ne sont pas
- suffisamment renseign&eacute;s pour avoir des propri&eacute;t&eacute;s uniques&nbsp;&raquo;.</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>&nbsp;</span></p>
- </td>
- </tr>
-</table>
-
-<p class=MsoNormal>&nbsp;</p>
-
-</div>
-
+<h1 class="western" style="border: 1pt solid rgb(0, 0, 0); padding: 0.05cm 0.12cm; margin-top: 0.21cm;" align="center">
+<font face="Arial, sans-serif"><font style="font-size: 20pt;" size="5"><i>
+ contrôle N° 3.3<br>
+Unicité des noms de points d’arrêt <br>
+</i></font></font></h1>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Objectif: </b></u>
+Vérifier que chaque POINT D’ARRÊT SUR PARCOURS
+(«&nbsp;StopPoint&nbsp;») possède des propriétés uniques au sein d’un
+même jeu de données<br>
+</font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Priorité: </b></u> Obligatoire</font></p><font face="Arial, sans-serif">
+</font><p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><u><b>Explications:</b></u>
+</font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Dans un même jeu de données et à fortiori sur un même LIGNE/Chouette
+(«&nbsp;Line&nbsp;»), deux ou plusieurs POINTs D’ARRÊT SUR PARCOURS
+(«&nbsp;StopPoint&nbsp;») peuvent avoir la même dénomination. Si un
+simple nom ne suffit pas (mairie, église …) à les départager, alors
+il faut ajouter à ce nom une adresse et éventuellement le nom de la
+commune.</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Ce point de contrôle consiste donc à recenser les POINTs D’ARRÊT SUR PARCOURS qui possèdent les mêmes caractéristiques.</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>Exemple: </u></b></font></font></font></p>
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+&nbsp;<img src="image017.jpg" height="624" width="450"></font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>N° test:</u></b>
+Test 3.3.1</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Libellé:</u>
+Différentiation de nom pour les POINTs D’ARRÊT SUR PARCOURS («&nbsp;StopPoint&nbsp;»)</font></font></font></p>
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2"><span style="text-decoration: underline;">
+Champ d’application:&nbsp;</span>&lt;StopPoint&gt;</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Vérification:</u> </font></font></font></p>
+
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si l’élément «&nbsp;StopPoint&nbsp;» mentionné dans les champs
+d’application est présent une ou plusieurs fois, poursuivre le test,
+sinon le test est abandonné.&nbsp;</font></font></font></p>
+
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- S’il existe deux points d’arrêt «&nbsp;StopPoint&nbsp;» dont la
+valeur de l’attribut de l’élément «&nbsp;names&nbsp;» est identique et
+que les valeurs de l’attribut de l’élément &lt;containedIn&gt; sont
+différentes ou vides, alors la valeur de l’élément
+«&nbsp;adresse&nbsp;» doit être différenciée pour les deux objets
+«&nbsp;StopPoint&nbsp;». Si c’est le cas, le test est validé sinon le
+test fournit &nbsp;lemessage d'avertissement (WARNING)&nbsp;
+&nbsp;: «&nbsp;test 3.3.1&nbsp;: deux points d’arrêt
+«&nbsp;StopPoint&nbsp;» de même nom ne sont pas suffisamment renseignés
+pour avoir des propriétés uniques&nbsp;».</font></font></font></p>
diff --git a/app/views/test_sheet/3_4.html b/app/views/test_sheet/3_4.html
index 735f814a6..a216e99c8 100644
--- a/app/views/test_sheet/3_4.html
+++ b/app/views/test_sheet/3_4.html
@@ -1,239 +1,44 @@
-<div class=WordSection1>
-</span></b>
+<h1 class="western" style="border: 1pt solid rgb(0, 0, 0); padding: 0.05cm 0.12cm; margin-top: 0.21cm;" align="center">
+<font face="Arial, sans-serif"><font style="font-size: 20pt;" size="5"><i>
+ point de contrôle N° 3.4<br>
+Unicité des noms de ligne<br>
+</i></font></font></h1>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Objectif: </b></u>
+Vérifier que chaque LINE/Chouette («&nbsp;Line&nbsp;») possède des propriétés uniques<br>
+dans un jeu de données.<br>
+</font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Priorité: </b></u> Obligatoire</font></p><font face="Arial, sans-serif">
+</font><p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><u><b>Explications:</b></u>
+</font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Dans un même jeu de données, chaque LINE/Chouette («&nbsp;Line&nbsp;») doit posséder une appellation unique.</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Ce point de contrôle consiste donc à recenser les LINEs/Chouette qui possèdent les mêmes propriétés.</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>Exemple: </u></b></font></font></font></p>
+<p><font face="Arial, sans-serif"><img src="image018.jpg" height="498" width="478"></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>N° test:</u></b>
+Test 3.4.1</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Libellé:</u>
+Vérifier que chaque LINE/Chouette («&nbsp;Line&nbsp;») possède des valeurs d’attributs uniques</font></font></font></p>
-<p class=MsoTitle><span style='font-size:14.0pt;font-family:"Tahoma","sans-serif"'>Fiche
-du point de contr&ocirc;le N&deg; 3.4</span></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2"><span style="text-decoration: underline;">
+Champ d’application:</span>&nbsp;&lt;Line&gt;</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Vérification:</u> </font></font></font></p>
-<p class=MsoNormal>&nbsp;</p>
-<table class=MsoNormalTable border=1 cellspacing=0 cellpadding=0 width=638
- style='width:478.4pt;border-collapse:collapse;border:none'>
- <tr style='page-break-inside:avoid'>
- <td width=638 colspan=2 valign=top style='width:478.4pt;border:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center'><i><span style='font-family:"Tahoma","sans-serif";
- color:navy'>Description</span></i></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>Intitul&eacute;</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt'><span style='font-size:11.0pt;
- line-height:200%;font-family:"Tahoma","sans-serif"'>Unicit&eacute; des noms de ligne</span></p>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>Objectif</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif";font-weight:normal'>V&eacute;rifier que chaque LINE/Chouette
- (&laquo;&nbsp;Line&nbsp;&raquo;) poss&egrave;de des propri&eacute;t&eacute;s uniques </span><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>dans
- un jeu de donn&eacute;es.</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>R&eacute;f&eacute;rences</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif";font-weight:normal'>TRIDENT/profil CHOUETTE/Transmodel
- V4 et V5.1</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>N&deg; de fiche(s) connexe(s)</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='text-align:left'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'>&nbsp;</span></h1>
- <h1 align=left style='text-align:left'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'>&nbsp;</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt'><b><span style='font-family:
- "Tahoma","sans-serif"'>Priorit&eacute;<span style='color:red'> </span></span></b></p>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif";font-weight:normal'>Obligatoire</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt'><b><span style='font-family:
- "Tahoma","sans-serif"'>R&eacute;sultat</span></b></p>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif";font-weight:normal'>d&eacute;livrance d&rsquo;un avertissement de
- mise en garde sur des cons&eacute;quences &eacute;ventuelles de dysfonctionnement</span></h1>
- </td>
- </tr>
- <tr style='page-break-inside:avoid'>
- <td width=638 colspan=2 valign=top style='width:478.4pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center'><i><span style='color:navy'>Mise en &oelig;uvre</span></i></h1>
- </td>
- </tr>
- <tr>
- <td width=100 style='width:74.85pt;border:solid windowtext 1.0pt;border-top:
- none;padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>Explication</span></h1>
- </td>
- <td width=538 style='width:403.55pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Dans
- un m&ecirc;me jeu de donn&eacute;es, chaque LINE/Chouette (&laquo;&nbsp;Line&nbsp;&raquo;) doit
- poss&eacute;der une appellation unique. </span></p>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Ce
- point de contr&ocirc;le consiste donc &agrave; recenser les LINEs/Chouette qui poss&egrave;dent
- les m&ecirc;mes propri&eacute;t&eacute;s.</span></p>
- </td>
- </tr>
-</table>
-
-<p class=MsoNormal>&nbsp;</p>
-
-<table class=MsoNormalTable border=1 cellspacing=0 cellpadding=0 width=647
- style='width:485.45pt;border-collapse:collapse;border:none'>
- <tr>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><b><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Exemple</span></b></p>
- </td>
- <td width=547 valign=top style='width:410.6pt;border:solid windowtext 1.0pt;
- border-left:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 style='margin-left:18.0pt;text-indent:-18.0pt'><span style='font-size:
- 11.0pt;font-weight:normal'>&nbsp;</span></h1>
- <h1 style='margin-left:18.0pt;text-indent:-18.0pt'><span style='font-size:
- 11.0pt;font-weight:normal'><img width=478 height=498
- src="BATERI_Neptune_FINAL-V2_0a_fichiers/image018.jpg"></span></h1>
- <p class=MsoNormal>&nbsp;</p>
- </td>
- </tr>
- <tr style='page-break-inside:avoid'>
- <td width=647 colspan=2 valign=top style='width:485.45pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h2 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center'><i><span lang=EN-US style='font-size:14.0pt;
- color:navy'>Evaluation</span></i></h2>
- </td>
- </tr>
- <tr>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span lang=EN-US style='font-size:11.0pt'>N&deg; test</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>Test
- 3.4.1</span></p>
- </td>
- </tr>
- <tr>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt'>Libell&eacute;</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>V&eacute;rifier
- que chaque LINE/Chouette (&laquo;&nbsp;Line&nbsp;&raquo;) poss&egrave;de des valeurs d&rsquo;attributs
- uniques</span></p>
- </td>
- </tr>
- <tr>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt'>Champ d&rsquo;application</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&lt;Line&gt;</span></p>
- </td>
- </tr>
- <tr>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt'>V&eacute;rification</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>-
- Si l&rsquo;&eacute;l&eacute;ment &laquo;&nbsp;Line&nbsp;&raquo;, mentionn&eacute; dans les champs d&rsquo;application, est
- pr&eacute;sent une ou plusieurs fois, poursuivre le test, sinon le test est
- abandonn&eacute;.</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>-
- Si la r&eacute;f&eacute;rence constitu&eacute;e par la concat&eacute;nation de la valeur des attributs
- des &eacute;l&eacute;ments &laquo;&nbsp;name&nbsp;&raquo; et &laquo;&nbsp;number&nbsp;&raquo; est unique pour
- toutes les lignes &laquo;&nbsp;Line&nbsp;&raquo;, le test est valid&eacute;, sinon le test est
- invalid&eacute; et fournit le message&nbsp;: &laquo;&nbsp;test 3.4.1&nbsp;: les &eacute;l&eacute;ments
- &laquo;&nbsp;name&nbsp;&raquo; et &laquo;&nbsp;number&nbsp;&raquo; d&rsquo;une ligne ne constituent pas un
- identifiant unique pour la ligne &laquo;&nbsp;Line&nbsp;&raquo;&nbsp;r&eacute;f&eacute;renc&eacute;e par l&rsquo;&eacute;l&eacute;ment
- &laquo;&nbsp;ObjectId&nbsp;&raquo;&raquo; </span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>&nbsp;</span></p>
- </td>
- </tr>
-</table>
-
-<p class=MsoNormal>&nbsp;</p>
-
-</div>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si l’élément «&nbsp;Line&nbsp;», mentionné dans les champs
+d’application, est présent une ou plusieurs fois, poursuivre le test,
+sinon le test est abandonné.</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si la référence constituée par la concaténation de la valeur des
+attributs des éléments «&nbsp;name&nbsp;» et «&nbsp;number&nbsp;» est
+unique pour toutes les lignes «&nbsp;Line&nbsp;», le test est validé,
+sinon le test est invalidé et fournit le message&nbsp;: «&nbsp;test
+3.4.1&nbsp;: les éléments «&nbsp;name&nbsp;» et «&nbsp;number&nbsp;»
+d’une ligne ne constituent pas un identifiant unique pour la ligne
+«&nbsp;Line&nbsp;»&nbsp;référencée par l’élément «&nbsp;ObjectId&nbsp;»</font></font></font></p>
diff --git a/app/views/test_sheet/3_5.html b/app/views/test_sheet/3_5.html
index 968d199a7..584de6a2c 100644
--- a/app/views/test_sheet/3_5.html
+++ b/app/views/test_sheet/3_5.html
@@ -1,239 +1,52 @@
-<div class=WordSection1>
-</span></b>
+<h1 class="western" style="border: 1pt solid rgb(0, 0, 0); padding: 0.05cm 0.12cm; margin-top: 0.21cm;" align="center">
+<font face="Arial, sans-serif"><font style="font-size: 20pt;" size="5"><i>
+ point de contrôle N° 3.5<br>
+Modèle de représentation des coordonnées des points d’arrêt<br>
+</i></font></font></h1>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Objectif: </b></u>
+Vérifier que les coordonnées des POINTs D’ARRÊT SUR PARCOURS
+(«&nbsp;StopPoint&nbsp;») sont dans un même système géodésique ou un
+même système de projection<br>
+</font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Priorité: </b></u> Obligatoire</font></p><font face="Arial, sans-serif">
+</font><p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><u><b>Explications:</b></u>
+</font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Dans un même jeu de données, chaque POINT D’ARRÊT SUR PARCOURS
+(«&nbsp;StopPoint&nbsp;») doit être représenté géographiquement de la
+même manière et dans un système de représentation géographique
+identique. On vérifiera également qu’il n’y a pas d’aberration comme
+des coordonnées géographiques nulle ou situées hors d’une zone dont le
+périmètre ou le contour est à définir.</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>Exemple: </u></b></font></font></font></p>
+<p><font face="Arial, sans-serif"><img src="image017.jpg" height="624" width="450"></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>N° test:</u></b>
+Test 3.5.1</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Libellé:</u> Test des coordonnées géographiques de chaque POINT
+D’ARRÊT SUR PARCOURS («&nbsp;StopPoint&nbsp;») par rapport à un modèle
+de projection de référence.</font></font></font></p>
-<p class=MsoTitle><span style='font-size:14.0pt;font-family:"Tahoma","sans-serif"'>Fiche
-du point de contr&ocirc;le N&deg; 3.5</span></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2"><span style="text-decoration: underline;">
+Champ d’application:</span>&nbsp;&lt;StopPoint&gt;</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Vérification:</u> </font></font></font></p>
-<p class=MsoNormal>&nbsp;</p>
-<table class=MsoNormalTable border=1 cellspacing=0 cellpadding=0 width=638
- style='width:478.4pt;border-collapse:collapse;border:none'>
- <tr style='page-break-inside:avoid'>
- <td width=638 colspan=2 valign=top style='width:478.4pt;border:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center'><i><span style='color:navy'>Description</span></i></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>Intitul&eacute;</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt'><span style='font-size:11.0pt;
- line-height:200%;font-family:"Tahoma","sans-serif"'>Mod&egrave;le de repr&eacute;sentation
- des coordonn&eacute;es des points d&rsquo;arr&ecirc;t</span></p>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>Objectif</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif";font-weight:normal'>V&eacute;rifier que les coordonn&eacute;es des
- POINTs D&rsquo;ARR&Ecirc;T SUR PARCOURS (&laquo;&nbsp;StopPoint&nbsp;&raquo;) sont dans un m&ecirc;me syst&egrave;me
- g&eacute;od&eacute;sique ou un m&ecirc;me syst&egrave;me de projection</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>R&eacute;f&eacute;rences</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif";font-weight:normal'>TRIDENT/profil CHOUETTE/Transmodel
- V4 et V5.1</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>N&deg; de fiche(s) connexe(s)</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='text-align:left'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'>&nbsp;</span></h1>
- <h1 align=left style='text-align:left'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'>&nbsp;</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt'><b><span style='font-family:
- "Tahoma","sans-serif"'>Priorit&eacute;<span style='color:red'> </span></span></b></p>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif";font-weight:normal'>Obligatoire</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt'><b><span style='font-family:
- "Tahoma","sans-serif"'>R&eacute;sultat</span></b></p>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif";font-weight:normal'>Conforme ou non conforme</span></h1>
- </td>
- </tr>
- <tr style='page-break-inside:avoid'>
- <td width=638 colspan=2 valign=top style='width:478.4pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center'><i><span style='color:navy'>Mise en &oelig;uvre</span></i></h1>
- </td>
- </tr>
- <tr>
- <td width=100 style='width:74.85pt;border:solid windowtext 1.0pt;border-top:
- none;padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>Explication</span></h1>
- </td>
- <td width=538 style='width:403.55pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt;line-height:normal'><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Dans un m&ecirc;me jeu
- de donn&eacute;es, chaque POINT D&rsquo;ARR&Ecirc;T SUR PARCOURS (&laquo;&nbsp;StopPoint&nbsp;&raquo;) doit
- &ecirc;tre repr&eacute;sent&eacute; g&eacute;ographiquement de la m&ecirc;me mani&egrave;re et dans un syst&egrave;me de
- repr&eacute;sentation g&eacute;ographique identique. On v&eacute;rifiera &eacute;galement qu&rsquo;il n&rsquo;y a pas
- d&rsquo;aberration comme des coordonn&eacute;es g&eacute;ographiques nulle ou situ&eacute;es hors d&rsquo;une
- zone dont le p&eacute;rim&egrave;tre ou le contour est &agrave; d&eacute;finir.</span></p>
- </td>
- </tr>
-</table>
-<p class=MsoNormal>&nbsp;</p>
-<table class=MsoNormalTable border=1 cellspacing=0 cellpadding=0 width=638
- style='width:478.4pt;border-collapse:collapse;border:none'>
- <tr>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><b><span lang=EN-US style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>Exemple</span></b></p>
- </td>
- <td width=538 valign=top style='width:403.55pt;border:solid windowtext 1.0pt;
- border-left:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 style='margin-left:18.0pt;text-indent:-18.0pt'><span lang=EN-US>&nbsp;</span></h1>
- <h1 style='margin-left:18.0pt;text-indent:-18.0pt'><span lang=EN-US><img
- width=450 height=624 src="BATERI_Neptune_FINAL-V2_0a_fichiers/image017.jpg"></span></h1>
- <p class=MsoNormal><span lang=EN-US>&nbsp;</span></p>
- </td>
- </tr>
- <tr style='page-break-inside:avoid'>
- <td width=638 colspan=2 valign=top style='width:478.4pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h2 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center'><i><span lang=EN-US style='font-size:14.0pt;
- color:navy'>Evaluation</span></i></h2>
- </td>
- </tr>
- <tr>
- <td width=100 valign=top style='width:74.85pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span lang=EN-US style='font-size:11.0pt'>N&deg; test</span></h1>
- </td>
- <td width=538 style='width:403.55pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>Test
- 3.5.1</span></p>
- </td>
- </tr>
- <tr>
- <td width=100 valign=top style='width:74.85pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt'>Libell&eacute;</span></h1>
- </td>
- <td width=538 valign=top style='width:403.55pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Test
- des coordonn&eacute;es g&eacute;ographiques de chaque POINT D&rsquo;ARR&Ecirc;T SUR PARCOURS
- (&laquo;&nbsp;StopPoint&nbsp;&raquo;) par rapport &agrave; un mod&egrave;le de projection de r&eacute;f&eacute;rence.</span></p>
- </td>
- </tr>
- <tr>
- <td width=100 valign=top style='width:74.85pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt'>Champ d&rsquo;application</span></h1>
- </td>
- <td width=538 valign=top style='width:403.55pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <p class=MsoHeader style='margin-top:6.0pt'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>&lt;StopPoint&gt;</span></p>
- </td>
- </tr>
- <tr>
- <td width=100 valign=top style='width:74.85pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt'>V&eacute;rification</span></h1>
- </td>
- <td width=538 valign=top style='width:403.55pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <p class=MsoNormal><span style='font-family:"Tahoma","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>Soit
- PJ la projection de r&eacute;f&eacute;rence.</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>-
- Si l&rsquo;objet &laquo;&nbsp;StopPoint&nbsp;&raquo; mentionn&eacute; dans les champs d&rsquo;application
- est pr&eacute;sent une ou plusieurs fois, poursuivre le test, sinon le test est
- abandonn&eacute;.</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>-
- Si la valeur de l&rsquo;attribut de l&rsquo;&eacute;l&eacute;ment &laquo;&nbsp;longLatType&nbsp;&raquo; contenu
- dans l&rsquo;&eacute;l&eacute;ment &laquo;&nbsp;StopPoint&nbsp;&raquo; est diff&eacute;rente de PJ alors le test
- fournit le message d'avertissement&nbsp;: &laquo;&nbsp;test 3.5.1&nbsp;: le point
- d&rsquo;arr&ecirc;t d&rsquo;identifiant &laquo;&nbsp;ObjectId&nbsp;&raquo; n&rsquo;est pas dans le bon syst&egrave;me de
- projection&nbsp;ou ses coordonn&eacute;es g&eacute;ographiques sont nulle ou il est situ&eacute;
- hors d&rsquo;une zone dont le p&eacute;rim&egrave;tre ou le contour est &agrave; d&eacute;finir.&raquo;</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>-
- Sinon le test est valid&eacute;.</span></p>
- </td>
- </tr>
-</table>
-</div> \ No newline at end of file
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Soit PJ la projection de référence:<br>-
+Si l’objet «&nbsp;StopPoint&nbsp;» mentionné dans les champs
+d’application est présent une ou plusieurs fois, poursuivre le test,
+sinon le test est abandonné.<br>- Si la valeur de l’attribut de
+l’élément «&nbsp;longLatType&nbsp;» contenu dans l’élément
+«&nbsp;StopPoint&nbsp;» est différente de PJ alors le test fournit le
+message d'avertissement&nbsp;: «&nbsp;test 3.5.1&nbsp;: le point
+d’arrêt d’identifiant «&nbsp;ObjectId&nbsp;» n’est pas dans le bon
+système de projection&nbsp;ou ses coordonnées géographiques sont nulle
+ou il est situé hors d’une zone dont le périmètre ou le contour est à
+définir.»</font></font></font></p><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">- Sinon le test est validé.</font></font></font>
diff --git a/app/views/test_sheet/3_6.html b/app/views/test_sheet/3_6.html
index 2ad4af075..d26b60765 100644
--- a/app/views/test_sheet/3_6.html
+++ b/app/views/test_sheet/3_6.html
@@ -1,260 +1,62 @@
-<div class=WordSection1>
-</span></b>
-
-<p class=MsoTitle><span style='font-size:14.0pt;font-family:"Tahoma","sans-serif"'>Fiche
-du point de contr&ocirc;le N&deg; 3.6</span></p>
-
-<p class=MsoNormal>&nbsp;</p>
-
-<table class=MsoNormalTable border=1 cellspacing=0 cellpadding=0 width=647
- style='width:485.45pt;border-collapse:collapse;border:none'>
- <tr style='page-break-inside:avoid'>
- <td width=647 colspan=2 valign=top style='width:485.45pt;border:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center'><i><span style='color:navy'>Description</span></i></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt'>Intitul&eacute;</span></h1>
- </td>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt;text-align:justify'><span
- style='font-size:11.0pt;line-height:200%;font-family:"Tahoma","sans-serif"'>Localisation
- des points d&rsquo;arr&ecirc;t &agrave; l&rsquo;int&eacute;rieur d&rsquo;un p&eacute;rim&egrave;tre d&eacute;fini.</span></p>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt'>Objectif</span></h1>
- </td>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>S&rsquo;assurer que les </span><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'>coordonn&eacute;es des POINTs
- D&rsquo;ARR&Ecirc;T SUR PARCOURS (&laquo;&nbsp;StopPoint&nbsp;&raquo;) du jeu de donn&eacute;es sont situ&eacute;es
- &agrave; l&rsquo;int&eacute;rieur d&rsquo;un p&eacute;rim&egrave;tre d&eacute;fini.</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt'>R&eacute;f&eacute;rences</span></h1>
- </td>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>TRIDENT/profil CHOUETTE/Transmodel V4 et V5.1</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt'>N&deg;de fiche(s) connexe(s)</span></h1>
- </td>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>&nbsp;</span></h1>
- <h1><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>&nbsp;</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt'><b><span style='font-family:
- "Tahoma","sans-serif"'>Priorit&eacute;<span style='color:red'> </span></span></b></p>
- </td>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>Obligatoire</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt'><b><span style='font-family:
- "Tahoma","sans-serif"'>R&eacute;sultat</span></b></p>
- </td>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>D&eacute;livrance d&rsquo;un avertissement de mise en garde sur des
- cons&eacute;quences &eacute;ventuelles de dysfonctionnement</span></h1>
- </td>
- </tr>
- <tr style='page-break-inside:avoid'>
- <td width=647 colspan=2 valign=top style='width:485.45pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center'><i><span style='font-family:"Tahoma","sans-serif";
- color:navy'>Mise en &oelig;uvre</span></i></h1>
- </td>
- </tr>
- <tr>
- <td width=100 style='width:74.85pt;border:solid windowtext 1.0pt;border-top:
- none;padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>Explication</span></h1>
- </td>
- <td width=547 style='width:410.6pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm;text-align:justify'><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'>Si le jeu de donn&eacute;es appartient &agrave; un
- exploitant dont le r&eacute;seau dessert un groupe de communes, les coordonn&eacute;es des </span><span
- style='font-size:11.0pt;font-family:"Arial","sans-serif"'>POINTs D&rsquo;ARR&Ecirc;T SUR
- PARCOURS (&laquo;&nbsp;StopPoint&nbsp;&raquo;)</span><b><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'> </span></b><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'> doivent se situer dans cette zone. </span></p>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm;text-align:justify'><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'>Ce point de contr&ocirc;le consiste donc &agrave;
- v&eacute;rifier que les coordonn&eacute;es en latitude et longitude de chaque </span><span
- style='font-size:11.0pt;font-family:"Arial","sans-serif"'>POINT D&rsquo;ARR&Ecirc;T SUR
- PARCOURS (&laquo;&nbsp;StopPoint&nbsp;&raquo;)</span><b><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'> </span></b><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'>sont incluses dans un territoire d&eacute;limit&eacute;.</span></p>
- </td>
- </tr>
-</table>
-
-<p class=MsoNormal>&nbsp;</p>
-
-<table class=MsoNormalTable border=1 cellspacing=0 cellpadding=0 width=638
- style='width:478.4pt;border-collapse:collapse;border:none'>
- <tr>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><b><span lang=EN-US style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>Exemple</span></b></p>
- </td>
- <td width=538 valign=top style='width:403.55pt;border:solid windowtext 1.0pt;
- border-left:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 style='margin-left:18.0pt;text-indent:-18.0pt'><span lang=EN-US>&nbsp;</span></h1>
- <h1 style='margin-left:18.0pt;text-indent:-18.0pt'><span lang=EN-US><img
- width=450 height=624 src="BATERI_Neptune_FINAL-V2_0a_fichiers/image017.jpg"></span></h1>
- <p class=MsoNormal><span lang=EN-US>&nbsp;</span></p>
- </td>
- </tr>
- <tr style='page-break-inside:avoid'>
- <td width=638 colspan=2 valign=top style='width:478.4pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h2 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center'><i><span lang=EN-US style='font-size:14.0pt;
- color:navy'>Evaluation</span></i></h2>
- </td>
- </tr>
- <tr>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span lang=EN-US style='font-size:11.0pt'>N&deg; test</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>Test
- 3.6.1</span></p>
- </td>
- </tr>
- <tr>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt'>Libell&eacute;</span></h1>
- </td>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>V&eacute;rification
- que les coordonn&eacute;es de chaque </span><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'>POINT D&rsquo;ARR&Ecirc;T SUR PARCOURS
- (&laquo;&nbsp;StopPoint&nbsp;&raquo;)</span><b><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'> </span></b><span style='font-size:11.0pt;font-family:
- "Arial","sans-serif"'>sont inscrites dans une zone d&eacute;termin&eacute;e et qu&rsquo;elles
- sont dans le bon syst&egrave;me de projection.</span></p>
- </td>
- </tr>
- <tr>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt'>Champ d&rsquo;application</span></h1>
- </td>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <p class=MsoHeader style='margin-top:6.0pt'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>&lt;StopPoint&gt;</span></p>
- </td>
- </tr>
- <tr>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt'>V&eacute;rification</span></h1>
- </td>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>Soit
- PG le polygone de la zone couverte par le r&eacute;seau dans une projection PJ.</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal style='text-align:justify'><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'>- Si l&rsquo;objet &laquo;&nbsp;StopPoint&nbsp;&raquo;
- mentionn&eacute; dans les champs d&rsquo;application est pr&eacute;sent une ou plusieurs fois,
- poursuivre le test, sinon le test est abandonn&eacute;.</span></p>
- <p class=MsoNormal style='text-align:justify'><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal style='text-align:justify'><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'>- Si la valeur de l&rsquo;attribut de l&rsquo;&eacute;l&eacute;ment
- &laquo;&nbsp;longLatType&nbsp;&raquo; contenu dans l&rsquo;objet &laquo;&nbsp;StopPoint&nbsp;&raquo; est
- diff&eacute;rente de PJ alors le test fournit le message d'avertissement &laquo;&nbsp;test
- 3.6.1a&nbsp;: le point d&rsquo;arr&ecirc;t d&rsquo;identifiant &laquo;&nbsp;ObjectId&nbsp;&raquo; n&rsquo;est pas
- dans le bon syst&egrave;me de projection&nbsp;&raquo;, sinon poursuivre le test.</span></p>
- <p class=MsoNormal style='text-align:justify'><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal style='text-align:justify'><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'>- Si la projection du point, calcul&eacute;e &agrave;
- partir des valeurs des attributs des &eacute;l&eacute;ments &laquo;&nbsp;longitude&nbsp;&raquo;,
- &laquo;&nbsp;latitude&nbsp;&raquo; contenus dans l&rsquo;objet &laquo;&nbsp;StopPoint&nbsp;&raquo;, est contenue
- dans le polygone PG le test est valid&eacute;, sinon le test est invalid&eacute; et fournit
- le message&nbsp;: &laquo;&nbsp;test 3.6.1b&nbsp;: le point d&rsquo;arr&ecirc;t d&rsquo;identifiant
- &laquo;&nbsp;ObjectId&nbsp;&raquo; a des coordonn&eacute;es qui sont hors du polygone de la zone
- couverte&nbsp;&raquo;.</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>&nbsp;</span></p>
- </td>
- </tr>
-</table>
-
-<p class=MsoNormal>&nbsp;</p>
-
-</div>
-
+<h1 class="western" style="border: 1pt solid rgb(0, 0, 0); padding: 0.05cm 0.12cm; margin-top: 0.21cm;" align="center">
+<font face="Arial, sans-serif"><font style="font-size: 20pt;" size="5"><i>
+ point de contrôle N° 3.6<br>
+Localisation des points d’arrêt à l’intérieur d’un périmètre défini<br>
+</i></font></font></h1>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Objectif: </b></u>
+S’assurer que les coordonnées
+des POINTs D’ARRÊT SUR PARCOURS («&nbsp;StopPoint&nbsp;») du jeu de
+données sont situées à l’intérieur d’un périmètre défini.<br>
+</font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Priorité: </b></u> Obligatoire</font><br>
+</p><font face="Arial, sans-serif"></font><p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><u><b>Explications:</b></u>
+</font></font></p>
+
+
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Si le jeu de données appartient à un exploitant dont le réseau dessert un groupe de communes, les coordonnées des&nbsp;POINTs D’ARRÊT SUR PARCOURS («&nbsp;StopPoint&nbsp;»)&nbsp;doivent se situer dans cette zone.</font></font></font></p>
+
+
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Ce point de contrôle consiste donc à vérifier que les coordonnées en latitude et longitude de chaque&nbsp;POINT D’ARRÊT SUR PARCOURS («&nbsp;StopPoint&nbsp;»)&nbsp;sont incluses dans un territoire délimité.</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>Exemple: </u></b></font></font></font></p>
+<p><font face="Arial, sans-serif"><img src="image017.jpg" height="624" width="450"></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>N° test:</u></b>
+Test 3.6.1</font></font></font></p>
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Libellé:</u>
+Vérification que les coordonnées de chaque POINT D’ARRÊT SUR PARCOURS («&nbsp;StopPoint&nbsp;»)</font></font></font></p><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">sont inscrites dans une zone déterminée et qu’elles sont dans le bon système de projection.&nbsp;</font></font></font>
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2"><span style="text-decoration: underline;">
+Champ dÂ’application:</span>&nbsp;&lt;StopPoint&gt;</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Vérification:</u> </font></font></font></p>
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Soit PG le polygone de la zone couverte par le réseau dans une projection PJ.</font></font></font></p>
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si l’objet «&nbsp;StopPoint&nbsp;» mentionné dans les champs
+d’application est présent une ou plusieurs fois, poursuivre le test,
+sinon le test est abandonné.</font></font></font></p>
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si la valeur de l’attribut de l’élément «&nbsp;longLatType&nbsp;»
+contenu dans l’objet «&nbsp;StopPoint&nbsp;» est différente de PJ alors
+le test fournit le message d'avertissement «&nbsp;test 3.6.1a&nbsp;: le
+point d’arrêt d’identifiant «&nbsp;ObjectId&nbsp;» n’est pas dans le
+bon système de projection&nbsp;», sinon poursuivre le test.</font></font></font></p>
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si la projection du point, calculée à partir des valeurs des
+attributs des éléments «&nbsp;longitude&nbsp;», «&nbsp;latitude&nbsp;»
+contenus dans l’objet «&nbsp;StopPoint&nbsp;», est contenue dans le
+polygone PG le test est validé, sinon le test est invalidé et fournit
+le message&nbsp;: «&nbsp;test 3.6.1b&nbsp;: le point d’arrêt
+d’identifiant «&nbsp;ObjectId&nbsp;» a des coordonnées qui sont hors du
+polygone de la zone couverte&nbsp;».</font></font></font></p>
diff --git a/app/views/test_sheet/3_7.html b/app/views/test_sheet/3_7.html
index 5193c9ae9..e061a060c 100644
--- a/app/views/test_sheet/3_7.html
+++ b/app/views/test_sheet/3_7.html
@@ -1,256 +1,56 @@
-<div class=WordSection1>
-</span></b>
-
-<p class=MsoTitle><span style='font-size:14.0pt;font-family:"Tahoma","sans-serif"'>Fiche
-du point de contr&ocirc;le N&deg; 3.7</span></p>
-
-<p class=MsoNormal>&nbsp;</p>
-
-<table class=MsoNormalTable border=1 cellspacing=0 cellpadding=0 width=647
- style='width:485.45pt;border-collapse:collapse;border:none'>
- <tr style='page-break-inside:avoid'>
- <td width=647 colspan=2 valign=top style='width:485.45pt;border:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center'><i><span style='font-family:"Tahoma","sans-serif";
- color:navy'>Description</span></i></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt'>Intitul&eacute;</span></h1>
- </td>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt;text-align:justify'><span
- style='font-size:11.0pt;line-height:200%;font-family:"Tahoma","sans-serif"'>Caract&eacute;risation
- des distances entre les points d&rsquo;arr&ecirc;t </span></p>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt'>Objectif</span></h1>
- </td>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>V&eacute;rifier </span><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif";font-weight:normal'>que la distance entre les </span><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>POINTs
- D&rsquo;ARR&Ecirc;T SUR PARCOURS (&laquo;&nbsp;StopPoint&nbsp;&raquo;)</span><span style='font-size:
- 11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'> se situe dans
- une fourchette param&eacute;trable (distance minimale et maximale &agrave; fixer)</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt'>R&eacute;f&eacute;rences</span></h1>
- </td>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>TRIDENT/profil CHOUETTE/Transmodel V4 et V5.1</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt'>N&deg;de fiche(s) connexe(s)</span></h1>
- </td>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>&nbsp;</span></h1>
- <h1><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>&nbsp;</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt'><b><span style='font-family:
- "Tahoma","sans-serif"'>Priorit&eacute;<span style='color:red'> </span></span></b></p>
- </td>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>Obligatoire</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt'><b><span style='font-family:
- "Tahoma","sans-serif"'>R&eacute;sultat</span></b></p>
- </td>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>D&eacute;livrance d&rsquo;un avertissement de mise en garde sur des
- cons&eacute;quences &eacute;ventuelles de dysfonctionnement</span></h1>
- </td>
- </tr>
- <tr style='page-break-inside:avoid'>
- <td width=647 colspan=2 valign=top style='width:485.45pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center'><i><span style='color:navy'>Mise en &oelig;uvre</span></i></h1>
- </td>
- </tr>
- <tr>
- <td width=100 style='width:74.85pt;border:solid windowtext 1.0pt;border-top:
- none;padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>Explication</span></h1>
- </td>
- <td width=547 style='width:410.6pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm;text-align:justify'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>Afin de contr&ocirc;ler les distances aberrantes
- entre les POINTs D&rsquo;ARR&Ecirc;T SUR PARCOURS (&laquo;&nbsp;StopPoint&nbsp;&raquo;), un contr&ocirc;le
- sera effectu&eacute; sur la distance entre les 2 POINTs D&rsquo;ARR&Ecirc;T SUR PARCOURS de
- chaque TRONCON COMMERCIAL/Chouette (&laquo;&nbsp;PtLink&nbsp;&raquo;)&nbsp;: ce contr&ocirc;le
- devra r&eacute;pondre &agrave; des crit&egrave;res de distance maximale et de distance minimale
- (ces distances seront param&eacute;trables).</span></p>
- </td>
- </tr>
-</table>
-
-<p class=MsoNormal>&nbsp;</p>
-
-<table class=MsoNormalTable border=1 cellspacing=0 cellpadding=0 width=638
- style='width:478.4pt;border-collapse:collapse;border:none'>
- <tr>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><b><span lang=EN-US style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>Exemple</span></b></p>
- </td>
- <td width=538 valign=top style='width:403.55pt;border:solid windowtext 1.0pt;
- border-left:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 style='margin-left:18.0pt;text-indent:-18.0pt'><span lang=EN-US
- style='font-size:11.0pt;font-weight:normal'>&nbsp;</span></h1>
- <h1 style='margin-left:18.0pt;text-indent:-18.0pt'><span lang=EN-US
- style='font-size:11.0pt;font-weight:normal'><img width=372 height=618
- src="BATERI_Neptune_FINAL-V2_0a_fichiers/image019.jpg"></span></h1>
- <p class=MsoNormal><span lang=EN-US>&nbsp;</span></p>
- <h1 style='margin-left:18.0pt;text-indent:-18.0pt'><span lang=EN-US
- style='font-size:11.0pt;font-weight:normal'><img width=433 height=338
- src="BATERI_Neptune_FINAL-V2_0a_fichiers/image020.jpg"></span></h1>
- <p class=MsoNormal><span lang=EN-US>&nbsp;</span></p>
- </td>
- </tr>
- <tr style='page-break-inside:avoid'>
- <td width=638 colspan=2 valign=top style='width:478.4pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h2 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center'><i><span lang=EN-US style='font-size:14.0pt;
- color:navy'>Evaluation</span></i></h2>
- </td>
- </tr>
- <tr>
- <td width=100 valign=top style='width:74.85pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span lang=EN-US style='font-size:11.0pt'>N&deg; test</span></h1>
- </td>
- <td width=538 style='width:403.55pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>Test
- 3.7.1</span></p>
- </td>
- </tr>
- <tr>
- <td width=100 valign=top style='width:74.85pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt'>Libell&eacute;</span></h1>
- </td>
- <td width=538 valign=top style='width:403.55pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>V&eacute;rification
- de la distance entre 2 POINTs D&rsquo;ARR&Ecirc;T SUR PARCOURS (&laquo;&nbsp;StopPoint&nbsp;&raquo;)
- cons&eacute;cutifs</span></p>
- </td>
- </tr>
- <tr>
- <td width=100 valign=top style='width:74.85pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt'>Champ d&rsquo;application</span></h1>
- </td>
- <td width=538 valign=top style='width:403.55pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>&lt;vehicleJourney&gt;
- </span></p>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&lt;VehicleJourneyAtStop&gt;</span></p>
- </td>
- </tr>
- <tr>
- <td width=100 valign=top style='width:74.85pt;border:solid windowtext 1.0pt;
- border-top:none;padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt'>V&eacute;rification</span></h1>
- </td>
- <td width=538 valign=top style='width:403.55pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <p class=MsoNormal><b><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>&nbsp;</span></b></p>
- <p class=MsoBodyText3 align=left style='text-align:left'><span
- style='font-family:"Tahoma","sans-serif"'>- Si le fichier contient une classe
- d&rsquo;objets &laquo;&nbsp;vehicleJourney&nbsp;&raquo; incluant au moins deux &eacute;l&eacute;ments
- &laquo;&nbsp;vehicleJourneyAtStop&nbsp;&raquo; cons&eacute;cutifs, poursuivre le test, sinon le
- test est abandonn&eacute;.</span></p>
- <p class=MsoNormal style='text-align:justify'><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal style='text-align:justify'><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'>- Si entre deux &eacute;l&eacute;ments
- &laquo;&nbsp;vehicleJourneyAtStop&nbsp;&raquo; successifs, la distance spatiale entre le
- point d&rsquo;arr&ecirc;t &laquo;&nbsp;StopPoint&nbsp;&raquo; identifi&eacute; par la valeur de l&rsquo;attribut
- de l&rsquo;&eacute;l&eacute;ment &laquo;&nbsp;stopPointId&nbsp;&raquo; et le point d&rsquo;arr&ecirc;t &laquo;&nbsp;StopPoint&raquo;
- identifi&eacute; par la valeur de l&rsquo;attribut de l&rsquo;&eacute;l&eacute;ment &laquo;&nbsp;stopPointId&nbsp;&raquo;
- est inf&eacute;rieure &agrave; XX ou sup&eacute;rieure &agrave; YY, alors le test fournit le message
- d&rsquo;avertissement&nbsp;: &laquo;&nbsp;test 3.7.1&nbsp;: la distance spatiale entre
- deux points d&rsquo;arr&ecirc;t cons&eacute;cutifs ne se situe pas dans une fourchette
- autoris&eacute;e&nbsp;(entre XX pour sa valeur minimale et YY pour sa valeur
- sup&eacute;rieure&raquo;.</span></p>
- <p class=MsoNormal style='text-align:justify'><b><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>&nbsp;</span></b></p>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm;text-align:justify'><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'>- Sinon le test est valid&eacute;</span></p>
- </td>
- </tr>
-</table>
-
-<p class=MsoNormal>&nbsp;</p>
-
-</div>
-
+ß<h1 class="western" style="border: 1pt solid rgb(0, 0, 0); padding: 0.05cm 0.12cm; margin-top: 0.21cm;" align="center">
+<font face="Arial, sans-serif"><font style="font-size: 20pt;" size="5"><i>
+ point de contrôle N° 3.7<br>
+Caractérisation des distances entre les points d’arrêt <br>
+</i></font></font></h1>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Objectif: </b></u>
+Vérifier que la distance entre les POINTs D’ARRÊT SUR PARCOURS («&nbsp;StopPoint&nbsp;»)<br>
+se situe dans une fourchette paramétrable (distance minimale et maximale à fixer)<br>
+</font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Prioritée: </b></u> Obligatoire</font></p><font face="Arial, sans-serif">
+</font><p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><u><b>Explications:</b></u>
+</font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Afin de contrôler les distances aberrantes entre les POINTs D’ARRÊT SUR
+PARCOURS («&nbsp;StopPoint&nbsp;»), un contrôle sera effectué sur la
+distance entre les 2 POINTs D’ARRÊT SUR PARCOURS de chaque TRONCON
+COMMERCIAL/Chouette («&nbsp;PtLink&nbsp;»)&nbsp;: ce contrôle devra
+répondre à des critères de distance maximale et de distance minimale
+(ces distances seront paramétrables).</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>Exemple: </u></b></font></font></font></p>
+<p><font face="Arial, sans-serif"><img src="image019.jpg" height="618" width="372"></font></p>
+<p><font face="Arial, sans-serif"><img src="image020.jpg" height="338" width="433"></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>N° test:</u></b>
+Test 3.7.1</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Libellé:</u>
+Vérification de la distance entre 2 POINTs D’ARRÊT SUR PARCOURS («&nbsp;StopPoint&nbsp;») consécutifs</font></font></font></p>
+
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2"><span style="text-decoration: underline;">
+Champ d’application:</span>&nbsp;&lt;vehicleJourney&gt;&nbsp;&lt;VehicleJourneyAtStop&gt;</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Vérification:</u> </font></font></font></p>
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si le fichier contient une classe d’objets
+«&nbsp;vehicleJourney&nbsp;» incluant au moins deux éléments
+«&nbsp;vehicleJourneyAtStop&nbsp;» consécutifs, poursuivre le test,
+sinon le test est abandonné.</font></font></font></p>
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si entre deux éléments «&nbsp;vehicleJourneyAtStop&nbsp;» successifs,
+la distance spatiale entre le point d’arrêt «&nbsp;StopPoint&nbsp;»
+identifié par la valeur de l’attribut de l’élément
+«&nbsp;stopPointId&nbsp;» et le point d’arrêt «&nbsp;StopPoint»
+identifié par la valeur de l’attribut de l’élément
+«&nbsp;stopPointId&nbsp;» est inférieure à XX ou supérieure à YY, alors
+le test fournit le message d’avertissement&nbsp;: «&nbsp;test
+3.7.1&nbsp;: la distance spatiale entre deux points d’arrêt consécutifs
+ne se situe pas dans une fourchette autorisée&nbsp;(entre XX pour sa
+valeur minimale et YY pour sa valeur supérieure».</font></font></font></p>
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Sinon le test est validé</font></font></font></p>
diff --git a/app/views/test_sheet/3_8.html b/app/views/test_sheet/3_8.html
index 08e6f6d19..aa080a4b4 100644
--- a/app/views/test_sheet/3_8.html
+++ b/app/views/test_sheet/3_8.html
@@ -1,283 +1,99 @@
-<div class=WordSection1>
-</span></b>
+<h1 class="western" style="border: 1pt solid rgb(0, 0, 0); padding: 0.05cm 0.12cm; margin-top: 0.21cm;" align="center">
+<font face="Arial, sans-serif"><font style="font-size: 20pt;" size="5"><i>
+ point de contrôle N° 3.8<br>
+Cohérence entre le temps et la distance pour chaque correspondance <br>
+</i></font></font></h1>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Objectif: </b></u>
+Vérifier qu’il
+y a une cohérence entre le temps et la distance pour chaque
+TronçonDeCorrespondance/Chouette («&nbsp;ConnectionLink&nbsp;»)<br>
+</font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Priorité: </b></u> Obligatoire</font></p><font face="Arial, sans-serif">
+</font><p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><u><b>Explications:</b></u>
+</font></font></p>
-<p class=MsoTitle><span style='font-size:14.0pt;font-family:"Tahoma","sans-serif"'>Fiche
-du point de contr&ocirc;le N&deg; 3.8</span></p>
-<p class=MsoNormal>&nbsp;</p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Pour&nbsp;chaque TronçonDeCorrespondance/Chouette («&nbsp;ConnectionLink&nbsp;»),
+le temps de parcours entre 2&nbsp;ARRÊT/Chouette
+(«&nbsp;StopArea&nbsp;») ne doit pas être aberrant. On peut alors fixer
+une vitesse théorique moyenne (en fonction du temps de déplacement en
+marche à pied, des obstacles rencontrés, de la perte de temps liée à la
+descente du véhicule).</font></font></font></p>
-<table class=MsoNormalTable border=1 cellspacing=0 cellpadding=0 width=638
- style='width:478.4pt;border-collapse:collapse;border:none'>
- <tr style='page-break-inside:avoid'>
- <td width=638 colspan=2 valign=top style='width:478.4pt;border:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center'><i><span style='color:navy'>Description</span></i></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt'>Intitul&eacute;</span></h1>
- </td>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt;text-align:justify'><span
- style='font-size:11.0pt;line-height:200%;font-family:"Tahoma","sans-serif"'>Coh&eacute;rence
- entre le temps et la distance pour chaque correspondance </span></p>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt'>Objectif</span></h1>
- </td>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>V&eacute;rifier </span><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif";font-weight:normal'>que qu&rsquo;il y a une coh&eacute;rence entre
- le temps et la distance pour chaque Tron&ccedil;onDeCorrespondance/Chouette
- (&laquo;&nbsp;ConnectionLink&nbsp;&raquo;)</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt'>R&eacute;f&eacute;rences</span></h1>
- </td>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>TRIDENT/profil CHOUETTE</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt'>N&deg;de fiche(s) connexe(s)</span></h1>
- </td>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>&nbsp;</span></h1>
- <h1><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>&nbsp;</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt'><b><span style='font-family:
- "Tahoma","sans-serif"'>Priorit&eacute;<span style='color:red'> </span></span></b></p>
- </td>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>Obligatoire</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt'><b><span style='font-family:
- "Tahoma","sans-serif"'>R&eacute;sultat</span></b></p>
- </td>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif";
- font-weight:normal'>D&eacute;livrance d&rsquo;un message de mise en garde</span></h1>
- </td>
- </tr>
- <tr style='page-break-inside:avoid'>
- <td width=638 colspan=2 valign=top style='width:478.4pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center'><i><span style='color:navy'>Mise en &oelig;uvre</span></i></h1>
- </td>
- </tr>
- <tr>
- <td width=100 style='width:74.85pt;border:solid windowtext 1.0pt;border-top:
- none;padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>Explication</span></h1>
- </td>
- <td width=538 style='width:403.55pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm;text-align:justify'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>Pour </span><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>chaque Tron&ccedil;onDeCorrespondance/Chouette
- (&laquo;&nbsp;ConnectionLink&nbsp;&raquo;)</span><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>, le temps de parcours entre 2
- ARR&Ecirc;T1/Chouette (&laquo;&nbsp;StopArea&nbsp;&raquo;) ne doit pas &ecirc;tre aberrant. On peut
- alors fixer une vitesse th&eacute;orique moyenne (en fonction du temps de
- d&eacute;placement en marche &agrave; pied, des obstacles rencontr&eacute;s, de la perte de temps
- li&eacute;e &agrave; la descente du v&eacute;hicule …). </span></p>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Ainsi
- la longueur du </span><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Tron&ccedil;onDeCorrespondance/Chouette
- (&laquo;&nbsp;ConnectionLink&nbsp;&raquo;)</span><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'> qui est la diff&eacute;rence entre les &eacute;l&eacute;ments
- &laquo;&nbsp;EndOfLink&nbsp;&raquo; et &laquo;&nbsp;StartOfLink&nbsp;&raquo; et la dur&eacute;e repr&eacute;sent&eacute;e
- par les &eacute;l&eacute;ments &laquo;&nbsp;DefaultDuration&nbsp;&raquo;,
- &laquo;&nbsp;FrequentTravellerDuration&nbsp;&raquo; ou
- &laquo;&nbsp;OccasionalTravellerDuration&nbsp;&raquo;, &eacute;ventuellement
- &laquo;&nbsp;MobilityRestrictedTravellerDuration&nbsp;&raquo;, permet de calculer une
- vitesse qui doit s&rsquo;approcher de la vitesse th&eacute;orique (fourchette &agrave; d&eacute;finir).</span></p>
- </td>
- </tr>
-</table>
-<p class=MsoNormal>&nbsp;</p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Ainsi la longueur du&nbsp;TronçonDeCorrespondance/Chouette («&nbsp;ConnectionLink&nbsp;»)&nbsp;qui
+est la différence entre les éléments «&nbsp;EndOfLink&nbsp;» et
+«&nbsp;StartOfLink&nbsp;» et la durée représentée par les éléments
+«&nbsp;DefaultDuration&nbsp;», </font></font></font><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">«&nbsp;</font></font></font><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">FrequentTravellerDuration&nbsp;» ou «&nbsp;OccasionalTravellerDuration&nbsp;», éventuellement&nbsp;</font></font></font><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">«&nbsp;</font></font></font><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">MobilityRestrictedTravellerDuration&nbsp;»,
+permet de calculer une vitesse qui doit s’approcher de la vitesse
+théorique (fourchette à définir).</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>Exemple: </u></b></font></font></font></p>
+<p><font face="Arial, sans-serif"><img src="image021.jpg" height="547" width="372"></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>N° test:</u></b>
+Test 3.8.1</font></font></font></p>
-<table class=MsoNormalTable border=1 cellspacing=0 cellpadding=0 width=638
- style='width:478.4pt;border-collapse:collapse;border:none'>
- <tr>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><b><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>Exemple</span></b></p>
- </td>
- <td width=538 valign=top style='width:403.55pt;border:solid windowtext 1.0pt;
- border-left:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=left style='margin-left:18.0pt;text-align:left;text-indent:-18.0pt'><span
- style='font-size:11.0pt;font-weight:normal'>&nbsp;</span></h1>
- <p class=MsoNormal align=center style='text-align:center'><img width=372
- height=547 src="BATERI_Neptune_FINAL-V2_0a_fichiers/image021.jpg"></p>
- <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
- </td>
- </tr>
- <tr style='page-break-inside:avoid'>
- <td width=638 colspan=2 valign=top style='width:478.4pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h2 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center'><i><span lang=EN-US style='font-size:14.0pt;
- color:navy'>Evaluation</span></i></h2>
- </td>
- </tr>
- <tr>
- <td width=100 valign=top style='width:74.85pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span lang=EN-US style='font-size:11.0pt'>N&deg; test</span></h1>
- </td>
- <td width=538 style='width:403.55pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>Test
- 3.8.1</span></p>
- </td>
- </tr>
- <tr>
- <td width=100 valign=top style='width:74.85pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt'>Libell&eacute;</span></h1>
- </td>
- <td width=538 style='width:403.55pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>V&eacute;rifier
- les vitesses calcul&eacute;es &agrave; partir des attributs du </span><span
- style='font-size:11.0pt;font-family:"Arial","sans-serif"'>Tron&ccedil;onDeCorrespondance/Chouette
- (&laquo;&nbsp;ConnectionLink&nbsp;&raquo;)</span><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'> suivant les param&egrave;tres fix&eacute;s</span></p>
- </td>
- </tr>
- <tr>
- <td width=100 valign=top style='width:74.85pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt'>Champ d&rsquo;application</span></h1>
- </td>
- <td width=538 style='width:403.55pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&lt;ConnectionLink&gt;</span></p>
- </td>
- </tr>
- <tr>
- <td width=100 valign=top style='width:74.85pt;border:solid windowtext 1.0pt;
- border-top:none;padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt'>V&eacute;rification</span></h1>
- </td>
- <td width=538 style='width:403.55pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>-
- Si l&rsquo;&eacute;l&eacute;ment &laquo;&nbsp;ConnectionLink&nbsp;&raquo; mentionn&eacute; dans les champs
- d&rsquo;application est pr&eacute;sent une ou plusieurs fois, poursuivre le test, sinon le
- test est abandonn&eacute;.</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>-
- Si la vitesse d&eacute;duite de la distance spatiale entre &laquo;&nbsp;EndOfLink&nbsp;&raquo;
- et &laquo;&nbsp;StartOfLink&nbsp;&raquo; divis&eacute;e par le temps
- &laquo;&nbsp;DefaultDuration&nbsp;&raquo; est proche de la valeur param&eacute;trable XX (+/-
- delta), poursuivre le test, sinon le test est invalid&eacute; et fournit le
- message&nbsp;: &laquo;&nbsp;test 3.8.1a&nbsp;: la vitesse fix&eacute;e par l&rsquo;&eacute;l&eacute;ment
- &laquo;&nbsp;DefaultDuration&nbsp;&raquo; n&rsquo;est pas conforme &agrave; la valeur param&eacute;trable XX
- (+/- delta) fix&eacute;e pour la correspondance dont l&rsquo;identifiant est
- &laquo;&nbsp;ObjectId&nbsp;&raquo;.</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>-
- Si la vitesse d&eacute;duite de la distance spatiale entre &laquo;&nbsp;EndOfLink&nbsp;&raquo;
- et &laquo;&nbsp;StartOfLink&nbsp;&raquo; divis&eacute;e par le temps
- &laquo;&nbsp;FrequentTravellerDuration&nbsp;&raquo; est proche de la valeur param&eacute;trable
- YY (+/- delta), poursuivre le test, sinon le test est invalid&eacute; et fournit le
- message&nbsp;: &laquo;&nbsp;test 3.8.1b&nbsp;: la vitesse fix&eacute;e par l&rsquo;&eacute;l&eacute;ment
- &laquo;&nbsp;FrequentTravellerDuration&nbsp;&raquo; n&rsquo;est pas conforme &agrave; la valeur
- param&eacute;trable YY (+/- delta) fix&eacute;e pour la correspondance dont l&rsquo;identifiant
- est &laquo;&nbsp;ObjectId&nbsp;&raquo;.</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>-
- Si la vitesse d&eacute;duite de la distance spatiale entre &laquo;&nbsp;EndOfLink&nbsp;&raquo;
- et &laquo;&nbsp;StartOfLink&nbsp;&raquo; divis&eacute;e par le temps
- &laquo;&nbsp;OccasionalTravellerDuration&nbsp;&raquo; est proche de la valeur
- param&eacute;trable ZZ (+/- delta), poursuivre le test, sinon le test est invalid&eacute;
- et fournit le message&nbsp;: &laquo;&nbsp;test 3.8.1c&nbsp;: la vitesse fix&eacute;e par
- l&rsquo;&eacute;l&eacute;ment &laquo;&nbsp;OccasionalTravellerDuration&nbsp;&raquo; n&rsquo;est pas conforme &agrave; la
- valeur param&eacute;trable ZZ (+/- delta) fix&eacute;e pour la correspondance dont
- l&rsquo;identifiant est &laquo;&nbsp;ObjectId&nbsp;&raquo;.&raquo;.</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>-
- Si l&rsquo;&eacute;l&eacute;ment &laquo;&nbsp;MobilityRestrictedTravellerDuration&nbsp;&raquo;&nbsp; est
- d&eacute;fini dans l&rsquo;&eacute;l&eacute;ment &laquo;&nbsp;VehicleJourneyAtStop&nbsp;&raquo; identifi&eacute;,
- poursuivre le test, sinon le test est valid&eacute;.</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>-
- Si la vitesse d&eacute;duite de la distance spatiale entre &laquo;&nbsp;EndOfLink&nbsp;&raquo;
- et &laquo;&nbsp;StartOfLink&nbsp;&raquo; divis&eacute;e par le temps
- &laquo;&nbsp;MobilityRestrictedTravellerDuration&nbsp;&raquo; est proche de la valeur
- param&eacute;trable WW (+/- delta), le test est valid&eacute;, sinon le test est invalid&eacute;
- et fournit le message&nbsp;: &laquo;&nbsp;test 3.8.1d&nbsp;: la vitesse fix&eacute;e par
- l&rsquo;&eacute;l&eacute;ment &laquo;&nbsp;MobilityRestrictedTravellerDuration&nbsp;&raquo; n&rsquo;est pas
- conforme &agrave; la valeur param&eacute;trable WW (+/- delta) fix&eacute;e pour la correspondance
- dont l&rsquo;identifiant est &laquo;&nbsp;ObjectId&nbsp;&raquo;.&raquo;.</span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>&nbsp;</span></p>
- </td>
- </tr>
-</table>
-<p class=MsoNormal>&nbsp;</p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Libellé:</u>
+Vérifier les vitesses calculées à partir des attributs du TronçonDeCorrespondance/Chouette («&nbsp;ConnectionLink&nbsp;»)&nbsp;suivant les paramètres fixés&nbsp;</font></font></font></p>
-</div>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2"><span style="text-decoration: underline;">
+Champ d’application:</span>&nbsp;&lt;ConnectionLink&gt;</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Vérification:</u> </font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si l’élément «&nbsp;ConnectionLink&nbsp;» mentionné dans les champs
+d’application est présent une ou plusieurs fois, poursuivre le test,
+sinon le test est abandonné.</font></font></font></p>
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si la vitesse déduite de la distance spatiale entre
+«&nbsp;EndOfLink&nbsp;» et «&nbsp;StartOfLink&nbsp;» divisée par le
+temps «&nbsp;DefaultDuration&nbsp;» est proche de la valeur
+paramétrable XX (+/- delta), poursuivre le test, sinon le test est
+invalidé et fournit le message&nbsp;: «&nbsp;test 3.8.1a&nbsp;: la
+vitesse fixée par l’élément «&nbsp;DefaultDuration&nbsp;» n’est pas
+conforme à la valeur paramétrable XX (+/- delta) fixée pour la
+correspondance dont l’identifiant est «&nbsp;ObjectId&nbsp;».</font></font></font></p>
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si la vitesse déduite de la distance spatiale entre
+«&nbsp;EndOfLink&nbsp;» et «&nbsp;StartOfLink&nbsp;» divisée par le
+temps «&nbsp;FrequentTravellerDuration&nbsp;» est proche de la valeur
+paramétrable YY (+/- delta), poursuivre le test, sinon le test est
+invalidé et fournit le message&nbsp;: «&nbsp;test 3.8.1b&nbsp;: la
+vitesse fixée par l’élément «&nbsp;FrequentTravellerDuration&nbsp;»
+n’est pas conforme à la valeur paramétrable YY (+/- delta) fixée pour
+la correspondance dont l’identifiant est «&nbsp;ObjectId&nbsp;».</font></font></font></p>
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si la vitesse déduite de la distance spatiale entre
+«&nbsp;EndOfLink&nbsp;» et «&nbsp;StartOfLink&nbsp;» divisée par le
+temps «&nbsp;OccasionalTravellerDuration&nbsp;» est proche de la valeur
+paramétrable ZZ (+/- delta), poursuivre le test, sinon le test est
+invalidé et fournit le message&nbsp;: «&nbsp;test 3.8.1c&nbsp;: la
+vitesse fixée par l’élément «&nbsp;OccasionalTravellerDuration&nbsp;»
+n’est pas conforme à la valeur paramétrable ZZ (+/- delta) fixée pour
+la correspondance dont l’identifiant est «&nbsp;ObjectId&nbsp;».».</font></font></font></p>
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si l’élément «&nbsp;MobilityRestrictedTravellerDuration&nbsp;»&nbsp;
+est défini dans l’élément «&nbsp;VehicleJourneyAtStop&nbsp;» identifié,
+poursuivre le test, sinon le test est validé.</font></font></font></p>
+
+
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si la vitesse déduite de la distance spatiale entre
+«&nbsp;EndOfLink&nbsp;» et «&nbsp;StartOfLink&nbsp;» divisée par le
+temps «&nbsp;MobilityRestrictedTravellerDuration&nbsp;» est proche de
+la valeur paramétrable WW (+/- delta), le test est validé, sinon le
+test est invalidé et fournit le message&nbsp;: «&nbsp;test
+3.8.1d&nbsp;: la vitesse fixée par l’élément
+«&nbsp;MobilityRestrictedTravellerDuration&nbsp;» n’est pas conforme à
+la valeur paramétrable WW (+/- delta) fixée pour la correspondance dont
+l’identifiant est «&nbsp;ObjectId&nbsp;».<br>&nbsp;</font></font></font></p>
diff --git a/app/views/test_sheet/3_9.html b/app/views/test_sheet/3_9.html
index 249a1d722..295eca22a 100644
--- a/app/views/test_sheet/3_9.html
+++ b/app/views/test_sheet/3_9.html
@@ -1,260 +1,65 @@
-<div class=WordSection1>
-</span></b>
+<h1 class="western" style="border: 1pt solid rgb(0, 0, 0); padding: 0.05cm 0.12cm; margin-top: 0.21cm;" align="center">
+<font face="Arial, sans-serif"><font style="font-size: 20pt;" size="5"><i>
+ point de contrôle N° 3.9<br>
+Cohérence entre le temps et la distance pour chaque tronçon <br>
+</i></font></font></h1>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Objectif: </b></u>
+Vérifier&nbsp;qu’il y a une cohérence entre le temps et la distance pour chaque TRONCON COMMERCIAL / Chouette («&nbsp;PtLink&nbsp;»)<br>
+</font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><u><b>Priorité: </b></u> Obligatoire</font></p><font face="Arial, sans-serif">
+</font><p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><u><b>Explications:</b></u>
+</font></font></p>
-<p class=MsoTitle><span style='font-size:14.0pt;font-family:"Tahoma","sans-serif"'>Fiche
-du point de contr&ocirc;le N&deg; 3.9</span></p>
-<p class=MsoNormal>&nbsp;</p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+Pour chaque&nbsp;TRONCON COMMERCIAL / Chouette («&nbsp;PtLink&nbsp;»)&nbsp;,
+on peut calculer la distance entre les 2 POINTs D’ARRÊT SUR PARCOURS
+(«&nbsp;StopPoint&nbsp;») qui le constituent et au sein d’une même
+COURSE COMMERCIALE («&nbsp;VehicleJourney&nbsp;»), on peut récupérer
+l’HEURE DE PASSAGE GRAPHIQUEE/Chouette
+(«&nbsp;VehicleJourneyAtStop&nbsp;») des POINTs D’ARRÊT SUR PARCOURS .
+On peut ainsi vérifier que la vitesse calculée se situe autour d’une
+vitesse théorique moyenne (vitesse commerciale ou vitesse à vol
+d’oiseau).</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>Exemple: </u></b></font></font></font></p>
+<p><font face="Arial, sans-serif"><img src="image019.jpg" height="618" width="372"></font></p>
+<p><font face="Arial, sans-serif"><img src="image020.jpg" height="338" width="433"></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<b><u>N° test:</u></b>
+Test 3.9.1</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Libellé:</u> Vérifier que la vitesse entre 2 POINTs D’ARRÊT SUR
+PARCOURS («&nbsp;StopPoint&nbsp;») consécutifs se situe dans une
+fourchette autorisée.</font></font></font></p>
-<table class=MsoNormalTable border=1 cellspacing=0 cellpadding=0 width=647
- style='width:485.45pt;border-collapse:collapse;border:none'>
- <tr style='page-break-inside:avoid'>
- <td width=647 colspan=2 valign=top style='width:485.45pt;border:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center'><i><span style='color:navy'>Description</span></i></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>Intitul&eacute;</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt'><span style='font-size:11.0pt;
- line-height:200%;font-family:"Tahoma","sans-serif"'>Coh&eacute;rence entre le temps
- et la distance pour chaque tron&ccedil;on </span></p>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>Objectif</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif";font-weight:normal'>V&eacute;rifier </span><span
- style='font-size:11.0pt;font-family:"Tahoma","sans-serif";font-weight:normal'>que
- qu&rsquo;il y a une coh&eacute;rence entre le temps et la distance pour chaque TRONCON
- COMMERCIAL / Chouette (&laquo;&nbsp;PtLink&nbsp;&raquo;)</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>R&eacute;f&eacute;rences</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif";font-weight:normal'>TRIDENT/profil CHOUETTE/Transmodel
- V4 et V5.1</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>N&deg; de fiche(s) connexe(s)</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='text-align:left'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'>&nbsp;</span></h1>
- <h1 align=left style='text-align:left'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif";font-weight:normal'>&nbsp;</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt'><b><span style='font-family:
- "Tahoma","sans-serif"'>Priorit&eacute;<span style='color:red'> </span></span></b></p>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif";font-weight:normal'>Obligatoire</span></h1>
- </td>
- </tr>
- <tr style='height:37.4pt'>
- <td width=108 style='width:81.35pt;border:solid windowtext 1.0pt;border-top:
- none;padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <p class=MsoBodyText2 style='margin-top:6.0pt'><b><span style='font-family:
- "Tahoma","sans-serif"'>R&eacute;sultat</span></b></p>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt;height:37.4pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif";font-weight:normal'>D&eacute;livrance d&rsquo;un avertissement de
- mise en garde sur des cons&eacute;quences &eacute;ventuelles de dysfonctionnement</span></h1>
- </td>
- </tr>
- <tr style='page-break-inside:avoid'>
- <td width=647 colspan=2 valign=top style='width:485.45pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center'><i><span style='color:navy'>Mise en &oelig;uvre</span></i></h1>
- </td>
- </tr>
- <tr>
- <td width=100 style='width:74.85pt;border:solid windowtext 1.0pt;border-top:
- none;padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 align=left style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:left'><span style='font-size:11.0pt;font-family:
- "Tahoma","sans-serif"'>Explication</span></h1>
- </td>
- <td width=547 style='width:410.6pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm;text-align:justify'><span style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>Pour chaque </span><span style='font-size:
- 11.0pt;font-family:"Tahoma","sans-serif"'>TRONCON COMMERCIAL / Chouette
- (&laquo;&nbsp;PtLink&nbsp;&raquo;)</span><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>,
- on peut calculer la distance entre les 2 POINTs D&rsquo;ARR&Ecirc;T SUR PARCOURS
- (&laquo;&nbsp;StopPoint&nbsp;&raquo;) qui le constituent et au sein d&rsquo;une m&ecirc;me COURSE
- COMMERCIALE (&laquo;&nbsp;VehicleJourney&nbsp;&raquo;), on peut r&eacute;cup&eacute;rer l&rsquo;HEURE DE
- PASSAGE GRAPHIQUEE/Chouette (&laquo;&nbsp;VehicleJourneyAtStop&nbsp;&raquo;) des POINTs
- D&rsquo;ARR&Ecirc;T SUR PARCOURS . On peut ainsi v&eacute;rifier que la vitesse calcul&eacute;e se
- situe autour d&rsquo;une vitesse th&eacute;orique moyenne (vitesse commerciale ou vitesse
- &agrave; vol d&rsquo;oiseau). </span></p>
- </td>
- </tr>
-</table>
-<p class=MsoNormal>&nbsp;</p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2"><span style="text-decoration: underline;">
+Champ d’application</span>:&nbsp;&lt;vehicleJourney&gt;&nbsp;&lt;VehicleJourneyAtStop&gt;</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+<u>Vérification:</u> </font></font></font></p>
-<table class=MsoNormalTable border=1 cellspacing=0 cellpadding=0 width=647
- style='width:485.45pt;border-collapse:collapse;border:none'>
- <tr>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- padding:0cm 3.5pt 0cm 3.5pt'>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><b><span lang=EN-US style='font-size:11.0pt;
- font-family:"Tahoma","sans-serif"'>Exemple</span></b></p>
- </td>
- <td width=547 valign=top style='width:410.6pt;border:solid windowtext 1.0pt;
- border-left:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h1 style='margin-left:18.0pt;text-indent:-18.0pt'><span lang=EN-US>&nbsp;</span></h1>
- <h1 style='margin-left:18.0pt;text-indent:-18.0pt'><span lang=EN-US><img
- width=372 height=618 src="BATERI_Neptune_FINAL-V2_0a_fichiers/image019.jpg"></span></h1>
- <p class=MsoNormal><span lang=EN-US>&nbsp;</span></p>
- <p class=MsoNormal align=center style='text-align:center'><b><span
- lang=EN-US><img width=433 height=338
- src="BATERI_Neptune_FINAL-V2_0a_fichiers/image020.jpg"></span></b></p>
- <p class=MsoNormal align=center style='text-align:center'><span lang=EN-US>&nbsp;</span></p>
- </td>
- </tr>
- <tr style='page-break-inside:avoid'>
- <td width=647 colspan=2 valign=top style='width:485.45pt;border:solid windowtext 1.0pt;
- border-top:none;padding:0cm 3.5pt 0cm 3.5pt'>
- <h2 align=center style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
- margin-left:0cm;text-align:center'><i><span lang=EN-US style='font-size:14.0pt;
- color:navy'>Evaluation</span></i></h2>
- </td>
- </tr>
- <tr>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- border-top:none;padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span lang=EN-US style='font-size:11.0pt'>N&deg; test</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>Test
- 3.9.1</span></p>
- </td>
- </tr>
- <tr>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- border-top:none;padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt'>Libell&eacute;</span></h1>
- </td>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>V&eacute;rifier
- que la vitesse entre 2 POINTs D&rsquo;ARR&Ecirc;T SUR PARCOURS (&laquo;&nbsp;StopPoint&nbsp;&raquo;)
- cons&eacute;cutifs se situe dans une fourchette autoris&eacute;e.</span></p>
- </td>
- </tr>
- <tr>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- border-top:none;padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt'>Champ d&rsquo;application</span></h1>
- </td>
- <td width=108 style='width:81.35pt;border-top:none;border-left:none;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&lt;vehicleJourney&gt;
- </span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&lt;VehicleJourneyAtStop&gt;</span></p>
- </td>
- </tr>
- <tr>
- <td width=108 valign=top style='width:81.35pt;border:solid windowtext 1.0pt;
- border-top:none;padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <h1 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:
- 0cm'><span style='font-size:11.0pt'>V&eacute;rification</span></h1>
- </td>
- <td width=108 valign=top style='width:81.35pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:5.65pt 11.35pt 5.65pt 3.5pt'>
- <p class=MsoNormal><b><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>&nbsp;</span></b></p>
- <p class=MsoNormal style='text-align:justify'><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'>- Si le fichier contient un objet
- &laquo;&nbsp;vehicleJourney&nbsp;&raquo; incluant au moins deux objets
- &laquo;&nbsp;vehicleJourneyAtStop&nbsp;&raquo; cons&eacute;cutifs, poursuivre le test, sinon le
- test est abandonn&eacute;. </span></p>
- <p class=MsoNormal><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>&nbsp;</span></p>
- <p class=MsoNormal style='text-align:justify'><span style='font-size:11.0pt;
- font-family:"Arial","sans-serif"'>- Si entre deux objets
- &laquo;&nbsp;vehicleJourneyAtStop&nbsp;&raquo; successifs, la distance spatiale entre le
- point d&rsquo;arr&ecirc;t &laquo;&nbsp;StopPoint&nbsp;&raquo; identifi&eacute; par la valeur de l&rsquo;attribut
- de l&rsquo;&eacute;l&eacute;ment &laquo;&nbsp;stopPointId&nbsp;&raquo; et le point d&rsquo;arr&ecirc;t &laquo;&nbsp;StopPoint&nbsp;&raquo;
- identifi&eacute; par la valeur de l&rsquo;attribut de l&rsquo;&eacute;l&eacute;ment &laquo;&nbsp;stopPointId&nbsp;&raquo;
- divis&eacute;e par la diff&eacute;rence absolue entre la valeur de l&rsquo;attribut de l&rsquo;&eacute;l&eacute;ment
- &laquo;&nbsp;departureTime&nbsp;&raquo; du premier point d&rsquo;arr&ecirc;t et la valeur de
- l&rsquo;attribut de l&rsquo;&eacute;l&eacute;ment &laquo;&nbsp;arrivalTime&nbsp;&raquo; du second point d&rsquo;arr&ecirc;t est
- inf&eacute;rieure &agrave; XX ou sup&eacute;rieure &agrave; YY alors le test fournit le message
- d&rsquo;avertissement&nbsp;: &laquo;&nbsp;test 3.9.1&nbsp;: la vitesse d&eacute;termin&eacute;e par la
- distance et le temps entre 2 points d&rsquo;arr&ecirc;t cons&eacute;cutifs (entre deux objets
- &laquo;&nbsp;vehicleJourneyAtStop&nbsp;&raquo;) ne se situe pas une fourchette autoris&eacute;e
- entre XX et YY&nbsp;&raquo;.</span></p>
- <p class=MsoNormal><b><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>&nbsp;</span></b></p>
- <p class=MsoNormal style='margin-top:6.0pt;margin-right:0cm;margin-bottom:
- 6.0pt;margin-left:0cm'><b><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>-
- </span></b><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>Sinon
- le test est valid&eacute;</span></p>
- </td>
- </tr>
-</table>
-<p class=MsoNormal>&nbsp;</p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si le fichier contient un objet «&nbsp;vehicleJourney&nbsp;» incluant
+au moins deux objets «&nbsp;vehicleJourneyAtStop&nbsp;» consécutifs,
+poursuivre le test, sinon le test est abandonné&nbsp;</font></font></font></p>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+- Si entre deux objets «&nbsp;vehicleJourneyAtStop&nbsp;» successifs,
+la distance spatiale entre le point d’arrêt «&nbsp;StopPoint&nbsp;»
+identifié par la valeur de l’attribut de l’élément
+«&nbsp;stopPointId&nbsp;» et le point d’arrêt «&nbsp;StopPoint&nbsp;»
+identifié par la valeur de l’attribut de l’élément
+«&nbsp;stopPointId&nbsp;» divisée par la différence absolue entre la
+valeur de l’attribut de l’élément «&nbsp;departureTime&nbsp;» du
+premier point d’arrêt et la valeur de l’attribut de l’élément
+«&nbsp;arrivalTime&nbsp;» du second point d’arrêt est inférieure à XX
+ou supérieure à YY alors le test fournit le message
+d’avertissement&nbsp;: «&nbsp;test 3.9.1&nbsp;: la vitesse déterminée
+par la distance et le temps entre 2 points d’arrêt consécutifs (entre
+deux objets «&nbsp;vehicleJourneyAtStop&nbsp;») ne se situe pas une
+fourchette autorisée entre XX et YY&nbsp;».</font></font></font></p>
-</div>
+<p style="margin-bottom: 0cm;"><font face="Arial, sans-serif"><font face="Arial, sans-serif"><font style="font-size: 11pt;" size="2">
+-&nbsp;Sinon le test est validé</font></font></font></p>
diff --git a/app/views/time_table_dates/_form.html.erb b/app/views/time_table_dates/_form.html.erb
deleted file mode 100644
index 8d2231be4..000000000
--- a/app/views/time_table_dates/_form.html.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<%= semantic_form_for [@referential, @time_table, @time_table_date] do |form| %>
- <%= form.inputs do %>
- <%= form.input :date, :as => :date_picker, :label => @time_table_date.human_attribute_name("date") %>
-
- <% end %>
- <%= form.actions do %>
- <%= form.action :submit, :as => :button %>
- <%= form.action :cancel, :as => :link , :url => referential_time_table_path(@referential, @time_table) %>
- <% end %>
-<% end %>
-
diff --git a/app/views/time_table_dates/new.html.erb b/app/views/time_table_dates/new.html.erb
deleted file mode 100644
index 4e6119b9a..000000000
--- a/app/views/time_table_dates/new.html.erb
+++ /dev/null
@@ -1,4 +0,0 @@
-<%= title_tag t('time_table_dates.new.title') %>
-
-<%= render "form" %>
-
diff --git a/app/views/time_table_periods/_form.html.erb b/app/views/time_table_periods/_form.html.erb
deleted file mode 100644
index 9bfda0aa4..000000000
--- a/app/views/time_table_periods/_form.html.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<%= semantic_form_for [@referential, @time_table, @time_table_period] do |form| %>
- <%= form.inputs do %>
- <%= form.input :period_start, :as => :date_picker, :label => @time_table_period.human_attribute_name("period_start") %>
- <%= form.input :period_end, :as => :date_picker, :label => @time_table_period.human_attribute_name("period_end") %>
- <% end %>
- <%= form.actions do %>
- <%= form.action :submit, :as => :button %>
- <%= form.action :cancel, :as => :link , :url => referential_time_table_path(@referential, @time_table) %>
- <% end %>
-<% end %>
-
diff --git a/app/views/time_table_periods/new.html.erb b/app/views/time_table_periods/new.html.erb
deleted file mode 100644
index 5088637a1..000000000
--- a/app/views/time_table_periods/new.html.erb
+++ /dev/null
@@ -1,4 +0,0 @@
-<%= title_tag t('time_table_periods.new.title') %>
-
-<%= render "form" %>
-
diff --git a/app/views/time_tables/_date_fields.erb b/app/views/time_tables/_date_fields.erb
new file mode 100644
index 000000000..5d24456a3
--- /dev/null
+++ b/app/views/time_tables/_date_fields.erb
@@ -0,0 +1,4 @@
+<%= f.inputs :class => 'dates nested-fields' do %>
+ <%= f.input :date, :as => :date_picker, :label => @time_table.human_attribute_name("date"), :wrapper_html => { :class => 'fl1' }%>
+ <%= link_to_remove_association t('actions.destroy'), f %>
+<% end %>
diff --git a/app/views/time_tables/_dates.html.erb b/app/views/time_tables/_dates.html.erb
index 47ae01710..663efec58 100644
--- a/app/views/time_tables/_dates.html.erb
+++ b/app/views/time_tables/_dates.html.erb
@@ -1,10 +1,6 @@
<ul class='dates'>
<% @time_table.dates.each do |tmd| %>
<li class="<%= (tmd.position%2==0) ? 'odd' : 'even' %>"><%= l tmd.date %>
- <div class="actions">
- <%= link_to t("actions.destroy"), referential_time_table_time_table_date_path(@referential, @time_table,tmd), :method => :delete, :confirm => t('time_tables.actions.destroy_date_confirm'), :class => "remove" %>
- </div>
-
</li>
<% end %>
</ul>
diff --git a/app/views/time_tables/_form.erb b/app/views/time_tables/_form.erb
index fbced7bd4..9970577d6 100644
--- a/app/views/time_tables/_form.erb
+++ b/app/views/time_tables/_form.erb
@@ -17,6 +17,43 @@
<%= form.input :objectid, :required => !@time_table.new_record?, :input_html => { :disabled => !@time_table.new_record? } %>
<% end %>
+ <h3 class="time_table_periods">
+ <a class="periods"><%= @time_table.human_attribute_name("periods") %>
+ <%= image_tag("icons/plus.png" , :class => "switcher", :style => "display: none;") %>
+ <%= image_tag("icons/minus.png" , :class => "switcher" ) %>
+ </a>
+
+ </h3>
+ <div class="periods content" id="periods_content">
+ <div id="periods">
+ <%= form.semantic_fields_for :periods do |p| %>
+ <%= render "period_fields", :f => p %>
+ <% end %>
+ </div>
+ <%= link_to_add_association t("time_tables.actions.add_period"), form, :periods ,
+ :"data-association-insertion-method" => "append",
+ :"data-association-insertion-node" => "div#periods"%>
+ </div>
+
+ <h3 class="time_table_dates">
+ <a class="dates"><%= @time_table.human_attribute_name("dates") %>
+ <%= image_tag("icons/plus.png" , :class => "switcher", :style => "display: none;") %>
+ <%= image_tag("icons/minus.png" , :class => "switcher" ) %>
+ </a>
+ </h3>
+
+ <div class="dates content" id="dates_content">
+ <div id="dates">
+ <%= form.semantic_fields_for :dates do |p| %>
+ <%= render "date_fields", :f => p %>
+ <% end %>
+ </div>
+ <%= link_to_add_association t("time_tables.actions.add_date"), form, :dates ,
+ :"data-association-insertion-method" => "append",
+ :"data-association-insertion-node" => "div#dates" %>
+ </div>
+
+ <p/>
<%= form.actions do %>
<%= form.action :submit, :as => :button %>
<%= form.action :cancel, :as => :link %>
diff --git a/app/views/time_tables/_period_fields.erb b/app/views/time_tables/_period_fields.erb
new file mode 100644
index 000000000..120a526bb
--- /dev/null
+++ b/app/views/time_tables/_period_fields.erb
@@ -0,0 +1,5 @@
+<%= f.inputs :class => 'periods nested-fields' do %>
+ <%= f.input :period_start, :as => :date_picker, :label => @time_table.human_attribute_name("period_start"), :wrapper_html => { :class => 'fl1' }%>
+ <%= f.input :period_end, :as => :date_picker, :label => @time_table.human_attribute_name("period_end"), :wrapper_html => { :class => 'fl2' }%>
+ <%= link_to_remove_association t('actions.destroy'), f %>
+<% end %>
diff --git a/app/views/time_tables/_periods.html.erb b/app/views/time_tables/_periods.html.erb
index 9f3974735..1f0aea057 100644
--- a/app/views/time_tables/_periods.html.erb
+++ b/app/views/time_tables/_periods.html.erb
@@ -1,9 +1,6 @@
<ul class='periods'>
<% @time_table.periods.each do |tmp| %>
<li class='period'><%= t('time_tables.show.from')%> <%= l tmp.period_start %> <%= t('time_tables.show.to')%> <%= l tmp.period_end %>
- <div class="actions">
- <%= link_to t("actions.destroy"), referential_time_table_time_table_period_path(@referential, @time_table,tmp), :method => :delete, :confirm => t('time_tables.actions.destroy_period_confirm'), :class => "remove" %>
- </div>
</li>
<% end %>
</ul>
diff --git a/app/views/time_tables/_time_table.erb b/app/views/time_tables/_time_table.erb
index a2b3f1ff3..0679008fc 100644
--- a/app/views/time_tables/_time_table.erb
+++ b/app/views/time_tables/_time_table.erb
@@ -1,5 +1,5 @@
<%= div_for(time_table) do %>
- <%= link_to ( [@referential, time_table]) do %>
+ <%= link_to([@referential, time_table]) do %>
<div class="state-code" >
<div class="<%= time_table_state_code(time_table) %>" >
</div>
@@ -13,7 +13,7 @@
<%= composition_info(time_table) %>
<div class="actions">
<%= link_to t("actions.edit"), edit_referential_time_table_path(@referential, time_table), :class => "edit" %> |
- <%= link_to t("actions.destroy"), referential_time_table_path(@referential, time_table), :method => :delete, :confirm => t('time_tables.actions.destroy_confirm'), :class => "remove" %>
+ <%= link_to t("actions.destroy"), referential_time_table_path(@referential, time_table), :method => :delete, :data => {:confirm => t('time_tables.actions.destroy_confirm')}, :class => "remove" %>
</div>
</div>
<% end %>
diff --git a/app/views/time_tables/show.html.erb b/app/views/time_tables/show.html.erb
index 60eee8d04..c23ed912c 100644
--- a/app/views/time_tables/show.html.erb
+++ b/app/views/time_tables/show.html.erb
@@ -1,3 +1,4 @@
+<% require 'calendar_helper' %>
<%= title_tag t('time_tables.show.title', :time_table => @time_table.comment )%>
<div class="time_table_show">
@@ -61,27 +62,70 @@
<label><%= @time_table.human_attribute_name("objectid") %>: </label>
<%= @time_table.objectid %>
</p>
- <p>
- <label><%= @time_table.human_attribute_name("creation_time") %>: </label>
- <%= l @time_table.creation_time %>
- </p>
- <p>
- <label><%= @time_table.human_attribute_name("creator_id") %>: </label>
- <%= @time_table.creator_id %>
- </p>
+
+ <h3 class="time_table_calendars">
+ <a class="calendars"><%= @time_table.human_attribute_name("calendars") %>
+ <%= image_tag("icons/plus.png" , :class => "switcher", :style => "display: none;") %>
+ <%= image_tag("icons/minus.png" , :class => "switcher" ) %>
+ </a>
+
+ </h3>
+ <div class="calendars content">
+ <div class="year_choice">
+ <span class="previous"> <%= link_to("<", referential_time_table_path(@referential, @time_table, :year => (@year - 1)) ) %> </span>
+ <span class="year"> <%= "#{@year}" %> </span>
+ <span class="next"> <%= link_to(">", referential_time_table_path(@referential, @time_table, :year => (@year + 1)) ) %> </span>
+ </div>
+ <div class="calendar_helper">
+ <%= cal = ""
+ (1..12).each do |month|
+ cal << calendar(:year => @year, :month => month, :first_day_of_week => 1) do |d|
+ if @time_table.include_in_dates?(d)
+ [link_to(d.mday, edit_referential_time_table_path(@referential, @time_table) ), {:class => "selected_date"}]
+ elsif @time_table.include_in_periods?(d)
+ [link_to(d.mday, edit_referential_time_table_path(@referential, @time_table) ), {:class => "selected_period"}]
+ elsif @time_table.include_in_overlap_dates?(d)
+ [link_to(d.mday, edit_referential_time_table_path(@referential, @time_table) ), {:class => "overlap_date"}]
+ end
+ end
+ end
+ cal.html_safe
+ %>
+ </div>
+ </div>
+
+
+ </div>
+ <h3 class="time_table_periods">
+ <a class="periods"><%= @time_table.human_attribute_name("periods") %>
+ <%= image_tag("icons/plus.png" , :class => "switcher", :style => "display: none;") %>
+ <%= image_tag("icons/minus.png" , :class => "switcher" ) %>
+ </a>
+
+ </h3>
+ <div class="periods content">
+ <%= render "periods" %>
+ </div>
+
+ <h3 class="time_table_dates">
+ <a class="dates"><%= @time_table.human_attribute_name("dates") %>
+ <%= image_tag("icons/plus.png" , :class => "switcher", :style => "display: none;") %>
+ <%= image_tag("icons/minus.png" , :class => "switcher" ) %>
+ </a>
+ </h3>
+
+ <div class="dates content">
+ <%= render "dates" %>
</div>
- <h3 class="dates"><%= t('.dates') %></h3>
- <%= render "dates" %>
- <h3 class="periods"><%= t('.periods') %></h3>
- <%= render "periods" %>
+
</div>
<% content_for :sidebar do %>
<ul class="actions">
<li><%= link_to t('time_tables.actions.edit'), edit_referential_time_table_path(@referential, @time_table), :class => "edit" %></li>
- <li><%= link_to t('time_tables.actions.destroy'), referential_time_table_path(@referential, @time_table), :method => :delete, :confirm => t('time_tables.actions.destroy_confirm'), :class => "remove" %></li>
- <li><%= link_to t('time_tables.show.add_date'), new_referential_time_table_time_table_date_path(@referential, @time_table), :class => 'add' %></li>
- <li><%= link_to t('time_tables.show.add_period'), new_referential_time_table_time_table_period_path(@referential, @time_table), :class => 'add' %></li>
+ <li><%= link_to t('time_tables.actions.destroy'), referential_time_table_path(@referential, @time_table), :method => :delete, :data => {:confirm => t('time_tables.actions.destroy_confirm')}, :class => "remove" %></li>
<br>
</ul>
+
+ <%= creation_tag(@time_table) %>
<% end %>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 10c369bf4..07e747331 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -15,7 +15,7 @@
<ul class="actions">
<li><%= link_to t('users.actions.edit'), edit_organisation_user_path( @user), :class => "edit" %></li>
<% unless current_user.id==@user.id %>
- <li><%= link_to t('users.actions.destroy'), organisation_user_path(@user),:method => :delete, :confirm => t('users.actions.destroy_confirm'), :class => "remove" %></li>
+ <li><%= link_to t('users.actions.destroy'), organisation_user_path(@user),:method => :delete, :data => {:confirm => t('users.actions.destroy_confirm')}, :class => "remove" %></li>
<% end %>
</ul>
<% end %>
diff --git a/app/views/vehicle_journeys/_form.html.erb b/app/views/vehicle_journeys/_form.html.erb
index 0c0ccaecc..b16de29f4 100644
--- a/app/views/vehicle_journeys/_form.html.erb
+++ b/app/views/vehicle_journeys/_form.html.erb
@@ -4,7 +4,7 @@
<%= form.input :published_journey_name %>
<%= form.input :published_journey_identifier %>
<%= form.input :comment %>
- <%= form.input :transport_mode, :as => :select, :collection => Chouette::Line.transport_modes, :include_blank => true, :member_label => Proc.new { |mode| t("transport_modes.label.#{mode}") } %>
+ <%= form.input :transport_mode_name, :as => :select, :collection => Chouette::Line.transport_modes, :include_blank => true, :member_label => Proc.new { |mode| t("transport_mode_names.label.#{mode}") } %>
<%= form.input :status_value %>
<%= form.input :facility %>
<%= form.input :vehicle_type_identifier%>
@@ -62,6 +62,7 @@
crossDomain: false,
prePopulate: $('#time_table_tokens').data('pre'),
minChars: 3,
+ preventDuplicates: true,
});
});
</script>
diff --git a/app/views/vehicle_journeys/new.js.erb b/app/views/vehicle_journeys/new.js.erb
index 473c6be57..65e5dfccb 100644
--- a/app/views/vehicle_journeys/new.js.erb
+++ b/app/views/vehicle_journeys/new.js.erb
@@ -1,8 +1,8 @@
$(document).ready(function() {
$("#vehicle_journey_journey_pattern_id").change(
function(){
- var url = "<%= "/referentials/#{@referential.id}/lines/#{@line.id}/routes/#{@route.id}/journey_patterns/" %>";
- url = url + $("#vehicle_journey_journey_pattern_input select option:selected").attr("value") +
+ var url = "<%= referential_line_route_journey_patterns_path(@referential.id,@line.id,@route.id) %>";
+ url = url + "/" + $("#vehicle_journey_journey_pattern_input select option:selected").attr("value") +
"/new_vehicle_journey";
$.get(url);
}
diff --git a/app/views/vehicle_journeys/show.html.erb b/app/views/vehicle_journeys/show.html.erb
index 9f748d52f..b6203c2bc 100644
--- a/app/views/vehicle_journeys/show.html.erb
+++ b/app/views/vehicle_journeys/show.html.erb
@@ -42,14 +42,6 @@
<label><%= @vehicle_journey.human_attribute_name("objectid") %>: </label>
<%= @vehicle_journey.objectid %>
</p>
- <p>
- <label><%= @vehicle_journey.human_attribute_name("creation_time") %>: </label>
- <%= l @vehicle_journey.creation_time %>
- </p>
- <p>
- <label><%= @vehicle_journey.human_attribute_name("creator_id") %>: </label>
- <%= @vehicle_journey.creator_id %>
- </p>
</div>
</div>
<h3>
@@ -91,7 +83,7 @@
<% content_for :sidebar do %>
<ul class="actions">
<li><%= link_to t('vehicle_journeys.actions.edit'), edit_referential_line_route_vehicle_journey_path(@referential, @line, @route, @vehicle_journey), :class => "edit" %></li>
- <li><%= link_to t('vehicle_journeys.actions.destroy'), referential_line_route_vehicle_journey_path(@referential, @line, @route, @vehicle_journey), :method => :delete, :confirm => t('vehicle_journeys.actions.destroy_confirm'), :class => "remove" %></li>
+ <li><%= link_to t('vehicle_journeys.actions.destroy'), referential_line_route_vehicle_journey_path(@referential, @line, @route, @vehicle_journey), :method => :delete, :data => {:confirm => t('vehicle_journeys.actions.destroy_confirm')}, :class => "remove" %></li>
</ul>
<% unless @vehicle_journey.vehicle_journey_at_stops.empty? ||
@vehicle_journey.vehicle_journey_at_stops.any? { |vjas| vjas.departure_time.nil? } %>
@@ -107,5 +99,6 @@
<% end %>
<% end %>
</div>
+ <%= creation_tag(@vehicle_journey) %>
<% end %>
<% end %>
diff --git a/config/application.rb b/config/application.rb
index 837542855..2d411fb2c 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -29,6 +29,9 @@ module ChouetteIhm
# Activate observers that should always be running.
# config.active_record.observers = :cacher, :garbage_collector, :forum_observer
+
+ # custom exception pages
+ config.exceptions_app = self.routes
# Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
# Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
diff --git a/config/database.yml b/config/database.yml
index 0c5c4ba6e..9466851ef 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -27,4 +27,4 @@ production:
encoding: utf8
host: localhost
username: chouette
- password: chouette
+ password: chouette \ No newline at end of file
diff --git a/config/database.yml.ccontrol b/config/database.yml.ccontrol
index c9067ea11..1936af0e1 100644
--- a/config/database.yml.ccontrol
+++ b/config/database.yml.ccontrol
@@ -7,7 +7,7 @@ development:
test:
adapter: jdbcpostgresql
- database: chouette2_test
+ database: <%= (ENV["GIT_BRANCH"].nil? || ENV["GIT_BRANCH"] == "master") ? "chouette_test" : "chouette_" + ENV["GIT_BRANCH"] + "_test" %>
encoding: utf8
username: chouette
password: chouette
diff --git a/config/database.yml.travis b/config/database.yml.travis
new file mode 100644
index 000000000..40a95e668
--- /dev/null
+++ b/config/database.yml.travis
@@ -0,0 +1,11 @@
+development:
+ adapter: <%= RUBY_PLATFORM == "java" ? "jdbcpostgresql" : "postgresql" %>
+ database: <%= (ENV["GIT_BRANCH"].nil? || ENV["GIT_BRANCH"] == "master") ? "chouette_d" : "chouette_" + ENV["GIT_BRANCH"] + "_d" %>
+ encoding: utf8
+ username: postgres
+
+test:
+ adapter: <%= RUBY_PLATFORM == "java" ? "jdbcpostgresql" : "postgresql" %>
+ database: <%= (ENV["GIT_BRANCH"].nil? || ENV["GIT_BRANCH"] == "master") ? "chouette_test" : "chouette_" + ENV["GIT_BRANCH"] + "_test" %>
+ encoding: utf8
+ username: postgres \ No newline at end of file
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 05fd92389..5836c597c 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -1,3 +1,4 @@
+# ENV["CHOUETTE_RUN_MIGRATIONS"] = "true"
ChouetteIhm::Application.configure do
# Settings specified here will take precedence over those in config/application.rb
@@ -29,6 +30,9 @@ ChouetteIhm::Application.configure do
config.assets.debug = true
config.active_record.mass_assignment_sanitizer = :strict
+
+ # uncomment to show chouette error view in development
+ #config.consider_all_requests_local = false
config.active_record.auto_explain_threshold_in_seconds = (RUBY_PLATFORM == "java" ? nil : 0.5)
diff --git a/config/environments/production.rb b/config/environments/production.rb
index a418c74cd..5793f9ab1 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -34,10 +34,16 @@ ChouetteIhm::Application.configure do
#config.log_level = :info
# Use a different logger for distributed setups
- require 'syslog_logger'
- config.logger = SyslogLogger.new("rails/chouette2").tap do |logger|
- # logger.level = Logger::INFO
- end
+ if ENV['OS'] == 'Windows_NT'
+ # args = log_path,number of files,file sizes
+ config.logger = Logger.new("C:/chouette/logs/chouette2.log", 5, 10.megabytes)
+ else
+ require 'syslog_logger'
+ config.logger = SyslogLogger.new("rails/chouette2").tap do |logger|
+ # logger.level = Logger::INFO
+ end
+ end
+
# Use a different cache store in production
# config.cache_store = :mem_cache_store
@@ -65,14 +71,44 @@ ChouetteIhm::Application.configure do
config.action_mailer.default_url_options = { :host => 'chouette.dryade.net/chouette2' }
- ActionMailer::Base.delivery_method = :sendmail
+ # mailer configuration :
+ # by default : set to smtp on windows platforms and sendmail on unix one
+ # may be changed as convenience
+ if ENV['OS'] == 'Windows_NT'
+ ## using SMTP (maybe useful for Windows or VM platforms):
+ ActionMailer::Base.delivery_method = :smtp
+ ActionMailer::Base.server_settings = {
+ :address => "smtp.sample.com",
+ #:port => 25,
+ :domain => "sample.com",
+ #:authentication => :login,
+ :user_name => "username",
+ #:password => "password",
+ #:enable_starttls_auto => true,
+ #openssl_verify_mode => # set one in ‘none’ ‘peer’ ‘client_once’ ‘fail_if_no_peer_cert’
+ }
+ else
+ ## using SENDMAIL (easy on Linux platforms) :
+ ActionMailer::Base.delivery_method = :sendmail
+ end
- config.to_prepare do
- Devise::Mailer.layout "mailer"
- Chouette::Command.command = "/usr/local/opt/chouette-command/chouette-gui-2.0.0.2/chouette"
- Import.root = "/var/lib/chouette/imports"
- Export.root = "/var/lib/chouette/exports"
- FileValidation.root = "/var/lib/chouette/validations"
+ # paths for external resources
+ if ENV['OS'] == 'Windows_NT'
+ config.to_prepare do
+ Devise::Mailer.layout "mailer"
+ Chouette::Command.command = "C:/chouette/chouette-cmd_2.0.3/chouette.bat"
+ Import.root = "C:/chouette/chouette/imports"
+ Export.root = "C:/chouette/chouette/exports"
+ FileValidation.root = "C:/chouette/chouette/validations"
+ end
+ else
+ config.to_prepare do
+ Devise::Mailer.layout "mailer"
+ Chouette::Command.command = "/usr/local/opt/chouette-command/chouette-gui-2.0.3/chouette"
+ Import.root = "/var/lib/chouette/imports"
+ Export.root = "/var/lib/chouette/exports"
+ FileValidation.root = "/var/lib/chouette/validations"
+ end
end
end
diff --git a/config/initializers/apartment.rb b/config/initializers/apartment.rb
index bff88d5fc..4bc95f829 100644
--- a/config/initializers/apartment.rb
+++ b/config/initializers/apartment.rb
@@ -1,6 +1,6 @@
Apartment.configure do |config|
# set your options (described below) here
- config.excluded_models = ["Referential", "Organisation", "User", "Import", "ImportLogMessage", "Export", "ExportLogMessage", "Delayed::Backend::ActiveRecord::Job"] # these models will not be multi-tenanted, but remain in the global (public) namespace
+ config.excluded_models = ["Referential", "Organisation", "User", "Import", "ImportLogMessage", "Export", "ExportLogMessage", "Delayed::Backend::ActiveRecord::Job", "Api::V1::ApiKey"] # these models will not be multi-tenanted, but remain in the global (public) namespace
# Dynamically get database names to migrate
config.database_names = lambda{ Referential.pluck(:slug) }
diff --git a/config/initializers/rabl_config.rb b/config/initializers/rabl_config.rb
new file mode 100644
index 000000000..2dcac1a0d
--- /dev/null
+++ b/config/initializers/rabl_config.rb
@@ -0,0 +1,5 @@
+Rabl.configure do |config|
+ config.include_json_root = false
+ config.xml_options = { :camelize => true }
+end
+
diff --git a/config/locales/access_links.yml b/config/locales/access_links.yml
new file mode 100644
index 000000000..3c85585b4
--- /dev/null
+++ b/config/locales/access_links.yml
@@ -0,0 +1,93 @@
+en:
+ access_links:
+ actions:
+ new: "Add a new access link"
+ edit: "Edit this access link"
+ destroy: "Remove this access link"
+ destroy_confirm: "Are you sure you want destroy this access link?"
+ new:
+ title_access_point_to_stop_area: "Create an access link from access %{access_point} to stop area %{stop_area}"
+ title_stop_area_to_access_point: "Create an access link from stop area %{stop_area} to access %{access_point}"
+ edit:
+ title_access_point_to_stop_area: "Update an access link from access %{access_point} to stop area %{stop_area}"
+ title_stop_area_to_access_point: "Update an access link from stop area %{stop_area} to access %{access_point} "
+ show:
+ title: "access link %{access_link}"
+ durations: "Durations (hh mm ss):"
+ activerecord:
+ models:
+ access_link:
+ zero: "access link"
+ one: "access link"
+ other: "access links"
+ attributes:
+ access_link:
+ access_point: "Access Point"
+ stop_area: "Stop Area"
+ name: "Name"
+ comment: "Comment"
+ link_distance: "Distance (m)"
+ access_link_type: "Type"
+ default_duration: "Average"
+ frequent_traveller_duration: "Regular passenger"
+ occasional_traveller_duration: "Occasional passenger"
+ mobility_restricted_traveller_duration: "Mobility reduced passenger"
+ mobility_restricted_suitability: "Mobility reduced passenger suitable"
+ stairs_availability: "Escalator"
+ lift_availability: "Lift"
+ objectid: "Neptune identifier"
+ object_version: "Version"
+ creation_time: "Created on"
+ creatorid: "Created by "
+ formtastic:
+ hints:
+ access_link:
+ objectid: "[prefix]:AccessLink:[unique_key] : prefix contains only alphanumerical or underscore characters, unique_key accepts also minus character"
+
+fr:
+ access_links:
+ actions:
+ new: "Ajouter un lien"
+ edit: "Modifier ce lien"
+ destroy: "Supprimer ce lien"
+ destroy_confirm: "Etes vous sûr de détruire ce lien ?"
+ new:
+ title_access_point_to_stop_area: "Créer un lien depuis l'accès %{access_point} vers l'arrêt %{stop_area}"
+ title_stop_area_to_access_point: "Créer un lien depuis l'arrêt %{stop_area} vers l'accès %{access_point}"
+ edit:
+ title_access_point_to_stop_area: "Modifier un lien depuis l'accès %{access_point} vers l'arrêt %{stop_area}"
+ title_stop_area_to_access_point: "Modifier un lien depuis l'arrêt %{stop_area} vers l'accès %{access_point}"
+ show:
+ title: "lien d'accès %{access_link}"
+ durations: "Durées (hh mm ss) :"
+ activerecord:
+ models:
+ access_link:
+ zero: "lien"
+ one: "lien"
+ other: "liens"
+ attributes:
+ access_link:
+ access_point: "Accès"
+ stop_area: "Arrêt"
+ name: "Nom"
+ comment: "Commentaire"
+ link_distance: "Distance (m)"
+ access_link_type: "Type"
+ default_duration: "moyenne"
+ frequent_traveller_duration: "pour un habitué"
+ occasional_traveller_duration: "pour un voyageur occasionnel"
+ mobility_restricted_traveller_duration: "pour un voyageur à mobilité réduite"
+ mobility_restricted_suitability: "Accès pour voyageur à mobilité réduite"
+ stairs_availability: "Escalator"
+ lift_availability: "Ascenseur"
+ objectid: "Identifiant Neptune"
+ object_version: "Version"
+ creation_time: "Créé le"
+ creator_id: "Créé par"
+ formtastic:
+ hints:
+ access_link:
+ objectid: "[prefixe]:AccessLink:[clé_unique] caractères autorisés : alphanumériques et 'souligné' pour le préfixe, la clé unique accepte en plus le 'moins'"
+
+
diff --git a/config/locales/access_points.yml b/config/locales/access_points.yml
new file mode 100644
index 000000000..83007d088
--- /dev/null
+++ b/config/locales/access_points.yml
@@ -0,0 +1,117 @@
+en:
+ access_points:
+ access_point:
+ no_position: "No Position"
+ actions:
+ new: "Add a new access point"
+ edit: "Edit this access point"
+ destroy: "Remove this access point"
+ destroy_confirm: "Are you sure you want destroy this access point?"
+ new:
+ title: "Add a new access point"
+ edit:
+ title: "Update access point %{access_point}"
+ show:
+ title: "Access point %{access_point}"
+ geographic_data: "Geographic data "
+ no_geographic_data: "None"
+ generic_access_links: "Glogal access links"
+ detail_access_links: "Specific access links"
+ access_link_legend_1: "grays arrows for undefined links, green for defined ones"
+ access_link_legend_2: "clic on arrows to create/edit a link"
+ index:
+ title: "Access points"
+ name_or_country_code: "Name"
+ activerecord:
+ models:
+ access_point:
+ zero: "access point"
+ one: "access point"
+ other: "access points"
+ attributes:
+ access_point:
+ stop_area: "Contain in Stop Area"
+ name: "Name"
+ comment: "Comments"
+ access_point_type: "Access point type"
+ street_name: "Street name"
+ country_code: "INSEE code"
+ openning_time: "Opening time"
+ closing_time: "Closing time"
+ projection_type: "Projection type"
+ x: "x-position"
+ y: "y-position"
+ long_lat_type: "Projection type"
+ longitude: "Longitude"
+ latitude: "Latitude"
+ mobility_restricted_suitability: "Mobility reduced passenger suitable"
+ stairs_availability: "Escalator"
+ lift_availability: "Lift"
+ objectid: "Neptune identifier"
+ object_version: "Version"
+ creation_time: "Created on"
+ creatorid: "Created by"
+ formtastic:
+ hints:
+ access_point:
+ objectid: "[prefix]:AccessPoint:[unique_key] : prefix contains only alphanumerical or underscore characters, unique_key accepts also minus character"
+
+fr:
+ access_points:
+ access_point:
+ no_position: "Pas de position"
+ actions:
+ new: "Ajouter un accès"
+ edit: "Modifier cet accès"
+ destroy: "Supprimer cet accès"
+ destroy_confirm: "Etes vous sûr de détruire cet accès ?"
+ new:
+ title: "Ajouter un accès"
+ edit:
+ title: "Modifier l'accès %{access_point}"
+ show:
+ title: "Accès %{access_point}"
+ geographic_data: "Données géographiques"
+ no_geographic_data: "Aucune"
+ generic_access_links: "Liens Arrêts - Accès globaux"
+ detail_access_links: "Liens Arrêts - Accès détaillés"
+ access_link_legend_1: "Les flêches grises représentent des liens non définis"
+ access_link_legend_2: "cliquer sur les flêches pour créer/éditer un lien"
+ index:
+ name_or_country_code: "Nom"
+ title: "Accès de %{stop_area}"
+ activerecord:
+ models:
+ access_point:
+ zero: "accès"
+ one: "accès"
+ other: "accès"
+ attributes:
+ access_point:
+ stop_area: "Zone d'arrêts"
+ name: "Nom"
+ comment: "Commentaire"
+ access_point_type: "Type d'accès"
+ street_name: "Nom de la rue"
+ country_code: "Code INSEE"
+ projection_type: "Projection"
+ x: "Position X"
+ y: "Position Y"
+ long_lat_type: "Projection"
+ longitude: "Longitude"
+ latitude: "Latitude"
+ openning_time: "Horaire d'ouverture"
+ closing_time: "Horaire de fermeture"
+ mobility_restricted_suitability: "Accès pour voyageur à mobilité réduite"
+ stairs_availability: "Escalator"
+ lift_availability: "Ascenseur"
+ objectid: "Identifiant Neptune"
+ object_version: "Version"
+ creation_time: "Créé le"
+ creator_id: "Créé par"
+ formtastic:
+ hints:
+ access_point:
+ objectid: "[prefixe]:AccessPoint:[clé_unique] caractères autorisés : alphanumériques et 'souligné' pour le préfixe, la clé unique accepte en plus le 'moins'"
+
+
diff --git a/config/locales/access_types.yml b/config/locales/access_types.yml
new file mode 100644
index 000000000..60fe17d0f
--- /dev/null
+++ b/config/locales/access_types.yml
@@ -0,0 +1,13 @@
+en:
+ access_types:
+ label:
+ in: "Entrance"
+ out: "Exit"
+ in_out: "Both ways"
+
+fr:
+ access_types:
+ label:
+ in: "Entrée"
+ out: "Sortie"
+ in_out: "Entrée/Sortie"
diff --git a/config/locales/actions.yml b/config/locales/actions.yml
index 98460aafd..bbc7d9bc0 100644
--- a/config/locales/actions.yml
+++ b/config/locales/actions.yml
@@ -1,16 +1,16 @@
en:
actions:
- edit: Edit
- destroy: Destroy
- search: Search
- add: Add new
- or: or
- cancel: Cancel
+ edit: "Edit"
+ destroy: "Destroy"
+ search: "Search"
+ add: "Add new"
+ or: "or"
+ cancel: "Cancel"
fr:
actions:
- edit: Modifier
- destroy: Supprimer
- search: Chercher
- add: Ajouter
- or: ou
- cancel: Annuler \ No newline at end of file
+ edit: "Modifier"
+ destroy: "Supprimer"
+ search: "Chercher"
+ add: "Ajouter"
+ or: "ou"
+ cancel: "Annuler" \ No newline at end of file
diff --git a/config/locales/api_keys.yml b/config/locales/api_keys.yml
new file mode 100644
index 000000000..e64bbb5b5
--- /dev/null
+++ b/config/locales/api_keys.yml
@@ -0,0 +1,37 @@
+en:
+ api_keys:
+ actions:
+ new: "Add a new api key"
+ edit: "Edit this api key"
+ destroy: "Remove this api key"
+ destroy_confirm: "Are you sure you want destroy this api key?"
+ new:
+ title: "Add a new api key"
+ edit:
+ title: "Update api key"
+ activerecord:
+ models:
+ api_key: "Api Key"
+ attributes:
+ api_key:
+ name: "Name"
+ token: "Token"
+fr:
+ api_keys:
+ actions:
+ new: "Ajouter une clé d'accès API"
+ edit: "Modifier la clé d'accès API"
+ destroy: "Supprimer la clé d'accès API"
+ destroy_confirm: "Etes vous sûr de vouloir détruire la clé d'accès API ?"
+ new:
+ title: "Ajouter une clé d'accès API"
+ edit:
+ title: "Modifier la clé d'accès API"
+ activerecord:
+ models:
+ api_key: "Clé d'accès API"
+ attributes:
+ api_key:
+ name: "Nom"
+ token: "Token"
+
diff --git a/config/locales/area_types.yml b/config/locales/area_types.yml
index ecaf45d78..95d154521 100644
--- a/config/locales/area_types.yml
+++ b/config/locales/area_types.yml
@@ -1,17 +1,17 @@
en:
area_types:
label:
- boarding_position: Boarding Position
- quay: Quay
- commercial_stop_point: Commercial Stop Point
- stop_place: Stop Place
- itl: Restriction Constraint
+ boarding_position: "Boarding Position"
+ quay: "Quay"
+ commercial_stop_point: "Commercial Stop Point"
+ stop_place: "Stop Place"
+ itl: "Restriction Constraint"
fr:
area_types:
label:
boarding_position: "Point d'embarquement"
- quay: Quai
- commercial_stop_point: Arrêt commercial
+ quay: "Quai"
+ commercial_stop_point: "Arrêt commercial"
stop_place: "Pôle d'échange"
- itl: ITL
+ itl: "ITL"
diff --git a/config/locales/clean_ups.yml b/config/locales/clean_ups.yml
index 8ac843f49..09abc5adf 100644
--- a/config/locales/clean_ups.yml
+++ b/config/locales/clean_ups.yml
@@ -8,6 +8,7 @@ en:
success_sa: "%{count} stop areas deleted"
success_c: "%{count} companies deleted"
success_n: "%{count} networks deleted"
+ success_g: "%{count} groups of lines deleted"
failure: "Fail when clean_up"
actions:
clean_up: "clean up"
@@ -16,10 +17,11 @@ en:
attributes:
clean_up:
expected_date: "Final date"
- keep_lines: keep lines
- keep_stops: keep stop areas
- keep_companies: keep companies
- keep_networks: keep networks
+ keep_lines: "keep lines"
+ keep_stops: "keep stop areas"
+ keep_companies: "keep companies"
+ keep_networks: "keep networks"
+ keep_group_of_lines: "keep groups of lines"
formtastic:
hints:
clean_up:
@@ -34,6 +36,7 @@ fr:
success_sa: "%{count} arrêt(s) supprimé(s)"
success_c: "%{count} transporteur(s) supprimé(s)"
success_n: "%{count} réseau(x) supprimé(s)"
+ success_g: "%{count} groupe(s) de lignes supprimé(s)"
failure: "Echec de la purge "
actions:
clean_up: "Purger"
@@ -42,10 +45,11 @@ fr:
attributes:
clean_up:
expected_date: "date limite"
- keep_lines: conserver les lignes
- keep_stops: conserver les arrêts
- keep_companies: conserver les transporteurs
- keep_networks: conserver les réseaux
+ keep_lines: "conserver les lignes"
+ keep_stops: "conserver les arrêts"
+ keep_companies: "conserver les transporteurs"
+ keep_networks: "conserver les réseaux"
+ keep_group_of_lines: "conserver les groupes de lignes"
formtastic:
hints:
clean_up:
diff --git a/config/locales/companies.yml b/config/locales/companies.yml
index b9750ebff..620b721ce 100644
--- a/config/locales/companies.yml
+++ b/config/locales/companies.yml
@@ -13,14 +13,14 @@ en:
title: "Company %{company}"
index:
title: "Companies"
- name: Name
+ name: "Name"
activerecord:
models:
company:
- zero: company
- one: company
- other: companies
+ zero: "company"
+ one: "company"
+ other: "companies"
attributes:
company:
registration_number: "Registration number"
@@ -32,14 +32,14 @@ en:
phone: "Phone number"
fax: "Fax number"
email: "Email"
- objectid: Neptune identifier
- object_version: Version
- creation_time: Created on
- creator_id: Created by
+ objectid: "Neptune identifier"
+ object_version: "Version"
+ creation_time: "Created on"
+ creator_id: "Created by "
formtastic:
hints:
company:
- registration_number: only alphanumerical or underscore characters
+ registration_number: "only alphanumerical or underscore characters "
objectid: "[prefix]:Company:[unique_key] : prefix contains only alphanumerical or underscore characters, unique_key accepts also minus character"
fr:
@@ -57,14 +57,14 @@ fr:
title: "Transporteur %{company}"
index:
title: "Transporteurs"
- name: Nom
+ name: "Nom"
activerecord:
models:
company:
- zero: transporteur
- one: transporteur
- other: transporteurs
+ zero: "transporteur"
+ one: "transporteur"
+ other: "transporteurs"
attributes:
company:
registration_number: "Numéro d'enregistrement"
diff --git a/config/locales/connection_link_types.yml b/config/locales/connection_link_types.yml
index 2404aeeff..0f4f9d408 100644
--- a/config/locales/connection_link_types.yml
+++ b/config/locales/connection_link_types.yml
@@ -1,13 +1,13 @@
en:
connection_link_types:
label:
- underground: Underground
- mixed: Mixed
- overground: Overground
+ underground: "Underground"
+ mixed: "Mixed"
+ overground: "Overground"
fr:
connection_link_types:
label:
- underground: Souterrain
- mixed: Mixte
- overground: Aérien
+ underground: "Souterrain"
+ mixed: "Mixte"
+ overground: "Aérien"
diff --git a/config/locales/connection_links.yml b/config/locales/connection_links.yml
index fb9b98ba4..4a008199b 100644
--- a/config/locales/connection_links.yml
+++ b/config/locales/connection_links.yml
@@ -1,62 +1,62 @@
en:
connection_links:
actions:
- new: Add a new connection link
- edit: Edit this connection link
- destroy: Remove this connection link
- destroy_confirm: Are you sure you want destroy this connection link?
+ new: "Add a new connection link"
+ edit: "Edit this connection link"
+ destroy: "Remove this connection link"
+ destroy_confirm: "Are you sure you want destroy this connection link?"
select_areas: "Update start/end of link"
new:
- title: Add a new connection link
+ title: "Add a new connection link"
edit:
- title: Update connection link %{connection_link}
+ title: "Update connection link %{connection_link}"
show:
- title: Connection link %{connection_link}
+ title: "Connection link %{connection_link}"
durations: "Durations (hh mm ss):"
connection_link:
- from: From
- to: to
+ from: "From"
+ to: "to"
index:
- title: Connection links
- name: Name
- departure: Start of link
- arrival: End of link
- selection: Selection
- selection_all: All
+ title: "Connection links"
+ name: "Name"
+ departure: "Start of link"
+ arrival: "End of link"
+ selection: "Selection"
+ selection_all: "All"
select_departure:
- title: Select start stop area for %{connection_link}
+ title: "Select start stop area for %{connection_link}"
select_arrival:
- title: Select end stop area for %{connection_link}
+ title: "Select end stop area for %{connection_link}"
select_areas:
title: "Select start and end stops for %{connection_link}"
activerecord:
models:
connection_link:
- zero: connection link
- one: connection link
- other: connection links
+ zero: "connection link"
+ one: "connection link"
+ other: "connection links"
attributes:
connection_link:
- departure: Start of link
- arrival: End of link
- departure_id: Start of link
- arrival_id: End of link
- undefined: not yet set
- name: Name
- comment: Comment
- link_distance: Distance (m)
- connection_link_type: Type
- default_duration: Average
- frequent_traveller_duration: Regular passenger
- occasional_traveller_duration: Occasional passenger
- mobilit_yrestricted_traveller_duration: Mobility reduced passenger
- mobility_restricted_suitability: Mobility reduced passenger suitable
- stairs_availability: Escalator
- lift_availability: Lift
- objectid: Neptune identifier
- object_version: Version
- creation_time: Created on
- creator_id: Created by
+ departure: "Start of link"
+ arrival: "End of link"
+ departure_id: "Start of link"
+ arrival_id: "End of link"
+ undefined: "not yet set"
+ name: "Name"
+ comment: "Comment"
+ link_distance: "Distance (m)"
+ connection_link_type: "Type"
+ default_duration: "Average"
+ frequent_traveller_duration: "Regular passenger"
+ occasional_traveller_duration: "Occasional passenger"
+ mobility_restricted_traveller_duration: "Mobility reduced passenger"
+ mobility_restricted_suitability: "Mobility reduced passenger suitable"
+ stairs_availability: "Escalator"
+ lift_availability: "Lift"
+ objectid: "Neptune identifier"
+ object_version: "Version"
+ creation_time: "Created on"
+ creator_id: "Created by"
formtastic:
hints:
connection_link:
@@ -65,28 +65,28 @@ en:
fr:
connection_links:
actions:
- new: Ajouter une correspondance
- edit: Modifier cette correspondance
- destroy: Supprimer cette correspondance
- destroy_confirm: Etes vous sûr de détruire cette correspondance ?
+ new: "Ajouter une correspondance"
+ edit: "Modifier cette correspondance"
+ destroy: "Supprimer cette correspondance"
+ destroy_confirm: "Etes vous sûr de détruire cette correspondance ?"
select_areas: "Modifier les départs/arrivées"
new:
- title: Ajouter une correspondance
+ title: "Ajouter une correspondance"
edit:
- title: Modifier la correspondance %{connection_link}
+ title: "Modifier la correspondance %{connection_link}"
show:
- title: Correspondance %{connection_link}
+ title: "Correspondance %{connection_link}"
durations: "Durées (hh mm ss) :"
connection_link:
- from: De
- to: vers
+ from: "De"
+ to: "vers"
index:
- name: Nom
- title: Correspondances
- departure: Arrêt de départ
+ name: "Nom"
+ title: "Correspondances"
+ departure: "Arrêt de départ"
arrival: "Arrêt d'arrivée"
- selection: Sélection
- selection_all: Tous
+ selection: "Sélection"
+ selection_all: "Tous"
select_departure:
title: "Sélection de l'arrêt de départ de %{connection_link}"
select_arrival:
@@ -96,31 +96,31 @@ fr:
activerecord:
models:
connection_link:
- zero: correspondance
- one: correspondance
- other: correspondances
+ zero: "correspondance"
+ one: "correspondance"
+ other: "correspondances"
attributes:
connection_link:
- departure: Arrêt de départ
+ departure: "Arrêt de départ"
arrival: "Arrêt d'arrivée"
- departure_id: Arrêt de départ
+ departure_id: "Arrêt de départ"
arrival_id: "Arrêt d'arrivée"
- undefined: non défini
- name: Nom
- comment: Commentaire
- link_distance: Distance (m)
- connection_link_type: Type
- default_duration: moyenne
- frequent_traveller_duration: pour un habitué
- occasional_traveller_duration: pour un voyageur occasionnel
- mobility_restricted_traveller_duration: pour un voyageur à mobilité réduite
- mobility_restricted_suitability: Accès pour voyageur à mobilité réduite
- stairs_availability: Escalator
- lift_availability: Ascenseur
- objectid: Identifiant Neptune
- object_version: Version
- creation_time: Créé le
- creator_id: Créé par
+ undefined: "non défini"
+ name: "Nom"
+ comment: "Commentaire"
+ link_distance: "Distance (m)"
+ connection_link_type: "Type"
+ default_duration: "moyenne"
+ frequent_traveller_duration: "pour un habitué"
+ occasional_traveller_duration: "pour un voyageur occasionnel"
+ mobility_restricted_traveller_duration: "pour un voyageur à mobilité réduite"
+ mobility_restricted_suitability: "Accès pour voyageur à mobilité réduite"
+ stairs_availability: "Escalator"
+ lift_availability: "Ascenseur"
+ objectid: "Identifiant Neptune"
+ object_version: "Version"
+ creation_time: "Créé le"
+ creator_id: "Créé par"
formtastic:
hints:
connection_link:
diff --git a/config/locales/directions.yml b/config/locales/directions.yml
index 8e59b0b84..6e541c274 100644
--- a/config/locales/directions.yml
+++ b/config/locales/directions.yml
@@ -1,31 +1,31 @@
en:
directions:
label:
- straight_forward: straight forward
- backward: backward
- clock_wise: clockwise
- counter_clock_wise: counterclockwise
- north: north
- north_west: north west
- west: west
- south_west: south west
- south: south
- south_east: south east
- east: east
- north_east: north east
+ straight_forward: "straight forward"
+ backward: "backward"
+ clock_wise: "clockwise"
+ counter_clock_wise: "counterclockwise"
+ north: "north"
+ north_west: "north west"
+ west: "west"
+ south_west: "south west"
+ south: "south"
+ south_east: "south east"
+ east: "east"
+ north_east: "north east"
fr:
directions:
label:
- straight_forward: aller
- backward: retour
- clock_wise: sens horaire
- counter_clock_wise: sens anti horaire
- north: nord
- north_west: nord ouest
- west: ouest
- south_west: sud ouest
- south: sud
- south_east: sud est
- east: est
- north_east: nord est
+ straight_forward: "aller"
+ backward: "retour"
+ clock_wise: "sens horaire"
+ counter_clock_wise: "sens anti horaire"
+ north: "nord"
+ north_west: "nord ouest"
+ west: "ouest"
+ south_west: "sud ouest"
+ south: "sud"
+ south_east: "sud est"
+ east: "est"
+ north_east: "nord est"
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 62de85bbc..fd461119f 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -7,4 +7,5 @@ en:
"false": "no"
time:
formats:
+ short: "%d %b %y %H:%M"
hour: "%H:%M"
diff --git a/config/locales/exports.yml b/config/locales/exports.yml
index fa7fdfb8e..3d359d609 100644
--- a/config/locales/exports.yml
+++ b/config/locales/exports.yml
@@ -1,35 +1,40 @@
en:
exports:
actions:
- new: New export
- destroy: Destroy
- destroy_confirm: Are you sure you want destroy this export?
- download: Download
+ new: "New export"
+ destroy: "Destroy"
+ destroy_confirm: "Are you sure you want destroy this export?"
+ download: "Download"
new:
- title: New export
- all: All
+ title: "New export"
+ all: "All"
index:
- title: Exports
+ title: "Exports"
+ warning: ""
show:
- report: Report
+ report: "Report"
statuses:
- pending: Pending
- completed: Completed
- failed: Failed
+ pending: "Pending"
+ completed: "Completed"
+ failed: "Failed"
export_log_messages:
messages:
- started: Started export
- completed: Completed export
- failed: Failed export
- undefined: %{key} undefined
+ started: "Started export"
+ completed: "Completed export"
+ failed: "Failed export"
+ undefined: "%{key} undefined"
+ EXPORT: %{0} Export
+ EXPORTED_LINE: "Line %{0} (%{1}) exported"
+ EMPTY_LINE: "Line without valid vehicle journey : not exported"
EXPORT_ERROR: "Error durring export"
- EXCEPTION : "Origin %{0}"
- NEPTUNE_EXPORT: Neptune Export
+ EXCEPTION: "Origin %{0}"
+ # old report for backward compatibility
+ NEPTUNE_EXPORT: "Neptune Export"
NEPTUNE_EXPORTED_LINE: "Line %{0} (%{1}) exported"
NEPTUNE_EMPTY_LINE: "Line %{0} (%{1}) without valid vehicle journey : not exported"
- GTFS_EXPORT: GTFS Export
- GTFS_OK: Export GTFS terminated
- GTFS_NO_LINE: No line to export
+ GTFS_EXPORT: "GTFS Export"
+ GTFS_OK: "Export GTFS terminated"
+ GTFS_NO_LINE: "No line to export"
GTFS_MISSING_PARAMETER: "Missing parameter : %{0}"
GTFS_UNKNOWN_PARAMETER: "Unknown parameter : %{0}"
GTFS_FILE_ACCESS: "Unable to access file %{0}"
@@ -37,71 +42,87 @@ en:
GTFS_EMPTY_DATA: "No %{0} data to export"
GTFS_INVALID_DATA: "%{0} %{1} : invalid data %{2}=%{3}"
GTFS_MISSING_DATA: "%{0} %{1} : missing value for : %{2}"
- CSV_EXPORT: CSV Export
- CSV_OK_LINE: Line %{0} exported
+ CSV_EXPORT: "CSV Export"
+ CSV_OK_LINE: "Line %{0} exported"
CSV_TOO_MUCH_ROUTES: "Line %{0} rejected : more than 2 routes"
+ NETEX_EXPORT: "NeTEx Export"
+ NETEX_EXPORTED_LINE: "Line %{0} (%{1}) exported"
+ NETEX_EMPTY_LINE: "Line %{0} (%{1}) without valid vehicle journey : not exported"
severities:
- info: Information
- ok: Ok
- warning: Warning
- error: Error
- fatal: Fatal
+ info: "Information"
+ ok: "Ok"
+ warning: "Warning"
+ error: "Error"
+ fatal: "Fatal"
activerecord:
models:
export:
- zero: export
- one: export
- other: exports
+ zero: "export"
+ one: "export"
+ other: "exports"
+ neptune_export:
+ zero: "Export"
+ one: "Neptune Export"
+ other: "Exports"
csv_export:
- zero: CSV Export
- one: CSV Export
- other: CSV Exports
+ zero: "Export"
+ one: "CSV Export"
+ other: "Exports"
gtfs_export:
- zero: GTFS Export
- one: GTFS Export
- other: GTFS Exports
+ zero: "Export"
+ one: "GTFS Export"
+ other: "Exports"
+ netex_export:
+ zero: "Export"
+ one: "NeTEx Export"
+ other: "Exports"
attributes:
export:
- status: Status
- references_type: Associated Data Type
- reference_ids: Associated Data
- time_zone: Time Zone
+ status: "Status"
+ references_type: "Associated Data Type"
+ reference_ids: "Associated Data"
+ time_zone: "Time Zone"
export_log_message:
- created_at: Date
- position: N.
- full_message: Message
+ created_at: "Date"
+ position: "N."
+ full_message: "Message"
fr:
exports:
actions:
- new: Nouvel export
- destroy: Supprimer cet export
- destroy_confirm: Etes vous sûr de détruire cet export ?
- download: Télécharger
+ new: "Nouvel export"
+ destroy: "Supprimer cet export"
+ destroy_confirm: "Etes vous sûr de détruire cet export ?"
+ download: "Télécharger"
new:
- title: Nouvel export
- all: Toutes
+ title: "Nouvel export"
+ all: "Toutes"
index:
- title: Exports
+ title: "Exports"
+ warning: ""
show:
- report: Rapport
+ report: "Rapport"
statuses:
- pending: En cours
- completed: Achevé
- failed: Echoué
+ pending: "En cours"
+ completed: "Achevé"
+ failed: "Echoué"
export_log_messages:
messages:
- started: Export démarré
- completed: Export achevé avec succès
- failed: Export interrompu
- undefined: %{key} non défini
+ started: "Export démarré"
+ completed: "Export achevé avec succès"
+ failed: "Export interrompu"
+ undefined: "%{key} non défini"
+ EXPORT: "Export %{0}"
+ EXPORTED_LINE: "Ligne %{0} (%{1}) exportée"
+ EMPTY_LINE: "Ligne sans course valide : non exportée"
EXPORT_ERROR: "Erreur lors de l'export"
- EXCEPTION : "Cause %{0}"
- NEPTUNE_EXPORT: Export Neptune
+ EXCEPTION: "Cause %{0}"
+ # old report for backward compatibility
+ NEPTUNE_EXPORT: "Export Neptune"
NEPTUNE_EXPORTED_LINE: "Ligne %{0} (%{1}) exportée"
NEPTUNE_EMPTY_LINE: "Ligne %{0} (%{1}) sans course valide : non exportée"
- GTFS_EXPORT: Export GTFS
- GTFS_OK: Export GTFS terminé
- GTFS_NO_LINE: Pas de ligne à exporter
+ GTFS_EXPORT: "Export GTFS"
+ GTFS_OK: "Export GTFS terminé"
+ GTFS_NO_LINE: "Pas de ligne à exporter"
GTFS_MISSING_PARAMETER: "Paramètre %{0} manquant"
GTFS_UNKNOWN_PARAMETER: "Paramètre %{0} inconnu"
GTFS_FILE_ACCESS: "Accès au fichier %{0} impossible"
@@ -109,43 +130,50 @@ fr:
GTFS_EMPTY_DATA: "Pas de donné de type %{0} à exporter"
GTFS_INVALID_DATA: "%{0} %{1} : attribut %{2}=%{3} invalide"
GTFS_MISSING_DATA: "%{0} %{1} : valeur manquante : %{2}"
- CSV_EXPORT: Export CSV
- CSV_OK_LINE: Ligne %{0} exportée
+ CSV_EXPORT: "Export CSV"
+ CSV_OK_LINE: "Ligne %{0} exportée"
CSV_TOO_MUCH_ROUTES: "Ligne %{0} non exportable : plus de 2 séquences d'arrêt"
+ NETEX_EXPORT: "Export NeTEx"
+ NETEX_EXPORTED_LINE: "Ligne %{0} (%{1}) exportée"
+ NETEX_EMPTY_LINE: "Ligne %{0} (%{1}) sans course valide : non exportée"
severities:
- info: Information
- ok: Ok
- warning: Alerte
- error: Erreur
- fatal: Fatal
+ info: "Information"
+ ok: "Ok"
+ warning: "Alerte"
+ error: "Erreur"
+ fatal: "Fatal"
activerecord:
models:
export:
- zero: export
- one: export
- other: exports
+ zero: "export"
+ one: "export"
+ other: "exports"
neptune_export:
- zero: Export Neptune
- one: Export Neptune
- other: Exports Neptune
+ zero: "Export"
+ one: "Export Neptune"
+ other: "Exports"
csv_export:
- zero: Export CSV
- one: Export CSV
- other: Exports CSV
+ zero: "Export"
+ one: "Export CSV"
+ other: "Exports"
gtfs_export:
- zero: Export GTFS
- one: Export GTFS
- other: Exports GTFS
+ zero: "Export"
+ one: "Export GTFS"
+ other: "Exports"
+ netex_export:
+ zero: "Export"
+ one: "Export NeTEx"
+ other: "Exports"
attributes:
export:
- status: Status
- references_type: Type de données incluses
- reference_ids: Données incluses
- time_zone: Fuseau horaire
+ status: "Status"
+ references_type: "Type de données incluses"
+ reference_ids: "Données incluses"
+ time_zone: "Fuseau horaire"
export_log_message:
- created_at: Date
+ created_at: "Date"
position: "No"
- full_message: Message
+ full_message: "Message"
formtastic:
hints:
time_zone: "selon le codage TZ (http://fr.wikipedia.org/wiki/Tz_database)" \ No newline at end of file
diff --git a/config/locales/file_validations.yml b/config/locales/file_validations.yml
index 50645dee9..4c7e66829 100644
--- a/config/locales/file_validations.yml
+++ b/config/locales/file_validations.yml
@@ -1,32 +1,33 @@
en:
file_validations:
index:
- title: Neptune Validation
+ title: "Neptune Validation"
+ warning: ""
edit:
title: "Edit the Validation"
show:
- title: Neptune Validation
- summary: Rapport de conformité à la norme NEPTUNE
+ title: "Neptune Validation"
+ summary: "Rapport de conformité à la norme NEPTUNE"
new:
- title: Create a new validation
+ title: "Create a new validation"
submit: "Create a validation"
actions:
- new: Add a validation
+ new: "Add a validation"
destroy_confirm: "Do you confirm to destroy this validation ?"
- destroy: Destroy this validation
- edit: Edit this validation
+ destroy: "Destroy this validation"
+ edit: "Edit this validation"
statuses:
- pending: Pending
- completed: Completed
- failed: Failed
+ pending: "Pending"
+ completed: "Completed"
+ failed: "Failed"
file_validation_log_messages:
messages:
- undefined: %{key} undefined
+ undefined: "%{key} undefined"
TooMuchDetails: ( %{0} erreurs / warnings supplémentaires )
ONE: "Catégorie 1 : Syntaxe"
Test1_Sheet1: 'Fiche n° 1.1 : Conformité à la syntaxe XML suivant les recommandations du W3C'
- Test1_Sheet1_Step1: Conformité à la syntaxe XML
- Test1_Sheet1_Step2: Conformité au schéma XML du profil NEPTUNE
+ Test1_Sheet1_Step1: "Conformité à la syntaxe XML"
+ Test1_Sheet1_Step2: "Conformité au schéma XML du profil NEPTUNE"
Test1_Sheet1_Step0_fatal: "Erreur fatale : Impossible d'ouvrir le fichier %{0}"
Test1_Sheet1_Step0_error: "Impossible d'importer cette entrée %{0} du zip"
Test1_Sheet1_Step0_warning: "Cette entrée %{0} du zip n'est pas un fichier xml et a été ignoré"
@@ -234,78 +235,79 @@ en:
Test3_Sheet21_Step1_error_c: "c : la vitesse fixée par l'élément < OccasionalTravellerDuration > n'est pas conforme à la valeur paramétrable %{Vitesse minimale %{0} et Vitesse maximale %{1} fixée pour le lien d'accès dont l'identifiant est < %{2} >"
Test3_Sheet21_Step1_error_d: "d : la vitesse fixée par l'élément < MobilityRestrictedTravellerDuration > n'est pas conforme à la valeur paramétrable Vitesse minimale %{0} et Vitesse maximale %{1} fixée pour le lien d'accès dont l'identifiant est < %{2} >"
severities:
- uncheck: Unchecked
- ok: Ok
- warning: Warning
- error: Error
- fatal: Fatal
+ uncheck: "Unchecked"
+ ok: "Ok"
+ warning: "Warning"
+ error: "Error"
+ fatal: "Fatal"
activerecord:
models:
file_validation:
- zero: Neptune Validation
- one: Neptune Validation
- other: Neptune Validation
+ zero: "Neptune Validation"
+ one: "Neptune Validation"
+ other: "Neptune Validation"
attributes:
file_validation:
- resources: File to validate
- status: Status
- file_name: Tested data
+ resources: "File to validate"
+ status: "Status"
+ file_name: "Tested data"
file_validation_log_message:
- created_at: Date
- position: N.
- full_message: Message
+ created_at: "Date"
+ position: "N."
+ full_message: "Message"
fr:
file_validations:
index:
- title: Validation Neptune
+ title: "Validation Neptune"
+ warning: ""
edit:
title: "Editer la validation"
show:
- title: Validation Neptune
- summary: Rapport de conformité à la norme NEPTUNE
- details: Détails
- parameters: Paramètres des tests
+ title: "Validation Neptune"
+ summary: "Rapport de conformité à la norme NEPTUNE"
+ details: "Détails"
+ parameters: "Paramètres des tests"
new:
- title: Démarrer une nouvelle validation
+ title: "Démarrer une nouvelle validation"
submit: "Lancer la validation"
actions:
- new: Ajouter une validation
+ new: "Ajouter une validation"
destroy_confirm: "Voulez-vous supprimer ce résultat de validation ?"
- destroy: Supprimer cette validation
- edit: Editer cette validation
+ destroy: "Supprimer cette validation"
+ edit: "Editer cette validation"
statuses:
- pending: En cours
- completed: Achevé
- failed: Echoué
+ pending: "En cours"
+ completed: "Achevé"
+ failed: "Echoué"
uncheck_count:
- zero: aucun inapplicable
- one: un inapplicable
+ zero: "aucun inapplicable"
+ one: "un inapplicable"
other: "%{count} inapplicables"
ok_count:
- zero: aucun test réussi
- one: un test réussi
- other: %{count} tests réussis
+ zero: "aucun test réussi"
+ one: "un test réussi"
+ other: "%{count} tests réussis"
warning_count:
- zero: aucun warning
- one: un warning
- other: %{count} warnings
+ zero: "aucun warning"
+ one: "un warning"
+ other: "%{count} warnings"
error_count:
- zero: aucune erreur
- one: une erreur
- other: %{count} erreurs
+ zero: "aucune erreur"
+ one: "une erreur"
+ other: "%{count} erreurs"
fatal_count:
- zero: aucune erreur fatale
- one: une erreur fatale
- other: %{count} erreurs fatales
+ zero: "aucune erreur fatale"
+ one: "une erreur fatale"
+ other: "%{count} erreurs fatales"
file_validation_log_messages:
messages:
- undefined: %{key} non défini
- TooMuchDetails: ( %{0} erreurs / warnings supplémentaires )
+ undefined: "%{key} non défini"
+ TooMuchDetails: "( %{0} erreurs / warnings supplémentaires )"
ONE: "Catégorie 1 : Syntaxe"
Test1_Sheet1: 'Fiche n° 1.1 : Conformité à la syntaxe XML suivant les recommandations du W3C'
- Test1_Sheet1_Step1: Conformité à la syntaxe XML
- Test1_Sheet1_Step2: Conformité au schéma XML du profil NEPTUNE
+ Test1_Sheet1_Step1: "Conformité à la syntaxe XML"
+ Test1_Sheet1_Step2: "Conformité au schéma XML du profil NEPTUNE"
Test1_Sheet1_Step0_fatal: "Erreur fatale : Impossible d'ouvrir le fichier %{0}"
Test1_Sheet1_Step0_error: "Impossible d'importer cette entrée %{0} du zip"
Test1_Sheet1_Step0_warning: "Cette entrée %{0} du zip n'est pas un fichier xml et a été ignoré"
@@ -330,7 +332,7 @@ fr:
Test2_Sheet2_Step1: "Correcte référence à des LIGNEs/Chouette ( < Line >) dans GROUPE DE LIGNES ( < GroupOfLine >)"
Test2_Sheet2_Step1_error: "la valeur de l'élément < lineId > : %{0} de la classe d'objets < GroupOfLine > n'a pas été repérée dans l'élément < objectId > de la classe d'objets < Line >"
Test2_Sheet3: "Fiche n° 2.3 : Cohérence entre les arrêts et leurs composants"
- Test2_Sheet3_Step1: "Correcte référence à des ARRÊTs/Chouette ( < StopArea >) et/ou à des POINTs D''ARRÊT SUR PARCOURS ( < StopPoint >) dans les ARRÊTs/Chouette ( < StopArea >) "
+ Test2_Sheet3_Step1: Conformité au schéma XML du profil NEPTUNE"Correcte référence à des ARRÊTs/Chouette ( < StopArea >) et/ou à des POINTs D''ARRÊT SUR PARCOURS ( < StopPoint >) dans les ARRÊTs/Chouette ( < StopArea >) "
Test2_Sheet3_Step1_unchecked: "non implémenté"
Test2_Sheet3_Step1_error: "une ou plusieurs valeurs de l'élément < contains > de l'objet < StopArea > %{0} n'est pas repérée dans la classe d'objets correspondant < StopPoint > ou < StopArea >. >"
Test2_Sheet4: "Fiche n° 2.4 : Définition des correspondances"
@@ -513,22 +515,22 @@ fr:
Test3_Sheet21_Step1_error_c: "c : la vitesse fixée par l'élément < OccasionalTravellerDuration > n'est pas conforme à la valeur paramétrable %{Vitesse minimale %{0} et Vitesse maximale %{1} fixée pour le lien d'accès dont l'identifiant est < %{2} >"
Test3_Sheet21_Step1_error_d: "d : la vitesse fixée par l'élément < MobilityRestrictedTravellerDuration > n'est pas conforme à la valeur paramétrable Vitesse minimale %{0} et Vitesse maximale %{1} fixée pour le lien d'accès dont l'identifiant est < %{2} >"
severities:
- uncheck: Non testé
- ok: Ok
- warning: Alerte
- error: Erreur
- fatal: Fatal
+ uncheck: "Non testé"
+ ok: "Ok"
+ warning: "Alerte"
+ error: "Erreur"
+ fatal: "Fatal"
activerecord:
models:
file_validation:
- zero: Validation Neptune
- one: Validation Neptune
- other: Validation Neptune
+ zero: "Validation Neptune"
+ one: "Validation Neptune"
+ other: "Validations Neptune"
attributes:
file_validation:
- resources: Fichier à valider
- status: Status
- file_name: Jeu de données
+ resources: "Fichier à valider"
+ status: "Status"
+ file_name: "Jeu de données"
test3_1_minimal_distance: "Distance minimale (test 3.1)"
test3_2_minimal_distance: "Distance minimale (test 3.2)"
test3_2_polygon_points: "Polygone (long lat) (test 3.6)"
@@ -559,6 +561,6 @@ fr:
test3_21d_maximal_speed: " / "
projection_reference: "Système de projection de référence"
file_validation_log_message:
- created_at: Date
- position: N.
- full_message: Message
+ created_at: "Date"
+ position: "N."
+ full_message: "Message"
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 9e74d5804..31075abe5 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -1,22 +1,72 @@
-fr:
# https://github.com/svenfuchs/rails-i18n/blob/master/rails/locale/fr.yml
+# French translations for Ruby on Rails
+# by Christian Lescuyer (christian@flyingcoders.com)
+# contributors:
+# - Sebastien Grosjean - ZenCocoon.com
+# - Bruno Michel - http://github.com/nono
+# - Tsutomu Kuroda - http://github.com/kuroda (t-kuroda@oiax.jp)
+# Emended by Benjamin des Gachons and Patrick Chew : <http://www.fitima.org/docs/fiche.pdf>
+
+fr:
date:
formats:
default: "%d/%m/%Y"
short: "%e %b"
long: "%e %B %Y"
- summary: "%A %d %B %Y" # added
- day_names: [dimanche, lundi, mardi, mercredi, jeudi, vendredi, samedi]
- abbr_day_names: [dim, lun, mar, mer, jeu, ven, sam]
- month_names: [~, janvier, février, mars, avril, mai, juin, juillet, août, septembre, octobre, novembre, décembre]
- abbr_month_names: [~, jan., fév., mar., avr., mai, juin, juil., août, sept., oct., nov., déc.]
- order: [ :day, :month, :year ]
+ day_names:
+ - dimanche
+ - lundi
+ - mardi
+ - mercredi
+ - jeudi
+ - vendredi
+ - samedi
+ abbr_day_names:
+ - dim
+ - lun
+ - mar
+ - mer
+ - jeu
+ - ven
+ - sam
+ month_names:
+ - ~
+ - janvier
+ - février
+ - mars
+ - avril
+ - mai
+ - juin
+ - juillet
+ - août
+ - septembre
+ - octobre
+ - novembre
+ - décembre
+ abbr_month_names:
+ - ~
+ - jan.
+ - fév.
+ - mar.
+ - avr.
+ - mai
+ - juin
+ - juil.
+ - août
+ - sept.
+ - oct.
+ - nov.
+ - déc.
+ order:
+ - :day
+ - :month
+ - :year
time:
formats:
default: "%d %B %Y %H:%M:%S"
short: "%d %b %H:%M"
- long: "%A %d %B %Y à %Hh%M"
+ long: "%A %d %B %Y %H:%M"
hour: "%Hh%M"
minute: "%M min"
am: 'am'
@@ -121,20 +171,17 @@ fr:
words_connector: ", "
two_words_connector: " et "
last_word_connector: " et "
- select:
- prompt: "Veuillez sélectionner"
helpers:
select:
prompt: "Veuillez sélectionner"
submit:
- create: "Créer un %{model}"
- update: "Modifier ce %{model}"
- submit: "Enregistrer ce %{model}"
-
+ create: "Créer un(e) %{model}"
+ update: "Modifier ce(tte) %{model}"
+ submit: "Enregistrer ce(tte) %{model}"
- errors:
- format: "Le %{attribute} %{message}"
+ errors: &errors
+ format: "%{attribute} %{message}"
messages: &errors_messages
inclusion: "n'est pas inclus(e) dans la liste"
exclusion: "n'est pas disponible"
@@ -143,9 +190,15 @@ fr:
accepted: "doit être accepté(e)"
empty: "doit être rempli(e)"
blank: "doit être rempli(e)"
- too_long: "est trop long (pas plus de %{count} caractères)"
- too_short: "est trop court (au moins %{count} caractères)"
- wrong_length: "ne fait pas la bonne longueur (doit comporter %{count} caractères)"
+ too_long:
+ one: "est trop long (pas plus d'un caractère)"
+ other: "est trop long (pas plus de %{count} caractères)"
+ too_short:
+ one: "est trop court (au moins un caractère)"
+ other: "est trop court (au moins %{count} caractères)"
+ wrong_length:
+ one: "ne fait pas la bonne longueur (doit comporter un seul caractère)"
+ other: "ne fait pas la bonne longueur (doit comporter %{count} caractères)"
not_a_number: "n'est pas un nombre"
not_an_integer: "doit être un nombre entier"
greater_than: "doit être supérieur à %{count}"
@@ -155,41 +208,27 @@ fr:
less_than_or_equal_to: "doit être inférieur ou égal à %{count}"
odd: "doit être impair"
even: "doit être pair"
+ taken: "n'est pas disponible"
+ record_invalid: "La validation a échoué : %{errors}"
+
template: &errors_template
header:
- one: "Impossible d'enregistrer ce %{model} : 1 erreur"
- other: "Impossible d'enregistrer ce %{model} : %{count} erreurs"
+ one: "Impossible d'enregistrer ce(tte) %{model} : 1 erreur"
+ other: "Impossible d'enregistrer ce(tte) %{model} : %{count} erreurs"
body: "Veuillez vérifier les champs suivants : "
- activerecord:
- errors:
- messages:
- taken: "n'est pas disponible"
activemodel:
errors:
- messages:
- taken: "n'est pas disponible"
- record_invalid: "La validation a échoué : %{errors}"
- <<: *errors_messages
- template:
- <<: *errors_template
- full_messages:
- format: "%{attribute} %{message}"
- flash:
- actions:
- create:
- notice: '%{resource_name} créé(e) avec succès.'
- update:
- notice: '%{resource_name} mise(e) à jour avec succès.'
- destroy:
- notice: '%{resource_name} détruit(e) avec succès.'
- alert: '%{resource_name} ne peut être détruit(e).'
+ <<: *errors
+ activerecord:
+ errors:
+ <<: *errors
# FIN: https://github.com/svenfuchs/rails-i18n/blob/master/rails/locale/fr.yml
"true": "oui"
"false": "non"
- or: ou
- back: Revenir
+ or: "ou"
+ back: "Revenir"
today: "Aujourd'hui"
yesterday: "Hier"
edit_periods: "Editer Périodes"
diff --git a/config/locales/group_of_lines.yml b/config/locales/group_of_lines.yml
new file mode 100644
index 000000000..963dc769e
--- /dev/null
+++ b/config/locales/group_of_lines.yml
@@ -0,0 +1,78 @@
+en:
+ group_of_lines:
+ actions:
+ new: "Add a new group of lines"
+ edit: "Edit this group of lines"
+ destroy: "Remove this group of lines"
+ destroy_confirm: "Are you sure you want destroy this group of lines?"
+ new:
+ title: "Add a new group of lines"
+ edit:
+ title: "Update group of lines %{group_of_line}"
+ show:
+ title: "Group of lines %{group_of_line}"
+ lines: "Lines list"
+ index:
+ title: "Group of Lines"
+ name: "Name"
+ form:
+ lines: "Associated lines"
+ activerecord:
+ models:
+ group_of_line:
+ zero: "group of line"
+ one: "group of line"
+ other: "groups of lines"
+ attributes:
+ group_of_line:
+ name: "Name"
+ comment: "Comments"
+ line_count: "Number of lines"
+ objectid: "Neptune identifier"
+ object_version: "Version"
+ creation_time: "Created on"
+ creator_id: "Created by"
+ formtastic:
+ hints:
+ group_of_line:
+ objectid: "[prefix]:GroupOfLine:[unique_key] : prefix contains only alphanumerical or underscore characters, unique_key accepts also minus character"
+
+fr:
+ group_of_lines:
+ actions:
+ new: "Ajouter un groupe de lignes"
+ edit: "Modifier ce groupe de lignes"
+ destroy: "Supprimer ce groupe de lignes"
+ destroy_confirm: "Etes vous sûr de détruire ce groupe de lignes ?"
+ new:
+ title: "Ajouter un groupe de lignes"
+ edit:
+ title: "Modifier le groupe de lignes %{group_of_line}"
+ show:
+ title: "Groupe de lignes %{group_of_line}"
+ lines: "Liste des lignes"
+ index:
+ title: "Groupes de lignes"
+ name: "Nom"
+ form:
+ lines: "Lignes associées"
+ activerecord:
+ models:
+ group_of_line:
+ zero: "groupe de lignes"
+ one: "groupe de lignes"
+ other: "groupes de lignes"
+ attributes:
+ group_of_line:
+ name: "Nom"
+ comment: "Commentaire"
+ line_count: "Nombre de lignes"
+ objectid: "Identifiant Neptune"
+ object_version: "Version"
+ creation_time: "Créé le"
+ creator_id: "Créé par"
+ formtastic:
+ hints:
+ group_of_line:
+ objectid: "[prefixe]:GroupOfLine:[clé_unique] caractères autorisés : alphanumériques et 'souligné' pour le préfixe, la clé unique accepte en plus le 'moins'"
+
diff --git a/config/locales/imports.yml b/config/locales/imports.yml
index ebf463886..b10888a35 100644
--- a/config/locales/imports.yml
+++ b/config/locales/imports.yml
@@ -1,27 +1,60 @@
en:
imports:
actions:
- new: New import
- destroy: Destroy
- destroy_confirm: Are you sure you want destroy this import?
+ new: "New import"
+ destroy: "Destroy"
+ destroy_confirm: "Are you sure you want destroy this import?"
new:
- title: New import
+ title: "New import"
index:
- title: Imports
+ title: "Imports"
+ warning: ""
show:
- report: Report
+ report: "Report"
statuses:
- pending: Pending
- completed: Completed
- failed: Failed
+ pending: "Pending"
+ completed: "Completed"
+ failed: "Failed"
import_log_messages:
messages:
- started: Started import
- completed: Completed import
- failed: Failed import
- undefined: %{key} undefined
- NEPTUNE_ONE: Conformité du fichier
- NEPTUNE_TooMuchDetails: ( %{0} erreurs / warnings supplémentaires )
+ started: "Started import"
+ completed: "Completed import"
+ failed: "Failed import"
+ undefined: "%{key} undefined"
+ IMPORT: "Import on %{0} format"
+ ZIP_FILE: "ZIP File %{0}"
+ ZIP_ERROR: "Error %{0}"
+ FILE: "File %{0}"
+ FILE_ERROR: "Error %{0}"
+ FILE_IGNORED: "Unknown file format ; ignored"
+ VALIDATION_ERROR: "Wrong grammar : %{0}"
+ VALIDATION_CAUSE: "%{0}"
+ IMPORTED_LINE: "Imported Line : %{0}"
+ LINE_COUNT: "Line count : %{0}"
+ TIME_TABLE_COUNT: "Tiemtable count : %{0}"
+ ROUTE_COUNT: "Route count : %{0}"
+ JOURNEY_PATTERN_COUNT: "Journey pattern count : %{0}"
+ VEHICLE_JOURNEY_COUNT: "Vehicle journey count : %{0}"
+ STOP_AREA_COUNT: "Stop area count : %{0}"
+ CONNECTION_LINK_COUNT: "Connection link count : %{0}"
+ ACCES_POINT_COUNT: "Access Point count : %{0}"
+ MANDATORY_TAG: "Mandatory tag : %{0} "
+ UNKNOWN_ENUM: "Unknown enum vaule for %{0} : %{1} "
+ EMPTY_TAG: "Empty value : %{0}"
+ BAD_REFERENCE: "Missing reference %{0} for %{1}"
+ EMPTY_LINE: "Empty Line %{0} "
+ EMPTY_ROUTE: "Empty Route {0} "
+ EMPTY_JOURNEY_PATTERN: "Empty Journey pattern %{0}"
+ EMPTY_VEHICLE_JOURNEY: "Empty Vehicle journey %{0} "
+ EMPTY_TIMETABLE: "Empty Timetable %{0} "
+ SAVE_OK: "%{0} saved"
+ SAVE_ERROR: "%{0} save failed : %{1}"
+ IMPORT_ERROR: "Import Error"
+ EXCEPTION: "Problem : %{0}"
+ # old Import reports (before 2.0.3)
+ SAVE: "Save"
+ NEPTUNE_ONE: "Conformité du fichier"
+ NEPTUNE_TooMuchDetails: "( %{0} erreurs / warnings supplémentaires )"
NEPTUNE_Test1_Sheet1: 'Fiche n° 1.1 : Conformité à la syntaxe XML suivant les recommandations du W3C'
NEPTUNE_Test1_Sheet1_Step1: Conformité à la syntaxe XML
NEPTUNE_Test1_Sheet1_Step2: Conformité au schéma XML du profil NEPTUNE
@@ -31,95 +64,144 @@ en:
NEPTUNE_Test1_Sheet1_Step1_error: "le fichier %{0} n'est pas correctement formé selon les recommandations du W3C"
NEPTUNE_Test1_Sheet1_Step2_error: "le fichier %{0} ne respecte pas le modèle NEPTUNE"
NEPTUNE_Test1_Sheet1_Step2_encoding: "le fichier %{0} ne respecte pas le codage de caractères du modèle NEPTUNE (ISO-8859-1)"
- NEPTUNE_Test1_Sheet1_Step2_fatal: "Erreur fatale \: Aucune entrée valide trouvée dans le fichier"
+ NEPTUNE_Test1_Sheet1_Step2_fatal: "Erreur fatale : Aucune entrée valide trouvée dans le fichier"
NEPTUNE_Test1_Sheet2: 'Fiche n° 1.2 : Conformité au schéma XML du profil NEPTUNE'
NEPTUNE_Test1_Sheet2_Step1: Conformité au schéma XML du profil NEPTUNE
NEPTUNE_Test1_Sheet2_Step1_error: "le fichier %{0} ne respecte pas le modèle NEPTUNE"
NEPTUNE_Test1_Sheet2_Step1_encoding: "le fichier %{0} ne respecte pas le codage de caractères du modèle NEPTUNE (ISO-8859-1)"
NEPTUNE_Test1_Sheet2_Step1_fatal: "Erreur fatale : Aucune entrée valide trouvée dans le fichier"
- CSV_IMPORT: Import CVS file
- CSV_OK_LINE: line %{0} imported
- CSV_OK_TIMETABLE: timetables %{0} (%{1}) imported
+ CSV_IMPORT: "Import CVS file"
+ CSV_OK_LINE: "line %{0} imported"
+ CSV_OK_TIMETABLE: "timetables %{0} (%{1}) imported"
CSV_OK_PTNETWORK: "network %{0} : %{1} imported"
- CSV_OK_COMPANY: company %{0} imported
+ CSV_OK_COMPANY: "company %{0} imported"
CSV_FILE_NOT_FOUND: "file %{0} : error %{1}"
- CSV_FILE_IGNORED: file %{0} ignored (not XML)
+ CSV_FILE_IGNORED: "file %{0} ignored (not XML) "
CSV_VALIDATION_ERROR: "XML file don't agree with Neptune XSD : %{0}"
- CSV_VALIDATION_CAUSE: %{0}
- CSV_PARSE_OBJECT: Analyse %{0}
+ CSV_VALIDATION_CAUSE: "%{0}"
+ CSV_PARSE_OBJECT: "Analyse %{0}"
CSV_MANDATORY_TAG: "missing or empty mandatory tag : %{0}"
CSV_UNKNOWN_ENUM: "Unknown %{0} enumaration value : %{1}"
CSV_EMPTY_TAG: "empty tag : %{0}"
CSV_TIMETABLE_COUNT: "timetable count : %{0}"
CSV_LINE_COUNT: "line count : %{0}"
- CSV_END_OF_FILE: Unexpected end of file
- CSV_BAD_TIMETABLE_PERIODS: Bad timetable periods
+ CSV_END_OF_FILE: "Unexpected end of file"
+ CSV_BAD_TIMETABLE_PERIODS: "Bad timetable periods"
CSV_INVALID_LINE: "invalid line : %{0}"
CSV_STOP_WITHOUT_COORDS: "Stop without coords : %{0}"
CSV_VJ_MISSING_TIMETABLE: "Unable to find timetable of vehicle journey : %{0}"
- CSV_FILE_FORMAT: Invalid or deprecated CSV format
+ CSV_FILE_FORMAT: "Invalid or deprecated CSV format"
CSV_BAD_ID: "Invalid built Neptune Object ID : %{1} for %{0} "
- CSV_UNUSED_TIMETABLE: Unused timetable %{0} (%{1})
- SAVE: Save
- SAVE_OK: %{0} saved
- SAVE_ERROR: "%{0} save failed : %{1}"
+ CSV_UNUSED_TIMETABLE: "Unused timetable %{0} (%{1})"
severities:
- info: Information
- uncheck: Unchecked
- ok: Ok
- warning: Warning
- error: Error
- fatal: Fatal
+ info: "Information"
+ uncheck: "Unchecked"
+ ok: "Ok"
+ warning: "Warning"
+ error: "Error"
+ fatal: "Fatal"
activerecord:
models:
import:
- zero: import
- one: import
- other: imports
+ zero: "import"
+ one: "import"
+ other: "imports"
neptune_import:
- zero: Neptune import
- one: Neptune import
- other: Neptune imports
+ zero: "import"
+ one: "Neptune import"
+ other: "imports"
csv_import:
- zero: CSV import
- one: CSV import
- other: CSV imports
+ zero: "import"
+ one: "CSV import"
+ other: "imports"
+ gtfs_import:
+ zero: "import"
+ one: "GTFS import"
+ other: "imports"
+ netex_import:
+ zero: "import"
+ one: "NeTEx import"
+ other: "imports"
attributes:
import:
- resources: File to import
- status: Status
+ resources: "File to import"
+ status: "Status"
objectid_prefix: "Neptune Id prefix"
+ max_distance_for_commercial: "Max distance for commercial stop"
+ max_distance_for_connection_link: "Max distance for connection link"
+ ignore_last_word: "ignore last word"
+ ignore_end_chars: "ignore last chars"
import_log_message:
- created_at: Date
- position: N.
- full_message: Message
+ created_at: "Date"
+ position: "N."
+ full_message: "Message"
+ formtastic:
+ hints:
+ import:
+ max_distance_for_commercial: "Maximal distance to merge homonymous stops in commercial stop in meter"
+ max_distance_for_connection_link: "Maximal distance to link stops by connection link stop in meter"
+ ignore_last_word: "ignore last word on stop name in homonymous detection (inappliable when just one word occurs)"
+ ignore_end_chars: "ignore some chars at the end of stop names in homonymous detection"
fr:
imports:
actions:
- new: Nouvel import
- destroy: Supprimer cet import
- destroy_confirm: Etes vous sûr de détruire cet import ?
+ new: "Nouvel import"
+ destroy: "Supprimer cet import"
+ destroy_confirm: "Etes vous sûr de détruire cet import ?"
new:
- title: Nouvel import
+ title: "Nouvel import"
index:
- title: Imports
+ title: "Imports"
+ warning: ""
show:
- report: Rapport
+ report: "Rapport"
statuses:
- pending: En cours
- completed: Achevé
- failed: Echoué
+ pending: "En cours"
+ completed: "Achevé"
+ failed: "Echoué"
import_log_messages:
messages:
- started: Import démarré
- completed: Import achevé avec succès
- failed: Import interrompu
- undefined: %{key} non défini
- NEPTUNE_ONE: Conformité du fichier
- NEPTUNE_TooMuchDetails: ( %{0} erreurs / warnings supplémentaires )
+ started: "Import démarré"
+ completed: "Import achevé avec succès"
+ failed: "Import interrompu"
+ undefined: "%{key} non défini"
+ IMPORT: "Import au format %{0}"
+ ZIP_FILE: "Fichier ZIP %{0}"
+ ZIP_ERROR: "Erreur %{0}"
+ FILE: "Fichier %{0}"
+ FILE_ERROR: "Erreur %{0}"
+ FILE_IGNORED: "Format non traité; ignoré"
+ VALIDATION_ERROR: "Le fichier ne respecte pas la grammaire : %{0}"
+ VALIDATION_CAUSE: "%{0}"
+ IMPORTED_LINE: "Ligne importée %{0}"
+ LINE_COUNT: "Nombre de lignes extraites : %{0}"
+ TIME_TABLE_COUNT: "Nombre de calendriers extraits : %{0}"
+ ROUTE_COUNT: "Nombre de séquences d'arrêts extraites : %{0}"
+ JOURNEY_PATTERN_COUNT: "Nombre de missions extraites : %{0}"
+ VEHICLE_JOURNEY_COUNT: "Nombre de courses extraites : %{0}"
+ STOP_AREA_COUNT: "Nombre d'arrêts extraits : %{0}"
+ CONNECTION_LINK_COUNT: "Nombre de correspondances extraites : %{0}"
+ ACCES_POINT_COUNT: "Nombre de points d'accès extraits : %{0}"
+ MANDATORY_TAG: "Valeur obligatoire absente ou vide : %{0} "
+ UNKNOWN_ENUM: "Valeur de l'enum %{0} inconnue : %{1} "
+ EMPTY_TAG: "Valeur vide : %{0}"
+ BAD_REFERENCE: "Référence %{0} manquante pour %{1}"
+ EMPTY_LINE: "Ligne %{0} sans séquence d'arrêt"
+ EMPTY_ROUTE: "Séquence d'arrêts %{0} sans mission ou arrêt"
+ EMPTY_JOURNEY_PATTERN: "Mission %{0} sans arrêt ou course"
+ EMPTY_VEHICLE_JOURNEY: "Course %{0} sans horaire"
+ EMPTY_TIMETABLE: "Calendrier %{0} sans jours ni période"
+ SAVE_OK: "%{0} enregistré"
+ SAVE_ERROR: "Echec de l'enregistrement de %{0} : %{1}"
+ IMPORT_ERROR: "Erreur d'import"
+ EXCEPTION: "Problème : %{0}"
+ # old Import reports (before 2.0.3)
+ SAVE: "Sauvegarde"
+ NEPTUNE_ONE: "Conformité du fichier"
+ NEPTUNE_TooMuchDetails: "( %{0} erreurs / warnings supplémentaires )"
NEPTUNE_Test1_Sheet1: 'Fiche n° 1.1 : Conformité à la syntaxe XML suivant les recommandations du W3C'
- NEPTUNE_Test1_Sheet1_Step1: Conformité à la syntaxe XML
- NEPTUNE_Test1_Sheet1_Step2: Conformité au schéma XML du profil NEPTUNE
+ NEPTUNE_Test1_Sheet1_Step1: "Conformité à la syntaxe XML"
+ NEPTUNE_Test1_Sheet1_Step2: "Conformité au schéma XML du profil NEPTUNE"
NEPTUNE_Test1_Sheet1_Step0_fatal: "Erreur fatale : Impossible d'ouvrir le fichier %{0}"
NEPTUNE_Test1_Sheet1_Step0_error: "Impossible d'importer cette entrée %{0} du zip"
NEPTUNE_Test1_Sheet1_Step0_warning: "Cette entrée %{0} du zip n'est pas un fichier xml et a été ignoré"
@@ -132,59 +214,75 @@ fr:
NEPTUNE_Test1_Sheet2_Step1_error: "le fichier %{0} ne respecte pas le modèle NEPTUNE"
NEPTUNE_Test1_Sheet2_Step1_encoding: "le fichier %{0} ne respecte pas le codage de caractères du modèle NEPTUNE (ISO-8859-1)"
NEPTUNE_Test1_Sheet2_Step1_fatal: "Erreur fatale : Aucune entrée valide trouvée dans le fichier"
- CSV_IMPORT: Import de fichier au format CSV
- CSV_OK_LINE: Ligne %{0} importée
- CSV_OK_TIMETABLE: Tableau de marche %{0} (%{1}) importé
+ CSV_IMPORT: "Import de fichier au format CSV"
+ CSV_OK_LINE: "Ligne %{0} importée"
+ CSV_OK_TIMETABLE: "Tableau de marche %{0} (%{1}) importé"
CSV_OK_PTNETWORK: "Réseau %{0} : %{1} importé"
CSV_OK_COMPANY: "Transporteur %{0} importé"
CSV_FILE_ERROR: "Fichier %{0} : erreur %{1}"
CSV_FILE_IGNORED: "Fichier %{0} ignoré (non CSV) "
CSV_VALIDATION_ERROR: "Fichier CSV ne respecte pas le format Chouette : %{0}"
- CSV_VALIDATION_CAUSE: %{0}
- CSV_PARSE_OBJECT: Analyse %{0}
+ CSV_VALIDATION_CAUSE: "%{0}"
+ CSV_PARSE_OBJECT: "Analyse %{0}"
CSV_MANDATORY_TAG: "Tag obligatoire absent ou vide : %{0}"
CSV_UNKNOWN_ENUM: "Valeur de l'enum %{0} inconnue : %{1}"
CSV_EMPTY_TAG: "Tag vide : %{0}"
CSV_TIMETABLE_COUNT: "Nombre de tableaux de marche : %{0}"
CSV_LINE_COUNT: "Nombre de lignes : %{0}"
- CSV_END_OF_FILE: Fichier tronqué
- CSV_BAD_TIMETABLE_PERIODS: Mauvaises périodes dans le tableau de marche
+ CSV_END_OF_FILE: "Fichier tronqué"
+ CSV_BAD_TIMETABLE_PERIODS: "Mauvaises périodes dans le tableau de marche"
CSV_INVALID_LINE: "ligne invalide : %{0}"
CSV_STOP_WITHOUT_COORDS: "Arret sans coordonnées : %{0}"
CSV_VJ_MISSING_TIMETABLE: "Impossible de trouver le tableau de marche de la course : %{0}"
- CSV_FILE_FORMAT: Format CSV invalide ou obsolète
+ CSV_FILE_FORMAT: "Format CSV invalide ou obsolète"
CSV_BAD_ID: "Identifiant Neptune produit invalide : %{1} pour %{0} "
CSV_UNUSED_TIMETABLE: "Tableau de marche %{0} (%{1}) inutilisé"
- SAVE: Sauvegarde
- SAVE_OK: %{0} enregistré
- SAVE_ERROR: "Echec de l'enregistrement de %{0} : %{1}"
severities:
- info: Information
- uncheck: Non testé
- ok: Ok
- warning: Alerte
- error: Erreur
- fatal: Fatal
+ info: "Information"
+ uncheck: "Non testé"
+ ok: "Ok"
+ warning: "Alerte"
+ error: "Erreur"
+ fatal: "Fatal"
activerecord:
models:
import:
- zero: import
- one: import
- other: imports
+ zero: "import"
+ one: "import"
+ other: "imports"
neptune_import:
- zero: import Neptune
- one: import Neptune
- other: imports Neptune
+ zero: "import"
+ one: "import Neptune"
+ other: "imports"
csv_import:
- zero: import CSV
- one: import CSV
- other: imports CSV
+ zero: "import"
+ one: "import CSV"
+ other: "imports"
+ gtfs_import:
+ zero: "import"
+ one: "import GTFS"
+ other: "imports"
+ netex_import:
+ zero: "import"
+ one: "import NeTEx"
+ other: "imports"
attributes:
import:
- resources: Fichier à importer
- status: Status
+ resources: "Fichier à importer"
+ status: "Status"
objectid_prefix: "Préfixe d'identifiants"
+ max_distance_for_commercial: "Distance max pour créer les zones"
+ max_distance_for_connection_link: "Distance max pour créer les correspondances"
+ ignore_last_word: "ignorer le dernier mot"
+ ignore_end_chars: "ignorer les n derniers caractères"
import_log_message:
- created_at: Date
+ created_at: "Date"
position: "No"
- full_message: Message
+ full_message: "Message"
+ formtastic:
+ hints:
+ import:
+ max_distance_for_commercial: "Distance maximale entre deux arrêts homonymes pour créer les zones d'arrêt (en mètre)"
+ max_distance_for_connection_link: "Distance maximale entre deux arrêts pour créer les correspondances (en mètre)"
+ ignore_last_word: "ignorer le dernier mot pour détecter l'homonymie des noms d'arrêt (inapplicable quand le nom ne comporte qu'un mot)"
+ ignore_end_chars: "ignorer les n derniers caractères du nom de l'arrêt pour détecter l'homonymie"
diff --git a/config/locales/journey_patterns.yml b/config/locales/journey_patterns.yml
index 301c4b7e7..120e27d1d 100644
--- a/config/locales/journey_patterns.yml
+++ b/config/locales/journey_patterns.yml
@@ -6,39 +6,39 @@ en:
vehicle_journeys_count: "Vehicle journeys: %{count}"
vehicle_journey_at_stops: "Vehicle journey at stops"
actions:
- new: Add a new journey_pattern
- edit: Edit this journey pattern
- destroy: Remove this journey pattern
- destroy_confirm: Are you sure you want destroy this journey pattern ?
+ new: "Add a new journey_pattern"
+ edit: "Edit this journey pattern"
+ destroy: "Remove this journey pattern"
+ destroy_confirm: A"re you sure you want destroy this journey pattern ?"
new:
- title: Add a new journey pattern
+ title: "Add a new journey pattern"
edit:
- title: Update journey pattern %{journey_pattern}
+ title: "Update journey pattern %{journey_pattern}"
show:
- title: Journey Pattern %{journey_pattern}
+ title: "Journey Pattern %{journey_pattern}"
stop_points: "Stop point on journey pattern list"
index:
- title: Journey Patterns
+ title: "Journey Patterns"
form:
warning: "Be careful, selection is also applied to the %{count} vehicle journeys associated to this journey pattern"
activerecord:
models:
journey_pattern:
- zero: journey pattern
- one: journey pattern
- other: journey patterns
+ zero: "journey pattern"
+ one: "journey pattern"
+ other: "journey patterns"
attributes:
journey_pattern:
- route: Route
- name: Name
- published_name: Published name
- comment: Comments
- registration_number: Registration number
+ route: "Route"
+ name: "Name"
+ published_name: "Published name"
+ comment: "Comments"
+ registration_number: "Registration number"
stop_point_ids: "Route's stop selection"
- objectid: Neptune identifier
- object_version: Version
- creation_time: Created on
- creator_id: Created by
+ objectid: "Neptune identifier"
+ object_version: "Version"
+ creation_time: "Created on"
+ creator_id: "Created by"
fr:
journey_patterns:
@@ -48,36 +48,36 @@ fr:
vehicle_journeys_count: "Courses: %{count}"
vehicle_journey_at_stops: "Horaires des courses"
actions:
- new: Ajouter une mission
- edit: Modifier cette mission
- destroy: Supprimer cette mission
+ new: "Ajouter une mission"
+ edit: "Modifier cette mission"
+ destroy: "Supprimer cette mission"
destroy_confirm: "Etes vous sûr de vouloir détruire cette mission ?"
new:
- title: Ajouter une mission
+ title: "Ajouter une mission"
edit:
- title: Modifier la mission %{journey_pattern}
+ title: "Modifier la mission %{journey_pattern}"
show:
- title: Mission %{journey_pattern}
+ title: "Mission %{journey_pattern}"
stop_points: "Liste des arrêts de la mission"
index:
- title: Missions
+ title: "Missions"
form:
warning: "Attention, la sélection s'applique aussi aux %{count} courses de la mission"
activerecord:
models:
journey_pattern:
- zero: mission
- one: mission
- other: missions
+ zero: "mission"
+ one: "mission"
+ other: "missions"
attributes:
journey_pattern:
route: "Séquence d'arrêts"
- name: Nom
- published_name: Nom public
- comment: Commentaire
+ name: "Nom"
+ published_name: "Nom public"
+ comment: "Commentaire"
registration_number: "Numéro d'enregistrement"
- stop_point_ids: Sélection des arrêts desservis
- objectid: Identifiant Neptune
- object_version: Version
- creation_time: Créé le
- creator_id: Créé par
+ stop_point_ids: "Sélection des arrêts desservis"
+ objectid: "Identifiant Neptune"
+ object_version: "Version"
+ creation_time: "Créé le"
+ creator_id: "Créé par"
diff --git a/config/locales/layouts.yml b/config/locales/layouts.yml
index 60cac8cda..6c9165bf2 100644
--- a/config/locales/layouts.yml
+++ b/config/locales/layouts.yml
@@ -1,20 +1,24 @@
en:
layouts:
back_to_dashboard: "Back to Dashboard"
- help: Help
+ help: "Help"
home: "Home"
user:
profile: "My Profile"
sign_out: "Sign out"
tabs:
dashboard: "dashboard"
+ creation_tag:
+ title: "Create"
fr:
layouts:
back_to_dashboard: "Retour au Tableau de Bord"
- help: Besoin d'aide?
+ help: "Besoin d'aide?"
home: "Accueil"
user:
profile: "Mon Profil"
sign_out: "Déconnexion"
tabs:
dashboard: "Tableau de bord"
+ creation_tag:
+ title: "Création"
diff --git a/config/locales/lines.yml b/config/locales/lines.yml
index 7e37501fb..23406fcc8 100644
--- a/config/locales/lines.yml
+++ b/config/locales/lines.yml
@@ -1,105 +1,117 @@
en:
lines:
actions:
- new: Add a new line
- edit: Edit this line
- destroy: Remove this line
- destroy_confirm: Are you sure you want destroy this line?
- import: Import lines
+ new: "Add a new line"
+ edit: "Edit this line"
+ destroy: "Remove this line"
+ destroy_confirm: "Are you sure you want destroy this line?"
+ import: "Import lines"
new:
- title: Add a new line
+ title: "Add a new line"
edit:
- title: Update line %{line}
+ title: "Update line %{line}"
show:
- title: Line %{line}
+ title: "Line %{line}"
itineraries: "Line's route list"
+ group_of_lines: "Groups of lines"
index:
- title: Lines
- name_or_number: Name or number
- selection: Filter on
- selection_all: All
- multi_selection: Multiple selection
- multi_selection_enable: Enable multiple selection
- multi_selection_disable: Disable multiple selection
- delete_selected: Delete lines
- export_selected: Export lines
- select_all: Select all
- deselect_all: Deselect all
- unset: undefined
+ title: "Lines"
+ name_or_number: "Name or number"
+ selection: "Filter on"
+ selection_all: "All"
+ multi_selection: "Multiple selection"
+ multi_selection_enable: "Enable multiple selection"
+ multi_selection_disable: "Disable multiple selection"
+ delete_selected: "Delete lines"
+ export_selected: "Export lines"
+ select_all: "Select all"
+ deselect_all: "Deselect all"
+ unset: "undefined"
+ form:
+ group_of_lines: "Associated groups of lines"
+ no_group_of_line: "No group of line"
+ several_group_of_lines: "%{count} groups of lines"
activerecord:
models:
line:
- zero: line
- one: line
- other: lines
+ zero: "line"
+ one: "line"
+ other: "lines"
attributes:
line:
- network: Network
- company: Company
- registration_number: Registration number
- name: Name
- published_name: Published name
- number: Number
- transport_mode: Transport mode
- comment: Comments
- objectid: Neptune identifier
- object_version: Version
- creation_time: Created on
- creator_id: Created by
+ network: "Network"
+ company: "Company"
+ registration_number: "Registration number"
+ name: "Name"
+ published_name: "Published name"
+ number: "Number"
+ transport_mode: "Transport mode"
+ group_of_line: "Group of lines"
+ comment: "Comments"
+ objectid: "Neptune identifier"
+ object_version: "Version"
+ creation_time: "Created on"
+ creator_id: "Created by"
formtastic:
hints:
line:
- registration_number: only alphanumerical or underscore characters
+ registration_number: "only alphanumerical or underscore characters"
objectid: "[prefix]:Line:[unique_key] : prefix contains only alphanumerical or underscore characters, unique_key accepts also minus character"
fr:
lines:
actions:
- new: Ajouter une ligne
- edit: Modifier cette ligne
- destroy: Supprimer cette ligne
- destroy_confirm: Etes vous sûr de détruire cette ligne ?
- import: Importer des lignes
+ new: "Ajouter une ligne"
+ edit: "Modifier cette ligne"
+ destroy: "Supprimer cette ligne"
+ destroy_confirm: "Etes vous sûr de détruire cette ligne ?"
+ import: "Importer des lignes"
new:
- title: Ajouter une ligne
+ title: "Ajouter une ligne"
edit:
- title: Modifier la ligne %{line}
+ title: "Modifier la ligne %{line}"
show:
- title: Ligne %{line}
+ title: "Ligne %{line}"
itineraries: "Liste des séquences d'arrêts de la ligne"
+ group_of_lines: "Groupes de lignes"
index:
- name_or_number: Nom ou indice
- title: Lignes
- selection: Filtrer sur
- selection_all: Tous
- multi_selection: Sélection multiple
- multi_selection_enable: Activer la sélection multiple
- multi_selection_disable: Désactiver la sélection multiple
- delete_selected: Supprimer les lignes
- export_selected: Exporter les lignes
- select_all: Tout sélectionner
- deselect_all: Tout désélectionner
- unset: non défini
+ name_or_number: "Nom ou indice"
+ title: "Lignes"
+ selection: "Filtrer sur"
+ selection_all: "Tous"
+ multi_selection: "Sélection multiple"
+ multi_selection_enable: "Activer la sélection multiple"
+ multi_selection_disable: "Désactiver la sélection multiple"
+ delete_selected: "Supprimer les lignes"
+ export_selected: "Exporter les lignes"
+ select_all: "Tout sélectionner"
+ deselect_all: "Tout désélectionner"
+ unset: "non défini"
+ form:
+ group_of_lines: "Groupes de lignes associés"
+ no_group_of_line: "Aucun groupe de lignes"
+ several_group_of_lines: "%{count} groupes of lignes"
activerecord:
models:
line:
- zero: ligne
- one: ligne
- other: lignes
+ zero: "ligne"
+ one: "ligne"
+ other: "lignes"
attributes:
line:
- network: Réseau
- company: Transporteur
+ network: "Réseau"
+ company: "Transporteur"
registration_number: "Numéro d'enregistrement"
- name: Nom
- published_name: Nom public
- number: Indice
- transport_mode: Mode de transport
- comment: Commentaire
- objectid: Identifiant Neptune
- object_version: Version
- creation_time: Créé le
- creator_id: Créé par
+ name: "Nom"
+ published_name: "Nom public"
+ number: "Indice"
+ transport_mode: "Mode de transport"
+ group_of_line: "Groupe de lignes"
+ comment: "Commentaire"
+ objectid: "Identifiant Neptune"
+ object_version: "Version"
+ creation_time: "Créé le"
+ creator_id: "Créé par"
formtastic:
hints:
line:
diff --git a/config/locales/networks.yml b/config/locales/networks.yml
index 3415495ca..8387730eb 100644
--- a/config/locales/networks.yml
+++ b/config/locales/networks.yml
@@ -1,9 +1,9 @@
en:
networks:
actions:
- new: Add a new network
- edit: Edit this network
- destroy: Remove this network
+ new: "Add a new network"
+ edit: "Edit this network"
+ destroy: "Remove this network"
destroy_confirm: "Are you sure you want destroy this network?"
new:
title: "Add a new network"
@@ -13,63 +13,63 @@ en:
title: "Network"
index:
title: "Networks"
- name: Name
+ name: "Name"
activerecord:
models:
network:
- zero: network
- one: network
- other: networks
+ zero: "network"
+ one: "network"
+ other: "networks"
attributes:
network:
registration_number: "Registration number"
name: "Name"
comment: "Comments"
version_date: "Date of this network's version"
- description: Description
- source_type: Source type
- source_name: Source name
- source_identifier: Source identifier
- objectid: Neptune identifier
- object_version: Version
- creation_time: Created on
- creator_id: Created by
+ description: "Description"
+ source_type: "Source type"
+ source_name: "Source name"
+ source_identifier: "Source identifier"
+ objectid: "Neptune identifier"
+ object_version: "Version"
+ creation_time: "Created on"
+ creator_id: "Created by "
formtastic:
hints:
network:
- registration_number: only alphanumerical or underscore characters
+ registration_number: "only alphanumerical or underscore characters"
objectid: "[prefix]:GroupOfLine:[unique_key] : prefix contains only alphanumerical or underscore characters, unique_key accepts also minus character"
fr:
networks:
actions:
- new: Ajouter un réseau
- edit: Modifier ce réseau
- destroy: Supprimer ce réseau
+ new: "Ajouter un réseau"
+ edit: "Modifier ce réseau"
+ destroy: "Supprimer ce réseau"
destroy_confirm: "Etes vous sûr de détruire ce réseau ?"
new:
title: "Ajouter un réseau"
edit:
- title: Modifier le réseau %{network}
+ title: "Modifier le réseau %{network}"
show:
- title: Réseau %{network}
+ title: "Réseau %{network}"
index:
title: "Réseaux"
- name: Nom
+ name: "Nom"
activerecord:
models:
network:
- zero: réseau
- one: réseau
- other: réseaux
+ zero: "réseau"
+ one: "réseau"
+ other: "réseaux"
attributes:
network:
registration_number: "Numéro d'enregistrement"
name: "Nom"
comment: "Commentaire"
- version_date: Date de version
- description: Description
+ version_date: "Date de version"
+ description: "Description"
source_type: "Type de système origine"
source_name: "Nom du système origine"
source_identifier: "Identifiant du système origine"
diff --git a/config/locales/referentials.yml b/config/locales/referentials.yml
index 2b003e3e1..7049949b9 100644
--- a/config/locales/referentials.yml
+++ b/config/locales/referentials.yml
@@ -3,66 +3,69 @@ en:
edit:
title: "Edit the data space"
show:
- lines: lines
- networks: networks
- vehicle_journeys: vehicle journeys
- time_tables: time tables
- title: Data space
- clean_up: Clean up
+ lines: "lines"
+ networks: "networks"
+ vehicle_journeys: "vehicle journeys"
+ time_tables: "time tables"
+ title: "Data space"
+ clean_up: "Clean up"
+ api_keys: "Authentification keys for an API REST access"
counts:
- objects: Data space elements
- count: count
+ objects: "Data space elements"
+ count: "count"
validity_out:
- validity_out_time_tables: Closed timetables
- validity_out_soon_time_tables: Timetables closed in %{count} days
+ validity_out_time_tables: "Closed timetables"
+ validity_out_soon_time_tables: "Timetables closed in %{count} days"
new:
- title: Create a new data space
+ title: "Create a new data space"
submit: "Create a data space"
actions:
- new: Add a data space
+ new: "Add a data space"
destroy_confirm: "Do you confirm to destroy this data space ?"
- destroy: Destroy this data space
- edit: Edit this data space
+ destroy: "Destroy this data space"
+ edit: "Edit this data space"
errors:
pg_excluded: "can't begins with pg_"
public_excluded: "public is reserved value"
activerecord:
models:
referential:
- zero: Data space
- one: Data space
- other: Data spaces
+ zero: "Data space"
+ one: "Data space"
+ other: "Data spaces"
attributes:
referential:
- name: Name
- slug: Code
- prefix: Neptune Object Id prefix
- projection_type: Optional spatial reference system code (SRID)
- time_zone: time zone
+ name: "Name"
+ slug: "Code"
+ prefix: "Neptune Object Id prefix"
+ projection_type: "Optional spatial reference system code (SRID)"
+ time_zone: "time zone"
upper_corner: "Top,Right corner for default bounding box"
lower_corner: "Bottom,Left corner for default bounding box"
- resources: Neptune Import File
- validity_period: Validity period
- no_validity_period: undefined
- start_validity_period: from
- end_validity_period: to
- networks: Networks
- lines: Lines
- vehicle_journeys: Vehicle journeys
- companies: Companies
- stop_areas: Stop Areas
- time_tables: Time tables
- connection_links: Connection links
- quays: quays
- boarding_positions: boarding positions
- commercial_stops: commercial stops
- stop_places: stop places
- itls: routing contraints
+ resources: "Neptune Import File"
+ validity_period: "Validity period"
+ no_validity_period: "undefined"
+ start_validity_period: "from"
+ end_validity_period: "to"
+ networks: "Networks"
+ group_of_lines: "Group of lines"
+ lines: "Lines"
+ vehicle_journeys: "Vehicle journeys"
+ companies: "Companies"
+ stop_areas: "Stop Areas"
+ access_points: "Access Points"
+ time_tables: "Time tables"
+ connection_links: "Connection links"
+ quays: "quays"
+ boarding_positions: "boarding positions"
+ commercial_stops: "commercial stops"
+ stop_places: "stop places"
+ itls: "routing contraints"
formtastic:
hints:
referential:
slug: "only lowercase alphanumerical or underscore characters, first character must be a letter"
- prefix: only alphanumerical or underscore characters
+ prefix: "only alphanumerical or underscore characters"
upper_corner: "longitude,latitude in WGS84 referential, dot for decimal separator"
lower_corner: "longitude,latitude in WGS84 referential, dot for decimal separator"
@@ -71,61 +74,64 @@ fr:
edit:
title: "Modifier l'espace de données"
show:
- lines: lignes
- networks: réseaux
- vehicle_journeys: courses
- time_tables: calendriers
- title: Espace de données
- clean_up: Purge des données obsolètes
+ lines: "lignes"
+ networks: "réseaux"
+ vehicle_journeys: "courses"
+ time_tables: "calendriers"
+ title: "Espace de données"
+ clean_up: "Purge des données obsolètes"
+ api_keys: "Clés d'authentification pour un accès à l'API REST"
counts:
- objects: Eléments
- count: Qté
+ objects: "Eléments"
+ count: "Qté"
validity_out:
- validity_out_time_tables: Calendriers échus
- validity_out_soon_time_tables: Calendriers à échoir dans %{count} jours
+ validity_out_time_tables: "Calendriers échus"
+ validity_out_soon_time_tables: "Calendriers à échoir dans %{count} jours"
new:
- title: Créer un nouvel espace de données
+ title: "Créer un nouvel espace de données"
submit: "Créer un espace de données"
actions:
- new: Ajouter un espace de données
+ new: "Ajouter un espace de données"
destroy_confirm: "Etes vous sûr de vouloir supprimer cet espace de données ?"
- destroy: Supprimer cet espace de données
- edit: Modifier cet espace de données
+ destroy: "Supprimer cet espace de données"
+ edit: "Modifier cet espace de données"
errors:
pg_excluded: "ne peut pas commencer par pg_ (valeurs réservées)"
public_excluded: "public est une valeur réservée"
activerecord:
models:
referential:
- zero: Espace de Données
- one: Espace de Données
- other: Espaces de Données
+ zero: "Espace de Données"
+ one: "Espace de Données"
+ other: "Espaces de Données"
attributes:
referential:
- name: Nom
- slug: Code
- prefix: Préfixe des identifiants Neptune
- projection_type: Système de référence spatiale optionnel (SRID)
- time_zone: Fuseau horaire
+ name: "Nom"
+ slug: "Code"
+ prefix: "Préfixe des identifiants Neptune"
+ projection_type: "Système de référence spatiale (SRID) optionnel"
+ time_zone: "Fuseau horaire"
upper_corner: "Point haut/droite de l'emprise par défaut"
lower_corner: "Point bas/gauche de l'emprise par défaut"
- resources: Import Neptune
- validity_period: Période de validité
- no_validity_period: non définie
- start_validity_period: du
- end_validity_period: au
- networks: Réseaux
- lines: Lignes
- vehicle_journeys: Courses
- companies: Transporteurs
- stop_areas: Arrêts
- time_tables: Calendriers
- connection_links: Correspondances
- quays: quais
+ resources: "Import Neptune"
+ validity_period: "Période de validité"
+ no_validity_period: "non définie"
+ start_validity_period: "du"
+ end_validity_period: "au"
+ networks: "Réseaux"
+ group_of_lines: "Groupes de lignes"
+ lines: "Lignes"
+ vehicle_journeys: "Courses"
+ companies: "Transporteurs"
+ stop_areas: "Arrêts"
+ access_points: "points d'accès"
+ time_tables: "Calendriers"
+ connection_links: "Correspondances"
+ quays: "quais"
boarding_positions: "points d'embarquement"
- commercial_stops: arrêts commerciaux
+ commercial_stops: "arrêts commerciaux"
stop_places: "pôles d'échange"
- itls: ITL
+ itls: "ITL"
formtastic:
hints:
referential:
diff --git a/config/locales/routes.yml b/config/locales/routes.yml
index e5d631bd2..5e6b12f9f 100644
--- a/config/locales/routes.yml
+++ b/config/locales/routes.yml
@@ -1,57 +1,57 @@
en:
routes:
actions:
- new: Add a new route
- edit: Edit this route
- destroy: Remove this route
- destroy_confirm: Are you sure you want destroy this route?
+ new: "Add a new route"
+ edit: "Edit this route"
+ destroy: "Remove this route"
+ destroy_confirm: "Are you sure you want destroy this route?"
new:
- title: Add a new route
+ title: "Add a new route"
edit:
- title: Update route %{route}
+ title: "Update route %{route}"
show:
- title: Route %{route}
+ title: "Route %{route}"
stop_points: "Stop point on route list"
journey_patterns: "Route journey patterns list"
- no_opposite_route: No reversed route associated
- undefined: Undefined
+ no_opposite_route: "No reversed route associated"
+ undefined: "Undefined"
index:
- title: Routes
- selection: Selection
- selection_all: All
+ title: "Routes"
+ selection: "Selection"
+ selection_all: "All"
route:
- no_journey_pattern: No Journey pattern
+ no_journey_pattern: "No Journey pattern"
wayback:
- positive: forward
- negative: backward
- opposite: Opposite route
- no_opposite: No opposite route
+ positive: "forward"
+ negative: "backward"
+ opposite: "Opposite route"
+ no_opposite: "No opposite route"
activerecord:
models:
route:
- zero: route
- one: route
- other: routes
+ zero: "route"
+ one: "route"
+ other: "routes"
attributes:
route:
wayback:
- positive: forward
- negative: backward
- line: Line
- vehicle_journeys: Vehicle journeys
- journey_patterns: Journey patterns
- name: Name
- published_name: Published name
- comment: Comments
- number: Number
- direction_code: Direction
- wayback_code: Wayback
- opposite_route: Reversed route
- objectid: Neptune identifier
- object_version: Version
- creation_time: Created on
- creator_id: Created by
+ positive: "forward"
+ negative: "backward"
+ line: "Line"
+ vehicle_journeys: "Vehicle journeys"
+ journey_patterns: "Journey patterns"
+ name: "Name"
+ published_name: "Published name"
+ comment: "Comments"
+ number: "Number"
+ direction_code: "Direction"
+ wayback_code: "Wayback"
+ opposite_route: "Reversed route"
+ objectid: "Neptune identifier"
+ object_version: "Version"
+ creation_time: "Created on"
+ creator_id: "Created by"
fr:
routes:
@@ -69,18 +69,18 @@ fr:
stop_points: "Liste des arrêts de la séquence d'arrêts"
journey_patterns: "Liste des missions"
no_opposite_route: "Aucune séquence d'arrêts associée en sens opposé"
- undefined: Non défini
+ undefined: "Non défini"
index:
title: "Séquences d'arrêts"
- selection: Sélection
- selection_all: Tous
+ selection: "Sélection"
+ selection_all: "Tous"
route:
- no_journey_pattern: Pas de mission
+ no_journey_pattern: "Pas de mission"
wayback:
- positive: Aller
- negative: Retour
- opposite: Séquence opposée
- no_opposite: Pas de séquence opposée
+ positive: "Aller"
+ negative: "Retour"
+ opposite: "Séquence opposée"
+ no_opposite: "Pas de séquence opposée"
activerecord:
models:
route:
@@ -90,22 +90,22 @@ fr:
attributes:
route:
wayback:
- positive: Aller
- negative: Retour
- line: Ligne
- vehicle_journeys: Courses
- journey_patterns: Missions
- name: Nom
- published_name: Nom public
- number: Indice
- comment: Commentaire
- direction_code: Direction
- wayback_code: Sens
+ positive: "Aller"
+ negative: "Retour"
+ line: "Ligne"
+ vehicle_journeys: "Courses"
+ journey_patterns: "Missions"
+ name: "Nom"
+ published_name: "Nom public"
+ number: "Indice"
+ comment: "Commentaire"
+ direction_code: "Direction"
+ wayback_code: "Sens"
opposite_route: "Séquence d'arrêts associée en sens opposé"
- objectid: Identifiant Neptune
- object_version: Version
- creation_time: Créé le
- creator_id: Créé par
- no_journey_pattern: Pas de mission
+ objectid: "Identifiant Neptune"
+ object_version: "Version"
+ creation_time: "Créé le"
+ creator_id: "Créé par"
+ no_journey_pattern: "Pas de mission"
diff --git a/config/locales/stop_areas.yml b/config/locales/stop_areas.yml
index 2d920435d..b7201b983 100644
--- a/config/locales/stop_areas.yml
+++ b/config/locales/stop_areas.yml
@@ -2,109 +2,136 @@ en:
stop_areas:
default_geometry_success: "%{count} modified stop areas"
stop_area:
- no_position: No Position
+ no_position: "No Position"
lines: "Lines :"
actions:
- new: Add a new stop
- edit: Edit this stop
- destroy: Remove this stop
- destroy_confirm: Are you sure you want destroy this stop?
- select_parent: Manage Parent
- add_children: Manage Children
+ new: "Add a new stop"
+ edit: "Edit this stop"
+ destroy: "Remove this stop"
+ destroy_confirm: "Are you sure you want destroy this stop?"
+ select_parent: "Manage Parent"
+ add_children: "Manage Children"
+ manage_access_points: "Manage Access Points"
+ manage_access_links: "Manage Access Links"
add_routing_lines: "Manage constraint's lines"
add_routing_stops: "Manage constraint's stops"
default_geometry: "Compute missing geometries"
new:
- title: Add a new stop
+ title: "Add a new stop"
edit:
- title: Update stop %{stop_area}
+ title: "Update stop %{stop_area}"
show:
- title: Stop %{stop_area}
- geographic_data: Geographic data
- no_geographic_data: None
- genealogical: Links between stop area
+ title: "Stop %{stop_area}"
+ geographic_data: "Geographic data"
+ no_geographic_data: "None"
+ itl_managment: "Routing constraint's links managment"
+ stop_managment: "Parent-Child links managment"
+ access_managment: "Access Points and Links managment"
+ access_points: "Access Points"
+ genealogical:
+ genealogical: "Links between stop area"
genealogical_routing: "Routing constraint's links"
index:
- title: Stop areas
- name_or_country_code: Name or Country code
- selection: Filter on
- selection_all: All
- area_type: Area Type
+ title: "Stop areas"
+ name_or_country_code: "Name or Country code"
+ selection: "Filter on"
+ selection_all: "All"
+ area_type: "Area Type"
+ access_links:
+ title: "Access links for %{stop_area}'s access"
+ generic_access_links: "Glogal links"
+ detail_access_links: "Specific links"
+ access_link_legend_1: "grays arrows for undefined links, green for defined ones"
+ access_link_legend_2: "clic on arrows to create/edit a link"
select_parent:
- title: Manage parent of stop area %{stop_area}
+ title: "Manage parent of stop area %{stop_area}"
add_children:
- title: Manage children of stop area %{stop_area}
+ title: "Manage children of stop area %{stop_area}"
add_lines:
- title: Manage lines of routing constraint %{stop_area}
+ title: "Manage lines of routing constraint %{stop_area}"
add_stops:
- title: Manage stop areas of routing constraint %{stop_area}
+ title: "Manage stop areas of routing constraint %{stop_area}"
activerecord:
models:
stop_area:
- zero: stop area
- one: stop area
- other: stop areas
+ zero: "stop area"
+ one: "stop area"
+ other: "stop areas"
attributes:
stop_area:
- name: Name
- registration_number: Registration number
- comment: Comments
- stop_area_type: Area type
- nearest_topic_name: Nearest point of interest
- street_name: Street name
- country_code: INSEE code
- fare_code: Fare code
- projection_type: Projection type
- x: x-position
- y: y-position
- long_lat_type: Projection type
- longitude: Longitude
- latitude: Latitude
- objectid: Neptune identifier
- object_version: Version
- creation_time: Created on
+ name: "Name"
+ registration_number: "Registration number"
+ comment: "Comments"
+ stop_area_type: "Area type"
+ nearest_topic_name: "Nearest point of interest"
+ street_name: "Street name"
+ country_code: "INSEE code"
+ fare_code: "Fare code"
+ projection_type: "Projection type"
+ x: "x-position"
+ y: "y-position"
+ long_lat_type: "Projection type"
+ longitude: "Longitude"
+ latitude: "Latitude"
+ objectid: "Neptune identifier"
+ object_version: "Version"
+ creation_time: "Created on"
creatorid: Created by
- children_ids: Children
- routing_stop_ids: Attached stops
- routing_line_ids: Attached lines
- parent: Parent
+ children_ids: "Children"
+ routing_stop_ids: "Attached stops"
+ routing_line_ids: "Attached lines"
+ parent: "Parent"
formtastic:
hints:
stop_area:
- registration_number: only alphanumerical or underscore characters
+ registration_number: "only alphanumerical or underscore characters"
objectid: "[prefix]:StopArea:[unique_key] : prefix contains only alphanumerical or underscore characters, unique_key accepts also minus character"
fr:
stop_areas:
default_geometry_success: "%{count} arrêts modifiés"
stop_area:
- no_position: Pas de position
+ no_position: "Pas de position"
lines: "Lignes :"
actions:
- new: Ajouter un arrêt
- edit: Modifier cet arrêt
- destroy: Supprimer cet arrêt
- destroy_confirm: Etes vous sûr de détruire cet arrêt ?
- select_parent: Gérer le parent
- add_children: Gérer les fils
+ new: "Ajouter un arrêt"
+ edit: "Modifier cet arrêt"
+ destroy: "Supprimer cet arrêt"
+ destroy_confirm: "Etes vous sûr de détruire cet arrêt ?"
+ select_parent: "Gérer le parent"
+ add_children: "Gérer les fils"
add_routing_lines: "Gérer les lignes de l'ITL"
add_routing_stops: "Gérer les arrêts de l'ITL"
+ manage_access_points: "Gérer les accès"
+ manage_access_links: "Gérer les liens arrêt-accès"
+ add_children: "Gérer les fils"
default_geometry: "Calculer les géométries manquantes"
new:
- title: Ajouter un arrêt
+ title: "Ajouter un arrêt"
edit:
title: "Modifier l'arrêt %{stop_area}"
show:
- title: Arrêt %{stop_area}
- geographic_data: Données géographiques
- no_geographic_data: Aucune
- genealogical: Lien entre arrêts
+ title: "Arrêt %{stop_area}"
+ geographic_data: "Données géographiques"
+ no_geographic_data: "Aucune"
+ itl_managment: "Gestion des liens de l'ITL"
+ stop_managment: "Gestion des relations père-fils"
+ access_managment: "Gestion des accès et liens associés"
+ access_points: "Points d'accès"
+ genealogical:
+ genealogical: "Lien entre arrêts"
genealogical_routing: "Liens de l'ITL"
+ access_links:
+ title: "Liens Accès-Arrêts des accès de %{stop_area}"
+ generic_access_links: "Liens globaux"
+ detail_access_links: "Liens détaillés"
+ access_link_legend_1: "Les flêches grises représentent des liens non définis"
+ access_link_legend_2: "cliquer sur les flêches pour créer/éditer un lien"
index:
- name_or_country_code: Nom ou Code Postal
- title: Arrêts
- selection: Filtrer sur
- selection_all: Tous
+ name_or_country_code: "Nom ou Code INSEE"
+ title: "Arrêts"
+ selection: "Filtrer sur"
+ selection_all: "Tous"
area_type: "Type d'arrêt"
select_parent:
title: "Gérer le parent de l'arrêt %{stop_area}"
@@ -117,34 +144,34 @@ fr:
activerecord:
models:
stop_area:
- zero: arrêt
- one: arrêt
- other: arrêts
+ zero: "arrêt"
+ one: "arrêt"
+ other: "arrêts"
attributes:
stop_area:
- name: Nom
+ name: "Nom"
registration_number: "Numéro d'enregistrement"
- published_name: Nom public
- comment: Commentaire
+ published_name: "Nom public"
+ comment: "Commentaire"
stop_area_type: "Type d'arrêt"
nearest_topic_name: "Point d'intérêt le plus proche"
- street_name: Nom de la rue
- country_code: Code INSEE
- fare_code: Zone tarifaire
- projection_type: Projection
- x: Position X
- y: Position Y
- long_lat_type: Projection
- longitude: Longitude
- latitude: Latitude
- objectid: Identifiant Neptune
- object_version: Version
- creation_time: Créé le
- creator_id: Créé par
- children_ids: Fils
+ street_name: "Nom de la rue"
+ country_code: "Code INSEE"
+ fare_code: "Zone tarifaire"
+ projection_type: "Projection"
+ x: "Position X"
+ y: "Position Y"
+ long_lat_type: "Projection"
+ longitude: "Longitude"
+ latitude: "Latitude"
+ objectid: "Identifiant Neptune"
+ object_version: "Version"
+ creation_time: "Créé le"
+ creator_id: "Créé par"
+ children_ids: "Fils"
routing_stop_ids: "Arrêts concernés par l'ITL"
routing_line_ids: "Lignes affectées par l'ITL"
- parent: Parent
+ parent: "Parent"
formtastic:
hints:
stop_area:
diff --git a/config/locales/stop_points.yml b/config/locales/stop_points.yml
index cea5debcf..2a4c90766 100644
--- a/config/locales/stop_points.yml
+++ b/config/locales/stop_points.yml
@@ -3,43 +3,43 @@ en:
reorder_success: "Stop list saved"
reorder_failure: "Fail in reordering"
actions:
- sort: Manage stops on route
- show: Show
- index: Stops on route list
- new: Add a new stop on route
- edit: Edit this stop on route
- destroy: Remove this stop on route
- destroy_confirm: Are you sure you want destroy this stop on route ?
+ sort: "Manage stops on route"
+ show: "Show"
+ index: "Stops on route list"
+ new: "Add a new stop on route"
+ edit: "Edit this stop on route"
+ destroy: "Remove this stop on route"
+ destroy_confirm: "Are you sure you want destroy this stop on route ?"
new:
- title: Add a new stop route
- select_area: Select a stop area
+ title: "Add a new stop route"
+ select_area: "Select a stop area"
index:
- reorder_button: Save reordering
- title: Stops on route %{route}
- subtitle: Stops on route ordered
- move: Move
- no_stop_point: No stop point on route
+ reorder_button: "Save reordering"
+ title: "Stops on route %{route}"
+ subtitle: "Stops on route ordered"
+ move: "Move"
+ no_stop_point: "No stop point on route"
activerecord:
models:
stop_point:
- zero: stop point on route
- one: stop point on route
- other: stop points on route
+ zero: "stop point on route"
+ one: "stop point on route"
+ other: "stop points on route"
attributes:
stop_point:
- lines: lines
+ lines: "lines"
fr:
stop_points:
reorder_success: "La list des arrêts a été mise à jour"
reorder_failure: "Echec de la mise à jour"
actions:
- sort: Gérer les arrêts de la séquence
- show: Consulter
- index: Liste des arrêts de la séquence
- new: Ajouter un arrêt à la séquence
- edit: Modifier cet arrêt de la séquence
- destroy: Supprimer cet arrêt de la séquence
- destroy_confirm: Etes vous sûr de retirer cet arrêt de la séquence ?
+ sort: "Gérer les arrêts de la séquence"
+ show: "Consulter"
+ index: "Liste des arrêts de la séquence"
+ new: "Ajouter un arrêt à la séquence"
+ edit: "Modifier cet arrêt de la séquence"
+ destroy: "Supprimer cet arrêt de la séquence"
+ destroy_confirm: "Etes vous sûr de retirer cet arrêt de la séquence ?"
new:
title: "Ajouter un arrêt à la séquence %{route}"
select_area: "Sélectionner un arrêt"
@@ -47,8 +47,8 @@ fr:
reorder_button: "Mettre à jour l'ordre"
title: "Liste ordonnée des arrêts de la séquence d'arrêts %{route}"
subtitle: "Arrêts dans l'ordre de parcours"
- move: Déplacer
- no_stop_point: Aucun arrêt dans la séquence
+ move: "Déplacer"
+ no_stop_point: "Aucun arrêt dans la séquence"
activerecord:
models:
stop_point:
@@ -57,4 +57,4 @@ fr:
other: "arrêts sur séquence d'arrêts"
attributes:
stop_point:
- lines: lignes
+ lines: "lignes"
diff --git a/config/locales/subscriptions.yml b/config/locales/subscriptions.yml
index 891a08d74..efade4c53 100644
--- a/config/locales/subscriptions.yml
+++ b/config/locales/subscriptions.yml
@@ -2,23 +2,30 @@ en:
subscriptions:
success: "Subscription saved"
failure: "Invalide subscription"
+ new:
+ title: "Create your account"
+ actions:
+ new: "Create an account"
activemodel:
attributes:
subscription:
- organisation_name: Organisation
- user_name: User full name
- subscriptions:
- new:
- title: Create your account
- actions:
- new: Create an account
+ organisation_name: "Organisation"
+ user_name: "User full name"
+ email: "Email address"
+ password: "Password"
+ password_confirmation: "Password confirmation"
+ current_password: "Actual password"
fr:
subscriptions:
success: "Inscription enregistrée"
failure: "Inscription invalide"
- activemodel:
+ new:
+ title: "Créer votre compte"
+ actions:
+ new: "Créer un compte"
+ activemodel:
models:
- subscription: compte
+ subscription: "compte"
attributes:
subscription:
organisation_name: "Organisation"
@@ -27,8 +34,3 @@ fr:
password: "Mot de passe"
password_confirmation: "Confirmation du mot de passe"
current_password: "Mot de passe actuel"
- subscriptions:
- new:
- title: Créer votre compte
- actions:
- new: Créer un compte
diff --git a/config/locales/time_table_dates.yml b/config/locales/time_table_dates.yml
deleted file mode 100644
index 7f0fc6497..000000000
--- a/config/locales/time_table_dates.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-en:
- time_table_dates:
- new:
- title: "Timetable : add a new date"
- activerecord:
- models:
- time_table_date: Date
- attributes:
- time_table_date:
- date: Calendar date
-
-fr:
- time_table_dates:
- new:
- title: "Calendrier : ajouter une date"
- activerecord:
- models:
- time_table_date: Date
- attributes:
- time_table_date:
- date: Date
diff --git a/config/locales/time_table_periods.yml b/config/locales/time_table_periods.yml
deleted file mode 100644
index 6d71cd681..000000000
--- a/config/locales/time_table_periods.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-en:
- time_table_periods:
- new:
- title: "Timetable : add a new period"
- activerecord:
- models:
- time_table_period: Period
- attributes:
- time_table_period:
- period_start: From
- period_end: To
-
-fr:
- time_table_periods:
- new:
- title: "Calendrier : ajouter une période d'application"
- activerecord:
- models:
- time_table_period: Période
- attributes:
- time_table_period:
- period_start: Du
- period_end: Au
diff --git a/config/locales/time_tables.yml b/config/locales/time_tables.yml
index d2fd44887..cc9865e56 100644
--- a/config/locales/time_tables.yml
+++ b/config/locales/time_tables.yml
@@ -1,65 +1,68 @@
en:
time_tables:
time_table:
- empty: empty
- bounding: from %{start} to %{end}
+ empty: "empty"
+ bounding: "from %{start} to %{end}"
periods_count: "periods: %{count}"
dates_count: "dates: %{count}"
periods_dates_count: "dates: %{dates_count}, periods: %{periods_count}"
actions:
- new: Add a new timetable
- edit: Edit this timetable
- destroy: Remove this timetable
- destroy_confirm: Are you sure you want destroy this timetable?
- destroy_date_confirm: Are you sure you want destroy this date ?
- destroy_period_confirm: Are you sure you want destroy this period ?
+ new: "Add a new timetable"
+ edit: "Edit this timetable"
+ destroy: "Remove this timetable"
+ destroy_confirm: "Are you sure you want destroy this timetable ?"
+ destroy_date_confirm: "Are you sure you want destroy this date ?"
+ destroy_period_confirm: "Are you sure you want destroy this period ?"
+ add_period: "Add a period"
+ add_date: "Add a date"
new:
- title: Add a new timetable
+ title: "Add a new timetable"
edit:
- title: Update timetable %{time_table}
+ title: "Update timetable %{time_table}"
show:
resume: "From %{start_date} to %{end_date} (independently of any period day types)"
resume_empty: "Empty timetable"
- title: Timetable %{time_table}
+ title: "Timetable %{time_table}"
dates: "Application dates"
periods: "Application periods"
- from: from
- to: to
- add_period: Add a period
- add_date: Add a date
+ from: "from"
+ to: "to"
+ add_period: "Add a period"
+ add_date: "Add a date"
index:
- title: Timetables
- comment: Comment
- selection: Selection
- selection_all: All
+ title: "Timetables"
+ comment: "Comment"
+ selection: "Selection"
+ selection_all: "All"
activerecord:
models:
time_table:
- zero: timetable
- one: timetable
- other: timetables
+ zero: "timetable"
+ one: "timetable"
+ other: "timetables"
attributes:
time_table:
- comment: Comment
- version: Version
- day_types: Day types
- none: none
- monday: Monday
- tuesday: Tuesday
- wednesday: Wednesday
- thursday: Thursday
- friday: Friday
- saturday: Saturday
- sunday: Sunday
- objectid: Neptune identifier
- object_version: Version
- creation_time: Created on
- creator_id: Created by
- dates: Application dates
- date: Le
- periods: Application periods
- period_start: From
- period_end: to
+ comment: "Comment"
+ version: "Version"
+ day_types: "Day types"
+ none: "none"
+ monday: "Monday"
+ tuesday: "Tuesday"
+ wednesday: "Wednesday"
+ thursday: "Thursday"
+ friday: "Friday"
+ saturday: "Saturday"
+ sunday: "Sunday"
+ objectid: "Neptune identifier"
+ object_version: "Version"
+ creation_time: "Created on"
+ creator_id: "Created by "
+ calendars: "Calendar view"
+ dates: "Application dates"
+ date: "On"
+ periods: "Application periods"
+ period_start: "From"
+ period_end: "to"
formtastic:
hints:
@@ -69,20 +72,22 @@ en:
fr:
time_tables:
time_table:
- empty: vide
- bounding: du %{start} au %{end}
+ empty: "vide"
+ bounding: "du %{start} au %{end}"
periods_count: "périodes: %{count}"
dates_count: "dates: %{count}"
periods_dates_count: "dates: %{dates_count}, périodes: %{periods_count}"
actions:
- new: Ajouter un calendrier
- edit: Modifier ce calendrier
- destroy: Supprimer ce calendrier
- destroy_confirm: Etes vous sûr de détruire ce calendrier ?
- destroy_date_confirm: Etes vous sûr de détruire cette date ?
- destroy_period_confirm: Etes vous sûr de détruire cette période ?
+ new: "Ajouter un calendrier"
+ edit: "Modifier ce calendrier"
+ destroy: "Supprimer ce calendrier"
+ destroy_confirm: "Etes vous sûr de détruire ce calendrier ?"
+ destroy_date_confirm: "Etes vous sûr de détruire cette date ?"
+ destroy_period_confirm: "Etes vous sûr de détruire cette période ?"
+ add_period: "Ajouter une période"
+ add_date: "Ajouter une date"
new:
- title: Ajouter un calendrier
+ title: "Ajouter un calendrier"
edit:
title: "Modifier le calendrier %{time_table}"
show:
@@ -91,43 +96,44 @@ fr:
title: Calendrier %{time_table}
dates: "Dates d'application"
periods: "Périodes d'application"
- from: du
- to: au
- add_period: Ajouter une période
- add_date: Ajouter une date
+ from: "du"
+ to: "au"
+ add_period: "Ajouter une période"
+ add_date: "Ajouter une date"
index:
- comment: Description
- title: calendriers
- selection: Sélection
- selection_all: Tous
+ comment: "Description"
+ title: "calendriers"
+ selection: "Sélection"
+ selection_all: "Tous"
activerecord:
models:
time_table:
- zero: calendrier
- one: calendrier
- other: calendriers
+ zero: "calendrier"
+ one: "calendrier"
+ other: "calendriers"
attributes:
time_table:
- comment: Description
- version: Version
+ comment: "Description"
+ version: "Version"
day_types: "Jours d'application"
- none: aucun
- monday: Lundi
- tuesday: Mardi
- wednesday: Mercredi
- thursday: Jeudi
- friday: Vendredi
- saturday: Samedi
- sunday: Dimanche
- objectid: Identifiant Neptune
- object_version: Version
- creation_time: Créé le
- creator_id: Créé par
+ none: "aucun"
+ monday: "Lundi"
+ tuesday: "Mardi"
+ wednesday: "Mercredi"
+ thursday: "Jeudi"
+ friday: "Vendredi"
+ saturday: "Samedi"
+ sunday: "Dimanche"
+ objectid: "Identifiant Neptune"
+ object_version: "Version"
+ creation_time: "Créé le"
+ creator_id: "Créé par"
+ calendars: "Présentation calendaire"
dates: "Dates d'application"
- date: Date
+ date: "Date"
periods: "Périodes d'application"
- period_start: Du
- period_end: au
+ period_start: "Du"
+ period_end: "au"
formtastic:
hints:
diff --git a/config/locales/transport_modes.yml b/config/locales/transport_modes.yml
index 49d60f5de..3c89e4524 100644
--- a/config/locales/transport_modes.yml
+++ b/config/locales/transport_modes.yml
@@ -1,47 +1,47 @@
en:
transport_modes:
label:
- unknown: unknown
- air: Air
- train: Train
- long_distance_train: Long distance train
- local_train: Local train
- rapid_transit: Rapid transit
- metro: Metro
- tramway: Tramway
- coach: Coach
- bus: Bus
- ferry: Ferry
- waterborne: Waterborne
- private_vehicle: Private vehicle
- walk: Walk
- trolley_bus: Trolleybus
- bicycle: Bicycle
- shuttle: Shuttle
- taxi: Taxi
- val: VAL
- other: Other
+ unknown: "unknown"
+ air: "Air"
+ train: "Train"
+ long_distance_train: "Long distance train"
+ local_train: "Local train"
+ rapid_transit: "Rapid transit"
+ metro: "Metro"
+ tramway: "Tramway"
+ coach: "Coach"
+ bus: "Bus"
+ ferry: "Ferry"
+ waterborne: "Waterborne"
+ private_vehicle: "Private vehicle"
+ walk: "Walk"
+ trolley_bus: "Trolleybus"
+ bicycle: "Bicycle"
+ shuttle: "Shuttle"
+ taxi: "Taxi"
+ val: "VAL"
+ other: "Other"
fr:
transport_modes:
label:
- unknown: Inconnu
- air: Air
- train: Train
- long_distance_train: Train Grande Ligne
- local_train: TER
- rapid_transit: RER
- metro: Métro
- tramway: Tramway
- coach: Autocar
- bus: Bus
- ferry: Ferry
- waterborne: Bac
- private_vehicle: Voiture particulière
- walk: Marche à pied
- trolley_bus: Trolleybus
- bicycle: Vélo
- shuttle: Navette
- taxi: Taxi
- val: VAL
- other: Autre
+ unknown: "Inconnu"
+ air: "Air"
+ train: "Train"
+ long_distance_train: "Train Grande Ligne"
+ local_train: "TER"
+ rapid_transit: "RER"
+ metro: "Métro"
+ tramway: "Tramway"
+ coach: "Autocar"
+ bus: "Bus"
+ ferry: "Ferry"
+ waterborne: "Bac"
+ private_vehicle: "Voiture particulière"
+ walk: "Marche à pied"
+ trolley_bus: "Trolleybus"
+ bicycle: "Vélo"
+ shuttle: "Navette"
+ taxi: "Taxi"
+ val: "VAL"
+ other: "Autre"
diff --git a/config/locales/users.yml b/config/locales/users.yml
index 075c23851..7de65d406 100644
--- a/config/locales/users.yml
+++ b/config/locales/users.yml
@@ -1,43 +1,43 @@
en:
users:
actions:
- new: Add a new user
- edit: Edit this user
- destroy: Remove this user
- destroy_confirm: Are you sure you want destroy this user?
+ new: "Add a new user"
+ edit: "Edit this user"
+ destroy: "Remove this user"
+ destroy_confirm: "Are you sure you want destroy this user?"
new:
- title: Add a new user
+ title: "Add a new user"
edit:
- title: Update user %{user}
+ title: "Update user %{user}"
show:
- title: User %{user}
+ title: "User %{user}"
index:
- title: Users
+ title: "Users"
activerecord:
models:
- user: user
+ user: "user"
attributes:
user:
- name: Full name
+ name: "Full name"
fr:
users:
actions:
- new: Ajouter un utilisateur
- edit: Modifier cet utilisateur
- destroy: Supprimer cet utilisateur
- destroy_confirm: Etes vous sûr de détruire cet utilisateur ?
+ new: "Ajouter un utilisateur"
+ edit: "Modifier cet utilisateur"
+ destroy: "Supprimer cet utilisateur"
+ destroy_confirm: "Etes vous sûr de détruire cet utilisateur ?"
new:
- title: Ajouter un utilisateur
+ title: "Ajouter un utilisateur"
edit:
title: "Modifier l'utilisateur %{user}"
show:
- title: Utilisateur %{user}
+ title: "Utilisateur %{user}"
index:
- title: Utilisateurs
+ title: "Utilisateurs"
activerecord:
models:
- user: utilisateur
+ user: "utilisateur"
attributes:
user:
- name: Nom complet
+ name: "Nom complet"
diff --git a/config/locales/vehicle_journeys.yml b/config/locales/vehicle_journeys.yml
index 4c643134b..70e1d043f 100644
--- a/config/locales/vehicle_journeys.yml
+++ b/config/locales/vehicle_journeys.yml
@@ -1,74 +1,75 @@
en:
vehicle_journeys:
vehicle_journey:
- title_stopless: Vehicle journey %{name}
- title: Vehicle journey %{name} leaving from %{stop} at %{time}
+ title_stopless: "Vehicle journey %{name}"
+ title: "Vehicle journey %{name} leaving from %{stop} at %{time}"
actions:
index: "Vehicle time's board"
- new: Add a new vehicle journey
- edit: Edit this vehicle journey
- destroy: Remove this vehicle journey
- destroy_confirm: Are you sure you want destroy this vehicle journey?
+ new: "Add a new vehicle journey"
+ edit: "Edit this vehicle journey"
+ destroy: "Remove this vehicle journey"
+ destroy_confirm: "Are you sure you want destroy this vehicle journey?"
new:
- title: Add a new vehicle journey
+ title: "Add a new vehicle journey"
edit:
- title_stopless: Update vehicle journey %{name}
- title: Update vehicle journey %{name} leaving from %{stop} at %{time}
+ title_stopless: "Update vehicle journey %{name}"
+ title: "Update vehicle journey %{name} leaving from %{stop} at %{time}"
form:
- stop_title: Stop
- departure: Departure
- arrival: Arrival
- to_arrivals: Copy departures to arrivals
- to_departures: Copy arrivals to departures
- time_tables: Associated calendars to vehicle journey
+ stop_title: "Stop"
+ departure: "Departure"
+ arrival: "Arrival"
+ to_arrivals: "Copy departures to arrivals"
+ to_departures: "Copy arrivals to departures"
+ time_tables: "Associated calendars to vehicle journey"
timeless:
- title: Timeless vehicle journeys
- vehicle_journeys: Vehicle journeys with times at stop
- vehicles_list: Vehicles list
+ title: "Timeless vehicle journeys"
+ vehicle_journeys: "Vehicle journeys with times at stop"
+ vehicles_list: "Vehicle journeys list"
show:
- title: Vehicle Journey %{vehicle journey}
- stop_title: Stop
- departure: Departure
- arrival: Arrival
- time_tables: Calendars list
- bounding: From %{start} to %{end}
- validation: Clone
- translation_form: Vehicle journey translations
+ title: "Vehicle Journey %{vehicle journey}"
+ stop_title: "Stop"
+ departure: "Departure"
+ arrival: "Arrival"
+ time_tables: "Calendars list"
+ bounding: "From %{start} to %{end}"
+ validation: "Clone"
+ translation_form: "Vehicle journey translations"
index:
- title: Vehicle journeys on route %{route}
+ title: "Vehicle journeys on route %{route}"
vehicle_journeys: "Departure's times"
- selection: Filter on
- selection_all: All
- time_range: Departure time threshold
+ title: "Timeless vehicle journeys"
+ selection: "Filter on"
+ selection_all: "All"
+ time_range: "Departure time threshold"
time_filter:
- time_range_filter: Filter
+ time_range_filter: "Filter"
activerecord:
models:
vehicle_journey:
- zero: vehicle journey
- one: vehicle journey
- other: vehicle journeys
+ zero: "vehicle journey"
+ one: "vehicle journey"
+ other: "vehicle journeys"
attributes:
vehicle_journey:
- line: Line
- route: Route
- journey_pattern: Journey Pattern
- time_tables: Calendars
- time_slot: Time Slot
- company: Company
- comment: Comments
- status_value: Status Value
- transport_mode: Transport Mode
- published_journey_name: Published Name
- published_journey_identifier: Published Identifier
- facility: Facility
- vehicletypeidentifier: Vehicle Type Identifier
- time_table_ids: Calendar list
- vehicle_journey_at_stop_ids: Time list
- objectid: Neptune identifier
- object_version: Version
- creation_time: Created on
- creator_id: Created by
+ line: "Line"
+ route: "Route"
+ journey_pattern: "Journey Pattern"
+ time_tables: "Calendars"
+ time_slot: "Time Slot"
+ company: "Company"
+ comment: "Comments"
+ status_value: "Status Value"
+ transport_mode: "Transport Mode"
+ published_journey_name: "Published Name"
+ published_journey_identifier: "Published Identifier"
+ facility: "Facility"
+ vehicletypeidentifier: "Vehicle Type Identifier"
+ time_table_ids: "Calendar list"
+ vehicle_journey_at_stop_ids: "Time list"
+ objectid: "Neptune identifier"
+ object_version: "Version"
+ creation_time: "Created on"
+ creator_id: "Created by"
errors:
models:
vehicle_journey:
@@ -77,8 +78,8 @@ en:
fr:
vehicle_journeys:
vehicle_journey:
- title_stopless: Course %{name}
- title: Course %{name} partant de %{stop} à %{time}
+ title_stopless: "Course %{name}"
+ title: "Course %{name} partant de %{stop} à %{time}"
actions:
index: "Horaires des courses"
new: "Ajouter une course"
@@ -91,34 +92,34 @@ fr:
title_stopless: "Modifier la course %{name}"
title: "Modifier la course partant de %{stop} à %{time}"
form:
- stop_title: Arrêt
- departure: Départ
- arrival: Arrivée
- to_arrivals: Copie départs vers arrivées
- to_departures: Copie arrivées vers départs
- time_tables: Calendriers associés à la course
+ stop_title: "Arrêt"
+ departure: "Départ"
+ arrival: "Arrivée"
+ to_arrivals: "Copie départs vers arrivées"
+ to_departures: "Copie arrivées vers départs"
+ time_tables: "Calendriers associés à la course"
timeless:
- title: Courses sans horaire
- vehicle_journeys: Courses ayant des horaires
- vehicles_list: Liste des courses
+ title: "Courses sans horaire"
+ vehicle_journeys: "Courses ayant des horaires"
+ vehicles_list: "Liste des courses"
show:
title: "Course au départ de %{stop} à %{time} sur la séquence %{route}"
- stop_title: Arrêt
- departure: Départ
- arrival: Arrivée
- time_tables: Liste des calendriers
- bounding: De %{start} à %{end}
- validation: Cloner
- translation_form: Cloner la course
+ stop_title: "Arrêt"
+ departure: "Départ"
+ arrival: "Arrivée"
+ time_tables: "Liste des calendriers"
+ bounding: "De %{start} à %{end}"
+ validation: "Cloner"
+ translation_form: "Cloner la course"
index:
title: "Courses de la séquence d'arrêts %{route}"
- timeless: Courses sans horaire
+ timeless: "Courses sans horaire"
vehicle_journeys: "Horaires de départ aux arrêts"
- selection: Filtrer sur
- selection_all: Tous
- time_range: Seuil horaire au départ
+ selection: "Filtrer sur"
+ selection_all: "Tous"
+ time_range: "Seuil horaire au départ"
time_filter:
- time_range_filter: Filtrer
+ time_range_filter: "Filtrer"
activerecord:
models:
vehicle_journey:
@@ -127,25 +128,25 @@ fr:
other: "Courses"
attributes:
vehicle_journey:
- line: Ligne
+ line: "Ligne"
route: "Séquence d'arrêt"
- journey_pattern: Mission
- time_tables: Calendriers
- time_slot: Fréquence
- company: Transporteur
- comment: Commentaires
- status_value: Etat de trafic
- transport_mode: Mode de transport
- published_journey_name: Nom public
- published_journey_identifier: Identifiant public
- facility: Equipement
+ journey_pattern: "Mission"
+ time_tables: "Calendriers"
+ time_slot: "Fréquence"
+ company: "Transporteur"
+ comment: "Commentaires"
+ status_value: "Etat de trafic"
+ transport_mode: "Mode de transport"
+ published_journey_name: "Nom public"
+ published_journey_identifier: "Identifiant public"
+ facility: "Equipement"
vehicle_type_identifier: "Type d'identifiant du véhicule"
time_table_ids: "Liste des calendriers"
- vehicle_journey_at_stop_ids: Liste des horaires
- objectid: Identifiant Neptune
- object_version: Version
- creation_time: Créé le
- creator_id: Créé par
+ vehicle_journey_at_stop_ids: "Liste des horaires"
+ objectid: "Identifiant Neptune"
+ object_version: "Version"
+ creation_time: "Créé le"
+ creator_id: "Créé par"
errors:
models:
vehicle_journey:
diff --git a/config/locales/vehicle_translations.yml b/config/locales/vehicle_translations.yml
index f945cc81c..3d1e0b702 100644
--- a/config/locales/vehicle_translations.yml
+++ b/config/locales/vehicle_translations.yml
@@ -5,8 +5,8 @@ en:
activemodel:
attributes:
vehicle_translation:
- duration: Duration
- count: Count
+ duration: "Duration"
+ count: "Count"
fr:
vehicle_translations:
success: "%{count} course(s) crée(s) par translation"
diff --git a/config/locales/waybacks.yml b/config/locales/waybacks.yml
index 6891b844d..c3bf8cc3d 100644
--- a/config/locales/waybacks.yml
+++ b/config/locales/waybacks.yml
@@ -1,11 +1,11 @@
en:
waybacks:
label:
- straight_forward: straight forward
- backward: backward
+ straight_forward: "straight forward"
+ backward: "backward"
fr:
waybacks:
label:
- straight_forward: aller
- backward: retour
+ straight_forward: "aller"
+ backward: "retour"
diff --git a/config/locales/will_paginate.yml b/config/locales/will_paginate.yml
index a44d740c0..e666fce92 100644
--- a/config/locales/will_paginate.yml
+++ b/config/locales/will_paginate.yml
@@ -5,8 +5,8 @@ en:
page_gap: "&hellip;"
page_entries_info:
- search: Search
- list: Paginated list
+ search: "Search"
+ list: "Paginated list"
single_page:
zero: "No item found"
one: "1 %{model} shown"
@@ -26,8 +26,8 @@ fr:
page_gap: "&hellip;"
page_entries_info:
- search: Recherche
- list: Liste paginée
+ search: "Recherche"
+ list: "Liste paginée"
single_page:
zero: "Aucun élément trouvé"
one: "1 %{model} affiché(e)"
diff --git a/config/routes.rb b/config/routes.rb
index 6f51978a3..238217099 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,7 +1,34 @@
ChouetteIhm::Application.routes.draw do
- devise_for :users do
+
+ devise_scope :users do
match "/users/sign_up" => "subscriptions#new"
end
+ devise_for :users
+
+ namespace :api do
+ namespace :v1 do
+ resources :time_tables, :only => [:index, :show]
+ resources :connection_links, :only => [:index, :show]
+ resources :companies, :only => [:index, :show]
+ resources :networks, :only => [:index, :show]
+ resources :stop_areas, :only => [:index, :show]
+ resources :group_of_lines, :only => [:index, :show]
+ resources :access_points, :only => [:index, :show]
+ resources :access_links, :only => [:index, :show]
+ resources :lines, :only => [:index, :show] do
+ resources :journey_patterns, :only => [:index, :show]
+ resources :routes, :only => [:index, :show] do
+ resources :vehicle_journeys, :only => [:index, :show]
+ resources :journey_patterns, :only => [:index, :show]
+ resources :stop_areas, :only => [:index, :show]
+ end
+ end
+ resources :routes, :only => :show
+ resources :journey_patterns, :only => :show
+ resources :vehicle_journeys, :only => :show
+ end
+ end
+
resource :subscription
@@ -12,10 +39,38 @@ ChouetteIhm::Application.routes.draw do
resources :file_validations
resources :referentials do
+ resources :api_keys
resources :stop_point_areas
match 'lines' => 'lines#destroy_all', :via => :delete
- resources :lines, :networks do
+ resources :group_of_lines do
+ resources :stop_areas do
+ resources :access_points
+ resources :stop_area_parents
+ resources :stop_area_children
+ resources :stop_area_routing_lines
+ resources :stop_area_routing_stops
+ member do
+ get 'add_children'
+ get 'select_parent'
+ get 'add_routing_lines'
+ get 'add_routing_stops'
+ end
+ end
+ resources :lines
+ collection do
+ get :name_filter
+ end
+ end
+
+ resources :lines do
+ collection do
+ get :name_filter
+ end
+ end
+
+ resources :lines, :networks, :group_of_lines do
resources :stop_areas do
+ resources :access_points
resources :stop_area_parents
resources :stop_area_children
resources :stop_area_routing_lines
@@ -63,7 +118,12 @@ ChouetteIhm::Application.routes.draw do
resources :time_table_periods
end
+ resources :access_points do
+ resources :access_links
+ end
+
resources :stop_areas do
+ resources :access_points
resources :stop_area_parents
resources :stop_area_children
resources :stop_area_routing_lines
@@ -73,6 +133,7 @@ ChouetteIhm::Application.routes.draw do
get 'select_parent'
get 'add_routing_lines'
get 'add_routing_stops'
+ get 'access_links'
end
collection do
put 'default_geometry'
@@ -85,6 +146,7 @@ ChouetteIhm::Application.routes.draw do
get 'select_areas'
end
resources :stop_areas do
+ resources :access_points
resources :stop_area_parents
resources :stop_area_children
resources :stop_area_routing_lines
@@ -105,5 +167,9 @@ ChouetteIhm::Application.routes.draw do
match '/help/(*slug)' => 'help#show'
match '/test_sheet/(*slug)' => 'test_sheet#show'
+ match '/404', :to => 'errors#not_found'
+ match '/422', :to => 'errors#server_error'
+ match '/500', :to => 'errors#server_error'
+
root :to => 'referentials#index'
end
diff --git a/db/migrate/20120926144618_add_id_to_time_table_date.ninoxe_engine.rb b/db/migrate/20120926144618_add_id_to_time_table_date.ninoxe_engine.rb
new file mode 100644
index 000000000..35f1d8a2f
--- /dev/null
+++ b/db/migrate/20120926144618_add_id_to_time_table_date.ninoxe_engine.rb
@@ -0,0 +1,13 @@
+# This migration comes from ninoxe_engine (originally 20120926141405)
+class AddIdToTimeTableDate < ActiveRecord::Migration
+ def change
+ # active record can't add primary key after table creation
+ # must do SQL direct command
+ execute <<-SQL
+ ALTER TABLE time_table_dates ADD COLUMN id bigserial
+ SQL
+ execute <<-SQL
+ ALTER TABLE time_table_dates ADD CONSTRAINT time_table_dates_pkey PRIMARY KEY (id)
+ SQL
+ end
+end
diff --git a/db/migrate/20120926144619_add_id_to_time_table_period.ninoxe_engine.rb b/db/migrate/20120926144619_add_id_to_time_table_period.ninoxe_engine.rb
new file mode 100644
index 000000000..0211d49ac
--- /dev/null
+++ b/db/migrate/20120926144619_add_id_to_time_table_period.ninoxe_engine.rb
@@ -0,0 +1,13 @@
+# This migration comes from ninoxe_engine (originally 20120926141415)
+class AddIdToTimeTablePeriod < ActiveRecord::Migration
+ def change
+ # active record can't add primary key after table creation
+ # must do SQL direct command
+ execute <<-SQL
+ ALTER TABLE time_table_periods ADD COLUMN id bigserial
+ SQL
+ execute <<-SQL
+ ALTER TABLE time_table_periods ADD CONSTRAINT time_table_periods_pkey PRIMARY KEY (id)
+ SQL
+ end
+end
diff --git a/db/migrate/20121025112852_add_fields_to_access_points.ninoxe_engine.rb b/db/migrate/20121025112852_add_fields_to_access_points.ninoxe_engine.rb
new file mode 100644
index 000000000..ac692647d
--- /dev/null
+++ b/db/migrate/20121025112852_add_fields_to_access_points.ninoxe_engine.rb
@@ -0,0 +1,13 @@
+# This migration comes from ninoxe_engine (originally 20121024072219)
+class AddFieldsToAccessPoints < ActiveRecord::Migration
+ def change
+ remove_column "access_points", "mobility_restricted_suitability"
+ remove_column "access_points", "stairs_availability"
+ add_column "access_points", "mobility_restricted_suitability", "boolean"
+ add_column "access_points", "stairs_availability", "boolean"
+ rename_column "access_points", "type","access_type"
+ change_column "access_points", "openning_time","time"
+ change_column "access_points", "closing_time","time"
+ add_column "access_points", "stop_area_id", "integer", {:limit => 8}
+ end
+end
diff --git a/db/migrate/20121211085620_create_api_key.rb b/db/migrate/20121211085620_create_api_key.rb
new file mode 100644
index 000000000..6fa225876
--- /dev/null
+++ b/db/migrate/20121211085620_create_api_key.rb
@@ -0,0 +1,14 @@
+class CreateApiKey < ActiveRecord::Migration
+ def up
+ create_table :api_keys do |a|
+ a.belongs_to :referential
+ a.string :token
+ a.string :name
+ a.timestamps
+ end
+ end
+
+ def down
+ drop_table :api_keys
+ end
+end
diff --git a/db/migrate/20130207123618_add_foreign_keys.ninoxe_engine.rb b/db/migrate/20130207123618_add_foreign_keys.ninoxe_engine.rb
new file mode 100644
index 000000000..cab9d13f0
--- /dev/null
+++ b/db/migrate/20130207123618_add_foreign_keys.ninoxe_engine.rb
@@ -0,0 +1,278 @@
+# This migration comes from ninoxe_engine (originally 20130204141720)
+require "forwardable"
+
+class AddForeignKeys < ActiveRecord::Migration
+ def up
+ # t.remove_foreign_key does not works if foreign key doesn't exists so check before if keys already exists
+ change_table :access_links do |t|
+ if @connection.foreign_keys(:access_links).any?
+ @connection.foreign_keys(:access_links).map do |f|
+ name = f.options[:name]
+ if (name == "aclk_acpt_fkey" || name == "aclk_area_fkey" )
+ remove_foreign_key :access_links, :name => name
+ end
+ end
+ end
+ t.foreign_key :access_points, :dependent => :delete, :name => 'aclk_acpt_fkey'
+ t.foreign_key :stop_areas, :dependent => :delete, :name => 'aclk_area_fkey'
+ end
+ change_table :access_points do |t|
+ if @connection.foreign_keys(:access_points).any?
+ @connection.foreign_keys(:access_points).map do |f|
+ name = f.options[:name]
+ if (name == "access_area_fkey" )
+ remove_foreign_key :access_points, :name => name
+ end
+ end
+ end
+ t.foreign_key :stop_areas, :dependent => :delete, :name => 'access_area_fkey'
+ end
+ change_table :connection_links do |t|
+ if @connection.foreign_keys(:connection_links).any?
+ @connection.foreign_keys(:connection_links).map do |f|
+ name = f.options[:name]
+ if (name == "colk_endarea_fkey" || name == "colk_startarea_fkey" )
+ remove_foreign_key :connection_links, :name => name
+ end
+ end
+ end
+ t.foreign_key :stop_areas, :dependent => :delete, :column => 'arrival_id', :name => 'colk_endarea_fkey'
+ t.foreign_key :stop_areas, :dependent => :delete, :column => 'departure_id', :name => 'colk_startarea_fkey'
+ end
+ change_table :group_of_lines_lines do |t|
+ if @connection.foreign_keys(:group_of_lines_lines).any?
+ @connection.foreign_keys(:group_of_lines_lines).map do |f|
+ name = f.options[:name]
+ if (name == "groupofline_group_fkey" || name == "groupofline_line_fkey" )
+ remove_foreign_key :group_of_lines_lines, :name => name
+ end
+ end
+ end
+ t.foreign_key :group_of_lines, :dependent => :delete, :name => 'groupofline_group_fkey'
+ t.foreign_key :lines, :dependent => :delete, :name => 'groupofline_line_fkey'
+ end
+ change_table :journey_patterns do |t|
+ if @connection.foreign_keys(:journey_patterns).any?
+ @connection.foreign_keys(:journey_patterns).map do |f|
+ name = f.options[:name]
+ if (name == "arrival_point_fkey" || name == "departure_point_fkey" || name == "jp_route_fkey")
+ remove_foreign_key :journey_patterns, :name => name
+ end
+ end
+ end
+ t.foreign_key :stop_points, :dependent => :nullify, :column => 'arrival_stop_point_id', :name => 'arrival_point_fkey'
+ t.foreign_key :stop_points, :dependent => :nullify, :column => 'departure_stop_point_id', :name => 'departure_point_fkey'
+ t.foreign_key :routes, :dependent => :delete, :name => 'jp_route_fkey'
+ end
+ change_table :journey_patterns_stop_points do |t|
+ if @connection.foreign_keys(:journey_patterns_stop_points).any?
+ @connection.foreign_keys(:journey_patterns_stop_points).map do |f|
+ name = f.options[:name]
+ if (name == "jpsp_jp_fkey" || name == "jpsp_stoppoint_fkey" )
+ remove_foreign_key :journey_patterns_stop_points, :name => name
+ end
+ end
+ end
+ t.foreign_key :journey_patterns, :dependent => :delete, :name => 'jpsp_jp_fkey'
+ t.foreign_key :stop_points, :dependent => :delete, :name => 'jpsp_stoppoint_fkey'
+ end
+ change_table :lines do |t|
+ if @connection.foreign_keys(:lines).any?
+ @connection.foreign_keys(:lines).map do |f|
+ name = f.options[:name]
+ if (name == "line_company_fkey" || name == "line_ptnetwork_fkey" )
+ remove_foreign_key :lines, :name => name
+ end
+ end
+ end
+ t.foreign_key :companies, :dependent => :nullify, :name => 'line_company_fkey'
+ t.foreign_key :networks, :dependent => :nullify, :name => 'line_ptnetwork_fkey'
+ end
+ change_table :routes do |t|
+ if @connection.foreign_keys(:routes).any?
+ @connection.foreign_keys(:routes).map do |f|
+ name = f.options[:name]
+ if (name == "route_line_fkey" )
+ remove_foreign_key :routes, :name => name
+ end
+ end
+ end
+ t.foreign_key :lines, :dependent => :delete, :name => 'route_line_fkey'
+ end
+ change_table :routing_constraints_lines do |t|
+ if @connection.foreign_keys(:routing_constraints_lines).any?
+ @connection.foreign_keys(:routing_constraints_lines).map do |f|
+ name = f.options[:name]
+ if (name == "routingconstraint_line_fkey" || name == "routingconstraint_stoparea_fkey" )
+ remove_foreign_key :routing_constraints_lines, :name => name
+ end
+ end
+ end
+ t.foreign_key :lines, :dependent => :delete, :name => 'routingconstraint_line_fkey'
+ t.foreign_key :stop_areas, :dependent => :delete, :name => 'routingconstraint_stoparea_fkey'
+ end
+ change_table :stop_areas do |t|
+ if @connection.foreign_keys(:stop_areas).any?
+ @connection.foreign_keys(:stop_areas).map do |f|
+ name = f.options[:name]
+ if (name == "area_parent_fkey" )
+ remove_foreign_key :stop_areas, :name => name
+ end
+ end
+ end
+ t.foreign_key :stop_areas, :dependent => :nullify, :column => 'parent_id', :name => 'area_parent_fkey'
+ end
+ change_table :stop_areas_stop_areas do |t|
+ if @connection.foreign_keys(:stop_areas_stop_areas).any?
+ @connection.foreign_keys(:stop_areas_stop_areas).map do |f|
+ name = f.options[:name]
+ if (name == "stoparea_child_fkey" || name == "stoparea_parent_fkey" )
+ remove_foreign_key :stop_areas_stop_areas, :name => name
+ end
+ end
+ end
+ t.foreign_key :stop_areas, :dependent => :delete, :column => 'child_id', :name => 'stoparea_child_fkey'
+ t.foreign_key :stop_areas, :dependent => :delete, :column => 'parent_id', :name => 'stoparea_parent_fkey'
+ end
+ change_table :stop_points do |t|
+ if @connection.foreign_keys(:stop_points).any?
+ @connection.foreign_keys(:stop_points).map do |f|
+ name = f.options[:name]
+ if (name == "stoppoint_area_fkey" || name == "stoppoint_route_fkey" )
+ remove_foreign_key :stop_points, :name => name
+ end
+ end
+ end
+ t.foreign_key :stop_areas, :name => 'stoppoint_area_fkey'
+ t.foreign_key :routes, :dependent => :delete, :name => 'stoppoint_route_fkey'
+ end
+ change_table :time_table_dates do |t|
+ if @connection.foreign_keys(:time_table_dates).any?
+ @connection.foreign_keys(:time_table_dates).map do |f|
+ name = f.options[:name]
+ if (name == "tm_date_fkey" )
+ remove_foreign_key :time_table_dates, :name => name
+ end
+ end
+ end
+ t.foreign_key :time_tables, :dependent => :delete, :name => 'tm_date_fkey'
+ end
+ change_table :time_table_periods do |t|
+ if @connection.foreign_keys(:time_table_periods).any?
+ @connection.foreign_keys(:time_table_periods).map do |f|
+ name = f.options[:name]
+ if (name == "tm_period_fkey" )
+ remove_foreign_key :time_table_periods, :name => name
+ end
+ end
+ end
+ t.foreign_key :time_tables, :dependent => :delete, :name => 'tm_period_fkey'
+ end
+ change_table :time_tables_vehicle_journeys do |t|
+ if @connection.foreign_keys(:time_tables_vehicle_journeys).any?
+ @connection.foreign_keys(:time_tables_vehicle_journeys).map do |f|
+ name = f.options[:name]
+ if (name == "vjtm_tm_fkey" || name == "vjtm_vj_fkey" )
+ remove_foreign_key :time_tables_vehicle_journeys, :name => name
+ end
+ end
+ end
+ t.foreign_key :time_tables, :dependent => :delete, :name => 'vjtm_tm_fkey'
+ t.foreign_key :vehicle_journeys, :dependent => :delete, :name => 'vjtm_vj_fkey'
+ end
+ change_table :vehicle_journey_at_stops do |t|
+ if @connection.foreign_keys(:vehicle_journey_at_stops).any?
+ @connection.foreign_keys(:vehicle_journey_at_stops).map do |f|
+ name = f.options[:name]
+ if (name == "vjas_sp_fkey" || name == "vjas_vj_fkey" )
+ remove_foreign_key :vehicle_journey_at_stops, :name => name
+ end
+ end
+ end
+ t.foreign_key :stop_points, :dependent => :delete, :name => 'vjas_sp_fkey'
+ t.foreign_key :vehicle_journeys, :dependent => :delete, :name => 'vjas_vj_fkey'
+ end
+ change_table :vehicle_journeys do |t|
+ if @connection.foreign_keys(:vehicle_journeys).any?
+ @connection.foreign_keys(:vehicle_journeys).map do |f|
+ name = f.options[:name]
+ if (name == "vj_company_fkey" || name == "vj_jp_fkey" || name == "vj_route_fkey")
+ remove_foreign_key :vehicle_journeys, :name => name
+ end
+ end
+ end
+ t.foreign_key :companies, :dependent => :nullify, :name => 'vj_company_fkey'
+ t.foreign_key :journey_patterns, :dependent => :delete, :name => 'vj_jp_fkey'
+ t.foreign_key :routes, :dependent => :delete, :name => 'vj_route_fkey'
+ end
+
+ end
+
+ def down
+ change_table :access_links do |t|
+ t.remove_foreign_key :name => :aclk_acpt_fkey
+ t.remove_foreign_key :name => :aclk_area_fkey
+ end
+ change_table :access_points do |t|
+ t.remove_foreign_key :name => :access_area_fkey
+ end
+ change_table :connection_links do |t|
+ t.remove_foreign_key :name => :colk_endarea_fkey
+ t.remove_foreign_key :name => :colk_startarea_fkey
+ end
+ change_table :group_of_lines_lines do |t|
+ t.remove_foreign_key :name => :groupofline_group_fkey
+ t.remove_foreign_key :name => :groupofline_line_fkey
+ end
+ change_table :journey_patterns do |t|
+ t.remove_foreign_key :name => :arrival_point_fkey
+ t.remove_foreign_key :name => :departure_point_fkey
+ t.remove_foreign_key :name => :jp_route_fkey
+ end
+ change_table :journey_patterns_stop_points do |t|
+ t.remove_foreign_key :name => :jpsp_jp_fkey
+ t.remove_foreign_key :name => :jpsp_stoppoint_fkey
+ end
+ change_table :lines do |t|
+ t.remove_foreign_key :name => :line_company_fkey
+ t.remove_foreign_key :name => :line_ptnetwork_fkey
+ end
+ change_table :routes do |t|
+ t.remove_foreign_key :name => :route_line_fkey
+ end
+ change_table :routing_constraints_lines do |t|
+ t.remove_foreign_key :name => :routingconstraint_line_fkey
+ t.remove_foreign_key :name => :routingconstraint_stoparea_fkey
+ end
+ change_table :stop_areas do |t|
+ t.remove_foreign_key :name => :area_parent_fkey
+ end
+ change_table :stop_areas_stop_areas do |t|
+ t.remove_foreign_key :name => :stoparea_child_fkey
+ t.remove_foreign_key :name => :stoparea_parent_fkey
+ end
+ change_table :stop_points do |t|
+ t.remove_foreign_key :name => :stoppoint_area_fkey
+ t.remove_foreign_key :name => :stoppoint_route_fkey
+ end
+ change_table :time_table_dates do |t|
+ t.remove_foreign_key :name => :tm_date_fkey
+ end
+ change_table :time_table_periods do |t|
+ t.remove_foreign_key :name => :tm_period_fkey
+ end
+ change_table :time_tables_vehicle_journeys do |t|
+ t.remove_foreign_key :name => :vjtm_tm_fkey
+ t.remove_foreign_key :name => :vjtm_vj_fkey
+ end
+ change_table :vehicle_journey_at_stops do |t|
+ t.remove_foreign_key :name => :vjas_sp_fkey
+ t.remove_foreign_key :name => :vjas_vj_fkey
+ end
+ change_table :vehicle_journeys do |t|
+ t.remove_foreign_key :name => :vj_company_fkey
+ t.remove_foreign_key :name => :vj_jp_fkey
+ t.remove_foreign_key :name => :vj_route_fkey
+ end
+ end
+end
diff --git a/db/migrate/20130412083016_add_shortcut_to_time_table.ninoxe_engine.rb b/db/migrate/20130412083016_add_shortcut_to_time_table.ninoxe_engine.rb
new file mode 100644
index 000000000..f4a351965
--- /dev/null
+++ b/db/migrate/20130412083016_add_shortcut_to_time_table.ninoxe_engine.rb
@@ -0,0 +1,7 @@
+# This migration comes from ninoxe_engine (originally 20130410063411)
+class AddShortcutToTimeTable < ActiveRecord::Migration
+ def change
+ add_column "time_tables", "start_date", "date"
+ add_column "time_tables", "end_date", "date"
+ end
+end
diff --git a/db/migrate/20130412083017_set_shortcut_to_existing_time_table.ninoxe_engine.rb b/db/migrate/20130412083017_set_shortcut_to_existing_time_table.ninoxe_engine.rb
new file mode 100644
index 000000000..b8cea84a5
--- /dev/null
+++ b/db/migrate/20130412083017_set_shortcut_to_existing_time_table.ninoxe_engine.rb
@@ -0,0 +1,11 @@
+# This migration comes from ninoxe_engine (originally 20130410100706)
+class SetShortcutToExistingTimeTable < ActiveRecord::Migration
+ def up
+ Chouette::TimeTable.all.each do |t|
+ t.shortcuts_update
+ end
+ end
+
+ def down
+ end
+end
diff --git a/db/migrate/20130412083423_resize_chouette_columns.ninoxe_engine.rb b/db/migrate/20130412083423_resize_chouette_columns.ninoxe_engine.rb
new file mode 100644
index 000000000..d32753d6f
--- /dev/null
+++ b/db/migrate/20130412083423_resize_chouette_columns.ninoxe_engine.rb
@@ -0,0 +1,6 @@
+# This migration comes from ninoxe_engine (originally 20130410143542)
+class ResizeChouetteColumns < ActiveRecord::Migration
+ def change
+ change_column "vehicle_journeys", "number", "integer", {:limit => 8}
+ end
+end
diff --git a/db/migrate/20130412094550_resize_columns.rb b/db/migrate/20130412094550_resize_columns.rb
new file mode 100644
index 000000000..c780c752d
--- /dev/null
+++ b/db/migrate/20130412094550_resize_columns.rb
@@ -0,0 +1,11 @@
+class ResizeColumns < ActiveRecord::Migration
+ def change
+ change_column "referentials", "organisation_id", "integer", {:limit => 8}
+ change_column "imports", "referential_id", "integer", {:limit => 8}
+ change_column "import_log_messages", "import_id", "integer", {:limit => 8}
+ change_column "exports", "referential_id", "integer", {:limit => 8}
+ change_column "export_log_messages", "export_id", "integer", {:limit => 8}
+ change_column "file_validations", "organisation_id", "integer", {:limit => 8}
+ change_column "file_validation_log_messages", "file_validation_id", "integer", {:limit => 8}
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 2895423a1..abb811eb1 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
#
# It's strongly recommended to check this file into your version control system.
-ActiveRecord::Schema.define(:version => 20120905125251) do
+ActiveRecord::Schema.define(:version => 20130412094550) do
create_table "access_links", :force => true do |t|
t.integer "access_point_id", :limit => 8
@@ -43,25 +43,34 @@ ActiveRecord::Schema.define(:version => 20120905125251) do
t.string "creator_id"
t.string "name"
t.string "comment"
- t.decimal "longitude", :precision => 19, :scale => 16
- t.decimal "latitude", :precision => 19, :scale => 16
+ t.decimal "longitude", :precision => 19, :scale => 16
+ t.decimal "latitude", :precision => 19, :scale => 16
t.string "long_lat_type"
- t.decimal "x", :precision => 19, :scale => 2
- t.decimal "y", :precision => 19, :scale => 2
+ t.decimal "x", :precision => 19, :scale => 2
+ t.decimal "y", :precision => 19, :scale => 2
t.string "projection_type"
t.string "country_code"
t.string "street_name"
t.string "contained_in"
- t.datetime "openning_time"
- t.datetime "closing_time"
- t.string "type"
+ t.time "openning_time"
+ t.time "closing_time"
+ t.string "access_type"
t.boolean "lift_availability"
- t.datetime "mobility_restricted_suitability"
- t.datetime "stairs_availability"
+ t.boolean "mobility_restricted_suitability"
+ t.boolean "stairs_availability"
+ t.integer "stop_area_id", :limit => 8
end
add_index "access_points", ["objectid"], :name => "access_points_objectid_key", :unique => true
+ create_table "api_keys", :force => true do |t|
+ t.integer "referential_id"
+ t.string "token"
+ t.string "name"
+ t.datetime "created_at", :null => false
+ t.datetime "updated_at", :null => false
+ end
+
create_table "companies", :force => true do |t|
t.string "objectid", :null => false
t.integer "object_version"
@@ -114,31 +123,31 @@ ActiveRecord::Schema.define(:version => 20120905125251) do
t.datetime "failed_at"
t.string "locked_by"
t.string "queue"
- t.datetime "created_at"
- t.datetime "updated_at"
+ t.datetime "created_at", :null => false
+ t.datetime "updated_at", :null => false
end
add_index "delayed_jobs", ["priority", "run_at"], :name => "delayed_jobs_priority"
create_table "export_log_messages", :force => true do |t|
- t.integer "export_id"
+ t.integer "export_id", :limit => 8
t.string "key"
t.string "arguments", :limit => 1000
t.integer "position"
t.string "severity"
- t.datetime "created_at"
- t.datetime "updated_at"
+ t.datetime "created_at", :null => false
+ t.datetime "updated_at", :null => false
end
add_index "export_log_messages", ["export_id"], :name => "index_export_log_messages_on_export_id"
create_table "exports", :force => true do |t|
- t.integer "referential_id"
+ t.integer "referential_id", :limit => 8
t.string "status"
t.string "type"
t.string "options"
- t.datetime "created_at"
- t.datetime "updated_at"
+ t.datetime "created_at", :null => false
+ t.datetime "updated_at", :null => false
t.string "references_type"
t.string "reference_ids"
end
@@ -176,16 +185,14 @@ ActiveRecord::Schema.define(:version => 20120905125251) do
t.integer "choice_code"
end
- add_index "facilities_features", ["facility_id"], :name => "idx_facility_id"
-
create_table "file_validation_log_messages", :force => true do |t|
- t.integer "file_validation_id"
+ t.integer "file_validation_id", :limit => 8
t.string "key"
t.string "arguments", :limit => 1000
t.integer "position"
t.string "severity"
- t.datetime "created_at"
- t.datetime "updated_at"
+ t.datetime "created_at", :null => false
+ t.datetime "updated_at", :null => false
end
add_index "file_validation_log_messages", ["file_validation_id"], :name => "index_file_validation_log_messages_on_file_validation_id"
@@ -195,9 +202,9 @@ ActiveRecord::Schema.define(:version => 20120905125251) do
t.string "options", :limit => 2000
t.string "file_name"
t.string "file_type"
- t.datetime "created_at"
- t.datetime "updated_at"
- t.integer "organisation_id"
+ t.datetime "created_at", :null => false
+ t.datetime "updated_at", :null => false
+ t.integer "organisation_id", :limit => 8
end
create_table "group_of_lines", :force => true do |t|
@@ -212,30 +219,27 @@ ActiveRecord::Schema.define(:version => 20120905125251) do
add_index "group_of_lines", ["objectid"], :name => "group_of_lines_objectid_key", :unique => true
create_table "group_of_lines_lines", :id => false, :force => true do |t|
- t.integer "group_of_line_id", :limit => 8, :null => false
- t.integer "line_id", :limit => 8, :null => false
+ t.integer "group_of_line_id", :limit => 8
+ t.integer "line_id", :limit => 8
end
- add_index "group_of_lines_lines", ["group_of_line_id"], :name => "idx_grli_gr"
- add_index "group_of_lines_lines", ["line_id"], :name => "idx_grli_li"
-
create_table "import_log_messages", :force => true do |t|
- t.integer "import_id"
+ t.integer "import_id", :limit => 8
t.string "key"
t.string "arguments", :limit => 1000
t.integer "position"
t.string "severity"
- t.datetime "created_at"
- t.datetime "updated_at"
+ t.datetime "created_at", :null => false
+ t.datetime "updated_at", :null => false
end
add_index "import_log_messages", ["import_id"], :name => "index_import_log_messages_on_import_id"
create_table "imports", :force => true do |t|
- t.integer "referential_id"
+ t.integer "referential_id", :limit => 8
t.string "status"
- t.datetime "created_at"
- t.datetime "updated_at"
+ t.datetime "created_at", :null => false
+ t.datetime "updated_at", :null => false
t.string "type"
t.string "options"
t.string "file_type"
@@ -260,11 +264,10 @@ ActiveRecord::Schema.define(:version => 20120905125251) do
add_index "journey_patterns", ["objectid"], :name => "journey_patterns_objectid_key", :unique => true
create_table "journey_patterns_stop_points", :id => false, :force => true do |t|
- t.integer "journey_pattern_id", :limit => 8, :null => false
- t.integer "stop_point_id", :limit => 8, :null => false
+ t.integer "journey_pattern_id", :limit => 8
+ t.integer "stop_point_id", :limit => 8
end
- add_index "journey_patterns_stop_points", ["journey_pattern_id"], :name => "idx_jpsp_jpid"
add_index "journey_patterns_stop_points", ["journey_pattern_id"], :name => "index_journey_pattern_id_on_journey_patterns_stop_points"
create_table "lines", :force => true do |t|
@@ -329,14 +332,13 @@ ActiveRecord::Schema.define(:version => 20120905125251) do
create_table "referentials", :force => true do |t|
t.string "name"
t.string "slug"
- t.datetime "created_at"
- t.datetime "updated_at"
+ t.datetime "created_at", :null => false
+ t.datetime "updated_at", :null => false
t.string "prefix"
t.string "projection_type"
- t.string "bounding_box", :limit => nil
t.string "time_zone"
t.string "bounds"
- t.integer "organisation_id"
+ t.integer "organisation_id", :limit => 8
end
create_table "routes", :force => true do |t|
@@ -361,9 +363,6 @@ ActiveRecord::Schema.define(:version => 20120905125251) do
t.integer "line_id", :limit => 8
end
- add_index "routing_constraints_lines", ["line_id"], :name => "idx_rcli_li"
- add_index "routing_constraints_lines", ["stop_area_id"], :name => "idx_rcli_st"
-
create_table "stop_areas", :force => true do |t|
t.integer "parent_id", :limit => 8
t.string "objectid", :null => false
@@ -420,7 +419,7 @@ ActiveRecord::Schema.define(:version => 20120905125251) do
add_index "time_slots", ["objectid"], :name => "time_slots_objectid_key", :unique => true
- create_table "time_table_dates", :id => false, :force => true do |t|
+ create_table "time_table_dates", :force => true do |t|
t.integer "time_table_id", :limit => 8, :null => false
t.date "date"
t.integer "position", :null => false
@@ -428,7 +427,7 @@ ActiveRecord::Schema.define(:version => 20120905125251) do
add_index "time_table_dates", ["time_table_id"], :name => "index_time_table_dates_on_time_table_id"
- create_table "time_table_periods", :id => false, :force => true do |t|
+ create_table "time_table_periods", :force => true do |t|
t.integer "time_table_id", :limit => 8, :null => false
t.date "period_start"
t.date "period_end"
@@ -445,13 +444,15 @@ ActiveRecord::Schema.define(:version => 20120905125251) do
t.string "version"
t.string "comment"
t.integer "int_day_types", :default => 0
+ t.date "start_date"
+ t.date "end_date"
end
add_index "time_tables", ["objectid"], :name => "time_tables_objectid_key", :unique => true
create_table "time_tables_vehicle_journeys", :id => false, :force => true do |t|
- t.integer "time_table_id", :limit => 8, :null => false
- t.integer "vehicle_journey_id", :limit => 8, :null => false
+ t.integer "time_table_id", :limit => 8
+ t.integer "vehicle_journey_id", :limit => 8
end
add_index "time_tables_vehicle_journeys", ["time_table_id"], :name => "index_time_tables_vehicle_journeys_on_time_table_id"
@@ -468,8 +469,8 @@ ActiveRecord::Schema.define(:version => 20120905125251) do
t.datetime "last_sign_in_at"
t.string "current_sign_in_ip"
t.string "last_sign_in_ip"
- t.datetime "created_at"
- t.datetime "updated_at"
+ t.datetime "created_at", :null => false
+ t.datetime "updated_at", :null => false
t.integer "organisation_id"
t.string "name"
t.string "confirmation_token"
@@ -501,12 +502,8 @@ ActiveRecord::Schema.define(:version => 20120905125251) do
t.time "waiting_time"
t.time "elapse_duration"
t.time "headway_frequency"
- t.integer "position", :limit => 8
- t.boolean "is_departure", :default => false
- t.boolean "is_arrival", :default => false
end
- add_index "vehicle_journey_at_stops", ["stop_point_id"], :name => "index_vehicle_journey_at_stops_on_stop_point_id"
add_index "vehicle_journey_at_stops", ["stop_point_id"], :name => "index_vehicle_journey_at_stops_on_stop_pointid"
add_index "vehicle_journey_at_stops", ["vehicle_journey_id"], :name => "index_vehicle_journey_at_stops_on_vehicle_journey_id"
@@ -526,10 +523,58 @@ ActiveRecord::Schema.define(:version => 20120905125251) do
t.string "published_journey_identifier"
t.string "facility"
t.string "vehicle_type_identifier"
- t.integer "number"
+ t.integer "number", :limit => 8
end
add_index "vehicle_journeys", ["objectid"], :name => "vehicle_journeys_objectid_key", :unique => true
add_index "vehicle_journeys", ["route_id"], :name => "index_vehicle_journeys_on_route_id"
+ add_foreign_key "access_links", "access_points", :name => "aclk_acpt_fkey", :dependent => :delete
+ add_foreign_key "access_links", "stop_areas", :name => "aclk_area_fkey", :dependent => :delete
+
+ add_foreign_key "access_points", "stop_areas", :name => "access_area_fkey", :dependent => :delete
+
+ add_foreign_key "connection_links", "stop_areas", :name => "colk_endarea_fkey", :column => "arrival_id", :dependent => :delete
+ add_foreign_key "connection_links", "stop_areas", :name => "colk_startarea_fkey", :column => "departure_id", :dependent => :delete
+
+ add_foreign_key "group_of_lines_lines", "group_of_lines", :name => "groupofline_group_fkey", :dependent => :delete
+ add_foreign_key "group_of_lines_lines", "lines", :name => "groupofline_line_fkey", :dependent => :delete
+
+ add_foreign_key "journey_patterns", "routes", :name => "jp_route_fkey", :dependent => :delete
+ add_foreign_key "journey_patterns", "stop_points", :name => "arrival_point_fkey", :column => "arrival_stop_point_id", :dependent => :nullify
+ add_foreign_key "journey_patterns", "stop_points", :name => "departure_point_fkey", :column => "departure_stop_point_id", :dependent => :nullify
+
+ add_foreign_key "journey_patterns_stop_points", "journey_patterns", :name => "jpsp_jp_fkey", :dependent => :delete
+ add_foreign_key "journey_patterns_stop_points", "stop_points", :name => "jpsp_stoppoint_fkey", :dependent => :delete
+
+ add_foreign_key "lines", "companies", :name => "line_company_fkey", :dependent => :nullify
+ add_foreign_key "lines", "networks", :name => "line_ptnetwork_fkey", :dependent => :nullify
+
+ add_foreign_key "routes", "lines", :name => "route_line_fkey", :dependent => :delete
+
+ add_foreign_key "routing_constraints_lines", "lines", :name => "routingconstraint_line_fkey", :dependent => :delete
+ add_foreign_key "routing_constraints_lines", "stop_areas", :name => "routingconstraint_stoparea_fkey", :dependent => :delete
+
+ add_foreign_key "stop_areas", "stop_areas", :name => "area_parent_fkey", :column => "parent_id", :dependent => :nullify
+
+ add_foreign_key "stop_areas_stop_areas", "stop_areas", :name => "stoparea_child_fkey", :column => "child_id", :dependent => :delete
+ add_foreign_key "stop_areas_stop_areas", "stop_areas", :name => "stoparea_parent_fkey", :column => "parent_id", :dependent => :delete
+
+ add_foreign_key "stop_points", "routes", :name => "stoppoint_route_fkey", :dependent => :delete
+ add_foreign_key "stop_points", "stop_areas", :name => "stoppoint_area_fkey"
+
+ add_foreign_key "time_table_dates", "time_tables", :name => "tm_date_fkey", :dependent => :delete
+
+ add_foreign_key "time_table_periods", "time_tables", :name => "tm_period_fkey", :dependent => :delete
+
+ add_foreign_key "time_tables_vehicle_journeys", "time_tables", :name => "vjtm_tm_fkey", :dependent => :delete
+ add_foreign_key "time_tables_vehicle_journeys", "vehicle_journeys", :name => "vjtm_vj_fkey", :dependent => :delete
+
+ add_foreign_key "vehicle_journey_at_stops", "stop_points", :name => "vjas_sp_fkey", :dependent => :delete
+ add_foreign_key "vehicle_journey_at_stops", "vehicle_journeys", :name => "vjas_vj_fkey", :dependent => :delete
+
+ add_foreign_key "vehicle_journeys", "companies", :name => "vj_company_fkey", :dependent => :nullify
+ add_foreign_key "vehicle_journeys", "journey_patterns", :name => "vj_jp_fkey", :dependent => :delete
+ add_foreign_key "vehicle_journeys", "routes", :name => "vj_route_fkey", :dependent => :delete
+
end
diff --git a/doc/interfaces/api_rest_v1.xsd b/doc/interfaces/api_rest_v1.xsd
new file mode 100644
index 000000000..a31f92ff3
--- /dev/null
+++ b/doc/interfaces/api_rest_v1.xsd
@@ -0,0 +1,937 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ targetNamespace="http://www.chouette.mobi/schema/api/v1"
+ xmlns="http://www.chouette.mobi/schema/api/v1">
+ <xs:element name="Lines">
+ <xs:annotation>
+ <xs:documentation>Conteneur de réponse pour les requêtes de sélection de lignes</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element maxOccurs="unbounded" minOccurs="0" ref="Line"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="Line" type="LineType">
+ <xs:annotation>
+ <xs:documentation>Conteneur de réponse pour les requêtes de sélection du détail d'une ligne</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Networks">
+ <xs:annotation>
+ <xs:documentation>Conteneur de réponse pour les requêtes de sélection de réseaux</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element maxOccurs="unbounded" minOccurs="0" ref="Network"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="Network" type="NetworkType">
+ <xs:annotation>
+ <xs:documentation>Conteneur de réponse pour les requêtes de sélection du détail d'un réseau</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Companies">
+ <xs:annotation>
+ <xs:documentation>Conteneur de réponse pour les requêtes de sélection de transporteurs</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element maxOccurs="unbounded" minOccurs="0" ref="Company"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="Company" type="CompanyType">
+ <xs:annotation>
+ <xs:documentation>Conteneur de réponse pour les requêtes de sélection du détail d'un transporteur</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="StopAreas">
+ <xs:annotation>
+ <xs:documentation>Conteneur de réponse pour les requêtes de sélection d'arrêts</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element maxOccurs="unbounded" minOccurs="0" ref="StopArea"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="StopArea" type="StopAreaType">
+ <xs:annotation>
+ <xs:documentation>Conteneur de réponse pour les requêtes de sélection du détail d'un arrêt</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="ConnectionLinks">
+ <xs:annotation>
+ <xs:documentation>Conteneur de réponse pour les requêtes de sélection de correspondances</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element maxOccurs="unbounded" minOccurs="0" ref="ConnectionLink"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="ConnectionLink" type="ConnectionLinkType">
+ <xs:annotation>
+ <xs:documentation>Conteneur de réponse pour les requêtes de sélection du détail d'une correspondance</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="TimeTables">
+ <xs:annotation>
+ <xs:documentation>Conteneur de réponse pour les requêtes de sélection de calendriers</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element maxOccurs="unbounded" minOccurs="0" ref="TimeTable"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="TimeTable" type="TimeTableType">
+ <xs:annotation>
+ <xs:documentation>Conteneur de réponse pour les requêtes de sélection du détail d'un calendrier</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Routes">
+ <xs:annotation>
+ <xs:documentation>Conteneur de réponse pour les requêtes de sélection de séquences d'arrêts</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element maxOccurs="unbounded" minOccurs="0" ref="Route"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="Route" type="RouteType">
+ <xs:annotation>
+ <xs:documentation>Conteneur de réponse pour les requêtes de sélection du détail d'une séquence d'arrêts</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="JourneyPatterns">
+ <xs:annotation>
+ <xs:documentation>Conteneur de réponse pour les requêtes de sélection de missions</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element maxOccurs="unbounded" minOccurs="0" ref="JourneyPattern"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="JourneyPattern" type="JourneyPatternType">
+ <xs:annotation>
+ <xs:documentation>Conteneur de réponse pour les requêtes de sélection du détail d'une mission</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="VehicleJourneys">
+ <xs:annotation>
+ <xs:documentation>Conteneur de réponse pour les requêtes de sélection de courses</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element maxOccurs="unbounded" minOccurs="0" ref="VehicleJourney"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="VehicleJourney" type="VehicleJourneyType">
+ <xs:annotation>
+ <xs:documentation>Conteneur de réponse pour les requêtes de sélection du détail d'une course</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:complexType name="TridentObjectType">
+ <xs:annotation>
+ <xs:documentation>Structure qui correspond au TridentObjectType NEPTUNE</xs:documentation>
+ </xs:annotation>
+ <xs:complexContent>
+ <xs:extension base="TridentShortDescription">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="CreationTime" type="xs:dateTime">
+ <xs:annotation>
+ <xs:documentation>creationTime de la structure NEPTUNE associée</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element minOccurs="0" name="CreatorId" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>creatorId de la structure NEPTUNE associée</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ <xs:complexType name="TridentShortDescription">
+ <xs:annotation>
+ <xs:documentation>Structure qui rassemble les propriétés du TridentObjectType NEPTUNE qui servent à l'identification.</xs:documentation>
+ </xs:annotation>
+ <xs:sequence>
+ <xs:element name="ObjectId" type="TridentIdType">
+ <xs:annotation>
+ <xs:documentation>objectid de la structure NEPTUNE associée</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element minOccurs="0" name="ObjectVersion" type="xs:positiveInteger">
+ <xs:annotation>
+ <xs:documentation>objectVersion de la structure NEPTUNE associée</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="NetworkType">
+ <xs:annotation>
+ <xs:documentation>Structure qui correspond au PTNetworkType NEPTUNE</xs:documentation>
+ </xs:annotation>
+ <xs:complexContent>
+ <xs:extension base="TridentObjectType">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="VersionDate" type="xs:date">
+ <xs:annotation>
+ <xs:documentation>versionDate de la structure NEPTUNE associée</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element minOccurs="0" name="Description" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>description de la structure NEPTUNE associée</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Name" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>name de la structure NEPTUNE associée</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element minOccurs="0" name="RegistrationNumber" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>registrationNumber de la structure NEPTUNE associée</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element minOccurs="0" name="SourceName" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>sourceName de la structure NEPTUNE associée</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element minOccurs="0" name="SourceIdentifier" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>sourceIdentifier de la structure NEPTUNE associée</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element minOccurs="0" name="SourceType" type="SourceTypeType">
+ <xs:annotation>
+ <xs:documentation>sourceType de la structure NEPTUNE associée</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element minOccurs="0" name="Comment" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>comment de la structure NEPTUNE associée</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ <xs:complexType name="CompanyType">
+ <xs:annotation>
+ <xs:documentation>Structure qui correspond au CompanyType NEPTUNE</xs:documentation>
+ </xs:annotation>
+ <xs:complexContent>
+ <xs:extension base="TridentObjectType">
+ <xs:sequence>
+ <xs:element name="Name" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>name de la structure NEPTUNE associée</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element minOccurs="0" name="ShortName" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>shortName de la structure NEPTUNE associée</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element minOccurs="0" name="OrganisationalUnit" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>organisationalUnit de la structure NEPTUNE associée</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element minOccurs="0" name="OperatingDepartmentName" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>operatingDepartmentName de la structure NEPTUNE associée</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element minOccurs="0" name="Code" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>code de la structure NEPTUNE associée</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element minOccurs="0" name="Phone" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>phone de la structure NEPTUNE associée</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element minOccurs="0" name="Fax" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>fax de la structure NEPTUNE associée</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element minOccurs="0" name="Email" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>email de la structure NEPTUNE associée</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element minOccurs="0" name="RegistrationNumber" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>registrationNumber de la structure NEPTUNE associée</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ <xs:complexType name="CompanyShortDescriptionType">
+ <xs:annotation>
+ <xs:documentation>Structure équivalente la structure CompanyType mais qui n'en décrit que les propriétés principales.</xs:documentation>
+ </xs:annotation>
+ <xs:complexContent>
+ <xs:extension base="TridentShortDescription">
+ <xs:sequence>
+ <xs:element name="Name" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>name de la structure NEPTUNE associée</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element minOccurs="0" name="ShortName" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>shortName de la structure NEPTUNE associée</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element minOccurs="0" name="RegistrationNumber" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>registrationNumber de la structure NEPTUNE associée</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ <xs:complexType name="NetworkShortDesciptionType">
+ <xs:annotation>
+ <xs:documentation>Structure équivalente la structure NetworkType mais qui n'en décrit que les propriétés principales.</xs:documentation>
+ </xs:annotation>
+ <xs:complexContent>
+ <xs:extension base="TridentShortDescription">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="Description" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>description de la structure NEPTUNE associée</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Name" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>name de la structure NEPTUNE associée</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element minOccurs="0" name="RegistrationNumber" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>registrationNumber de la structure NEPTUNE associée</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ <xs:complexType name="RoutingLineObjectIdsType">
+ <xs:annotation>
+ <xs:documentation>Structure utilisée uniquement pour décrire les StopArea ayant "ITL" comme AreaType.
+La structure qui rassemble les identififiants (TridentIdType NEPTUNE) des lignes de l'ITL.</xs:documentation>
+ </xs:annotation>
+ <xs:sequence>
+ <xs:element maxOccurs="unbounded" name="RoutingLineObjectId" type="TridentIdType">
+ <xs:annotation>
+ <xs:documentation>Identififiant (TridentIdType NEPTUNE) d'une ligne (structure LineType)</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="RoutingStopAreaObjectIdsType">
+ <xs:annotation>
+ <xs:documentation>Structure utilisée uniquement pour décrire les StopArea ayant "ITL" comme AreaType.
+La structure qui rassemble les identififiants (TridentIdType NEPTUNE) des arrêts de l'ITL.</xs:documentation>
+ </xs:annotation>
+ <xs:sequence>
+ <xs:element maxOccurs="unbounded" name="RoutingStopAreaObjectId" type="TridentIdType">
+ <xs:annotation>
+ <xs:documentation>Identififiant (TridentIdType NEPTUNE) d'un arrêt (structure StopAreaType)</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="LineType">
+ <xs:annotation>
+ <xs:documentation>Structure qui correspond au LineType NEPTUNE</xs:documentation>
+ </xs:annotation>
+ <xs:complexContent>
+ <xs:extension base="TridentObjectType">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="Name" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>name de la structure NEPTUNE associée</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element minOccurs="0" name="Number" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>number de la structure NEPTUNE associée</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element minOccurs="0" name="PublishedName" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>publishedName de la structure NEPTUNE associée</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element minOccurs="0" name="TransportModeName" type="TransportModeNameType">
+ <xs:annotation>
+ <xs:documentation>transportModeName de la structure NEPTUNE associée</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element minOccurs="0" name="RegistrationNumber" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>registrationNumber de la structure NEPTUNE associée</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element minOccurs="0" name="Comment" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>comment de la structure NEPTUNE associée</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element minOccurs="0" name="MobilityRestrictedSuitability" type="xs:boolean">
+ <xs:annotation>
+ <xs:documentation>mobilityRestrictedSuitability de la structure NEPTUNE associée</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element minOccurs="0" name="NetworkShortDescription" type="NetworkShortDesciptionType"/>
+ <xs:element minOccurs="0" name="CompanyShortDescription"
+ type="CompanyShortDescriptionType"/>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ <xs:complexType name="LineShortDescriptionType">
+ <xs:annotation>
+ <xs:documentation>Structure équivalente la structure LineType mais qui n'en décrit que les propriétés principales.</xs:documentation>
+ </xs:annotation>
+ <xs:complexContent>
+ <xs:extension base="TridentShortDescription">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="Name" type="xs:string"/>
+ <xs:element minOccurs="0" name="Number" type="xs:string"/>
+ <xs:element minOccurs="0" name="PublishedName" type="xs:string"/>
+ <xs:element minOccurs="0" name="RegistrationNumber" type="xs:string"/>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ <xs:complexType name="StopAreaType">
+ <xs:annotation>
+ <xs:documentation>Structure qui correspond à l'élément ChouetteArea NEPTUNE (qui regroupe les éléments StopArea at AreaCentroid).</xs:documentation>
+ </xs:annotation>
+ <xs:complexContent>
+ <xs:extension base="TridentObjectType">
+ <xs:sequence>
+ <xs:element name="Name" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>correspond au StopAreaType.name (du format NEPTUNE)</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="AreaType" type="ChouetteAreaType">
+ <xs:annotation>
+ <xs:documentation>correspond au StopAreaType.areaType (du format NEPTUNE)</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element minOccurs="0" name="NearestTopicName" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>correspond au StopAreaType.nearestTopicName (du format NEPTUNE)</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element minOccurs="0" name="FareCode" type="xs:int">
+ <xs:annotation>
+ <xs:documentation>correspond au StopAreaType.fareCode (du format NEPTUNE)</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element minOccurs="0" name="RegistrationNumber" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>correspond au StopAreaType.registrationNumber (du format NEPTUNE)</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element minOccurs="0" name="Longitude" type="LongitudeType">
+ <xs:annotation>
+ <xs:documentation>correspond au AreaCentroid.longitude (du format NEPTUNE)</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element minOccurs="0" name="Latitude" type="LatitudeType">
+ <xs:annotation>
+ <xs:documentation>correspond au AreaCentroid.latitude (du format NEPTUNE)</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element minOccurs="0" name="LongLatType" type="LongLatTypeType">
+ <xs:annotation>
+ <xs:documentation>correspond au AreaCentroid.longLatType (du format NEPTUNE)</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element minOccurs="0" name="StreetName" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>correspond au AreaCentroid.streetName (du format NEPTUNE)</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element minOccurs="0" name="CountryCode" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>correspond au AreaCentroid.countryCode (du format NEPTUNE)</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element minOccurs="0" name="X" type="xs:decimal">
+ <xs:annotation>
+ <xs:documentation>correspond au AreaCentroid.X (du format NEPTUNE)</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element minOccurs="0" name="Y" type="xs:decimal">
+ <xs:annotation>
+ <xs:documentation>correspond au AreaCentroid.Y (du format NEPTUNE)</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element minOccurs="0" name="ProjectionType" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>correspond au AreaCentroid.projectionType (du format NEPTUNE)</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element minOccurs="0" name="Comment" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>correspond au AreaCentroid.comment (du format NEPTUNE)</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element maxOccurs="1" minOccurs="0" name="RoutingStopAreaObjectIds"
+ type="RoutingStopAreaObjectIdsType">
+ <xs:annotation>
+ <xs:documentation>Element présent uniquement pour les StopArea ayant "ITL" comme AreaType.
+L'élément rassemble les identififiants (TridentIdType NEPTUNE) des lignes de l'ITL.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element minOccurs="0" name="RoutingLineObjectIds" type="RoutingLineObjectIdsType">
+ <xs:annotation>
+ <xs:documentation>Element présent uniquement pour les StopArea ayant "ITL" comme AreaType.
+L'élément rassemble les identififiants (TridentIdType NEPTUNE) des arrêts de l'ITL.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element minOccurs="0" name="Parent" type="StopAreaShortDescriptionType">
+ <xs:annotation>
+ <xs:documentation>Element qui décrit le StopAreaType du niveau hiérachique supérieur si celui-ci existe.
+
+Si on note s un StopAreaType (NEPTUNE) et p le StopAreaType (NEPTUNE) de son niveau supérieur,
+la relation s'établit sur p au niveau du AreCentroid.containIn (NEPTUNE) qui fait apparaitre une référence s.
+
+Si on note S et P les structures StopAreaType équivalentes dans schéma décrit par cette XSD,
+c'est S qui référence P au niveau de S.parent.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ <xs:complexType name="StopAreaShortDescriptionType">
+ <xs:annotation>
+ <xs:documentation>Structure équivalente la structure StopAreaType mais qui n'en décrit que les propriétés principales.</xs:documentation>
+ </xs:annotation>
+ <xs:complexContent>
+ <xs:extension base="TridentShortDescription">
+ <xs:sequence>
+ <xs:element name="Name" type="xs:string"/>
+ <xs:element name="AreaType" type="ChouetteAreaType"/>
+ <xs:element minOccurs="0" name="Longitude" type="LongitudeType"/>
+ <xs:element minOccurs="0" name="Latitude" type="LatitudeType"/>
+ <xs:element minOccurs="0" name="LongLatType" type="LongLatTypeType"/>
+ <xs:element minOccurs="0" name="ParentObjectId" type="TridentIdType"/>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ <xs:complexType name="StopAreaShortDescriptionsType">
+ <xs:sequence>
+ <xs:element maxOccurs="unbounded" name="StopAreaShortDescription"
+ type="StopAreaShortDescriptionType"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="RouteType">
+ <xs:annotation>
+ <xs:documentation>Structure qui correspond au RouteType NEPTUNE</xs:documentation>
+ </xs:annotation>
+ <xs:complexContent>
+ <xs:extension base="TridentObjectType">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="Name" type="xs:string"/>
+ <xs:element minOccurs="0" name="PublishedName" type="xs:string"/>
+ <xs:element minOccurs="0" name="Number" type="xs:string"/>
+ <xs:element minOccurs="0" name="Direction" type="PTDirectionType"/>
+ <xs:element minOccurs="0" name="WayBackRouteId" type="TridentIdType"/>
+ <xs:element minOccurs="0" name="Comment" type="xs:string"/>
+ <xs:element minOccurs="0" name="WayBack" type="xs:string"/>
+ <xs:element name="LineShortDescription" type="LineShortDescriptionType"/>
+ <xs:element minOccurs="0" name="JourneyPatternShortDescriptions"
+ type="JourneyPatternShortDescriptionsType"/>
+ <xs:element minOccurs="0" name="VehicleJourneyObjectIds">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element maxOccurs="unbounded" name="VehicleJourneyObjectId" type="TridentIdType"
+ />
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element minOccurs="0" name="StopAreaShortDescriptions"
+ type="StopAreaShortDescriptionsType"/>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ <xs:complexType name="RouteShortDescriptionType">
+ <xs:annotation>
+ <xs:documentation>Structure équivalente la structure RouteType mais qui n'en décrit que les propriétés principales.</xs:documentation>
+ </xs:annotation>
+ <xs:complexContent>
+ <xs:extension base="TridentShortDescription">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="name" type="xs:string"/>
+ <xs:element minOccurs="0" name="publishedName" type="xs:string"/>
+ <xs:element minOccurs="0" name="number" type="xs:string"/>
+ <xs:element minOccurs="0" name="direction" type="PTDirectionType"/>
+ <xs:element minOccurs="0" name="wayBack" type="xs:string"/>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ <xs:complexType name="JourneyPatternType">
+ <xs:annotation>
+ <xs:documentation>Structure qui correspond au JourneyPatternType NEPTUNE</xs:documentation>
+ </xs:annotation>
+ <xs:complexContent>
+ <xs:extension base="TridentObjectType">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="Name" type="xs:string"/>
+ <xs:element minOccurs="0" name="PublishedName" type="xs:string"/>
+ <xs:element minOccurs="0" name="RegistrationNumber" type="xs:string"/>
+ <xs:element minOccurs="0" name="Comment" type="xs:string"/>
+ <xs:element name="RouteShortDescription" type="RouteShortDescriptionType"/>
+ <xs:element minOccurs="0" name="VehicleJourneyObjectIds">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element maxOccurs="unbounded" name="VehicleJourneyObjectId" type="TridentIdType"
+ />
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element minOccurs="0" name="StopAreaShortDescriptions"
+ type="StopAreaShortDescriptionsType"/>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ <xs:complexType name="JourneyPatternShortDescriptionType">
+ <xs:complexContent>
+ <xs:extension base="TridentShortDescription">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="Name" type="xs:string"/>
+ <xs:element minOccurs="0" name="PublishedName" type="xs:string"/>
+ <xs:element minOccurs="0" name="RegistrationNumber" type="xs:string"/>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ <xs:complexType name="JourneyPatternShortDescriptionsType">
+ <xs:sequence>
+ <xs:element name="JourneyPatternShortDescription" type="JourneyPatternShortDescriptionType"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="ConnectionLinkType">
+ <xs:annotation>
+ <xs:documentation>Structure qui correspond au ConnectionLinkType NEPTUNE</xs:documentation>
+ </xs:annotation>
+ <xs:complexContent>
+ <xs:extension base="TridentObjectType">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="Name" type="xs:string"/>
+ <xs:element minOccurs="0" name="LinkDistance" type="xs:decimal"/>
+ <xs:element minOccurs="0" name="LinkType" type="ConnectionLinkTypeType"/>
+ <xs:element minOccurs="0" name="defaultDuration" type="xs:duration"/>
+ <xs:element minOccurs="0" name="FrequentTravellerDuration" type="xs:duration"/>
+ <xs:element minOccurs="0" name="OccasionalTravellerDuration" type="xs:duration"/>
+ <xs:element minOccurs="0" name="MobilityRestrictedTravellerDuration" type="xs:duration"/>
+ <xs:element minOccurs="0" name="MobilityRestrictedSuitability" type="xs:boolean"/>
+ <xs:element minOccurs="0" name="StairsAvailability" type="xs:boolean"/>
+ <xs:element minOccurs="0" name="LiftAvailability" type="xs:boolean"/>
+ <xs:element minOccurs="0" name="Comment" type="xs:string"/>
+ <xs:element minOccurs="1" name="StartOfLinkShortDescription"
+ type="StopAreaShortDescriptionType"/>
+ <xs:element name="EndOfLinkShortDescription" type="StopAreaShortDescriptionType"/>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ <xs:complexType name="TimeTableType">
+ <xs:annotation>
+ <xs:documentation>Structure qui correspond au TimetableType NEPTUNE</xs:documentation>
+ </xs:annotation>
+ <xs:complexContent>
+ <xs:extension base="TridentObjectType">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="Version" type="xs:string"/>
+ <xs:element minOccurs="0" name="Comment" type="xs:string"/>
+ <xs:element minOccurs="0" name="Dates">
+ <xs:complexType>
+ <xs:sequence maxOccurs="unbounded">
+ <xs:element name="Date" type="xs:date"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:sequence minOccurs="0">
+ <xs:element name="Monday" type="xs:boolean"/>
+ <xs:element name="Tuesday" type="xs:boolean"/>
+ <xs:element name="Wednesday" type="xs:boolean"/>
+ <xs:element name="Thursday" type="xs:boolean"/>
+ <xs:element name="Friday" type="xs:boolean"/>
+ <xs:element name="Saturday" type="xs:boolean"/>
+ <xs:element name="Sunday" type="xs:boolean"/>
+ <xs:element maxOccurs="1" minOccurs="1" name="Periods">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element maxOccurs="unbounded" name="Period">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="PeriodStart"/>
+ <xs:element name="PeriodEnd"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ <xs:complexType name="VehicleJourneyType">
+ <xs:annotation>
+ <xs:documentation>Structure qui correspond au VehicleJourneyType NEPTUNE</xs:documentation>
+ </xs:annotation>
+ <xs:complexContent>
+ <xs:extension base="TridentObjectType">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="PublishedJourneyName" type="xs:string"/>
+ <xs:element minOccurs="0" name="PublishedJourneyIdentifier" type="xs:string"/>
+ <xs:element minOccurs="0" name="TransportMode" type="TransportModeNameType"/>
+ <xs:element minOccurs="0" name="VehicleTypeIdentifier" type="xs:string"/>
+ <xs:element minOccurs="0" name="StatusValue" type="ServiceStatusValueType"/>
+ <xs:element minOccurs="0" name="Facility" type="xs:string"/>
+ <xs:element minOccurs="0" name="Number" type="xs:integer"/>
+ <xs:element minOccurs="0" name="Comment" type="xs:string"/>
+ <xs:element name="RouteShortDescription" type="RouteShortDescriptionType"/>
+ <xs:element name="JourneyPatternShortDescription"
+ type="JourneyPatternShortDescriptionType"/>
+ <xs:element minOccurs="0" name="TimeTableObjectIds">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element maxOccurs="unbounded" name="TimeTableObjectId" type="TridentIdType"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element minOccurs="0" name="VehicleJourneyAtStops">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element maxOccurs="unbounded" name="VehicleJourneyAtStop">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="Order" type="xs:positiveInteger"/>
+ <xs:element name="StopAreaObjectId" type="TridentIdType"/>
+ <xs:element minOccurs="0" name="ConnectingServiceId" type="TridentIdType"/>
+ <xs:element minOccurs="0" name="ArrivalTime" type="xs:time"/>
+ <xs:element minOccurs="0" name="DepartureTime" type="xs:time"/>
+ <xs:element minOccurs="0" name="WaitingTime" type="xs:time"/>
+ <xs:element minOccurs="0" name="ElapseDuration" type="xs:duration"/>
+ <xs:element minOccurs="0" name="HeadwayFrequency" type="xs:duration"/>
+ <xs:element minOccurs="0" name="BoardingAlightingPossibility"
+ type="BoardingAlightingPossibilityType"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ <xs:simpleType name="TransportModeNameType">
+ <xs:annotation>
+ <xs:documentation>
+ Enumeration containing all the possible transport modes
+ </xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="Air"/>
+ <xs:enumeration value="Train"/>
+ <xs:enumeration value="LongDistanceTrain"/>
+ <xs:enumeration value="LongDistanceTrain_2"/>
+ <xs:enumeration value="LocalTrain"/>
+ <xs:enumeration value="RapidTransit"/>
+ <xs:enumeration value="Metro"/>
+ <xs:enumeration value="Tramway"/>
+ <xs:enumeration value="Coach"/>
+ <xs:enumeration value="Bus"/>
+ <xs:enumeration value="Ferry"/>
+ <xs:enumeration value="Waterborne"/>
+ <xs:enumeration value="PrivateVehicle"/>
+ <xs:enumeration value="Walk"/>
+ <xs:enumeration value="Trolleybus"/>
+ <xs:enumeration value="Bicycle"/>
+ <xs:enumeration value="Shuttle"/>
+ <xs:enumeration value="Taxi"/>
+ <xs:enumeration value="VAL"/>
+ <xs:enumeration value="Other"/>
+ </xs:restriction>
+ </xs:simpleType>
+ <xs:simpleType name="TridentIdType">
+ <xs:annotation>
+ <xs:documentation>
+ Defines the way an TRIDENT ID has to be built:
+ {PeerID}:{Class name}:{Progressive integer}
+ For example: RATP:Event:12332 or ATAC:Line:9987
+ </xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="xs:string">
+ <xs:pattern value="(\w|_)+:\w+:[0-9A-Za-z]+"/>
+ </xs:restriction>
+ </xs:simpleType>
+ <xs:simpleType name="SourceTypeType">
+ <xs:annotation>
+ <xs:documentation>
+ Enumeration containing all the possible type of information
+source
+ </xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="AutomobileClubPatrol"/>
+ <xs:enumeration value="SpotterAircraft"/>
+ <xs:enumeration value="BreakdownService"/>
+ <xs:enumeration value="CameraObservation"/>
+ <xs:enumeration value="EmergencyServicePatrol"/>
+ <xs:enumeration value="FreightVehicleOperator"/>
+ <xs:enumeration value="InfraredMonitoringStation"/>
+ <xs:enumeration value="InductionLoopMonitoringStation"/>
+ <xs:enumeration value="MicrowaveMonitoringStation"/>
+ <xs:enumeration value="MobileTelephoneCaller"/>
+ <xs:enumeration value="OtherInformation"/>
+ <xs:enumeration value="OtherOfficialVehicle"/>
+ <xs:enumeration value="PolicePatrol"/>
+ <xs:enumeration value="PublicAndPrivateUtilities"/>
+ <xs:enumeration value="RoadAuthorities"/>
+ <xs:enumeration value="RegisteredMotoristObserver"/>
+ <xs:enumeration value="RoadsideTelephoneCaller"/>
+ <xs:enumeration value="TrafficMonitoringStation"/>
+ <xs:enumeration value="TransitOperator"/>
+ <xs:enumeration value="VideoProcessingMonitoringStation"/>
+ <xs:enumeration value="VehicleProbeMeasurement"/>
+ <xs:enumeration value="PublicTransport"/>
+ <xs:enumeration value="PassengerTransportCoordinatingAuthority"/>
+ <xs:enumeration value="TravelInformationServiceProvider"/>
+ <xs:enumeration value="TravelAgency"/>
+ <xs:enumeration value="IndividualSubjectOfTravelItinerary"/>
+ </xs:restriction>
+ </xs:simpleType>
+ <xs:simpleType name="LongitudeType">
+ <xs:restriction base="xs:decimal">
+ <xs:minInclusive value="-180"/>
+ <xs:maxInclusive value="180"/>
+ </xs:restriction>
+ </xs:simpleType>
+ <xs:simpleType name="LatitudeType">
+ <xs:restriction base="xs:decimal">
+ <xs:minInclusive value="-90"/>
+ <xs:maxInclusive value="90"/>
+ </xs:restriction>
+ </xs:simpleType>
+ <xs:simpleType name="LongLatTypeType">
+ <xs:annotation>
+ <xs:documentation>Type of geodesic reference</xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="WGS84"/>
+ <xs:enumeration value="WGS92"/>
+ <xs:enumeration value="Standard"/>
+ </xs:restriction>
+ </xs:simpleType>
+ <xs:simpleType name="ChouetteAreaType">
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="Quay"/>
+ <xs:enumeration value="BoardingPosition"/>
+ <xs:enumeration value="CommercialStopPoint"/>
+ <xs:enumeration value="StopPlace"/>
+ <xs:enumeration value="ITL"/>
+ </xs:restriction>
+ </xs:simpleType>
+ <xs:simpleType name="PTDirectionType">
+ <xs:annotation>
+ <xs:documentation>
+ Enumeration containing all the possible directions on a PT Network
+ </xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="North"/>
+ <xs:enumeration value="NorthEast"/>
+ <xs:enumeration value="East"/>
+ <xs:enumeration value="SouthEast"/>
+ <xs:enumeration value="South"/>
+ <xs:enumeration value="SouthWest"/>
+ <xs:enumeration value="West"/>
+ <xs:enumeration value="NorthWest"/>
+ <xs:enumeration value="ClockWise"/>
+ <xs:enumeration value="CounterClockWise"/>
+ <xs:enumeration value="A"/>
+ <xs:enumeration value="R"/>
+ </xs:restriction>
+ </xs:simpleType>
+ <xs:simpleType name="ConnectionLinkTypeType">
+ <xs:annotation>
+ <xs:documentation>Type of connection</xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="Underground"/>
+ <xs:enumeration value="Mixed"/>
+ <xs:enumeration value="Overground"/>
+ </xs:restriction>
+ </xs:simpleType>
+ <xs:simpleType name="ServiceStatusValueType">
+ <xs:annotation>
+ <xs:documentation>
+ Enumeration containing all the possible status of a PT service
+ </xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="Normal"/>
+ <xs:enumeration value="Delayed"/>
+ <xs:enumeration value="Cancelled"/>
+ <xs:enumeration value="Disrupted"/>
+ <xs:enumeration value="ReducedService"/>
+ <xs:enumeration value="IncreasedService"/>
+ <xs:enumeration value="Rerouted"/>
+ <xs:enumeration value="NotStopping"/>
+ <xs:enumeration value="Early"/>
+ </xs:restriction>
+ </xs:simpleType>
+ <xs:simpleType name="BoardingAlightingPossibilityType">
+ <xs:annotation>
+ <xs:documentation>
+ Enumeration containing all the ways to board or alight a bus
+ </xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="BoardAndAlight"/>
+ <xs:enumeration value="AlightOnly"/>
+ <xs:enumeration value="BoardOnly"/>
+ <xs:enumeration value="NeitherBoardOrAlight"/>
+ <xs:enumeration value="BoardAndAlightOnRequest"/>
+ <xs:enumeration value="AlightOnRequest"/>
+ <xs:enumeration value="BoardOnRequest"/>
+ </xs:restriction>
+ </xs:simpleType>
+</xs:schema>
diff --git a/lib/tasks/ci.rake b/lib/tasks/ci.rake
index cfd68a1cf..8a59f54b9 100644
--- a/lib/tasks/ci.rake
+++ b/lib/tasks/ci.rake
@@ -1,10 +1,15 @@
namespace :ci do
- task :prepare do
+ task :db_travis_config do
+ cp "config/database.yml.travis", "config/database.yml"
+ end
+ task :prepare_travis => ["ci:db_travis_config", "apartment:migrate"]
+ task :db_config do
cp "config/database.yml.ccontrol", "config/database.yml"
end
+ task :prepare => ["ci:db_config", "db:migrate"]
task :deploy do
cp "chouette2.war", "/var/lib/tomcat6/webapps/"
end
- task :build => ["db:migrate", "spec", "war", "ci:deploy"]
+ task :build => [ "war", "ci:deploy"]
end
diff --git a/public/404.html b/public/404.html
index 9a48320a5..72bd4129d 100644
--- a/public/404.html
+++ b/public/404.html
@@ -1,26 +1,47 @@
<!DOCTYPE html>
<html>
<head>
+ <!-- <link href="assets/application.css" media="screen" rel="stylesheet" type="text/css" /> -->
<title>The page you were looking for doesn't exist (404)</title>
<style type="text/css">
- body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
+ body { background-color: #fff; text-align: center; }
div.dialog {
- width: 25em;
- padding: 0 4em;
- margin: 4em auto 0 auto;
+ width: 45em;
+ padding:1em;
+ margin: 2em auto 0 auto;
border: 1px solid #ccc;
border-right-color: #999;
border-bottom-color: #999;
}
- h1 { font-size: 100%; color: #f00; line-height: 1.5em; }
+ h1 { font-size: 100%; color: #f00; line-height: 1.5em; font-weight: bold}
+ a,a:visited { text-decoration: underline; color: blue}
</style>
</head>
<body>
- <!-- This file lives in public/404.html -->
+ <!-- This file lives in public/404.html
+ <div id="header">
+ <div class="infos">
+ <div class="logo">
+ <a href="referentials">
+ <img src="assets/logo_chouette.png" alt="Logo_chouette">
+ </a>
+ </div>
+ </div>
+ </div>-->
<div class="dialog">
+ <h1>D&eacute;sol&eacute;, la page demand&eacute;e n'existe pas</h1>
+ <a href="http://www.chouette.mobi/spip.php?rubrique38" target="_blank">N'h&eacute;sitez pas &agrave; nous d&eacute;crire le probl&egrave;me</a>, nous essaierons de le r&eacute;soudre.<br/>Merci d'avance<br/> <br/>
+ Vous pouvez n&eacute;anmoins continuer &agrave; utiliser l'application CHOUETTE<br/>
+ <a href="javascript:history.back()" >Retour</a><br/>
+ <!-- <a href="referentials" >Accueil</a> -->
+ <br/> <br/><br/> <br/>
<h1>The page you were looking for doesn't exist.</h1>
- <p>You may have mistyped the address or the page may have moved.</p>
+ You may have mistyped the address or the page may have moved. <br/>
+ <a href="http://www.chouette.mobi/spip.php?rubrique38" target="_blank">Please describe us what happened</a>, we'll try to come back with an answer. <br/>Thank you. <br/> <br/>
+ You can still continue the use the CHOUETTE application. <br/>
+ <a href="javascript:history.back()" >Back</a><br/>
+ <!-- <a href="referentials" >Home</a> -->
</div>
</body>
</html>
diff --git a/public/422.html b/public/422.html
index 83660ab18..ea857f263 100644
--- a/public/422.html
+++ b/public/422.html
@@ -1,26 +1,47 @@
<!DOCTYPE html>
<html>
<head>
+ <!-- <link href="assets/application.css" media="screen" rel="stylesheet" type="text/css" /> -->
<title>The change you wanted was rejected (422)</title>
<style type="text/css">
- body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
+ body { background-color: #fff; text-align: center; }
div.dialog {
- width: 25em;
- padding: 0 4em;
- margin: 4em auto 0 auto;
+ width: 45em;
+ padding:1em;
+ margin: 2em auto 0 auto;
border: 1px solid #ccc;
border-right-color: #999;
border-bottom-color: #999;
}
- h1 { font-size: 100%; color: #f00; line-height: 1.5em; }
+ h1 { font-size: 100%; color: #f00; line-height: 1.5em; font-weight: bold}
+ a,a:visited { text-decoration: underline; color: blue}
</style>
</head>
<body>
- <!-- This file lives in public/422.html -->
+ <!-- This file lives in public/422.html
+ <div id="header">
+ <div class="infos">
+ <div class="logo">
+ <a href="referentials">
+ <img src="assets/logo_chouette.png" alt="Logo_chouette">
+ </a>
+ </div>
+ </div>
+ </div>-->
<div class="dialog">
+ <h1>La modification demand&eacute;e a &eacute;t&eacute; refus&eacute;e</h1>
+ <a href="http://www.chouette.mobi/spip.php?rubrique38" target="_blank">N'h&eacute;sitez pas &agrave; nous d&eacute;crire le probl&egrave;me</a>, nous essaierons de le r&eacute;soudre.<br/>Merci d'avance<br/> <br/>
+ Vous pouvez n&eacute;anmoins continuer &agrave; utiliser l'application CHOUETTE<br/>
+ <a href="javascript:history.back()" >Retour</a><br/>
+ <!-- <a href="referentials" >Accueil</a> -->
+ <br/> <br/><br/> <br/>
<h1>The change you wanted was rejected.</h1>
- <p>Maybe you tried to change something you didn't have access to.</p>
+ Maybe you tried to change something you didn't have access to. <br/>
+ <a href="http://www.chouette.mobi/spip.php?rubrique38" target="_blank">Please describe us what happened</a>, we'll try to come back with an answer. <br/>Thank you. <br/> <br/>
+ You can still continue the use the CHOUETTE application. <br/>
+ <a href="javascript:history.back()" >Back</a><br/>
+ <!-- <a href="referentials" >Home</a> -->
</div>
</body>
</html>
diff --git a/public/500.html b/public/500.html
index b80307fc1..22a514e37 100644
--- a/public/500.html
+++ b/public/500.html
@@ -1,26 +1,44 @@
-<!DOCTYPE html>
-<html>
-<head>
- <title>We're sorry, but something went wrong (500)</title>
- <style type="text/css">
- body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
- div.dialog {
- width: 25em;
- padding: 0 4em;
- margin: 4em auto 0 auto;
- border: 1px solid #ccc;
- border-right-color: #999;
- border-bottom-color: #999;
- }
- h1 { font-size: 100%; color: #f00; line-height: 1.5em; }
- </style>
-</head>
-
-<body>
- <!-- This file lives in public/500.html -->
- <div class="dialog">
- <h1>We're sorry, but something went wrong.</h1>
- <p>We've been notified about this issue and we'll take a look at it shortly.</p>
- </div>
-</body>
-</html>
+<!DOCTYPE html>
+<html><head>
+ <title>We're sorry, but something went wrong (500)</title>
+ <style type="text/css">
+ body { background-color: #fff; text-align: center; }
+ div.dialog {
+ width: 45em;
+ padding:1em;
+ margin: 2em auto 0 auto;
+ border: 1px solid #ccc;
+ border-right-color: #999;
+ border-bottom-color: #999;
+ }
+ h1 { font-size: 100%; color: #f00; line-height: 1.5em; font-weight: bold}
+ a,a:visited { text-decoration: underline; color: blue}
+ </style>
+</head>
+
+<body>
+ <!-- This file lives in public/500.html
+ <div id="header">
+ <div class="infos">
+ <div class="logo">
+ <a href="referentials">
+ <img src="assets/logo_chouette.png" alt="Logo_chouette">
+ </a>
+ </div>
+ </div>
+ </div>-->
+ <div class="dialog">
+ <h1>D&eacute;sol&eacute;, une erreur est survenue</h1>
+ <a href="http://www.chouette.mobi/spip.php?rubrique38" target="_blank">N'h&eacute;sitez pas &agrave; nous d&eacute;crire le probl&egrave;me</a>, nous essaierons de le r&eacute;soudre.<br/>Merci d'avance<br/> <br/>
+ Vous pouvez n&eacute;anmoins continuer &agrave; utiliser l'application CHOUETTE<br/>
+ <a href="javascript:history.back()" >Retour</a><br/>
+ <!-- <a href="referentials" >Accueil</a> -->
+ <br/> <br/><br/> <br/>
+ <h1>We're sorry, but something went wrong.</h1>
+ <a href="http://www.chouette.mobi/spip.php?rubrique38" target="_blank">Please describe us what happened</a>, we'll try to come back with an answer. <br/>Thank you. <br/> <br/>
+ You can still continue the use the CHOUETTE application. <br/>
+ <a href="javascript:history.back()" >Back</a><br/>
+ <!-- <a href="referentials" >Home</a> -->
+ </div>
+</body>
+</html> \ No newline at end of file
diff --git a/public/help/access_in.png b/public/help/access_in.png
new file mode 100644
index 000000000..6d341c517
--- /dev/null
+++ b/public/help/access_in.png
Binary files differ
diff --git a/public/help/access_in_out.png b/public/help/access_in_out.png
new file mode 100644
index 000000000..5c9b066c5
--- /dev/null
+++ b/public/help/access_in_out.png
Binary files differ
diff --git a/public/help/access_out.png b/public/help/access_out.png
new file mode 100644
index 000000000..bd366b7fc
--- /dev/null
+++ b/public/help/access_out.png
Binary files differ
diff --git a/public/help/disabled_left_arrow.png b/public/help/disabled_left_arrow.png
new file mode 100644
index 000000000..3e11b9c71
--- /dev/null
+++ b/public/help/disabled_left_arrow.png
Binary files differ
diff --git a/public/help/disabled_right_arrow.png b/public/help/disabled_right_arrow.png
new file mode 100644
index 000000000..be6fcdf65
--- /dev/null
+++ b/public/help/disabled_right_arrow.png
Binary files differ
diff --git a/public/help/gray_left_arrow.png b/public/help/gray_left_arrow.png
new file mode 100644
index 000000000..7dc80a93e
--- /dev/null
+++ b/public/help/gray_left_arrow.png
Binary files differ
diff --git a/public/help/gray_right_arrow.png b/public/help/gray_right_arrow.png
new file mode 100644
index 000000000..a2fa02a7c
--- /dev/null
+++ b/public/help/gray_right_arrow.png
Binary files differ
diff --git a/public/help/green_left_arrow.png b/public/help/green_left_arrow.png
new file mode 100644
index 000000000..26149186d
--- /dev/null
+++ b/public/help/green_left_arrow.png
Binary files differ
diff --git a/public/help/green_right_arrow.png b/public/help/green_right_arrow.png
new file mode 100644
index 000000000..09ac3eec9
--- /dev/null
+++ b/public/help/green_right_arrow.png
Binary files differ
diff --git a/public/test_sheet/image001.gif b/public/test_sheet/image001.gif
new file mode 100755
index 000000000..7baead282
--- /dev/null
+++ b/public/test_sheet/image001.gif
Binary files differ
diff --git a/public/test_sheet/image001.jpg b/public/test_sheet/image001.jpg
new file mode 100755
index 000000000..148a8d555
--- /dev/null
+++ b/public/test_sheet/image001.jpg
Binary files differ
diff --git a/public/test_sheet/image002.jpg b/public/test_sheet/image002.jpg
new file mode 100755
index 000000000..1f6c96bb0
--- /dev/null
+++ b/public/test_sheet/image002.jpg
Binary files differ
diff --git a/public/test_sheet/image003.jpg b/public/test_sheet/image003.jpg
new file mode 100755
index 000000000..7bd7b6e2a
--- /dev/null
+++ b/public/test_sheet/image003.jpg
Binary files differ
diff --git a/public/test_sheet/image004.jpg b/public/test_sheet/image004.jpg
new file mode 100755
index 000000000..eea635db0
--- /dev/null
+++ b/public/test_sheet/image004.jpg
Binary files differ
diff --git a/public/test_sheet/image005.jpg b/public/test_sheet/image005.jpg
new file mode 100755
index 000000000..05a9fc9fd
--- /dev/null
+++ b/public/test_sheet/image005.jpg
Binary files differ
diff --git a/public/test_sheet/image006.jpg b/public/test_sheet/image006.jpg
new file mode 100755
index 000000000..fa185e313
--- /dev/null
+++ b/public/test_sheet/image006.jpg
Binary files differ
diff --git a/public/test_sheet/image007.jpg b/public/test_sheet/image007.jpg
new file mode 100755
index 000000000..4c581999e
--- /dev/null
+++ b/public/test_sheet/image007.jpg
Binary files differ
diff --git a/public/test_sheet/image008.jpg b/public/test_sheet/image008.jpg
new file mode 100755
index 000000000..ffde60848
--- /dev/null
+++ b/public/test_sheet/image008.jpg
Binary files differ
diff --git a/public/test_sheet/image009.jpg b/public/test_sheet/image009.jpg
new file mode 100755
index 000000000..fdfc8a7f8
--- /dev/null
+++ b/public/test_sheet/image009.jpg
Binary files differ
diff --git a/public/test_sheet/image010.jpg b/public/test_sheet/image010.jpg
new file mode 100755
index 000000000..39d1381e6
--- /dev/null
+++ b/public/test_sheet/image010.jpg
Binary files differ
diff --git a/public/test_sheet/image011.jpg b/public/test_sheet/image011.jpg
new file mode 100755
index 000000000..f15976961
--- /dev/null
+++ b/public/test_sheet/image011.jpg
Binary files differ
diff --git a/public/test_sheet/image012.jpg b/public/test_sheet/image012.jpg
new file mode 100755
index 000000000..23a77d27f
--- /dev/null
+++ b/public/test_sheet/image012.jpg
Binary files differ
diff --git a/public/test_sheet/image013.jpg b/public/test_sheet/image013.jpg
new file mode 100755
index 000000000..e0c114636
--- /dev/null
+++ b/public/test_sheet/image013.jpg
Binary files differ
diff --git a/public/test_sheet/image014.jpg b/public/test_sheet/image014.jpg
new file mode 100755
index 000000000..5dc13fdee
--- /dev/null
+++ b/public/test_sheet/image014.jpg
Binary files differ
diff --git a/public/test_sheet/image015.jpg b/public/test_sheet/image015.jpg
new file mode 100755
index 000000000..ec42834c3
--- /dev/null
+++ b/public/test_sheet/image015.jpg
Binary files differ
diff --git a/public/test_sheet/image016.jpg b/public/test_sheet/image016.jpg
new file mode 100755
index 000000000..ba5d19d3c
--- /dev/null
+++ b/public/test_sheet/image016.jpg
Binary files differ
diff --git a/public/test_sheet/image017.jpg b/public/test_sheet/image017.jpg
new file mode 100755
index 000000000..59e12d3ce
--- /dev/null
+++ b/public/test_sheet/image017.jpg
Binary files differ
diff --git a/public/test_sheet/image018.jpg b/public/test_sheet/image018.jpg
new file mode 100755
index 000000000..e89c11f3a
--- /dev/null
+++ b/public/test_sheet/image018.jpg
Binary files differ
diff --git a/public/test_sheet/image019.jpg b/public/test_sheet/image019.jpg
new file mode 100755
index 000000000..03a904932
--- /dev/null
+++ b/public/test_sheet/image019.jpg
Binary files differ
diff --git a/public/test_sheet/image020.jpg b/public/test_sheet/image020.jpg
new file mode 100755
index 000000000..40ed9f6e7
--- /dev/null
+++ b/public/test_sheet/image020.jpg
Binary files differ
diff --git a/public/test_sheet/image021.jpg b/public/test_sheet/image021.jpg
new file mode 100755
index 000000000..a0657d16e
--- /dev/null
+++ b/public/test_sheet/image021.jpg
Binary files differ
diff --git a/public/test_sheet/image022.jpg b/public/test_sheet/image022.jpg
new file mode 100755
index 000000000..93ed2fa8b
--- /dev/null
+++ b/public/test_sheet/image022.jpg
Binary files differ
diff --git a/public/test_sheet/image023.jpg b/public/test_sheet/image023.jpg
new file mode 100755
index 000000000..1dbf32723
--- /dev/null
+++ b/public/test_sheet/image023.jpg
Binary files differ
diff --git a/public/test_sheet/image024.jpg b/public/test_sheet/image024.jpg
new file mode 100755
index 000000000..117a34061
--- /dev/null
+++ b/public/test_sheet/image024.jpg
Binary files differ
diff --git a/public/test_sheet/image025.jpg b/public/test_sheet/image025.jpg
new file mode 100755
index 000000000..8a782704c
--- /dev/null
+++ b/public/test_sheet/image025.jpg
Binary files differ
diff --git a/public/test_sheet/image026.jpg b/public/test_sheet/image026.jpg
new file mode 100755
index 000000000..7db56d4b9
--- /dev/null
+++ b/public/test_sheet/image026.jpg
Binary files differ
diff --git a/public/test_sheet/image027.gif b/public/test_sheet/image027.gif
new file mode 100755
index 000000000..9d5091332
--- /dev/null
+++ b/public/test_sheet/image027.gif
Binary files differ
diff --git a/public/test_sheet/image028.gif b/public/test_sheet/image028.gif
new file mode 100755
index 000000000..3cdc86104
--- /dev/null
+++ b/public/test_sheet/image028.gif
Binary files differ
diff --git a/public/test_sheet/image029.jpg b/public/test_sheet/image029.jpg
new file mode 100755
index 000000000..1376834c9
--- /dev/null
+++ b/public/test_sheet/image029.jpg
Binary files differ
diff --git a/spec/controllers/api/v1/lines_controller_spec.rb b/spec/controllers/api/v1/lines_controller_spec.rb
new file mode 100644
index 000000000..1d9383593
--- /dev/null
+++ b/spec/controllers/api/v1/lines_controller_spec.rb
@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+describe Api::V1::LinesController do
+ let!(:line) { referential.lines.first || create(:line) }
+
+ it_behaves_like "api key protected controller" do
+ let(:data){line}
+ end
+ describe "GET #index" do
+ context "when authorization provided and request.accept is json" do
+ before :each do
+ config_formatted_request_with_authorization( "application/json")
+ get :index
+ end
+
+ it "should assign expected lines" do
+ assigns[:lines].should == [line]
+ end
+ end
+ end
+end
diff --git a/spec/controllers/api/v1/networks_controller_spec.rb b/spec/controllers/api/v1/networks_controller_spec.rb
new file mode 100644
index 000000000..01e3ee35d
--- /dev/null
+++ b/spec/controllers/api/v1/networks_controller_spec.rb
@@ -0,0 +1,35 @@
+require 'spec_helper'
+
+describe Api::V1::NetworksController do
+ let!(:network) { referential.networks.first || create(:network) }
+
+ it_behaves_like "api key protected controller" do
+ let(:data){network}
+ end
+
+ describe "GET #show" do
+ context "when authorization provided and request.accept is json" do
+ before :each do
+ config_formatted_request_with_authorization( "application/json")
+ get :show, :id => network.objectid
+ end
+
+ it "should assign expected network" do
+ assigns[:network].should == network
+ end
+ end
+ end
+ describe "GET #index" do
+ context "when authorization provided and request.accept is json" do
+ before :each do
+ config_formatted_request_with_authorization( "application/json")
+ get :index
+ end
+
+ it "should assign expected networks" do
+ assigns[:networks].should == [network]
+ end
+ end
+ end
+
+end
diff --git a/spec/controllers/api/v1/stop_area_controller_spec.rb b/spec/controllers/api/v1/stop_area_controller_spec.rb
new file mode 100644
index 000000000..8f1b47078
--- /dev/null
+++ b/spec/controllers/api/v1/stop_area_controller_spec.rb
@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+describe Api::V1::StopAreasController do
+ let!(:stop_area) { referential.stop_areas.first || create(:stop_area) }
+
+ it_behaves_like "api key protected controller" do
+ let(:data){stop_area}
+ end
+ describe "GET #index, route_id, line_id" do
+ let!(:line) { referential.lines.first || create(:line) }
+ let!(:route) { line.routes.first || create(:route, :line => line) }
+ before :each do
+ config_formatted_request_with_authorization( "application/json")
+ get :index, :route_id => route.objectid, :line_id => route.line.objectid
+ end
+ it "should assign expected stop_areas" do
+ assigns[:stop_areas].map(&:id).sort.should == route.stop_areas.map(&:id).sort
+ end
+ end
+ describe "GET #index, :q => { :name_cont => 'aa'}" do
+ let!(:sa1) { create(:stop_area, :name => "aaa") }
+ let!(:sa2) { create(:stop_area, :name => "aab") }
+ let!(:sa3) { create(:stop_area, :name => "abb") }
+ before :each do
+ config_formatted_request_with_authorization( "application/json")
+ get :index, :q => { :name_cont => "aa"}
+ end
+ it "should assign expected stop_areas" do
+ assigns[:stop_areas].map(&:name).sort.should == [ sa1.name, sa2.name]
+ end
+ end
+end
+
diff --git a/spec/factories.rb b/spec/factories.rb
index cbdb97440..7ae087de0 100644
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -15,6 +15,7 @@ FactoryGirl.define do
factory :user do |f|
f.association :organisation
+ f.sequence(:name) { |n| "chouette#{n}" }
f.sequence(:email) { |n| "chouette#{n}@dryade.priv" }
f.password "secret"
f.password_confirmation "secret"
diff --git a/spec/models/api/v1/api_key_spec.rb b/spec/models/api/v1/api_key_spec.rb
new file mode 100644
index 000000000..02c68ea13
--- /dev/null
+++ b/spec/models/api/v1/api_key_spec.rb
@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+describe Api::V1::ApiKey do
+ let!(:referential){Factory(:referential)}
+ subject { Api::V1::ApiKey.create( :name => "test", :referential => referential)}
+
+ it "test" do
+ subject.should be_valid
+ subject.referential.should == referential
+
+ end
+end
+
diff --git a/spec/models/export_spec.rb b/spec/models/export_spec.rb
index c59689f4a..4d5556998 100644
--- a/spec/models/export_spec.rb
+++ b/spec/models/export_spec.rb
@@ -46,7 +46,7 @@ describe Export do
describe ".types" do
it "should return available Export implementations" do
- Export.types.should =~ %w{NeptuneExport CsvExport GtfsExport}
+ Export.types.should =~ %w{NeptuneExport CsvExport GtfsExport NetexExport}
end
end
diff --git a/spec/models/gtfs_import_spec.rb b/spec/models/gtfs_import_spec.rb
new file mode 100644
index 000000000..f22a2d20d
--- /dev/null
+++ b/spec/models/gtfs_import_spec.rb
@@ -0,0 +1,75 @@
+require 'spec_helper'
+
+describe GtfsImport do
+
+ describe "#objectid_prefix" do
+
+ it "should be included in options" do
+ subject.objectid_prefix = "dummy"
+ subject.options.should include "objectid_prefix" => "dummy"
+ end
+
+ it "should be included in import_options" do
+ subject.objectid_prefix = "dummy"
+ subject.import_options.should include :objectid_prefix => "dummy"
+ end
+
+ end
+
+ describe "#max_distance_for_commercial" do
+
+ it "should be included in options" do
+ subject.max_distance_for_commercial = 300
+ subject.options.should include "max_distance_for_commercial" => 300
+ end
+
+ it "should be included in import_options" do
+ subject.max_distance_for_commercial = 300
+ subject.import_options.should include :max_distance_for_commercial => 300
+ end
+
+ end
+
+ describe "#max_distance_for_connection_link" do
+
+ it "should be included in options" do
+ subject.max_distance_for_connection_link = 300
+ subject.options.should include "max_distance_for_connection_link" => 300
+ end
+
+ it "should be included in import_options" do
+ subject.max_distance_for_connection_link = 300
+ subject.import_options.should include :max_distance_for_connection_link => 300
+ end
+
+ end
+
+ describe "#ignore_last_word" do
+
+ it "should be included in options" do
+ subject.ignore_last_word = true
+ subject.options.should include "ignore_last_word" => true
+ end
+
+ it "should be included in import_options" do
+ subject.ignore_last_word = true
+ subject.import_options.should include :ignore_last_word => true
+ end
+
+ end
+
+ describe "#ignore_end_chars" do
+
+ it "should be included in options" do
+ subject.ignore_end_chars = 2
+ subject.options.should include "ignore_end_chars" => 2
+ end
+
+ it "should be included in import_options" do
+ subject.ignore_end_chars = 2
+ subject.import_options.should include :ignore_end_chars => 2
+ end
+
+ end
+
+end
diff --git a/spec/models/import_spec.rb b/spec/models/import_spec.rb
index 205489717..bbf6725d7 100644
--- a/spec/models/import_spec.rb
+++ b/spec/models/import_spec.rb
@@ -45,7 +45,7 @@ describe Import do
describe ".types" do
it "should return available Import implementations" do
- Import.types.should =~ %w{NeptuneImport CsvImport}
+ Import.types.should =~ %w{NeptuneImport CsvImport GtfsImport NetexImport}
end
end
diff --git a/spec/models/netex_export_spec.rb b/spec/models/netex_export_spec.rb
new file mode 100644
index 000000000..385f6aa5a
--- /dev/null
+++ b/spec/models/netex_export_spec.rb
@@ -0,0 +1,7 @@
+require 'spec_helper'
+
+describe NetexExport do
+
+ its(:export_options) { should include(:format => :netex) }
+
+end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 7f465ca11..d18359ce0 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,5 +1,5 @@
# This file is copied to spec/ when you run 'rails generate rspec:install'
-ENV["RAILS_ENV"] ||= 'test'
+ENV["RAILS_ENV"] = 'test'
require File.expand_path("../../config/environment", __FILE__)
require 'rspec/rails'
require 'rspec/autorun'
diff --git a/spec/support/api_key.rb b/spec/support/api_key.rb
new file mode 100644
index 000000000..dc7111214
--- /dev/null
+++ b/spec/support/api_key.rb
@@ -0,0 +1,42 @@
+module ApiKeyHelper
+
+ def get_api_key
+ Api::V1::ApiKey.find_or_create_by_referential_id_and_name( referential.id, "test")
+ end
+ def config_formatted_request_with_authorization( format)
+ request.env['HTTP_AUTHORIZATION'] = ActionController::HttpAuthentication::Token.encode_credentials( get_api_key.token)
+ request.accept = format
+ end
+ def config_formatted_request_with_dummy_authorization( format)
+ request.env['HTTP_AUTHORIZATION'] = ActionController::HttpAuthentication::Token.encode_credentials( "dummy")
+ request.accept = format
+ end
+ def config_formatted_request_without_authorization( format)
+ request.env['HTTP_AUTHORIZATION'] = nil
+ request.accept = format
+ end
+ def json_xml_format?
+ request.accept == "application/json" || request.accept == "application/xml"
+ end
+
+ def self.included(base)
+ base.class_eval do
+ extend ClassMethods
+ alias_method :api_key, :get_api_key
+ end
+ end
+
+ module ClassMethods
+ def assign_api_key
+ before(:each) do
+ assign :api_key, api_key
+ end
+ end
+ end
+
+end
+
+RSpec.configure do |config|
+ config.include ApiKeyHelper
+end
+
diff --git a/spec/support/api_key_protected.rb b/spec/support/api_key_protected.rb
new file mode 100644
index 000000000..43256716d
--- /dev/null
+++ b/spec/support/api_key_protected.rb
@@ -0,0 +1,51 @@
+shared_examples "api key protected controller" do
+
+ let(:h) { { :index => (Proc.new { get :index }),
+ :show => (Proc.new { get :show, :id => data.objectid })}}
+ [:index, :show].each do |http_verb|
+
+ describe "GET ##{http_verb}" do
+ ["application/json","application/xml","application/html"].each do |format|
+ context "when an invalid authorization is provided" do
+ before :each do
+ config_formatted_request_with_dummy_authorization( format)
+ h[http_verb].call
+ end
+ it "should return HTTP 401" do
+ response.response_code.should == 401
+ end
+ end
+ context "when no authorization is provided" do
+ before :each do
+ config_formatted_request_without_authorization( format)
+ h[http_verb].call
+ end
+ it "should return HTTP 401" do
+ response.response_code.should == 401
+ end
+ end
+ context "when authorization provided and request.accept is #{format}," do
+ before :each do
+ config_formatted_request_with_authorization( format)
+ h[http_verb].call
+ end
+
+ it "should assign expected api_key" do
+ assigns[:api_key].should eql(api_key) if json_xml_format?
+ end
+ it "should assign expected referential" do
+ assigns[:referential].should == api_key.referential if json_xml_format?
+ end
+
+ it "should return #{(format == "application/json" || format == "application/xml") ? "success" : "failure"} response" do
+ if json_xml_format?
+ response.should be_success
+ else
+ response.should_not be_success
+ end
+ end
+ end
+ end
+ end
+ end
+end
diff --git a/spec/views/time_tables/show.html.erb_spec.rb b/spec/views/time_tables/show.html.erb_spec.rb
index 17449748b..9d0527c5d 100644
--- a/spec/views/time_tables/show.html.erb_spec.rb
+++ b/spec/views/time_tables/show.html.erb_spec.rb
@@ -4,8 +4,9 @@ describe "/time_tables/show" do
assign_referential
let!(:time_table) { assign(:time_table, create(:time_table)) }
+ let!(:year) { assign(:year, Date.today.cwyear) }
- it "should render h2 with the time_table comment" do
+ it "should render h2 with the time_table comment" do
render
rendered.should have_selector("h2", :text => Regexp.new(time_table.comment))
end