From 146a148adb54ff858eb911bb25e7c3426c2a7764 Mon Sep 17 00:00:00 2001
From: esikkala <esko.ikkala@aalto.fi>
Date: Tue, 9 Mar 2021 07:36:26 +0200
Subject: [PATCH] Improve GeoJSON layer handling
---
.../components/facet_results/LeafletMap.js | 43 ++++++++++++-------
.../perspectives/sampo/Perspective1.js | 9 +++-
2 files changed, 34 insertions(+), 18 deletions(-)
diff --git a/src/client/components/facet_results/LeafletMap.js b/src/client/components/facet_results/LeafletMap.js
index 0bf38d9c..1b2c00eb 100644
--- a/src/client/components/facet_results/LeafletMap.js
+++ b/src/client/components/facet_results/LeafletMap.js
@@ -117,14 +117,8 @@ class LeafletMap extends React.Component {
if (this.props.mapMode && this.props.pageType === 'clientFSResults') {
this.drawPointData()
}
- if (this.props.showExternalLayers) {
- this.props.clearGeoJSONLayers()
- if (this.state.activeOverlays.length > 0 && this.isSafeToLoadLargeLayers()) {
- this.props.fetchGeoJSONLayers({
- layerIDs: this.state.activeOverlays,
- bounds: this.leafletMap.getBounds()
- })
- }
+ if (this.props.showExternalLayers && !this.props.locateUser) {
+ this.fetchDefaultGeoJSONLayers()
}
}
@@ -229,8 +223,10 @@ class LeafletMap extends React.Component {
const container = this.props.container ? this.props.container : 'map'
this.leafletMap = L.map(container, {
- ...(this.props.center && { center: this.props.center }),
- ...(this.props.zoom && { zoom: this.props.zoom }),
+ ...(!this.props.locateUser && {
+ center: this.props.center,
+ zoom: this.props.zoom
+ }),
zoomControl: false,
zoominfoControl: true,
layers: [
@@ -249,6 +245,9 @@ class LeafletMap extends React.Component {
// [intl.get('leafletMap.basemaps.googleRoadmap')]: googleRoadmap,
}
this.initOverLays(basemaps)
+ if (!this.props.locateUser) {
+ this.initMapEventListeners()
+ }
}
// Add scale
@@ -283,14 +282,27 @@ class LeafletMap extends React.Component {
.addTo(this.leafletMap)
.bindPopup('You are within ' + e.accuracy + ' meters from this point')
// .openPopup()
+ this.initMapEventListeners()
+ this.fetchDefaultGeoJSONLayers()
}
onLocationError = e => {
- console.log(e)
- this.props.showError({
- title: '',
- text: e.message
- })
+ // this.props.showError({
+ // title: '',
+ // text: e.message
+ // })
+ this.initMapEventListeners()
+ this.fetchDefaultGeoJSONLayers()
+ }
+
+ fetchDefaultGeoJSONLayers = () => {
+ this.props.clearGeoJSONLayers()
+ if (this.state.activeOverlays.length > 0 && this.isSafeToLoadLargeLayers()) {
+ this.props.fetchGeoJSONLayers({
+ layerIDs: this.state.activeOverlays,
+ bounds: this.leafletMap.getBounds()
+ })
+ }
}
boundsToValues = () => {
@@ -510,7 +522,6 @@ class LeafletMap extends React.Component {
[intl.get('leafletMap.externalLayers.senateAtlas')]: senateAtlas
}
this.createOpacitySlider(opacityLayers)
- this.initMapEventListeners()
}
populateOverlay = layerObj => {
diff --git a/src/client/components/perspectives/sampo/Perspective1.js b/src/client/components/perspectives/sampo/Perspective1.js
index 61902dcd..bc4c602d 100644
--- a/src/client/components/perspectives/sampo/Perspective1.js
+++ b/src/client/components/perspectives/sampo/Perspective1.js
@@ -51,8 +51,9 @@ const Perspective1 = props => {
<LeafletMap
center={[22.43, 10.37]}
zoom={2}
- // center={[60.17, 24.81]}
- // zoom={14}
+ // locateUser
+ // center={[60.187, 24.821]}
+ // zoom={15}
results={props.placesResults.results}
layers={props.leafletMapLayers}
pageType='facetResults'
@@ -72,6 +73,10 @@ const Perspective1 = props => {
showInstanceCountInClusters
updateFacetOption={props.updateFacetOption}
showExternalLayers
+ // activeOverlays={[
+ // 'arkeologiset_kohteet_alue',
+ // 'arkeologiset_kohteet_piste'
+ // ]}
layerControlExpanded
showError={props.showError}
/>}
--
GitLab