Merged hotfix-0.6.4 into develop
commit
c01adb8b37
|
@ -1,5 +1,9 @@
|
||||||
# Tracman Server Changelog
|
# Tracman Server Changelog
|
||||||
###### v 0.6.3
|
###### v 0.6.4
|
||||||
|
|
||||||
|
#### v0.6.4
|
||||||
|
|
||||||
|
* [#92](https://github.com/Tracman-org/Server/issues/92) Fixed blank map issue
|
||||||
|
|
||||||
#### v0.6.3
|
#### v0.6.3
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
# <img align="left" src="/static/img/icon/by/48.png" alt="[]" title="The Tracman Logo">Tracman
|
# <img align="left" src="/static/img/icon/by/48.png" alt="[]" title="The Tracman Logo">Tracman
|
||||||
###### v 0.6.3
|
###### v 0.6.4
|
||||||
|
|
||||||
node.js application to display a sharable map with user's location.
|
node.js application to display a sharable map with user's location.
|
||||||
|
|
||||||
|
@ -52,6 +52,9 @@ Tracman will be updated according to [this branching model](http://nvie.com/post
|
||||||
|
|
||||||
[view full changelog](CHANGELOG.md)
|
[view full changelog](CHANGELOG.md)
|
||||||
|
|
||||||
|
#### v0.6.4
|
||||||
|
|
||||||
|
* [#92](https://github.com/Tracman-org/Server/issues/92) Fixed blank map issue
|
||||||
|
|
||||||
#### v0.6.3
|
#### v0.6.3
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "tracman",
|
"name": "tracman",
|
||||||
"version": "0.6.3",
|
"version": "0.6.4",
|
||||||
"description": "Tracks user's GPS location",
|
"description": "Tracks user's GPS location",
|
||||||
"main": "server.js",
|
"main": "server.js",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
|
|
@ -62,7 +62,8 @@ function toggleMaps(loc) {
|
||||||
$('#map').hide();
|
$('#map').hide();
|
||||||
$('#pano').hide();
|
$('#pano').hide();
|
||||||
$('#notset').show();
|
$('#notset').show();
|
||||||
} else {
|
}
|
||||||
|
else {
|
||||||
$('#map').show();
|
$('#map').show();
|
||||||
$('#pano').show();
|
$('#pano').show();
|
||||||
$('#notset').hide();
|
$('#notset').hide();
|
||||||
|
@ -83,6 +84,7 @@ window.gmapsCb = function() {
|
||||||
// Create map
|
// Create map
|
||||||
if (disp!=='1') {
|
if (disp!=='1') {
|
||||||
//console.log("Creating map...");
|
//console.log("Creating map...");
|
||||||
|
|
||||||
map = new google.maps.Map( mapElem, {
|
map = new google.maps.Map( mapElem, {
|
||||||
center: new google.maps.LatLng( mapuser.last.lat, mapuser.last.lon ),
|
center: new google.maps.LatLng( mapuser.last.lat, mapuser.last.lon ),
|
||||||
panControl: false,
|
panControl: false,
|
||||||
|
@ -185,17 +187,15 @@ socket.on('get', function(loc) {
|
||||||
|
|
||||||
// Parse location
|
// Parse location
|
||||||
loc = parseLoc(loc);
|
loc = parseLoc(loc);
|
||||||
|
|
||||||
// Update map
|
// Update map
|
||||||
if (disp!=='1') {
|
if (disp!=='1') {
|
||||||
|
|
||||||
// Update time
|
// Update time
|
||||||
$('#timestamp').text('location updated '+loc.tim);
|
$('#timestamp').text('location updated '+loc.tim);
|
||||||
|
|
||||||
// Show or hide map
|
|
||||||
toggleMaps(loc);
|
|
||||||
|
|
||||||
// Update marker and map center
|
// Update marker and map center
|
||||||
|
google.maps.event.trigger(map,'resize');
|
||||||
map.setCenter({ lat:loc.lat, lng:loc.lon });
|
map.setCenter({ lat:loc.lat, lng:loc.lon });
|
||||||
marker.setPosition({ lat:loc.lat, lng:loc.lon });
|
marker.setPosition({ lat:loc.lat, lng:loc.lon });
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue