Skip to content
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.

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

Implement context fusion #60

Draft
wants to merge 40 commits into
base: geo_upload
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
b8a3f1e
added annotationsSettingsTab mixin for geo context-layer
mtiessen1175 Sep 6, 2024
e4cd4df
Rename files as allocation already clear from directory-structure
mtiessen1175 Sep 9, 2024
6df3a4f
Added annotations script (also included to publisher) in order to loa…
mtiessen1175 Sep 9, 2024
d02335e
remove console statements
mtiessen1175 Sep 9, 2024
d15366d
added production file (public annotations script)
mtiessen1175 Sep 9, 2024
f89eb86
Fixed missing <script> tag and added overlays to settingsTab.
mtiessen1175 Sep 10, 2024
ff117b0
Merge branch 'geo_upload' into context_fusion
mtiessen1175 Sep 11, 2024
c8f9335
Merge branch 'geo_upload' into context_fusion
mtiessen1175 Sep 11, 2024
8e6ce33
Merge branch 'geo_upload' into context_fusion
mtiessen1175 Sep 13, 2024
4834c0c
Include list of geo overlays to select from in annotation-settings.
mtiessen1175 Sep 17, 2024
9736999
added production ready files
mtiessen1175 Sep 17, 2024
72c8c5b
removed console statement
mtiessen1175 Sep 18, 2024
7d3b9e6
added production files
mtiessen1175 Sep 18, 2024
ed4c84e
Added annotationCanvasMixin for context layer to geo-module
mtiessen1175 Sep 18, 2024
ab5f76e
added production files
mtiessen1175 Sep 18, 2024
cd28d28
Merge branch 'geo_upload' into context_fusion
mtiessen1175 Sep 25, 2024
c243315
Updated OpenLayers imports to new biigle path
mtiessen1175 Sep 25, 2024
3107886
Added basic layer structure for WMS source to settingsTab.
mtiessen1175 Sep 27, 2024
b3c1913
Small linter fix and production files.
mtiessen1175 Sep 27, 2024
33d8bc0
Merge branch 'geo_upload' into context_fusion (working geoTIFF vis)
mtiessen1175 Oct 4, 2024
e146bd7
Save the context-layer settings (active overlay, opacity) in annotati…
mtiessen1175 Oct 8, 2024
dca8dcd
removed annotationCanvasMixin.
mtiessen1175 Oct 8, 2024
780f9e0
added geoTIFF TIlelayer to annotation map.
mtiessen1175 Oct 9, 2024
21b31bb
Changed watcher to properly add/update layer upon changes.
mtiessen1175 Oct 10, 2024
0676eed
minor changes (comment)
mtiessen1175 Oct 10, 2024
5d1315a
Fixed "map undefined" error on sidebar.toggle event.
mtiessen1175 Oct 14, 2024
d99482b
Added API route for receiving image metadata.
mtiessen1175 Oct 14, 2024
471c5c8
Fetch entire Image object (with metadata). Calculated correct context…
mtiessen1175 Oct 15, 2024
868a79a
changed calculateExtent function dependencies.
mtiessen1175 Oct 17, 2024
bb4e24b
Attempt to rotate context-layer (not working)
mtiessen1175 Oct 17, 2024
e2f9103
rotation and scale of overlay in experimental state.
mtiessen1175 Oct 23, 2024
8e4758e
Added OL prerender function for rotation of contextLayer
mtiessen1175 Oct 30, 2024
533326b
Fixed if-statement to account for undefined as well.
mtiessen1175 Nov 4, 2024
43716a2
experimental prerender rotate-function (not working yet)
mtiessen1175 Nov 11, 2024
771b888
Implemented mosaic rotation (adapted for cases that use the lower lef…
mtiessen1175 Nov 13, 2024
c2f9cd5
Merge branch 'geo_upload' into context_fusion
mtiessen1175 Nov 13, 2024
42a9c9f
Add scale method to adjust context-layer size
mtiessen1175 Nov 21, 2024
baf6cce
small fixes
mtiessen1175 Nov 21, 2024
617469b
Adapt the scale method (reset scale to 1 after each change).
mtiessen1175 Nov 22, 2024
6679db2
Added comment to code.
mtiessen1175 Nov 22, 2024
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
4 changes: 3 additions & 1 deletion src/GeoServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,9 @@ public function boot(Modules $modules, Router $router)
'volumesStyles',
'volumesEditRight',
'volumesEditScripts',
'volumesEditStyles'
'volumesEditStyles',
'annotationsScripts',
'annotationsSettingsTab',
],
'apidoc' => [__DIR__.'/Http/Controllers/Api/'],
]);
Expand Down
46 changes: 46 additions & 0 deletions src/Http/Controllers/Api/ImageMetadataController.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
<?php

namespace Biigle\Modules\Geo\Http\Controllers\Api;

use Biigle\Http\Controllers\Api\Controller;
use Biigle\Image;

class ImageMetadataController extends Controller
{
/**
* Get the image metadata.
*
* @api {get} volumes/{id}/images/metadata/{image_id} Get images with metadata
* @apiGroup Images
* @apiName getImageMetadata
* @apiPermission projectMember
* @apiDescription Returns metadata of images.
*
* @apiParam {Number} volumeId
* @apiParam {Number} imageId
*
* @apiSuccessExample {json} Success response:
* ['id': 2,
* 'filename': 'image1',
* 'volume_id': 2,
* 'uuid': bc4f17bc-459f-4a68-9003A-35addec7354f,
* 'taken_at': 2024-08-13 21:44:12,
* 'lng': 414919.629674,
* 'lat': 8032131.178341,
* 'attrs': {'metadata': {'gps_altitude': -3429.406, 'yaw': 129.130866},
* 'width': 2800,
* 'height': 4320
* },
* 'tiled': f
* ]
*
* @param int $volumeId
* @param int $imageId
* @return Biigle\Image
*/
public function getImageMetadata($volumeId, $imageId)
{
$image = Image::where('volume_id', $volumeId)->where('id', $imageId)->first();
return $image;
}
}
2 changes: 2 additions & 0 deletions src/public/assets/scripts/annotations.js

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions src/public/assets/scripts/annotations.js.LICENSE.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
/*!
* Vue.js v2.6.14
* (c) 2014-2021 Evan You
* Released under the MIT License.
*/
1 change: 1 addition & 0 deletions src/public/mix-manifest.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"/assets/scripts/main.js": "/assets/scripts/main.js?id=5d75e90309015b8aad9b612f52a6979f",
"/assets/scripts/volumes.js": "/assets/scripts/volumes.js?id=f487d8fe79d9ae5c2eb5c53edc02c374",
"/assets/scripts/annotations.js": "/assets/scripts/annotations.js?id=305559ed397c61a8e6f2a2e1bbba4fea",
"/assets/styles/main.css": "/assets/styles/main.css?id=b692ef8518741236ded072068dddeb05"
}
1 change: 1 addition & 0 deletions src/resources/assets/js/annotations/annotations.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
import './settingsTabPlugins';
10 changes: 10 additions & 0 deletions src/resources/assets/js/annotations/api/imageMetadata.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
/**
* Resource for volume images with metadata.
*
* Get image metadata:
*
* resource.query({id: volumeId}).then(...)
*
* @type {Vue.resource}
*/
export default Vue.resource('api/v1/volumes{/id}/images/metadata{/image_id}', {});
Loading
Loading