Merge pull request #19 from marcoancona/master

update zones and zones-compiled
mifi · Dec 8, 2020 · cb683b8 · cb683b8
2 parents a0fb858 + 534e1e4
commit cb683b8
Show file tree

Hide file tree

Showing 4 changed files with 1,509 additions and 448 deletions.
diff --git a/compile-zones.js b/compile-zones.js
@@ -9,13 +9,13 @@ const zones = JSON.parse(zonesJson);
 
 const out = {};
 Object.keys(zones.zones).forEach((z) => {
-  out[z] = zones.zones[z].ics;
+  out[z] = zones.zones[z].ics.join('\r\n');
 });
 
 Object.keys(zones.aliases).forEach((z) => {
   const aliasTo = zones.aliases[z].aliasTo;
   if (zones.zones[aliasTo]) {
-    out[z] = zones.zones[aliasTo].ics;
+    out[z] = zones.zones[aliasTo].ics.join('\r\n');
   } else {
     console.warn(`${aliasTo} (${z}) not found, skipping`);
   }

diff --git a/index.js b/index.js
@@ -131,7 +131,8 @@ class IcalExpander {
 function registerTimezones() {
   Object.keys(timezones).forEach((key) => {
     const icsData = timezones[key];
-    const parsed = ICAL.parse(`BEGIN:VCALENDAR\nPRODID:-//tzurl.org//NONSGML Olson 2012h//EN\nVERSION:2.0\n${icsData}\nEND:VCALENDAR`);
+    const icsTimezone = `BEGIN:VTIMEZONE\r\nTZID:${key}\r\n${icsData}\r\nEND:VTIMEZONE`;
+    const parsed = ICAL.parse(`BEGIN:VCALENDAR\nPRODID:-//tzurl.org//NONSGML Olson 2012h//EN\nVERSION:2.0\n${icsTimezone}\nEND:VCALENDAR`);
     const comp = new ICAL.Component(parsed);
     const vtimezone = comp.getFirstSubcomponent('vtimezone');
 

diff --git a/zones-compiled.json b/zones-compiled.json