Skip to content
Snippets Groups Projects
Commit 7e6806a4 authored by Esko Ikkala's avatar Esko Ikkala
Browse files

Fix creation place map popups

parent 17bfded4
No related branches found
No related tags found
No related merge requests found
...@@ -109,7 +109,7 @@ class LeafletMap extends React.Component { ...@@ -109,7 +109,7 @@ class LeafletMap extends React.Component {
} }
componentDidUpdate({ results, mapMode }) { componentDidUpdate({ results, place, mapMode }) {
// check if results data or mapMode have changed // check if results data or mapMode have changed
if (this.props.results !== results || this.props.mapMode !== mapMode) { if (this.props.results !== results || this.props.mapMode !== mapMode) {
...@@ -119,8 +119,21 @@ class LeafletMap extends React.Component { ...@@ -119,8 +119,21 @@ class LeafletMap extends React.Component {
this.updateMarkers(this.props.results); this.updateMarkers(this.props.results);
} }
} }
if (this.props.place !== place) {
this.markers[this.props.place.id.replace('http://ldf.fi/mmm/place/', '')]
.bindPopup(this.createPopUpContent(this.props.place), {
maxHeight: 300,
maxWidth: 400,
minWidth: 400,
//closeButton: false,
})
.openPopup();
}
} }
updateMarkers(results) { updateMarkers(results) {
this.resultMarkerLayer.clearLayers(); this.resultMarkerLayer.clearLayers();
this.markers = {}; this.markers = {};
...@@ -193,7 +206,6 @@ class LeafletMap extends React.Component { ...@@ -193,7 +206,6 @@ class LeafletMap extends React.Component {
}; };
createPopUpContent(result) { createPopUpContent(result) {
// console.log(result)
let popUpTemplate = `<h3><a target="_blank" rel="noopener noreferrer" href=${result.sdbmLink}>${result.prefLabel}</a></p></h3>`; let popUpTemplate = `<h3><a target="_blank" rel="noopener noreferrer" href=${result.sdbmLink}>${result.prefLabel}</a></p></h3>`;
if (has(result, 'source')) { if (has(result, 'source')) {
popUpTemplate += `<p>Place authority: <a target="_blank" rel="noopener noreferrer" href=${result.source}>${result.source}</a></p>`; popUpTemplate += `<p>Place authority: <a target="_blank" rel="noopener noreferrer" href=${result.source}>${result.source}</a></p>`;
...@@ -253,7 +265,8 @@ LeafletMap.propTypes = { ...@@ -253,7 +265,8 @@ LeafletMap.propTypes = {
fetchPlaces: PropTypes.func.isRequired, fetchPlaces: PropTypes.func.isRequired,
fetchPlace: PropTypes.func.isRequired, fetchPlace: PropTypes.func.isRequired,
results: PropTypes.array.isRequired, results: PropTypes.array.isRequired,
mapMode: PropTypes.string.isRequired mapMode: PropTypes.string.isRequired,
place: PropTypes.object.isRequired,
}; };
export default LeafletMap; export default LeafletMap;
...@@ -34,6 +34,7 @@ let Manuscripts = props => { ...@@ -34,6 +34,7 @@ let Manuscripts = props => {
fetchPlaces={props.fetchPlaces} fetchPlaces={props.fetchPlaces}
fetchPlace={props.fetchPlace} fetchPlace={props.fetchPlace}
results={props.search.places} results={props.search.places}
place={props.search.place}
mapMode='cluster' mapMode='cluster'
/>} />}
/> />
......
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