Skip to content

Commit a730da1

Browse files
committed
found garage by location
1 parent 72d133f commit a730da1

File tree

3 files changed

+19
-4
lines changed

3 files changed

+19
-4
lines changed

controllers/garage.controller.js

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,20 @@ const rendergaragebyloc=async(req,res)=>
131131
var geometry = geoData.body.features[0].geometry;
132132
geometry.place_name=req.body.location;
133133
var coords=await garageService.ReturnCoords();
134-
res.render("garages/foundgarage",{ body: req.body,by:"Location",geometry:geometry,maptoken: mapBoxToken,coords:coords})
134+
var min_distance=10000000.0;
135+
var dist={};
136+
for (let coord of coords){
137+
var distance=garageService.DistanceCal(geometry.coordinates[1],geometry.coordinates[0],coord.coordinates[1],coord.coordinates[0]);
138+
console.log(distance);
139+
if(distance<=min_distance)
140+
{
141+
dist=coord;
142+
min_distance=distance;
143+
}
144+
}
145+
console.log(dist);
146+
res.render("garages/foundgarage",{ body: req.body,by:"Location",geometry:geometry,maptoken: mapBoxToken,dist:dist,
147+
min_distance:min_distance})
135148
}
136149
}
137150

services/garage.service.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ const ReturnCoords=async()=>
4747
return coords;
4848
}
4949

50-
const DistanceCal=(lat1,lat2, lon1, lon2)=>
50+
const DistanceCal=(lat1,lon1, lat2, lon2)=>
5151
{
5252
lon1 = lon1 * Math.PI / 180;
5353
lon2 = lon2 * Math.PI / 180;

views/garages/foundgarage.ejs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,12 @@
1111
<%- include('../partials/alerts')%>
1212
<br>
1313
<div class="container">
14-
<center><h1>Found Garages by <%=by%> near you</h1></center><br>
14+
<center><h1>Found Garages by <%=by%> near you<br>
15+
(Within <%=Math.round(min_distance*100)/100%> km radius)
16+
</h1></center><br>
1517
<div id='map' style="width: auto; height: 350px;"></div>
1618
</div>
17-
<%=coords%>
19+
<%=dist%>
1820
</body>
1921
</html>
2022
<style>

0 commit comments

Comments
 (0)