AegisSight/AegisSight-Globe
2
0
Fork 0
Code Issues Pull-Requests Actions Pakete Projekte Releases Wiki Aktivität

fix: NASA GIBS Imagery nutzt REST-URL statt KVP-Endpunkt

Quellcode durchsuchen 
wmts.cgi mit times/clock funktionierte nicht -- Tiles wurden nicht geladen.
Jetzt gleicher Ansatz wie nightlights.js: Datum direkt in REST-URL eingebaut.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Dieser Commit ist enthalten in:
Claude Dev
2026-03-27 21:54:48 +01:00
Ursprung 39b2528ced
Commit 1d64ad8d1f
1 geänderte Dateien mit 85 neuen und 100 gelöschten Zeilen
Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

185
static/js/ui/imagery.js
Datei anzeigen

@@ -5,85 +5,81 @@
const ImagerySwitch = { const ImagerySwitch = {
_viewer: null, _viewer: null,
_currentLayer: null, _currentLayer: null,
_currentId: "default", _currentId: 'default',
_sources: { _sources: {
"default": { name: "Cesium Ion (Standard)", url: null }, 'default': { name: 'Cesium Ion (Standard)' },
"esri": { 'esri': {
name: "Esri World Imagery", name: 'Esri World Imagery',
url: "https://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}", url: 'https://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}',
}, },
"nasa-modis": { 'nasa-modis': {
name: "NASA MODIS Terra (Heute)", name: 'NASA MODIS Terra (Heute)',
wmts: { gibs: {
url: "https://gibs.earthdata.nasa.gov/wmts/epsg4326/best/wmts.cgi", layer: 'MODIS_Terra_CorrectedReflectance_TrueColor',
layer: "MODIS_Terra_CorrectedReflectance_TrueColor", tileMatrixSet: '250m',
tileMatrixSetID: "250m", ext: 'jpg',
format: "image/jpeg", time: 'today',
time: "today",
maxLevel: 8, maxLevel: 8,
}, },
}, },
"nasa-viirs": { 'nasa-viirs': {
name: "NASA VIIRS SNPP (Heute)", name: 'NASA VIIRS SNPP (Heute)',
wmts: { gibs: {
url: "https://gibs.earthdata.nasa.gov/wmts/epsg4326/best/wmts.cgi", layer: 'VIIRS_SNPP_CorrectedReflectance_TrueColor',
layer: "VIIRS_SNPP_CorrectedReflectance_TrueColor", tileMatrixSet: '250m',
tileMatrixSetID: "250m", ext: 'jpg',
format: "image/jpeg", time: 'today',
time: "today",
maxLevel: 8, maxLevel: 8,
}, },
}, },
"nasa-goes-east": { 'nasa-goes-east': {
name: "NASA GOES East (Live)", name: 'NASA GOES East (Live)',
wmts: { gibs: {
url: "https://gibs.earthdata.nasa.gov/wmts/epsg4326/best/wmts.cgi", layer: 'GOES-East_ABI_GeoColor',
layer: "GOES-East_ABI_GeoColor", tileMatrixSet: '2km',
tileMatrixSetID: "2km", ext: 'jpg',
format: "image/jpeg", time: 'today',
time: null,
maxLevel: 5, maxLevel: 5,
}, },
}, },
"nasa-goes-west": { 'nasa-goes-west': {
name: "NASA GOES West (Live)", name: 'NASA GOES West (Live)',
wmts: { gibs: {
url: "https://gibs.earthdata.nasa.gov/wmts/epsg4326/best/wmts.cgi", layer: 'GOES-West_ABI_GeoColor',
layer: "GOES-West_ABI_GeoColor", tileMatrixSet: '2km',
tileMatrixSetID: "2km", ext: 'jpg',
format: "image/jpeg", time: 'today',
time: null,
maxLevel: 5, maxLevel: 5,
}, },
}, },
"s2-2024": { 's2-2024': {
name: "Sentinel-2 (2024)", name: 'Sentinel-2 (2024)',
url: "https://tiles.maps.eox.at/wmts/1.0.0/s2cloudless-2024_3857/default/GoogleMapsCompatible/{z}/{x}/{y}.jpg", url: 'https://tiles.maps.eox.at/wmts/1.0.0/s2cloudless-2024_3857/default/GoogleMapsCompatible/{z}/{x}/{y}.jpg',
}, },
"s2-2023": { 's2-2023': {
name: "Sentinel-2 (2023)", name: 'Sentinel-2 (2023)',
url: "https://tiles.maps.eox.at/wmts/1.0.0/s2cloudless-2023_3857/default/GoogleMapsCompatible/{z}/{x}/{y}.jpg", url: 'https://tiles.maps.eox.at/wmts/1.0.0/s2cloudless-2023_3857/default/GoogleMapsCompatible/{z}/{x}/{y}.jpg',
}, },
"s2-2022": { 's2-2022': {
name: "Sentinel-2 (2022)", name: 'Sentinel-2 (2022)',
url: "https://tiles.maps.eox.at/wmts/1.0.0/s2cloudless-2022_3857/default/GoogleMapsCompatible/{z}/{x}/{y}.jpg", url: 'https://tiles.maps.eox.at/wmts/1.0.0/s2cloudless-2022_3857/default/GoogleMapsCompatible/{z}/{x}/{y}.jpg',
}, },
"s2-2020": { 's2-2020': {
name: "Sentinel-2 (2020)", name: 'Sentinel-2 (2020)',
url: "https://tiles.maps.eox.at/wmts/1.0.0/s2cloudless-2020_3857/default/GoogleMapsCompatible/{z}/{x}/{y}.jpg", url: 'https://tiles.maps.eox.at/wmts/1.0.0/s2cloudless-2020_3857/default/GoogleMapsCompatible/{z}/{x}/{y}.jpg',
}, },
"s2-2018": { 's2-2018': {
name: "Sentinel-2 (2018)", name: 'Sentinel-2 (2018)',
url: "https://tiles.maps.eox.at/wmts/1.0.0/s2cloudless-2018_3857/default/GoogleMapsCompatible/{z}/{x}/{y}.jpg", url: 'https://tiles.maps.eox.at/wmts/1.0.0/s2cloudless-2018_3857/default/GoogleMapsCompatible/{z}/{x}/{y}.jpg',
}, },
"topo": { 'topo': {
name: "OpenTopoMap", name: 'OpenTopoMap',
url: "https://tile.opentopomap.org/{z}/{x}/{y}.png", url: 'https://tile.opentopomap.org/{z}/{x}/{y}.png',
}, },
"osm": { 'osm': {
name: "OpenStreetMap", name: 'OpenStreetMap',
url: "https://a.tile.openstreetmap.org/{z}/{x}/{y}.png", url: 'https://a.tile.openstreetmap.org/{z}/{x}/{y}.png',
}, },
}, },
@@ -91,10 +87,29 @@ const ImagerySwitch = {
this._viewer = viewer; this._viewer = viewer;
}, },
_getGibsLabels(maxLevel) { _buildGibsProvider(g) {
var today = new Date().toISOString().slice(0, 10);
var time = (g.time === 'today') ? today : g.time;
var labels = []; var labels = [];
for (var i = 0; i <= maxLevel; i++) labels.push(String(i)); for (var i = 0; i <= g.maxLevel; i++) labels.push(String(i));
return labels;
// REST-URL (gleicher Ansatz wie nightlights.js -- bewaehrt)
var restUrl = 'https://gibs.earthdata.nasa.gov/wmts/epsg4326/best/'
+ g.layer + '/default/' + time + '/' + g.tileMatrixSet
+ '/{TileMatrix}/{TileRow}/{TileCol}.' + g.ext;
return new Cesium.WebMapTileServiceImageryProvider({
url: restUrl,
layer: g.layer,
style: 'default',
tileMatrixSetID: g.tileMatrixSet,
tileMatrixLabels: labels,
format: 'image/' + g.ext,
tilingScheme: new Cesium.GeographicTilingScheme(),
tileWidth: 512,
tileHeight: 512,
credit: 'NASA GIBS',
});
}, },
switchTo(id) { switchTo(id) {
@@ -108,47 +123,18 @@ const ImagerySwitch = {
this._currentLayer = null; this._currentLayer = null;
} }
if (id === "default") { if (id === 'default') {
// Cesium Ion Default -- nichts hinzufuegen
this._currentId = id; this._currentId = id;
} else if (src.wmts) { } else if (src.gibs) {
// NASA GIBS WMTS Provider // NASA GIBS WMTS (REST-URL)
var w = src.wmts;
var opts = {
url: w.url,
layer: w.layer,
tileMatrixSetID: w.tileMatrixSetID,
format: w.format,
style: "default",
tileWidth: 512,
tileHeight: 512,
tilingScheme: new Cesium.GeographicTilingScheme(),
tileMatrixLabels: this._getGibsLabels(w.maxLevel),
credit: "NASA GIBS",
};
if (w.time === "today") {
opts.times = new Cesium.TimeIntervalCollection([
new Cesium.TimeInterval({
start: Cesium.JulianDate.fromIso8601(new Date().toISOString().slice(0, 10)),
stop: Cesium.JulianDate.fromIso8601("9999-12-31"),
}),
]);
opts.clock = this._viewer.clock;
} else if (w.time) {
opts.times = new Cesium.TimeIntervalCollection([
new Cesium.TimeInterval({
start: Cesium.JulianDate.fromIso8601(w.time),
stop: Cesium.JulianDate.fromIso8601("9999-12-31"),
}),
]);
opts.clock = this._viewer.clock;
}
this._currentLayer = this._viewer.imageryLayers.addImageryProvider( this._currentLayer = this._viewer.imageryLayers.addImageryProvider(
new Cesium.WebMapTileServiceImageryProvider(opts) this._buildGibsProvider(src.gibs)
); );
this._viewer.imageryLayers.lower(this._currentLayer); this._viewer.imageryLayers.lower(this._currentLayer);
this._currentId = id; this._currentId = id;
} else { } else if (src.url) {
// URL Template Provider (Esri, Sentinel, OSM) // URL Template (Esri, Sentinel, OSM)
this._currentLayer = this._viewer.imageryLayers.addImageryProvider( this._currentLayer = this._viewer.imageryLayers.addImageryProvider(
new Cesium.UrlTemplateImageryProvider({ new Cesium.UrlTemplateImageryProvider({
url: src.url, url: src.url,
@@ -160,10 +146,9 @@ const ImagerySwitch = {
this._currentId = id; this._currentId = id;
} }
// Dropdown aktualisieren var sel = document.getElementById('imagery-select');
var sel = document.getElementById("imagery-select");
if (sel) sel.value = id; if (sel) sel.value = id;
var label = document.getElementById("imagery-label"); var label = document.getElementById('imagery-label');
if (label) label.textContent = src.name; if (label) label.textContent = src.name;
}, },
}; };