Added final changes for soft launch

Author: nicoverbruggen

README.md

@@ -35,4 +35,9 @@ Data returned through the API (when specifically requesting `application/ld+json
 
 ### Data dumps
 
-Data dumps and the data that is used (and will be used and queryable in the future) are available at <a href="http://archive.irail.be">http://archive.irail.be</a>.
+Data dumps and the data that is used (and will be used and queryable in the future) are available at <a href="http://archive.irail.be">http://archive.irail.be</a>.
+
+
+### Thanks to
+
+Special attribution to Melih Bilgil for the icon set. (http://picol.org/icon_library.php)

app/config/app.php

@@ -26,7 +26,8 @@
 	|
 	*/
 
-	'url' => 'http://irail.dev',
+	'url' => 'http://irail.dev',    // with http
+    'url-short' => 'irail.dev',     // without http
 
 	/*
 	|--------------------------------------------------------------------------

app/controllers/ApiController.php

@@ -39,4 +39,50 @@ public function liveboard($id){
                 break;
         }
     }
+
+    public function specificTrain($station_id, $liveboard_id){
+        $negotiator = new \Negotiation\FormatNegotiator();
+        $acceptHeader = Request::header('accept');
+        $priorities = array('text/html', 'application/json', '*/*');
+        $result = $negotiator->getBest($acceptHeader, $priorities);
+        $val = $result->getValue();
+        switch ($val){
+            case "text/html":
+                    $stationStringName = \hyperRail\StationString::convertToString($station_id);
+                    $URL = "http://api.irail.be/liveboard/?station=" . $stationStringName->name . "&fast=true&lang=nl&format=json";
+                    $data = file_get_contents($URL);
+                    $newData = \hyperRail\iRailFormatConverter::convertLiveboardData($data, $station_id);
+                    foreach ($newData['@graph'] as $graph){
+                        if (strpos($graph['@id'],$liveboard_id) !== false) {
+                            return View::make('stations.departuredetail')->with('station', $graph)->with('departureStation', $stationStringName);
+                        }
+                    }
+                return View::make('stations.expired');
+                break;
+            case "application/ld+json":
+                $stationStringName = \hyperRail\StationString::convertToString($station_id);
+                $URL = "http://api.irail.be/liveboard/?station=" . $stationStringName->name . "&fast=true&lang=nl&format=json";
+                $data = file_get_contents($URL);
+                    $newData = \hyperRail\iRailFormatConverter::convertLiveboardData($data, $station_id);
+                    foreach ($newData['@graph'] as $graph){
+                        if (strpos($graph['@id'],$liveboard_id) !== false) {
+                            return $graph;
+                        }
+                    }
+                    return View::make('stations.expired');
+                break;
+            default:
+                    $stationStringName = \hyperRail\StationString::convertToString($station_id);
+                    $URL = "http://api.irail.be/liveboard/?station=" . $stationStringName->name . "&fast=true&lang=nl&format=json";
+                    $data = file_get_contents($URL);
+                    $newData = \hyperRail\iRailFormatConverter::convertLiveboardData($data, $station_id);
+                    foreach ($newData['@graph'] as $graph){
+                        if (strpos($graph['@id'],$liveboard_id) !== false) {
+                            return View::make('stations.departuredetail')->with('station', $graph)->with('departureStation', $stationStringName);
+                        }
+                    }
+                    return View::make('stations.expired');
+                break;
+        }
+    }
 }

app/controllers/StationController.php

@@ -16,9 +16,7 @@
     if (App::environment()=='production'){
         if (!Request::secure()) return Redirect::secure(Request::getRequestUri());
     }
-
     // TODO: implement language negotiation as an alternative to get('lang')
-
     if (Input::get('lang')){
         $languages = array('nl', 'en', 'fr');
         $locale = Input::get('lang');
@@ -37,8 +35,6 @@
             $locale = null;
         }
     }
-
-
 });
 
 App::after(function($request, $response)

app/filters.php

@@ -3,7 +3,6 @@
 namespace hyperRail;
 
 class StationString {
-
     /**
      * Converts a station string to a station id. If the string cannot be converted,
      * null is returned.

app/hyperRail/StationString.php

@@ -21,12 +21,12 @@ public static function convertLiveboardData($json, $station_id, $format = "jsonl
         // Set globals
         // (which data applies to all possible LiveboardItems we are going to create?)
         $stationName = $initialData->stationinfo->name;
-        $timestamp = $initialData->timestamp;
         // Convert timestamp to date
-        $date = date('Ymd', $timestamp);
-        $time = date('His', $timestamp);
         foreach ($initialData->departures->departure as $departure){
+            $time = $departure->time;
             $liveboardItem = new LiveboardItem();
+            $date = date('Ymd', $time);
+            $time = date('His', $time);
             $vehicleShort = explode("BE.NMBS.", $departure->vehicle);
             $liveboardItem->fill($station_id, $date, $time, $vehicleShort[1], $departure->station, $departure->delay, date('c', $departure->time), $departure->platform);
             array_push($liveboardCollection, $liveboardItem->toArray());

app/hyperRail/Tests/JsonLDTest.php

@@ -45,6 +45,9 @@
     "404ErrorTitle" => "Page not found",
     "404Explanation" => "We could not find this page. If you think this was a mistake, ",
     "goHome" => "Go back to the homepage",
+    "ExpiredErrorTitle" => "This train has left the station!",
+    "ExpiredExplanation" => "This train has left the station, and is no longer available. To learn more about this train, visit ",
+    "delay" => "delay",
     // END OF NEW TRANSLATION STRINGS
     "search"=>"Search",
     "departure_at" => "Departure",

app/hyperRail/iRailFormatConverter.php

@@ -45,6 +45,9 @@
     "404ErrorTitle" => "Page pas trouvé",
     "404Explanation" => "Nous n'avons pas trouvé ce page. Si le problème persiste et vous pensez que c'est un erreur, ",
     "goHome" => "Retournez à page d’accueil",
+    "ExpiredErrorTitle" => "Ce train a déjà quitté la gare!",
+    "ExpiredExplanation" => "Ce train a déjà quitté la gare, et n'est plus disponible. Pour obtenir plus d'information sur ce train vous pouvez consulter nos archives de données à ",
+    "delay" => "retard",
     // END OF NEW TRANSLATION STRINGS
     "search"=>"Chercher",
     "departure_at" => "Départ",