Merged @adgrace pull request #410

moment · Feb 21, 2020 · a09033a · a09033a
1 parent 6c2d379
commit a09033a
Show file tree

Hide file tree

Showing 522 changed files with 3,212 additions and 2,217 deletions.
diff --git a/builds/moment-timezone-with-data-10-year-range.js b/builds/moment-timezone-with-data-10-year-range.js
diff --git a/builds/moment-timezone-with-data-10-year-range.min.js b/builds/moment-timezone-with-data-10-year-range.min.js
diff --git a/builds/moment-timezone-with-data-1970-2030.js b/builds/moment-timezone-with-data-1970-2030.js
diff --git a/builds/moment-timezone-with-data-1970-2030.min.js b/builds/moment-timezone-with-data-1970-2030.min.js
diff --git a/builds/moment-timezone-with-data-2012-2022.js b/builds/moment-timezone-with-data-2012-2022.js
diff --git a/builds/moment-timezone-with-data-2012-2022.min.js b/builds/moment-timezone-with-data-2012-2022.min.js
diff --git a/builds/moment-timezone-with-data.js b/builds/moment-timezone-with-data.js
diff --git a/builds/moment-timezone-with-data.min.js b/builds/moment-timezone-with-data.min.js
diff --git a/data/packed/latest.json b/data/packed/latest.json
diff --git a/moment-timezone-utils.js b/moment-timezone-utils.js
@@ -122,11 +122,11 @@
 			return '';
 		}
 		if (number < 1000) {
-			return '|' + number;
+			return number;
 		}
 		var exponent = String(number | 0).length - 2;
 		var precision = Math.round(number / Math.pow(10, exponent));
-		return '|' + precision + 'e' + exponent;
+		return precision + 'e' + exponent;
 	}
 
 	function packCountries (countries) {
@@ -152,11 +152,11 @@
 	function pack (source) {
 		validatePackData(source);
 		return [
-			source.name,
-			packAbbrsAndOffsets(source),
-			packUntils(source.untils),
-			packPopulation(source.population),
-			packCountries(source.countries)
+			source.name, // 0 - timezone name
+			packAbbrsAndOffsets(source), // 1 - abbrs, 2 - offsets, 3 - indices
+			packUntils(source.untils), // 4 - untils
+			packPopulation(source.population), // 5 - population
+			packCountries(source.countries) // 6 - countries
 		].join('|');
 	}
 
@@ -237,8 +237,7 @@
 		return {
 			version 	: source.version,
 			zones   	: zones,
-			links   	: links.sort(),
-			countries 	: source.countries
+			links   	: links.sort()
 		};
 	}
 
@@ -290,7 +289,8 @@
 			abbrs      : slice.apply(source.abbrs, indices),
 			untils     : untils,
 			offsets    : slice.apply(source.offsets, indices),
-			population : source.population
+			population : source.population,
+			countries  : source.countries
 		};
 	}
 
@@ -311,14 +311,17 @@
 		output = createLinks({
 			zones : outputZones,
 			links : input.links.slice(),
-			version : input.version,
-			countries : []
+			version : input.version
 		}, groupLeaders);
 
 		for (i = 0; i < output.zones.length; i++) {
 			output.zones[i] = pack(output.zones[i]);
 		}
 
+		output.countries = input.countries.map(function (unpacked) {
+			return packCountry(unpacked);
+		});
+
 		return output;
 	}
 

diff --git a/moment-timezone.js b/moment-timezone.js
@@ -119,7 +119,7 @@
 			offsets = data[2].split(' '),
 			indices = data[3].split(''),
 			untils  = data[4].split(' '),
-			countries = data[7];
+			countries = data[6];
 
 		arrayToInt(offsets);
 		arrayToInt(indices);

diff --git a/tasks/data-pack.js b/tasks/data-pack.js
@@ -14,7 +14,7 @@ module.exports = function (grunt) {
 			return tz.pack(unpacked);
 		});
 
