Fixed stations url + improvements to JS

Author: nicoverbruggen

app/hyperRail/Models/LiveboardItem.php

@@ -16,14 +16,14 @@ class LiveboardItem {
 
     public function fill($stationId, $requestDate, $requestTime, $routeLabel, $headSign,
                                         $delay, $time, $platform){
-        $md5hash = md5($routeLabel . $headSign);
-        $this->stationURL = "http://" . _DOMAIN_ . "/NMBS/stations/" . $stationId . "/" . $requestDate . $requestTime . $md5hash;
+        $this->headsign = $headSign;
+        $this->routeLabel = preg_replace("/([A-Z]{1,2})(\d+)/", "$1 $2", $routeLabel);
+        $md5hash = md5($this->routeLabel . $this->headsign);
+        $this->stationURL = "http://" . _DOMAIN_ . "/stations/NMBS/" . $stationId . "/departures/" . $requestDate . $requestTime . $md5hash;
         $this->delay = $delay;
         $this->scheduledDepartureTime = $time;
         $this->platform = $platform;
-        $this->destinationURL = "http://" . _DOMAIN_ . "/NMBS/stations/" . $stationId;
-        $this->headsign = $headSign;
-        $this->routeLabel = $routeLabel;
+        $this->destinationURL = "http://" . _DOMAIN_ . "/stations/NMBS/" . $stationId . "/departures/";
     }
 
     public function toArray(){

app/hyperRail/iRailFormatConverter.php

@@ -26,7 +26,7 @@ public static function convertLiveboardData($json, $station_id, $format = "jsonl
             $time = $departure->time;
             $liveboardItem = new LiveboardItem();
             $date = date('Ymd', $time);
-            $time = date('His', $time);
+            $time = date('Hi', $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/routes.php

@@ -18,8 +18,8 @@
 
 Route::get('/language', 'LanguageController@index');
 Route::get('/stations', 'StationController@redirectToNMBSStations');
-Route::get('/NMBS/stations/{id}', 'StationController@liveboard');
-Route::get('/NMBS/stations/{id}/{trainHash}', 'StationController@specificTrain');
+Route::get('/stations/NMBS/{id}', 'StationController@liveboard');
+Route::get('/stations/NMBS/{id}/departures/{trainHash}', 'StationController@specificTrain');
 
 /*
 |--------------------------------------------------------------------------

app/views/stations/search.blade.php

@@ -17,7 +17,7 @@
                         <label for="departure">{{Lang::get('client.stationName')}}</label>
                         <input type="text" ng-model="departure" placeholder="{{Lang::get('client.stationSearchPlaceholder')}}" typeahead="station as station.name for station in stations.stations | filter:{name:$viewValue} | limitTo:5" typeahead-template-url="customTemplate.html" class="form-control input-lg">
                     </div>
-                    <a href="{{ URL::to('NMBS/stations') }}/@{{departure.id}}" ng-show="departure.id" class="btn btn-primary btn-wide btn-lg bounceIn">{{Lang::get('client.viewLiveboard')}}</a>
+                    <a href="{{ URL::to('stations/NMBS') }}/@{{departure.id}}" ng-show="departure.id" class="btn btn-primary btn-wide btn-lg bounceIn">{{Lang::get('client.viewLiveboard')}}</a>
                 </div>
             </div>
         </div>

composer.json

@@ -8,8 +8,7 @@
         "easyrdf/easyrdf": "*",
         "semsol/arc2": "*",
         "ml/json-ld": "1.*",
-        "willdurand/negotiation": "@stable",
-        "fzaninotto/faker": "1.3"
+        "willdurand/negotiation": "@stable"
     },
     "require-dev": {
         "phpunit/phpunit": "4.0.*",

public/js/irailapp/app.js

@@ -272,19 +272,6 @@
         $http.get('../../data/stations.json').success(function(data) {
             $scope.stations = data;
             var location = document.URL;
-            // Figure out what the station name is
-            var split = location.split('NMBS/stations/');
-            var id = split[1].split('?');
-            try{
-                var stationName = $scope.findStationById(id[0]).name;
-            }
-            catch(ex){
-                $scope.results = false;
-                $scope.loading = false;
-                $scope.error = true;
-            }
-            // Set up the request path
-            // url = "http://api.irail.be/liveboard/?station=" + stationName + "&lang=nl&format=json";
             // Request the URL
             $http.get(document.URL, config)
                 // If it works, show data