Skip to content
This repository has been archived by the owner on May 20, 2022. It is now read-only.

Commit

Permalink
Merge branch 'master' of github.com:eoxc/CODE-DE
Browse files Browse the repository at this point in the history
  • Loading branch information
constantinius committed Sep 15, 2017
2 parents b48eb8d + 549da31 commit a47c509
Show file tree
Hide file tree
Showing 14 changed files with 418 additions and 86 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "CODE-DE",
"version": "1.0.0-rc.6",
"version": "1.0.0-rc.7",
"description": "CODE-DE",
"scripts": {
"build": "webpack -p",
Expand Down Expand Up @@ -70,7 +70,7 @@
"bootstrap": "^3.3.7",
"bootstrap-slider": "^9.7.2",
"eonasdan-bootstrap-datetimepicker": "^4.17.42",
"eoxc": "1.0.0-rc.6",
"eoxc": "1.0.0-rc.7",
"es6-promise": "^4.0.5",
"i18next": "^3.4.1",
"jquery": "^2.2.3",
Expand Down
8 changes: 4 additions & 4 deletions src/_client.scss
Original file line number Diff line number Diff line change
Expand Up @@ -474,7 +474,7 @@ input {

.ol-mouse-position-eoxc {
bottom: 10px;
left: 245px;
left: 20px;
position: absolute;
padding: 2px;
background-color: rgba(255,255,255,.8);
Expand Down Expand Up @@ -525,15 +525,15 @@ input {
}


.panel-title .caret{
.panel-title .caret,.dropdown.open .caret{
-webkit-transform:rotate(0deg);
transform:rotate(0deg);
}
.panel-title .caret,.panel-title .collapsed .caret{
.panel-title .caret,.panel-title .collapsed .caret,.dropdown .caret{
-webkit-transition:.2s ease-in-out;
transition:.2s ease-in-out;
}
.panel-title .collapsed .caret {
.panel-title .collapsed .caret,.dropdown .caret {
-webkit-transform:rotate(-90deg);
transform:rotate(-90deg);
}
Expand Down
33 changes: 33 additions & 0 deletions src/code-de.html
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,39 @@ <h1 class="sr-only">CODE-DE</h1>
"download": {
"protocol": "OpenSearch"
}
},
{
"id": "S2_MSI_L1C_TE",
"link": "\/en\/record\/39b6073d-7ef4-4aa9-a3e4-07f079709b52",
"displayName": "Sentinel-2 MSI - Test Environment",
"displayColor": "rgba(153, 0, 153, 1)",
"display": {
"id": "S2_MSI_L1C",
"visible": false,
"protocol": "WMS",
"urls": [
"http://ows.eox.at/code-de_geoservice/Sentinel2/wms?"
],
"format": "image\/png",
"projection": "EPSG:4326",
"style": "default",
"attribution": "Nutzungsbedingungen: https:\/\/scihub.copernicus.eu\/twiki\/pub\/SciHubWebPortal\/TermsConditions\/TC_Sentinel_Data_31072014.pdf"
},
"search": {
"protocol": "OpenSearch",
"url": "https://dehub.dlr.de/opensearch/description.xml/?parentIdentifier=EOP:CODE-DE:S2_MSI_L1C",
"id": "EOP:CODE-DE:S2_MSI_L1C",
"histogramBinCount": 30,
"format": "application\/atom+xml",
"method": "GET",
"histogramThreshold": 500,
"lightweightBuckets": true,
"searchLimit": 600,
"loadMore":600
},
"download": {
"protocol": "OpenSearch"
}
}
],
"overlayLayers": [
Expand Down
4 changes: 2 additions & 2 deletions src/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -481,8 +481,8 @@ window.Application = Marionette.Application.extend({
// use set timeout here so that vendor info is always at the end of the attribution list
setTimeout(() => {
const vendorInfoHTML = `<li>Powered&nbsp;by&nbsp;<a href="https://github.com/eoxc" target="_blank">EOxC</a>&nbsp;&copy;&nbsp;<a href="https://eox.at" target="_blank">EOX&nbsp;<i class="icon-eox-eye"/></a>
<!-- CODE-DE Client version {{cdeVersion}} https://github.com/eoxc/CODE-DE/releases/tag/v${cdeVersion} -->
<!-- eoxc version {{eoxcVersion}} https://github.com/eoxc/eoxc/releases/tag/v${eoxcVersion} --></li>`;
<!-- CODE-DE Client version ${cdeVersion} https://github.com/eoxc/CODE-DE/releases/tag/v${cdeVersion} -->
<!-- eoxc version ${eoxcVersion} https://github.com/eoxc/eoxc/releases/tag/v${eoxcVersion} --></li>`;
$(this.container).find('.ol-attribution ul').append(vendorInfoHTML);
});

Expand Down
7 changes: 4 additions & 3 deletions src/multi.html
Original file line number Diff line number Diff line change
Expand Up @@ -192,11 +192,12 @@ <h1 class="sr-only">CODE-DE</h1>
"displayColor": "rgba(51, 102, 204, 1)",
"link": "http://sxcat.eox.at/socat/ASA_IMP_1P",
"display": {
"id": "ENVISAT_ASAR_IMP_1P",
"id": "ASA-IMP_1P",
"visible": true,
"protocol": "WMS",
"protocol": "WMTS",
"urls": [
"http://brow01.ngeo.eox.at/c/?"
// "http://brow01.ngeo.eox.at/c/?"
"https://eoli.eo.esa.int/c/wmts/?"
],
"matrixSet": "WGS84",
"format": "image/png",
Expand Down
267 changes: 267 additions & 0 deletions src/sentinel-hub.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,267 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>EOxC Demo Sentinel-Hub</title>
<link rel="stylesheet" href="static/code-de.css"/>
<link rel="stylesheet" href="static/fonts.css"/>
<style>
#header .navbar.static {
top: 0 !important;
}
#header .navbar-collapse {
background: #373B50;
text-align: right;
}
#header {
min-height: auto;
}
</style>
</head>
<body class="page-catalogclient i18n-en">
<header id="header">
<nav class="navbar static">
<div class="container">
<div class="navbar-header">
<div class="navbar-brand-centered">
<h1 style="color: white">EOxC Demo Sentinel-Hub</h1>
</div>
</div>
</div>
</nav>
</header>

<div id="app" style="width: 100%; top: 55px; bottom: 0; position: absolute; margin: 0; padding:0;"></div>
<script src="code-de.bundle.js"></script>
<script>
var config = {
"settings": {
"rightPanelOpen": true,
"leftPanelOpen": true,
"language": "en",
"tutorial": "once",
"center": [15, 50],
"zoom": 4,
"minZoom": 4,
"maxZoom": 15,
"searchDebounceTime": 250,
"timeSliderControls": true,
"timeDomain": [
"2015-01-01T00:00:00Z",
"2017-07-31T23:59:59Z"
],
"contrainTimeDomain": true,
"selectedTimeDomain": [
"2017-07-20T00:00:00Z",
"2017-07-26T23:59:59Z"
],
"selectableInterval": "P1M",
"displayTimeDomain": [
"2017-07-01T00:00:00Z",
"2017-07-31T23:59:59Z"
],
"footprintFillColor": "rgba(255, 255, 255, 0.2)",
"footprintStrokeColor": "rgba(255, 255, 255, 1)",
"filterFillColor": "rgba(0, 165, 255, 0)",
"filterStrokeColor": "rgba(0, 165, 255, 1)",
"filterOutsideColor": "rgba(0, 0, 0, 0.5)",
"selectedFootprintFillColor": "rgba(255, 0, 0, 0.2)",
"selectedFootprintStrokeColor": "rgba(255, 0, 0, 1)",
"highlightFillColor": "rgba(246, 182, 0, 0.2)",
"highlightStrokeColor": "rgba(246, 182, 0, 1)",
"highlightStrokeWidth": 3,
"maxTooltips": 1,
"parameters": [
{
"type": "eo:cloudCover",
"title": "Cloud Coverage in percent",
"max": 100,
"min": 0,
"range": true
},
{
"type": "eo:resolution",
"options": [{
"label": "10m",
"value": "10",
}, {
"label": "20m",
"value": "20",
}, {
"label": "60m",
"value": "60",
}]
}
],
"translations": {
"en": {
"Cloud Cover": "Cloud coverage (%)"
}
}
},
"baseLayers": [
{
"id": "s2cloudless",
"displayName": "Sentinel-2 cloudless",
"display": {
"id": "s2cloudless",
"visible": true,
"protocol": "WMTS",
"urls": [
"http://a.tiles.maps.eox.at/wmts/",
"http://b.tiles.maps.eox.at/wmts/",
"http://c.tiles.maps.eox.at/wmts/",
"http://d.tiles.maps.eox.at/wmts/",
"http://e.tiles.maps.eox.at/wmts/"
],
"matrixSet": "WGS84",
"format": "image/png",
"projection": "EPSG:4326",
"style": "default",
"attribution": "<a class=\"a-light\" xmlns:dct=\"http://purl.org/dc/terms/\" href=\"https://s2maps.eu\" property=\"dct:title\">Sentinel-2 cloudless</a> by <a class=\"a-light\" xmlns:cc=\"http://creativecommons.org/ns#\" href=\"https://eox.at\" property=\"cc:attributionName\" rel=\"cc:attributionURL\">EOX IT Services GmbH</a> (Contains modified Copernicus Sentinel data 2016)"
}
}, {
"id": "terrain-light",
"displayName": "Terrain-Light",
"display": {
"id": "terrain-light",
"visible": false,
"protocol": "WMTS",
"urls": [
"http://a.tiles.maps.eox.at/wmts/",
"http://b.tiles.maps.eox.at/wmts/",
"http://c.tiles.maps.eox.at/wmts/",
"http://d.tiles.maps.eox.at/wmts/",
"http://e.tiles.maps.eox.at/wmts/"
],
"matrixSet": "WGS84",
"format": "image/png",
"projection": "EPSG:4326",
"style": "default",
"attribution": "Terrain-Light { Data &copy; <a href=\"http://www.openstreetmap.org/copyright\" target=\"_blank\">OpenStreetMap</a> contributors and <a href='javascript:;' onClick='toggle(terrain_attribution)'>others</a>, Rendering &copy; <a href=\"http://eox.at\" target=\"_blank\">EOX</a> }"
}
}, {
"id": "terrain",
"displayName": "Terrain",
"display": {
"id": "terrain",
"visible": false,
"protocol": "WMTS",
"urls": [
"http://a.tiles.maps.eox.at/wmts/",
"http://b.tiles.maps.eox.at/wmts/",
"http://c.tiles.maps.eox.at/wmts/",
"http://d.tiles.maps.eox.at/wmts/",
"http://e.tiles.maps.eox.at/wmts/"
],
"matrixSet": "WGS84",
"format": "image/png",
"projection": "EPSG:4326",
"style": "default",
"attribution": "Terrain { Data &copy; <a href=\"http://www.openstreetmap.org/copyright\" target=\"_blank\">OpenStreetMap</a> contributors and <a href='javascript:;' onClick='toggle(terrain_attribution)'>others</a>, Rendering &copy; <a href=\"http://eox.at\" target=\"_blank\">EOX</a> }"
}
}, {
"id": "bluemarble",
"displayName": "Blue Marble",
"display": {
"id": "bluemarble",
"visible": false,
"protocol": "WMTS",
"urls": [
"http://a.tiles.maps.eox.at/wmts/",
"http://b.tiles.maps.eox.at/wmts/",
"http://c.tiles.maps.eox.at/wmts/",
"http://d.tiles.maps.eox.at/wmts/",
"http://e.tiles.maps.eox.at/wmts/"
],
"matrixSet": "WGS84",
"format": "image/png",
"projection": "EPSG:4326",
"style": "default",
"attribution": "Blue Marble { &copy; <a href=\"http://nasa.gov\" target=\"_blank\">NASA</a> }"
}
}
],
"layers": [
{
"id": "Sentinel-2",
"displayName": "Sentinel-2",
"displayColor": "rgba(51, 102, 204, 1)",
"display": {
"id": "",
"visible": true,
"protocol": "WMS",
"urls": [
""
]
},
"search": {
"protocol": "OpenSearch",
"url": "http://ows.eox.at/sentinel-hub/sentinel-hub.osdd",
"id": "S2",
"histogramBinCount": 30,
"format": "application\/atom+xml",
"method": "GET",
"histogramThreshold": 600,
"lightweightBuckets": true,
"searchLimit": 600,
"loadMore":300
},
"download": {
"protocol": "OpenSearch"
}
}
],
"overlayLayers": [
{
"id": "coastline",
"displayName": "Coastline",
"display": {
"id": "coastline",
"visible": false,
"protocol": "WMTS",
"urls": [
"http://a.tiles.maps.eox.at/wmts/",
"http://b.tiles.maps.eox.at/wmts/",
"http://c.tiles.maps.eox.at/wmts/",
"http://d.tiles.maps.eox.at/wmts/",
"http://e.tiles.maps.eox.at/wmts/"
],
"matrixSet": "WGS84",
"style": "default",
"format": "image/png",
"attribution": "Overlay { Data &copy; <a href=\"http://www.openstreetmap.org/copyright\" target=\"_blank\">OpenStreetMap</a> contributors, Rendering &copy; <a href=\"http://eox.at\" target=\"_blank\">EOX</a> and <a href=\"https://github.com/mapserver/basemaps\" target=\"_blank\">MapServer</a> }"
}
},
{
"id": "overlay_base",
"displayName": "Borders and Labels",
"display": {
"id": "overlay_base",
"visible": false,
"protocol": "WMTS",
"urls": [
"http://a.tiles.maps.eox.at/wmts/",
"http://b.tiles.maps.eox.at/wmts/",
"http://c.tiles.maps.eox.at/wmts/",
"http://d.tiles.maps.eox.at/wmts/",
"http://e.tiles.maps.eox.at/wmts/"
],
"matrixSet": "WGS84",
"style": "default",
"format": "image/png",
"projection": "EPSG:4326",
"attribution": "Overlay { Data &copy; <a href=\"http://www.openstreetmap.org/copyright\" target=\"_blank\">OpenStreetMap</a> contributors, Rendering &copy; <a href=\"http://eox.at\" target=\"_blank\">EOX</a> and <a href=\"https://github.com/mapserver/basemaps\" target=\"_blank\">MapServer</a> }"
}
}
]
};

var app = new Application({
config: config,
container: document.getElementById('app')
});
app.start();
</script>
</body>
</html>
1 change: 1 addition & 0 deletions src/static/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
fonts/
12 changes: 6 additions & 6 deletions src/static/code-de.css

Large diffs are not rendered by default.

Loading

0 comments on commit a47c509

Please sign in to comment.