diff --git a/3DGeoVolumes/collections/Stuttgart/Stuttgart.json b/3DGeoVolumes/collections/Stuttgart/Stuttgart.json
index 2644d4fc84c90771806f3ff933681a118853bd76..81715ecb51b6f087ce46db8055aac3f1f70b1c0f 100644
--- a/3DGeoVolumes/collections/Stuttgart/Stuttgart.json
+++ b/3DGeoVolumes/collections/Stuttgart/Stuttgart.json
@@ -41,56 +41,91 @@
}
],
"children": [
- {
- "id": "Stuttgart_LOD2_Stadtmitte",
- "title": "Stuttgart 3D Models LOD2 Stadtmitte Demo",
- "description": "All Supported 3D Containers for the city of Stuttgart 3D Models LOD2 Stadtmitte",
- "collectiontype": "3d-container",
- "extent": {
- "spatial": {
- "bbox": [
- [9.161434,48.771841,-10,9.183426,48.786318,550]
- ],
- "crs": "http://www.opengis.net/def/crs/OGC/0/CRS84h"
- }
- },
- "links": [
- {
- "rel": "collections",
- "href": "host_url/collections/",
- "type": "application/json"
- },
- {
- "title": "Stuttgart LOD2 Stadtmitte - Collections",
- "rel": "self",
- "href": "host_url/collections/Stuttgart/Stuttgart_LOD2_Stadtmitte",
- "type": "application/json"
- },
- {
- "title": "Stuttgart LOD2 Stadtmitte : 3D Tiles",
- "rel": "items",
- "href": "http://193.196.37.89:8092/AssetsHFT/3DTile_Stuttgart_City_LoD2_InnenStadt_ClampToGround/tileset.json",
- "type": "application/json+3dtiles"
- }
- ],
- "children": [
-
+ {
+ "id": "HFTBuilding2_3DModel",
+ "title": "HFT Building 2 - 3D Model",
+ "description": "3D Building Model of the HFT Stuttgart created by SketchUp and converted with CityEngine and FME.",
+ "collectiontype": "3d-container",
+ "extent": {
+ "spatial": {
+ "bbox": [
+ [
+ 9.1729205436,
+ 48.7794377214,
+ -10,
+ 9.1738475153,
+ 48.7802408522,
+ 550
+ ]
],
- "content": [
- {
- "title": "Stuttgart LOD2 Stadtmitte - Collections",
- "rel": "original",
- "href": "host_url/collections/Stuttgart/Stuttgart_LOD2_Stadtmitte",
- "type": "application/json"
- },
- {
- "title": "Stuttgart LOD2 Stadtmitte : 3D Tiles",
- "rel": "original",
- "href": "http://193.196.37.89:8092/AssetsHFT/3DTile_Stuttgart_City_LoD2_InnenStadt_ClampToGround/tileset.json",
- "type": "application/json+3dtiles"
- }
- ]
+ "crs": "http://www.opengis.net/def/crs/OGC/0/CRS84h"
+ }
+ },
+ "links": [
+ {
+ "rel": "collections",
+ "href": "https://steinbeis-3dps.eu/3DGeoVolumes/collections/",
+ "type": "application/json"
+ },
+ {
+ "title": "Stuttgart Collections",
+ "rel": "self",
+ "href": "https://steinbeis-3dps.eu/3DGeoVolumes/collections/Stuttgart",
+ "type": "application/json"
+ },
+ {
+ "title": "HFT Building 2 - 3D Model: i3s",
+ "rel": "items",
+ "href": "https://steinbeis-3dps.eu/3DGeoVolumes/collections/Stuttgart/HFTBuilding2_3DModel/i3s",
+ "type": "application/json+i3s"
+ },
+ {
+ "title": "HFT Building 2 - 3D Model: 3D Tiles",
+ "rel": "items",
+ "href": "https://steinbeis-3dps.eu/3DGeoVolumes/collections/Stuttgart/HFTBuilding2_3DModel/3dtiles",
+ "type": "application/json+3dtiles"
+ },
+ {
+ "title": "HFT Building 2 - 3D Model: USDZ",
+ "rel": "items",
+ "href": "https://steinbeis-3dps.eu/3DGeoVolumes/collections/Stuttgart/HFTBuilding2_3DModel/usdz",
+ "type": "application/usdz"
+ },
+ {
+ "title": "HFT Building 2 - 3D Model: gltf",
+ "rel": "items",
+ "href": "https://steinbeis-3dps.eu/3DGeoVolumes/collections/Stuttgart/HFTBuilding2_3DModel/gltf",
+ "type": "application/gltf"
}
+ ],
+ "children": [],
+ "content": [
+ {
+ "title": "HFT Building 2 - 3D Model: i3s",
+ "rel": "items",
+ "href": "https://steinbeis-3dps.eu/3DGeoVolumes/collections/Stuttgart/HFTBuilding2_3DModel/i3s",
+ "type": "application/json+i3s"
+ },
+ {
+ "title": "HFT Building 2 - 3D Model: 3D Tiles",
+ "rel": "original",
+ "href": "https://steinbeis-3dps.eu/3DGeoVolumes/collections/Stuttgart/HFTBuilding2_3DModel/3dtiles",
+ "type": "application/json+3dtiles"
+ },
+ {
+ "title": "HFT Building 2 - 3D Model: USDZ",
+ "rel": "original",
+ "href": "https://steinbeis-3dps.eu/3DGeoVolumes/collections/Stuttgart/HFTBuilding2_3DModel/usdz",
+ "type": "application/usdz"
+ },
+ {
+ "title": "HFT Building 2 - 3D Model: gltf",
+ "rel": "original",
+ "href": "https://steinbeis-3dps.eu/3DGeoVolumes/collections/Stuttgart/HFTBuilding2_3DModel/gltf",
+ "type": "application/gltf"
+ }
+ ]
+ }
],
"content": [
{
diff --git a/3DGeoVolumes/collections/collections.json b/3DGeoVolumes/collections/collections.json
index 4ed1273af5bf14ccc8a3b723d586d6d027cebf92..742198f3928768f11e450dcabb760872086279db 100644
--- a/3DGeoVolumes/collections/collections.json
+++ b/3DGeoVolumes/collections/collections.json
@@ -105,14 +105,21 @@
],
"children": [
{
- "id": "Stuttgart_LOD2_Stadtmitte",
- "title": "Stuttgart 3D Models LOD2 Stadtmitte Demo",
- "description": "All Supported 3D Containers for the city of Stuttgart 3D Models LOD2 Stadtmitte",
+ "id": "HFTBuilding2_3DModel",
+ "title": "HFT Building 2 - 3D Model",
+ "description": "3D Building Model of the HFT Stuttgart created by SketchUp and converted with CityEngine and FME.",
"collectiontype": "3d-container",
"extent": {
"spatial": {
"bbox": [
- [9.161434,48.771841,-10,9.183426,48.786318,550]
+ [
+ 9.1729205436,
+ 48.7794377214,
+ -10,
+ 9.1738475153,
+ 48.7802408522,
+ 550
+ ]
],
"crs": "http://www.opengis.net/def/crs/OGC/0/CRS84h"
}
@@ -120,37 +127,65 @@
"links": [
{
"rel": "collections",
- "href": "host_url/collections/",
+ "href": "https://steinbeis-3dps.eu/3DGeoVolumes/collections/",
"type": "application/json"
},
{
- "title": "Stuttgart LOD2 Stadtmitte - Collections",
+ "title": "Stuttgart Collections",
"rel": "self",
- "href": "host_url/collections/Stuttgart/Stuttgart_LOD2_Stadtmitte",
+ "href": "https://steinbeis-3dps.eu/3DGeoVolumes/collections/Stuttgart",
"type": "application/json"
},
{
- "title": "Stuttgart LOD2 Stadtmitte : 3D Tiles",
+ "title": "HFT Building 2 - 3D Model: i3s",
"rel": "items",
- "href": "http://193.196.37.89:8092/AssetsHFT/3DTile_Stuttgart_City_LoD2_InnenStadt_ClampToGround/tileset.json",
+ "href": "https://steinbeis-3dps.eu/3DGeoVolumes/collections/Stuttgart/HFTBuilding2_3DModel/i3s",
+ "type": "application/json+i3s"
+ },
+ {
+ "title": "HFT Building 2 - 3D Model: 3D Tiles",
+ "rel": "items",
+ "href": "https://steinbeis-3dps.eu/3DGeoVolumes/collections/Stuttgart/HFTBuilding2_3DModel/3dtiles",
"type": "application/json+3dtiles"
+ },
+ {
+ "title": "HFT Building 2 - 3D Model: USDZ",
+ "rel": "items",
+ "href": "https://steinbeis-3dps.eu/3DGeoVolumes/collections/Stuttgart/HFTBuilding2_3DModel/usdz",
+ "type": "application/usdz"
+ },
+ {
+ "title": "HFT Building 2 - 3D Model: gltf",
+ "rel": "items",
+ "href": "https://steinbeis-3dps.eu/3DGeoVolumes/collections/Stuttgart/HFTBuilding2_3DModel/gltf",
+ "type": "application/gltf"
}
],
- "children": [
-
- ],
+ "children": [],
"content": [
{
- "title": "Stuttgart LOD2 Stadtmitte - Collections",
- "rel": "original",
- "href": "host_url/collections/Stuttgart/Stuttgart_LOD2_Stadtmitte",
- "type": "application/json"
+ "title": "HFT Building 2 - 3D Model: i3s",
+ "rel": "items",
+ "href": "https://steinbeis-3dps.eu/3DGeoVolumes/collections/Stuttgart/HFTBuilding2_3DModel/i3s",
+ "type": "application/json+i3s"
},
{
- "title": "Stuttgart LOD2 Stadtmitte : 3D Tiles",
+ "title": "HFT Building 2 - 3D Model: 3D Tiles",
"rel": "original",
- "href": "http://193.196.37.89:8092/AssetsHFT/3DTile_Stuttgart_City_LoD2_InnenStadt_ClampToGround/tileset.json",
+ "href": "https://steinbeis-3dps.eu/3DGeoVolumes/collections/Stuttgart/HFTBuilding2_3DModel/3dtiles",
"type": "application/json+3dtiles"
+ },
+ {
+ "title": "HFT Building 2 - 3D Model: USDZ",
+ "rel": "original",
+ "href": "https://steinbeis-3dps.eu/3DGeoVolumes/collections/Stuttgart/HFTBuilding2_3DModel/usdz",
+ "type": "application/usdz"
+ },
+ {
+ "title": "HFT Building 2 - 3D Model: gltf",
+ "rel": "original",
+ "href": "https://steinbeis-3dps.eu/3DGeoVolumes/collections/Stuttgart/HFTBuilding2_3DModel/gltf",
+ "type": "application/gltf"
}
]
}
diff --git a/server.js b/server.js
index 52f368243ac1ff2801e4c258579a990a3218a82b..60b4f6480954bf72fdee7969f3f93da7a72450dd 100644
--- a/server.js
+++ b/server.js
@@ -147,22 +147,19 @@
var collection_json = require(`./3DGeoVolumes/collections/${req.params.collectionsId}/${req.params.collectionsId}.json`)
res.json(collection_json);
} catch (error) {
- res.send("internal error at /3DGeoVolumes/collections/:collectionsId")
+ console.log(error)
+ res.send("internal error")
}
})
// request 3D Tiles
app.get('/collections/:collectionsId/3dtiles', function (req, res) {
try {
- if (req.params.collectionsId == "Stuttgart_LOD2_Stadtmitte") {
- res.redirect("http://193.196.37.89:8092/AssetsHFT/3DTile_Stuttgart_City_LoD2_InnenStadt_ClampToGround/tileset.json")
- } else {
var collections_3dtiles_json = require(`./3DGeoVolumes/collections/${req.params.collectionsId}/3dtiles/tileset.json`)
var collections_3dtiles_output = replace_server_url(collections_3dtiles_json)
res.json(collections_3dtiles_output);
- }
} catch (error) {
console.log(error)
- res.send("internal error at /3DGeoVolumes/collections/:collectionsId/3dtiles")
+ res.send("internal error")
}
})