Skip to content

Commit 3e91705

Browse files
vbguynyvbguyny
committed
v1.71 - Fixed 401 error to api.weather.com
1 parent 63800c3 commit 3e91705

3 files changed

Lines changed: 29 additions & 26 deletions

File tree

‎Scripts/twc3.js‎

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ var _DayLongNames = { 'Sun': 'Sunday', 'Mon': 'Monday', 'Tue': 'Tuesday', 'Wed':
1111
var _MonthShortNames = { 'January': 'Jan', 'February': 'Feb', 'March': 'Mar', 'April': 'Apr', 'May': 'May', 'June': 'Jun', 'July': 'Jul', 'August': 'Aug', 'September': 'Sep', 'October': 'Oct', 'November': 'Nov', 'December': 'Dec' };
1212
var _MonthLongNames = { 'Jan': 'January', 'Feb': 'February', 'Mar': 'March', 'Apr': 'April', 'May': 'May', 'Jun': 'June', 'Jul': 'July', 'Aug': 'August', 'Sep': 'September', 'Oct': 'October', 'Nov': 'November', 'Dec': 'December' };
1313

14+
//var _WEATHER_API_KEY = "6532d6454b8aa370768e63d6ba5a832e";
15+
var _WEATHER_API_KEY = "21d8a80b3d6b444998a80b3d6b1449d3";
16+
1417
var canvasProgress;
1518
var divProgress;
1619

@@ -583,8 +586,8 @@ var GetMonthPrecipitation = function (WeatherParameters) {
583586
var FirstOfMonth = new Date(Now.getFullYear(), Now.getMonth(), 1);
584587
var LastOfMonth = new Date(Now.getFullYear(), Now.getMonth() + 1, 1).addDays(-1);
585588

586-
//https://api.weather.com/v3/location/near?apiKey=6532d6454b8aa370768e63d6ba5a832e&geocode=40.83%2C-73.02&product=airport&subproduct=major&format=json
587-
var Url = "https://api.weather.com/v3/location/near?apiKey=6532d6454b8aa370768e63d6ba5a832e&geocode=";
589+
//https://api.weather.com/v3/location/near?apiKey=" + _WEATHER_API_KEY + "&geocode=40.83%2C-73.02&product=airport&subproduct=major&format=json
590+
var Url = "https://api.weather.com/v3/location/near?apiKey=" + _WEATHER_API_KEY + "&geocode=";
588591
Url += WeatherParameters.Latitude.toString() + "%2C";
589592
Url += WeatherParameters.Longitude.toString();
590593
Url += "&product=airport&subproduct=major&format=json";
@@ -627,9 +630,9 @@ var GetMonthPrecipitation = function (WeatherParameters) {
627630
return;
628631
}
629632

630-
//https://api.weather.com/v2/astro?apiKey=6532d6454b8aa370768e63d6ba5a832e&geocode=40.81999969%2C-73&days=1&date=20181223&format=json
631-
//This also has the moon and sun data: https://api.weather.com/v3/wx/forecast/daily/3day?language=en-US&apiKey=6532d6454b8aa370768e63d6ba5a832e&geocode=40.83%2C-73.02&units=e&format=json
632-
var Url = "https://api.weather.com/v2/astro?apiKey=6532d6454b8aa370768e63d6ba5a832e&geocode=";
633+
//https://api.weather.com/v2/astro?apiKey=" + _WEATHER_API_KEY + "&geocode=40.81999969%2C-73&days=1&date=20181223&format=json
634+
//This also has the moon and sun data: https://api.weather.com/v3/wx/forecast/daily/3day?language=en-US&apiKey=" + _WEATHER_API_KEY + "&geocode=40.83%2C-73.02&units=e&format=json
635+
var Url = "https://api.weather.com/v2/astro?apiKey=" + _WEATHER_API_KEY + "&geocode=";
633636
Url += WeatherParameters.Latitude.toString() + "%2C";
634637
Url += WeatherParameters.Longitude.toString();
635638
Url += "&days=1&date=" + Now.getFullYear().pad() + (Now.getMonth() + 1).pad(2) + Now.getDate().pad(2) + "&format=json";
@@ -650,8 +653,8 @@ var GetMonthPrecipitation = function (WeatherParameters) {
650653

651654
var Now = new Date();
652655
Now = Now.addDays(1);
653-
//https://api.weather.com/v2/astro?apiKey=6532d6454b8aa370768e63d6ba5a832e&geocode=40.81999969%2C-73&days=1&date=20181223&format=json
654-
var Url = "https://api.weather.com/v2/astro?apiKey=6532d6454b8aa370768e63d6ba5a832e&geocode=";
656+
//https://api.weather.com/v2/astro?apiKey=" + _WEATHER_API_KEY + "&geocode=40.81999969%2C-73&days=1&date=20181223&format=json
657+
var Url = "https://api.weather.com/v2/astro?apiKey=" + _WEATHER_API_KEY + "&geocode=";
655658
Url += WeatherParameters.Latitude.toString() + "%2C";
656659
Url += WeatherParameters.Longitude.toString();
657660
Url += "&days=1&date=" + Now.getFullYear().pad() + (Now.getMonth() + 1).pad(2) + Now.getDate().pad(2) + "&format=json";
@@ -723,9 +726,9 @@ var GetMonthPrecipitation = function (WeatherParameters) {
723726
// return;
724727
// }
725728

726-
// //https://api.weather.com/v2/astro?apiKey=6532d6454b8aa370768e63d6ba5a832e&geocode=40.81999969%2C-73&days=1&date=20181223&format=json
727-
// //This also has the moon and sun data: https://api.weather.com/v3/wx/forecast/daily/3day?language=en-US&apiKey=6532d6454b8aa370768e63d6ba5a832e&geocode=40.83%2C-73.02&units=e&format=json
728-
// var Url = "https://api.weather.com/v2/astro?apiKey=6532d6454b8aa370768e63d6ba5a832e&geocode=";
729+
// //https://api.weather.com/v2/astro?apiKey=" + _WEATHER_API_KEY + "&geocode=40.81999969%2C-73&days=1&date=20181223&format=json
730+
// //This also has the moon and sun data: https://api.weather.com/v3/wx/forecast/daily/3day?language=en-US&apiKey=" + _WEATHER_API_KEY + "&geocode=40.83%2C-73.02&units=e&format=json
731+
// var Url = "https://api.weather.com/v2/astro?apiKey=" + _WEATHER_API_KEY + "&geocode=";
729732
// Url += WeatherParameters.Latitude.toString() + "%2C";
730733
// Url += WeatherParameters.Longitude.toString();
731734
// Url += "&days=1&date=" + Now.getFullYear().pad() + (Now.getMonth() + 1).pad(2) + Now.getDate().pad(2) + "&format=json";
@@ -746,8 +749,8 @@ var GetMonthPrecipitation = function (WeatherParameters) {
746749

747750
// var Now = new Date();
748751
// Now = Now.addDays(1);
749-
// //https://api.weather.com/v2/astro?apiKey=6532d6454b8aa370768e63d6ba5a832e&geocode=40.81999969%2C-73&days=1&date=20181223&format=json
750-
// var Url = "https://api.weather.com/v2/astro?apiKey=6532d6454b8aa370768e63d6ba5a832e&geocode=";
752+
// //https://api.weather.com/v2/astro?apiKey=" + _WEATHER_API_KEY + "&geocode=40.81999969%2C-73&days=1&date=20181223&format=json
753+
// var Url = "https://api.weather.com/v2/astro?apiKey=" + _WEATHER_API_KEY + "&geocode=";
751754
// Url += WeatherParameters.Latitude.toString() + "%2C";
752755
// Url += WeatherParameters.Longitude.toString();
753756
// Url += "&days=1&date=" + Now.getFullYear().pad() + (Now.getMonth() + 1).pad(2) + Now.getDate().pad(2) + "&format=json";
@@ -12487,7 +12490,7 @@ var Progress = function (e)
1248712490
////DrawText(context, "Star4000 Large", "16pt", "#ffff00", 170, 80, "Conditions", 3);
1248812491
//DrawText(context, "Star4000 Large", "16pt", "#ffff00", 170, 55, "WeatherStar", 3);
1248912492
//DrawText(context, "Star4000 Large", "16pt", "#ffff00", 170, 80, "4000+", 3);
12490-
DrawTitleText(context, "WeatherStar", "4000+ 1.70");
12493+
DrawTitleText(context, "WeatherStar", "4000+ 1.71");
1249112494

1249212495
// Draw a box for the progress.
1249312496
//context.fillStyle = "#000000";

‎index.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,17 @@
2727
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
2828
<meta name="theme-color" content="#ffffff">
2929

30-
<link rel="manifest" href="manifest.json?v=70" />
30+
<link rel="manifest" href="manifest.json?v=71" />
3131
<link rel="icon" href="images/logo192.png" />
32-
<link rel="stylesheet" type="text/css" href="Styles/index.css?v=70" />
32+
<link rel="stylesheet" type="text/css" href="Styles/index.css?v=71" />
3333

3434
<script type="text/javascript" src="Scripts/jquery-3.1.0.min.js"></script>
3535
<script type="text/javascript" src="Scripts/jquery.autocomplete.min.js"></script>
3636
<script type="text/javascript" src="Scripts/NoSleep.min.js"></script>
3737
<script type="text/javascript" src="Scripts/jquery.touchSwipe.min.js"></script>
38-
<script type="text/javascript" src="Scripts/Timer.js?v=70"></script>
39-
<script type="text/javascript" src="Scripts/index.js?v=70"></script>
40-
<script type="text/javascript" src="Scripts/States.js?v=70"></script>
38+
<script type="text/javascript" src="Scripts/Timer.js?v=71"></script>
39+
<script type="text/javascript" src="Scripts/index.js?v=71"></script>
40+
<script type="text/javascript" src="Scripts/States.js?v=71"></script>
4141

4242
<!-- Place this tag in your head or just before your close body tag. -->
4343
<script async defer src="https://buttons.github.io/buttons.js"></script>

‎twc3.html‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@
33
<html lang="en" xmlns="http://www.w3.org/1999/xhtml">
44
<head>
55
<meta charset="utf-8" />
6-
<link rel="stylesheet" type="text/css" href="Styles/twc3.css?v=70">
6+
<link rel="stylesheet" type="text/css" href="Styles/twc3.css?v=71">
77
<script type="text/javascript" src="Scripts/jquery-3.1.0.min.js"></script>
8-
<script type="text/javascript" src="Scripts/libgif.js?v=70"></script>
9-
<script type="text/javascript" src="Scripts/TravelCities.js?v=70"></script>
10-
<script type="text/javascript" src="Scripts/RegionalCities.js?v=70"></script>
11-
<script type="text/javascript" src="Scripts/Icons.js?v=70"></script>
12-
<script type="text/javascript" src="Scripts/stations.js?v=70"></script>
8+
<script type="text/javascript" src="Scripts/libgif.js?v=71"></script>
9+
<script type="text/javascript" src="Scripts/TravelCities.js?v=71"></script>
10+
<script type="text/javascript" src="Scripts/RegionalCities.js?v=71"></script>
11+
<script type="text/javascript" src="Scripts/Icons.js?v=71"></script>
12+
<script type="text/javascript" src="Scripts/stations.js?v=71"></script>
1313
<script type="text/javascript" src="Scripts/jeoquery.js"></script>
14-
<script type="text/javascript" src="Scripts/Timer.js?v=70"></script>
14+
<script type="text/javascript" src="Scripts/Timer.js?v=71"></script>
1515
<script type="text/javascript" src="Scripts/metars.js"></script>
1616
<!--<script type="text/javascript" src="Scripts/timemachine.min.js"></script>-->
17-
<script type="text/javascript" src="Scripts/twc3.js?v=70"></script>
17+
<script type="text/javascript" src="Scripts/twc3.js?v=71"></script>
1818
</head>
1919
<body>
2020

0 commit comments

Comments
 (0)