Merge pull request #79 from derheubi/2_Geolocation

Co-Authored-By: Jonas Heubuch <jonas.heubuch@outlook.com>
Traewelling · Aug 4, 2020 · fcc4943 · fcc4943
2 parents 6ae9953 + 906a985
commit fcc4943
Show file tree

Hide file tree

Showing 17 changed files with 243 additions and 28 deletions.
diff --git a/api-swagger-v0.yml b/api-swagger-v0.yml
@@ -675,6 +675,55 @@ paths:
           $ref: '#/components/responses/UnauthorizedError'
         406:
           $ref: '#/components/responses/GDPRError'
+  /trains/nearby:
+    get:
+      security:
+        - bearerAuth: []
+      tags: [Nearby]
+      summary: Retrieves the nearest station from coordinates
+      description: This endpoint queries the nearest station to given coordinates.
+      parameters:
+        - in: query
+          name: latitude
+          schema:
+            type: number
+            example: 48.994348
+          required: true
+          description: The latitude of the coordinates
+        - in: query
+          name: longitude
+          schema:
+            type: number
+            example: 8.399583
+          required: true
+          description: The longitude of the coordinates
+      responses:
+        200:
+          description: OK
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  type:
+                    type: string
+                    example: "station"
+                  id:
+                    type: string
+                    example: "8000191"
+                  name:
+                    type: string
+                    example: "Karlsruhe Hbf"
+                  location:
+                    $ref: '#/components/schemas/hafas_location'
+                  products:
+                    $ref: '#/components/schemas/hafas_products'
+        401:
+          $ref: '#/components/responses/UnauthorizedError'
+        404:
+          $ref: '#/components/responses/NotFoundError'
+        406:
+          $ref: '#/components/responses/GDPRError'
   /user/leaderboard:
     get:
       security:

diff --git a/app/Http/Controllers/API/TransportController.php b/app/Http/Controllers/API/TransportController.php
@@ -135,6 +135,23 @@ public function TrainLatestArrivals()
         return $this->sendResponse($arrivals);
     }
 
+    public function StationByCoordinates(Request $request) {
+        $validator = Validator::make($request->all(), [
+            'latitude' => 'required|numeric|min:-180|max:180',
+            'longitude' => 'required|numeric|min:-180|max:180'
+        ]);
+        if ($validator->fails()) {
+            return $this->sendError($validator->errors(), 400);
+        }
+
+        $nearestStation = TransportBackend::StationByCoordinates($request->latitude, $request->longitude);
+        if ($nearestStation === null) {
+            return $this->sendError(__("controller.transport.no-station-found"), 404);
+        }
+
+        return $this->sendResponse($nearestStation);
+    }
+
     public function getHome()
     {
         return $this->sendResponse(auth()->user()->home);

diff --git a/app/Http/Controllers/FrontendTransportController.php b/app/Http/Controllers/FrontendTransportController.php
@@ -42,6 +42,24 @@ public function TrainStationboard(Request $request) {
         );
     }
 
