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

sitenames on map not displayed #41

Closed
wants to merge 1 commit into from
Closed

sitenames on map not displayed #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions src/components/LeafletMap/LeafletMap.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,12 @@ class LeafletMap extends React.Component {
}

try {
const station_latitude = siteMetadata["station_latitude"];
const station_longitude = siteMetadata["station_longitude"];
const latitude = siteMetadata["latitude"];
const longitude = siteMetadata["longitude"];

const locationStr = `${station_latitude}, ${station_longitude}`;
const location = [station_latitude, station_longitude];
const siteName = siteMetadata["station_long_name"];
const locationStr = `${latitude}, ${longitude}`;
const location = [latitude, longitude];
const siteName = siteMetadata["long_name"];

marker = (
<CircleMarker
Expand Down
2 changes: 1 addition & 1 deletion src/components/MultiSiteLineChart/MultiSiteLineChart.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ class MultiSiteLineChart extends React.Component {
// Set the name for the legend
let name = null;
try {
const siteName = metadata["station_long_name"];
const siteName = metadata["long_name"];
const inlet = metadata["inlet"];

name = `${toTitleCase(siteName)} - ${inlet}`;
Expand Down
12 changes: 6 additions & 6 deletions src/components/ScatterMap/ScatterMap.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ class ScatterMap extends React.Component {
const ch4Data = ch4MobileGlasgow["ch4"]["data"];

const measurements = ch4Data["z"];
const station_latitude = ch4Data["lat"];
const station_longitude = ch4Data["lon"];
const latitude = ch4Data["lat"];
const longitude = ch4Data["lon"];

const hovertemplate =
"<b>station_latitude</b>: %{lat:.5f}<br>" +
"<b>station_longitude</b>: %{lon:.5f}<br><br>" +
"<b>latitude</b>: %{lat:.5f}<br>" +
"<b>longitude</b>: %{lon:.5f}<br><br>" +
"<b>Concentration: </b>: %{text:.2f} ppb <br>" +
"(enhancement over background)" +
"<extra></extra>";
Expand All @@ -37,8 +37,8 @@ class ScatterMap extends React.Component {
coloraxis: "coloraxis",
hovertemplate: hovertemplate,
text: measurements,
lon: station_longitude,
lat: station_latitude,
lon: longitude,
lat: latitude,
marker: {
color: measurements,
colorscale: "Viridis",
Expand Down
6 changes: 3 additions & 3 deletions src/components/SliderMap/SliderMap.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ class SliderMap extends React.Component {

for (const [site, siteData] of Object.entries(sites)) {
const siteName = String(site).toUpperCase();
const lat = siteData["station_latitude"];
const long = siteData["station_longitude"];
const longName = siteData["station_long_name"];
const lat = siteData["latitude"];
const long = siteData["longitude"];
const longName = siteData["long_name"];
const locationStr = `${siteName}, ${lat}, ${long}`;

let marker;
Expand Down
2 changes: 1 addition & 1 deletion src/data/bsd_inlets.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/data/measurementData.json
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions src/data/networkInfo.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
{
"beaco2n": {
"url": "http://beacon.berkeley.edu/",
"station_long_name": "BEACO2N"
"long_name": "BEACO2N"
},
"aqmesh_glasgow": {
"url": "https://www.ch.cam.ac.uk/group/atm/",
"station_long_name": "AQMesh"
"long_name": "AQMesh"
},
"npl_picarro": {
"url": "https://www.npl.co.uk/emissions-atmospheric-metrology",
"station_long_name": "National Physical Laboratory"
"long_name": "National Physical Laboratory"
},
"cop26": {
"url": "https://www.bristol.ac.uk/chemistry/research/acrg/current/decc.html",
"station_long_name": "University of Bristol"
"long_name": "University of Bristol"
}
}
60 changes: 30 additions & 30 deletions src/data/siteMetadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,99 +3,99 @@
"bellahoustonacademy": {
"deployed": "2021-07-15",
"id": 175,
"station_latitude": 55.848,
"station_long_name": "Bellahouston Academy",
"station_longitude": -4.301,
"latitude": 55.848,
"long_name": "Bellahouston Academy",
"longitude": -4.301,
"magl": "NA",
"masl": "NA",
"node_folder_id": 932
},
"glasgows12002": {
"deployed": "2021-01-20",
"id": 157,
"station_latitude": 55.826,
"station_long_name": "GlasgowS12002",
"station_longitude": -4.226,
"latitude": 55.826,
"long_name": "GlasgowS12002",
"longitude": -4.226,
"magl": "NA",
"masl": "NA",
"node_folder_id": 872
},
"hillparksecondaryschool": {
"deployed": "2021-07-28",
"id": 174,
"station_latitude": 55.815,
"station_long_name": "Hillpark Secondary School",
"station_longitude": -4.299,
"latitude": 55.815,
"long_name": "Hillpark Secondary School",
"longitude": -4.299,
"magl": "NA",
"masl": "NA",
"node_folder_id": 931
},
"johnpaulacademy": {
"deployed": "2021-07-15",
"id": 179,
"station_latitude": 55.904,
"station_long_name": "John Paul Academy",
"station_longitude": -4.295,
"latitude": 55.904,
"long_name": "John Paul Academy",
"longitude": -4.295,
"magl": "NA",
"masl": "NA",
"node_folder_id": 936
},
"killearnstirlingshireglasgows22002": {
"deployed": "2020-03-26",
"id": 156,
"station_latitude": 56.043,
"station_long_name": "Killearn Stirlingshire GlasgowS22002",
"station_longitude": -4.381,
"latitude": 56.043,
"long_name": "Killearn Stirlingshire GlasgowS22002",
"longitude": -4.381,
"magl": "NA",
"masl": "NA",
"node_folder_id": 873
},
"knightswoodsecondary": {
"deployed": "2021-07-12",
"id": 193,
"station_latitude": 55.891,
"station_long_name": "Knightswood Secondary",
"station_longitude": -4.339,
"latitude": 55.891,
"long_name": "Knightswood Secondary",
"longitude": -4.339,
"magl": "NA",
"masl": "NA",
"node_folder_id": 913
},
"notredamehighschool": {
"deployed": "2021-07-12",
"id": 197,
"station_latitude": 55.878,
"station_long_name": "Notre Dame High School",
"station_longitude": -4.299,
"latitude": 55.878,
"long_name": "Notre Dame High School",
"longitude": -4.299,
"magl": "NA",
"masl": "NA",
"node_folder_id": 918
},
"stpaulshighschool": {
"deployed": "2021-07-28",
"id": 172,
"station_latitude": 55.824,
"station_long_name": "St Pauls High School",
"station_longitude": -4.338,
"latitude": 55.824,
"long_name": "St Pauls High School",
"longitude": -4.338,
"magl": "NA",
"masl": "NA",
"node_folder_id": 929
},
"stthomasaquinasrcsecondaryschool": {
"deployed": "2021-07-28",
"id": 178,
"station_latitude": 55.881,
"station_long_name": "St Thomas Aquinas R C Secondary School",
"station_longitude": -4.336,
"latitude": 55.881,
"long_name": "St Thomas Aquinas R C Secondary School",
"longitude": -4.336,
"magl": "NA",
"masl": "NA",
"node_folder_id": 935
},
"universityofstrathclyde": {
"deployed": "2021-01-01",
"id": 171,
"station_latitude": 55.861,
"station_long_name": "University of Strathclyde",
"station_longitude": -4.247,
"latitude": 55.861,
"long_name": "University of Strathclyde",
"longitude": -4.247,
"magl": "NA",
"masl": "NA",
"node_folder_id": 928
Expand Down
48 changes: 24 additions & 24 deletions src/mock/LGHGSitesRandomData.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"TMB": {
"station_long_name": "Thames Barrier",
"station_latitude": 51.497,
"station_longitude": 0.037,
"long_name": "Thames Barrier",
"latitude": 51.497,
"longitude": 0.037,
"measurements": {
"1609459200000": 20,
"1609718400000": 47,
Expand Down Expand Up @@ -37,9 +37,9 @@
}
},
"BTT": {
"station_long_name": "BT Tower",
"station_latitude": 51.5215,
"station_longitude": -0.1389,
"long_name": "BT Tower",
"latitude": 51.5215,
"longitude": -0.1389,
"measurements": {
"1609459200000": 56,
"1609718400000": 78,
Expand Down Expand Up @@ -74,9 +74,9 @@
}
},
"NPL": {
"station_long_name": "National Physical Laboratory",
"station_latitude": 51.4241,
"station_longitude": -0.3487,
"long_name": "National Physical Laboratory",
"latitude": 51.4241,
"longitude": -0.3487,
"measurements": {
"1609459200000": 61,
"1609718400000": 37,
Expand Down Expand Up @@ -111,9 +111,9 @@
}
},
"UOW": {
"station_long_name": "University of Westminster, Harrow Campus",
"station_latitude": 51.5776,
"station_longitude": -0.3251,
"long_name": "University of Westminster, Harrow Campus",
"latitude": 51.5776,
"longitude": -0.3251,
"measurements": {
"1609459200000": 30,
"1609718400000": 69,
Expand Down Expand Up @@ -148,9 +148,9 @@
}
},
"STJ": {
"station_long_name": "St Jude on the Hill",
"station_latitude": 51.5802,
"station_longitude": -0.1899,
"long_name": "St Jude on the Hill",
"latitude": 51.5802,
"longitude": -0.1899,
"measurements": {
"1609459200000": 31,
"1609718400000": 20,
Expand Down Expand Up @@ -185,9 +185,9 @@
}
},
"HFT": {
"station_long_name": "Highfield Tower",
"station_latitude": 51.608,
"station_longitude": 0.1745,
"long_name": "Highfield Tower",
"latitude": 51.608,
"longitude": 0.1745,
"measurements": {
"1609459200000": 53,
"1609718400000": 74,
Expand Down Expand Up @@ -222,9 +222,9 @@
}
},
"SMA": {
"station_long_name": "St Mary's",
"station_latitude": 51.5044,
"station_longitude": -0.3056,
"long_name": "St Mary's",
"latitude": 51.5044,
"longitude": -0.3056,
"measurements": {
"1609459200000": 74,
"1609718400000": 67,
Expand Down Expand Up @@ -259,9 +259,9 @@
}
},
"RHO": {
"station_long_name": "Royal Holloway",
"station_latitude": 51.427582,
"station_longitude": -0.56278,
"long_name": "Royal Holloway",
"latitude": 51.427582,
"longitude": -0.56278,
"measurements": {
"1609459200000": 32,
"1609718400000": 35,
Expand Down
4 changes: 2 additions & 2 deletions src/mock/randomSites.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ export function createSites() {

for (let i = 0; i < n_sites; i++) {
const location = {
station_latitude: getRandomLatitude(minLat, maxLat),
station_longitude: getRandomLongitude(minLong, maxLong),
latitude: getRandomLatitude(minLat, maxLat),
longitude: getRandomLongitude(minLong, maxLong),
};

let site_name = getSelection();
Expand Down