More fixes (ld+json fixes + enter bug on route planner)!

Author: nicoverbruggen

app/controllers/StationController.php

@@ -79,7 +79,15 @@ public function specificTrain($station_id, $liveboard_id){
                     $newData = \hyperRail\iRailFormatConverter::convertLiveboardData($data, $station_id);
                     foreach ($newData['@graph'] as $graph){
                         if (strpos($graph['@id'],$liveboard_id) !== false) {
-                            return $graph;
+                            $context = array(
+                                "delay" =>  "http://semweb.mmlab.be/ns/rplod/delay",
+                                "platform" => "http://semweb.mmlab.be/ns/rplod/platform",
+                                "scheduledDepartureTime" => "http://semweb.mmlab.be/ns/rplod/scheduledDepartureTime",
+                                "stop" => "http://semweb.mmlab.be/ns/rplod/stop",
+                                "headsign" => "http://vocab.org/transit/terms/headsign",
+                                "routeLabel" => "http://semweb.mmlab.be/ns/rplod/routeLabel",
+                            );
+                            return array("@context" => $context, "@graph" => $graph);
                         }
                     }
                     return View::make('stations.expired');

app/hyperRail/Models/LiveboardItem.php

@@ -23,7 +23,7 @@ public function fill($stationId, $requestDate, $requestTime, $routeLabel, $headS
         $this->delay = $delay;
         $this->scheduledDepartureTime = $time;
         $this->platform = $platform;
-        $this->destinationURL = "http://" . _DOMAIN_ . "/stations/NMBS/" . $stationId . "/departures/";
+        $this->destinationURL = "http://" . _DOMAIN_ . "/stations/NMBS/" . $stationId;
     }
 
     public function toArray(){

app/hyperRail/iRailFormatConverter.php

@@ -35,9 +35,12 @@ public static function convertLiveboardData($json, $station_id, $format = "jsonl
             "delay" =>  "http://semweb.mmlab.be/ns/rplod/delay",
             "platform" => "http://semweb.mmlab.be/ns/rplod/platform",
             "scheduledDepartureTime" => "http://semweb.mmlab.be/ns/rplod/scheduledDepartureTime",
-            "stop" => "http://semweb.mmlab.be/ns/rplod/stop",
             "headsign" => "http://vocab.org/transit/terms/headsign",
             "routeLabel" => "http://semweb.mmlab.be/ns/rplod/routeLabel",
+            "stop" => array(
+                "@id" => "http://semweb.mmlab.be/ns/rplod/stop",
+                "@type" => "@id"
+            ),
         );
         return array("@context" => $context, "@graph" => $liveboardCollection);
     }

app/views/route/planner.blade.php

@@ -43,7 +43,7 @@
                     </select>
                     <timepicker ng-model="mytime" ng-change="changed()" minute-step="15" show-meridian="ismeridian"></timepicker>
                     <br/>
-                    <input type="submit" id="submit" class="btn btn-default btn-lg btn-primary btn-wide" ng-click="save()" value="{{Lang::get('client.confirmSearch')}}" ng-hide="departure == destination">
+                    <input type="submit" id="confirm" class="btn btn-default btn-lg btn-primary btn-wide" ng-click="save()" value="{{Lang::get('client.confirmSearch')}}" ng-hide="departure == destination">
                     <div class="alert alert-danger" ng-show="data === null">
                         <p ng-show="stationnotfound === true">{{Lang::get('client.errorCheckInput')}}</p>
                     </div>

public/js/irailapp/app.js

@@ -32,7 +32,7 @@
 
         $(document).keypress(function(e) {
             if(e.which == 13 && $scope.planning == true){
-                $scope.confirmRouteSearch();
+                $('#confirm').focus();
             }
         });