Interactive interface for browsing global, full-resolution satellite imagery
WV-2232 (#3869)
Jason Kent3e796c8655fc
diff --git a/web/js/components/location-search/location-marker.js b/web/js/components/location-search/location-marker.jsindex d870feaec..0fd0a5e77 100644--- a/web/js/components/location-search/location-marker.js+++ b/web/js/components/location-search/location-marker.js@@ -7,8 +7,7 @@ import { getCoordinatesMetadata } from './ol-coordinates-marker-util';export default function LocationMarker ({reverseGeocodeResults, removeMarker, coordinatesObject, isMobile, dialogVisible = true,}) {- const coordinates = [coordinatesObject.longitude, coordinatesObject.latitude];- const [latitude, longitude] = coordinates;+ const { longitude, latitude } = coordinatesObject;const tooltipId = util.encodeId(`coordinates-map-marker_${longitude},${latitude}`);const geocodeProperties = { latitude, longitude, reverseGeocodeResults };const coordinatesMetadata = getCoordinatesMetadata(geocodeProperties);diff --git a/web/js/map/ui.js b/web/js/map/ui.jsindex 2420b103f..e82086fe1 100644--- a/web/js/map/ui.js+++ b/web/js/map/ui.js@@ -349,7 +349,8 @@ export default function mapui(models, config, store) {removeAllCoordinatesMarkers();if (coordinates && coordinates.length > 0) {coordinates.forEach((coordinatesObject) => {- const latestCoordinates = [coordinatesObject.latitude, coordinatesObject.longitude];+ const { longitude, latitude } = coordinatesObject;+ const latestCoordinates = [longitude, latitude];const areCoordinatesWithinExtentBool = areCoordinatesWithinExtent(proj, latestCoordinates);if (!areCoordinatesWithinExtentBool) return;@@ -364,7 +365,8 @@ export default function mapui(models, config, store) {const state = store.getState();const { proj } = state;const { sources } = config;- const latestCoordinates = coordinatesObject && [coordinatesObject.latitude, coordinatesObject.longitude];+ const { longitude, latitude } = coordinatesObject;+ const latestCoordinates = coordinatesObject && [longitude, latitude];const zoom = self.selected.getView().getZoom();const activeLayers = getActiveLayers(state).filter(({ projections }) => projections[proj.id]);const maxZoom = getMaxZoomLevelLayerCollection(activeLayers, zoom, proj.id, sources);diff --git a/web/js/modules/image-download/util.js b/web/js/modules/image-download/util.jsindex 4df03d3a7..227a4800d 100644--- a/web/js/modules/image-download/util.js+++ b/web/js/modules/image-download/util.js@@ -2,7 +2,6 @@ import {each as lodashEach,get as lodashGet,} from 'lodash';-import { boundingExtent, containsCoordinate } from 'ol/extent';import util from '../../util/util';import { formatDisplayDate } from '../date/util';import { nearestInterval } from '../layers/util';@@ -105,7 +104,7 @@ const imageUtilProcessWrap = function(fileType, layersArray, layerWraps, opaciti* @param {Boolean} isWorldfile* @param {Array} markerCoordinates*/-export function getDownloadUrl(url, proj, layerDefs, lonlats, dimensions, dateTime, fileType, isWorldfile, markerCoordinates) {+export function getDownloadUrl(url, proj, layerDefs, bbox, dimensions, dateTime, fileType, isWorldfile, markerCoordinates) {const { crs } = proj.selected;const {layersArray,@@ -124,7 +123,7 @@ export function getDownloadUrl(url, proj, layerDefs, lonlats, dimensions, dateTiconst params = ['REQUEST=GetSnapshot',`TIME=${util.toISOStringSeconds(snappedDateTime)}`,- `BBOX=${bboxWMS13(lonlats, crs)}`,+ `BBOX=${bboxWMS13(bbox, crs)}`,`CRS=${crs}`,`LAYERS=${layersArray.join(',')}`,`WRAP=${layerWraps.join(',')}`,@@ -138,17 +137,15 @@ export function getDownloadUrl(url, proj, layerDefs, lonlats, dimensions, dateTiif (isWorldfile) {params.push('WORLDFILE=true');}+// handle adding coordinates markerif (markerCoordinates.length > 0) {- // transform for WVS- const coordinates = coordinatesCRSTransform(markerCoordinates, 'EPSG:4326', crs);- const [longitude, latitude] = coordinates;- // prevent marker requests outside selected bounding box- const bboxExtent = boundingExtent([lonlats[0], lonlats[1]]);- const coordinatesWithinBbox = containsCoordinate(bboxExtent, coordinates);- if (coordinatesWithinBbox) {- params.push(`MARKER=${longitude},${latitude}`);- }+ const coords = markerCoordinates.reduce((validCoords, { longitude: lon, latitude: lat }) => {+ const mCoord = coordinatesCRSTransform([lon, lat], 'EPSG:4326', crs);+ // const inExtent = containsCoordinate(boundingExtent(bbox), mCoord);+ return validCoords.concat([mCoord[0], mCoord[1]]);+ }, []);+ params.push(`MARKER=${coords.join(',')}`);}return `${url}?${params.join('&')}&ts=${Date.now()}`;}@@ -247,6 +244,7 @@ export function imageUtilGetLayers(products, proj) {});return layers;}+/** Retrieves opacities from palettes*@@ -341,6 +339,7 @@ export function imageSizeValid(imgHeight, imgWidth, maxSize) {}return true;}+export function getDimensions(projection, bounds, resolution) {const conversionFactor = imageUtilGetConversionFactor(projection);const imgWidth = Math.round(diff --git a/web/js/modules/image-download/util.test.js b/web/js/modules/image-download/util.test.jsindex 481dbcd33..d981e4173 100644--- a/web/js/modules/image-download/util.test.js+++ b/web/js/modules/image-download/util.test.js@@ -214,8 +214,11 @@ test('Download URL', () => {height: 300,};const dateTime = new Date('2019-06-24T19:04:00Z');- const locationSearchCoordinates = [-19.1609, 2.7117];- const dlURL = getDownloadUrl(url, proj, mockLayerDefs, lonlats, dimensions, dateTime, false, false, locationSearchCoordinates);+ const locationMarkers = [+ { id: 1, longitude: 2.7117, latitude: -19.1609 },+ { id: 2, longitude: 71.173, latitude: -39.0961 },+ ];+ const dlURL = getDownloadUrl(url, proj, mockLayerDefs, lonlats, dimensions, dateTime, false, false, locationMarkers);const expectedURL = 'http://localhost:3002/api/v1/snapshot'+ '?REQUEST=GetSnapshot'+ '&TIME=2019-06-24T00:00:00Z'@@ -225,6 +228,6 @@ test('Download URL', () => {+ '&WRAP=day'+ '&FORMAT=image/jpeg'+ '&WIDTH=300&HEIGHT=300'- + '&MARKER=-19.1609,2.7117';+ + '&MARKER=2.7117,-19.1609,71.173,-39.0961';expect(dlURL.includes(expectedURL)).toBe(true);});diff --git a/web/js/modules/location-search/actions.js b/web/js/modules/location-search/actions.jsindex 9a2a7c1ad..11fe8b33f 100644--- a/web/js/modules/location-search/actions.js+++ b/web/js/modules/location-search/actions.js@@ -58,13 +58,14 @@ export function toggleReverseGeocodeActive(isActive) {* @param {Object} reverseGeocodeResults* @param {Boolean} isInputSearch*/-export function setPlaceMarker(coordinates, reverseGeocodeResults, isInputSearch) {+export function setPlaceMarker(newCoordinates, reverseGeocodeResults, isInputSearch) {return (dispatch, getState) => {const state = getState();const {proj,- locationSearch,+ locationSearch: { coordinates },} = state;+ const [longitude, latitude] = newCoordinates;if (reverseGeocodeResults) {const { error } = reverseGeocodeResults;@@ -73,9 +74,9 @@ export function setPlaceMarker(coordinates, reverseGeocodeResults, isInputSearch}}- const coordinatesWithinExtent = areCoordinatesWithinExtent(proj, coordinates);- const stateCoordinates = locationSearch.coordinates;- const markerAlreadyExists = stateCoordinates.find((stateCoordinate) => stateCoordinate.latitude === coordinates[0] && stateCoordinate.longitude === coordinates[1]);+ const coordinatesWithinExtent = areCoordinatesWithinExtent(proj, newCoordinates);+ const markerAlreadyExists = coordinates.find(({ longitude: lon, latitude: lat }) => lon === longitude && lat === latitude);+if (!coordinatesWithinExtent) {return dispatch({type: SET_MARKER,@@ -93,15 +94,13 @@ export function setPlaceMarker(coordinates, reverseGeocodeResults, isInputSearch});}- const coordinatesObject = {- id: Math.floor(Math.random() * (coordinates[0] + coordinates[1])),- latitude: coordinates[0],- longitude: coordinates[1],- };-dispatch({type: SET_MARKER,- coordinates: coordinatesObject,+ coordinates: {+ id: Math.floor(longitude + latitude),+ longitude,+ latitude,+ },reverseGeocodeResults,isCoordinatesSearchActive: isInputSearch,});diff --git a/web/js/modules/location-search/util.js b/web/js/modules/location-search/util.jsindex f5819c3be..62ceac2e7 100644--- a/web/js/modules/location-search/util.js+++ b/web/js/modules/location-search/util.js@@ -54,8 +54,8 @@ export function areCoordinatesWithinExtent(proj, coordinates) {*/export function getCoordinatesMarker(proj, coordinatesObject, results, removeMarker, isMobile, dialogVisible) {const { crs } = proj.selected;- const coordinates = [coordinatesObject.latitude, coordinatesObject.longitude];- const { id } = coordinatesObject;+ const { id, longitude, latitude } = coordinatesObject;+ const coordinates = [longitude, latitude];// only add marker within current map extentconst coordinatesWithinExtent = areCoordinatesWithinExtent(proj, coordinates);@@ -123,14 +123,14 @@ export function mapLocationToLocationSearchState(const coordinatesArray = s ? s.split('+') : [];const isValid = coordinatesArray.length >= 1;const validatedCoordinatesArray = coordinatesArray.map((coordinate) => {- const [latitude, longitude] = coordinate+ const [longitude, latitude] = coordinate? coordinate.split(',').map((coord) => Number(coord)).filter((coord) => !lodashIsNaN(parseFloat(coord))): [];const validatedCoordinates = isValid && {- id: Math.floor(Math.random() * (latitude + longitude)),+ id: Math.floor(longitude + latitude),latitude,longitude,};@@ -152,8 +152,8 @@ export function mapLocationToLocationSearchState(export function serializeCoordinatesWrapper(coordinates, state) {const { map, proj } = state;- const serializeCoordinates = (coordinate) => {- const coordinateValues = [coordinate.latitude, coordinate.longitude];+ const serializeCoordinates = ({ longitude, latitude }) => {+ const coordinateValues = [longitude, latitude];if (!map.ui.selected) return;const coordinatesWithinExtent = areCoordinatesWithinExtent(proj, coordinateValues);if (!coordinatesWithinExtent) return;