Commit 01c0b4fb authored by amarcic's avatar amarcic
Browse files

Merge branch 'map-dev' of...

Merge branch 'map-dev' of https://gitlab.cceh.uni-koeln.de/spp-2143-learning-through-connecting/ltc_website into map-dev
parents f844660c d20ebf3d
......@@ -406,14 +406,6 @@ export const AppContent = () => {
{(loadingContext||loadingObjects||loadingArchaeoSites||loadingSitesByRegion) && <LinearProgress />}
{input.showRelatedObjects && <Button
onClick={() => handleRelatedObjects()}
name="hideRelatedObjects"
variant="contained"
color="primary"
size="small">
Return to search results (hide related objects)
</Button>}
</Grid>
<Grid className="grid-map" item xs={12} lg={9}>
<OurMap
......@@ -441,6 +433,14 @@ export const AppContent = () => {
<h3>Search Results</h3>
{input.resultsListExpanded ? <ExpandLessIcon/> : <ExpandMoreIcon/>}
</Button>
{input.showRelatedObjects && <Button
onClick={() => handleRelatedObjects()}
name="hideRelatedObjects"
variant="contained"
color="primary"
size="small">
Return to search results (hide related objects)
</Button>}
{input.resultsListExpanded
? (<Grid className="grid-results-list-expanded" item>
{/* Conditions for rendering a table */
......
......@@ -3,6 +3,7 @@ import { Map, TileLayer, Rectangle, Circle } from 'react-leaflet';
import MarkerClusterGroup from "react-leaflet-markercluster";
import { CreateMarkers } from '..'
import {useTranslation} from "react-i18next";
import {Button} from "@material-ui/core";
const osmTiles = 'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png';
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment