Fix automatic search algorithm
parent
16df6c10ae
commit
35e0954b58
|
@ -215,9 +215,9 @@ class UserPageController extends Controller
|
||||||
}
|
}
|
||||||
|
|
||||||
public function receiveStationCoordinates(Request $request) {
|
public function receiveStationCoordinates(Request $request) {
|
||||||
Session::forget('autonomyKm');
|
/*Session::forget('autonomyKm');
|
||||||
Session::forget('latitudeOrigin');
|
Session::forget('latitudeOrigin');
|
||||||
Session::forget('longitudeOrigin');
|
Session::forget('longitudeOrigin');*/
|
||||||
|
|
||||||
Session::put("autonomyKm", $request->distance);
|
Session::put("autonomyKm", $request->distance);
|
||||||
Session::put("latitudeOrigin",$request->latitudeOrigin);
|
Session::put("latitudeOrigin",$request->latitudeOrigin);
|
||||||
|
@ -244,10 +244,10 @@ class UserPageController extends Controller
|
||||||
$longitudeDestination = Session::get('longitudeDestination');
|
$longitudeDestination = Session::get('longitudeDestination');
|
||||||
$selectedVehicle = Session::get('selectedVehicle');
|
$selectedVehicle = Session::get('selectedVehicle');
|
||||||
|
|
||||||
Session::forget('latitudeOrigin');
|
/* Session::forget('latitudeOrigin');
|
||||||
Session::forget('longitudeOrigin');
|
Session::forget('longitudeOrigin');
|
||||||
Session::forget('latitudeDestination');
|
Session::forget('latitudeDestination');
|
||||||
Session::forget('longitudeDestination');
|
Session::forget('longitudeDestination');*/
|
||||||
|
|
||||||
/* echo "origin lat $latitudeOrigin<br>";
|
/* echo "origin lat $latitudeOrigin<br>";
|
||||||
echo "origin lng $longitudeOrigin<br>";
|
echo "origin lng $longitudeOrigin<br>";
|
||||||
|
@ -337,46 +337,6 @@ class UserPageController extends Controller
|
||||||
return Response::json($response, $statusCode);
|
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));
|
|
||||||
*/
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -393,6 +393,10 @@ var array2;
|
||||||
var i, j, k, l;
|
var i, j, k, l;
|
||||||
var multiplier=1;
|
var multiplier=1;
|
||||||
|
|
||||||
|
|
||||||
|
console.log("coordinates");
|
||||||
|
console.table(coordinates);
|
||||||
|
|
||||||
var autonomyKm = $('#upAutonomyKm').val();
|
var autonomyKm = $('#upAutonomyKm').val();
|
||||||
var checkForStationPoints = [];
|
var checkForStationPoints = [];
|
||||||
var point = {"latitude":null, "longitude":null};
|
var point = {"latitude":null, "longitude":null};
|
||||||
|
@ -469,6 +473,7 @@ var array2;
|
||||||
|
|
||||||
//console.log("COORDS ORIGIN"+ coordinates.origin.latitude +" "+ coordinates.origin.longitude);
|
//console.log("COORDS ORIGIN"+ coordinates.origin.latitude +" "+ coordinates.origin.longitude);
|
||||||
$.ajax({
|
$.ajax({
|
||||||
|
async: false,
|
||||||
url: '/receiveCoords',//'http://geocomb.app/receiveCoords',
|
url: '/receiveCoords',//'http://geocomb.app/receiveCoords',
|
||||||
type: 'POST',
|
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},
|
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,7 +492,7 @@ var array2;
|
||||||
|
|
||||||
var link= "/receivedCoords";
|
var link= "/receivedCoords";
|
||||||
var stationData;
|
var stationData;
|
||||||
console.log(link);
|
//console.log(link);
|
||||||
$.ajax({
|
$.ajax({
|
||||||
async: false,
|
async: false,
|
||||||
url: link,
|
url: link,
|
||||||
|
@ -498,12 +503,10 @@ var array2;
|
||||||
stationData = data['station'];
|
stationData = data['station'];
|
||||||
console.table(stationData);
|
console.table(stationData);
|
||||||
},
|
},
|
||||||
|
|
||||||
error: function (error) {
|
error: function (error) {
|
||||||
console.log("Error getting the station data");
|
console.log("Error getting the station data");
|
||||||
console.table(error);
|
console.table(error);
|
||||||
}
|
}
|
||||||
|
|
||||||
});
|
});
|
||||||
console.table(stationData);
|
console.table(stationData);
|
||||||
|
|
||||||
|
@ -627,7 +630,6 @@ var array2;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
var directionsService = new google.maps.DirectionsService();
|
var directionsService = new google.maps.DirectionsService();
|
||||||
var directionsDisplay = new google.maps.DirectionsRenderer({
|
var directionsDisplay = new google.maps.DirectionsRenderer({
|
||||||
map: mapUP,
|
map: mapUP,
|
||||||
|
|
Loading…
Reference in New Issue