Skip to content

Commit

Permalink
Merge pull request #11 from Uni-of-Exeter/small-updates
Browse files Browse the repository at this point in the history 
Small updates
  • Loading branch information
@simonkirbysimonkirby
simonkirbysimonkirby authored Dec 10, 2024
2 parents 0711b2a + d768fec commit c1528cf
Show file tree
Hide file tree
Showing 4 changed files with 37 additions and 45 deletions.
29 changes: 17 additions & 12 deletions client/src/components/climateMap/ClimateMap.css
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,22 @@
.leaflet-container {
width: 100%;
height: 500px;
aspect-ratio: 1 / 1.1;
z-index: 0;
border: 2px solid #333;
overflow: hidden;
box-sizing: border-box;
margin: 0;
}

@media (min-width: 2000px) {
@media (min-width: 1300px) {
.leaflet-container {
height: 750px;
height: 80vh;
}
}

@media (min-width: 1300px) {
.map-selection {
height: 80vh;
}
}

Expand Down Expand Up @@ -53,17 +59,11 @@
margin-top: 1em;
margin-top: 0;
width: 10em;
height: 500px;
height: auto;
padding-bottom: 0;
}
}

@media (min-width: 2000px) {
.map-selection {
height: 750px;
}
}

.map-selection h2 {
font-size: 0.75em;
}
Expand All @@ -81,6 +81,11 @@
margin-right: 1em;
}

