NoNameGuy
/
geocomb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix automatic search algorithm

master
Goncalo Bras 2017-09-05 15:18:17 +01:00
parent 16df6c10ae
commit 35e0954b58
2 changed files with 16 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
laravel/app/Http/Controllers/UserPageController.php
View File

@ -215,9 +215,9 @@ class UserPageController extends Controller
}
public function receiveStationCoordinates(Request $request) {
Session::forget('autonomyKm');
/*Session::forget('autonomyKm');
Session::forget('latitudeOrigin');
Session::forget('longitudeOrigin');
Session::forget('longitudeOrigin');*/
Session::put("autonomyKm", $request->distance);
Session::put("latitudeOrigin",$request->latitudeOrigin);
@ -244,10 +244,10 @@ class UserPageController extends Controller
$longitudeDestination = Session::get('longitudeDestination');
$selectedVehicle = Session::get('selectedVehicle');
Session::forget('latitudeOrigin');
/* Session::forget('latitudeOrigin');
Session::forget('longitudeOrigin');
Session::forget('latitudeDestination');
Session::forget('longitudeDestination');
Session::forget('longitudeDestination');*/
/* echo "origin lat $latitudeOrigin<br>";
echo "origin lng $longitudeOrigin<br>";
@ -337,46 +337,6 @@ class UserPageController extends Controller
return Response::json($response, $statusCode);
}
// $this->mainFuel = $vehicleFuels[0];
//order array by price
//usort($stationsArray, array($this, "sortByPriceLower"));
/* do{
$station = $stationsArray[$index];
if ($station!=null) {
$latitudeStation = $station->latitude;
$longitudeStation = $station->longitude;
// echo "latitude destination: ".$latitudeDestination;
// echo "longitude destination: ".$longitudeDestination;
$distance = $this->checkStationDistance($latitudeOrigin, $longitudeOrigin, $latitudeStation, $longitudeStation);
// echo "distance: $distance<br>";
echo "autonomy data: $autonomyKmData";//
if ($distance<$autonomyKmData) {
$outOfRange = false;
try{
$statusCode = 200;
$response['station'] = $station ;
}catch (Exception $e){
$statusCode = 400;
}finally{
return Response::json($response, $statusCode);
}
}else{
$outOfRange = true;
$index++;
}
// }
}
}while($outOfRange==true && $index<count($stationsArray));
*/
}

22
laravel/public/js/javascript.js
View File

@ -393,6 +393,10 @@ var array2;
var i, j, k, l;
var multiplier=1;
console.log("coordinates");
console.table(coordinates);
var autonomyKm = $('#upAutonomyKm').val();
var checkForStationPoints = [];
var point = {"latitude":null, "longitude":null};
@ -469,6 +473,7 @@ var array2;
//console.log("COORDS ORIGIN"+ coordinates.origin.latitude +" "+ coordinates.origin.longitude);
$.ajax({
async: false,
url: '/receiveCoords',//'http://geocomb.app/receiveCoords',
type: 'POST',
data: {"points": pointsArray, "vehicleId": vehicleId, "distance": distance, "latitudeOrigin": coordinates.origin.latitude, "longitudeOrigin": coordinates.origin.longitude},//{ "_token" : $('meta[name=_token]').attr('content'), name: "John", location: "Boston" },//JSON.stringify(pointsArray),//{_token: CSRF_TOKEN},
@ -487,23 +492,21 @@ var array2;
var link= "/receivedCoords";
var stationData;
console.log(link);
//console.log(link);
$.ajax({
async: false,
url: link,
crossDomain: true,
type: "GET",
dataType: "json",
type: "GET",
dataType: "json",
success: function (data) {
stationData = data['station'];
console.table(stationData);
},
error: function (error) {
console.log("Error getting the station data");
console.table(error);
}
error: function (error) {
console.log("Error getting the station data");
console.table(error);
}
});
console.table(stationData);
@ -627,7 +630,6 @@ var array2;
var directionsService = new google.maps.DirectionsService();
var directionsDisplay = new google.maps.DirectionsRenderer({
map: mapUP,