Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Map popup improvements #13

Merged
merged 2 commits into from
Nov 26, 2020
Merged

Map popup improvements #13

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
99b0002
Show number of LCPs in popup, or nothing if no LCPs
nilshettich Nov 25, 2020
e3196a1
Updated popup 'Site contents' labels
razvanMiu Nov 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
122 changes: 71 additions & 51 deletions src/components/manage/Blocks/DiscodataOpenlayersMapBlock/View.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1243,65 +1243,85 @@ const OpenlayersMapView = (props) => {
<div className="popover-body">
<div className="grid-layout">
{/* SITE CONTENTS */}
<div className="row mb-1-super mt-0-super">
<div className="column column-12">
<Header as="h3">Site contents</Header>
</div>
<div className="column column-12">
<p>
<Link
as="a"
className={
!state.popupDetails.properties.nFacilities
? 'disabled-link'
: ''
}
onClick={setSiteQueryParams}
to={`/industrial-site/pollutant-releases-and-transfers/site-overview/?siteInspireId=${state.popupDetails.properties.InspireSiteId}&siteName=${state.popupDetails.properties.siteName}&siteReportingYear=${state.popupDetails.properties.Site_reporting_year}`}
>
{state.popupDetails.properties.nFacilities || 0}{' '}
Facilities
</Link>
</p>
</div>
<div className="column column-12">
<p>
<Link
as="a"
className={
!state.popupDetails.properties.nInstallations
? 'disabled-link'
: ''
}
onClick={setSiteQueryParams}
to={`/industrial-site/regulatory-information/site-overview/?siteInspireId=${state.popupDetails.properties.InspireSiteId}&siteName=${state.popupDetails.properties.siteName}&siteReportingYear=${state.popupDetails.properties.Site_reporting_year}`}
>
{state.popupDetails.properties.nInstallations || 0}{' '}
Installations
</Link>
</p>
</div>
<div className="column column-12">
<p>Large combustion plants</p>
{state.popupDetails.properties.nFacilities ||
state.popupDetails.properties.nInstallations ||
state.popupDetails.properties.nLCP ? (
<div className="row mb-1-super mt-0-super">
<div className="column column-12">
<Header as="h3">Site contents</Header>
</div>
{state.popupDetails.properties.nFacilities ? (
<div className="column column-12">
<p>
<Link
as="a"
className={
!state.popupDetails.properties.nFacilities
? 'disabled-link'
: ''
}
onClick={setSiteQueryParams}
to={`/industrial-site/pollutant-releases-and-transfers/site-overview/?siteInspireId=${state.popupDetails.properties.InspireSiteId}&siteName=${state.popupDetails.properties.siteName}&siteReportingYear=${state.popupDetails.properties.Site_reporting_year}`}
>
{state.popupDetails.properties.nFacilities}
Facilit
{state.popupDetails.properties.nFacilities > 1
? 'ies'
: 'y'}
</Link>
</p>
</div>
) : (
''
)}
{state.popupDetails.properties.nInstallations ? (
<div className="column column-12">
<p>
<Link
as="a"
className={
!state.popupDetails.properties.nInstallations
? 'disabled-link'
: ''
}
onClick={setSiteQueryParams}
to={`/industrial-site/regulatory-information/site-overview/?siteInspireId=${state.popupDetails.properties.InspireSiteId}&siteName=${state.popupDetails.properties.siteName}&siteReportingYear=${state.popupDetails.properties.Site_reporting_year}`}
>
{state.popupDetails.properties.nInstallations}
Installation
{state.popupDetails.properties.nInstallations > 1
? 's'
: ''}
</Link>
</p>
</div>
) : (
''
)}
{state.popupDetails.properties.nLCP ? (
<div className="column column-12">
<p>
{state.popupDetails.properties.nLCP}
Large combustion plant
{state.popupDetails.properties.nLCP > 1 ? 's' : ''}
</p>
</div>
) : (
''
)}
</div>
</div>
) : (
''
)}

{/* SITE POLLUTANT EMISSIONS */}
<div className="row mb-1-super mt-0-super">
<div className="column column-12">
<Header as="h3">Pollutant emissions</Header>
</div>
<div className="column column-12 description">
{state.popupDetails.properties.pollutants ? (
<p>
{state.popupDetails.properties.pollutants}
{/* {state.popupDetails.properties.pollutants.substring(
0,
256,
)}
{state.popupDetails.properties.pollutants.length > 256
? '...'
: ''} */}
</p>
<p>{state.popupDetails.properties.pollutants}</p>
) : (
<p>There are no data regarding the pollutants</p>
)}
Expand Down