Skip to content

Interactive interface for browsing global, full-resolution satellite imagery

break out of for each pixel traversals, limit coordinate marker and running data events

Ed Plato0a45242aff10
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 6f58f4ff2..cee26e402 100644
--- a/web/js/components/location-search/ol-coordinates-marker-util.js
+++ b/web/js/components/location-search/ol-coordinates-marker-util.js
@@ -52,4 +52,3 @@ export const getCoordinatesMetadata = (geocodeProperties) => {
title: title || coordinates,
};
};
-
diff --git a/web/js/components/location-search/ol-coordinates-marker.js b/web/js/components/location-search/ol-coordinates-marker.js
index 67003b249..e0692f2e3 100644
--- a/web/js/components/location-search/ol-coordinates-marker.js
+++ b/web/js/components/location-search/ol-coordinates-marker.js
@@ -41,15 +41,21 @@ export class CoordinatesMarker extends Component {
}
mouseMove(event, map, crs) {
- const pixels = map.getEventPixel(event);
- const coord = map.getCoordinateFromPixel(pixels);
-
const {
- isShowingClick,
changeCursor,
+ coordinates,
+ isCoordinateSearchActive,
+ isShowingClick,
measureIsActive,
} = this.props;
+ if (measureIsActive
+ || (!isCoordinateSearchActive && coordinates.length === 0)) {
+ return;
+ }
+
+ const pixels = map.getEventPixel(event);
+ const coord = map.getCoordinateFromPixel(pixels);
if (!coord) {
return;
}
@@ -58,13 +64,16 @@ export class CoordinatesMarker extends Component {
return;
}
const hasFeatures = map.hasFeatureAtPixel(pixels);
- if (hasFeatures && !isShowingClick && !measureIsActive) {
- const featureCheck = (feature) => feature.getId() === 'coordinates-map-marker';
- const isActiveLayer = map.forEachFeatureAtPixel(pixels, featureCheck);
- if (isActiveLayer) {
- changeCursor(true);
- }
- } else if (!hasFeatures && isShowingClick) {
+ if (hasFeatures && !isShowingClick) {
+ const featureCheck = (feature) => {
+ if (feature.getId() === 'coordinates-map-marker') {
+ changeCursor(true);
+ }
+ return true;
+ };
+ map.forEachFeatureAtPixel(pixels, featureCheck);
+ }
+ if (!hasFeatures && isShowingClick) {
changeCursor(false);
}
}
@@ -83,24 +92,23 @@ export class CoordinatesMarker extends Component {
singleClick(e, map, crs) {
const {
config,
- proj,
isCoordinateSearchActive,
measureIsActive,
+ proj,
setPlaceMarker,
toggleReverseGeocodeActive,
} = this.props;
+ if (measureIsActive) return;
const pixels = e.pixel;
- const coord = map.getCoordinateFromPixel(pixels);
-
- const [lon, lat] = transform(coord, crs, 'EPSG:4326');
-
- const latitude = getCoordinateFixedPrecision(lat);
- const longitude = getCoordinateFixedPrecision(lon);
- if (measureIsActive) return;
// handle reverse geocoding mouse click
if (isCoordinateSearchActive) {
+ const coord = map.getCoordinateFromPixel(pixels);
+ const [lon, lat] = transform(coord, crs, 'EPSG:4326');
+ const latitude = getCoordinateFixedPrecision(lat);
+ const longitude = getCoordinateFixedPrecision(lon);
+
// show alert warning and exit mode if outside current map extent
const validNums = !lodashIsNaN(parseFloat(latitude)) && !lodashIsNaN(parseFloat(longitude));
const withinExtent = areCoordinatesWithinExtent(proj, [longitude, latitude]);
@@ -152,13 +160,13 @@ function mapStateToProps(state) {
return {
config,
- proj,
- map,
coordinates,
isCoordinateSearchActive,
isMobile,
isShowingClick: map.isClickable,
+ map,
measureIsActive: measure.isActive,
+ proj,
};
}
@@ -176,6 +184,7 @@ const mapDispatchToProps = (dispatch) => ({
CoordinatesMarker.propTypes = {
changeCursor: PropTypes.func.isRequired,
config: PropTypes.object.isRequired,
+ coordinates: PropTypes.array,
isCoordinateSearchActive: PropTypes.bool.isRequired,
isShowingClick: PropTypes.bool.isRequired,
measureIsActive: PropTypes.bool.isRequired,
diff --git a/web/js/containers/map-interactions/ol-vector-interactions.js b/web/js/containers/map-interactions/ol-vector-interactions.js
index 77f0df795..cf001b24a 100644
--- a/web/js/containers/map-interactions/ol-vector-interactions.js
+++ b/web/js/containers/map-interactions/ol-vector-interactions.js
@@ -39,12 +39,16 @@ export class VectorInteractions extends React.Component {
}
mouseMove(event, map, crs) {
+ const {
+ isShowingClick, changeCursor, isCoordinateSearchActive, measureIsActive, compareState, swipeOffset, proj,
+ } = this.props;
+
+ if (measureIsActive || isCoordinateSearchActive) {
+ return;
+ }
const pixels = map.getEventPixel(event);
const coord = map.getCoordinateFromPixel(pixels);
- const {
- isShowingClick, changeCursor, measureIsActive, compareState, swipeOffset, proj,
- } = this.props;
const [lon, lat] = transform(coord, crs, 'EPSG:4326');
if (lon < -250 || lon > 250 || lat < -90 || lat > 90) {
return;
@@ -53,6 +57,9 @@ export class VectorInteractions extends React.Component {
if (hasFeatures && !isShowingClick && !measureIsActive) {
let isActiveLayer = false;
map.forEachFeatureAtPixel(pixels, (feature, layer) => {
+ if (isActiveLayer) {
+ return true;
+ }
const def = lodashGet(layer, 'wv.def');
if (!def || lodashIncludes(def.clickDisabledFeatures, feature.getType())) return;
const isWrapped = proj.id === 'geographic' && (def.wrapadjacentdays || def.wrapX);
@@ -70,11 +77,11 @@ export class VectorInteractions extends React.Component {
singleClick(e, map) {
const {
browser, lastSelected, openVectorDialog, onCloseModal, selectVectorFeatures,
- modalState, getDialogObject, measureIsActive, activeLayers,
+ modalState, getDialogObject, measureIsActive, activeLayers, isCoordinateSearchActive,
activateVectorZoomAlert, activateVectorExceededResultsAlert, proj, isEmbedModeActive, isMobile,
} = this.props;
- if (measureIsActive) return;
+ if (measureIsActive || isCoordinateSearchActive) return;
const isVectorModalOpen = modalState.id.includes('vector_dialog') && modalState.isOpen;
const pixels = e.pixel;
const clickObj = getDialogObject(pixels, map);
@@ -120,7 +127,7 @@ export class VectorInteractions extends React.Component {
function mapStateToProps(state) {
const {
- modal, map, measure, vectorStyles, browser, compare, proj, ui, embed,
+ modal, map, measure, vectorStyles, browser, compare, locationSearch, proj, ui, embed,
} = state;
let swipeOffset;
const activeLayers = getActiveLayers(state);
@@ -128,11 +135,13 @@ function mapStateToProps(state) {
const percentOffset = state.compare.value || 50;
swipeOffset = browser.screenWidth * (percentOffset / 100);
}
+ const { isCoordinateSearchActive } = locationSearch;
const isMobile = browser.lessThan.medium;
return {
activeLayers,
browser,
isMobile,
+ isCoordinateSearchActive,
compareState: compare,
getDialogObject: (pixels, olMap) => onMapClickGetVectorFeatures(pixels, olMap, state, swipeOffset),
isDistractionFreeModeActive: ui.isDistractionFreeModeActive,
@@ -213,6 +222,7 @@ VectorInteractions.propTypes = {
browser: PropTypes.object,
compareState: PropTypes.object,
isEmbedModeActive: PropTypes.bool,
+ isCoordinateSearchActive: PropTypes.bool,
isMobile: PropTypes.bool,
lastSelected: PropTypes.object,
proj: PropTypes.object,
diff --git a/web/js/containers/vector-dialog.js b/web/js/containers/vector-dialog.js
index 8ded8171e..6a0141715 100644
--- a/web/js/containers/vector-dialog.js
+++ b/web/js/containers/vector-dialog.js
@@ -70,7 +70,7 @@ class VectorDialog extends React.Component {
}
}
-function mapStateToProps(state) {
+function mapStateToProps() {
return {};
}
export default connect(
diff --git a/web/js/map/runningdata.js b/web/js/map/runningdata.js
index 3244b4cf5..82b5ef4ed 100644
--- a/web/js/map/runningdata.js
+++ b/web/js/map/runningdata.js
@@ -11,7 +11,7 @@ import {
const { events } = util;
-export default function MapRunningData(models, compareUi, store) {
+export default function MapRunningData(compareUi, store) {
const self = this;
let dataObj = {};
/**
@@ -38,7 +38,12 @@ export default function MapRunningData(models, compareUi, store) {
*/
self.newPoint = function(pixels, map) {
const state = store.getState();
- const { proj } = state;
+ const { locationSearch, proj } = state;
+ const { isCoordinateSearchActive } = locationSearch;
+ if (isCoordinateSearchActive) {
+ return;
+ }
+
const activeLayerObj = {};
const [lon, lat] = map.getCoordinateFromPixel(pixels);
let swipeOffset;
diff --git a/web/js/map/ui.js b/web/js/map/ui.js
index 463b01022..3ba5e2435 100644
--- a/web/js/map/ui.js
+++ b/web/js/map/ui.js
@@ -71,7 +71,7 @@ export default function mapui(models, config, store, ui) {
const animationDuration = 250;
const dateline = mapDateLineBuilder(store);
const compareMapUi = mapCompare(store);
- const runningdata = new MapRunningData(models, compareMapUi, store);
+ const runningdata = new MapRunningData(compareMapUi, store);
const doubleClickZoom = new OlInteractionDoubleClickZoom({
duration: animationDuration,
});
@@ -1100,12 +1100,14 @@ export default function mapui(models, config, store, ui) {
function createMousePosSel(map, proj) {
const throttledOnMouseMove = lodashThrottle((e) => {
const state = store.getState();
- const { browser, sidebar } = state;
+ const { browser, locationSearch, sidebar } = state;
+ const { isCoordinateSearchActive } = locationSearch;
const isMobile = browser.lessThan.medium;
if (self.mapIsbeingZoomed) return;
if (compareMapUi && compareMapUi.dragging) return;
if (isMobile) return;
if (state.measure.isActive) return;
+ if (isCoordinateSearchActive) return;
const pixels = map.getEventPixel(e);
const coords = map.getCoordinateFromPixel(pixels);
diff --git a/web/js/modules/vector-styles/util.js b/web/js/modules/vector-styles/util.js
index b0cec6291..38926c8e7 100644
--- a/web/js/modules/vector-styles/util.js
+++ b/web/js/modules/vector-styles/util.js
@@ -224,7 +224,7 @@ function getModalContentsAtPixel(mapProps, config, compareState, isMobile) {
const lengthCheck = (arr) => arr.length >= (isMobile ? 5 : 12);
if (lengthCheck(metaArray)) {
exceededLengthLimit = true;
- return;
+ return true;
}
const featureId = feature.getId();
if (featureId === 'coordinates-map-marker') {