From 3eec0d128e5c171e2d28c6a0bd1f3632ca06765c Mon Sep 17 00:00:00 2001
From: Dominik Pfennig <dominik@suma-ev.de>
Date: Tue, 8 May 2018 07:58:23 +0200
Subject: [PATCH] Komplette Routenplanung auf unseren Prepare Server umgelegt.

---
 app/Http/Controllers/RoutingController.php | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/app/Http/Controllers/RoutingController.php b/app/Http/Controllers/RoutingController.php
index af52386..a8594ae 100644
--- a/app/Http/Controllers/RoutingController.php
+++ b/app/Http/Controllers/RoutingController.php
@@ -38,10 +38,8 @@ public function routingOverviewGeoJson($vehicle, $points)
             default:
                 $port = 5000;
         }
-        $url       = "http://maps.metager.de:$port/route/v1/$vehicle/$points?steps=true&geometries=geojson";
-        if($port == 5002){
-            $url       = "http://94.130.163.243:$port/route/v1/$vehicle/$points?steps=true&geometries=geojson";
-        }
+        $url       = "http://94.130.163.243:$port/route/v1/$vehicle/$points?steps=true&geometries=geojson";
+
         $cacheHash = md5($url);
         if (Cache::has($cacheHash)) {
             $result = Cache::get($cacheHash);
@@ -92,10 +90,7 @@ public function routingGeoJson($vehicle, $points, $bearingStartPoint = "")
             default:
                 $port = 5000;
         }
-        $url = "http://maps.metager.de:$port/route/v1/$vehicle/$points?steps=true&alternatives=true&geometries=geojson&overview=full&annotations=true";
-        if($port == 5002){
-            $url       = "http://94.130.163.243:$port/route/v1/$vehicle/$points?steps=true&alternatives=true&geometries=geojson&overview=full&annotations=true";
-        }
+        $url = "http://94.130.163.243:$port/route/v1/$vehicle/$points?steps=true&alternatives=true&geometries=geojson&overview=full&annotations=true";
 
         # Maybe we need to add Bearings:
         if ($bearingStartPoint !== "") {
@@ -155,10 +150,8 @@ public function match($vehicle, $points, $timestamp, $radiuses)
             default:
                 $port = 5000;
         }
-        $url = 'http://maps.metager.de:' . $port . '/match/v1/' . $vehicle . '/' . $points . '?steps=true&geometries=geojson&timestamps=' . $timestamp . '&radiuses=' . $radiuses;
-        if($port == 5002){
-            $url       = "http://94.130.163.243" . $port . '/match/v1/' . $vehicle . '/' . $points . '?steps=true&geometries=geojson&timestamps=' . $timestamp . '&radiuses=' . $radiuses;
-        }
+        $url = 'http://94.130.163.243:' . $port . '/match/v1/' . $vehicle . '/' . $points . '?steps=true&geometries=geojson&timestamps=' . $timestamp . '&radiuses=' . $radiuses;
+
         // make request
         $ch = curl_init();
         curl_setopt($ch, CURLOPT_URL, $url);
-- 
GitLab