Skip to content

Map distances #26

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

Merged
merged 2 commits into from
Mar 25, 2017
Merged

Map distances #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6b55321
Map distances
hw2zheng Mar 25, 2017
c710d33
Merge branch 'master2' into haowei3
hw2zheng Mar 25, 2017
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
2 changes: 1 addition & 1 deletion OddJobb/www/css/card.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.card-header {
height: 10vw;
height: 1vw;
background-size: cover;
background-position: center;
}
Expand Down
32 changes: 16 additions & 16 deletions OddJobb/www/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,21 +48,21 @@
<ul>
<li>
<a href="profile.html" id="profile" class="item-link list-button close-panel">Profile</a>

</li>
<li>
<a href="createPost.html" id="createPost" class="item-link list-button close-panel">Submit a new post</a>
</li>
<li>
<a href="postList.html" class="item-link list-button close-panel">View current posts</a>
</li>
<li>
<a href="messages.html" id="viewMessages" class="item-link list-button close-panel">Messages</a>
</li>

<li>
<a href="#" id="logout" onclick="logout()" class="item-link list-button close-panel">Logout</a>
</li>
<li>
<a href="myPosts.html" id="myPost" class="item-link list-button close-panel">My Posts</a>
</li>
<li>
<a href="createPost.html" id="createPost" class="item-link list-button close-panel">Submit a new post</a>
</li>
<li>
<a href="postList.html" class="item-link list-button close-panel">View current posts</a>
</li>
<li>
<a href="messages.html" id="viewMessages" class="item-link list-button close-panel">Messages</a>
</li>
<li>
<a href="#" id="logout" onclick="logout()" class="item-link list-button close-panel">Logout</a>
</li>
</ul>
</div>
</div>
Expand Down Expand Up @@ -131,7 +131,7 @@

<script type="text/javascript" src="cordova.js"></script>
<script type="text/javascript" src="lib/framework7/js/framework7.min.js"></script>
<script src="https://maps.google.com/maps/api/js?key=AIzaSyDqwL4NIot6kxkU47LWMQl5-f4sKvHMKrM"></script>
<script src="https://maps.google.com/maps/api/js?key=AIzaSyDqwL4NIot6kxkU47LWMQl5-f4sKvHMKrM&libraries=geometry"></script>

<!--Loading Controllers-->
<script type="text/javascript" src="js/my-app.js"></script>
Expand Down
104 changes: 82 additions & 22 deletions OddJobb/www/js/controllers/jobpost.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,11 @@ myApp.onPageInit('post', function (page) {
season: 'img/green.jpg',
text: post.content,
creator: post.creator,
postalCode: post.postalCode,
postID: post._id
})
map = new GMaps({
div: '#map',
lat: -12.043333,
lng: -77.028333
});
address(post.postalCode);
}
Expand All @@ -34,9 +33,15 @@ myApp.onPageInit('post', function (page) {
});
})


myApp.onPageInit('postList', function (page) {
const posts = [];
var posts = [];
var changes = 0;

var myList = myApp.virtualList('.postlist', {
items: posts,
template: cardTemplateDistance
});

$$.ajax({
url: 'http://oddjobbackend.herokuapp.com/posts',
method: 'GET',
Expand All @@ -49,24 +54,42 @@ myApp.onPageInit('postList', function (page) {
posts.push({
title: post.title,
date: new Date(post.postDate).toDateString(),
postalCode: post.postalCode,
season: 'img/green.jpg',
text: post.content,
creator: post.creator,
postID: post._id,
item: user,
email: window.user
email: window.user,
distance: ''
})
}
});
const myList = myApp.virtualList('.postlist', {
items: posts,
template: cardTemplate
});
})

myList.replaceAllItems(posts);
}
});
// postPost();

const notify = () => {
changes++;
posts = posts.sort(function (post1, post2) {
return parseInt(post1.distance) - parseInt(post2.distance);
});
myList.replaceAllItems(posts);
}

$$('#get-address').click(function () {
const postalCode = $$('#distance-address').val();
GMaps.geocode({
address: postalCode,
callback: function (results, status) {
if (status == 'OK') {
var latlng = results[0].geometry.location;
getAddresses(posts, { lat: latlng.lat, lng: latlng.lng }, notify);
}
}
});
console.log(posts);
});
})


Expand All @@ -84,6 +107,7 @@ myApp.onPageInit('myPosts', function (page) {
date: new Date(post.postDate).toDateString(),
season: 'img/green.jpg',
text: post.content,
postalCode: post.postalCode,
creator: post.creator,
postID: post._id
})
Expand Down Expand Up @@ -114,16 +138,34 @@ function address(adr) {
});
}

function getAddresses(postList, latlong, callbackFn) {
const latlngList = [];

postList.forEach((post) => {
GMaps.geocode({
address: post.postalCode,
callback: function (results, status) {
if (status == 'OK') {
var latlng = results[0].geometry.location;
const postCoords = {
lat: latlng.lat,
lng: latlng.lng
};
post.distance = calcDistance(postCoords, latlong);
console.log(post.distance);
callbackFn();
}
else {
console.log(post.postID);
}
}
});
})
return latlngList;
}


function postPost() {
$$.ajax({
url: `http://oddjobbackend.herokuapp.com/newPost?title=${'snow mowing required'}&creator=${1234}&content=${'guys please help my snow is too large'}&uniqueID=${'asdf'}&category${'summer'}&postalCode=${'L2N 2H4'}`,
method: 'POST',
success: (response) => {
console.log(response);
}
});
function calcDistance(p1, p2) {
return (google.maps.geometry.spherical.computeDistanceBetween(p1, p2) / 10).toFixed(2) + 'm';
}


Expand Down Expand Up @@ -154,7 +196,25 @@ const cardTemplate2 =
' </div>' +
' </div>' +
' <div class="card-footer">' +
' <a href="#" class="button">Contact</a>' +
' <a href="indMsg.html?personName={{item}}&email={{email}}" class="button">Contact</a>' +
' </div>' +
'</div >';


const cardTemplateDistance =
'<div class="card" >' +
' <div style="background-image:url({{season}})" valign="bottom" class="card-header color-white"></div>' +
' <div class="card-content">' +
' <div class="card-content-inner">' +
' <p class="color-gray">Posted on {{date}}</p>' +
' <h3 class=card-title">{{title}}</h3>' +
' <p>{{text}}</p>' +
' <h3 class=right>Distance: {{distance}} </h3>' +
' </div>' +
' </div>' +
' <div class="card-footer">' +
' <a href="post.html?postID={{postID}}" class="button">Map</a>' +
' <a href="indMsg.html?personName={{item}}&email={{email}}" class="button">Contact</a>' +
' </div>' +
'</div >';

Expand Down
5 changes: 5 additions & 0 deletions OddJobb/www/postList.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,11 @@
<div class="pages">
<div data-page="postList" class="page">
<div class="page-content">
<div class="item-title label">Name</div>
<div class="item-input">
<input id="distance-address" type="text" placeholder="Postal Code">
<a href="#" id="get-address" list-button>Submit</a>
</div>
<div class="postlist">
<!-- keep it empty -->
</div>
Expand Down