Skip to content

FilterRecomendationsByDistance #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AnudeepCHS wants to merge 1 commit into
base: master
Choose a base branch
from
Open

FilterRecomendationsByDistance #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 21 additions & 7 deletions bookswap/bookswap_client/src/components/Home/Dashboard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class Dashboard extends Component {
super();
this.state = {
allBookDetails : [],
allBooksInRange : [],
allBookDetailsInit : [],
bookIsOpen:false,
openMessage:false,
isMeetingLocationModalOpen: false,
Expand Down Expand Up @@ -92,13 +92,15 @@ filterByDistance=(book)=>{

dist=this.distance(localStorage.getItem("userLat"),localStorage.getItem("userLon"),
book.location.latitude,book.location.longitude );
console.log("distance of book"+book.bookName+":" + dist);
return dist<= this.state.range;



console.log("distance of book"+book.bookName+":" + dist);
return dist<= this.state.range;
}

handleApply=()=>{
let allBookDetails= this.state.allBookDetailsInit;
let distanceFilteredBooks= allBookDetails.filter(this.filterByDistance);
this.setState({allBookDetails:distanceFilteredBooks});
}

// filtering by distance

Expand Down Expand Up @@ -158,6 +160,10 @@ getBooksList = () => {
.then(response => {
if(response.status === 200){
let allBookDetails=response.data;
this.setState({
allBookDetailsInit: allBookDetails

});
let distanceFilteredBooks= allBookDetails.filter(this.filterByDistance);
allBookDetails=distanceFilteredBooks;
let books = [];
Expand Down Expand Up @@ -371,6 +377,10 @@ messageContentHandler=(e)=>
.then(response => {
if(response.status === 200){
let allBookDetails=response.data;
this.setState({
allBookDetailsInit: allBookDetails

});
let distanceFilteredBooks= allBookDetails.filter(this.filterByDistance);
allBookDetails = distanceFilteredBooks;
this.setState({
Expand Down Expand Up @@ -501,6 +511,10 @@ searchBook=(searchString)=>
.then(response => {
if(response.status === 200){
let allBookDetails=response.data;
this.setState({
allBookDetailsInit: allBookDetails

});
let distanceFilteredBooks= allBookDetails.filter(this.filterByDistance);
allBookDetails = distanceFilteredBooks;
this.setState({
Expand Down Expand Up @@ -624,7 +638,7 @@ searchBook=(searchString)=>

}}
/>
<Button onClick={() => this.searchBook(this.state.searchString)}>Apply</Button>
<Button onClick={() => this.handleApply()}>Apply</Button>
</div>
</div>
</div>
Expand Down
68 changes: 67 additions & 1 deletion bookswap/bookswap_client/src/components/Home/Recommendation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import '../../App.css';
import axios from 'axios';
import {Redirect} from 'react-router';
import bookdummy from '../../common/books.png';

import RangeSlider from "react-input-slider";
import Modal from 'react-modal';
import { Button } from 'react-bootstrap';
import {backendURI} from '../../common/config';
Expand All @@ -16,13 +16,58 @@ class Recommendation extends Component {
searchString:'alchemist',
bookTitle:'',
allBookDetails:[],
allBookDetailsInit:[],
range: 15,
unavailableModal:false
};
this.closeModal = this.closeModal.bind(this);
}
componentDidMount() {
this.getRecommendation();
}
// filtering by distance
distance=(lat1, lon1, lat2, lon2)=>{
console.log("distance called on "+lat1+","+lon1+","+lat2+","+lon2+",");
if ((lat1 == lat2) && (lon1 == lon2)) {
return 0;
}
else {
var radlat1 = Math.PI * lat1/180;
var radlat2 = Math.PI * lat2/180;
var theta = lon1-lon2;
console.log();
var radtheta = Math.PI * theta/180;
var dist = Math.sin(radlat1) * Math.sin(radlat2) + Math.cos(radlat1) * Math.cos(radlat2) * Math.cos(radtheta);
if (dist > 1) {
dist = 1;
}
dist = Math.acos(dist);
dist = dist * 180/Math.PI;
dist = dist * 60 * 1.1515;
return dist;
}
}

filterByDistance=(book)=>{
let dist=0;
let range= this.state.range;
console.log("range captured"+range );
console.log("filter by dist called on book" +book.bookName);

dist=this.distance(localStorage.getItem("userLat"),localStorage.getItem("userLon"),
book.location.latitude,book.location.longitude );
console.log("distance of book"+book.bookName+":" + dist);
return dist<= this.state.range;
}

handleApply=()=>{
let allBookDetails= this.state.allBookDetailsInit;
let distanceFilteredBooks= allBookDetails.filter(this.filterByDistance);
this.setState({allBookDetails:distanceFilteredBooks});
}

// filtering by distance

getRecommendation=()=>
{
this.setState({
Expand Down Expand Up @@ -88,6 +133,13 @@ console.log(data)
if(response.status === 200){
console.log(response.data.length)
let allBookDetails=response.data[0];
this.setState({
allBookDetailsInit: allBookDetails

});

let distanceFilteredBooks= allBookDetails.filter(this.filterByDistance);
allBookDetails=distanceFilteredBooks;
console.log(JSON.stringify(allBookDetails))
this.setState({
allBookDetails,
Expand Down Expand Up @@ -180,6 +232,20 @@ console.log(data)
<div style={{display: "flex",justifyContent: "center",alignItems: "center"}}>
<button class="btn btn-primary" type="button" onClick={this.getRecommendation}><span class="glyphicon glyphicon-search"></span>Search</button>
</div>
<div>
<p>Show books in: {this.state.range} mi.</p>
<RangeSlider
axis="x"
x={this.state.range}
xmin = {0}
xmax ={50}
onChange={({ x }) => {
this.setState({range: x });

}}
/>
<Button onClick={() => this.handleApply()}>Apply</Button>
</div>
</div>
</div>
</div>
Expand Down