From cd7e918690b14b0325d5b5d04f90379f5d7e495d Mon Sep 17 00:00:00 2001
From: Paul <paul@derbyshire.nl>
Date: Sun, 3 Nov 2019 11:05:49 +0100
Subject: [PATCH] timezone improvements

---
 src/MyESP.cpp               |  2 +-
 src/Ntp.cpp                 |  6 ++++++
 src/websrc/index.html       |  2 +-
 src/websrc/myesp.htm        | 22 ++++++++++------------
 src/websrc/myesp.js         |  2 --
 tools/wsemulator/wserver.js |  2 +-
 6 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/src/MyESP.cpp b/src/MyESP.cpp
index 1d5392360..81897c5a7 100644
--- a/src/MyESP.cpp
+++ b/src/MyESP.cpp
@@ -2467,7 +2467,7 @@ void MyESP::_onWsEvent(AsyncWebSocket * server, AsyncWebSocketClient * client, A
 // handle ws from browser
 void MyESP::_procMsg(AsyncWebSocketClient * client, size_t sz) {
     // We should always get a JSON object from browser, so parse it
-    StaticJsonDocument<400> doc;
+    StaticJsonDocument<500> doc;
     char                    json[sz + 1];
     memcpy(json, (char *)(client->_tempObject), sz);
     json[sz] = '\0';
diff --git a/src/Ntp.cpp b/src/Ntp.cpp
index 5b294ee40..156184972 100644
--- a/src/Ntp.cpp
+++ b/src/Ntp.cpp
@@ -13,6 +13,12 @@ IPAddress        NtpClient::timeServer;
 AsyncUDP         NtpClient::udpListener;
 byte             NtpClient::NTPpacket[NTP_PACKET_SIZE];
 
+// references:
+// https://github.com/filipdanic/compact-timezone-list/blob/master/index.js
+// https://github.com/sanohin/google-timezones-json/blob/master/timezones.json
+// https://github.com/dmfilipenko/timezones.json/blob/master/timezones.json
+// https://home.kpn.nl/vanadovv/time/TZworld.html
+
 // Australia Eastern Time Zone (Sydney, Melbourne)
 TimeChangeRule aEDT = {"AEDT", First, Sun, Oct, 2, 660}; // UTC + 11 hours
 TimeChangeRule aEST = {"AEST", First, Sun, Apr, 3, 600}; // UTC + 10 hours
diff --git a/src/websrc/index.html b/src/websrc/index.html
index 074fec01c..0bd7ac770 100644
--- a/src/websrc/index.html
+++ b/src/websrc/index.html
@@ -212,7 +212,7 @@
                                 </div>
                             </div>
                             <div style="clear:both;">
-                                <br>
+                              <br>
                             </div>
                             <div>
                                 <div class="form-group">
diff --git a/src/websrc/myesp.htm b/src/websrc/myesp.htm
index 81ffcd160..963e79ce6 100644
--- a/src/websrc/myesp.htm
+++ b/src/websrc/myesp.htm
@@ -338,22 +338,21 @@
 <div id="ntpcontent">
     <br>
     <legend>Time Settings</legend>
-    <h6 class="text-muted">With Network Time Protocol (NTP) enabled, all times are adjusted to the local timezone
-        and
-        respect daylight saving
-        time (DST)</h6>
+    <h6 class="text-muted">With Network Time Protocol (NTP) enabled, all times are adjusted to the local timezone and
+        respect daylight saving time (DST)</h6>
     <br>
     <div class="row form-group">
         <label class="col-xs-3">Device Time</label>
-        <span id="utc" class="col-xs-9 col-md-5">
-        </span>
+        <span id="utc" class="col-xs-9 col-md-5"></span>
+        <div class="col-xs-3">
+            <button onclick="forcentp()" id="forcentp" class="btn btn-info btn-sm">Sync Device with Internet
+                Time</button>
+        </div>
     </div>
+
     <div class="row form-group">
         <label class="col-xs-3">Browser Time</label>
-        <span id="rtc" class="col-xs-9 col-md-5">
-        </span>
-    </div>
-    <div class="row form-group">
+        <span id="rtc" class="col-xs-9 col-md-5"></span>
         <div class="col-xs-3">
             <button onclick="syncBrowserTime()" class="btn btn-info btn-sm">Sync Browser Time to Device</button><i
                 style="margin-left: 10px;" class="glyphicon glyphicon-info-sign" aria-hidden="true"
@@ -361,6 +360,7 @@
                 data-content="Use your browser time. Useful when the system does not have an internet connection."></i>
         </div>
     </div>
+
     <div class="row form-group">
         <label class="col-xs-3">NTP<i style="margin-left: 10px;" class="glyphicon glyphicon-info-sign"
                 aria-hidden="true" data-toggle="popover" data-trigger="hover" data-placement="right"
@@ -372,8 +372,6 @@
                 <label class="radio-inline">
                     <input type="radio" value="0" onclick="handleNTPOFF();" name="ntpenabled" checked>Disabled</label>
             </form>
-            <button onclick="forcentp()" id="forcentp" class="btn btn-info btn-sm">Sync Device with Internet
-                Time</button>
         </div>
     </div>
     <div class="row form-group">
diff --git a/src/websrc/myesp.js b/src/websrc/myesp.js
index 9379ee7b0..d46061e6d 100644
--- a/src/websrc/myesp.js
+++ b/src/websrc/myesp.js
@@ -715,8 +715,6 @@ function initMQTTLogTable() {
                     if (value < 1563300000) {
                         return "(" + value + ")";
                     } else {
-                        var comp = new Date();
-                        value = Math.floor(value + ((comp.getTimezoneOffset() * 60) * -1));
                         var vuepoch = new Date(value * 1000);
                         var formatted = vuepoch.getUTCFullYear() +
                             "-" + twoDigits(vuepoch.getUTCMonth() + 1) +
diff --git a/tools/wsemulator/wserver.js b/tools/wsemulator/wserver.js
index da9a4ad54..d4f9976cb 100644
--- a/tools/wsemulator/wserver.js
+++ b/tools/wsemulator/wserver.js
@@ -89,7 +89,7 @@ var configfile = {
         "server": "pool.ntp.org",
         "interval": 60,
         "timezone": 2,
-        "enabled": false
+        "enabled": true
     }
 };