.map-selection button {
font-size: 75%;
/* Style the individual leaflet zoom buttons */
.leaflet-control-zoom a {
width: 60px !important;
height: 60px !important;
line-height: 50px !important;
text-align: center !important;
font-size: 4em !important;
}
10 changes: 5 additions & 5 deletions client/src/components/climateMap/ClimateMap.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const tileLayer = {
url: "https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png",
};

const center = [55, -5.2];
const center = [55.8, -3.2];
const highlightCol = "#ffd768ff";

function RegionsListener(props) {
Expand Down Expand Up @@ -152,7 +152,7 @@ class ClimateMap extends React.Component {
for (let r of this.state.regions) {
r.clearMe();
}
this.setState((prev) => ({
this.setState((prev) => ({
regions: [],
geojson_key: prev.geojson_key + 1,
}));
Expand Down Expand Up @@ -191,8 +191,9 @@ class ClimateMap extends React.Component {
<div>
<h1>Select your area</h1>
<p>
To begin, select the area/s you are interested in by clicking on the map. The map units can be
changed and are currently displaying&nbsp;
To begin, select the area/s you are interested in by clicking on the map. Climate data for your
chosen area/s will appear below. The map units can be changed to explore the UK and the Isle of
Man at via the following dropdown:{" "}
<select
onChange={(e) => {
this.setState(() => ({
Expand All @@ -212,7 +213,6 @@ class ClimateMap extends React.Component {
<option value="boundary_ni_dz">Data Zones (Northern Ireland)</option>
<option value="boundary_iom">Isle of Man</option>
</select>
&nbsp;Data for your chosen area/s will appear below.
{/*The Index of Multiple Deprivation score
<select onChange={(e) => { this.setState(() => ({
Expand Down
27 changes: 7 additions & 20 deletions client/src/components/header/Introduction.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ function Introduction() {
target="_blank"
rel="noreferrer"
>
Introduction to Local Climate Adaptation.
Introduction to Local Climate Adaptation
</a>
</li>
<li>
Expand All @@ -61,28 +61,15 @@ function Introduction() {
target="_blank"
rel="noreferrer"
>
LCAT User Guide.
LCAT User Guide
</a>
</li>
<li>
<a href="https://climatedataportal.metoffice.gov.uk/pages/lacs" target="_blank" rel="noreferrer">
Met Office Local Authority Climate Service
</a>
</li>
</ul>

<p>
<strong className="text-emphasis">Data disclaimer:</strong>
</p>

<p>
Please be aware that climate predictions for the regions of Northern Ireland and the Isles of Scilly are
not bias corrected. This is due to limitations of the underlying climate datasets used in LCAT. For further information
on bias correction, please see {" "}
<a
href="https://www.metoffice.gov.uk/binaries/content/assets/metofficegovuk/pdf/research/ukcp/ukcp18-guidance---how-to-bias-correct.pdf"
target="_blank"
rel="noreferrer"
>
this article
</a>
{" "} by the Met Office.
</p>
</div>
);
}
Expand Down
16 changes: 8 additions & 8 deletions client/src/components/vulnerabilities/PersonalSocialVulnerabilitiesData.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ export const vulnerabilityData = [
<ul>
<li>
Climate Just's mapping tool:{" "}
<a href="https://www.climatejust.org.uk/map" target="_blank" rel="noreferrer">
<a href="https://www.climatejust.org.uk/map.html" target="_blank" rel="noreferrer">
Mapping tool page | Climate Just
</a>
</li>
Expand Down Expand Up @@ -134,7 +134,7 @@ export const vulnerabilityData = [
<ul>
<li>
Climate Just's mapping tool:{" "}
<a href="https://www.climatejust.org.uk/map" target="_blank" rel="noreferrer">
<a href="https://www.climatejust.org.uk/map.html" target="_blank" rel="noreferrer">
Mapping tool page | Climate Just
</a>
</li>
Expand Down Expand Up @@ -198,7 +198,7 @@ export const vulnerabilityData = [
<ul>
<li>
Climate Just's mapping tool:{" "}
<a href="https://www.climatejust.org.uk/map" target="_blank" rel="noreferrer">
<a href="https://www.climatejust.org.uk/map.html" target="_blank" rel="noreferrer">
Mapping tool page | Climate Just
</a>
</li>
Expand Down Expand Up @@ -262,7 +262,7 @@ export const vulnerabilityData = [
<ul>
<li>
Climate Just's mapping tool:{" "}
<a href="https://www.climatejust.org.uk/map" target="_blank" rel="noreferrer">
<a href="https://www.climatejust.org.uk/map.html" target="_blank" rel="noreferrer">
Mapping tool page | Climate Just
</a>
</li>
Expand Down Expand Up @@ -332,7 +332,7 @@ export const vulnerabilityData = [
<ul>
<li>
Climate Just's mapping tool:{" "}
<a href="https://www.climatejust.org.uk/map" target="_blank" rel="noreferrer">
<a href="https://www.climatejust.org.uk/map.html" target="_blank" rel="noreferrer">
Mapping tool page | Climate Just
</a>
</li>
Expand Down Expand Up @@ -393,7 +393,7 @@ export const vulnerabilityData = [
<li>
Climate Just's mapping tool provides a range of data including length of residency & English
proficiency:{" "}
<a href="https://www.climatejust.org.uk/map" target="_blank" rel="noreferrer">
<a href="https://www.climatejust.org.uk/map.html" target="_blank" rel="noreferrer">
Mapping tool page | Climate Just
</a>
</li>
Expand Down Expand Up @@ -456,7 +456,7 @@ export const vulnerabilityData = [
<ul>
<li>
Climate Just's mapping tool:{" "}
<a href="https://www.climatejust.org.uk/map" target="_blank" rel="noreferrer">
<a href="https://www.climatejust.org.uk/map.html" target="_blank" rel="noreferrer">
Mapping tool page | Climate Just
</a>
</li>
Expand Down Expand Up @@ -538,7 +538,7 @@ export const vulnerabilityData = [
<ul>
<li>
Climate Just's mapping tool:{" "}
<a href="https://www.climatejust.org.uk/map" target="_blank" rel="noreferrer">
<a href="https://www.climatejust.org.uk/map.html" target="_blank" rel="noreferrer">
Mapping tool page | Climate Just
</a>
</li>
Expand Down

0 comments on commit c1528cf

Please sign in to comment.