-		output.countries = output.countries.map(function (unpacked) {
+		output.countries = unpacked.countries.map(function (unpacked) {
 			return tz.packCountry(unpacked);
 		});
 

diff --git a/tests/zones/africa/abidjan.js b/tests/zones/africa/abidjan.js
@@ -4,9 +4,9 @@ var helpers = require("../../helpers/helpers");
 
 exports["Africa/Abidjan"] = {
 
-	"guess:by:offset" : helpers.makeTestGuess("Africa/Abidjan", { offset: true, expect: "Etc/UTC" }),
+	"guess:by:offset" : helpers.makeTestGuess("Africa/Abidjan", { offset: true }),
 
-	"guess:by:abbr" : helpers.makeTestGuess("Africa/Abidjan", { abbr: true, expect: "Etc/UTC" }),
+	"guess:by:abbr" : helpers.makeTestGuess("Africa/Abidjan", { abbr: true }),
 
 	"1912" : helpers.makeTestYear("Africa/Abidjan", [
 		["1912-01-01T00:16:07+00:00", "23:59:59", "LMT", 968 / 60],

diff --git a/tests/zones/africa/accra.js b/tests/zones/africa/accra.js
@@ -4,9 +4,9 @@ var helpers = require("../../helpers/helpers");
 
 exports["Africa/Accra"] = {
 
-	"guess:by:offset" : helpers.makeTestGuess("Africa/Accra", { offset: true, expect: "Etc/UTC" }),
+	"guess:by:offset" : helpers.makeTestGuess("Africa/Accra", { offset: true, expect: "Africa/Abidjan" }),
 
-	"guess:by:abbr" : helpers.makeTestGuess("Africa/Accra", { abbr: true, expect: "Etc/UTC" }),
+	"guess:by:abbr" : helpers.makeTestGuess("Africa/Accra", { abbr: true, expect: "Africa/Abidjan" }),
 
 	"1918" : helpers.makeTestYear("Africa/Accra", [
 		["1918-01-01T00:00:51+00:00", "23:59:59", "LMT", 52 / 60],

diff --git a/tests/zones/africa/addis_ababa.js b/tests/zones/africa/addis_ababa.js
@@ -4,7 +4,7 @@ var helpers = require("../../helpers/helpers");
 
 exports["Africa/Addis_Ababa"] = {
 
-	"guess:by:offset" : helpers.makeTestGuess("Africa/Addis_Ababa", { offset: true, expect: "Europe/Simferopol" }),
+	"guess:by:offset" : helpers.makeTestGuess("Africa/Addis_Ababa", { offset: true, expect: "Europe/Moscow" }),
 
 	"guess:by:abbr" : helpers.makeTestGuess("Africa/Addis_Ababa", { abbr: true, expect: "Africa/Nairobi" }),
 

diff --git a/tests/zones/africa/algiers.js b/tests/zones/africa/algiers.js
@@ -4,9 +4,9 @@ var helpers = require("../../helpers/helpers");
 
 exports["Africa/Algiers"] = {
 
-	"guess:by:offset" : helpers.makeTestGuess("Africa/Algiers", { offset: true, expect: "Etc/GMT-1" }),
+	"guess:by:offset" : helpers.makeTestGuess("Africa/Algiers", { offset: true, expect: "Africa/Lagos" }),
 
-	"guess:by:abbr" : helpers.makeTestGuess("Africa/Algiers", { abbr: true, expect: "Africa/Tunis" }),
+	"guess:by:abbr" : helpers.makeTestGuess("Africa/Algiers", { abbr: true }),
 
 	"1911" : helpers.makeTestYear("Africa/Algiers", [
 		["1911-03-10T23:50:38+00:00", "23:59:59", "PMT", -561 / 60],

diff --git a/tests/zones/africa/asmara.js b/tests/zones/africa/asmara.js
@@ -4,7 +4,7 @@ var helpers = require("../../helpers/helpers");
 
 exports["Africa/Asmara"] = {
 
-	"guess:by:offset" : helpers.makeTestGuess("Africa/Asmara", { offset: true, expect: "Europe/Simferopol" }),
+	"guess:by:offset" : helpers.makeTestGuess("Africa/Asmara", { offset: true, expect: "Europe/Moscow" }),
 
 	"guess:by:abbr" : helpers.makeTestGuess("Africa/Asmara", { abbr: true, expect: "Africa/Nairobi" }),
 

diff --git a/tests/zones/africa/asmera.js b/tests/zones/africa/asmera.js
@@ -4,7 +4,7 @@ var helpers = require("../../helpers/helpers");
 
 exports["Africa/Asmera"] = {
 
-	"guess:by:offset" : helpers.makeTestGuess("Africa/Asmera", { offset: true, expect: "Europe/Simferopol" }),
+	"guess:by:offset" : helpers.makeTestGuess("Africa/Asmera", { offset: true, expect: "Europe/Moscow" }),
 
 	"guess:by:abbr" : helpers.makeTestGuess("Africa/Asmera", { abbr: true, expect: "Africa/Nairobi" }),
 

diff --git a/tests/zones/africa/bamako.js b/tests/zones/africa/bamako.js
@@ -4,9 +4,9 @@ var helpers = require("../../helpers/helpers");
 
 exports["Africa/Bamako"] = {
 
-	"guess:by:offset" : helpers.makeTestGuess("Africa/Bamako", { offset: true, expect: "Etc/UTC" }),
+	"guess:by:offset" : helpers.makeTestGuess("Africa/Bamako", { offset: true, expect: "Africa/Abidjan" }),
 
-	"guess:by:abbr" : helpers.makeTestGuess("Africa/Bamako", { abbr: true, expect: "Etc/UTC" }),
+	"guess:by:abbr" : helpers.makeTestGuess("Africa/Bamako", { abbr: true, expect: "Africa/Abidjan" }),
 
 	"1912" : helpers.makeTestYear("Africa/Bamako", [
 		["1912-01-01T00:16:07+00:00", "23:59:59", "LMT", 968 / 60],

diff --git a/tests/zones/africa/bangui.js b/tests/zones/africa/bangui.js
@@ -4,9 +4,9 @@ var helpers = require("../../helpers/helpers");
 
 exports["Africa/Bangui"] = {
 
-	"guess:by:offset" : helpers.makeTestGuess("Africa/Bangui", { offset: true, expect: "Etc/GMT-1" }),
+	"guess:by:offset" : helpers.makeTestGuess("Africa/Bangui", { offset: true, expect: "Africa/Lagos" }),
 
-	"guess:by:abbr" : helpers.makeTestGuess("Africa/Bangui", { abbr: true, expect: "Africa/Ndjamena" }),
+	"guess:by:abbr" : helpers.makeTestGuess("Africa/Bangui", { abbr: true, expect: "Africa/Lagos" }),
 
 	"1919" : helpers.makeTestYear("Africa/Bangui", [
 		["1919-08-31T23:46:23+00:00", "23:59:59", "LMT", -816 / 60],

diff --git a/tests/zones/africa/banjul.js b/tests/zones/africa/banjul.js
@@ -4,9 +4,9 @@ var helpers = require("../../helpers/helpers");
 
 exports["Africa/Banjul"] = {
 
-	"guess:by:offset" : helpers.makeTestGuess("Africa/Banjul", { offset: true, expect: "Etc/UTC" }),
+	"guess:by:offset" : helpers.makeTestGuess("Africa/Banjul", { offset: true, expect: "Africa/Abidjan" }),
 
-	"guess:by:abbr" : helpers.makeTestGuess("Africa/Banjul", { abbr: true, expect: "Etc/UTC" }),
+	"guess:by:abbr" : helpers.makeTestGuess("Africa/Banjul", { abbr: true, expect: "Africa/Abidjan" }),
 
 	"1912" : helpers.makeTestYear("Africa/Banjul", [
 		["1912-01-01T00:16:07+00:00", "23:59:59", "LMT", 968 / 60],

diff --git a/tests/zones/africa/bissau.js b/tests/zones/africa/bissau.js
@@ -4,9 +4,9 @@ var helpers = require("../../helpers/helpers");
 
 exports["Africa/Bissau"] = {
 
-	"guess:by:offset" : helpers.makeTestGuess("Africa/Bissau", { offset: true, expect: "Etc/UTC" }),
+	"guess:by:offset" : helpers.makeTestGuess("Africa/Bissau", { offset: true, expect: "Africa/Abidjan" }),
 
-	"guess:by:abbr" : helpers.makeTestGuess("Africa/Bissau", { abbr: true, expect: "Etc/UTC" }),
+	"guess:by:abbr" : helpers.makeTestGuess("Africa/Bissau", { abbr: true, expect: "Africa/Abidjan" }),
 
 	"1912" : helpers.makeTestYear("Africa/Bissau", [
 		["1912-01-01T00:59:59+00:00", "23:57:39", "LMT", 3740 / 60],

diff --git a/tests/zones/africa/blantyre.js b/tests/zones/africa/blantyre.js
@@ -4,9 +4,9 @@ var helpers = require("../../helpers/helpers");
 
 exports["Africa/Blantyre"] = {
 
-	"guess:by:offset" : helpers.makeTestGuess("Africa/Blantyre", { offset: true, expect: "Europe/Kaliningrad" }),
+	"guess:by:offset" : helpers.makeTestGuess("Africa/Blantyre", { offset: true, expect: "Africa/Cairo" }),
 
-	"guess:by:abbr" : helpers.makeTestGuess("Africa/Blantyre", { abbr: true, expect: "Africa/Windhoek" }),
+	"guess:by:abbr" : helpers.makeTestGuess("Africa/Blantyre", { abbr: true, expect: "Africa/Khartoum" }),
 
 	"1903" : helpers.makeTestYear("Africa/Blantyre", [
 		["1903-02-28T21:49:39+00:00", "23:59:59", "LMT", -7820 / 60],

diff --git a/tests/zones/africa/brazzaville.js b/tests/zones/africa/brazzaville.js
@@ -4,9 +4,9 @@ var helpers = require("../../helpers/helpers");
 
 exports["Africa/Brazzaville"] = {
 
-	"guess:by:offset" : helpers.makeTestGuess("Africa/Brazzaville", { offset: true, expect: "Etc/GMT-1" }),
+	"guess:by:offset" : helpers.makeTestGuess("Africa/Brazzaville", { offset: true, expect: "Africa/Lagos" }),
 
-	"guess:by:abbr" : helpers.makeTestGuess("Africa/Brazzaville", { abbr: true, expect: "Africa/Ndjamena" }),
+	"guess:by:abbr" : helpers.makeTestGuess("Africa/Brazzaville", { abbr: true, expect: "Africa/Lagos" }),
 
 	"1919" : helpers.makeTestYear("Africa/Brazzaville", [
 		["1919-08-31T23:46:23+00:00", "23:59:59", "LMT", -816 / 60],

diff --git a/tests/zones/africa/bujumbura.js b/tests/zones/africa/bujumbura.js
@@ -4,9 +4,9 @@ var helpers = require("../../helpers/helpers");
 
 exports["Africa/Bujumbura"] = {
 
-	"guess:by:offset" : helpers.makeTestGuess("Africa/Bujumbura", { offset: true, expect: "Europe/Kaliningrad" }),
+	"guess:by:offset" : helpers.makeTestGuess("Africa/Bujumbura", { offset: true, expect: "Africa/Cairo" }),
 
-	"guess:by:abbr" : helpers.makeTestGuess("Africa/Bujumbura", { abbr: true, expect: "Africa/Windhoek" }),
+	"guess:by:abbr" : helpers.makeTestGuess("Africa/Bujumbura", { abbr: true, expect: "Africa/Khartoum" }),
 
 	"1903" : helpers.makeTestYear("Africa/Bujumbura", [
 		["1903-02-28T21:49:39+00:00", "23:59:59", "LMT", -7820 / 60],

diff --git a/tests/zones/africa/cairo.js b/tests/zones/africa/cairo.js
@@ -4,9 +4,9 @@ var helpers = require("../../helpers/helpers");
 
 exports["Africa/Cairo"] = {
 
-	"guess:by:offset" : helpers.makeTestGuess("Africa/Cairo", { offset: true, expect: "Europe/Kaliningrad" }),
+	"guess:by:offset" : helpers.makeTestGuess("Africa/Cairo", { offset: true }),
 
-	"guess:by:abbr" : helpers.makeTestGuess("Africa/Cairo", { abbr: true, expect: "Europe/Kaliningrad" }),
+	"guess:by:abbr" : helpers.makeTestGuess("Africa/Cairo", { abbr: true }),
 
 	"1940" : helpers.makeTestYear("Africa/Cairo", [
 		["1940-07-14T21:59:59+00:00", "23:59:59", "EET", -120],

diff --git a/tests/zones/africa/casablanca.js b/tests/zones/africa/casablanca.js
@@ -4,9 +4,9 @@ var helpers = require("../../helpers/helpers");
 
 exports["Africa/Casablanca"] = {
 
-	"guess:by:offset" : helpers.makeTestGuess("Africa/Casablanca", { offset: true, expect: "Africa/El_Aaiun" }),
+	"guess:by:offset" : helpers.makeTestGuess("Africa/Casablanca", { offset: true }),
 
-	"guess:by:abbr" : helpers.makeTestGuess("Africa/Casablanca", { abbr: true, expect: "Africa/El_Aaiun" }),
+	"guess:by:abbr" : helpers.makeTestGuess("Africa/Casablanca", { abbr: true }),
 
 	"1913" : helpers.makeTestYear("Africa/Casablanca", [
 		["1913-10-26T00:30:19+00:00", "23:59:59", "LMT", 1820 / 60],

diff --git a/tests/zones/africa/ceuta.js b/tests/zones/africa/ceuta.js
@@ -4,9 +4,9 @@ var helpers = require("../../helpers/helpers");
 
 exports["Africa/Ceuta"] = {
 
-	"guess:by:offset" : helpers.makeTestGuess("Africa/Ceuta", { offset: true, expect: "MET" }),
+	"guess:by:offset" : helpers.makeTestGuess("Africa/Ceuta", { offset: true, expect: "Europe/Paris" }),
 
-	"guess:by:abbr" : helpers.makeTestGuess("Africa/Ceuta", { abbr: true, expect: "Europe/Zurich" }),
+	"guess:by:abbr" : helpers.makeTestGuess("Africa/Ceuta", { abbr: true, expect: "Europe/Paris" }),
 
 	"1918" : helpers.makeTestYear("Africa/Ceuta", [
 		["1918-05-06T22:59:59+00:00", "22:59:59", "WET", 0],

diff --git a/tests/zones/africa/conakry.js b/tests/zones/africa/conakry.js
@@ -4,9 +4,9 @@ var helpers = require("../../helpers/helpers");
 
 exports["Africa/Conakry"] = {
 
-	"guess:by:offset" : helpers.makeTestGuess("Africa/Conakry", { offset: true, expect: "Etc/UTC" }),
+	"guess:by:offset" : helpers.makeTestGuess("Africa/Conakry", { offset: true, expect: "Africa/Abidjan" }),
 
-	"guess:by:abbr" : helpers.makeTestGuess("Africa/Conakry", { abbr: true, expect: "Etc/UTC" }),
+	"guess:by:abbr" : helpers.makeTestGuess("Africa/Conakry", { abbr: true, expect: "Africa/Abidjan" }),
 
 	"1912" : helpers.makeTestYear("Africa/Conakry", [
 		["1912-01-01T00:16:07+00:00", "23:59:59", "LMT", 968 / 60],

diff --git a/tests/zones/africa/dakar.js b/tests/zones/africa/dakar.js
@@ -4,9 +4,9 @@ var helpers = require("../../helpers/helpers");
 
 exports["Africa/Dakar"] = {
 
-	"guess:by:offset" : helpers.makeTestGuess("Africa/Dakar", { offset: true, expect: "Etc/UTC" }),
+	"guess:by:offset" : helpers.makeTestGuess("Africa/Dakar", { offset: true, expect: "Africa/Abidjan" }),
 
-	"guess:by:abbr" : helpers.makeTestGuess("Africa/Dakar", { abbr: true, expect: "Etc/UTC" }),
+	"guess:by:abbr" : helpers.makeTestGuess("Africa/Dakar", { abbr: true, expect: "Africa/Abidjan" }),
 
 	"1912" : helpers.makeTestYear("Africa/Dakar", [
 		["1912-01-01T00:16:07+00:00", "23:59:59", "LMT", 968 / 60],

diff --git a/tests/zones/africa/dar_es_salaam.js b/tests/zones/africa/dar_es_salaam.js
@@ -4,7 +4,7 @@ var helpers = require("../../helpers/helpers");
 
 exports["Africa/Dar_es_Salaam"] = {
 
-	"guess:by:offset" : helpers.makeTestGuess("Africa/Dar_es_Salaam", { offset: true, expect: "Europe/Simferopol" }),
+	"guess:by:offset" : helpers.makeTestGuess("Africa/Dar_es_Salaam", { offset: true, expect: "Europe/Moscow" }),
 
 	"guess:by:abbr" : helpers.makeTestGuess("Africa/Dar_es_Salaam", { abbr: true, expect: "Africa/Nairobi" }),
 

diff --git a/tests/zones/africa/djibouti.js b/tests/zones/africa/djibouti.js
@@ -4,7 +4,7 @@ var helpers = require("../../helpers/helpers");
 
 exports["Africa/Djibouti"] = {
 
-	"guess:by:offset" : helpers.makeTestGuess("Africa/Djibouti", { offset: true, expect: "Europe/Simferopol" }),
+	"guess:by:offset" : helpers.makeTestGuess("Africa/Djibouti", { offset: true, expect: "Europe/Moscow" }),
 
 	"guess:by:abbr" : helpers.makeTestGuess("Africa/Djibouti", { abbr: true, expect: "Africa/Nairobi" }),
 

diff --git a/tests/zones/africa/douala.js b/tests/zones/africa/douala.js
@@ -4,9 +4,9 @@ var helpers = require("../../helpers/helpers");
 
 exports["Africa/Douala"] = {
 
-	"guess:by:offset" : helpers.makeTestGuess("Africa/Douala", { offset: true, expect: "Etc/GMT-1" }),
+	"guess:by:offset" : helpers.makeTestGuess("Africa/Douala", { offset: true, expect: "Africa/Lagos" }),
 
-	"guess:by:abbr" : helpers.makeTestGuess("Africa/Douala", { abbr: true, expect: "Africa/Ndjamena" }),
+	"guess:by:abbr" : helpers.makeTestGuess("Africa/Douala", { abbr: true, expect: "Africa/Lagos" }),
 
 	"1919" : helpers.makeTestYear("Africa/Douala", [
 		["1919-08-31T23:46:23+00:00", "23:59:59", "LMT", -816 / 60],

diff --git a/tests/zones/africa/el_aaiun.js b/tests/zones/africa/el_aaiun.js
@@ -4,9 +4,9 @@ var helpers = require("../../helpers/helpers");
 
 exports["Africa/El_Aaiun"] = {
 
-	"guess:by:offset" : helpers.makeTestGuess("Africa/El_Aaiun", { offset: true }),
+	"guess:by:offset" : helpers.makeTestGuess("Africa/El_Aaiun", { offset: true, expect: "Africa/Casablanca" }),
 
-	"guess:by:abbr" : helpers.makeTestGuess("Africa/El_Aaiun", { abbr: true }),
+	"guess:by:abbr" : helpers.makeTestGuess("Africa/El_Aaiun", { abbr: true, expect: "Africa/Casablanca" }),
 
 	"1934" : helpers.makeTestYear("Africa/El_Aaiun", [
 		["1934-01-01T00:52:47+00:00", "23:59:59", "LMT", 3168 / 60],

diff --git a/tests/zones/africa/freetown.js b/tests/zones/africa/freetown.js
@@ -4,9 +4,9 @@ var helpers = require("../../helpers/helpers");
 
 exports["Africa/Freetown"] = {
 
-	"guess:by:offset" : helpers.makeTestGuess("Africa/Freetown", { offset: true, expect: "Etc/UTC" }),
+	"guess:by:offset" : helpers.makeTestGuess("Africa/Freetown", { offset: true, expect: "Africa/Abidjan" }),
 
-	"guess:by:abbr" : helpers.makeTestGuess("Africa/Freetown", { abbr: true, expect: "Etc/UTC" }),
+	"guess:by:abbr" : helpers.makeTestGuess("Africa/Freetown", { abbr: true, expect: "Africa/Abidjan" }),
 
 	"1912" : helpers.makeTestYear("Africa/Freetown", [
 		["1912-01-01T00:16:07+00:00", "23:59:59", "LMT", 968 / 60],

diff --git a/tests/zones/africa/gaborone.js b/tests/zones/africa/gaborone.js
@@ -4,9 +4,9 @@ var helpers = require("../../helpers/helpers");
 
 exports["Africa/Gaborone"] = {
 
-	"guess:by:offset" : helpers.makeTestGuess("Africa/Gaborone", { offset: true, expect: "Europe/Kaliningrad" }),
+	"guess:by:offset" : helpers.makeTestGuess("Africa/Gaborone", { offset: true, expect: "Africa/Cairo" }),
 
-	"guess:by:abbr" : helpers.makeTestGuess("Africa/Gaborone", { abbr: true, expect: "Africa/Windhoek" }),
+	"guess:by:abbr" : helpers.makeTestGuess("Africa/Gaborone", { abbr: true, expect: "Africa/Khartoum" }),
 
 	"1903" : helpers.makeTestYear("Africa/Gaborone", [
 		["1903-02-28T21:49:39+00:00", "23:59:59", "LMT", -7820 / 60],

diff --git a/tests/zones/africa/harare.js b/tests/zones/africa/harare.js
@@ -4,9 +4,9 @@ var helpers = require("../../helpers/helpers");
 
 exports["Africa/Harare"] = {
 
-	"guess:by:offset" : helpers.makeTestGuess("Africa/Harare", { offset: true, expect: "Europe/Kaliningrad" }),
+	"guess:by:offset" : helpers.makeTestGuess("Africa/Harare", { offset: true, expect: "Africa/Cairo" }),
 
-	"guess:by:abbr" : helpers.makeTestGuess("Africa/Harare", { abbr: true, expect: "Africa/Windhoek" }),
+	"guess:by:abbr" : helpers.makeTestGuess("Africa/Harare", { abbr: true, expect: "Africa/Khartoum" }),
 
 	"1903" : helpers.makeTestYear("Africa/Harare", [
 		["1903-02-28T21:49:39+00:00", "23:59:59", "LMT", -7820 / 60],

diff --git a/tests/zones/africa/johannesburg.js b/tests/zones/africa/johannesburg.js
@@ -4,7 +4,7 @@ var helpers = require("../../helpers/helpers");
 
 exports["Africa/Johannesburg"] = {
 
-	"guess:by:offset" : helpers.makeTestGuess("Africa/Johannesburg", { offset: true, expect: "Europe/Kaliningrad" }),
+	"guess:by:offset" : helpers.makeTestGuess("Africa/Johannesburg", { offset: true, expect: "Africa/Cairo" }),
 
 	"guess:by:abbr" : helpers.makeTestGuess("Africa/Johannesburg", { abbr: true }),
 

diff --git a/tests/zones/africa/juba.js b/tests/zones/africa/juba.js
@@ -4,7 +4,7 @@ var helpers = require("../../helpers/helpers");
 
 exports["Africa/Juba"] = {
 
-	"guess:by:offset" : helpers.makeTestGuess("Africa/Juba", { offset: true, expect: "Europe/Simferopol" }),
+	"guess:by:offset" : helpers.makeTestGuess("Africa/Juba", { offset: true, expect: "Europe/Moscow" }),
 
 	"guess:by:abbr" : helpers.makeTestGuess("Africa/Juba", { abbr: true, expect: "Africa/Nairobi" }),