+
+
+
+
diff --git a/scripts/javascript.js b/scripts/javascript.js
index 0595df1..c669672 100644
--- a/scripts/javascript.js
+++ b/scripts/javascript.js
@@ -42,7 +42,8 @@ function geoLocation() {
var celsius = Math.round((temp - 32) * (5 / 9));
var tempFeel = data.currently.apparentTemperature;
var tempFeelCelsius = Math.round((tempFeel - 32) * (5 / 9));
- var forecast = data.daily.summary;
+ var extForecast = data.daily.summary;
+ var precipChance = (data.currently.precipProbability * 100) + "%";
if (data.hasOwnProperty("alerts")) {
var severe = data.alerts;
@@ -52,11 +53,14 @@ function geoLocation() {
}
+
+
window.temp = temp;
window.description = description;
window.celsius = celsius;
window.tempFeel = tempFeel;
window.tempFeelCelsius = tempFeelCelsius;
+ window.precipChance = precipChance;
console.log(data);
@@ -64,13 +68,17 @@ function geoLocation() {
var current = document.getElementById(conditions);
var dataPoints = document.getElementById(variables);
- conditions.innerHTML = "
It is currently " + Math.round(temp) + " °F" + " and " + description;
+ conditions.innerHTML = "
It feels like it is " + Math.round(tempFeel) + " °F.";
}
+ var extendedSummary = document.getElementById(extended);
+
+ extended.innerHTML = "
Your extended forecast summary is: \"" + extForecast + "\"";
+
var hourly = document.getElementById(twentyfour);
@@ -84,37 +92,55 @@ function geoLocation() {
switch (icon) {
case 'clear-night':
+ weathercon.innerHTML = '';
+ break;
+
case 'clear-day':
- weathercon.innerHTML = '
';
break;
case 'rain':
- weathercon.innerHTML = '
';
break;
case 'thunderstorm':
+ weathercon.innerHTML = '
';
+ break;
+
case 'hail':
- weathercon.innerHTML = '
';
+ weathercon.innerHTML = '
';
break;
case 'cloudy':
+ weathercon.innerHTML = '
';
+ break;
+
case 'fog':
+ weathercon.innerHTML = '
';
+ break;
+
case 'windy':
- weathercon.innerHTML = '
';
+ weathercon.innerHTML = '
';
break;
case 'snow':
+ weathercon.innerHTML = '
';
+ break;
+
case 'sleet':
- weathercon.innerHTML = '
';
+ weathercon.innerHTML = '
';
break;
case 'partly-cloudy-day':
+ weathercon.innerHTML = '
';
+ break;
+
case 'partly-cloudy-night':
- weathercon.innerHTML = '
';
+ weathercon.innerHTML = '
';
break;
case 'tornado':
- weathercon.innerHTML = '
';
+ weathercon.innerHTML = '
';
break;
@@ -136,26 +162,30 @@ function geoLocation() {
+
// Code to return the celsius converstion
function convertC() {
- conditions.innerHTML = "
It is currently " + Math.round(celsius) + " °C" + " and " + description;
- if (temp != tempFeel) {
+ conditions.innerHTML = "
It is currently " + Math.round(celsius) + " °C and " + description + "
Chance of precipitation is " + precipChance;
+
+ if (temp !== tempFeel) {
variables.innerHTML = "
It feels like it is " + Math.round(tempFeelCelsius) + " °C.";
- }
+ }
}
function convertF() {
conditions.innerHTML = "
It is currently " + Math.round(temp) + " °F" + " and " + description;
- if (temp != tempFeel) {
+ conditions.innerHTML = "
It is currently " + Math.round(temp) + " °F and " + description + "
Chance of precipitation is " + precipChance;
+
+ if (temp !== tempFeel) {
variables.innerHTML = "
It feels like it is " + Math.round(tempFeel) + " °F.";
- }
+ }
}
}
\ No newline at end of file