Skip to content

Commit

Permalink
Merge branch 'develop' into wv-2913-highlight-tracks
Browse files Browse the repository at this point in the history
  • Loading branch information
@christof-wittreich
christof-wittreich authored Oct 19, 2023
2 parents 74dec81 + a0557e6 commit 2ffa623
Show file tree
Hide file tree
Showing 22 changed files with 51 additions and 40 deletions.
3 changes: 2 additions & 1 deletion config/default/common/config/wv.json/layers/multi-mission/hls/HLS_Customizable_Landsat.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@
"source": "DDV",
"matrixSet": "31.25m"
}
}
},
"startDate": "2022-01-01T00:00:00Z"
}
}
}
3 changes: 2 additions & 1 deletion config/default/common/config/wv.json/layers/multi-mission/hls/HLS_Customizable_Sentinel.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@
"source": "DDV",
"matrixSet": "31.25m"
}
}
},
"startDate": "2022-01-01T00:00:00Z"
}
}
}
3 changes: 2 additions & 1 deletion config/default/common/config/wv.json/layers/multi-mission/hls/HLS_False_Color_Landsat.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@
"source": "DDV",
"matrixSet": "31.25m"
}
}
},
"startDate": "2022-01-01T00:00:00Z"
}
}
}
3 changes: 2 additions & 1 deletion config/default/common/config/wv.json/layers/multi-mission/hls/HLS_False_Color_Sentinel.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@
"source": "DDV",
"matrixSet": "31.25m"
}
}
},
"startDate": "2022-01-01T00:00:00Z"
}
}
}
3 changes: 2 additions & 1 deletion ...default/common/config/wv.json/layers/multi-mission/hls/HLS_False_Color_Urban_Landsat.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@
"source": "DDV",
"matrixSet": "31.25m"
}
}
},
"startDate": "2022-01-01T00:00:00Z"
}
}
}
3 changes: 2 additions & 1 deletion ...efault/common/config/wv.json/layers/multi-mission/hls/HLS_False_Color_Urban_Sentinel.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@
"source": "DDV",
"matrixSet": "31.25m"
}
}
},
"startDate": "2022-01-01T00:00:00Z"
}
}
}
3 changes: 2 additions & 1 deletion ...lt/common/config/wv.json/layers/multi-mission/hls/HLS_False_Color_Vegetation_Landsat.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@
"source": "DDV",
"matrixSet": "31.25m"
}
}
},
"startDate": "2022-01-01T00:00:00Z"
}
}
}
3 changes: 2 additions & 1 deletion ...t/common/config/wv.json/layers/multi-mission/hls/HLS_False_Color_Vegetation_Sentinel.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@
"source": "DDV",
"matrixSet": "31.25m"
}
}
},
"startDate": "2022-01-01T00:00:00Z"
}
}
}
3 changes: 2 additions & 1 deletion ...ig/default/common/config/wv.json/layers/multi-mission/hls/HLS_Moisture_Index_Landsat.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@
"source": "DDV",
"matrixSet": "31.25m"
}
}
},
"startDate": "2022-01-01T00:00:00Z"
}
}
}
3 changes: 2 additions & 1 deletion ...g/default/common/config/wv.json/layers/multi-mission/hls/HLS_Moisture_Index_Sentinel.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@
"source": "DDV",
"matrixSet": "31.25m"
}
}
},
"startDate": "2022-01-01T00:00:00Z"
}
}
}
3 changes: 2 additions & 1 deletion config/default/common/config/wv.json/layers/multi-mission/hls/HLS_NDSI_Landsat.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@
"source": "DDV",
"matrixSet": "31.25m"
}
}
},
"startDate": "2022-01-01T00:00:00Z"
}
}
}
3 changes: 2 additions & 1 deletion config/default/common/config/wv.json/layers/multi-mission/hls/HLS_NDSI_Sentinel.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@
"source": "DDV",
"matrixSet": "31.25m"
}
}
},
"startDate": "2022-01-01T00:00:00Z"
}
}
}
3 changes: 2 additions & 1 deletion config/default/common/config/wv.json/layers/multi-mission/hls/HLS_NDVI_Landsat.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@
"source": "DDV",
"matrixSet": "31.25m"
}
}
},
"startDate": "2022-01-01T00:00:00Z"
}
}
}
3 changes: 2 additions & 1 deletion config/default/common/config/wv.json/layers/multi-mission/hls/HLS_NDVI_Sentinel.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@
"source": "DDV",
"matrixSet": "31.25m"
}
}
},
"startDate": "2022-01-01T00:00:00Z"
}
}
}
3 changes: 2 additions & 1 deletion config/default/common/config/wv.json/layers/multi-mission/hls/HLS_NDWI_Landsat.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@
"source": "DDV",
"matrixSet": "31.25m"
}
}
},
"startDate": "2022-01-01T00:00:00Z"
}
}
}
3 changes: 2 additions & 1 deletion config/default/common/config/wv.json/layers/multi-mission/hls/HLS_NDWI_Sentinel.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@
"source": "DDV",
"matrixSet": "31.25m"
}
}
},
"startDate": "2022-01-01T00:00:00Z"
}
}
}
3 changes: 2 additions & 1 deletion ...efault/common/config/wv.json/layers/multi-mission/hls/HLS_Shortwave_Infrared_Landsat.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@
"source": "DDV",
"matrixSet": "31.25m"
}
}
},
"startDate": "2022-01-01T00:00:00Z"
}
}
}
3 changes: 2 additions & 1 deletion ...fault/common/config/wv.json/layers/multi-mission/hls/HLS_Shortwave_Infrared_Sentinel.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@
"source": "DDV",
"matrixSet": "31.25m"
}
}
},
"startDate": "2022-01-01T00:00:00Z"
}
}
}
30 changes: 11 additions & 19 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,7 @@
"simplebar-react": "^3.2.4",
"stackblur": "^1.0.0",
"supercluster": "^8.0.1",
"tough-cookie": "^4.1.3",
"upng-js": "^2.1.0",
"url-template": "^3.1.0",
"what-input": "^5.2.12"
Expand Down
2 changes: 1 addition & 1 deletion tasks/build-options/processColormap.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ async function processEntries (colormap) {

// If entry is served transparent, add it to the disabled array
if (entry._attributes.transparent !== 'false') {
initializeDisabled.push(index)
initializeDisabled.push(refsList.length)
}

if (!entry._attributes.ref) {
Expand Down
4 changes: 2 additions & 2 deletions web/js/map/natural-events/event-track.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ function EventTrack () {
});
return overlayMapping;
};