+    public function StationByCoordinates(Request $request)
+    {
+        $validatedInput = $request->validate([
+            'latitude' => 'required|numeric|min:-180|max:180',
+            'longitude' => 'required|numeric|min:-180|max:180'
+        ]);
+
+        $nearestStation = TransportBackend::StationByCoordinates($validatedInput['latitude'], $validatedInput['longitude']);
+        if ($nearestStation === null) {
+            return redirect()->back()->with('error', __('controller.transport.no-station-found'));
+        }
+
+        return redirect(route('trains.stationboard', [
+            'station' => $nearestStation->name,
+            'provider' => 'train'
+        ]));
+    }
+
     public function TrainTrip(Request $request) {
         $TrainTripResponse = TransportBackend::TrainTrip(
             $request->tripID,

diff --git a/app/Http/Controllers/TransportController.php b/app/Http/Controllers/TransportController.php
@@ -96,6 +96,19 @@ public static function FastTripAccess($departure, $lineName, $number, $when)
         return null;
     }
 
+    public static function StationByCoordinates($latitude, $longitude)
+    {
+        $client = new Client(['base_uri' => config('trwl.db_rest')]);
+        $response = $client->request('GET', "stops/nearby?latitude=$latitude&longitude=$longitude&results=1");
+        $json = json_decode($response->getBody()->getContents());
+
+        if (count($json) === 0) {
+            return null;
+        }
+
+        return $json[0];
+    }
+
     private static function getTrainDepartures($ibnr, $when='now', $trainType=null)
     {
         $client = new Client(['base_uri' => config('trwl.db_rest')]);

diff --git a/bootstrap/cache/services.php b/bootstrap/cache/services.php
@@ -182,6 +182,7 @@
     'Laravel\\Socialite\\Contracts\\Factory' => 'Laravel\\Socialite\\SocialiteServiceProvider',
     'command.tinker' => 'Laravel\\Tinker\\TinkerServiceProvider',
     'NunoMaduro\\Collision\\Contracts\\Provider' => 'NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider',
+    'Revolution\\Mastodon\\MastodonClient' => 'Revolution\\Mastodon\\Providers\\MastodonServiceProvider',
     'Revolution\\Mastodon\\Contracts\\Factory' => 'Revolution\\Mastodon\\Providers\\MastodonServiceProvider',
   ),
   'when' => 

diff --git a/package.json b/package.json
@@ -3,6 +3,7 @@
     "private": true,
     "scripts": {
         "dev": "npm run development",
+        "start": "npm run development && php artisan serve",
         "development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
         "watch": "npm run development -- --watch",
         "watch-poll": "npm run watch -- --watch-poll",
@@ -37,4 +38,4 @@
         "mdbootstrap": "^4.8.9",
         "momentjs": "^2.0.0"
     }
-}
+}
diff --git a/public/js/admin.js b/public/js/admin.js
diff --git a/public/js/app.js b/public/js/app.js
diff --git a/resources/js/components/stationboard.js b/resources/js/components/stationboard.js
@@ -1,4 +1,4 @@
-import {longStackSupport} from "q";
+import { longStackSupport } from "q";
 
 let delays = document.getElementsByClassName("traindelay");
 for (let i = 0; i < delays.length; i++) {
@@ -17,7 +17,7 @@ for (let i = 0; i < delays.length; i++) {
 
 var touchmoved;
 $(document)
-    .on("click touchstart", ".trainrow", function() {
+    .on("click touchstart", ".trainrow", function () {
         var lineName = $(this).data("linename");
         var tripID = $(this).data("tripid");
         var start = $(this).data("start");
@@ -32,15 +32,15 @@ $(document)
                 start;
         }
     })
-    .on("touchmove", function(e) {
+    .on("touchmove", function (e) {
         touchmoved = true;
     })
-    .on("touchstart", function() {
+    .on("touchstart", function () {
         touchmoved = false;
     });
 
 $(document)
-    .on("click touchend", ".train-destinationrow", function() {
+    .on("click touchend", ".train-destinationrow", function () {
         var tripID = $(this)
             .parent()
             .parent()
@@ -56,33 +56,33 @@ $(document)
             .parent()
             .data("linename");
         if (touchmoved != true) {
-            $("#checkinModal").modal("show", function(event) {
+            $("#checkinModal").modal("show", function (event) {
                 var modal = $(this);
                 modal
                     .find(".modal-title")
                     .html(
                         linename +
-                            ' <i class="fas fa-arrow-alt-circle-right"></i> ' +
-                            stopname
+                        ' <i class="fas fa-arrow-alt-circle-right"></i> ' +
+                        stopname
                     );
                 modal.find("#input-tripID").val(tripID);
                 modal.find("#input-destination").val(destination);
                 modal.find("#input-start").val(start);
             });
         }
     })
-    .on("touchmove", function(e) {
+    .on("touchmove", function (e) {
         touchmoved = true;
     })
-    .on("touchstart", function() {
+    .on("touchstart", function () {
         touchmoved = false;
     });
 
-$("#checkinModal").on("show.bs.modal", function(event) {
+$("#checkinModal").on("show.bs.modal", function (event) {
     $(event.relatedTarget);
 });
 
-$("#checkinButton").click(function(e) {
+$("#checkinButton").click(function (e) {
     e.preventDefault();
     $("#checkinForm").submit();
 });
@@ -94,3 +94,26 @@ if (document.getElementById("history-button")) {
         );
     });
 }
+
+if (document.getElementById("gps-button")) {
+    document.getElementById("gps-button").addEventListener("click", () => {
+        if (navigator.geolocation) {
+            navigator.geolocation.getCurrentPosition(searchStationByPosition, handlePositioningError);
+        } else {
+            ["d-none", "animated", "fadeIn"].forEach(classname =>
+                document.getElementById("gps-disabled-error").classList.toggle(classname)
+            );
+        }
+    });
+}
+
+function searchStationByPosition(position) {
+    let newLocation = `${window.location.protocol}//${window.location.host}/trains/nearby?latitude=${position.coords.latitude}&longitude=${position.coords.longitude}`;
+    window.location.href = newLocation;
+}
+
+function handlePositioningError(error) {
+    ["d-none", "animated", "fadeIn"].forEach(classname =>
+        document.getElementById("gps-disabled-error").classList.toggle(classname)
+    );
+}
diff --git a/resources/lang/de/stationboard.php b/resources/lang/de/stationboard.php
@@ -23,5 +23,7 @@
     "submit-search" => "Suchen",
     "where-are-you" => "Wo bist Du?",
     "last-stations" => "Letzte Stationen",
-    "next-stop" => "Nächster Halt"
+    "next-stop" => "Nächster Halt",
+    "search-by-location" => "Standortbasierte Suche",
+    "position-unavailable" => "Positionsbestimmung nicht möglich!"
 ];
diff --git a/resources/lang/en/stationboard.php b/resources/lang/en/stationboard.php
@@ -23,5 +23,7 @@
     "submit-search" => "Search",
     "where-are-you" => "Where are you?",
     "last-stations" => "Last stations",
-    "next-stop" => "Next stop"
+    "next-stop" => "Next stop",
+    "search-by-location" => "Search by location",
+    "position-unavailable" => "Locating not possible!"
 ];
diff --git a/resources/views/includes/station-autocomplete.blade.php b/resources/views/includes/station-autocomplete.blade.php
@@ -4,6 +4,12 @@
             <div class="card">
                 <div class="card-header">{{__('stationboard.where-are-you')}}</div>
                 <div class="card-body">
+                    <div id="gps-disabled-error" class="alert my-3 alert-danger d-none" role="alert">
+                        {{__('stationboard.position-unavailable')}}
+                        <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+                            <span aria-hidden="true">&times;</span>
+                        </button>
+                    </div>
                     <form action="{{ route('trains.stationboard') }}" method="get" id="autocomplete-form">
                         <input type="hidden" id="autocomplete-provider" name="provider" value="train">
 
@@ -17,6 +23,12 @@
                                 </span>
                             </div>
                             @endif
+
+                            <div class="input-group-append" id="gps-button" title="{{__('stationboard.search-by-location')}}">
+                                <span class="input-group-text" id="basic-addon2">
+                                    <i class="fa fa-map-marker-alt"></i>
+                                </span>
+                            </div>
 
                         </div>
                         <div class="list-group d-none" id="last-stations">

diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
@@ -169,7 +169,7 @@ class="fas fa-tools"></i> {{__('menu.admin')}}</a>
                     <span class="footer-nav-link">/ <a href="{{ route('blog.all') }}">{{ __('menu.blog') }}</a></span>
                 </p>
                 <p class="mb-0">{!! __('menu.developed') !!}</p>
-                <p class="mb-0">&copy; 2019 Tr&auml;welling</p>
+                <p class="mb-0">&copy; 2020 Tr&auml;welling</p>
                 <p class="mb-0 text-muted small">commit: {{ get_current_git_commit() }}</p>
             </div>
         </footer>

diff --git a/resources/views/stationboard.blade.php b/resources/views/stationboard.blade.php
@@ -8,9 +8,9 @@
     <div id="timepicker-wrapper">
         <div class="row justify-content-center">
             <div class="btn-group" role="group">
-                <a href="{{ url()->current() . '?' . http_build_query(['provider' => $request->provider, 'station' => $station['name'], 'when' => strtotime('-15 Minutes', $when), 'travelType' => $request->travelType]) }}" alt="{{__('stationboard.minus-15')}}" class="btn btn-light btn-rounded"><i class="fas fa-arrow-circle-left"></i></a>
+                <a href="{{ route('trains.stationboard', ['provider' => $request->provider, 'station' => $station['name'], 'when' => strtotime('-15 Minutes', $when), 'travelType' => $request->travelType]) }}" alt="{{__('stationboard.minus-15')}}" class="btn btn-light btn-rounded"><i class="fas fa-arrow-circle-left"></i></a>
                 <a href="#" id="timepicker-reveal" alt="{{__('stationboard.dt-picker')}}" class="btn btn-light btn-rounded c-datepicker-btn"><i class="fas fa-clock"></i></a>
-                <a href="{{ url()->current() . '?' . http_build_query(['provider' => $request->provider, 'station' => $station['name'], 'when' => strtotime('+15 Minutes', $when), 'travelType' => $request->travelType]) }}" alt="{{__('stationboard.plus-15')}}" class="btn btn-light btn-rounded"><i class="fas fa-arrow-circle-right"></i></a>
+                <a href="{{ route('trains.stationboard', ['provider' => $request->provider, 'station' => $station['name'], 'when' => strtotime('+15 Minutes', $when), 'travelType' => $request->travelType]) }}" alt="{{__('stationboard.plus-15')}}" class="btn btn-light btn-rounded"><i class="fas fa-arrow-circle-right"></i></a>
             </div>
         </div>
         <div class="row justify-content-center">
@@ -21,7 +21,7 @@
                         <a href="#" class="input-group-text btn-primary text-white" id="timepicker-button">{{__('stationboard.set-time')}}</a>
                     </div>
                     <script>
-                    window.changeTimeLink = "{{ url()->current() . '?' . http_build_query(['provider' => $request->provider, 'station' => $station['name'], 'travelType' => $request->travelType, 'when' => 'REPLACEME' ]) }}";
+                    window.changeTimeLink = "{{ route('trains.stationboard', ['provider' => $request->provider, 'station' => $station['name'], 'when' => 'REPLACEME', 'travelType' => $request->travelType]) }}";
                     </script>
                 </div>
             </div>

diff --git a/routes/api.php b/routes/api.php
@@ -56,6 +56,7 @@
             Route::get('latest', 'API\TransportController@TrainLatestArrivals')->name('api.v0.checkin.train.latest');
             Route::get('home', 'API\TransportController@getHome')->name('api.v0.checkin.train.home');
             Route::put('home', 'API\TransportController@setHome')->name('api.v0.checkin.train.home');
+            Route::get('nearby', 'API\TransportController@StationByCoordinates')->name('api.v0.trains.nearby');
         });
     });
 });
diff --git a/routes/web.php b/routes/web.php
@@ -256,6 +256,11 @@
         'as'    => 'trains.stationboard',
     ]);
 
+    Route::get('/trains/nearby', [
+        'uses'  => 'FrontendTransportController@StationByCoordinates',
+        'as'    => 'trains.nearby',
+    ]);
+
     Route::get('/trains/trip', [
         'uses'  => 'FrontendTransportController@TrainTrip',
         'as'    => 'trains.trip'