Kepler.gl is a powerful open source geospatial analysis tool for large-scale data sets.
[Enhancement] Geocoder interaction improvements (#1214)
Shan Hec273483c9315
diff --git a/examples/demo-app/src/components/map-control/map-control.js b/examples/demo-app/src/components/map-control/map-control.jsindex 039b82738..3458df6d4 100644--- a/examples/demo-app/src/components/map-control/map-control.js+++ b/examples/demo-app/src/components/map-control/map-control.js@@ -27,7 +27,7 @@ const MapControl = MapControlFactory();const StyledMapControlOverlay = styled.div`position: absolute;- top: 0px;+ top: ${props => props.top}px;right: 0px;z-index: 1;`;@@ -177,9 +177,9 @@ function SampleMapPanel(props) {}const CustomMapControl = props => (- <StyledMapControlOverlay>+ <StyledMapControlOverlay top={props.top}>{!props.isExport && props.currentSample ? <SampleMapPanel {...props} /> : null}- <MapControl {...props} />+ <MapControl {...props} top={0} /></StyledMapControlOverlay>);diff --git a/package.json b/package.jsonindex e41e67d3d..7ecce734d 100644--- a/package.json+++ b/package.json@@ -129,6 +129,7 @@"lodash.uniqby": "^4.7.0","lodash.xor": "^4.5.0","long": "^4.0.0",+ "mapbox": "^1.0.0-beta10","mini-svg-data-uri": "^1.0.3","moment": "^2.10.6","pbf": "^3.1.0",@@ -140,7 +141,6 @@"react-lifecycles-compat": "^3.0.4","react-map-gl": "^5.0.3","react-map-gl-draw": "0.14.8",- "react-mapbox-gl-geocoder": "^1.1.0","react-markdown": "^4.0.6","react-modal": "^3.8.1","react-onclickoutside": "^6.7.1",diff --git a/src/components/common/item-selector/item-selector.js b/src/components/common/item-selector/item-selector.jsindex 7b5809c95..9408f2a6d 100644--- a/src/components/common/item-selector/item-selector.js+++ b/src/components/common/item-selector/item-selector.js@@ -62,8 +62,10 @@ const DropdownWrapper = styled.div`z-index: ${props => props.theme.dropdownWrapperZ};position: absolute;bottom: ${props => (props.placement === 'top' ? props.theme.inputBoxHeight : 'auto')};- margin-top: ${props => (props.placement === 'bottom' ? '4px' : 'auto')};- margin-bottom: ${props => (props.placement === 'top' ? '4px' : 'auto')};+ margin-top: ${props =>+ props.placement === 'bottom' ? `${props.theme.dropdownWapperMargin}px` : 'auto'};+ margin-bottom: ${props =>+ props.placement === 'top' ? `${props.theme.dropdownWapperMargin}px` : 'auto'};`;class ItemSelector extends Component {diff --git a/src/components/common/styled-components.js b/src/components/common/styled-components.jsindex 7074f58a1..b79e32917 100644--- a/src/components/common/styled-components.js+++ b/src/components/common/styled-components.js@@ -462,9 +462,21 @@ export const StyledAttrbution = styled.div.attrs({position: absolute;display: block;margin: 0 10px 2px;- z-index: 999;+ z-index: 0;++ .attrition-logo {+ display: flex;+ font-size: 10px;+ justify-content: flex-end;+ align-items: center;+ color: ${props => props.theme.labelColor};++ a.mapboxgl-ctrl-logo {+ width: 72px;+ margin-left: 6px;+ }+ }a {- color: black;font-size: 10px;}`;diff --git a/src/components/geocoder-panel.js b/src/components/geocoder-panel.jsindex c9e5a4634..152c9352d 100644--- a/src/components/geocoder-panel.js+++ b/src/components/geocoder-panel.js@@ -21,21 +21,26 @@import React, {Component} from 'react';import PropTypes from 'prop-types';import styled from 'styled-components';-import {SidePanelSection, PanelLabel} from './common/styled-components';-import {FormattedMessage} from 'react-intl';-import Geocoder from 'react-mapbox-gl-geocoder';import Processors from 'processors';-import {fitBounds, addDataToMap, removeDataset} from 'actions';+import {FlyToInterpolator} from '@deck.gl/core';+import geoViewport from '@mapbox/geo-viewport';+import KeplerGlSchema from 'schemas';++import Geocoder from './geocoder/geocoder';+import {+ GEOCODER_DATASET_NAME,+ GEOCODER_LAYER_ID,+ GEOCODER_GEO_OFFSET,+ GEOCODER_ICON_COLOR,+ GEOCODER_ICON_SIZE+} from 'constants/default-settings';-const GEOCODER_DATASET_NAME = 'geocoder_dataset';-const QUERY_PARAMS = {};-const GEO_OFFSET = 0.1;const ICON_LAYER = {- id: 'geocoder_layer',+ id: GEOCODER_LAYER_ID,type: 'icon',config: {label: 'Geocoder Layer',- color: [255, 0, 0],+ color: GEOCODER_ICON_COLOR,dataId: GEOCODER_DATASET_NAME,columns: {lat: 'lt',@@ -46,68 +51,27 @@ const ICON_LAYER = {isVisible: true,hidden: true,visConfig: {- radius: 80+ radius: GEOCODER_ICON_SIZE}}};-const GeocoderPanelContent = styled.div`- background-color: ${props => props.theme.panelBackground};- padding: 0.5em 1em;- position: absolute;- top: 20px;- left: 50%;- margin-left: -20em;- width: 40em;- box-sizing: border-box;-`;--const GeocoderWrapper = styled.div`- color: ${props => props.theme.textColor};- font-size: ${props => props.theme.fontSize};-- .react-geocoder {- position: relative;- }-- .react-geocoder input {- ${props => props.theme.secondaryInput};- }-- .react-geocoder-results {- background-color: ${props => props.theme.panelBackground};- position: absolute;- width: 43.5em;- }-- .react-geocoder-item {- ${props => props.theme.dropdownListItem};- ${props => props.theme.textTruncate};- }-- .remove-layer {- background: transparent;- border: none;- bottom: 28px;- color: ${props => props.theme.textColor};- cursor: pointer;- display: inline;- font-size: 16px;- padding: 2px 8px;- position: absolute;- right: 16px;-- :hover,- :focus,- :active {- background: transparent !important;- border: none;- box-shadow: 0;- color: ${props => props.theme.textColor};- opacity: 0.6;- outline: none;+const PARSED_CONFIG = KeplerGlSchema.parseSavedConfig({+ version: 'v1',+ config: {+ visState: {+ layers: [ICON_LAYER]}}+});++const StyledGeocoderPanel = styled.div`+ position: absolute;+ top: ${props => props.theme.geocoderTop}px;+ right: ${props => props.theme.geocoderRight}px;+ width: ${props => (Number.isFinite(props.width) ? props.width : props.theme.geocoderWidth)}px;+ box-shadow: ${props => props.theme.boxShadow};+ z-index: 100;`;function generateGeocoderDataset(lat, lon, text) {@@ -133,97 +97,88 @@ function isValid(key) {return /pk\..*\..*/.test(key);}-export class GeocoderPanel extends Component {- static propTypes = {- isGeocoderEnabled: PropTypes.bool.isRequired,- mapboxApiAccessToken: PropTypes.string.isRequired- };-- state = {- selectedGeoItem: null- };-- removeGeocoderDataset() {- this.props.dispatch(removeDataset(GEOCODER_DATASET_NAME));- }+export default function GeocoderPanelFactory() {+ class GeocoderPanel extends Component {+ static propTypes = {+ isGeocoderEnabled: PropTypes.bool.isRequired,+ mapboxApiAccessToken: PropTypes.string.isRequired,+ mapState: PropTypes.object.isRequired,+ updateVisData: PropTypes.func.isRequired,+ removeDataset: PropTypes.func.isRequired,+ updateMap: PropTypes.func.isRequired,++ transitionDuration: PropTypes.number,+ width: PropTypes.number+ };++ removeGeocoderDataset() {+ this.props.removeDataset(GEOCODER_DATASET_NAME);+ }- onSelected = (viewport = null, geoItem) => {- const {- center: [lon, lat],- text,- bbox- } = geoItem;- this.removeGeocoderDataset();- this.props.dispatch(- addDataToMap({- datasets: [generateGeocoderDataset(lat, lon, text)],- options: {+ onSelected = (viewport = null, geoItem) => {+ const {+ center: [lon, lat],+ text,+ bbox+ } = geoItem;+ this.removeGeocoderDataset();+ this.props.updateVisData(+ [generateGeocoderDataset(lat, lon, text)],+ {keepExistingConfig: true},- config: {- version: 'v1',- config: {- visState: {- layers: [ICON_LAYER]- }- }- }- })- );- this.props.dispatch(- fitBounds(bbox || [lon - GEO_OFFSET, lat - GEO_OFFSET, lon + GEO_OFFSET, lat + GEO_OFFSET])- );- this.setState({- selectedGeoItem: geoItem- });- };+ PARSED_CONFIG+ );+ const bounds = bbox || [+ lon - GEOCODER_GEO_OFFSET,+ lat - GEOCODER_GEO_OFFSET,+ lon + GEOCODER_GEO_OFFSET,+ lat + GEOCODER_GEO_OFFSET+ ];+ const {center, zoom} = geoViewport.viewport(bounds, [+ this.props.mapState.width,+ this.props.mapState.height+ ]);++ this.props.updateMap({+ latitude: center[1],+ longitude: center[0],+ zoom,+ pitch: 0,+ bearing: 0,+ transitionDuration: this.props.transitionDuration,+ transitionInterpolator: new FlyToInterpolator()+ });+ };++ removeMarker = () => {+ this.removeGeocoderDataset();+ };++ render() {+ const {isGeocoderEnabled, mapboxApiAccessToken, width} = this.props;+ return (+ <StyledGeocoderPanel+ className="geocoder-panel"+ width={width}+ style={{display: isGeocoderEnabled ? 'block' : 'none'}}+ >+ {isValid(mapboxApiAccessToken) && (+ <Geocoder+ mapboxApiAccessToken={mapboxApiAccessToken}+ onSelected={this.onSelected}+ onDeleteMarker={this.removeMarker}+ width={width}+ />+ )}+ </StyledGeocoderPanel>+ );+ }+ }- removeMarker = () => {- this.setState({- selectedGeoItem: null- });- this.removeGeocoderDataset();+ GeocoderPanel.defaultProps = {+ transitionDuration: 3000};- render() {- const {isGeocoderEnabled, mapboxApiAccessToken} = this.props;- return (- <GeocoderPanelContent- className="geocoder-panel"- style={{display: isGeocoderEnabled ? 'block' : 'none'}}- >- <SidePanelSection>- <PanelLabel>- <FormattedMessage id={'geocoder.title'} />- </PanelLabel>- <GeocoderWrapper>- {isValid(mapboxApiAccessToken) && (- <Geocoder- mapboxApiAccessToken={mapboxApiAccessToken}- onSelected={this.onSelected}- hideOnSelect- pointZoom={15}- viewport={{}}- queryParams={QUERY_PARAMS}- />- )}- {this.state.selectedGeoItem && (- <button- type="button"- className="btn btn-primary remove-layer"- onClick={this.removeMarker}- title="Remove marker"- >- ×- </button>- )}- </GeocoderWrapper>- </SidePanelSection>- </GeocoderPanelContent>- );- }-}--export default function GeocoderPanelFactory() {return GeocoderPanel;}diff --git a/src/components/geocoder/geocoder.js b/src/components/geocoder/geocoder.jsnew file mode 100644index 000000000..29508455e--- /dev/null+++ b/src/components/geocoder/geocoder.js@@ -0,0 +1,215 @@+import React, {useCallback, useMemo, useState} from 'react';+import styled from 'styled-components';+import classnames from 'classnames';+import MapboxClient from 'mapbox';+import {injectIntl} from 'react-intl';+import {WebMercatorViewport} from 'viewport-mercator-project';+import KeyEvent from 'constants/keyevent';+import {Input} from 'components/common/styled-components';+import {Search, Delete} from 'components/common/icons';++let debounceTimeout = null;++const StyledContainer = styled.div`+ position: relative;+ color: ${props => props.theme.textColor};++ .geocoder-input {+ box-shadow: ${props => props.theme.boxShadow};++ .geocoder-input__search {+ position: absolute;+ height: ${props => props.theme.geocoderInputHeight}px;+ width: 30px;+ padding-left: 6px;+ display: flex;+ align-items: center;+ justify-content: center;+ color: ${props => props.theme.subtextColor};+ }++ input {+ padding: 4px 36px;+ height: ${props => props.theme.geocoderInputHeight}px;+ }+ }++ .geocoder-results {+ box-shadow: ${props => props.theme.boxShadow};+ background-color: ${props => props.theme.panelBackground};+ position: absolute;+ width: ${props => (Number.isFinite(props.width) ? props.width : props.theme.geocoderWidth)}px;+ margin-top: ${props => props.theme.dropdownWapperMargin}px;+ }++ .geocoder-item {+ ${props => props.theme.dropdownListItem};+ ${props => props.theme.textTruncate};++ &.active {+ background-color: ${props => props.theme.dropdownListHighlightBg};+ }+ }++ .remove-result {+ position: absolute;+ right: 16px;+ top: 0px;+ height: ${props => props.theme.geocoderInputHeight}px;+ display: flex;+ align-items: center;++ :hover {+ cursor: pointer;+ color: ${props => props.theme.textColorHl};+ }+ }+`;++const PLACEHOLDER = 'Enter an Address';++const GeoCoder = ({+ mapboxApiAccessToken,+ className = '',+ initialInputValue = '',+ limit = 5,+ timeout = 300,+ formatItem = item => item.place_name,+ viewport,+ onSelected,+ onDeleteMarker,+ transitionDuration,+ pointZoom,+ width,+ intl+}) => {+ const [inputValue, setInputValue] = useState(initialInputValue);+ const [showResults, setShowResults] = useState(false);+ const [showDelete, setShowDelete] = useState(false);+ const [results, setResults] = useState([]);+ const [selectedIndex, setSelectedIndex] = useState(0);++ const client = useMemo(() => new MapboxClient(mapboxApiAccessToken), [mapboxApiAccessToken]);++ const onChange = useCallback(+ event => {+ const queryString = event.target.value;+ setInputValue(queryString);+ clearTimeout(debounceTimeout);++ debounceTimeout = setTimeout(async () => {+ if (limit > 0 && Boolean(queryString)) {+ const response = await client.geocodeForward(queryString, {limit});+ setShowResults(true);+ setResults(response.entity.features);+ }+ }, timeout);+ },+ [client, results, setResults, setShowResults]+ );++ const onBlur = useCallback(() => {+ setTimeout(() => {+ setShowResults(false);+ }, timeout);+ }, [setShowResults]);++ const onFocus = useCallback(() => setShowResults(true), [setShowResults]);++ const onItemSelected = useCallback(+ item => {+ let newViewport = new WebMercatorViewport(viewport);+ const {bbox, center} = item;++ newViewport = bbox+ ? newViewport.fitBounds([+ [bbox[0], bbox[1]],+ [bbox[2], bbox[3]]+ ])+ : {+ longitude: center[0],+ latitude: center[1],+ zoom: pointZoom+ };++ const {longitude, latitude, zoom} = newViewport;++ onSelected({...viewport, ...{longitude, latitude, zoom, transitionDuration}}, item);++ setShowResults(false);+ setInputValue(formatItem(item));+ setShowDelete(true);+ },+ [viewport, onSelected, transitionDuration, pointZoom, formatItem]+ );++ const onMarkDeleted = useCallback(() => {+ setShowDelete(false);+ setInputValue('');+ onDeleteMarker();+ }, [onDeleteMarker]);++ const onKeyDown = useCallback(+ e => {+ switch (e.keyCode) {+ case KeyEvent.DOM_VK_UP:+ setSelectedIndex(selectedIndex > 0 ? selectedIndex - 1 : selectedIndex);+ break;+ case KeyEvent.DOM_VK_DOWN:+ setSelectedIndex(selectedIndex < results.length - 1 ? selectedIndex + 1 : selectedIndex);+ break;+ case KeyEvent.DOM_VK_ENTER:+ case KeyEvent.DOM_VK_RETURN:+ onItemSelected(results[selectedIndex]);+ break;+ default:+ break;+ }+ },+ [results, selectedIndex, setSelectedIndex]+ );++ return (+ <StyledContainer className={className} width={width}>+ <div className="geocoder-input">+ <div className="geocoder-input__search">+ <Search height="20px" />+ </div>+ <Input+ type="text"+ onChange={onChange}+ onBlur={onBlur}+ onFocus={onFocus}+ onKeyDown={onKeyDown}+ value={inputValue}+ placeholder={+ intl+ ? intl.formatMessage({id: 'geocoder.title', defaultMessage: PLACEHOLDER})+ : PLACEHOLDER+ }+ />+ {showDelete ? (+ <div className="remove-result">+ <Delete height="12px" onClick={onMarkDeleted} />+ </div>+ ) : null}+ </div>++ {showResults ? (+ <div className="geocoder-results">+ {results.map((item, index) => (+ <div+ key={index}+ className={classnames('geocoder-item', {active: selectedIndex === index})}+ onClick={() => onItemSelected(item)}+ >+ {formatItem(item)}+ </div>+ ))}+ </div>+ ) : null}+ </StyledContainer>+ );+};++export default injectIntl(GeoCoder);diff --git a/src/components/index.js b/src/components/index.jsindex c6b9a5a5f..51379ec47 100644--- a/src/components/index.js+++ b/src/components/index.js@@ -133,10 +133,12 @@ export {default as ProgressBar} from './common/progress-bar';export {default as FileUploadProgress} from './common/file-uploader/file-upload-progress';export {default as Slider} from './common/slider/slider';export {default as DatasetSquare} from './common/styled-components';+export {default as ActionPanel, ActionPanelItem} from 'components/common/action-panel';// side pane componentsexport {default as LayerConfigGroup} from './side-panel/layer-panel/layer-config-group';export {default as LayerTypeSelector} from './side-panel/layer-panel/layer-type-selector';+export {ConfigGroupCollapsibleContent} from './side-panel/layer-panel/layer-config-group';export {ChannelByValueSelector,diff --git a/src/components/kepler-gl.js b/src/components/kepler-gl.jsindex 3371b0810..0ff662775 100644--- a/src/components/kepler-gl.js+++ b/src/components/kepler-gl.js@@ -85,6 +85,10 @@ const GlobalStyle = styled.div`text-decoration: none;color: ${props => props.theme.labelColor};}++ .mapboxgl-ctrl .mapboxgl-ctrl-logo {+ display: none;+ }`;KeplerGlFactory.deps = [@@ -240,8 +244,7 @@ function KeplerGlFactory(mapStateActions,mapStyleActions,uiStateActions,- providerActions,- dispatch+ providerActions} = this.props;const availableProviders = this.availableProviders(this.props);@@ -371,7 +374,10 @@ function KeplerGlFactory(<GeoCoderPanelisGeocoderEnabled={interactionConfig.geocoder.enabled}mapboxApiAccessToken={mapboxApiAccessToken}- dispatch={dispatch}+ mapState={mapState}+ updateVisData={visStateActions.updateVisData}+ removeDataset={visStateActions.removeDataset}+ updateMap={mapStateActions.updateMap}/>)}<BottomWidgetdiff --git a/src/components/map-container.js b/src/components/map-container.jsindex 6cf2f8d08..ff25d7bbc 100644--- a/src/components/map-container.js+++ b/src/components/map-container.js@@ -42,7 +42,7 @@ import {getLayerHoverProp} from 'utils/layer-utils';// default-settingsimport ThreeDBuildingLayer from 'deckgl-layers/3d-building-layer/3d-building-layer';-import {FILTER_TYPES} from 'constants/default-settings';+import {FILTER_TYPES, GEOCODER_LAYER_ID} from 'constants/default-settings';const MAP_STYLE = {container: {@@ -62,18 +62,30 @@ const TRANSITION_DURATION = 0;const Attribution = () => (<StyledAttrbution>- <a href="https://kepler.gl/policy/" target="_blank" rel="noopener noreferrer">- © kepler.gl |{' '}- </a>- <a href="https://www.mapbox.com/about/maps/" target="_blank" rel="noopener noreferrer">- © Mapbox |{' '}- </a>- <a href="http://www.openstreetmap.org/copyright" target="_blank" rel="noopener noreferrer">- © OpenStreetMap |{' '}- </a>- <a href="https://www.mapbox.com/map-feedback/" target="_blank" rel="noopener noreferrer">- <strong>Improve this map</strong>- </a>+ <div className="attrition-logo">+ Basemap by:+ <a+ className="mapboxgl-ctrl-logo"+ target="_blank"+ rel="noopener noreferrer"+ href="https://www.mapbox.com/"+ aria-label="Mapbox logo"+ />+ </div>+ <div>+ <a href="https://kepler.gl/policy/" target="_blank" rel="noopener noreferrer">+ © kepler.gl |{' '}+ </a>+ <a href="https://www.mapbox.com/about/maps/" target="_blank" rel="noopener noreferrer">+ © Mapbox |{' '}+ </a>+ <a href="http://www.openstreetmap.org/copyright" target="_blank" rel="noopener noreferrer">+ © OpenStreetMap |{' '}+ </a>+ <a href="https://www.mapbox.com/map-feedback/" target="_blank" rel="noopener noreferrer">+ <strong>Improve this map</strong>+ </a>+ </div></StyledAttrbution>);@@ -152,7 +164,9 @@ export default function MapContainerFactory(MapPopover, MapControl, Editor) {(accu, layer, idx) => ({...accu,[layer.id]:- layer.shouldRenderLayer(layerData[idx]) && this._isVisibleMapLayer(layer, mapLayers)+ layer.id !== GEOCODER_LAYER_ID &&+ layer.shouldRenderLayer(layerData[idx]) &&+ this._isVisibleMapLayer(layer, mapLayers)}),{})@@ -469,6 +483,7 @@ export default function MapContainerFactory(MapPopover, MapControl, Editor) {uiState,uiStateActions,visStateActions,+ interactionConfig,editor,index} = this.props;@@ -490,6 +505,7 @@ export default function MapContainerFactory(MapPopover, MapControl, Editor) {};const isEdit = uiState.mapControls.mapDraw.active;+ const hasGeocoderLayer = layers.find(l => l.id === GEOCODER_LAYER_ID);return (<StyledMapContainer style={MAP_STYLE.container}>@@ -504,7 +520,7 @@ export default function MapContainerFactory(MapPopover, MapControl, Editor) {mapControls={mapControls}readOnly={this.props.readOnly}scale={mapState.scale || 1}- top={0}+ top={interactionConfig.geocoder && interactionConfig.geocoder.enabled ? 52 : 0}editor={editor}locale={uiState.locale}onTogglePerspective={mapStateActions.togglePerspective}@@ -545,11 +561,13 @@ export default function MapContainerFactory(MapPopover, MapControl, Editor) {}}/></MapComponent>- {mapStyle.topMapStyle && (+ {mapStyle.topMapStyle || hasGeocoderLayer ? (<div style={MAP_STYLE.top}>- <MapComponent {...mapProps} key="top" mapStyle={mapStyle.topMapStyle} />+ <MapComponent {...mapProps} key="top" mapStyle={mapStyle.topMapStyle}>+ {this._renderDeckOverlay({[GEOCODER_LAYER_ID]: true})}+ </MapComponent></div>- )}+ ) : null}{this._renderMapPopover(layersToRender)}<Attribution /></StyledMapContainer>diff --git a/src/components/map/map-control.js b/src/components/map/map-control.jsindex a13f12892..c0a18c91f 100644--- a/src/components/map/map-control.js+++ b/src/components/map/map-control.js@@ -53,7 +53,7 @@ const StyledMapControl = styled.div`width: ${props => props.theme.mapControl.width}px;padding: ${props => props.theme.mapControl.padding}px;z-index: 10;- top: ${props => props.top}px;+ margin-top: ${props => props.top || 0}px;position: absolute;`;@@ -72,14 +72,18 @@ const StyledMapControlPanel = styled.div`}`;-const StyledMapControlPanelContent = styled.div`+const StyledMapControlPanelContent = styled.div.attrs({+ className: 'map-control__panel-content'+})`${props => props.theme.dropdownScrollBar};max-height: 500px;min-height: 100px;overflow: auto;`;-const StyledMapControlPanelHeader = styled.div`+const StyledMapControlPanelHeader = styled.div.attrs({+ className: 'map-control__panel-header'+})`display: flex;justify-content: space-between;background-color: ${props => props.theme.mapPanelHeaderBackgroundColor};@@ -414,7 +418,8 @@ const MapControlFactory = () => {editor,scale,readOnly,- locale+ locale,+ top} = this.props;const {@@ -427,7 +432,7 @@ const MapControlFactory = () => {} = mapControls;return (- <StyledMapControl className="map-control">+ <StyledMapControl className="map-control" top={top}>{/* Split Map */}{splitMap.show && readOnly !== true ? (<ActionPanel className="split-map" key={0}>diff --git a/src/constants/default-settings.js b/src/constants/default-settings.jsindex 8bc323ace..fc3e3768a 100644--- a/src/constants/default-settings.js+++ b/src/constants/default-settings.js@@ -802,6 +802,14 @@ export const DEFAULT_TIME_FORMAT = 'MM/DD/YY HH:mm:ssa';export const SPEED_CONTROL_RANGE = [0, 10];export const SPEED_CONTROL_STEP = 0.001;+// Geocoder+export const GEOCODER_DATASET_NAME = 'geocoder_dataset';+export const GEOCODER_LAYER_ID = 'geocoder_layer';+export const GEOCODER_GEO_OFFSET = 0.05;+export const GEOCODER_ICON_COLOR = [255, 0, 0];+export const GEOCODER_ICON_SIZE = 80;++// We could use directly react-map-gl-draw EditorMode but this would// create a direct dependency with react-map-gl-draw// Created this map to be independent from react-map-gl-drawdiff --git a/src/localization/en.js b/src/localization/en.jsindex be7f5af31..1a4a5cda8 100644--- a/src/localization/en.js+++ b/src/localization/en.js@@ -435,7 +435,7 @@ export default {or: 'or'},geocoder: {- title: 'Geocoder'+ title: 'Enter an Address'},fieldSelector: {clearAll: 'Clear All',diff --git a/src/styles/base.js b/src/styles/base.jsindex 8eb66c0e1..10dc080a7 100644--- a/src/styles/base.js+++ b/src/styles/base.js@@ -144,6 +144,7 @@ export const dropdownListBgdLT = '#FFFFFF';export const dropdownListBorderTop = '#242730';export const dropdownListBorderTopLT = '#D3D8E0';export const dropdownWrapperZ = 100;+export const dropdownWapperMargin = 4;// Switchexport const switchWidth = 24;export const switchHeight = 12;@@ -253,6 +254,12 @@ export const sliderInputWidth = 56;export const sliderMarginTopIsTime = -12;export const sliderMarginTop = 12;+// Geocoder+export const geocoderWidth = 360;+export const geocoderTop = 20;+export const geocoderRight = 12;+export const geocoderInputHeight = 36;+// Plotexport const rangeBrushBgd = '#3A414C';export const histogramFillInRange = activeColor;@@ -366,7 +373,7 @@ const input = css`opacity: ${props => (props.disabled ? 0.5 : 1)};:hover {- cursor: ${props => (props.type === 'number' ? 'text' : 'pointer')};+ cursor: ${props => (props.type === 'number' || props.type === 'text' ? 'text' : 'pointer')};background-color: ${props =>props.active ? props.theme.inputBgdActive : props.theme.inputBgdHover};border-color: ${props =>@@ -868,6 +875,7 @@ export const theme = {dropdownListSection,dropdownListShadow,dropdownWrapperZ,+ dropdownWapperMargin,modalScrollBar,scrollBar,sidePanelScrollBar,@@ -1099,6 +1107,12 @@ export const theme = {sliderMarginTopIsTime,sliderMarginTop,+ // Geocoder+ geocoderWidth,+ geocoderTop,+ geocoderRight,+ geocoderInputHeight,+// PlotrangeBrushBgd,histogramFillInRange,diff --git a/test/browser/components/geocoder-panel-test.js b/test/browser/components/geocoder-panel-test.jsindex 27bc1cc83..32c64c450 100644--- a/test/browser/components/geocoder-panel-test.js+++ b/test/browser/components/geocoder-panel-test.js@@ -18,28 +18,43 @@// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN// THE SOFTWARE.+/* eslint-disable max-statements */import React from 'react';import sinon from 'sinon';import test from 'tape';import {IntlWrapper, mountWithTheme} from 'test/helpers/component-utils';-import {GeocoderPanel} from 'components/geocoder-panel';+import GeocoderPanelFactory from 'components/geocoder-panel';+import {appInjector} from 'components/container';++const GeocoderPanel = appInjector.get(GeocoderPanelFactory);+const MAPBOX_TOKEN = process.env.MapboxAccessToken;test('GeocoderPanel - render', t => {const enabled = true;- const dispatch = sinon.spy();+ const updateVisData = sinon.spy();+ const removeDataset = sinon.spy();+ const updateMap = sinon.spy();+ const mockMapState = {+ latitude: 33,+ longitude: 127,+ zoom: 8,+ width: 800,+ height: 800+ };+const mockGeoItem = {- center: [0, 0],+ center: [1, 55],text: 'mock',- bbox: [0, 0, 0, 0]+ bbox: [-1, 50, 4, 65]};const mockGeoItemWithOutBbox = {- center: [0, 0],+ center: [1, 55],text: 'mock'};- const mockPayload = {- datasets: [+ const mockPayload = [+ [{data: {fields: [@@ -72,7 +87,7 @@ test('GeocoderPanel - render', t => {analyzerType: 'STRING'}],- rows: [[0, 0, 'place', 'mock']]+ rows: [[55, 1, 'place', 'mock']]},id: 'geocoder_dataset',info: {@@ -82,41 +97,37 @@ test('GeocoderPanel - render', t => {}}],- options: {+ {keepExistingConfig: true},- config: {- version: 'v1',- config: {- visState: {- layers: [- {- id: 'geocoder_layer',- type: 'icon',- config: {- label: 'Geocoder Layer',- color: [255, 0, 0],- dataId: 'geocoder_dataset',- columns: {- lat: 'lt',- lng: 'ln',- icon: 'icon',- label: 'text'- },- isVisible: true,- hidden: true,- visConfig: {- radius: 80- }+ {+ visState: {+ layers: [+ {+ id: 'geocoder_layer',+ type: 'icon',+ config: {+ label: 'Geocoder Layer',+ color: [255, 0, 0],+ dataId: 'geocoder_dataset',+ columns: {+ lat: 'lt',+ lng: 'ln',+ icon: 'icon',+ label: 'text'+ },+ isVisible: true,+ hidden: true,+ visConfig: {+ radius: 80}}- ]- }+ }+ ]}}- };+ ];- // const onLayerClick = sinon.spy();let wrapper;t.doesNotThrow(() => {@@ -124,8 +135,11 @@ test('GeocoderPanel - render', t => {<IntlWrapper><GeocoderPanelisGeocoderEnabled={enabled}- mapboxApiAccessToken="smoothie-the-cat"- dispatch={dispatch}+ mapboxApiAccessToken={MAPBOX_TOKEN}+ mapState={mockMapState}+ updateVisData={updateVisData}+ removeDataset={removeDataset}+ updateMap={updateMap}/></IntlWrapper>);@@ -138,39 +152,41 @@ test('GeocoderPanel - render', t => {instance.onSelected(null, mockGeoItem);t.deepEqual(- dispatch.getCall(0).args,- [{type: '@@kepler.gl/REMOVE_DATASET', dataId: 'geocoder_dataset'}],- 'Should be dispatching removeDataset action on onSelected'- );- t.deepEqual(- dispatch.getCall(1).args,- [{type: '@@kepler.gl/ADD_DATA_TO_MAP', payload: mockPayload}],- 'Should be dispatching addDataToMap action on onSelected'+ removeDataset.args,+ [['geocoder_dataset']],+ 'Should call removeDataset on onSelected');+ t.deepEqual(updateVisData.args, [mockPayload], 'Should call updateVisData onSelected');+ const newVP = updateMap.args[0][0];+t.deepEqual(- dispatch.getCall(2).args,- [{type: '@@kepler.gl/FIT_BOUNDS', payload: mockGeoItem.bbox}],- 'Should be dispatching fitBounds action on onSelected w/ bbox'+ {latitude: newVP.latitude, longitude: newVP.longitude, zoom: newVP.zoom},+ {latitude: 57.5, longitude: 1.5, zoom: 5},+ 'Should call updateMap action on onSelected w/ new viewport');+ t.ok(newVP.transitionInterpolator, 'Should call updateMap action with transitionInterpolator');+instance.onSelected(null, mockGeoItemWithOutBbox);++ const newVP2 = updateMap.args[1][0];t.deepEqual(- dispatch.getCall(5).args,- [{type: '@@kepler.gl/FIT_BOUNDS', payload: [-0.1, -0.1, 0.1, 0.1]}],- 'Should be dispatching fitBounds action on onSelected w/o bbox'+ {latitude: newVP2.latitude, longitude: newVP2.longitude, zoom: newVP2.zoom},+ {latitude: 55, longitude: 1, zoom: 12},+ 'Should call updateMapaction on onSelected w/o bbox');instance.removeMarker();t.deepEqual(- dispatch.getCall(6).args,- [{type: '@@kepler.gl/REMOVE_DATASET', dataId: 'geocoder_dataset'}],+ removeDataset.args[1],+ ['geocoder_dataset'],'Should be dispatching removeDataset action on removeMarker');instance.removeGeocoderDataset();t.deepEqual(- dispatch.getCall(7).args,- [{type: '@@kepler.gl/REMOVE_DATASET', dataId: 'geocoder_dataset'}],+ removeDataset.args[2],+ ['geocoder_dataset'],'Should be dispatching removeDataset action on removeGeocoderDataset');