diff options
| author | Luc Donnet | 2014-09-30 16:28:06 +0200 |
|---|---|---|
| committer | Luc Donnet | 2014-09-30 16:28:06 +0200 |
| commit | 94e2f80aa99843c21e290ce75a7f8912f3368f3f (patch) | |
| tree | ab5e3be0cf6e5eaa23f7e3304cf6536855d6c417 | |
| parent | fe37e9c012a519eb3e774144ad767b3332b26208 (diff) | |
| parent | c6b7ae29463819e4999b8463136dc2936132143f (diff) | |
| download | chouette-core-94e2f80aa99843c21e290ce75a7f8912f3368f3f.tar.bz2 | |
Merge branch 'sismo' of github.com:afimb/chouette2 into sismo
| -rw-r--r-- | app/views/stop_areas/_form.html.erb | 15 | ||||
| -rw-r--r-- | config/locales/exchange.yml | 4 |
2 files changed, 16 insertions, 3 deletions
diff --git a/app/views/stop_areas/_form.html.erb b/app/views/stop_areas/_form.html.erb index 5a612614b..d108ef193 100644 --- a/app/views/stop_areas/_form.html.erb +++ b/app/views/stop_areas/_form.html.erb @@ -70,12 +70,17 @@ } if ( address.city) { name += address.city; + } else if ( address.village) { + name += address.village; + } else if ( address.town) { + name += address.town; } else if ( address.county ) { name += address.county; } else if ( address.country ) { name += address.country; } + return name; }; var filtering = function(list) { @@ -88,11 +93,19 @@ item.type == "secondary") && item.address.road ; }); return $.map( selection, function( d) { + var city = ""; + if ( d.address.city) { + city = d.address.city; + } else if ( d.address.town) { + city = d.address.town; + } else if ( d.address.village) { + city = d.address.village; + } return { postcode: d.address.postcode, road: d.address.road, lon: d.lon, lat: d.lat, suburb: d.address.suburb, - city: d.address.city, + city: city, postcode: d.address.postcode, the_key: address_display( d.address)}; }); diff --git a/config/locales/exchange.yml b/config/locales/exchange.yml index df9d97728..7c8ff9646 100644 --- a/config/locales/exchange.yml +++ b/config/locales/exchange.yml @@ -5,7 +5,7 @@ en: gtfs: "GTFS (General Transit Feed Specification)" csv: "CSV (Chouette format)" netex: "NeTEx (experimental)" - hub: "HUB 1.4 (Specific Transdev Format)" + hub: "HUB 1.3 (Specific Transdev Format)" kml: "KML (line, route, ... drawings on Keyhole Markup Language format)" fr: exchange: @@ -14,5 +14,5 @@ fr: gtfs: "GTFS (General Transit Feed Specification défini par Google)" csv: "CSV (format spécifique à Chouette)" netex: "profil NeTEx expérimental" - hub: "HUB 1.4 (format spécifique Transdev)" + hub: "HUB 1.3 (format spécifique Transdev)" kml: "KML (tracés de lignes, séquences d'arrêts, ... en 'Keyhole Markup Language')" |