Skip to content

Interactive interface for browsing global, full-resolution satellite imagery

WV-1931: Provide ability to add multiple markers (#3841)

Jason Hurleyce1ca611e25b
diff --git a/doc/url_parameters.md b/doc/url_parameters.md
index a6612aa1c..281c24609 100644
--- a/doc/url_parameters.md
+++ b/doc/url_parameters.md
@@ -23,7 +23,7 @@
| `efs` | boolean | <i>`true`</i> or <i>`false`</i> | Determines whether to "show all" events that match the date range and category filters or, to also include the current map viewport bounding box in the event API call to limit results to that area.<br><br>Default: `true` (which means show all; no bbox included) |
| `efd` | string | `yyyy-mm-dd,yyyy-mm-dd` | The event start and end dates to be included in an event API request. Default range is last 120 days from current app load time. |
| `efc` | string | `id,id,id` | The event category ids for each category to be included in an event API request. |
-| `s` | string | *`coordinates`* | A pair of coordinates using Decimal Degrees format (`DDD.DDDD,DDD.DDDD`) to add a Location Search marker onto the map. *\*Only one marker pair of coordinates can be included in the permalink.* |
+| `s` | string | *`coordinates`* | A pair of coordinates using Decimal Degrees format (`DDD.DDDD,DDD.DDDD`) to add a Location Search marker onto the map. To add more than one Location Search marker, separate coordinate pairs with a plus symbol. (`DDD.DDDD,DDD.DDDD+DDD.DDDD,DDD.DDDD`)|
| `ab` | boolean | **`on`** | If set to "on", the animation widget will be shown. |
| `as` | date | *`YYYY-MM-DDThh:mm:ssZ`* | The animation start day & time.\*\* |
| `ae` | date | *`YYYY-MM-DDThh:mm:ssZ`* | The animation end day & time.\*\* |
diff --git a/web/js/components/location-search/coordinates-dialog.js b/web/js/components/location-search/coordinates-dialog.js
index a70a9d6c3..14be56b32 100644
--- a/web/js/components/location-search/coordinates-dialog.js
+++ b/web/js/components/location-search/coordinates-dialog.js
@@ -43,12 +43,12 @@ class CoordinatesDialog extends Component {
}
// close dialog and remove map marker
- clearCoordinates = () => {
- const { clearCoordinates } = this.props;
+ removeMarker = () => {
+ const { removeMarker } = this.props;
this.setState({
showTooltips: false,
});
- clearCoordinates();
+ removeMarker();
}
// minimize dialog (destroy component)
@@ -69,12 +69,14 @@ class CoordinatesDialog extends Component {
// render minimize and remove dialog button controls
renderDialogButtonControls = () => {
const {
- isMobile,
+ isMobile, tooltipId,
} = this.props;
const { showTooltips } = this.state;
- const closeButtonId = 'close-coordinates-tooltip';
- const minimizeButtonId = 'minimize-coordinates-tooltip';
+ const closeButtonClassName = 'close-coordinates-tooltip';
+ const closeButtonId = `${closeButtonClassName}${tooltipId}`;
+ const minimizeButtonClassName = 'minimize-coordinates-tooltip';
+ const minimizeButtonId = `${minimizeButtonClassName}${tooltipId}`;
const closeButtonLabelText = 'Remove map marker';
const minimizeButtonLabelText = 'Minimize coordinates tooltip';
@@ -83,8 +85,8 @@ class CoordinatesDialog extends Component {
<>
<span
id={closeButtonId}
- className={`close-tooltip ${closeButtonId}`}
- onTouchEnd={this.clearCoordinates}
+ className={`close-tooltip ${closeButtonClassName}`}
+ onTouchEnd={this.removeMarker}
>
{tooltipVisibilityCondition
&& (
@@ -97,11 +99,11 @@ class CoordinatesDialog extends Component {
{closeButtonLabelText}
</UncontrolledTooltip>
)}
- <FontAwesomeIcon onClick={this.clearCoordinates} icon="times" fixedWidth />
+ <FontAwesomeIcon onClick={this.removeMarker} icon="times" fixedWidth />
</span>
<span
id={minimizeButtonId}
- className={`minimize-tooltip ${minimizeButtonId}`}
+ className={`minimize-tooltip ${minimizeButtonClassName}`}
onTouchEnd={this.minimizeDialog}
>
{tooltipVisibilityCondition
@@ -184,7 +186,7 @@ class CoordinatesDialog extends Component {
export default CoordinatesDialog;
CoordinatesDialog.propTypes = {
- clearCoordinates: PropTypes.func,
+ removeMarker: PropTypes.func,
removeCoordinatesDialog: PropTypes.func,
coordinatesMetadata: PropTypes.object,
isMobile: PropTypes.bool,
diff --git a/web/js/components/location-search/location-marker.js b/web/js/components/location-search/location-marker.js
index 928257836..b4e98a924 100644
--- a/web/js/components/location-search/location-marker.js
+++ b/web/js/components/location-search/location-marker.js
@@ -5,9 +5,10 @@ import util from '../../util/util';
import { getCoordinatesMetadata } from './ol-coordinates-marker-util';
export default function LocationMarker ({
- reverseGeocodeResults, clearMarker, coordinates, isMobile, dialogVisible = true,
+ reverseGeocodeResults, removeMarker, coordinatesObject, isMobile, dialogVisible = true,
}) {
- const [longitude, latitude] = coordinates;
+ const coordinates = [coordinatesObject.latitude, coordinatesObject.longitude];
+ const [latitude, longitude] = coordinates;
const tooltipId = util.encodeId(`coordinates-map-marker_${latitude},${longitude}`);
const geocodeProperties = { latitude, longitude, reverseGeocodeResults };
const coordinatesMetadata = getCoordinatesMetadata(geocodeProperties);
@@ -18,7 +19,7 @@ export default function LocationMarker ({
{showDialog && (
<CoordinatesDialog
coordinatesMetadata={coordinatesMetadata}
- clearCoordinates={clearMarker}
+ removeMarker={removeMarker}
removeCoordinatesDialog={() => setShowDialog(false)}
isMobile={isMobile}
tooltipId={tooltipId}
@@ -38,7 +39,7 @@ export default function LocationMarker ({
LocationMarker.propTypes = {
reverseGeocodeResults: PropTypes.object,
isMobile: PropTypes.bool,
- coordinates: PropTypes.array,
- clearMarker: PropTypes.func,
+ coordinatesObject: PropTypes.object,
+ removeMarker: PropTypes.func,
dialogVisible: PropTypes.bool,
};
diff --git a/web/js/location.js b/web/js/location.js
index 88c07cc73..b14812cf9 100644
--- a/web/js/location.js
+++ b/web/js/location.js
@@ -38,7 +38,7 @@ import { getInitialEventsState } from './modules/natural-events/reducers';
import { mapLocationToPaletteState } from './modules/palettes/util';
import { mapLocationToEmbedState } from './modules/embed/util';
import { mapLocationToAnimationState } from './modules/animation/util';
-import { areCoordinatesWithinExtent, mapLocationToLocationSearchState } from './modules/location-search/util';
+import { mapLocationToLocationSearchState, serializeCoordinatesWrapper } from './modules/location-search/util';
import mapLocationToSidebarState from './modules/sidebar/util';
import util from './util/util';
import {
@@ -481,20 +481,11 @@ const getParameters = function(config, parameters) {
s: {
stateKey: 'locationSearch.coordinates',
initialState: [],
- type: 'string',
+ type: 'array',
options: {
serializeNeedsGlobalState: true,
parse: (coordinates) => coordinates,
- serialize: (coordinates, state) => {
- const { map, proj } = state;
- if (map.ui.selected) {
- const coordinatesWithinExtent = areCoordinatesWithinExtent(proj, coordinates);
- if (!coordinatesWithinExtent) {
- return;
- }
- }
- return coordinates;
- },
+ serialize: serializeCoordinatesWrapper,
},
},
t: {
diff --git a/web/js/map/ui.js b/web/js/map/ui.js
index f46322213..d4bcb00e8 100644
--- a/web/js/map/ui.js
+++ b/web/js/map/ui.js
@@ -34,7 +34,7 @@ import { LOCATION_POP_ACTION } from '../redux-location-state-customs';
import { CHANGE_PROJECTION } from '../modules/projection/constants';
import { CHANGE_TAB } from '../modules/sidebar/constants';
import {
- CLEAR_MARKER,
+ REMOVE_MARKER,
SET_MARKER,
SET_REVERSE_GEOCODE_RESULTS,
TOGGLE_DIALOG_VISIBLE,
@@ -62,9 +62,10 @@ import {
import { getLeadingExtent, promiseImageryForTime } from '../modules/map/util';
import { updateVectorSelection } from '../modules/vector-styles/util';
import { hasVectorLayers } from '../modules/layers/util';
-import { animateCoordinates, getCoordinatesMarker } from '../modules/location-search/util';
+import { animateCoordinates, getCoordinatesMarker, areCoordinatesWithinExtent } from '../modules/location-search/util';
import { reverseGeocode } from '../modules/location-search/util-api';
+
const { events } = util;
export default function mapui(models, config, store, ui) {
@@ -102,10 +103,10 @@ export default function mapui(models, config, store, ui) {
store.dispatch({ type: dateConstants.CLEAR_PRELOAD });
return addLayer(def);
}
- case CLEAR_MARKER:
- return removeCoordinatesMarker();
+ case REMOVE_MARKER:
+ return removeCoordinatesMarker(action.coordinates);
case SET_MARKER: {
- return addMarkerAndUpdateStore(true, null, action.isInputSearch);
+ return addMarkerAndUpdateStore(true, action.reverseGeocodeResults, action.isCoordinatesSearchActive, action.coordinates);
}
case TOGGLE_DIALOG_VISIBLE:
return addMarkerAndUpdateStore(false);
@@ -242,18 +243,20 @@ export default function mapui(models, config, store, ui) {
*
* @returns {void}
*/
- const handleActiveMapMarker = (start) => {
+ const handleActiveMapMarker = () => {
const state = store.getState();
- const { locationSearch } = state;
- const { coordinates, reverseGeocodeResults } = locationSearch;
+ const { locationSearch, proj } = state;
+ const { coordinates } = locationSearch;
if (coordinates && coordinates.length > 0) {
- if (start) {
- reverseGeocode(coordinates, config).then((results) => {
- addMarkerAndUpdateStore(true, results);
+ coordinates.forEach((coordinatesObject) => {
+ const latestCoordinates = [coordinatesObject.latitude, coordinatesObject.longitude];
+ const areCoordinatesWithinExtentBool = areCoordinatesWithinExtent(proj, latestCoordinates);
+ if (!areCoordinatesWithinExtentBool) return;
+
+ reverseGeocode(latestCoordinates, config).then((results) => {
+ addMarkerAndUpdateStore(true, results, null, coordinatesObject);
});
- } else {
- addMarkerAndUpdateStore(true, reverseGeocodeResults);
- }
+ });
}
};
@@ -265,7 +268,9 @@ export default function mapui(models, config, store, ui) {
*
* @returns {void}
*/
- const removeCoordinatesMarker = () => {
+ const removeCoordinatesMarker = (coordinatesObject) => {
+ const map = self.selected;
+ self.activeMarker = map.getOverlayById(coordinatesObject.id);
if (self.activeMarker) {
self.activeMarker.setMap(null);
self.selected.removeOverlay(self.activeMarker);
@@ -282,25 +287,26 @@ export default function mapui(models, config, store, ui) {
* @param {Boolean} shouldFlyToCoordinates - if location search via input
* @returns {void}
*/
- const addMarkerAndUpdateStore = (showDialog, geocodeResults, shouldFlyToCoordinates) => {
+ const addMarkerAndUpdateStore = (showDialog, geocodeResults, shouldFlyToCoordinates, coordinatesObject) => {
const state = store.getState();
- const { locationSearch, proj, browser } = state;
- const {
- coordinates, reverseGeocodeResults,
- } = locationSearch;
- const results = geocodeResults || reverseGeocodeResults;
+ const { proj, browser } = state;
+ const results = geocodeResults;
+ if (!results) return;
+ const latestCoordinates = coordinatesObject && [coordinatesObject.latitude, coordinatesObject.longitude];
+
const { sources } = config;
- const clearMarker = () => {
- store.dispatch({ type: CLEAR_MARKER });
+ const removeMarker = () => {
+ store.dispatch({
+ type: REMOVE_MARKER,
+ coordinates: coordinatesObject,
+ });
};
- // clear previous marker (if present) and get new marker
- removeCoordinatesMarker();
const marker = getCoordinatesMarker(
proj,
- coordinates,
+ coordinatesObject,
results,
- clearMarker,
+ removeMarker,
browser.lessThan.medium,
showDialog,
);
@@ -319,7 +325,7 @@ export default function mapui(models, config, store, ui) {
const zoom = self.selected.getView().getZoom();
const activeLayers = getActiveLayers(state).filter(({ projections }) => projections[proj.id]);
const maxZoom = getMaxZoomLevelLayerCollection(activeLayers, zoom, proj.id, sources);
- animateCoordinates(self.selected, proj, coordinates, maxZoom);
+ animateCoordinates(self.selected, proj, latestCoordinates, maxZoom);
}
store.dispatch({
diff --git a/web/js/modules/location-search/actions.js b/web/js/modules/location-search/actions.js
index 6595d33f0..90554040e 100644
--- a/web/js/modules/location-search/actions.js
+++ b/web/js/modules/location-search/actions.js
@@ -1,5 +1,4 @@
import {
- CLEAR_MARKER,
CLEAR_SUGGESTIONS,
SET_MARKER,
SET_SUGGESTION,
@@ -78,27 +77,20 @@ export function setPlaceMarker(coordinates, reverseGeocodeResults, isInputSearch
return dispatch({
type: SET_MARKER,
coordinates: [],
- isCoordinatesDialogOpen: false,
});
}
+ const coordinatesObject = {
+ id: Math.floor(Math.random() * (coordinates[0] + coordinates[1])),
+ latitude: coordinates[0],
+ longitude: coordinates[1],
+ };
+
dispatch({
type: SET_MARKER,
+ coordinates: coordinatesObject,
reverseGeocodeResults,
- coordinates,
- isCoordinatesDialogOpen: true,
- isInputSearch,
- });
- };
-}
-
-/**
- * Clear coordinates including marker and dialog (if open)
- */
-export function clearCoordinates() {
- return (dispatch) => {
- dispatch({
- type: CLEAR_MARKER,
+ isCoordinatesSearchActive: isInputSearch,
});
};
}
diff --git a/web/js/modules/location-search/actions.test.js b/web/js/modules/location-search/actions.test.js
index c1c45a925..17c570782 100644
--- a/web/js/modules/location-search/actions.test.js
+++ b/web/js/modules/location-search/actions.test.js
@@ -2,14 +2,12 @@ import configureMockStore from 'redux-mock-store';
import thunk from 'redux-thunk';
import {
clearSuggestions,
- toggleDialogVisible,
toggleShowLocationSearch,
toggleReverseGeocodeActive,
setSuggestion,
} from './actions';
import {
TOGGLE_REVERSE_GEOCODE,
- TOGGLE_DIALOG_VISIBLE,
TOGGLE_SHOW_LOCATION_SEARCH,
CLEAR_SUGGESTIONS,
SET_SUGGESTION,
@@ -49,20 +47,6 @@ describe('Location Search actions', () => {
};
expect(toggleReverseGeocodeActive(true)).toEqual(expectedAction);
});
- test(`toggleDialogVisible action returns ${TOGGLE_DIALOG_VISIBLE} as type and ${
- true} as value`, () => {
- const expectedAction = {
- type: TOGGLE_DIALOG_VISIBLE,
- value: true,
- };
- const store = mockStore({
- locationSearch: {
- isCoordinatesDialogOpen: false,
- },
- });
- store.dispatch(toggleDialogVisible(true));
- expect(store.getActions()[0]).toEqual(expectedAction);
- });
test(`setSuggestion action returns ${SET_SUGGESTION} as type and ${suggestion} as value`, () => {
const expectedAction = {
type: SET_SUGGESTION,
diff --git a/web/js/modules/location-search/constants.js b/web/js/modules/location-search/constants.js
index 5087b573a..988ec8f20 100644
--- a/web/js/modules/location-search/constants.js
+++ b/web/js/modules/location-search/constants.js
@@ -1,5 +1,5 @@
-export const CLEAR_MARKER = 'LOCATION_SEARCH/CLEAR_MARKER';
export const CLEAR_SUGGESTIONS = 'LOCATION_SEARCH/CLEAR_SUGGESTIONS';
+export const REMOVE_MARKER = 'LOCATION_SEARCH/REMOVE_MARKER';
export const REQUEST_SUGGEST_PLACE_FAILURE = 'LOCATION_SEARCH/REQUEST_SUGGEST_PLACE_FAILURE';
export const REQUEST_SUGGEST_PLACE_SUCCESS = 'LOCATION_SEARCH/REQUEST_SUGGEST_PLACE_SUCCESS';
export const SET_REVERSE_GEOCODE_RESULTS = 'LOCATION_SEARCH/SET_REVERSE_GEOCODE_RESULTS';
@@ -8,4 +8,3 @@ export const SET_SUGGESTION = 'LOCATION_SEARCH/SET_SUGGESTION';
export const TOGGLE_DIALOG_VISIBLE = 'LOCATION_SEARCH/TOGGLE_DIALOG_VISIBLE';
export const TOGGLE_REVERSE_GEOCODE = 'LOCATION_SEARCH/TOGGLE_REVERSE_GEOCODE';
export const TOGGLE_SHOW_LOCATION_SEARCH = 'LOCATION_SEARCH/TOGGLE_SHOW_LOCATION_SEARCH';
-
diff --git a/web/js/modules/location-search/reducers.js b/web/js/modules/location-search/reducers.js
index 79dd2fc93..33a39ed67 100644
--- a/web/js/modules/location-search/reducers.js
+++ b/web/js/modules/location-search/reducers.js
@@ -1,12 +1,11 @@
import {
- CLEAR_MARKER,
CLEAR_SUGGESTIONS,
+ REMOVE_MARKER,
REQUEST_SUGGEST_PLACE_FAILURE,
REQUEST_SUGGEST_PLACE_SUCCESS,
SET_REVERSE_GEOCODE_RESULTS,
SET_MARKER,
SET_SUGGESTION,
- TOGGLE_DIALOG_VISIBLE,
TOGGLE_REVERSE_GEOCODE,
TOGGLE_SHOW_LOCATION_SEARCH,
} from './constants';
@@ -16,7 +15,6 @@ const localStorageCollapseState = getLocalStorageCollapseState();
export const locationSearchState = {
coordinates: [],
isCoordinateSearchActive: false,
- isCoordinatesDialogOpen: false,
isExpanded: !localStorageCollapseState,
reverseGeocodeResults: null,
suggestions: [],
@@ -25,11 +23,6 @@ export const locationSearchState = {
export function locationSearchReducer(state = locationSearchState, action) {
switch (action.type) {
- case TOGGLE_DIALOG_VISIBLE:
- return {
- ...state,
- isCoordinatesDialogOpen: action.value,
- };
case TOGGLE_SHOW_LOCATION_SEARCH:
return {
...state,
@@ -48,17 +41,14 @@ export function locationSearchReducer(state = locationSearchState, action) {
case SET_MARKER:
return {
...state,
- coordinates: action.coordinates,
+ coordinates: [...state.coordinates, action.coordinates],
isCoordinateSearchActive: false,
reverseGeocodeResults: action.reverseGeocodeResults,
- isCoordinatesDialogOpen: action.isCoordinatesDialogOpen,
};
- case CLEAR_MARKER:
+ case REMOVE_MARKER:
return {
...state,
- coordinates: [],
- reverseGeocodeResults: null,
- isCoordinatesDialogOpen: false,
+ coordinates: state.coordinates.filter((coordinate) => action.coordinates.id !== coordinate.id),
};
case SET_SUGGESTION:
return {
diff --git a/web/js/modules/location-search/reducers.test.js b/web/js/modules/location-search/reducers.test.js
index c0ecd81ec..89cfa7fd7 100644
--- a/web/js/modules/location-search/reducers.test.js
+++ b/web/js/modules/location-search/reducers.test.js
@@ -3,11 +3,9 @@ import {
locationSearchState,
} from './reducers';
import {
- CLEAR_MARKER,
CLEAR_SUGGESTIONS,
SET_MARKER,
SET_SUGGESTION,
- TOGGLE_DIALOG_VISIBLE,
TOGGLE_REVERSE_GEOCODE,
TOGGLE_SHOW_LOCATION_SEARCH,
} from './constants';
@@ -22,7 +20,7 @@ const suggestion = [{
magicKey: 'test1234=',
text: 'New York, NY, USA',
}];
-const coordinates = [72, 40];
+const coordinatesObject = { id: 1234, latitude: 72, longitude: 40 };
describe('locationSearch', () => {
test('locationSearch should return the initial state', () => {
@@ -62,22 +60,6 @@ describe('locationSearch', () => {
});
},
);
- test(
- `${TOGGLE_DIALOG_VISIBLE
- } sets coordinate dialog visiblity and `
- + 'should return new state',
- () => {
- expect(
- locationSearchReducer(locationSearchState, {
- type: TOGGLE_DIALOG_VISIBLE,
- value: true,
- }),
- ).toEqual({
- ...locationSearchState,
- isCoordinatesDialogOpen: true,
- });
- },
- );
test(
`${SET_MARKER
} updates coordinates, reverseGeocodeResults `
@@ -86,33 +68,14 @@ describe('locationSearch', () => {
expect(
locationSearchReducer(locationSearchState, {
type: SET_MARKER,
- coordinates,
+ coordinates: coordinatesObject,
reverseGeocodeResults,
- isCoordinatesDialogOpen: true,
}),
).toEqual({
...locationSearchState,
isCoordinateSearchActive: false,
- coordinates,
+ coordinates: [coordinatesObject],
reverseGeocodeResults,
- isCoordinatesDialogOpen: true,
- });
- },
- );
- test(
- `${CLEAR_MARKER
- } resets cooridnates and geocode results`
- + 'should return new state',
- () => {
- expect(
- locationSearchReducer(locationSearchState, {
- type: CLEAR_MARKER,
- }),
- ).toEqual({
- ...locationSearchState,
- coordinates: [],
- reverseGeocodeResults: null,
- isCoordinatesDialogOpen: false,
});
},
);
diff --git a/web/js/modules/location-search/util.js b/web/js/modules/location-search/util.js
index 40b4d8781..fc64d80c2 100644
--- a/web/js/modules/location-search/util.js
+++ b/web/js/modules/location-search/util.js
@@ -52,8 +52,10 @@ export function areCoordinatesWithinExtent(proj, coordinates) {
* @param {Array} coordinates
* @param {Object} reverseGeocodeResults
*/
-export function getCoordinatesMarker(proj, coordinates, results, clearMarker, isMobile, dialogVisible) {
+export function getCoordinatesMarker(proj, coordinatesObject, results, removeMarker, isMobile, dialogVisible) {
const { crs } = proj.selected;
+ const coordinates = [coordinatesObject.latitude, coordinatesObject.longitude];
+ const { id } = coordinatesObject;
// only add marker within current map extent
const coordinatesWithinExtent = areCoordinatesWithinExtent(proj, coordinates);
@@ -69,27 +71,30 @@ export function getCoordinatesMarker(proj, coordinates, results, clearMarker, is
const pinProps = {
reverseGeocodeResults: results,
- coordinates,
- clearMarker,
+ coordinatesObject,
isMobile,
dialogVisible,
};
// create Ol vector layer map pin
- const marker = createPin(transformedCoords, pinProps);
+ const marker = createPin(transformedCoords, pinProps, id, removeMarker);
return marker;
}
/**
* Create Ol vector layer map pin
* @param {Array} coordinates
- * @param {Array} transformedCoordinates
- * @param {Object} reverseGeocodeResults
+ * @param {Object} pinProps
+ * @param {Number} id
*/
-const createPin = function(coordinates, pinProps) {
+const createPin = function(coordinates, pinProps, id, removeMarkerPin) {
const overlayEl = document.createElement('div');
+ const removeMarker = () => {
+ ReactDOM.unmountComponentAtNode(overlayEl);
+ removeMarkerPin();
+ };
ReactDOM.render(
- React.createElement(LocationMarker, pinProps),
+ React.createElement(LocationMarker, { ...pinProps, removeMarker }),
overlayEl,
);
const markerPin = new OlOverlay({
@@ -97,7 +102,7 @@ const createPin = function(coordinates, pinProps) {
position: coordinates,
positioning: 'bottom-center',
stopEvent: false,
- id: 'coordinates-map-pin',
+ id,
});
return markerPin;
@@ -115,15 +120,22 @@ export function mapLocationToLocationSearchState(
state,
) {
const { s } = parameters;
- const validCoordinates = s
- ? s.split(',')
- .map((coord) => Number(coord))
- .filter((coord) => !lodashIsNaN(parseFloat(coord)))
- : [];
- const isValid = validCoordinates.length === 2;
- const coordinates = isValid
- ? validCoordinates
- : [];
+ const coordinatesArray = s ? s.split('+') : [];
+ const isValid = coordinatesArray.length >= 1;
+ const validatedCoordinatesArray = coordinatesArray.map((coordinate) => {
+ const [latitude, longitude] = coordinate
+ ? coordinate.split(',')
+ .map((coord) => Number(coord))
+ .filter((coord) => !lodashIsNaN(parseFloat(coord)))
+ : [];
+
+ const validatedCoordinates = isValid && {
+ id: Math.floor(Math.random() * (latitude + longitude)),
+ latitude,
+ longitude,
+ };
+ return validatedCoordinates;
+ });
const isMobile = state.browser.lessThan.medium;
const localStorageCollapseState = getLocalStorageCollapseState();
@@ -131,15 +143,31 @@ export function mapLocationToLocationSearchState(
stateFromLocation = update(stateFromLocation, {
locationSearch: {
- coordinates: { $set: coordinates },
+ coordinates: { $set: validatedCoordinatesArray },
isExpanded: { $set: isExpanded },
- isCoordinatesDialogOpen: { $set: isValid },
},
});
-
return stateFromLocation;
}
+export function serializeCoordinatesWrapper(coordinates, state) {
+ const { map, proj } = state;
+ const serializeCoordinates = (coordinate) => {
+ const coordinateValues = [coordinate.latitude, coordinate.longitude];
+ if (map.ui.selected) {
+ const coordinatesWithinExtent = areCoordinatesWithinExtent(proj, coordinateValues);
+ if (!coordinatesWithinExtent) {
+ return;
+ }
+ }
+ return coordinateValues;
+ };
+
+ const serializeCoordinatesArray = (coordinatesArray) => coordinatesArray.map((coordinate) => serializeCoordinates(coordinate));
+ const coordinatesURL = Array.isArray(coordinates) ? serializeCoordinatesArray(coordinates) : serializeCoordinates(coordinates);
+ return coordinatesURL.join('+');
+}
+
/**
* @return {Boolean} is Location Search local storage set to 'collapsed'
*/