kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-26 13:36:15 +00:00
Code Issues Projects Releases Wiki Activity

Add openstreetmap with a mapbox.com layer. #420

Browse Source
This commit is contained in:
James Cole
2017-09-30 17:50:22 +02:00
parent c0d62dfc86
commit cc61281523
24 changed files with 14474 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/Http/Controllers/TagController.php
View File

@@ -157,10 +157,19 @@ class TagController extends Controller
*/
public function index(TagRepositoryInterface $repository)
{
// collect tags by year:
// start with oldest tag
$oldestTag = $repository->oldestTag();
/** @var Carbon $start */
$start = clone(session('first'));
$start = new Carbon;
if (!is_null($oldestTag)) {
/** @var Carbon $start */
$start = $oldestTag->date;
}
if (is_null($oldestTag)) {
/** @var Carbon $start */
$start = clone(session('first'));
}
$now = new Carbon;
$clouds = [];
$clouds['no-date'] = $repository->tagCloud(null);

9
app/Http/Requests/TagFormRequest.php
View File

@@ -40,10 +40,11 @@ class TagFormRequest extends Request
$latitude = null;
$longitude = null;
$zoomLevel = null;
if ($this->get('setTag') === 'true') {
$latitude = $this->string('latitude');
$longitude = $this->string('longitude');
$zoomLevel = $this->integer('zoomLevel');
if ($this->get('tag_position_has_tag') === 'true') {
$latitude = $this->string('tag_position_latitude');
$longitude = $this->string('tag_position_longitude');
$zoomLevel = $this->integer('tag_position_zoomlevel');
}
$data = [