From 99b0002a6f5c7395fdbfda05657b2169e6d663b7 Mon Sep 17 00:00:00 2001
From: Nils Hettich <4287298+nilshettich@users.noreply.github.com>
Date: Wed, 25 Nov 2020 13:42:17 +0100
Subject: [PATCH 1/2] Show number of LCPs in popup, or nothing if no LCPs

---
 .../manage/Blocks/DiscodataOpenlayersMapBlock/View.jsx     | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/components/manage/Blocks/DiscodataOpenlayersMapBlock/View.jsx b/src/components/manage/Blocks/DiscodataOpenlayersMapBlock/View.jsx
index cafc02a..f0c2562 100644
--- a/src/components/manage/Blocks/DiscodataOpenlayersMapBlock/View.jsx
+++ b/src/components/manage/Blocks/DiscodataOpenlayersMapBlock/View.jsx
@@ -1282,7 +1282,12 @@ const OpenlayersMapView = (props) => {
                     </p>
                   </div>
                   <div className="column  column-12">
-                    <p>Large combustion plants</p>
+                    <p>
+                     {state.popupDetails.properties.nLCP   
+                      ? ' Large combustion plants'
+                      : '' } 
+                    </p>
+
                   </div>
                 </div>
                 {/* SITE POLLUTANT EMISSIONS */}

From e3196a1fd16499b68cc7ec101752d88a133a6221 Mon Sep 17 00:00:00 2001
From: Miu Razvan <miu.razvan28@gmail.com>
Date: Thu, 26 Nov 2020 10:55:51 +0200
Subject: [PATCH 2/2] Updated popup 'Site contents' labels

---
 .../DiscodataOpenlayersMapBlock/View.jsx      | 125 ++++++++++--------
 1 file changed, 70 insertions(+), 55 deletions(-)

diff --git a/src/components/manage/Blocks/DiscodataOpenlayersMapBlock/View.jsx b/src/components/manage/Blocks/DiscodataOpenlayersMapBlock/View.jsx
index f0c2562..2740380 100644
--- a/src/components/manage/Blocks/DiscodataOpenlayersMapBlock/View.jsx
+++ b/src/components/manage/Blocks/DiscodataOpenlayersMapBlock/View.jsx
@@ -1243,53 +1243,77 @@ 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>
+                {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 className="column  column-12">
-                    <p>
-                     {state.popupDetails.properties.nLCP   
-                      ? ' Large combustion plants'
-                      : '' } 
-                    </p>
+                ) : (
+                  ''
+                )}
 
-                  </div>
-                </div>
                 {/* SITE POLLUTANT EMISSIONS */}
                 <div className="row mb-1-super mt-0-super">
                   <div className="column  column-12">
@@ -1297,16 +1321,7 @@ const OpenlayersMapView = (props) => {
                   </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>
                     )}