From 83d96120ed7cf8a2fb57413fb1e45017bf5a9cbd Mon Sep 17 00:00:00 2001
From: esikkala <esko.ikkala@aalto.fi>
Date: Tue, 15 Jun 2021 10:22:59 +0300
Subject: [PATCH] LeafletMapDialog: add layout config
---
src/client/components/facet_bar/FacetBar.js | 1 +
src/client/components/facet_bar/LeafletMapDialog.js | 10 +++++++++-
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/src/client/components/facet_bar/FacetBar.js b/src/client/components/facet_bar/FacetBar.js
index 57b65ae0..9415c70a 100644
--- a/src/client/components/facet_bar/FacetBar.js
+++ b/src/client/components/facet_bar/FacetBar.js
@@ -370,6 +370,7 @@ class FacetBar extends React.Component {
updateMapBounds={this.props.updateMapBounds}
showError={this.props.showError}
perspectiveID={facetClass}
+ layoutConfig={this.props.layoutConfig}
/>}
{(facetedSearchMode === 'serverFS' || facetData.results !== null) &&
<Paper className={classes.facetInfoContainer}>
diff --git a/src/client/components/facet_bar/LeafletMapDialog.js b/src/client/components/facet_bar/LeafletMapDialog.js
index 64c137b1..a5024125 100644
--- a/src/client/components/facet_bar/LeafletMapDialog.js
+++ b/src/client/components/facet_bar/LeafletMapDialog.js
@@ -12,6 +12,10 @@ import CropFreeIcon from '@material-ui/icons/CropFree'
import LeafletMap from '../facet_results/LeafletMap'
import CircularProgress from '@material-ui/core/CircularProgress'
import Paper from '@material-ui/core/Paper'
+import {
+ MAPBOX_ACCESS_TOKEN,
+ MAPBOX_STYLE
+} from '../../configs/sampo/GeneralConfig'
const styles = theme => ({
root: {
@@ -99,6 +103,8 @@ class LeafletMapDialog extends React.Component {
>
<DialogTitle id='dialog-title'>{intl.get(`perspectives.${perspectiveID}.searchByAreaTitle`)}</DialogTitle>
<LeafletMap
+ mapBoxAccessToken={MAPBOX_ACCESS_TOKEN}
+ mapBoxStyle={MAPBOX_STYLE}
center={center}
zoom={zoom}
resultClass='clientFSBboxSearch'
@@ -110,6 +116,7 @@ class LeafletMapDialog extends React.Component {
facetedSearchMode='clientFS'
updateMapBounds={this.props.updateMapBounds}
container='mapDialog'
+ layoutConfig={this.props.layoutConfig}
/>
<DialogActions>
<Button onClick={this.handleClose} variant='contained' color='primary' autoFocus>
@@ -132,7 +139,8 @@ LeafletMapDialog.propTypes = {
clientFSClearResults: PropTypes.func.isRequired,
updateMapBounds: PropTypes.func,
showError: PropTypes.func,
- perspectiveID: PropTypes.string.isRequired
+ perspectiveID: PropTypes.string.isRequired,
+ layoutConfig: PropTypes.object.isRequired
}
export const LeafletMapDialogComponent = LeafletMapDialog
--
GitLab