diff options
| -rw-r--r-- | CHANGELOG.md | 5 | ||||
| -rw-r--r-- | README.md | 14 | ||||
| -rw-r--r-- | config/locales/imports.yml | 2 | ||||
| -rw-r--r-- | config/locales/routes.yml | 4 | ||||
| -rw-r--r-- | config/locales/stop_areas.yml | 2 | ||||
| -rw-r--r-- | db/migrate/20130628130527_remove_projection_from_stop_areas.ninoxe_engine.rb | 12 | ||||
| -rw-r--r-- | db/migrate/20130628130528_remove_projection_from_access_points.ninoxe_engine.rb | 12 |
7 files changed, 34 insertions, 17 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index ca9fdcd68..fa901d2f2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,10 @@ * suppression des coordonnées projetées en base ** les données sont produites à la volée pour l'export et l'affichage à partir de la projection fixée dans le référentiel * consolidation de l'import GTFS -* ajout d'un export KML +* ajout d'un export KML : +** lignes +** séquences d'arrêt +** arrêts # V2.0.3 (27/05/13) @@ -44,7 +44,7 @@ Install [JRuby] (https://github.com/dryade/chouette2/blob/master/doc/install/jru Get git code : ```sh cd workspace -git clone -b V2_0_3 git://github.com/dryade/chouette2 +git clone -b V2_1_0 git://github.com/dryade/chouette2 cd chouette2 ``` @@ -62,9 +62,9 @@ Install chouette-gui-command to import and export transport offer : ```sh sudo mkdir -p /usr/local/opt/chouette-command/ cd /usr/local/opt/chouette-command/ -wget http://chouette.dryade.net/chouette-cmd_2.0.3.zip -unzip chouette-cmd_2.0.3.zip -cd chouette-cmd_2.0.3 +wget http://chouette.dryade.net/chouette-cmd_2.1.0.zip +unzip chouette-cmd_2.1.0.zip +cd chouette-cmd_2.1.0 sudo chmod a+w . ``` @@ -91,9 +91,9 @@ Install chouette-gui-command to import and export transport offer : ```sh sudo mkdir -p tmp/chouette-command/ cd tmp/chouette-command/ -wget http://chouette.dryade.net/chouette-cmd_2.0.3.zip -unzip chouette-cmd_2.0.3.zip -cd chouette-cmd_2.0.3 +wget http://chouette.dryade.net/chouette-cmd_2.1.0.zip +unzip chouette-cmd_2.1.0.zip +cd chouette-cmd_2.1.0 sudo chmod a+w . ``` diff --git a/config/locales/imports.yml b/config/locales/imports.yml index 28e65084c..cb794b2dc 100644 --- a/config/locales/imports.yml +++ b/config/locales/imports.yml @@ -39,6 +39,7 @@ en: CONNECTION_LINK_COUNT: "Connection link count : %{0}" ACCES_POINT_COUNT: "Access Point count : %{0}" MANDATORY_TAG: "Mandatory tag : %{0} " + IGNORED_DATA: "%{0} line %{1} : invalid field %{2} (%{3}) ignored" UNKNOWN_ENUM: "Unknown enum vaule for %{0} : %{1} " EMPTY_TAG: "Empty value : %{0}" BAD_REFERENCE: "Missing reference %{0} for %{1}" @@ -184,6 +185,7 @@ fr: 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} " + IGNORED_DATA: "%{0} ligne %{1} : champ %{2} invalide (%{3}) ignoré" UNKNOWN_ENUM: "Valeur de l'enum %{0} inconnue : %{1} " EMPTY_TAG: "Valeur vide : %{0}" BAD_REFERENCE: "Référence %{0} manquante pour %{1}" diff --git a/config/locales/routes.yml b/config/locales/routes.yml index fb5f49b4a..f39331944 100644 --- a/config/locales/routes.yml +++ b/config/locales/routes.yml @@ -66,8 +66,8 @@ fr: edit: "Modifier cette séquence d'arrêts" destroy: "Supprimer cette séquence d'arrêts" destroy_confirm: "Etes vous sûr de détruire cette séquence d'arrêts ?" - export_kml: "Export KML de l'itinéraire" - export_kml_all: "Export KML des itinéraires" + export_kml: "Export KML de la séquence d'arrêts" + export_kml_all: "Export KML des séquences d'arrêts" new: title: "Ajouter une séquence d'arrêts" edit: diff --git a/config/locales/stop_areas.yml b/config/locales/stop_areas.yml index 81720ec3d..dfc677a71 100644 --- a/config/locales/stop_areas.yml +++ b/config/locales/stop_areas.yml @@ -110,7 +110,7 @@ fr: add_children: "Gérer les fils" default_geometry: "Calculer les géométries manquantes" export_kml_place: "Export KML des pôles d'échange" - export_kml_commercial: "Export KML des arrêt commerciaux" + export_kml_commercial: "Export KML des arrêts commerciaux" export_kml_physical: "Export KML des arrêts physiques" new: title: "Ajouter un arrêt" diff --git a/db/migrate/20130628130527_remove_projection_from_stop_areas.ninoxe_engine.rb b/db/migrate/20130628130527_remove_projection_from_stop_areas.ninoxe_engine.rb index 3eb30a601..36b6a6dca 100644 --- a/db/migrate/20130628130527_remove_projection_from_stop_areas.ninoxe_engine.rb +++ b/db/migrate/20130628130527_remove_projection_from_stop_areas.ninoxe_engine.rb @@ -1,9 +1,15 @@ # This migration comes from ninoxe_engine (originally 20130628124932) class RemoveProjectionFromStopAreas < ActiveRecord::Migration def up - remove_column :stop_areas, :x - remove_column :stop_areas, :y - remove_column :stop_areas, :projection_type + if column_exists? :stop_areas, :x + remove_column :stop_areas, :x + end + if column_exists? :stop_areas, :y + remove_column :stop_areas, :y + end + if column_exists? :stop_areas, :projection_type + remove_column :stop_areas, :projection_type + end end def down diff --git a/db/migrate/20130628130528_remove_projection_from_access_points.ninoxe_engine.rb b/db/migrate/20130628130528_remove_projection_from_access_points.ninoxe_engine.rb index f0640a623..ed7ce1f69 100644 --- a/db/migrate/20130628130528_remove_projection_from_access_points.ninoxe_engine.rb +++ b/db/migrate/20130628130528_remove_projection_from_access_points.ninoxe_engine.rb @@ -1,9 +1,15 @@ # This migration comes from ninoxe_engine (originally 20130628124951) class RemoveProjectionFromAccessPoints < ActiveRecord::Migration def up - remove_column :access_points, :x - remove_column :access_points, :y - remove_column :access_points, :projection_type + if column_exists? :access_points, :x + remove_column :access_points, :x + end + if column_exists? :access_points, :y + remove_column :access_points, :y + end + if column_exists? :access_points, :projection_type + remove_column :access_points, :projection_type + end end def down |