Commit 567cf4c1 authored by Athanasios's avatar Athanasios
Browse files

make boundingbox optional

parent a2fae1e5
......@@ -2,7 +2,31 @@ const fs = require("fs");
const boxIntersect = require("box-intersect");
const path = require('path');
const getIntersectingLayers = (bb, layers) => {
const getLayers = (layers, boundingbox) => {
if (boundingbox === undefined) {
return new Promise((resolve, reject) => {
fs.readFile("./assets/assets.json", (err, data) => {
if (err) {
reject();
}
let assets = JSON.parse(data);
let requestedLayers = layers.split(",");
assets = assets.filter(asset => requestedLayers.includes(asset.id));
assets = assets.filter(asset => asset.scope == "public");
resolve(assets);
});
});
} else {
return getIntersectingLayers(layers, boundingbox);
}
}
const getIntersectingLayers = (layers,bb) => {
return new Promise((resolve, reject) => {
fs.readFile("./assets/assets.json", (err, data) => {
......@@ -77,7 +101,7 @@ const isPublic = (url) => {
let assets = JSON.parse(data);
assets = assets.filter(asset => {
let parentDir = path.dirname(asset.url);
return !path.relative(parentDir, url).startsWith("..");
return !path.relative(parentDir, url).startsWith("..");
});
if (assets.length == 0) {
resolve(false);
......@@ -93,4 +117,4 @@ const isPublic = (url) => {
}
module.exports = { getIntersectingLayers, allLayersExist, getPublicLayers, isPublic };
\ No newline at end of file
module.exports = { getLayers, allLayersExist, getPublicLayers, isPublic };
\ No newline at end of file
......@@ -2,7 +2,7 @@ const assets = require("../src/assets");
const getSceneHandler = (req, res) => {
assets.getIntersectingLayers(req.query.boundingbox, req.query.layers).then(layers => {
assets.getLayers(req.query.layers, req.query.boundingbox).then(layers => {
layers = layers.map(layer => {
delete layer.scope;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment