Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat: Implementation of COG source change and minor style fix #2721

Merged
merged 2 commits into from
Dec 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 37 additions & 0 deletions app/src/components/map/MapOverlay.vue
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,43 @@ export default {
border-bottom: 0;
margin-left: -10px;
margin-bottom: -10px;
}
.loading-indicator {
top: unset;
bottom: 0.5em !important;
left: 0.5em !important;
height: 22px;
pointer-events: none !important;
}

.loading-indicator.hidden {
display: none;
}

@keyframes spinner {
to {
transform: rotate(360deg);
}
}

.spinner:after {
content: "";
box-sizing: border-box;
position: absolute;
top: 50%;
left: 50%;
width: 18px;
height: 18px;
margin-top: -9px;
margin-left: -9px;
border-radius: 50%;
border: 5px solid rgba(180, 180, 180, 0.6);
border-top-color: rgba(0, 0, 0, 0.6);
animation: spinner 0.6s linear infinite;
}
.theme--dark .spinner:after {
border: 5px solid rgba(180, 180, 180, 0.6);
border-top-color: rgba(255, 255, 255, 0.6);
}`;
if ('mapContainer' in this.$parent.$refs && this.$parent.$refs.mapContainer.shadowRoot) {
this.$parent.$refs.mapContainer.shadowRoot.appendChild(style);
Expand Down
9 changes: 8 additions & 1 deletion app/src/components/map/timeLayerUtils.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import GeoTIFF from 'ol/source/GeoTIFF';

// eslint-disable-next-line import/prefer-default-export
export function updateTimeLayer(layer, config, time, drawnArea, sourceGet = 'updateTime') {
if (config.protocol === 'cog' && !config.features) {
if (config.protocol === 'cog' && 'sources' in config && !config.features) {
const updatedSources = config.sources.map((item) => {
const url = item.url.replace(/{time}/i, config.dateFormatFunction(time));
return { url };
Expand All @@ -21,6 +21,13 @@ export function updateTimeLayer(layer, config, time, drawnArea, sourceGet = 'upd
normalize: config.normalize ? config.normalize : false,
interpolate: false,
}));
} else if (Array.isArray(time)) {
// This case if for geotiff assets passed in the time
layer.setSource(new GeoTIFF({
sources: time[1].map((url) => ({ url })),
normalize: config.normalize ? config.normalize : false,
interpolate: false,
}));
} else {
const source = layer.getSource();
const updateTimeFunction = source.get(sourceGet);
Expand Down
Loading