All4DK
/
wikipoints
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ADD вывод длины трека

This commit is contained in:
Krivchikov Dmitry 2016-05-29 10:34:00 +03:00
parent d23756c16e
commit 77570db7a8
5 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
classes/Geo.php
View File

@ -17,7 +17,10 @@ class Geo
$delta_lng = ($lng2 - $lng1); $delta_lng = ($lng2 - $lng1);
return (6378137 * acos(cos($lat1) * cos($lat2) * cos($lng1 - $lng2) + sin($lat1) * sin($lat2))); return (6378137 * acos(cos($lat1) * cos($lat2) * cos($lng1 - $lng2) + sin($lat1) * sin($lat2)));
// return round(6378137 * acos(cos($lat1) * cos($lat2) * cos($lng1 - $lng2) + sin($lat1) * sin($lat2)));
} }
static function formatedDistance($distance)
{
return $distance > 1000 ? round($distance/1000, 2).'km' : round($distance).'m';
}
} }

4
models/Trips.php
View File

@ -18,4 +18,8 @@ class Trips extends Model
return new self(); return new self();
} }
function getDistance()
{
return Geo::formatedDistance($this->distance);
}
} }

1
public/js/map.js
View File

@ -244,6 +244,7 @@ function initPoints(useBounds)
} else if (getURLParameter('track') != 'null') } else if (getURLParameter('track') != 'null')
{ {
showTrack(getURLParameter('track')) showTrack(getURLParameter('track'))
$('#trackShowHide' + getURLParameter('track')).prop('checked', true);
} }
} }
}); });

2
public/js/tracks.js
View File

@ -40,7 +40,7 @@ function hideTrack(id)
function loadTrack(id) function loadTrack(id)
{ {
colors = ['#e93333', '#fea22e', '#ff0', '#0f0', '#4267de', '#e42086', '#333']; colors = ['#ff0000', '#ff8e00', '#ff0', '#0f0', '#003cff', '#ff00ad'];
colorIndex = 0; colorIndex = 0;
tracks = new Array(); tracks = new Array();
markers = new Array(); markers = new Array();

1
views/indexTemplate.php
View File

@ -116,6 +116,7 @@ if (App::$user) {
<div style="border-bottom: solid 1px #CCC"> <div style="border-bottom: solid 1px #CCC">
<input type="checkbox" id="trackShowHide<?= $track->id ?>" onchange="showHideTrack(<?= $track->id ?>)" /> <input type="checkbox" id="trackShowHide<?= $track->id ?>" onchange="showHideTrack(<?= $track->id ?>)" />
<?= $track->name ?> <?= $track->name ?>
<b><?= $track->getDistance(); ?></b>
<?php if($track->status == Trips::STATUS_PUBLIC):?> <?php if($track->status == Trips::STATUS_PUBLIC):?>
<a href="/?track=<?= $track->id ?>" title="Ссылка на трек. <?="\n"?>[клик правой кнопкой -> копировать адрес]"> <a href="/?track=<?= $track->id ?>" title="Ссылка на трек. <?="\n"?>[клик правой кнопкой -> копировать адрес]">
<span class="glyphicon glyphicon-link" aria-hidden="true"></span> <span class="glyphicon glyphicon-link" aria-hidden="true"></span>