Skip to content
This repository has been archived by the owner on Jun 7, 2023. It is now read-only.

Additional metadata properties #57

Merged
merged 5 commits into from
Dec 22, 2016
Merged

Additional metadata properties #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
32b5813
Add support for "tags" and "license" metdata properties
nbumbarger Dec 19, 2016
b33bfa8
Lint
nbumbarger Dec 19, 2016
48e0846
Fix failing test by updating fixtures with required fields
nbumbarger Dec 20, 2016
26e8ba0
Remove hapi server initialization (necessary for local testing)
nbumbarger Dec 20, 2016
2b94ae0
Minify test JSON
nbumbarger Dec 20, 2016
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: 2 additions & 0 deletions models/upload.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ var sceneSchema = Joi.object().keys({
acquisition_start: Joi.date().required(),
acquisition_end: Joi.date().required(),
tms: Joi.string().allow(null),
license: Joi.string().required(),
tags: Joi.string().allow(null),
urls: Joi.array().items(Joi.string().uri({scheme: ['http', 'https', 'gdrive', 'file']}))
.min(1).required()
});
Expand Down
25 changes: 1 addition & 24 deletions test/fixture/NE1_50M_SR.input.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1 @@
{
"uploader": {
"name": "Lady Stardust",
"email": "[email protected]"
},
"scenes": [
{
"contact": {
"name": "Ziggy",
"email": "[email protected]"
},
"title": "Natural Earth Image",
"provider": "Natural Earth",
"sensor": "Some Algorithm",
"platform": "satellite",
"acquisition_start": "2015-04-01T00:00:00.000",
"acquisition_end": "2015-04-30T00:00:00.000",
"tms": null,
"urls": [
"http://localhost:8080/NE1_50M_SR.tif"
]
}
]
}
{"uploader":{"name":"Lady Stardust","email":"[email protected]"},"scenes":[{"contact":{"name":"Ziggy","email":"[email protected]"},"title":"Natural Earth Image","provider":"Natural Earth","sensor":"Some Algorithm","platform":"satellite","acquisition_start":"2015-04-01T00:00:00.000","acquisition_end":"2015-04-30T00:00:00.000","tms":null,"license":"MIT","tags":"tropical, paradise","urls":["http://localhost:8080/NE1_50M_SR.tif"]}]}
2 changes: 1 addition & 1 deletion test/fixture/NE1_50M_SR.output.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"uuid":"http://oam-uploader.s3.amazonaws.com/uploads/2015-08-18/55d3b052f885a1bb0221434b/scene/0/scene-0-image-0-NE1_50M_SR.tif","title":"Natural Earth Image","projection":"GEOGCS[\"WGS 84\",DATUM[\"WGS_1984\",SPHEROID[\"WGS 84\",6378137,298.257223563,AUTHORITY[\"EPSG\",\"7030\"]],AUTHORITY[\"EPSG\",\"6326\"]],PRIMEM[\"Greenwich\",0],UNIT[\"degree\",0.0174532925199433],AUTHORITY[\"EPSG\",\"4326\"]]","bbox":[128.99999999999997,29.000000000000004,146,54],"footprint":"POLYGON((128.99999999999997 54,146 54,146 29.000000000000004,128.99999999999997 29.000000000000004,128.99999999999997 54))","gsd":0.03333333333333333,"file_size":402897,"acquisition_start":"2015-04-01T00:00:00.000Z","acquisition_end":"2015-04-30T00:00:00.000Z","platform":"satellite","provider":"Natural Earth","contact":"Ziggy,[email protected]","properties":{"sensor":"Some Algorithm","thumbnail":"http://oam-uploader.s3.amazonaws.com/uploads/2015-08-18/55d3b052f885a1bb0221434b/scene/0/scene-0-image-0-NE1_50M_SR.tif.thumb.png","tms":null}}
{"uuid":"http://oam-uploader.s3.amazonaws.com/uploads/2015-08-18/55d3b052f885a1bb0221434b/scene/0/scene-0-image-0-NE1_50M_SR.tif","title":"Natural Earth Image","projection":"GEOGCS[\"WGS 84\",DATUM[\"WGS_1984\",SPHEROID[\"WGS 84\",6378137,298.257223563,AUTHORITY[\"EPSG\",\"7030\"]],AUTHORITY[\"EPSG\",\"6326\"]],PRIMEM[\"Greenwich\",0],UNIT[\"degree\",0.0174532925199433],AUTHORITY[\"EPSG\",\"4326\"]]","bbox":[128.99999999999997,29.000000000000004,146,54],"footprint":"POLYGON((128.99999999999997 54,146 54,146 29.000000000000004,128.99999999999997 29.000000000000004,128.99999999999997 54))","gsd":0.03333333333333333,"file_size":402897,"acquisition_start":"2015-04-01T00:00:00.000Z","acquisition_end":"2015-04-30T00:00:00.000Z","platform":"satellite","provider":"Natural Earth","contact":"Ziggy,[email protected]","license":"MIT","tags":"tropical, paradise","properties":{"sensor":"Some Algorithm","thumbnail":"http://oam-uploader.s3.amazonaws.com/uploads/2015-08-18/55d3b052f885a1bb0221434b/scene/0/scene-0-image-0-NE1_50M_SR.tif.thumb.png","tms":null}}
2 changes: 1 addition & 1 deletion test/fixture/upload-status.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"_id":"55e0c86b24c379c000544d24","uploader":{"name":"Lady Stardust","email":"[email protected]"},"scenes":[{"contact":{"name":"Ziggy","email":"[email protected]"},"title":"Natural Earth Image","provider":"Natural Earth","sensor":"Some Algorithm","platform":"satellite","acquisition_start":"2015-04-01T00:00:00.000Z","acquisition_end":"2015-04-30T00:00:00.000Z","tms":null,"images":[{"_id":"55e0c86a24c379c000544d23","url":"http://localhost:8080/NE1_50M_SR.tif","status":"finished","messages":[],"startedAt":"2015-08-28T20:45:31.062Z","metadata":{"uuid":"http://oam-uploader.s3.amazonaws.com/uploads/2015-08-28/55e0c86b24c379c000544d24/scene/0/scene-0-image-0-NE1_50M_SR.tif","title":"Natural Earth Image","projection":"GEOGCS[\"WGS 84\",DATUM[\"WGS_1984\",SPHEROID[\"WGS 84\",6378137,298.257223563,AUTHORITY[\"EPSG\",\"7030\"]],AUTHORITY[\"EPSG\",\"6326\"]],PRIMEM[\"Greenwich\",0],UNIT[\"degree\",0.0174532925199433],AUTHORITY[\"EPSG\",\"4326\"]]","bbox":[128.99999999999997,29.000000000000004,146,54],"footprint":"POLYGON((128.99999999999997 54,146 54,146 29.000000000000004,128.99999999999997 29.000000000000004,128.99999999999997 54))","gsd":0.03333333333333333,"file_size":402897,"acquisition_start":"2015-04-01T00:00:00.000Z","acquisition_end":"2015-04-30T00:00:00.000Z","platform":"satellite","provider":"Natural Earth","contact":"Ziggy,[email protected]","properties":{"sensor":"Some Algorithm","thumbnail":"http://oam-uploader.s3.amazonaws.com/uploads/2015-08-28/55e0c86b24c379c000544d24/scene/0/scene-0-image-0-NE1_50M_SR.tif.thumb.png","tms":null}},"stoppedAt":"2015-08-28T20:45:31.247Z"}]}],"createdAt":"2015-08-28T20:45:30.820Z"}
{"_id":"55e0c86b24c379c000544d24","uploader":{"name":"Lady Stardust","email":"[email protected]"},"scenes":[{"contact":{"name":"Ziggy","email":"[email protected]"},"title":"Natural Earth Image","provider":"Natural Earth","sensor":"Some Algorithm","platform":"satellite","acquisition_start":"2015-04-01T00:00:00.000Z","acquisition_end":"2015-04-30T00:00:00.000Z","tms":null,"license":"MIT","tags":"tropical, paradise","images":[{"_id":"55e0c86a24c379c000544d23","url":"http://localhost:8080/NE1_50M_SR.tif","status":"finished","messages":[],"startedAt":"2015-08-28T20:45:31.062Z","metadata":{"uuid":"http://oam-uploader.s3.amazonaws.com/uploads/2015-08-28/55e0c86b24c379c000544d24/scene/0/scene-0-image-0-NE1_50M_SR.tif","title":"Natural Earth Image","projection":"GEOGCS[\"WGS 84\",DATUM[\"WGS_1984\",SPHEROID[\"WGS 84\",6378137,298.257223563,AUTHORITY[\"EPSG\",\"7030\"]],AUTHORITY[\"EPSG\",\"6326\"]],PRIMEM[\"Greenwich\",0],UNIT[\"degree\",0.0174532925199433],AUTHORITY[\"EPSG\",\"4326\"]]","bbox":[128.99999999999997,29.000000000000004,146,54],"footprint":"POLYGON((128.99999999999997 54,146 54,146 29.000000000000004,128.99999999999997 29.000000000000004,128.99999999999997 54))","gsd":0.03333333333333333,"file_size":402897,"acquisition_start":"2015-04-01T00:00:00.000Z","acquisition_end":"2015-04-30T00:00:00.000Z","platform":"satellite","provider":"Natural Earth","contact":"Ziggy,[email protected]","license":"MIT","tags":"tropical, paradise","properties":{"sensor":"Some Algorithm","thumbnail":"http://oam-uploader.s3.amazonaws.com/uploads/2015-08-28/55e0c86b24c379c000544d24/scene/0/scene-0-image-0-NE1_50M_SR.tif.thumb.png","tms":null}},"stoppedAt":"2015-08-28T20:45:31.247Z"}]}],"createdAt":"2015-08-28T20:45:30.820Z"}
2 changes: 2 additions & 0 deletions worker/process-image.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,8 @@ function generateMetadata (scene, path, key, callback) {
platform: scene.platform,
provider: scene.provider,
contact: [scene.contact.name.replace(',', ';'), scene.contact.email].join(','),
license: scene.license,
tags: scene.tags,
properties: {
tms: scene.tms,
sensor: scene.sensor
Expand Down