EOX GitLab Instance

Skip to content
Snippets Groups Projects
Commit 33c29427 authored by Lubomir Dolezal's avatar Lubomir Dolezal
Browse files

Merge branch 'update-configurations' into 'master' 

Update configurations

See merge request !11
parents e0c048b7 08fa34bf
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 190192 additions and 623 deletions
cache/Dockerfile
+ 3
− 1
View file @ 33c29427
...@@ -56,7 +56,9 @@ ENV COLLECTION_ID= \ ...@@ -56,7 +56,9 @@ ENV COLLECTION_ID= \
OS_PASSWORD= \ OS_PASSWORD= \
OS_TENANT_NAME= \ OS_TENANT_NAME= \
OS_TENANT_ID= \ OS_TENANT_ID= \
OS_REGION_NAME= OS_REGION_NAME= \
BUCKET_NAME= \
BUCKET_NAME_FULL=
ADD configure.sh \ ADD configure.sh \
run-httpd.sh \ run-httpd.sh \
......
cache/configure.sh
+ 4
− 3
View file @ 33c29427
...@@ -13,6 +13,7 @@ cat /mapcache-template.xml \ ...@@ -13,6 +13,7 @@ cat /mapcache-template.xml \
| sed -e "s/{{OS_USERNAME}}/$(echo ${OS_USERNAME} | sed -e 's/[]\/$*.^[]/\\&/g')/g" \ | sed -e "s/{{OS_USERNAME}}/$(echo ${OS_USERNAME} | sed -e 's/[]\/$*.^[]/\\&/g')/g" \
| sed -e "s/{{OS_PASSWORD}}/$(echo ${OS_PASSWORD} | sed -e 's/[]\/$*.^[]/\\&/g')/g" \ | sed -e "s/{{OS_PASSWORD}}/$(echo ${OS_PASSWORD} | sed -e 's/[]\/$*.^[]/\\&/g')/g" \
| sed -e "s/{{BUCKET_NAME}}/$(echo ${BUCKET_NAME} | sed -e 's/[]\/$*.^[]/\\&/g')/g" \ | sed -e "s/{{BUCKET_NAME}}/$(echo ${BUCKET_NAME} | sed -e 's/[]\/$*.^[]/\\&/g')/g" \
| sed -e "s/{{BUCKET_NAME_FULL}}/$(echo ${BUCKET_NAME_FULL} | sed -e 's/[]\/$*.^[]/\\&/g')/g" \
| sed -e "s/{{DB_USER}}/$(echo ${DB_USER} | sed -e 's/[]\/$*.^[]/\\&/g')/g" \ | sed -e "s/{{DB_USER}}/$(echo ${DB_USER} | sed -e 's/[]\/$*.^[]/\\&/g')/g" \
| sed -e "s/{{DB_PW}}/$(echo ${DB_PW} | sed -e 's/[]\/$*.^[]/\\&/g')/g" \ | sed -e "s/{{DB_PW}}/$(echo ${DB_PW} | sed -e 's/[]\/$*.^[]/\\&/g')/g" \
| sed -e "s/{{DB_HOST}}/$(echo ${DB_HOST} | sed -e 's/[]\/$*.^[]/\\&/g')/g" \ | sed -e "s/{{DB_HOST}}/$(echo ${DB_HOST} | sed -e 's/[]\/$*.^[]/\\&/g')/g" \
...@@ -87,14 +88,14 @@ if [ ! -f "${INSTALL_DIR}/index.html" ] ; then ...@@ -87,14 +88,14 @@ if [ ! -f "${INSTALL_DIR}/index.html" ] ; then
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html> <html>
<head> <head>
<title>PRISM View Service (PVS) - Cache</title> <title>PRISM View Server (PVS) - Cache</title>
</head> </head>
<body> <body>
<h1>PRISM View Service (PVS) - Cache Test Page<br><font size="-1"> <h1>PRISM View Server (PVS) - Cache Test Page<br><font size="-1">
<strong>powered by</font> <a href="https://eox.at">EOX</a></strong></h1> <strong>powered by</font> <a href="https://eox.at">EOX</a></strong></h1>
<p>This page is used to test the proper operation of the PRISM View Server (PVS) <p>This page is used to test the proper operation of the PRISM View Server (PVS)
cache after it has been installed. If you can read cache after it has been installed. If you can read
this page it means that the PRISM View Service (PVS) cache this page it means that the PRISM View Server (PVS) cache
installed at this site is working properly.</p> installed at this site is working properly.</p>
<p>Links to services:</p> <p>Links to services:</p>
<ul> <ul>
......
cache/mapcache-template.xml
+ 3
− 3
View file @ 33c29427
...@@ -25,9 +25,9 @@ ...@@ -25,9 +25,9 @@
</service> </service>
<service type="wmts" enabled="true"/> <service type="wmts" enabled="true"/>
<metadata> <metadata>
<title>PRISM Data Access Service (PASS) developed by EOX</title> <title>PRISM View Server (PVS) developed by EOX</title>
<abstract>PRISM Data Access Service (PASS) developed by EOX</abstract> <abstract>PRISM View Server (PVS) developed by EOX</abstract>
<keyword>view service</keyword> <keyword>View Server</keyword>
<accessconstraints>UNKNOWN</accessconstraints> <accessconstraints>UNKNOWN</accessconstraints>
<fees>UNKNOWN</fees> <fees>UNKNOWN</fees>
<contactname>Stephan Meissl</contactname> <contactname>Stephan Meissl</contactname>
......
client/html/262c4bd9d237634de218.worker.js → client/html/ed6090683ac14375de89.worker.js
+ 4
− 4
View file @ 33c29427
Source diff could not be displayed: it is too large. Options to address this: view the blob.
client/html/index.html
+ 17
− 21
View file @ 33c29427
...@@ -3,14 +3,14 @@ ...@@ -3,14 +3,14 @@
<head> <head>
<meta http-equiv="Content-Type" content="text/html;charset=UTF-8"> <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
<meta charset="UTF-8"> <meta charset="UTF-8">
<title>PRISM View Service</title> <title>PRISM View Server</title>
<link rel="icon" href="//eox.at/wp-content/uploads/2015/06/cropped-eox_eye-192x192.png" sizes="192x192" /> <link rel="icon" href="//eox.at/wp-content/uploads/2015/06/cropped-eox_eye-192x192.png" sizes="192x192" />
<link rel="apple-touch-icon-precomposed" href="//eox.at/wp-content/uploads/2015/06/cropped-eox_eye-180x180.png" /> <link rel="apple-touch-icon-precomposed" href="//eox.at/wp-content/uploads/2015/06/cropped-eox_eye-180x180.png" />
</head> </head>
<body> <body>
<header id="header" style="width: 100%; height:70px;"> <header id="header" style="width: 100%; height:70px;">
<h3 style="width:100%;text-align:center; <h3 style="width:100%;text-align:center;
color: #006699;">PRISM View Service (PVS) Client powered by color: #006699;">PRISM View Server (PVS) Client powered by
<a href="//eox.at"><img src="//eox.at/wp-content/uploads/2017/09/EOX_Logo.svg" alt="EOX" style="height:25px;margin-left:10px"/></a> <a href="//eox.at"><img src="//eox.at/wp-content/uploads/2017/09/EOX_Logo.svg" alt="EOX" style="height:25px;margin-left:10px"/></a>
</h3> </h3>
</header> </header>
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
"leftPanelOpen": false, "leftPanelOpen": false,
"leftPanelTabIndex": 0, "leftPanelTabIndex": 0,
"tutorial": "once", "tutorial": "once",
"uploadEnabled": false, "uploadEnabled": true,
"selectFilesDownloadEnabled": false, "selectFilesDownloadEnabled": false,
"downloadEnabled": true, "downloadEnabled": true,
"searchEnabled" : true, "searchEnabled" : true,
...@@ -107,26 +107,10 @@ ...@@ -107,26 +107,10 @@
"name": "Nearest Neighbour", "name": "Nearest Neighbour",
"identifier": "http://www.opengis.net/def/interpolation/OGC/1/nearest-neighbour" "identifier": "http://www.opengis.net/def/interpolation/OGC/1/nearest-neighbour"
}, },
// {
// "name": "Cubic",
// "identifier": "http://www.opengis.net/def/interpolation/OGC/1/cubic"
// },
// {
// "name": "Cubic Spline",
// "identifier": "http://www.opengis.net/def/interpolation/OGC/1/cubic-spline"
// },
{ {
"name": "Average", "name": "Average",
"identifier": "http://www.opengis.net/def/interpolation/OGC/1/average" "identifier": "http://www.opengis.net/def/interpolation/OGC/1/average"
}, },
// {
// "name": "Lanczos",
// "identifier": "http://www.opengis.net/def/interpolation/OGC/1/lanczos"
// },
// {
// "name": "Mode",
// "identifier": "http://www.opengis.net/def/interpolation/OGC/1/mode"
// },
] ]
}, },
"baseLayers": [ "baseLayers": [
...@@ -138,6 +122,9 @@ ...@@ -138,6 +122,9 @@
"visible": true, "visible": true,
"protocol": "WMTS", "protocol": "WMTS",
"urls": [ "urls": [
"//a.s2maps-tiles.eu/wmts/",
"//b.s2maps-tiles.eu/wmts/",
"//c.s2maps-tiles.eu/wmts/",
"//d.s2maps-tiles.eu/wmts/", "//d.s2maps-tiles.eu/wmts/",
"//e.s2maps-tiles.eu/wmts/" "//e.s2maps-tiles.eu/wmts/"
], ],
...@@ -155,6 +142,9 @@ ...@@ -155,6 +142,9 @@
"visible": false, "visible": false,
"protocol": "WMTS", "protocol": "WMTS",
"urls": [ "urls": [
"//a.s2maps-tiles.eu/wmts/",
"//b.s2maps-tiles.eu/wmts/",
"//c.s2maps-tiles.eu/wmts/",
"//d.s2maps-tiles.eu/wmts/", "//d.s2maps-tiles.eu/wmts/",
"//e.s2maps-tiles.eu/wmts/" "//e.s2maps-tiles.eu/wmts/"
], ],
...@@ -172,6 +162,9 @@ ...@@ -172,6 +162,9 @@
"visible": false, "visible": false,
"protocol": "WMTS", "protocol": "WMTS",
"urls": [ "urls": [
"//a.s2maps-tiles.eu/wmts/",
"//b.s2maps-tiles.eu/wmts/",
"//c.s2maps-tiles.eu/wmts/",
"//d.s2maps-tiles.eu/wmts/", "//d.s2maps-tiles.eu/wmts/",
"//e.s2maps-tiles.eu/wmts/" "//e.s2maps-tiles.eu/wmts/"
], ],
...@@ -196,8 +189,11 @@ ...@@ -196,8 +189,11 @@
"visible": false, "visible": false,
"protocol": "WMTS", "protocol": "WMTS",
"urls": [ "urls": [
"//d.tiles.maps.eox.at/wmts/", "//a.s2maps-tiles.eu/wmts/",
"//e.tiles.maps.eox.at/wmts/" "//b.s2maps-tiles.eu/wmts/",
"//c.s2maps-tiles.eu/wmts/",
"//d.s2maps-tiles.eu/wmts/",
"//e.s2maps-tiles.eu/wmts/"
], ],
"matrixSet": "WGS84", "matrixSet": "WGS84",
"style": "default", "style": "default",
......
client/html/prism.js
+ 186814
− 424
View file @ 33c29427
This diff is collapsed.
config/dem_index-dev.html 0 → 100644
+ 948
− 0
View file @ 33c29427
This diff is collapsed.
config/dem_index-ops.html 0 → 100644
+ 968
− 0
View file @ 33c29427
This diff is collapsed.
config/dem_init-db.sh 0 → 100644
+ 87
− 0
View file @ 33c29427
# Check if collection exits in database and initialize database only if not
if python3 manage.py id check "${COLLECTION}"; then
echo "Initialize database"
python3 manage.py coveragetype import /rgbnir_definition.json --traceback
if [ "${COLLECTION}" == "DEM" ]; then
echo "Initializing collection '${COLLECTION}'."
python3 manage.py producttype create "${COLLECTION}"_Product_COP-DEM_GLO-30-DTED --traceback \
--coverage-type "int16_grayscale"
python3 manage.py browsetype create "${COLLECTION}"_Product_COP-DEM_GLO-30-DTED --traceback \
--red "gray" \
--red-range -100 4000 \
--red-nodata 0
python3 manage.py producttype create "${COLLECTION}"_Product_COP-DEM_GLO-90-DTED --traceback \
--coverage-type "int16_grayscale"
python3 manage.py browsetype create "${COLLECTION}"_Product_COP-DEM_GLO-90-DTED --traceback \
--red "gray" \
--red-range -100 4000 \
--red-nodata 0
python3 manage.py producttype create "${COLLECTION}"_Product_COP-DEM_EEA-10-DGED --traceback \
--coverage-type "float32_grayscale"
python3 manage.py browsetype create "${COLLECTION}"_Product_COP-DEM_EEA-10-DGED --traceback \
--red "gray" \
--red-range -100 4000 \
--red-nodata 0
python3 manage.py producttype create "${COLLECTION}"_Product_COP-DEM_EEA-10-INSP --traceback \
--coverage-type "float32_grayscale"
python3 manage.py browsetype create "${COLLECTION}"_Product_COP-DEM_EEA-10-INSP --traceback \
--red "gray" \
--red-range -100 4000 \
--red-nodata 0
python3 manage.py producttype create "${COLLECTION}"_Product_COP-DEM_GLO-30-DGED --traceback \
--coverage-type "float32_grayscale"
python3 manage.py browsetype create "${COLLECTION}"_Product_COP-DEM_GLO-30-DGED --traceback \
--red "gray" \
--red-range -100 4000 \
--red-nodata 0
python3 manage.py producttype create "${COLLECTION}"_Product_COP-DEM_GLO-90-DGED --traceback \
--coverage-type "float32_grayscale"
python3 manage.py browsetype create "${COLLECTION}"_Product_COP-DEM_GLO-90-DGED --traceback \
--red "gray" \
--red-range -100 4000 \
--red-nodata 0
python3 manage.py collectiontype create "${COLLECTION}"_Collection --traceback \
--coverage-type "float32_grayscale" \
--coverage-type "int16_grayscale" \
--product-type "${COLLECTION}"_Product_COP-DEM_GLO-30-DTED \
--product-type "${COLLECTION}"_Product_COP-DEM_GLO-90-DTED \
--product-type "${COLLECTION}"_Product_COP-DEM_EEA-10-DGED \
--product-type "${COLLECTION}"_Product_COP-DEM_EEA-10-INSP \
--product-type "${COLLECTION}"_Product_COP-DEM_GLO-30-DGED \
--product-type "${COLLECTION}"_Product_COP-DEM_GLO-90-DGED
python3 manage.py collection create "${COLLECTION}" --type "${COLLECTION}"_Collection --traceback
python3 manage.py collection create "${COLLECTION}_COP-DEM_EEA-10-DGED" --type "${COLLECTION}"_Collection --traceback
python3 manage.py collection create "${COLLECTION}_COP-DEM_EEA-10-INSP" --type "${COLLECTION}"_Collection --traceback
python3 manage.py collection create "${COLLECTION}_COP-DEM_GLO-30-DGED" --type "${COLLECTION}"_Collection --traceback
python3 manage.py collection create "${COLLECTION}_COP-DEM_GLO-30-DTED" --type "${COLLECTION}"_Collection --traceback
python3 manage.py collection create "${COLLECTION}_COP-DEM_GLO-90-DGED" --type "${COLLECTION}"_Collection --traceback
python3 manage.py collection create "${COLLECTION}_COP-DEM_GLO-90-DTED" --type "${COLLECTION}"_Collection --traceback
else
echo "Provided collection '${COLLECTION}' not valid."
fi
python3 manage.py storageauth create auth-cloud-ovh "${OS_AUTH_URL_SHORT}" \
--type keystone \
-p auth-version "${ST_AUTH_VERSION}" \
-p identity-api-version="${ST_AUTH_VERSION}" \
-p username "${OS_USERNAME}" \
-p password "${OS_PASSWORD}" \
-p tenant-name "${OS_TENANT_NAME}" \
-p tenant-id "${OS_TENANT_ID}" \
-p region-name "${OS_REGION_NAME}"
python3 manage.py storage create \
${UPLOAD_CONTAINER} ${UPLOAD_CONTAINER} \
--type swift \
--storage-auth auth-cloud-ovh
else
echo "Using existing database"
fi
config/dem_mapcache-dev.xml 0 → 100644
+ 548
− 0
View file @ 33c29427
This diff is collapsed.
config/dem_mapcache-ops.xml 0 → 100644
+ 569
− 0
View file @ 33c29427
This diff is collapsed.
config/emg_index-dev.html
+ 27
− 26
View file @ 33c29427
...@@ -3,14 +3,14 @@ ...@@ -3,14 +3,14 @@
<head> <head>
<meta http-equiv="Content-Type" content="text/html;charset=UTF-8"> <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
<meta charset="UTF-8"> <meta charset="UTF-8">
<title>PRISM View Service</title> <title>PRISM View Server</title>
<link rel="icon" href="//eox.at/wp-content/uploads/2015/06/cropped-eox_eye-192x192.png" sizes="192x192" /> <link rel="icon" href="//eox.at/wp-content/uploads/2015/06/cropped-eox_eye-192x192.png" sizes="192x192" />
<link rel="apple-touch-icon-precomposed" href="//eox.at/wp-content/uploads/2015/06/cropped-eox_eye-180x180.png" /> <link rel="apple-touch-icon-precomposed" href="//eox.at/wp-content/uploads/2015/06/cropped-eox_eye-180x180.png" />
</head> </head>
<body> <body>
<header id="header" style="width: 100%; height:70px;"> <header id="header" style="width: 100%; height:70px;">
<h3 style="width:100%;text-align:center; <h3 style="width:100%;text-align:center;
color: #006699;">PRISM View Service (PVS) Client powered by color: #006699;">PRISM View Server (PVS) Client powered by
<a href="//eox.at"><img src="//eox.at/wp-content/uploads/2017/09/EOX_Logo.svg" alt="EOX" style="height:25px;margin-left:10px"/></a> <a href="//eox.at"><img src="//eox.at/wp-content/uploads/2017/09/EOX_Logo.svg" alt="EOX" style="height:25px;margin-left:10px"/></a>
</h3> </h3>
</header> </header>
...@@ -26,15 +26,15 @@ ...@@ -26,15 +26,15 @@
"leftPanelOpen": false, "leftPanelOpen": false,
"leftPanelTabIndex": 0, "leftPanelTabIndex": 0,
"tutorial": "once", "tutorial": "once",
"uploadEnabled": false, "uploadEnabled": true,
"selectFilesDownloadEnabled": false, "selectFilesDownloadEnabled": false,
"downloadEnabled": true, "downloadEnabled": true,
"searchEnabled" : true, "searchEnabled" : true,
"searchDebounceTime": 500, "searchDebounceTime": 500,
"language": "en", "language": "en",
"timeDomain": [ "timeDomain": [
"2015-01-01T00:00:00Z", "2008-01-01T00:00:00Z",
today.toISOString(), today,
], ],
"constrainTimeDomain": true, "constrainTimeDomain": true,
"displayTimeDomain": [ "displayTimeDomain": [
...@@ -110,26 +110,10 @@ ...@@ -110,26 +110,10 @@
"name": "Nearest Neighbour", "name": "Nearest Neighbour",
"identifier": "http://www.opengis.net/def/interpolation/OGC/1/nearest-neighbour" "identifier": "http://www.opengis.net/def/interpolation/OGC/1/nearest-neighbour"
}, },
// {
// "name": "Cubic",
// "identifier": "http://www.opengis.net/def/interpolation/OGC/1/cubic"
// },
// {
// "name": "Cubic Spline",
// "identifier": "http://www.opengis.net/def/interpolation/OGC/1/cubic-spline"
// },
{ {
"name": "Average", "name": "Average",
"identifier": "http://www.opengis.net/def/interpolation/OGC/1/average" "identifier": "http://www.opengis.net/def/interpolation/OGC/1/average"
}, },
// {
// "name": "Lanczos",
// "identifier": "http://www.opengis.net/def/interpolation/OGC/1/lanczos"
// },
// {
// "name": "Mode",
// "identifier": "http://www.opengis.net/def/interpolation/OGC/1/mode"
// },
] ]
}, },
"baseLayers": [ "baseLayers": [
...@@ -141,6 +125,9 @@ ...@@ -141,6 +125,9 @@
"visible": true, "visible": true,
"protocol": "WMTS", "protocol": "WMTS",
"urls": [ "urls": [
"//a.s2maps-tiles.eu/wmts/",
"//b.s2maps-tiles.eu/wmts/",
"//c.s2maps-tiles.eu/wmts/",
"//d.s2maps-tiles.eu/wmts/", "//d.s2maps-tiles.eu/wmts/",
"//e.s2maps-tiles.eu/wmts/" "//e.s2maps-tiles.eu/wmts/"
], ],
...@@ -158,6 +145,9 @@ ...@@ -158,6 +145,9 @@
"visible": false, "visible": false,
"protocol": "WMTS", "protocol": "WMTS",
"urls": [ "urls": [
"//a.s2maps-tiles.eu/wmts/",
"//b.s2maps-tiles.eu/wmts/",
"//c.s2maps-tiles.eu/wmts/",
"//d.s2maps-tiles.eu/wmts/", "//d.s2maps-tiles.eu/wmts/",
"//e.s2maps-tiles.eu/wmts/" "//e.s2maps-tiles.eu/wmts/"
], ],
...@@ -175,6 +165,9 @@ ...@@ -175,6 +165,9 @@
"visible": false, "visible": false,
"protocol": "WMTS", "protocol": "WMTS",
"urls": [ "urls": [
"//a.s2maps-tiles.eu/wmts/",
"//b.s2maps-tiles.eu/wmts/",
"//c.s2maps-tiles.eu/wmts/",
"//d.s2maps-tiles.eu/wmts/", "//d.s2maps-tiles.eu/wmts/",
"//e.s2maps-tiles.eu/wmts/" "//e.s2maps-tiles.eu/wmts/"
], ],
...@@ -194,11 +187,12 @@ ...@@ -194,11 +187,12 @@
"display": { "display": {
"id": 'Emergency__TRUE_COLOR', "id": 'Emergency__TRUE_COLOR',
"visible": true, "visible": true,
"protocol": 'WMS', "protocol": 'WMTS',
"url": baseUrl + ':83/ows', "url": baseUrl + ':83/ows/wmts',
"format": 'image/png', "format": 'image/png',
"projection": 'EPSG:4326', "projection": 'EPSG:4326',
"style": '', "matrixSet": "WGS84",
"style": 'default',
"useMilliseconds": false, "useMilliseconds": false,
"maxZoom": 17, "maxZoom": 17,
"options": [{ "options": [{
...@@ -237,6 +231,10 @@ ...@@ -237,6 +231,10 @@
"type": "eo:cloudCover", "type": "eo:cloudCover",
"title": "Cloud Coverage" "title": "Cloud Coverage"
}, },
{
"type": "geo:uid",
"title": "Product ID"
},
], ],
"parametersFilterSettings": { "parametersFilterSettings": {
"collapsed": false, "collapsed": false,
...@@ -263,8 +261,11 @@ ...@@ -263,8 +261,11 @@
"visible": false, "visible": false,
"protocol": "WMTS", "protocol": "WMTS",
"urls": [ "urls": [
"//d.tiles.maps.eox.at/wmts/", "//a.s2maps-tiles.eu/wmts/",
"//e.tiles.maps.eox.at/wmts/" "//b.s2maps-tiles.eu/wmts/",
"//c.s2maps-tiles.eu/wmts/",
"//d.s2maps-tiles.eu/wmts/",
"//e.s2maps-tiles.eu/wmts/"
], ],
"matrixSet": "WGS84", "matrixSet": "WGS84",
"style": "default", "style": "default",
......
config/emg_index-ops.html
+ 49
− 28
View file @ 33c29427
...@@ -3,14 +3,14 @@ ...@@ -3,14 +3,14 @@
<head> <head>
<meta http-equiv="Content-Type" content="text/html;charset=UTF-8"> <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
<meta charset="UTF-8"> <meta charset="UTF-8">
<title>PRISM View Service</title> <title>PRISM View Server</title>
<link rel="icon" href="//eox.at/wp-content/uploads/2015/06/cropped-eox_eye-192x192.png" sizes="192x192" /> <link rel="icon" href="//eox.at/wp-content/uploads/2015/06/cropped-eox_eye-192x192.png" sizes="192x192" />
<link rel="apple-touch-icon-precomposed" href="//eox.at/wp-content/uploads/2015/06/cropped-eox_eye-180x180.png" /> <link rel="apple-touch-icon-precomposed" href="//eox.at/wp-content/uploads/2015/06/cropped-eox_eye-180x180.png" />
</head> </head>
<body> <body>
<header id="header" style="width: 100%; height:70px;"> <header id="header" style="width: 100%; height:70px;">
<h3 style="width:100%;text-align:center; <h3 style="width:100%;text-align:center;
color: #006699;">PRISM View Service (PVS) Client powered by color: #006699;">PRISM View Server (PVS) Client powered by
<a href="//eox.at"><img src="//eox.at/wp-content/uploads/2017/09/EOX_Logo.svg" alt="EOX" style="height:25px;margin-left:10px"/></a> <a href="//eox.at"><img src="//eox.at/wp-content/uploads/2017/09/EOX_Logo.svg" alt="EOX" style="height:25px;margin-left:10px"/></a>
</h3> </h3>
</header> </header>
...@@ -19,22 +19,42 @@ ...@@ -19,22 +19,42 @@
<script> <script>
var today = new Date(); var today = new Date();
today.setUTCHours(24, 0, 0, 0); today.setUTCHours(24, 0, 0, 0);
var baseUrl = '//emg.pvs.prism.eox.at/'; var baseUrl = '//emg.pass.copernicus.eu/';
var baseUrlsWMTS = [
'//a.emg.pass.copernicus.eu/cache/ows/wmts',
'//b.emg.pass.copernicus.eu/cache/ows/wmts',
'//c.emg.pass.copernicus.eu/cache/ows/wmts',
'//d.emg.pass.copernicus.eu/cache/ows/wmts',
'//e.emg.pass.copernicus.eu/cache/ows/wmts',
'//f.emg.pass.copernicus.eu/cache/ows/wmts',
'//g.emg.pass.copernicus.eu/cache/ows/wmts',
'//h.emg.pass.copernicus.eu/cache/ows/wmts',
];
var baseUrlsOws = [
'//a.emg.pass.copernicus.eu/ows',
'//b.emg.pass.copernicus.eu/ows',
'//c.emg.pass.copernicus.eu/ows',
'//d.emg.pass.copernicus.eu/ows',
'//e.emg.pass.copernicus.eu/ows',
'//f.emg.pass.copernicus.eu/ows',
'//g.emg.pass.copernicus.eu/ows',
'//h.emg.pass.copernicus.eu/ows',
];
var config = { var config = {
"settings": { "settings": {
"rightPanelOpen": true, "rightPanelOpen": true,
"leftPanelOpen": false, "leftPanelOpen": false,
"leftPanelTabIndex": 0, "leftPanelTabIndex": 0,
"tutorial": "once", "tutorial": "once",
"uploadEnabled": false, "uploadEnabled": true,
"selectFilesDownloadEnabled": false, "selectFilesDownloadEnabled": false,
"downloadEnabled": true, "downloadEnabled": true,
"searchEnabled" : true, "searchEnabled" : true,
"searchDebounceTime": 500, "searchDebounceTime": 500,
"language": "en", "language": "en",
"timeDomain": [ "timeDomain": [
"2015-01-01T00:00:00Z", "2008-01-01T00:00:00Z",
today.toISOString(), today,
], ],
"constrainTimeDomain": true, "constrainTimeDomain": true,
"displayTimeDomain": [ "displayTimeDomain": [
...@@ -110,26 +130,10 @@ ...@@ -110,26 +130,10 @@
"name": "Nearest Neighbour", "name": "Nearest Neighbour",
"identifier": "http://www.opengis.net/def/interpolation/OGC/1/nearest-neighbour" "identifier": "http://www.opengis.net/def/interpolation/OGC/1/nearest-neighbour"
}, },
// {
// "name": "Cubic",
// "identifier": "http://www.opengis.net/def/interpolation/OGC/1/cubic"
// },
// {
// "name": "Cubic Spline",
// "identifier": "http://www.opengis.net/def/interpolation/OGC/1/cubic-spline"
// },
{ {
"name": "Average", "name": "Average",
"identifier": "http://www.opengis.net/def/interpolation/OGC/1/average" "identifier": "http://www.opengis.net/def/interpolation/OGC/1/average"
}, },
// {
// "name": "Lanczos",
// "identifier": "http://www.opengis.net/def/interpolation/OGC/1/lanczos"
// },
// {
// "name": "Mode",
// "identifier": "http://www.opengis.net/def/interpolation/OGC/1/mode"
// },
] ]
}, },
"baseLayers": [ "baseLayers": [
...@@ -141,6 +145,9 @@ ...@@ -141,6 +145,9 @@
"visible": true, "visible": true,
"protocol": "WMTS", "protocol": "WMTS",
"urls": [ "urls": [
"//a.s2maps-tiles.eu/wmts/",
"//b.s2maps-tiles.eu/wmts/",
"//c.s2maps-tiles.eu/wmts/",
"//d.s2maps-tiles.eu/wmts/", "//d.s2maps-tiles.eu/wmts/",
"//e.s2maps-tiles.eu/wmts/" "//e.s2maps-tiles.eu/wmts/"
], ],
...@@ -158,6 +165,9 @@ ...@@ -158,6 +165,9 @@
"visible": false, "visible": false,
"protocol": "WMTS", "protocol": "WMTS",
"urls": [ "urls": [
"//a.s2maps-tiles.eu/wmts/",
"//b.s2maps-tiles.eu/wmts/",
"//c.s2maps-tiles.eu/wmts/",
"//d.s2maps-tiles.eu/wmts/", "//d.s2maps-tiles.eu/wmts/",
"//e.s2maps-tiles.eu/wmts/" "//e.s2maps-tiles.eu/wmts/"
], ],
...@@ -175,6 +185,9 @@ ...@@ -175,6 +185,9 @@
"visible": false, "visible": false,
"protocol": "WMTS", "protocol": "WMTS",
"urls": [ "urls": [
"//a.s2maps-tiles.eu/wmts/",
"//b.s2maps-tiles.eu/wmts/",
"//c.s2maps-tiles.eu/wmts/",
"//d.s2maps-tiles.eu/wmts/", "//d.s2maps-tiles.eu/wmts/",
"//e.s2maps-tiles.eu/wmts/" "//e.s2maps-tiles.eu/wmts/"
], ],
...@@ -194,11 +207,12 @@ ...@@ -194,11 +207,12 @@
"display": { "display": {
"id": 'Emergency__TRUE_COLOR', "id": 'Emergency__TRUE_COLOR',
"visible": true, "visible": true,
"protocol": 'WMS', "protocol": 'WMTS',
"url": baseUrl + 'cache/ows', "urls": baseUrlsWMTS,
"format": 'image/png', "format": 'image/png',
"projection": 'EPSG:4326', "projection": 'EPSG:4326',
"style": '', "matrixSet": "WGS84",
"style": 'default',
"useMilliseconds": false, "useMilliseconds": false,
"maxZoom": 17, "maxZoom": 17,
"options": [{ "options": [{
...@@ -237,6 +251,10 @@ ...@@ -237,6 +251,10 @@
"type": "eo:cloudCover", "type": "eo:cloudCover",
"title": "Cloud Coverage" "title": "Cloud Coverage"
}, },
{
"type": "geo:uid",
"title": "Product ID"
},
], ],
"parametersFilterSettings": { "parametersFilterSettings": {
"collapsed": false, "collapsed": false,
...@@ -263,8 +281,11 @@ ...@@ -263,8 +281,11 @@
"visible": false, "visible": false,
"protocol": "WMTS", "protocol": "WMTS",
"urls": [ "urls": [
"//d.tiles.maps.eox.at/wmts/", "//a.s2maps-tiles.eu/wmts/",
"//e.tiles.maps.eox.at/wmts/" "//b.s2maps-tiles.eu/wmts/",
"//c.s2maps-tiles.eu/wmts/",
"//d.s2maps-tiles.eu/wmts/",
"//e.s2maps-tiles.eu/wmts/"
], ],
"matrixSet": "WGS84", "matrixSet": "WGS84",
"style": "default", "style": "default",
...@@ -281,7 +302,7 @@ ...@@ -281,7 +302,7 @@
"id": 'Emergency__outlines', "id": 'Emergency__outlines',
"visible": false, "visible": false,
"protocol": 'WMS', "protocol": 'WMS',
"url": baseUrl + 'ows', "urls": baseUrlsOws,
"format": 'image/png', "format": 'image/png',
"projection": 'EPSG:4326', "projection": 'EPSG:4326',
"style": 'red', "style": 'red',
......
config/emg_init-db.sh
+ 1
− 1
View file @ 33c29427
...@@ -125,7 +125,7 @@ if python3 manage.py id check "${COLLECTION}"; then ...@@ -125,7 +125,7 @@ if python3 manage.py id check "${COLLECTION}"; then
-p region-name "${OS_REGION_NAME}" -p region-name "${OS_REGION_NAME}"
python3 manage.py storage create \ python3 manage.py storage create \
${BUCKET_NAME} ${BUCKET_NAME} \ ${UPLOAD_CONTAINER} ${UPLOAD_CONTAINER} \
--type swift \ --type swift \
--storage-auth auth-cloud-ovh --storage-auth auth-cloud-ovh
......
config/emg_mapcache-dev.xml
+ 6
− 12
View file @ 33c29427
...@@ -16,18 +16,12 @@ ...@@ -16,18 +16,12 @@
<resample_mode>bilinear</resample_mode> <resample_mode>bilinear</resample_mode>
<format>mixed</format> <format>mixed</format>
<maxsize>4096</maxsize> <maxsize>4096</maxsize>
<!-- <forwarding_rule name="wms">
<param name="SERVICE" type="values">WMS</param>
<http>
<url>http://localhost/browse/ows</url>
</http>
</forwarding_rule> -->
</service> </service>
<service type="wmts" enabled="true"/> <service type="wmts" enabled="true"/>
<metadata> <metadata>
<title>PRISM Data Access Service (PASS) developed by EOX</title> <title>PRISM View Server (PVS) developed by EOX</title>
<abstract>PRISM Data Access Service (PASS) developed by EOX</abstract> <abstract>PRISM View Server (PVS) developed by EOX</abstract>
<keyword>view service</keyword> <keyword>View Server</keyword>
<accessconstraints>UNKNOWN</accessconstraints> <accessconstraints>UNKNOWN</accessconstraints>
<fees>UNKNOWN</fees> <fees>UNKNOWN</fees>
<contactname>Stephan Meissl</contactname> <contactname>Stephan Meissl</contactname>
...@@ -117,7 +111,7 @@ ...@@ -117,7 +111,7 @@
<dimension type="postgresql" name="time" default="2017/2019" time="true" unit="ISO8601"> <dimension type="postgresql" name="time" default="2017/2019" time="true" unit="ISO8601">
<connection>host={{DB_HOST}} user={{DB_USER}} password={{DB_PW}} dbname={{DB_NAME}} port={{DB_PORT}}</connection> <connection>host={{DB_HOST}} user={{DB_USER}} password={{DB_PW}} dbname={{DB_NAME}} port={{DB_PORT}}</connection>
<list_query>SELECT CONCAT(to_char(MIN(T5."begin_time"),'YYYY-MM-DD"T"HH24:MI:SS"Z"'), CONCAT('/', to_char(MAX(T5."end_time"),'YYYY-MM-DD"T"HH24:MI:SS"Z"'))) FROM "coverages_product" INNER JOIN "coverages_product_collections" ON ("coverages_product"."eoobject_ptr_id" = "coverages_product_collections"."product_id") INNER JOIN "coverages_collection" ON ("coverages_product_collections"."collection_id" = "coverages_collection"."eoobject_ptr_id") INNER JOIN "coverages_eoobject" ON ("coverages_collection"."eoobject_ptr_id" = "coverages_eoobject"."id") INNER JOIN "coverages_eoobject" T5 ON ("coverages_product"."eoobject_ptr_id" = T5."id") WHERE "coverages_eoobject"."identifier" = 'Emergency';</list_query> <list_query>SELECT CONCAT(to_char(MIN(T5."begin_time"),'YYYY-MM-DD"T"HH24:MI:SS"Z"'), CONCAT('/', to_char(MAX(T5."end_time"),'YYYY-MM-DD"T"HH24:MI:SS"Z"'))) FROM "coverages_product" INNER JOIN "coverages_product_collections" ON ("coverages_product"."eoobject_ptr_id" = "coverages_product_collections"."product_id") INNER JOIN "coverages_collection" ON ("coverages_product_collections"."collection_id" = "coverages_collection"."eoobject_ptr_id") INNER JOIN "coverages_eoobject" ON ("coverages_collection"."eoobject_ptr_id" = "coverages_eoobject"."id") INNER JOIN "coverages_eoobject" T5 ON ("coverages_product"."eoobject_ptr_id" = T5."id") WHERE "coverages_eoobject"."identifier" = 'Emergency';</list_query>
<validate_query>SELECT * FROM (SELECT CONCAT(to_char(T5."begin_time",'YYYY-MM-DD"T"HH24:MI:SS"Z"'), CONCAT('/', to_char(T5."end_time",'YYYY-MM-DD"T"HH24:MI:SS"Z"'))) AS "interval" FROM "coverages_product" INNER JOIN "coverages_product_collections" ON ("coverages_product"."eoobject_ptr_id" = "coverages_product_collections"."product_id") INNER JOIN "coverages_collection" ON ("coverages_product_collections"."collection_id" = "coverages_collection"."eoobject_ptr_id") INNER JOIN "coverages_eoobject" ON ("coverages_collection"."eoobject_ptr_id" = "coverages_eoobject"."id") INNER JOIN "coverages_eoobject" T5 ON ("coverages_product"."eoobject_ptr_id" = T5."id") WHERE ("coverages_eoobject"."identifier" = 'Emergency' AND ((T5."begin_time" &lt; to_timestamp(:end_timestamp) AND T5."end_time" &gt; to_timestamp(:start_timestamp)) or (T5."begin_time" = T5."end_time" AND T5."begin_time" &lt;= to_timestamp(:end_timestamp) AND T5."end_time" &gt;= to_timestamp(:start_timestamp)))) AND T5."footprint" &amp;&amp; ST_MakeEnvelope(:minx,:miny,:maxx,:maxy,4326) ORDER BY T5."end_time" DESC LIMIT 20) AS sub ORDER BY interval ASC;</validate_query> <validate_query>SELECT DISTINCT interval FROM (SELECT CONCAT(to_char(T5."begin_time",'YYYY-MM-DD"T"HH24:MI:SS"Z"'), CONCAT('/', to_char(T5."end_time",'YYYY-MM-DD"T"HH24:MI:SS"Z"'))) AS "interval" FROM "coverages_product" INNER JOIN "coverages_product_collections" ON ("coverages_product"."eoobject_ptr_id" = "coverages_product_collections"."product_id") INNER JOIN "coverages_collection" ON ("coverages_product_collections"."collection_id" = "coverages_collection"."eoobject_ptr_id") INNER JOIN "coverages_eoobject" ON ("coverages_collection"."eoobject_ptr_id" = "coverages_eoobject"."id") INNER JOIN "coverages_eoobject" T5 ON ("coverages_product"."eoobject_ptr_id" = T5."id") WHERE ("coverages_eoobject"."identifier" = 'Emergency' AND ((T5."begin_time" &lt; to_timestamp(:end_timestamp) AND T5."end_time" &gt; to_timestamp(:start_timestamp)) or (T5."begin_time" = T5."end_time" AND T5."begin_time" &lt;= to_timestamp(:end_timestamp) AND T5."end_time" &gt;= to_timestamp(:start_timestamp)))) AND T5."footprint" &amp;&amp; ST_MakeEnvelope(:minx,:miny,:maxx,:maxy,4326) ORDER BY T5."end_time" DESC) AS sub ORDER BY interval ASC LIMIT 30;</validate_query>
</dimension> </dimension>
</dimensions> </dimensions>
</tileset> </tileset>
...@@ -139,7 +133,7 @@ ...@@ -139,7 +133,7 @@
<dimension type="postgresql" name="time" default="2017/2019" time="true" unit="ISO8601"> <dimension type="postgresql" name="time" default="2017/2019" time="true" unit="ISO8601">
<connection>host={{DB_HOST}} user={{DB_USER}} password={{DB_PW}} dbname={{DB_NAME}} port={{DB_PORT}}</connection> <connection>host={{DB_HOST}} user={{DB_USER}} password={{DB_PW}} dbname={{DB_NAME}} port={{DB_PORT}}</connection>
<list_query>SELECT CONCAT(to_char(MIN(T5."begin_time"),'YYYY-MM-DD"T"HH24:MI:SS"Z"'), CONCAT('/', to_char(MAX(T5."end_time"),'YYYY-MM-DD"T"HH24:MI:SS"Z"'))) FROM "coverages_product" INNER JOIN "coverages_product_collections" ON ("coverages_product"."eoobject_ptr_id" = "coverages_product_collections"."product_id") INNER JOIN "coverages_collection" ON ("coverages_product_collections"."collection_id" = "coverages_collection"."eoobject_ptr_id") INNER JOIN "coverages_eoobject" ON ("coverages_collection"."eoobject_ptr_id" = "coverages_eoobject"."id") INNER JOIN "coverages_eoobject" T5 ON ("coverages_product"."eoobject_ptr_id" = T5."id") WHERE "coverages_eoobject"."identifier" = 'Emergency';</list_query> <list_query>SELECT CONCAT(to_char(MIN(T5."begin_time"),'YYYY-MM-DD"T"HH24:MI:SS"Z"'), CONCAT('/', to_char(MAX(T5."end_time"),'YYYY-MM-DD"T"HH24:MI:SS"Z"'))) FROM "coverages_product" INNER JOIN "coverages_product_collections" ON ("coverages_product"."eoobject_ptr_id" = "coverages_product_collections"."product_id") INNER JOIN "coverages_collection" ON ("coverages_product_collections"."collection_id" = "coverages_collection"."eoobject_ptr_id") INNER JOIN "coverages_eoobject" ON ("coverages_collection"."eoobject_ptr_id" = "coverages_eoobject"."id") INNER JOIN "coverages_eoobject" T5 ON ("coverages_product"."eoobject_ptr_id" = T5."id") WHERE "coverages_eoobject"."identifier" = 'Emergency';</list_query>
<validate_query>SELECT * FROM (SELECT CONCAT(to_char(T5."begin_time",'YYYY-MM-DD"T"HH24:MI:SS"Z"'), CONCAT('/', to_char(T5."end_time",'YYYY-MM-DD"T"HH24:MI:SS"Z"'))) AS "interval" FROM "coverages_product" INNER JOIN "coverages_product_collections" ON ("coverages_product"."eoobject_ptr_id" = "coverages_product_collections"."product_id") INNER JOIN "coverages_collection" ON ("coverages_product_collections"."collection_id" = "coverages_collection"."eoobject_ptr_id") INNER JOIN "coverages_eoobject" ON ("coverages_collection"."eoobject_ptr_id" = "coverages_eoobject"."id") INNER JOIN "coverages_eoobject" T5 ON ("coverages_product"."eoobject_ptr_id" = T5."id") WHERE ("coverages_eoobject"."identifier" = 'Emergency' AND ((T5."begin_time" &lt; to_timestamp(:end_timestamp) AND T5."end_time" &gt; to_timestamp(:start_timestamp)) or (T5."begin_time" = T5."end_time" AND T5."begin_time" &lt;= to_timestamp(:end_timestamp) AND T5."end_time" &gt;= to_timestamp(:start_timestamp)))) AND T5."footprint" &amp;&amp; ST_MakeEnvelope(:minx,:miny,:maxx,:maxy,4326) ORDER BY T5."end_time" DESC LIMIT 20) AS sub ORDER BY interval ASC;</validate_query> <validate_query>SELECT DISTINCT interval FROM (SELECT CONCAT(to_char(T5."begin_time",'YYYY-MM-DD"T"HH24:MI:SS"Z"'), CONCAT('/', to_char(T5."end_time",'YYYY-MM-DD"T"HH24:MI:SS"Z"'))) AS "interval" FROM "coverages_product" INNER JOIN "coverages_product_collections" ON ("coverages_product"."eoobject_ptr_id" = "coverages_product_collections"."product_id") INNER JOIN "coverages_collection" ON ("coverages_product_collections"."collection_id" = "coverages_collection"."eoobject_ptr_id") INNER JOIN "coverages_eoobject" ON ("coverages_collection"."eoobject_ptr_id" = "coverages_eoobject"."id") INNER JOIN "coverages_eoobject" T5 ON ("coverages_product"."eoobject_ptr_id" = T5."id") WHERE ("coverages_eoobject"."identifier" = 'Emergency' AND ((T5."begin_time" &lt; to_timestamp(:end_timestamp) AND T5."end_time" &gt; to_timestamp(:start_timestamp)) or (T5."begin_time" = T5."end_time" AND T5."begin_time" &lt;= to_timestamp(:end_timestamp) AND T5."end_time" &gt;= to_timestamp(:start_timestamp)))) AND T5."footprint" &amp;&amp; ST_MakeEnvelope(:minx,:miny,:maxx,:maxy,4326) ORDER BY T5."end_time" DESC) AS sub ORDER BY interval ASC LIMIT 30;</validate_query>
</dimension> </dimension>
</dimensions> </dimensions>
</tileset> </tileset>
...@@ -161,7 +155,7 @@ ...@@ -161,7 +155,7 @@
<dimension type="postgresql" name="time" default="2017/2019" time="true" unit="ISO8601"> <dimension type="postgresql" name="time" default="2017/2019" time="true" unit="ISO8601">
<connection>host={{DB_HOST}} user={{DB_USER}} password={{DB_PW}} dbname={{DB_NAME}} port={{DB_PORT}}</connection> <connection>host={{DB_HOST}} user={{DB_USER}} password={{DB_PW}} dbname={{DB_NAME}} port={{DB_PORT}}</connection>
<list_query>SELECT CONCAT(to_char(MIN(T5."begin_time"),'YYYY-MM-DD"T"HH24:MI:SS"Z"'), CONCAT('/', to_char(MAX(T5."end_time"),'YYYY-MM-DD"T"HH24:MI:SS"Z"'))) FROM "coverages_product" INNER JOIN "coverages_product_collections" ON ("coverages_product"."eoobject_ptr_id" = "coverages_product_collections"."product_id") INNER JOIN "coverages_collection" ON ("coverages_product_collections"."collection_id" = "coverages_collection"."eoobject_ptr_id") INNER JOIN "coverages_eoobject" ON ("coverages_collection"."eoobject_ptr_id" = "coverages_eoobject"."id") INNER JOIN "coverages_eoobject" T5 ON ("coverages_product"."eoobject_ptr_id" = T5."id") WHERE "coverages_eoobject"."identifier" = 'Emergency';</list_query> <list_query>SELECT CONCAT(to_char(MIN(T5."begin_time"),'YYYY-MM-DD"T"HH24:MI:SS"Z"'), CONCAT('/', to_char(MAX(T5."end_time"),'YYYY-MM-DD"T"HH24:MI:SS"Z"'))) FROM "coverages_product" INNER JOIN "coverages_product_collections" ON ("coverages_product"."eoobject_ptr_id" = "coverages_product_collections"."product_id") INNER JOIN "coverages_collection" ON ("coverages_product_collections"."collection_id" = "coverages_collection"."eoobject_ptr_id") INNER JOIN "coverages_eoobject" ON ("coverages_collection"."eoobject_ptr_id" = "coverages_eoobject"."id") INNER JOIN "coverages_eoobject" T5 ON ("coverages_product"."eoobject_ptr_id" = T5."id") WHERE "coverages_eoobject"."identifier" = 'Emergency';</list_query>
<validate_query>SELECT * FROM (SELECT CONCAT(to_char(T5."begin_time",'YYYY-MM-DD"T"HH24:MI:SS"Z"'), CONCAT('/', to_char(T5."end_time",'YYYY-MM-DD"T"HH24:MI:SS"Z"'))) AS "interval" FROM "coverages_product" INNER JOIN "coverages_product_collections" ON ("coverages_product"."eoobject_ptr_id" = "coverages_product_collections"."product_id") INNER JOIN "coverages_collection" ON ("coverages_product_collections"."collection_id" = "coverages_collection"."eoobject_ptr_id") INNER JOIN "coverages_eoobject" ON ("coverages_collection"."eoobject_ptr_id" = "coverages_eoobject"."id") INNER JOIN "coverages_eoobject" T5 ON ("coverages_product"."eoobject_ptr_id" = T5."id") WHERE ("coverages_eoobject"."identifier" = 'Emergency' AND ((T5."begin_time" &lt; to_timestamp(:end_timestamp) AND T5."end_time" &gt; to_timestamp(:start_timestamp)) or (T5."begin_time" = T5."end_time" AND T5."begin_time" &lt;= to_timestamp(:end_timestamp) AND T5."end_time" &gt;= to_timestamp(:start_timestamp)))) AND T5."footprint" &amp;&amp; ST_MakeEnvelope(:minx,:miny,:maxx,:maxy,4326) ORDER BY T5."end_time" DESC LIMIT 20) AS sub ORDER BY interval ASC;</validate_query> <validate_query>SELECT DISTINCT interval FROM (SELECT CONCAT(to_char(T5."begin_time",'YYYY-MM-DD"T"HH24:MI:SS"Z"'), CONCAT('/', to_char(T5."end_time",'YYYY-MM-DD"T"HH24:MI:SS"Z"'))) AS "interval" FROM "coverages_product" INNER JOIN "coverages_product_collections" ON ("coverages_product"."eoobject_ptr_id" = "coverages_product_collections"."product_id") INNER JOIN "coverages_collection" ON ("coverages_product_collections"."collection_id" = "coverages_collection"."eoobject_ptr_id") INNER JOIN "coverages_eoobject" ON ("coverages_collection"."eoobject_ptr_id" = "coverages_eoobject"."id") INNER JOIN "coverages_eoobject" T5 ON ("coverages_product"."eoobject_ptr_id" = T5."id") WHERE ("coverages_eoobject"."identifier" = 'Emergency' AND ((T5."begin_time" &lt; to_timestamp(:end_timestamp) AND T5."end_time" &gt; to_timestamp(:start_timestamp)) or (T5."begin_time" = T5."end_time" AND T5."begin_time" &lt;= to_timestamp(:end_timestamp) AND T5."end_time" &gt;= to_timestamp(:start_timestamp)))) AND T5."footprint" &amp;&amp; ST_MakeEnvelope(:minx,:miny,:maxx,:maxy,4326) ORDER BY T5."end_time" DESC) AS sub ORDER BY interval ASC LIMIT 30;</validate_query>
</dimension> </dimension>
</dimensions> </dimensions>
</tileset> </tileset>
......
config/emg_mapcache-ops.xml
+ 7
− 13
View file @ 33c29427
...@@ -16,19 +16,13 @@ ...@@ -16,19 +16,13 @@
<resample_mode>bilinear</resample_mode> <resample_mode>bilinear</resample_mode>
<format>mixed</format> <format>mixed</format>
<maxsize>4096</maxsize> <maxsize>4096</maxsize>
<!-- <forwarding_rule name="wms">
<param name="SERVICE" type="values">WMS</param>
<http>
<url>http://localhost/browse/ows</url>
</http>
</forwarding_rule> -->
</service> </service>
<service type="wmts" enabled="true"/> <service type="wmts" enabled="true"/>
<metadata> <metadata>
<title>PRISM Data Access Service (PASS) developed by EOX</title> <title>PRISM View Server (PVS) developed by EOX</title>
<abstract>PRISM Data Access Service (PASS) developed by EOX</abstract> <abstract>PRISM View Server (PVS) developed by EOX</abstract>
<url>https://emg.pvs.prism.eox.at/cache/ows</url> <url>https://emg.pvs.prism.eox.at/cache/ows</url>
<keyword>view service</keyword> <keyword>View Server</keyword>
<accessconstraints>UNKNOWN</accessconstraints> <accessconstraints>UNKNOWN</accessconstraints>
<fees>UNKNOWN</fees> <fees>UNKNOWN</fees>
<contactname>Stephan Meissl</contactname> <contactname>Stephan Meissl</contactname>
...@@ -60,7 +54,7 @@ ...@@ -60,7 +54,7 @@
<username>{{OS_USERNAME}}</username> <username>{{OS_USERNAME}}</username>
<password>{{OS_PASSWORD}}</password> <password>{{OS_PASSWORD}}</password>
<container>{{BUCKET_NAME}}</container> <container>{{BUCKET_NAME}}</container>
<key>/{tileset}/{grid}/{dim}/{z}/{x}/{y}.{ext}</key> <key>{tileset}/{grid}/{dim:time}/{z}/{x}/{y}.{ext}</key>
</cache> </cache>
<!-- SOURCES Emergency --> <!-- SOURCES Emergency -->
...@@ -124,7 +118,7 @@ ...@@ -124,7 +118,7 @@
<dimension type="postgresql" name="time" default="2017/2019" time="true" unit="ISO8601"> <dimension type="postgresql" name="time" default="2017/2019" time="true" unit="ISO8601">
<connection>host={{DB_HOST}} user={{DB_USER}} password={{DB_PW}} dbname={{DB_NAME}} port={{DB_PORT}}</connection> <connection>host={{DB_HOST}} user={{DB_USER}} password={{DB_PW}} dbname={{DB_NAME}} port={{DB_PORT}}</connection>
<list_query>SELECT CONCAT(to_char(MIN(T5."begin_time"),'YYYY-MM-DD"T"HH24:MI:SS"Z"'), CONCAT('/', to_char(MAX(T5."end_time"),'YYYY-MM-DD"T"HH24:MI:SS"Z"'))) FROM "coverages_product" INNER JOIN "coverages_product_collections" ON ("coverages_product"."eoobject_ptr_id" = "coverages_product_collections"."product_id") INNER JOIN "coverages_collection" ON ("coverages_product_collections"."collection_id" = "coverages_collection"."eoobject_ptr_id") INNER JOIN "coverages_eoobject" ON ("coverages_collection"."eoobject_ptr_id" = "coverages_eoobject"."id") INNER JOIN "coverages_eoobject" T5 ON ("coverages_product"."eoobject_ptr_id" = T5."id") WHERE "coverages_eoobject"."identifier" = 'Emergency';</list_query> <list_query>SELECT CONCAT(to_char(MIN(T5."begin_time"),'YYYY-MM-DD"T"HH24:MI:SS"Z"'), CONCAT('/', to_char(MAX(T5."end_time"),'YYYY-MM-DD"T"HH24:MI:SS"Z"'))) FROM "coverages_product" INNER JOIN "coverages_product_collections" ON ("coverages_product"."eoobject_ptr_id" = "coverages_product_collections"."product_id") INNER JOIN "coverages_collection" ON ("coverages_product_collections"."collection_id" = "coverages_collection"."eoobject_ptr_id") INNER JOIN "coverages_eoobject" ON ("coverages_collection"."eoobject_ptr_id" = "coverages_eoobject"."id") INNER JOIN "coverages_eoobject" T5 ON ("coverages_product"."eoobject_ptr_id" = T5."id") WHERE "coverages_eoobject"."identifier" = 'Emergency';</list_query>
<validate_query>SELECT * FROM (SELECT CONCAT(to_char(T5."begin_time",'YYYY-MM-DD"T"HH24:MI:SS"Z"'), CONCAT('/', to_char(T5."end_time",'YYYY-MM-DD"T"HH24:MI:SS"Z"'))) AS "interval" FROM "coverages_product" INNER JOIN "coverages_product_collections" ON ("coverages_product"."eoobject_ptr_id" = "coverages_product_collections"."product_id") INNER JOIN "coverages_collection" ON ("coverages_product_collections"."collection_id" = "coverages_collection"."eoobject_ptr_id") INNER JOIN "coverages_eoobject" ON ("coverages_collection"."eoobject_ptr_id" = "coverages_eoobject"."id") INNER JOIN "coverages_eoobject" T5 ON ("coverages_product"."eoobject_ptr_id" = T5."id") WHERE ("coverages_eoobject"."identifier" = 'Emergency' AND ((T5."begin_time" &lt; to_timestamp(:end_timestamp) AND T5."end_time" &gt; to_timestamp(:start_timestamp)) or (T5."begin_time" = T5."end_time" AND T5."begin_time" &lt;= to_timestamp(:end_timestamp) AND T5."end_time" &gt;= to_timestamp(:start_timestamp)))) AND T5."footprint" &amp;&amp; ST_MakeEnvelope(:minx,:miny,:maxx,:maxy,4326) ORDER BY T5."end_time" DESC LIMIT 20) AS sub ORDER BY interval ASC;</validate_query> <validate_query>SELECT DISTINCT interval FROM (SELECT CONCAT(to_char(T5."begin_time",'YYYY-MM-DD"T"HH24:MI:SS"Z"'), CONCAT('/', to_char(T5."end_time",'YYYY-MM-DD"T"HH24:MI:SS"Z"'))) AS "interval" FROM "coverages_product" INNER JOIN "coverages_product_collections" ON ("coverages_product"."eoobject_ptr_id" = "coverages_product_collections"."product_id") INNER JOIN "coverages_collection" ON ("coverages_product_collections"."collection_id" = "coverages_collection"."eoobject_ptr_id") INNER JOIN "coverages_eoobject" ON ("coverages_collection"."eoobject_ptr_id" = "coverages_eoobject"."id") INNER JOIN "coverages_eoobject" T5 ON ("coverages_product"."eoobject_ptr_id" = T5."id") WHERE ("coverages_eoobject"."identifier" = 'Emergency' AND ((T5."begin_time" &lt; to_timestamp(:end_timestamp) AND T5."end_time" &gt; to_timestamp(:start_timestamp)) or (T5."begin_time" = T5."end_time" AND T5."begin_time" &lt;= to_timestamp(:end_timestamp) AND T5."end_time" &gt;= to_timestamp(:start_timestamp)))) AND T5."footprint" &amp;&amp; ST_MakeEnvelope(:minx,:miny,:maxx,:maxy,4326) ORDER BY T5."end_time" DESC) AS sub ORDER BY interval ASC LIMIT 30;</validate_query>
</dimension> </dimension>
</dimensions> </dimensions>
</tileset> </tileset>
...@@ -146,7 +140,7 @@ ...@@ -146,7 +140,7 @@
<dimension type="postgresql" name="time" default="2017/2019" time="true" unit="ISO8601"> <dimension type="postgresql" name="time" default="2017/2019" time="true" unit="ISO8601">
<connection>host={{DB_HOST}} user={{DB_USER}} password={{DB_PW}} dbname={{DB_NAME}} port={{DB_PORT}}</connection> <connection>host={{DB_HOST}} user={{DB_USER}} password={{DB_PW}} dbname={{DB_NAME}} port={{DB_PORT}}</connection>
<list_query>SELECT CONCAT(to_char(MIN(T5."begin_time"),'YYYY-MM-DD"T"HH24:MI:SS"Z"'), CONCAT('/', to_char(MAX(T5."end_time"),'YYYY-MM-DD"T"HH24:MI:SS"Z"'))) FROM "coverages_product" INNER JOIN "coverages_product_collections" ON ("coverages_product"."eoobject_ptr_id" = "coverages_product_collections"."product_id") INNER JOIN "coverages_collection" ON ("coverages_product_collections"."collection_id" = "coverages_collection"."eoobject_ptr_id") INNER JOIN "coverages_eoobject" ON ("coverages_collection"."eoobject_ptr_id" = "coverages_eoobject"."id") INNER JOIN "coverages_eoobject" T5 ON ("coverages_product"."eoobject_ptr_id" = T5."id") WHERE "coverages_eoobject"."identifier" = 'Emergency';</list_query> <list_query>SELECT CONCAT(to_char(MIN(T5."begin_time"),'YYYY-MM-DD"T"HH24:MI:SS"Z"'), CONCAT('/', to_char(MAX(T5."end_time"),'YYYY-MM-DD"T"HH24:MI:SS"Z"'))) FROM "coverages_product" INNER JOIN "coverages_product_collections" ON ("coverages_product"."eoobject_ptr_id" = "coverages_product_collections"."product_id") INNER JOIN "coverages_collection" ON ("coverages_product_collections"."collection_id" = "coverages_collection"."eoobject_ptr_id") INNER JOIN "coverages_eoobject" ON ("coverages_collection"."eoobject_ptr_id" = "coverages_eoobject"."id") INNER JOIN "coverages_eoobject" T5 ON ("coverages_product"."eoobject_ptr_id" = T5."id") WHERE "coverages_eoobject"."identifier" = 'Emergency';</list_query>
<validate_query>SELECT * FROM (SELECT CONCAT(to_char(T5."begin_time",'YYYY-MM-DD"T"HH24:MI:SS"Z"'), CONCAT('/', to_char(T5."end_time",'YYYY-MM-DD"T"HH24:MI:SS"Z"'))) AS "interval" FROM "coverages_product" INNER JOIN "coverages_product_collections" ON ("coverages_product"."eoobject_ptr_id" = "coverages_product_collections"."product_id") INNER JOIN "coverages_collection" ON ("coverages_product_collections"."collection_id" = "coverages_collection"."eoobject_ptr_id") INNER JOIN "coverages_eoobject" ON ("coverages_collection"."eoobject_ptr_id" = "coverages_eoobject"."id") INNER JOIN "coverages_eoobject" T5 ON ("coverages_product"."eoobject_ptr_id" = T5."id") WHERE ("coverages_eoobject"."identifier" = 'Emergency' AND ((T5."begin_time" &lt; to_timestamp(:end_timestamp) AND T5."end_time" &gt; to_timestamp(:start_timestamp)) or (T5."begin_time" = T5."end_time" AND T5."begin_time" &lt;= to_timestamp(:end_timestamp) AND T5."end_time" &gt;= to_timestamp(:start_timestamp)))) AND T5."footprint" &amp;&amp; ST_MakeEnvelope(:minx,:miny,:maxx,:maxy,4326) ORDER BY T5."end_time" DESC LIMIT 20) AS sub ORDER BY interval ASC;</validate_query> <validate_query>SELECT DISTINCT interval FROM (SELECT CONCAT(to_char(T5."begin_time",'YYYY-MM-DD"T"HH24:MI:SS"Z"'), CONCAT('/', to_char(T5."end_time",'YYYY-MM-DD"T"HH24:MI:SS"Z"'))) AS "interval" FROM "coverages_product" INNER JOIN "coverages_product_collections" ON ("coverages_product"."eoobject_ptr_id" = "coverages_product_collections"."product_id") INNER JOIN "coverages_collection" ON ("coverages_product_collections"."collection_id" = "coverages_collection"."eoobject_ptr_id") INNER JOIN "coverages_eoobject" ON ("coverages_collection"."eoobject_ptr_id" = "coverages_eoobject"."id") INNER JOIN "coverages_eoobject" T5 ON ("coverages_product"."eoobject_ptr_id" = T5."id") WHERE ("coverages_eoobject"."identifier" = 'Emergency' AND ((T5."begin_time" &lt; to_timestamp(:end_timestamp) AND T5."end_time" &gt; to_timestamp(:start_timestamp)) or (T5."begin_time" = T5."end_time" AND T5."begin_time" &lt;= to_timestamp(:end_timestamp) AND T5."end_time" &gt;= to_timestamp(:start_timestamp)))) AND T5."footprint" &amp;&amp; ST_MakeEnvelope(:minx,:miny,:maxx,:maxy,4326) ORDER BY T5."end_time" DESC) AS sub ORDER BY interval ASC LIMIT 30;</validate_query>
</dimension> </dimension>
</dimensions> </dimensions>
</tileset> </tileset>
...@@ -168,7 +162,7 @@ ...@@ -168,7 +162,7 @@
<dimension type="postgresql" name="time" default="2017/2019" time="true" unit="ISO8601"> <dimension type="postgresql" name="time" default="2017/2019" time="true" unit="ISO8601">
<connection>host={{DB_HOST}} user={{DB_USER}} password={{DB_PW}} dbname={{DB_NAME}} port={{DB_PORT}}</connection> <connection>host={{DB_HOST}} user={{DB_USER}} password={{DB_PW}} dbname={{DB_NAME}} port={{DB_PORT}}</connection>
<list_query>SELECT CONCAT(to_char(MIN(T5."begin_time"),'YYYY-MM-DD"T"HH24:MI:SS"Z"'), CONCAT('/', to_char(MAX(T5."end_time"),'YYYY-MM-DD"T"HH24:MI:SS"Z"'))) FROM "coverages_product" INNER JOIN "coverages_product_collections" ON ("coverages_product"."eoobject_ptr_id" = "coverages_product_collections"."product_id") INNER JOIN "coverages_collection" ON ("coverages_product_collections"."collection_id" = "coverages_collection"."eoobject_ptr_id") INNER JOIN "coverages_eoobject" ON ("coverages_collection"."eoobject_ptr_id" = "coverages_eoobject"."id") INNER JOIN "coverages_eoobject" T5 ON ("coverages_product"."eoobject_ptr_id" = T5."id") WHERE "coverages_eoobject"."identifier" = 'Emergency';</list_query> <list_query>SELECT CONCAT(to_char(MIN(T5."begin_time"),'YYYY-MM-DD"T"HH24:MI:SS"Z"'), CONCAT('/', to_char(MAX(T5."end_time"),'YYYY-MM-DD"T"HH24:MI:SS"Z"'))) FROM "coverages_product" INNER JOIN "coverages_product_collections" ON ("coverages_product"."eoobject_ptr_id" = "coverages_product_collections"."product_id") INNER JOIN "coverages_collection" ON ("coverages_product_collections"."collection_id" = "coverages_collection"."eoobject_ptr_id") INNER JOIN "coverages_eoobject" ON ("coverages_collection"."eoobject_ptr_id" = "coverages_eoobject"."id") INNER JOIN "coverages_eoobject" T5 ON ("coverages_product"."eoobject_ptr_id" = T5."id") WHERE "coverages_eoobject"."identifier" = 'Emergency';</list_query>
<validate_query>SELECT * FROM (SELECT CONCAT(to_char(T5."begin_time",'YYYY-MM-DD"T"HH24:MI:SS"Z"'), CONCAT('/', to_char(T5."end_time",'YYYY-MM-DD"T"HH24:MI:SS"Z"'))) AS "interval" FROM "coverages_product" INNER JOIN "coverages_product_collections" ON ("coverages_product"."eoobject_ptr_id" = "coverages_product_collections"."product_id") INNER JOIN "coverages_collection" ON ("coverages_product_collections"."collection_id" = "coverages_collection"."eoobject_ptr_id") INNER JOIN "coverages_eoobject" ON ("coverages_collection"."eoobject_ptr_id" = "coverages_eoobject"."id") INNER JOIN "coverages_eoobject" T5 ON ("coverages_product"."eoobject_ptr_id" = T5."id") WHERE ("coverages_eoobject"."identifier" = 'Emergency' AND ((T5."begin_time" &lt; to_timestamp(:end_timestamp) AND T5."end_time" &gt; to_timestamp(:start_timestamp)) or (T5."begin_time" = T5."end_time" AND T5."begin_time" &lt;= to_timestamp(:end_timestamp) AND T5."end_time" &gt;= to_timestamp(:start_timestamp)))) AND T5."footprint" &amp;&amp; ST_MakeEnvelope(:minx,:miny,:maxx,:maxy,4326) ORDER BY T5."end_time" DESC LIMIT 20) AS sub ORDER BY interval ASC;</validate_query> <validate_query>SELECT DISTINCT interval FROM (SELECT CONCAT(to_char(T5."begin_time",'YYYY-MM-DD"T"HH24:MI:SS"Z"'), CONCAT('/', to_char(T5."end_time",'YYYY-MM-DD"T"HH24:MI:SS"Z"'))) AS "interval" FROM "coverages_product" INNER JOIN "coverages_product_collections" ON ("coverages_product"."eoobject_ptr_id" = "coverages_product_collections"."product_id") INNER JOIN "coverages_collection" ON ("coverages_product_collections"."collection_id" = "coverages_collection"."eoobject_ptr_id") INNER JOIN "coverages_eoobject" ON ("coverages_collection"."eoobject_ptr_id" = "coverages_eoobject"."id") INNER JOIN "coverages_eoobject" T5 ON ("coverages_product"."eoobject_ptr_id" = T5."id") WHERE ("coverages_eoobject"."identifier" = 'Emergency' AND ((T5."begin_time" &lt; to_timestamp(:end_timestamp) AND T5."end_time" &gt; to_timestamp(:start_timestamp)) or (T5."begin_time" = T5."end_time" AND T5."begin_time" &lt;= to_timestamp(:end_timestamp) AND T5."end_time" &gt;= to_timestamp(:start_timestamp)))) AND T5."footprint" &amp;&amp; ST_MakeEnvelope(:minx,:miny,:maxx,:maxy,4326) ORDER BY T5."end_time" DESC) AS sub ORDER BY interval ASC LIMIT 30;</validate_query>
</dimension> </dimension>
</dimensions> </dimensions>
</tileset> </tileset>
......
config/vhr18_index-dev.html
+ 49
− 31
View file @ 33c29427
...@@ -3,14 +3,14 @@ ...@@ -3,14 +3,14 @@
<head> <head>
<meta http-equiv="Content-Type" content="text/html;charset=UTF-8"> <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
<meta charset="UTF-8"> <meta charset="UTF-8">
<title>PRISM View Service</title> <title>PRISM View Server</title>
<link rel="icon" href="//eox.at/wp-content/uploads/2015/06/cropped-eox_eye-192x192.png" sizes="192x192" /> <link rel="icon" href="//eox.at/wp-content/uploads/2015/06/cropped-eox_eye-192x192.png" sizes="192x192" />
<link rel="apple-touch-icon-precomposed" href="//eox.at/wp-content/uploads/2015/06/cropped-eox_eye-180x180.png" /> <link rel="apple-touch-icon-precomposed" href="//eox.at/wp-content/uploads/2015/06/cropped-eox_eye-180x180.png" />
</head> </head>
<body> <body>
<header id="header" style="width: 100%; height:70px;"> <header id="header" style="width: 100%; height:70px;">
<h3 style="width:100%;text-align:center; <h3 style="width:100%;text-align:center;
color: #006699;">PRISM View Service (PVS) Client powered by color: #006699;">PRISM View Server (PVS) Client powered by
<a href="//eox.at"><img src="//eox.at/wp-content/uploads/2017/09/EOX_Logo.svg" alt="EOX" style="height:25px;margin-left:10px"/></a> <a href="//eox.at"><img src="//eox.at/wp-content/uploads/2017/09/EOX_Logo.svg" alt="EOX" style="height:25px;margin-left:10px"/></a>
</h3> </h3>
</header> </header>
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
"leftPanelOpen": false, "leftPanelOpen": false,
"leftPanelTabIndex": 0, "leftPanelTabIndex": 0,
"tutorial": "once", "tutorial": "once",
"uploadEnabled": false, "uploadEnabled": true,
"selectFilesDownloadEnabled": false, "selectFilesDownloadEnabled": false,
"downloadEnabled": true, "downloadEnabled": true,
"searchEnabled" : true, "searchEnabled" : true,
...@@ -108,26 +108,10 @@ ...@@ -108,26 +108,10 @@
"name": "Nearest Neighbour", "name": "Nearest Neighbour",
"identifier": "http://www.opengis.net/def/interpolation/OGC/1/nearest-neighbour" "identifier": "http://www.opengis.net/def/interpolation/OGC/1/nearest-neighbour"
}, },
// {
// "name": "Cubic",
// "identifier": "http://www.opengis.net/def/interpolation/OGC/1/cubic"
// },
// {
// "name": "Cubic Spline",
// "identifier": "http://www.opengis.net/def/interpolation/OGC/1/cubic-spline"
// },
{ {
"name": "Average", "name": "Average",
"identifier": "http://www.opengis.net/def/interpolation/OGC/1/average" "identifier": "http://www.opengis.net/def/interpolation/OGC/1/average"
}, },
// {
// "name": "Lanczos",
// "identifier": "http://www.opengis.net/def/interpolation/OGC/1/lanczos"
// },
// {
// "name": "Mode",
// "identifier": "http://www.opengis.net/def/interpolation/OGC/1/mode"
// },
] ]
}, },
"baseLayers": [ "baseLayers": [
...@@ -139,6 +123,9 @@ ...@@ -139,6 +123,9 @@
"visible": true, "visible": true,
"protocol": "WMTS", "protocol": "WMTS",
"urls": [ "urls": [
"//a.s2maps-tiles.eu/wmts/",
"//b.s2maps-tiles.eu/wmts/",
"//c.s2maps-tiles.eu/wmts/",
"//d.s2maps-tiles.eu/wmts/", "//d.s2maps-tiles.eu/wmts/",
"//e.s2maps-tiles.eu/wmts/" "//e.s2maps-tiles.eu/wmts/"
], ],
...@@ -156,6 +143,9 @@ ...@@ -156,6 +143,9 @@
"visible": false, "visible": false,
"protocol": "WMTS", "protocol": "WMTS",
"urls": [ "urls": [
"//a.s2maps-tiles.eu/wmts/",
"//b.s2maps-tiles.eu/wmts/",
"//c.s2maps-tiles.eu/wmts/",
"//d.s2maps-tiles.eu/wmts/", "//d.s2maps-tiles.eu/wmts/",
"//e.s2maps-tiles.eu/wmts/" "//e.s2maps-tiles.eu/wmts/"
], ],
...@@ -173,6 +163,9 @@ ...@@ -173,6 +163,9 @@
"visible": false, "visible": false,
"protocol": "WMTS", "protocol": "WMTS",
"urls": [ "urls": [
"//a.s2maps-tiles.eu/wmts/",
"//b.s2maps-tiles.eu/wmts/",
"//c.s2maps-tiles.eu/wmts/",
"//d.s2maps-tiles.eu/wmts/", "//d.s2maps-tiles.eu/wmts/",
"//e.s2maps-tiles.eu/wmts/" "//e.s2maps-tiles.eu/wmts/"
], ],
...@@ -192,11 +185,12 @@ ...@@ -192,11 +185,12 @@
"display": { "display": {
"id": 'VHR_IMAGE_2018_Level_1__TRUE_COLOR', "id": 'VHR_IMAGE_2018_Level_1__TRUE_COLOR',
"visible": false, "visible": false,
"protocol": 'WMS', "protocol": 'WMTS',
"url": baseUrl + ':83/ows', "url": baseUrl + ':83/ows/wmts',
"format": 'image/png', "format": 'image/png',
"projection": 'EPSG:4326', "projection": 'EPSG:4326',
"style": '', "matrixSet": "WGS84",
"style": 'default',
"useMilliseconds": false, "useMilliseconds": false,
"maxZoom": 17, "maxZoom": 17,
"options": [{ "options": [{
...@@ -261,11 +255,12 @@ ...@@ -261,11 +255,12 @@
"display": { "display": {
"id": 'VHR_IMAGE_2018_Level_3__TRUE_COLOR', "id": 'VHR_IMAGE_2018_Level_3__TRUE_COLOR',
"visible": true, "visible": true,
"protocol": 'WMS', "protocol": 'WMTS',
"url": baseUrl + ':83/ows', "url": baseUrl + ':83/ows/wmts',
"format": 'image/png', "format": 'image/png',
"projection": 'EPSG:4326', "projection": 'EPSG:4326',
"style": '', "matrixSet": "WGS84",
"style": 'default',
"useMilliseconds": false, "useMilliseconds": false,
"maxZoom": 17, "maxZoom": 17,
"options": [{ "options": [{
...@@ -333,8 +328,11 @@ ...@@ -333,8 +328,11 @@
"visible": false, "visible": false,
"protocol": "WMTS", "protocol": "WMTS",
"urls": [ "urls": [
"//d.tiles.maps.eox.at/wmts/", "//a.s2maps-tiles.eu/wmts/",
"//e.tiles.maps.eox.at/wmts/" "//b.s2maps-tiles.eu/wmts/",
"//c.s2maps-tiles.eu/wmts/",
"//d.s2maps-tiles.eu/wmts/",
"//e.s2maps-tiles.eu/wmts/"
], ],
"matrixSet": "WGS84", "matrixSet": "WGS84",
"style": "default", "style": "default",
...@@ -366,12 +364,14 @@ ...@@ -366,12 +364,14 @@
"display": { "display": {
"id": 'VHR_IMAGE_2018_Level_3__masked_validity__Full', "id": 'VHR_IMAGE_2018_Level_3__masked_validity__Full',
"visible": false, "visible": false,
"protocol": 'WMS', "protocol": 'WMTS',
"url": baseUrl + ':83/ows', "url": baseUrl + ':83/ows/wmts',
"format": 'image/png', "format": 'image/png',
"projection": 'EPSG:4326', "projection": 'EPSG:4326',
"matrixSet": "WGS84",
"maxZoom": 17, "maxZoom": 17,
"synchronizeTime": false, "synchronizeTime": false,
"style": "default",
}, },
}, },
{ {
...@@ -380,12 +380,30 @@ ...@@ -380,12 +380,30 @@
"display": { "display": {
"id": 'VHR_IMAGE_2018_Level_3__Full', "id": 'VHR_IMAGE_2018_Level_3__Full',
"visible": false, "visible": false,
"protocol": 'WMS', "protocol": 'WMTS',
"url": baseUrl + ':83/ows', "url": baseUrl + ':83/ows/wmts',
"format": 'image/png', "format": 'image/png',
"projection": 'EPSG:4326', "projection": 'EPSG:4326',
"matrixSet": "WGS84",
"maxZoom": 17, "maxZoom": 17,
"synchronizeTime": false, "synchronizeTime": false,
"style": "default",
},
},
{
"id": 'VHR_IMAGE_2018_Level_3__FALSE_COLOR__Full',
"displayName": 'VHR Image 2018 Level 3 False Color Full Coverage',
"display": {
"id": 'VHR_IMAGE_2018_Level_3__FALSE_COLOR__Full',
"visible": false,
"protocol": 'WMTS',
"url": baseUrl + ':83/ows/wmts',
"format": 'image/png',
"projection": 'EPSG:4326',
"matrixSet": "WGS84",
"maxZoom": 17,
"synchronizeTime": false,
"style": "default",
}, },
} }
] ]
......
config/vhr18_index-ops.html
+ 72
− 34
View file @ 33c29427
...@@ -3,28 +3,48 @@ ...@@ -3,28 +3,48 @@
<head> <head>
<meta http-equiv="Content-Type" content="text/html;charset=UTF-8"> <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
<meta charset="UTF-8"> <meta charset="UTF-8">
<title>PRISM View Service</title> <title>PRISM View Server</title>
<link rel="icon" href="//eox.at/wp-content/uploads/2015/06/cropped-eox_eye-192x192.png" sizes="192x192" /> <link rel="icon" href="//eox.at/wp-content/uploads/2015/06/cropped-eox_eye-192x192.png" sizes="192x192" />
<link rel="apple-touch-icon-precomposed" href="//eox.at/wp-content/uploads/2015/06/cropped-eox_eye-180x180.png" /> <link rel="apple-touch-icon-precomposed" href="//eox.at/wp-content/uploads/2015/06/cropped-eox_eye-180x180.png" />
</head> </head>
<body> <body>
<header id="header" style="width: 100%; height:70px;"> <header id="header" style="width: 100%; height:70px;">
<h3 style="width:100%;text-align:center; <h3 style="width:100%;text-align:center;
color: #006699;">PRISM View Service (PVS) Client powered by color: #006699;">PRISM View Server (PVS) Client powered by
<a href="//eox.at"><img src="//eox.at/wp-content/uploads/2017/09/EOX_Logo.svg" alt="EOX" style="height:25px;margin-left:10px"/></a> <a href="//eox.at"><img src="//eox.at/wp-content/uploads/2017/09/EOX_Logo.svg" alt="EOX" style="height:25px;margin-left:10px"/></a>
</h3> </h3>
</header> </header>
<div id="app" style="width: 100%; top: 60px; bottom: 0; position: absolute; margin: 0; padding:0;"></div> <div id="app" style="width: 100%; top: 60px; bottom: 0; position: absolute; margin: 0; padding:0;"></div>
<script src="prism.js"></script> <script src="prism.js"></script>
<script> <script>
var baseUrl = '//vhr18.pvs.prism.eox.at/'; var baseUrl = '//vhr18.pass.copernicus.eu/';
var baseUrlsWMTS = [
'//a.vhr18.pass.copernicus.eu/cache/ows/wmts',
'//b.vhr18.pass.copernicus.eu/cache/ows/wmts',
'//c.vhr18.pass.copernicus.eu/cache/ows/wmts',
'//d.vhr18.pass.copernicus.eu/cache/ows/wmts',
'//e.vhr18.pass.copernicus.eu/cache/ows/wmts',
'//f.vhr18.pass.copernicus.eu/cache/ows/wmts',
'//g.vhr18.pass.copernicus.eu/cache/ows/wmts',
'//h.vhr18.pass.copernicus.eu/cache/ows/wmts',
];
var baseUrlsOws = [
'//a.vhr18.pass.copernicus.eu/ows',
'//b.vhr18.pass.copernicus.eu/ows',
'//c.vhr18.pass.copernicus.eu/ows',
'//d.vhr18.pass.copernicus.eu/ows',
'//e.vhr18.pass.copernicus.eu/ows',
'//f.vhr18.pass.copernicus.eu/ows',
'//g.vhr18.pass.copernicus.eu/ows',
'//h.vhr18.pass.copernicus.eu/ows',
];
var config = { var config = {
"settings": { "settings": {
"rightPanelOpen": true, "rightPanelOpen": true,
"leftPanelOpen": false, "leftPanelOpen": false,
"leftPanelTabIndex": 0, "leftPanelTabIndex": 0,
"tutorial": "once", "tutorial": "once",
"uploadEnabled": false, "uploadEnabled": true,
"selectFilesDownloadEnabled": false, "selectFilesDownloadEnabled": false,
"downloadEnabled": true, "downloadEnabled": true,
"searchEnabled" : true, "searchEnabled" : true,
...@@ -108,26 +128,10 @@ ...@@ -108,26 +128,10 @@
"name": "Nearest Neighbour", "name": "Nearest Neighbour",
"identifier": "http://www.opengis.net/def/interpolation/OGC/1/nearest-neighbour" "identifier": "http://www.opengis.net/def/interpolation/OGC/1/nearest-neighbour"
}, },
// {
// "name": "Cubic",
// "identifier": "http://www.opengis.net/def/interpolation/OGC/1/cubic"
// },
// {
// "name": "Cubic Spline",
// "identifier": "http://www.opengis.net/def/interpolation/OGC/1/cubic-spline"
// },
{ {
"name": "Average", "name": "Average",
"identifier": "http://www.opengis.net/def/interpolation/OGC/1/average" "identifier": "http://www.opengis.net/def/interpolation/OGC/1/average"
}, },
// {
// "name": "Lanczos",
// "identifier": "http://www.opengis.net/def/interpolation/OGC/1/lanczos"
// },
// {
// "name": "Mode",
// "identifier": "http://www.opengis.net/def/interpolation/OGC/1/mode"
// },
] ]
}, },
"baseLayers": [ "baseLayers": [
...@@ -139,8 +143,11 @@ ...@@ -139,8 +143,11 @@
"visible": true, "visible": true,
"protocol": "WMTS", "protocol": "WMTS",
"urls": [ "urls": [
"//a.s2maps-tiles.eu/wmts/",
"//b.s2maps-tiles.eu/wmts/",
"//c.s2maps-tiles.eu/wmts/",
"//d.s2maps-tiles.eu/wmts/", "//d.s2maps-tiles.eu/wmts/",
"//e.s2maps-tiles.eu/wmts/" "//e.s2maps-tiles.eu/wmts/",
], ],
"matrixSet": "WGS84", "matrixSet": "WGS84",
"format": "image/png", "format": "image/png",
...@@ -156,6 +163,9 @@ ...@@ -156,6 +163,9 @@
"visible": false, "visible": false,
"protocol": "WMTS", "protocol": "WMTS",
"urls": [ "urls": [
"//a.s2maps-tiles.eu/wmts/",
"//b.s2maps-tiles.eu/wmts/",
"//c.s2maps-tiles.eu/wmts/",
"//d.s2maps-tiles.eu/wmts/", "//d.s2maps-tiles.eu/wmts/",
"//e.s2maps-tiles.eu/wmts/" "//e.s2maps-tiles.eu/wmts/"
], ],
...@@ -173,6 +183,9 @@ ...@@ -173,6 +183,9 @@
"visible": false, "visible": false,
"protocol": "WMTS", "protocol": "WMTS",
"urls": [ "urls": [
"//a.s2maps-tiles.eu/wmts/",
"//b.s2maps-tiles.eu/wmts/",
"//c.s2maps-tiles.eu/wmts/",
"//d.s2maps-tiles.eu/wmts/", "//d.s2maps-tiles.eu/wmts/",
"//e.s2maps-tiles.eu/wmts/" "//e.s2maps-tiles.eu/wmts/"
], ],
...@@ -192,11 +205,12 @@ ...@@ -192,11 +205,12 @@
"display": { "display": {
"id": 'VHR_IMAGE_2018_Level_1__TRUE_COLOR', "id": 'VHR_IMAGE_2018_Level_1__TRUE_COLOR',
"visible": false, "visible": false,
"protocol": 'WMS', "protocol": 'WMTS',
"url": baseUrl + 'cache/ows', "urls": baseUrlsWMTS,
"format": 'image/png', "format": 'image/png',
"projection": 'EPSG:4326', "projection": 'EPSG:4326',
"style": '', "matrixSet": "WGS84",
"style": 'default',
"useMilliseconds": false, "useMilliseconds": false,
"maxZoom": 17, "maxZoom": 17,
"options": [{ "options": [{
...@@ -261,11 +275,12 @@ ...@@ -261,11 +275,12 @@
"display": { "display": {
"id": 'VHR_IMAGE_2018_Level_3__TRUE_COLOR', "id": 'VHR_IMAGE_2018_Level_3__TRUE_COLOR',
"visible": true, "visible": true,
"protocol": 'WMS', "protocol": 'WMTS',
"url": baseUrl + 'cache/ows', "urls": baseUrlsWMTS,
"format": 'image/png', "format": 'image/png',
"projection": 'EPSG:4326', "projection": 'EPSG:4326',
"style": '', "matrixSet": "WGS84",
"style": 'default',
"useMilliseconds": false, "useMilliseconds": false,
"maxZoom": 17, "maxZoom": 17,
"options": [{ "options": [{
...@@ -333,8 +348,11 @@ ...@@ -333,8 +348,11 @@
"visible": false, "visible": false,
"protocol": "WMTS", "protocol": "WMTS",
"urls": [ "urls": [
"//d.tiles.maps.eox.at/wmts/", "//a.s2maps-tiles.eu/wmts/",
"//e.tiles.maps.eox.at/wmts/" "//b.s2maps-tiles.eu/wmts/",
"//c.s2maps-tiles.eu/wmts/",
"//d.s2maps-tiles.eu/wmts/",
"//e.s2maps-tiles.eu/wmts/"
], ],
"matrixSet": "WGS84", "matrixSet": "WGS84",
"style": "default", "style": "default",
...@@ -351,7 +369,7 @@ ...@@ -351,7 +369,7 @@
"id": 'VHR_IMAGE_2018_Level_3__outlines', "id": 'VHR_IMAGE_2018_Level_3__outlines',
"visible": false, "visible": false,
"protocol": 'WMS', "protocol": 'WMS',
"url": baseUrl + 'ows', "urls": baseUrlsOws,
"format": 'image/png', "format": 'image/png',
"projection": 'EPSG:4326', "projection": 'EPSG:4326',
"style": 'red', "style": 'red',
...@@ -366,12 +384,14 @@ ...@@ -366,12 +384,14 @@
"display": { "display": {
"id": 'VHR_IMAGE_2018_Level_3__masked_validity__Full', "id": 'VHR_IMAGE_2018_Level_3__masked_validity__Full',
"visible": false, "visible": false,
"protocol": 'WMS', "protocol": 'WMTS',
"url": baseUrl + 'cache/ows', "urls": baseUrlsWMTS,
"format": 'image/png', "format": 'image/png',
"projection": 'EPSG:4326', "projection": 'EPSG:4326',
"matrixSet": "WGS84",
"maxZoom": 17, "maxZoom": 17,
"synchronizeTime": false, "synchronizeTime": false,
"style": "default",
}, },
}, },
{ {
...@@ -380,12 +400,30 @@ ...@@ -380,12 +400,30 @@
"display": { "display": {
"id": 'VHR_IMAGE_2018_Level_3__Full', "id": 'VHR_IMAGE_2018_Level_3__Full',
"visible": false, "visible": false,
"protocol": 'WMS', "protocol": 'WMTS',
"url": baseUrl + 'cache/ows', "urls": baseUrlsWMTS,
"format": 'image/png',
"projection": 'EPSG:4326',
"matrixSet": "WGS84",
"maxZoom": 17,
"synchronizeTime": false,
"style": "default",
},
},
{
"id": 'VHR_IMAGE_2018_Level_3__FALSE_COLOR__Full',
"displayName": 'VHR Image 2018 Level 3 False Color Full Coverage',
"display": {
"id": 'VHR_IMAGE_2018_Level_3__FALSE_COLOR__Full',
"visible": false,
"protocol": 'WMTS',
"urls": baseUrlsWMTS,
"format": 'image/png', "format": 'image/png',
"projection": 'EPSG:4326', "projection": 'EPSG:4326',
"matrixSet": "WGS84",
"maxZoom": 17, "maxZoom": 17,
"synchronizeTime": false, "synchronizeTime": false,
"style": "default",
}, },
} }
] ]
......
config/vhr18_init-db.sh
+ 1
− 1
View file @ 33c29427
...@@ -412,7 +412,7 @@ if python3 manage.py id check "${COLLECTION}"; then ...@@ -412,7 +412,7 @@ if python3 manage.py id check "${COLLECTION}"; then
-p region-name "${OS_REGION_NAME}" -p region-name "${OS_REGION_NAME}"
python3 manage.py storage create \ python3 manage.py storage create \
${BUCKET_NAME} ${BUCKET_NAME} \ ${UPLOAD_CONTAINER} ${UPLOAD_CONTAINER} \
--type swift \ --type swift \
--storage-auth auth-cloud-ovh --storage-auth auth-cloud-ovh
......
config/vhr18_mapcache-dev.xml
+ 15
− 21
View file @ 33c29427
This diff is collapsed.
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