Skip to content

Interactive interface for browsing global, full-resolution satellite imagery

integrate coords dialog with location marker comp

Jason Kent852f1dd3549d
diff --git a/web/css/location-search.css b/web/css/location-search.css
index cfd0f9d03..cbe12d47b 100644
--- a/web/css/location-search.css
+++ b/web/css/location-search.css
@@ -206,3 +206,7 @@
}
}
}
+
+.location-dialog-pin-wrapper {
+ text-align: center;
+}
diff --git a/web/css/tooltip.css b/web/css/tooltip.css
index 5b279895d..c818ef7a2 100644
--- a/web/css/tooltip.css
+++ b/web/css/tooltip.css
@@ -137,6 +137,7 @@
}
&.tooltip-coordinates-container {
max-width: 420px;
+ bottom: 6px;
& svg.svg-inline--fa.fa-copy {
position: absolute;
right: 6px;
diff --git a/web/js/components/location-search/coordinates-dialog.js b/web/js/components/location-search/coordinates-dialog.js
index 71f296c3c..12ae03206 100644
--- a/web/js/components/location-search/coordinates-dialog.js
+++ b/web/js/components/location-search/coordinates-dialog.js
@@ -11,12 +11,18 @@ class CoordinatesDialog extends Component {
super(props);
this.state = {
tooltipToggleTime: 0,
- showTooltips: true,
+ showTooltips: false,
isCopyToClipboardTooltipVisible: false,
};
this.copyToClipboard = this.copyToClipboard.bind(this);
}
+ componentDidMount() {
+ setTimeout(() => {
+ this.setState({ showTooltips: true });
+ }, 200);
+ }
+
copyToClipboard(coords) {
const options = window.clipboardData ? {} : { format: 'text/plain' };
options.onCopy = () => {
diff --git a/web/js/components/location-search/location-marker.js b/web/js/components/location-search/location-marker.js
index daa7e9605..5853822dc 100644
--- a/web/js/components/location-search/location-marker.js
+++ b/web/js/components/location-search/location-marker.js
@@ -1,21 +1,44 @@
-import React from 'react';
+import React, { useState } from 'react';
import PropTypes from 'prop-types';
+import CoordinatesDialog from './coordinates-dialog';
+import util from '../../util/util';
+import { getCoordinatesMetadata } from './ol-coordinates-marker-util';
+
+export default function LocationMarker ({
+ reverseGeocodeResults, clearMarker, coordinates, isMobile, dialogVisible = true,
+}) {
+ const [latitude, longitude] = coordinates;
+ const tooltipId = util.encodeId(`coordinates-map-marker_${latitude},${longitude}`);
+ const geocodeProperties = { latitude, longitude, reverseGeocodeResults };
+ const coordinatesMetadata = getCoordinatesMetadata(geocodeProperties);
+ const [showDialog, setShowDialog] = useState(dialogVisible);
-export default function LocationMarker ({ reverseGeocodeResults, addCoordinatesTooltip }) {
return (
- <>
+ <div className="location-dialog-pin-wrapper ">
+ {showDialog && (
+ <CoordinatesDialog
+ coordinatesMetadata={coordinatesMetadata}
+ clearCoordinates={clearMarker}
+ removeCoordinatesDialog={() => setShowDialog(false)}
+ isMobile={isMobile}
+ tooltipId={tooltipId}
+ />
+ )}
<img
id="marker-pin"
src="images/map-pin.png"
height="32"
width="20"
- onClick={() => addCoordinatesTooltip(reverseGeocodeResults)}
+ onClick={() => setShowDialog(true)}
/>
- </>
+ </div>
);
}
LocationMarker.propTypes = {
reverseGeocodeResults: PropTypes.object,
- addCoordinatesTooltip: PropTypes.func,
+ isMobile: PropTypes.bool,
+ coordinates: PropTypes.array,
+ clearMarker: PropTypes.func,
+ dialogVisible: PropTypes.bool,
};
diff --git a/web/js/components/location-search/ol-coordinates-marker-util.js b/web/js/components/location-search/ol-coordinates-marker-util.js
index c54300eec..6f58f4ff2 100644
--- a/web/js/components/location-search/ol-coordinates-marker-util.js
+++ b/web/js/components/location-search/ol-coordinates-marker-util.js
@@ -1,9 +1,4 @@
-import Overlay from 'ol/Overlay';
-import React from 'react';
-import ReactDOM from 'react-dom';
-import CoordinatesDialog from './coordinates-dialog';
-import { coordinatesCRSTransform } from '../../modules/projection/util';
-import util from '../../util/util';
+/* eslint-disable import/prefer-default-export */
import { getFormattedCoordinates } from './util';
/**
@@ -35,70 +30,6 @@ const getCoordinatesDialogTitle = (geocodeProperties) => {
return title;
};
-/**
- * Create dialog React DOM element
- *
- * @param {Object} map
- * @param {Object} config
- * @param {Array} coordinates
- * @param {Object} coordinatesMetadata
- * @param {Boolean} isMobile
- * @param {Function} clearCoordinates
- * @param {Function} toggleDialogVisible
- *
- * @returns {Void}
- */
-export const renderCoordinatesDialog = (map, config, coordinates, coordinatesMetadata, isMobile, clearCoordinates, toggleDialogVisible) => {
- const { projections } = config;
- const { proj } = map;
- const { crs } = projections[proj];
- const [latitude, longitude] = coordinates;
-
- // create tooltip overlay
- const tooltipElement = document.createElement('div');
- const tooltipId = util.encodeId(`coordinates-map-marker_${latitude},${longitude}`);
- const tooltipOverlay = new Overlay({
- id: tooltipId,
- className: 'coordinates-map-marker-dialog',
- element: tooltipElement,
- offset: [0, -40],
- positioning: 'bottom-center',
- stopEvent: false,
- });
-
- // transform polar projections coordinates
- let coordinatesPosition;
- if (proj === 'geographic') {
- coordinatesPosition = [longitude, latitude];
- } else {
- coordinatesPosition = coordinatesCRSTransform([longitude, latitude], 'EPSG:4326', crs);
- }
-
- // add tooltip overlay to map and position based on marker coordinates
- map.addOverlay(tooltipOverlay);
- tooltipOverlay.setPosition(coordinatesPosition);
-
- const coordinatesTooltipDOMEl = tooltipOverlay.getElement();
-
- // helper function to remove/hide tooltip overlay
- const removeCoordinatesDialog = () => {
- toggleDialogVisible(false);
- ReactDOM.unmountComponentAtNode(coordinatesTooltipDOMEl);
- };
-
- ReactDOM.render((
- <CoordinatesDialog
- coordinatesMetadata={coordinatesMetadata}
- removeCoordinatesDialog={removeCoordinatesDialog}
- clearCoordinates={clearCoordinates}
- isMobile={isMobile}
- tooltipId={tooltipId}
- />
- ), coordinatesTooltipDOMEl);
-
- return coordinatesTooltipDOMEl;
-};
-
/**
* getCoordinatesMetadata for tooltip display
*
@@ -122,28 +53,3 @@ export const getCoordinatesMetadata = (geocodeProperties) => {
};
};
-/**
- * Get coordinate dialog feature at clicked map pixel
- *
- * @param {Array} pixels
- * @param {Object} map
- * @param {Boolean} isMobile
- *
- * @returns {Void}
- */
-export const isCoordinatesDialogAvailableAtPixel = (pixels, map, isMobile) => {
- // check for existing coordinate marker tooltip overlay and prevent multiple renders
- const mapOverlays = map.getOverlays().getArray();
- const mapMarkerId = 'coordinates-map-marker';
- const coordinatesTooltipOverlay = mapOverlays.filter((overlay) => {
- const { id } = overlay;
- return id && id.includes(mapMarkerId);
- });
- if (coordinatesTooltipOverlay.length > 0) {
- return;
- }
-
- const featureOptions = isMobile ? { hitTolerance: 5 } : {};
- const featureCheck = (feature) => feature.getId() === mapMarkerId;
- return map.forEachFeatureAtPixel(pixels, featureCheck, featureOptions);
-};
diff --git a/web/js/components/location-search/ol-coordinates-marker.js b/web/js/components/location-search/ol-coordinates-marker.js
index d6ce15115..67003b249 100644
--- a/web/js/components/location-search/ol-coordinates-marker.js
+++ b/web/js/components/location-search/ol-coordinates-marker.js
@@ -7,9 +7,8 @@ import PropTypes from 'prop-types';
import { transform } from 'ol/proj';
import Alert from '../util/alert';
import { changeCursor as changeCursorActionCreator } from '../../modules/map/actions';
-import { isCoordinatesDialogAvailableAtPixel } from './ol-coordinates-marker-util';
import {
- setPlaceMarker, toggleDialogVisible, toggleReverseGeocodeActive,
+ setPlaceMarker, toggleReverseGeocodeActive,
} from '../../modules/location-search/actions';
import { areCoordinatesWithinExtent } from '../../modules/location-search/util';
import { reverseGeocode } from '../../modules/location-search/util-api';
@@ -115,22 +114,6 @@ export class CoordinatesMarker extends Component {
setPlaceMarker([longitude, latitude], results);
});
this.setState({ showExtentAlert: false });
- } else {
- // handle clicking on pixel and/or map marker
- e.stopPropagation();
- this.getCoordinatesDialog(pixels, map);
- }
- }
-
- getCoordinatesDialog = (pixels, olMap) => {
- const {
- isMobile,
- toggleDialogVisible,
- } = this.props;
- const isMarker = isCoordinatesDialogAvailableAtPixel(pixels, olMap, isMobile);
-
- if (isMarker) {
- toggleDialogVisible(true);
}
}
@@ -186,9 +169,6 @@ const mapDispatchToProps = (dispatch) => ({
setPlaceMarker: (coordinates, reverseGeocodeResults) => {
dispatch(setPlaceMarker(coordinates, reverseGeocodeResults));
},
- toggleDialogVisible: (isVisible) => {
- dispatch(toggleDialogVisible(isVisible));
- },
toggleReverseGeocodeActive: (isActive) => {
dispatch(toggleReverseGeocodeActive(isActive));
},
@@ -197,12 +177,10 @@ CoordinatesMarker.propTypes = {
changeCursor: PropTypes.func.isRequired,
config: PropTypes.object.isRequired,
isCoordinateSearchActive: PropTypes.bool.isRequired,
- isMobile: PropTypes.bool.isRequired,
isShowingClick: PropTypes.bool.isRequired,
measureIsActive: PropTypes.bool.isRequired,
proj: PropTypes.object,
setPlaceMarker: PropTypes.func.isRequired,
- toggleDialogVisible: PropTypes.func.isRequired,
toggleReverseGeocodeActive: PropTypes.func.isRequired,
};
export default connect(
diff --git a/web/js/map/ui.js b/web/js/map/ui.js
index d0f9828ac..55949d02e 100644
--- a/web/js/map/ui.js
+++ b/web/js/map/ui.js
@@ -1,5 +1,4 @@
/* eslint-disable no-multi-assign */
-import ReactDOM from 'react-dom';
import {
throttle as lodashThrottle,
forOwn as lodashForOwn,
@@ -65,8 +64,6 @@ import { updateVectorSelection } from '../modules/vector-styles/util';
import { hasVectorLayers } from '../modules/layers/util';
import { animateCoordinates, getCoordinatesMarker } from '../modules/location-search/util';
import { reverseGeocode } from '../modules/location-search/util-api';
-import { getCoordinatesMetadata, renderCoordinatesDialog } from '../components/location-search/ol-coordinates-marker-util';
-
const { events } = util;
@@ -89,7 +86,6 @@ export default function mapui(models, config, store, ui) {
selected: null, // The map for the selected projection
selectedVectors: {},
activeMarker: null,
- coordinatesDialogDOMEl: null,
runningdata,
layerKey,
createLayer,
@@ -110,16 +106,10 @@ export default function mapui(models, config, store, ui) {
case CLEAR_MARKER:
return removeCoordinatesMarker();
case SET_MARKER: {
- return addMarkerAndUpdateStore(null, action.isInputSearch);
- }
- case TOGGLE_DIALOG_VISIBLE: {
- if (action.value) {
- addCoordinatesTooltip();
- } else {
- removeCoordinatesTooltip();
- }
- return;
+ return addMarkerAndUpdateStore(true, null, action.isInputSearch);
}
+ case TOGGLE_DIALOG_VISIBLE:
+ return addMarkerAndUpdateStore(false);
case CLEAR_ROTATE: {
self.selected.getView().animate({
duration: 500,
@@ -262,36 +252,14 @@ export default function mapui(models, config, store, ui) {
if (coordinates && coordinates.length > 0) {
if (start) {
reverseGeocode(coordinates, config).then((results) => {
- addMarkerAndUpdateStore(results);
+ addMarkerAndUpdateStore(true, results);
});
} else {
- addMarkerAndUpdateStore(reverseGeocodeResults);
+ addMarkerAndUpdateStore(true, reverseGeocodeResults);
}
}
};
- /*
- * Remove coordinates tooltip from all projections
- *
- * @method removeCoordinatesTooltip
- * @static
- *
- * @returns {void}
- */
- const removeCoordinatesTooltip = () => {
- const mapProjections = Object.keys(self.proj);
- mapProjections.forEach((mapProjection) => {
- const mapOverlays = self.proj[mapProjection].getOverlays().getArray();
- const coordinatesTooltipOverlay = mapOverlays.filter((overlay) => {
- const { id } = overlay;
- return id && id.includes('coordinates-map-marker');
- });
- if (coordinatesTooltipOverlay.length > 0) {
- self.proj[mapProjection].removeOverlay(coordinatesTooltipOverlay[0]);
- }
- });
- };
-
/*
* Remove coordinates marker
*
@@ -305,52 +273,6 @@ export default function mapui(models, config, store, ui) {
self.activeMarker.setMap(null);
self.selected.removeOverlay(self.activeMarker);
}
- // remove tooltip from all projections
- removeCoordinatesTooltip();
- };
-
- /*
- * Add map marker coordinate tooltip
- *
- * @method addCoordinatesTooltip
- * @static
- *
- * @param {Object} geocodeResults
- *
- * @returns {void}
- */
- const addCoordinatesTooltip = (geocodeResults) => {
- const state = store.getState();
- const {
- browser, locationSearch,
- } = state;
- const { coordinates, reverseGeocodeResults } = locationSearch;
- const results = geocodeResults || reverseGeocodeResults;
- const isMobile = browser.lessThan.medium;
- const [longitude, latitude] = coordinates;
- const geocodeProperties = { latitude, longitude, reverseGeocodeResults: results };
- const coordinatesMetadata = getCoordinatesMetadata(geocodeProperties);
-
- // handle clearing coordinates using created marker
- const clearMarker = () => {
- store.dispatch({ type: CLEAR_MARKER });
- };
- // handle toggling dialog visibility to retain preference between proj changes
- const toggleDialogVisible = (isVisible) => {
- store.dispatch({ type: TOGGLE_DIALOG_VISIBLE, value: isVisible });
- };
-
- // render coordinates dialog
- const coordinatesTooltipDOMEl = renderCoordinatesDialog(
- self.selected,
- config,
- [latitude, longitude],
- coordinatesMetadata,
- isMobile,
- clearMarker,
- toggleDialogVisible,
- );
- self.coordinatesDialogDOMEl = coordinatesTooltipDOMEl;
};
/*
@@ -363,23 +285,28 @@ export default function mapui(models, config, store, ui) {
* @param {Boolean} shouldFlyToCoordinates - if location search via input
* @returns {void}
*/
- const addMarkerAndUpdateStore = (geocodeResults, shouldFlyToCoordinates) => {
+ const addMarkerAndUpdateStore = (showDialog, geocodeResults, shouldFlyToCoordinates) => {
const state = store.getState();
- const { locationSearch, proj } = state;
+ const { locationSearch, proj, browser } = state;
const {
- coordinates, isCoordinatesDialogOpen, reverseGeocodeResults,
+ coordinates, reverseGeocodeResults,
} = locationSearch;
const results = geocodeResults || reverseGeocodeResults;
const { sources } = config;
+ const clearMarker = () => {
+ store.dispatch({ type: CLEAR_MARKER });
+ };
- // unmount coordinate dialog to prevent residual tooltips being hovered
- if (self.coordinatesDialogDOMEl) {
- ReactDOM.unmountComponentAtNode(self.coordinatesDialogDOMEl);
- self.coordinatesDialogDOMEl = null;
- }
// clear previous marker (if present) and get new marker
removeCoordinatesMarker();
- const marker = getCoordinatesMarker(proj, coordinates, results, addCoordinatesTooltip);
+ const marker = getCoordinatesMarker(
+ proj,
+ coordinates,
+ results,
+ clearMarker,
+ browser.lessThan.medium,
+ showDialog,
+ );
// prevent marker if outside of extent
if (!marker) {
@@ -398,12 +325,6 @@ export default function mapui(models, config, store, ui) {
animateCoordinates(self.selected, proj, coordinates, maxZoom);
}
- // handle render initial tooltip
- const isDialogOpen = shouldFlyToCoordinates || isCoordinatesDialogOpen;
- if (isDialogOpen) {
- addCoordinatesTooltip(results);
- }
-
store.dispatch({
type: SET_REVERSE_GEOCODE_RESULTS,
value: results,
@@ -596,10 +517,6 @@ export default function mapui(models, config, store, ui) {
lodashEach(defs, (def) => {
map.addLayer(createLayer(def));
});
- // add active map marker back after destroying from layer/compare change
- if (self.activeMarker) {
- addMarkerAndUpdateStore();
- }
} else {
const stateArray = [['active', 'selected'], ['activeB', 'selectedB']];
clearLayers(map);
@@ -614,10 +531,6 @@ export default function mapui(models, config, store, ui) {
map.addLayer(getCompareLayerGroup(arr, state));
});
compareMapUi.create(map, compare.mode);
- // add active map marker back in compare mode post createLayer
- if (self.activeMarker) {
- addMarkerAndUpdateStore();
- }
}
updateLayerVisibilities();
}
diff --git a/web/js/modules/location-search/util.js b/web/js/modules/location-search/util.js
index f5bd0ed63..40b4d8781 100644
--- a/web/js/modules/location-search/util.js
+++ b/web/js/modules/location-search/util.js
@@ -52,7 +52,7 @@ export function areCoordinatesWithinExtent(proj, coordinates) {
* @param {Array} coordinates
* @param {Object} reverseGeocodeResults
*/
-export function getCoordinatesMarker(proj, coordinates, reverseGeocodeResults, addCoordinatesTooltip) {
+export function getCoordinatesMarker(proj, coordinates, results, clearMarker, isMobile, dialogVisible) {
const { crs } = proj.selected;
// only add marker within current map extent
@@ -67,8 +67,16 @@ export function getCoordinatesMarker(proj, coordinates, reverseGeocodeResults, a
transformedCoords = coordinatesCRSTransform(coordinates, 'EPSG:4326', crs);
}
+ const pinProps = {
+ reverseGeocodeResults: results,
+ coordinates,
+ clearMarker,
+ isMobile,
+ dialogVisible,
+ };
+
// create Ol vector layer map pin
- const marker = createPin(transformedCoords, reverseGeocodeResults, addCoordinatesTooltip);
+ const marker = createPin(transformedCoords, pinProps);
return marker;
}
@@ -78,23 +86,19 @@ export function getCoordinatesMarker(proj, coordinates, reverseGeocodeResults, a
* @param {Array} transformedCoordinates
* @param {Object} reverseGeocodeResults
*/
-const createPin = function(coordinates, reverseGeocodeResults = {}, addCoordinatesTooltip) {
+const createPin = function(coordinates, pinProps) {
const overlayEl = document.createElement('div');
ReactDOM.render(
- React.createElement(LocationMarker, {
- reverseGeocodeResults,
- coordinates,
- addCoordinatesTooltip,
- }),
+ React.createElement(LocationMarker, pinProps),
overlayEl,
);
const markerPin = new OlOverlay({
element: overlayEl,
+ position: coordinates,
positioning: 'bottom-center',
stopEvent: false,
id: 'coordinates-map-pin',
});
- markerPin.setPosition(coordinates);
return markerPin;
};