Check failure on line 163 in web/js/map/natural-events/event-track.js

View workflow job for this annotation

GitHub Actions / macOS-latest, Node 18 

Trailing spaces not allowed

Check failure on line 163 in web/js/map/natural-events/event-track.js

View workflow job for this annotation

GitHub Actions / ubuntu-latest, Node 18 

Trailing spaces not allowed

Check failure on line 163 in web/js/map/natural-events/event-track.js

View workflow job for this annotation

GitHub Actions / windows-latest, Node 18 

Trailing spaces not allowed
const removeTrackById = (mapArg, overlayMapping, track) => {
const id = track?.id;
if (overlayMapping[id]) {
Expand All @@ -171,7 +171,7 @@ function EventTrack () {
mapArg.removeOverlay(track);
}
};

Check failure on line 174 in web/js/map/natural-events/event-track.js

View workflow job for this annotation

GitHub Actions / macOS-latest, Node 18 

Trailing spaces not allowed

Check failure on line 174 in web/js/map/natural-events/event-track.js

View workflow job for this annotation

GitHub Actions / ubuntu-latest, Node 18 

Trailing spaces not allowed

Check failure on line 174 in web/js/map/natural-events/event-track.js

View workflow job for this annotation

GitHub Actions / windows-latest, Node 18 

Trailing spaces not allowed
const removeAllTracks = (mapArg) => {
if (!mapArg) return;
const overlayMapping = createOverlayMapping(mapArg);
Expand Down

0 comments on commit 2ffa623

Please sign in to comment.