Skip to content
Snippets Groups Projects
Commit 83d96120 authored by esikkala's avatar esikkala
Browse files

LeafletMapDialog: add layout config

parent 5d20bc01
No related branches found
No related tags found
No related merge requests found
...@@ -370,6 +370,7 @@ class FacetBar extends React.Component { ...@@ -370,6 +370,7 @@ class FacetBar extends React.Component {
updateMapBounds={this.props.updateMapBounds} updateMapBounds={this.props.updateMapBounds}
showError={this.props.showError} showError={this.props.showError}
perspectiveID={facetClass} perspectiveID={facetClass}
layoutConfig={this.props.layoutConfig}
/>} />}
{(facetedSearchMode === 'serverFS' || facetData.results !== null) && {(facetedSearchMode === 'serverFS' || facetData.results !== null) &&
<Paper className={classes.facetInfoContainer}> <Paper className={classes.facetInfoContainer}>
......
...@@ -12,6 +12,10 @@ import CropFreeIcon from '@material-ui/icons/CropFree' ...@@ -12,6 +12,10 @@ import CropFreeIcon from '@material-ui/icons/CropFree'
import LeafletMap from '../facet_results/LeafletMap' import LeafletMap from '../facet_results/LeafletMap'
import CircularProgress from '@material-ui/core/CircularProgress' import CircularProgress from '@material-ui/core/CircularProgress'
import Paper from '@material-ui/core/Paper' import Paper from '@material-ui/core/Paper'
import {
MAPBOX_ACCESS_TOKEN,
MAPBOX_STYLE
} from '../../configs/sampo/GeneralConfig'
const styles = theme => ({ const styles = theme => ({
root: { root: {
...@@ -99,6 +103,8 @@ class LeafletMapDialog extends React.Component { ...@@ -99,6 +103,8 @@ class LeafletMapDialog extends React.Component {
> >
<DialogTitle id='dialog-title'>{intl.get(`perspectives.${perspectiveID}.searchByAreaTitle`)}</DialogTitle> <DialogTitle id='dialog-title'>{intl.get(`perspectives.${perspectiveID}.searchByAreaTitle`)}</DialogTitle>
<LeafletMap <LeafletMap
mapBoxAccessToken={MAPBOX_ACCESS_TOKEN}
mapBoxStyle={MAPBOX_STYLE}
center={center} center={center}
zoom={zoom} zoom={zoom}
resultClass='clientFSBboxSearch' resultClass='clientFSBboxSearch'
...@@ -110,6 +116,7 @@ class LeafletMapDialog extends React.Component { ...@@ -110,6 +116,7 @@ class LeafletMapDialog extends React.Component {
facetedSearchMode='clientFS' facetedSearchMode='clientFS'
updateMapBounds={this.props.updateMapBounds} updateMapBounds={this.props.updateMapBounds}
container='mapDialog' container='mapDialog'
layoutConfig={this.props.layoutConfig}
/> />
<DialogActions> <DialogActions>
<Button onClick={this.handleClose} variant='contained' color='primary' autoFocus> <Button onClick={this.handleClose} variant='contained' color='primary' autoFocus>
...@@ -132,7 +139,8 @@ LeafletMapDialog.propTypes = { ...@@ -132,7 +139,8 @@ LeafletMapDialog.propTypes = {
clientFSClearResults: PropTypes.func.isRequired, clientFSClearResults: PropTypes.func.isRequired,
updateMapBounds: PropTypes.func, updateMapBounds: PropTypes.func,
showError: PropTypes.func, showError: PropTypes.func,
perspectiveID: PropTypes.string.isRequired perspectiveID: PropTypes.string.isRequired,
layoutConfig: PropTypes.object.isRequired
} }
export const LeafletMapDialogComponent = LeafletMapDialog export const LeafletMapDialogComponent = LeafletMapDialog
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment