From 9de1a4b90b0263e952b047104c8c7fdf5a433408 Mon Sep 17 00:00:00 2001 From: Joel Wetzell Date: Thu, 2 Dec 2021 09:54:13 -0600 Subject: [PATCH 1/7] Start adding location awareness to timezone --- src/app/app.component.html | 10 +- src/app/app.component.scss | 11 + src/app/app.component.ts | 20 +- src/app/timezone/models/timezone.model.ts | 467 ++++++++++++++++++ src/app/timezone/services/timezone.service.ts | 443 +---------------- 5 files changed, 500 insertions(+), 451 deletions(-) diff --git a/src/app/app.component.html b/src/app/app.component.html index 750e063..5b4cdcf 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -1,6 +1,4 @@ - -
-

{{timezone.name}}

-

{{timezone.time?.toFormat('tt')}}

-
- \ No newline at end of file +
+

{{fiveOclock.name}}

+

{{fiveOclock.time?.toFormat('tt')}}

+
\ No newline at end of file diff --git a/src/app/app.component.scss b/src/app/app.component.scss index f853330..e19a8e0 100644 --- a/src/app/app.component.scss +++ b/src/app/app.component.scss @@ -8,6 +8,17 @@ padding: 0; } +.single-container { + display:flex; + align-items: center; + flex-direction: column; + justify-content: center; + height: 100%; + width: 100%; + margin: 0; + padding: 0; +} + @media (max-width: 350px) { .timezone { font-size: 1.0em; diff --git a/src/app/app.component.ts b/src/app/app.component.ts index cad37cd..d77d8bc 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -1,12 +1,8 @@ -import { formatDate } from '@angular/common'; import { Component } from '@angular/core'; import { interval, Observable } from 'rxjs'; -import { Timezone } from './timezone/models/timezone.model'; +import { startWith } from 'rxjs/operators'; +import { GetClosestTimezoneFrom, Timezone } from './timezone/models/timezone.model'; import { TimezoneService } from './timezone/services/timezone.service'; - - - - @Component({ selector: 'app-root', templateUrl: './app.component.html', @@ -21,16 +17,16 @@ export class AppComponent { fiveOclocks: Timezone[] = []; - constructor(private timezoneService: TimezoneService){ - this.second = interval(1000) + constructor(private timezoneService: TimezoneService) { + this.second = interval(1000).pipe(startWith(0)) //every second and give it a starter value - this.second.subscribe(()=>{ + this.second.subscribe(() => { this.fiveOclocks = []; - this.timezoneService.getCurrentTimeInTimezones(this.timezoneService.getTimezones()).forEach((timezoneObj)=>{ - if(timezoneObj.time?.hour === 17){ - this.fiveOclock = timezoneObj; + this.timezoneService.getCurrentTimeInTimezones(this.timezoneService.getTimezones()).forEach((timezoneObj) => { + if (timezoneObj.time?.hour === 17) { this.fiveOclocks.push(timezoneObj); } + this.fiveOclock = GetClosestTimezoneFrom(this.timezoneService.getCurrentTimezone(), this.fiveOclocks) }) }) diff --git a/src/app/timezone/models/timezone.model.ts b/src/app/timezone/models/timezone.model.ts index 4f759ca..c2fe7ee 100644 --- a/src/app/timezone/models/timezone.model.ts +++ b/src/app/timezone/models/timezone.model.ts @@ -2,6 +2,7 @@ import { DateTime } from 'luxon'; export interface Timezone { name: string; + location?: TimezoneLocation; time?: DateTime; } @@ -21,4 +22,470 @@ export function TimezoneCompare(a: Timezone, b: Timezone) { } return 0; +} + +// http://www.movable-type.co.uk/scripts/latlong.html +export function GetClosestTimezoneFrom(timezone: string, timezones: Timezone[]) { + var location1 = timezoneMap[timezone] + + + var closestDist = Number.MAX_SAFE_INTEGER + var closestTimezone = undefined + timezones.forEach(element => { + var location2 = timezoneMap[element.name] + + var radius = 6371; + + var deltaLat = (location2.lat - location1.lat) * (Math.PI / 180); + var deltaLong = (location2.long - location2.long) * (Math.PI / 180); + + var a = Math.sin(deltaLat / 2) * Math.sin(deltaLat / 2) + + Math.cos(location1.lat * (Math.PI / 180)) * Math.cos(location2.lat * (Math.PI / 180)) * + Math.sin(deltaLong / 2) * Math.sin(deltaLong / 2); + + var distance = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a)) * radius; + + if (distance < closestDist) { + closestDist = distance + closestTimezone = element + } + }); + return closestTimezone +} + +export function TimezoneList() { + return Object.keys(timezoneMap) +} + +export interface TimezoneLocation { + lat: number; + long: number; +} + +//TODO: This still needs to be fully populated +export var timezoneMap: { [key: string]: TimezoneLocation } = { + 'Africa/Abidjan': { lat: 5.359952, long: -4.008256 }, + 'Africa/Accra': { lat: 5.603717, long: -0.186964 }, + 'Africa/Addis_Ababa': { lat: 9.033140, long: 38.750080 }, + 'Africa/Algiers': { lat: 36.753769, long: 3.058756 }, + 'Africa/Asmara': { lat: 15.339000, long: 38.937111 }, + 'Africa/Bamako': { lat: 12.6392, long: -8.0029 }, + 'Africa/Bangui': { lat: 4.3947, long: 18.5582 }, + 'Africa/Banjul': { lat: 13.4544, long: -16.5753 }, + 'Africa/Bissau': { lat: 11.8632, long: -15.5843 }, + 'Africa/Blantyre': { lat: -15.7667, long: 35.0168 }, + 'Africa/Brazzaville': { lat: -4.2634, long: 15.2429 }, + 'Africa/Bujumbura': { lat: 0, long: 0 }, + 'Africa/Cairo': { lat: 30.0444, long: 31.2357 }, + 'Africa/Casablanca': { lat: 0, long: 0 }, + 'Africa/Ceuta': { lat: 0, long: 0 }, + 'Africa/Conakry': { lat: 0, long: 0 }, + 'Africa/Dakar': { lat: 0, long: 0 }, + 'Africa/Dar_es_Salaam': { lat: 0, long: 0 }, + 'Africa/Djibouti': { lat: 0, long: 0 }, + 'Africa/Douala': { lat: 0, long: 0 }, + 'Africa/El_Aaiun': { lat: 0, long: 0 }, + 'Africa/Freetown': { lat: 0, long: 0 }, + 'Africa/Gaborone': { lat: 0, long: 0 }, + 'Africa/Harare': { lat: 0, long: 0 }, + 'Africa/Johannesburg': { lat: 0, long: 0 }, + 'Africa/Juba': { lat: 0, long: 0 }, + 'Africa/Kampala': { lat: 0, long: 0 }, + 'Africa/Khartoum': { lat: 0, long: 0 }, + 'Africa/Kigali': { lat: 0, long: 0 }, + 'Africa/Kinshasa': { lat: 0, long: 0 }, + 'Africa/Lagos': { lat: 0, long: 0 }, + 'Africa/Libreville': { lat: 0, long: 0 }, + 'Africa/Lome': { lat: 0, long: 0 }, + 'Africa/Luanda': { lat: 0, long: 0 }, + 'Africa/Lubumbashi': { lat: 0, long: 0 }, + 'Africa/Lusaka': { lat: 0, long: 0 }, + 'Africa/Malabo': { lat: 0, long: 0 }, + 'Africa/Maputo': { lat: 0, long: 0 }, + 'Africa/Maseru': { lat: 0, long: 0 }, + 'Africa/Mbabane': { lat: 0, long: 0 }, + 'Africa/Mogadishu': { lat: 0, long: 0 }, + 'Africa/Monrovia': { lat: 0, long: 0 }, + 'Africa/Nairobi': { lat: 0, long: 0 }, + 'Africa/Ndjamena': { lat: 0, long: 0 }, + 'Africa/Niamey': { lat: 0, long: 0 }, + 'Africa/Nouakchott': { lat: 0, long: 0 }, + 'Africa/Ouagadougou': { lat: 0, long: 0 }, + 'Africa/Porto-Novo': { lat: 0, long: 0 }, + 'Africa/Sao_Tome': { lat: 0, long: 0 }, + 'Africa/Tripoli': { lat: 0, long: 0 }, + 'Africa/Tunis': { lat: 0, long: 0 }, + 'Africa/Windhoek': { lat: 0, long: 0 }, + 'America/Adak': { lat: 0, long: 0 }, + 'America/Anchorage': { lat: 0, long: 0 }, + 'America/Anguilla': { lat: 0, long: 0 }, + 'America/Antigua': { lat: 0, long: 0 }, + 'America/Araguaina': { lat: 0, long: 0 }, + 'America/Argentina/Buenos_Aires': { lat: 0, long: 0 }, + 'America/Argentina/Catamarca': { lat: 0, long: 0 }, + 'America/Argentina/Cordoba': { lat: 0, long: 0 }, + 'America/Argentina/Jujuy': { lat: 0, long: 0 }, + 'America/Argentina/La_Rioja': { lat: 0, long: 0 }, + 'America/Argentina/Mendoza': { lat: 0, long: 0 }, + 'America/Argentina/Rio_Gallegos': { lat: 0, long: 0 }, + 'America/Argentina/Salta': { lat: 0, long: 0 }, + 'America/Argentina/San_Juan': { lat: 0, long: 0 }, + 'America/Argentina/San_Luis': { lat: 0, long: 0 }, + 'America/Argentina/Tucuman': { lat: 0, long: 0 }, + 'America/Argentina/Ushuaia': { lat: 0, long: 0 }, + 'America/Aruba': { lat: 0, long: 0 }, + 'America/Asuncion': { lat: 0, long: 0 }, + 'America/Atikokan': { lat: 0, long: 0 }, + 'America/Bahia': { lat: 0, long: 0 }, + 'America/Bahia_Banderas': { lat: 0, long: 0 }, + 'America/Barbados': { lat: 0, long: 0 }, + 'America/Belem': { lat: 0, long: 0 }, + 'America/Belize': { lat: 0, long: 0 }, + 'America/Blanc-Sablon': { lat: 0, long: 0 }, + 'America/Boa_Vista': { lat: 0, long: 0 }, + 'America/Bogota': { lat: 0, long: 0 }, + 'America/Boise': { lat: 0, long: 0 }, + 'America/Cambridge_Bay': { lat: 0, long: 0 }, + 'America/Campo_Grande': { lat: 0, long: 0 }, + 'America/Cancun': { lat: 0, long: 0 }, + 'America/Caracas': { lat: 0, long: 0 }, + 'America/Cayenne': { lat: 0, long: 0 }, + 'America/Cayman': { lat: 0, long: 0 }, + 'America/Chicago': { lat: 41.8781, long: -87.6298 }, + 'America/Chihuahua': { lat: 0, long: 0 }, + 'America/Costa_Rica': { lat: 0, long: 0 }, + 'America/Creston': { lat: 0, long: 0 }, + 'America/Cuiaba': { lat: 0, long: 0 }, + 'America/Curacao': { lat: 0, long: 0 }, + 'America/Danmarkshavn': { lat: 0, long: 0 }, + 'America/Dawson': { lat: 0, long: 0 }, + 'America/Dawson_Creek': { lat: 0, long: 0 }, + 'America/Denver': { lat: 0, long: 0 }, + 'America/Detroit': { lat: 0, long: 0 }, + 'America/Dominica': { lat: 0, long: 0 }, + 'America/Edmonton': { lat: 0, long: 0 }, + 'America/Eirunepe': { lat: 0, long: 0 }, + 'America/El_Salvador': { lat: 0, long: 0 }, + 'America/Fort_Nelson': { lat: 0, long: 0 }, + 'America/Fortaleza': { lat: 0, long: 0 }, + 'America/Glace_Bay': { lat: 0, long: 0 }, + 'America/Goose_Bay': { lat: 0, long: 0 }, + 'America/Grand_Turk': { lat: 0, long: 0 }, + 'America/Grenada': { lat: 0, long: 0 }, + 'America/Guadeloupe': { lat: 0, long: 0 }, + 'America/Guatemala': { lat: 0, long: 0 }, + 'America/Guayaquil': { lat: 0, long: 0 }, + 'America/Guyana': { lat: 0, long: 0 }, + 'America/Halifax': { lat: 0, long: 0 }, + 'America/Havana': { lat: 0, long: 0 }, + 'America/Hermosillo': { lat: 0, long: 0 }, + 'America/Indiana/Indianapolis': { lat: 0, long: 0 }, + 'America/Indiana/Knox': { lat: 0, long: 0 }, + 'America/Indiana/Marengo': { lat: 0, long: 0 }, + 'America/Indiana/Petersburg': { lat: 0, long: 0 }, + 'America/Indiana/Tell_City': { lat: 0, long: 0 }, + 'America/Indiana/Vevay': { lat: 0, long: 0 }, + 'America/Indiana/Vincennes': { lat: 0, long: 0 }, + 'America/Indiana/Winamac': { lat: 0, long: 0 }, + 'America/Inuvik': { lat: 0, long: 0 }, + 'America/Iqaluit': { lat: 0, long: 0 }, + 'America/Jamaica': { lat: 0, long: 0 }, + 'America/Juneau': { lat: 0, long: 0 }, + 'America/Kentucky/Louisville': { lat: 0, long: 0 }, + 'America/Kentucky/Monticello': { lat: 0, long: 0 }, + 'America/Kralendijk': { lat: 0, long: 0 }, + 'America/La_Paz': { lat: 0, long: 0 }, + 'America/Lima': { lat: 0, long: 0 }, + 'America/Los_Angeles': { lat: 0, long: 0 }, + 'America/Lower_Princes': { lat: 0, long: 0 }, + 'America/Maceio': { lat: 0, long: 0 }, + 'America/Managua': { lat: 0, long: 0 }, + 'America/Manaus': { lat: 0, long: 0 }, + 'America/Marigot': { lat: 0, long: 0 }, + 'America/Martinique': { lat: 0, long: 0 }, + 'America/Matamoros': { lat: 0, long: 0 }, + 'America/Mazatlan': { lat: 0, long: 0 }, + 'America/Menominee': { lat: 0, long: 0 }, + 'America/Merida': { lat: 0, long: 0 }, + 'America/Metlakatla': { lat: 0, long: 0 }, + 'America/Mexico_City': { lat: 0, long: 0 }, + 'America/Miquelon': { lat: 0, long: 0 }, + 'America/Moncton': { lat: 0, long: 0 }, + 'America/Monterrey': { lat: 0, long: 0 }, + 'America/Montevideo': { lat: 0, long: 0 }, + 'America/Montserrat': { lat: 0, long: 0 }, + 'America/Nassau': { lat: 0, long: 0 }, + 'America/New_York': { lat: 0, long: 0 }, + 'America/Nipigon': { lat: 0, long: 0 }, + 'America/Nome': { lat: 0, long: 0 }, + 'America/Noronha': { lat: 0, long: 0 }, + 'America/North_Dakota/Beulah': { lat: 0, long: 0 }, + 'America/North_Dakota/Center': { lat: 0, long: 0 }, + 'America/North_Dakota/New_Salem': { lat: 0, long: 0 }, + 'America/Nuuk': { lat: 0, long: 0 }, + 'America/Ojinaga': { lat: 0, long: 0 }, + 'America/Panama': { lat: 0, long: 0 }, + 'America/Pangnirtung': { lat: 0, long: 0 }, + 'America/Paramaribo': { lat: 0, long: 0 }, + 'America/Phoenix': { lat: 0, long: 0 }, + 'America/Port-au-Prince': { lat: 0, long: 0 }, + 'America/Port_of_Spain': { lat: 0, long: 0 }, + 'America/Porto_Velho': { lat: 0, long: 0 }, + 'America/Puerto_Rico': { lat: 0, long: 0 }, + 'America/Punta_Arenas': { lat: 0, long: 0 }, + 'America/Rainy_River': { lat: 0, long: 0 }, + 'America/Rankin_Inlet': { lat: 0, long: 0 }, + 'America/Recife': { lat: 0, long: 0 }, + 'America/Regina': { lat: 0, long: 0 }, + 'America/Resolute': { lat: 0, long: 0 }, + 'America/Rio_Branco': { lat: 0, long: 0 }, + 'America/Santarem': { lat: 0, long: 0 }, + 'America/Santiago': { lat: 0, long: 0 }, + 'America/Santo_Domingo': { lat: 0, long: 0 }, + 'America/Sao_Paulo': { lat: 0, long: 0 }, + 'America/Scoresbysund': { lat: 0, long: 0 }, + 'America/Sitka': { lat: 0, long: 0 }, + 'America/St_Barthelemy': { lat: 0, long: 0 }, + 'America/St_Johns': { lat: 0, long: 0 }, + 'America/St_Kitts': { lat: 0, long: 0 }, + 'America/St_Lucia': { lat: 0, long: 0 }, + 'America/St_Thomas': { lat: 0, long: 0 }, + 'America/St_Vincent': { lat: 0, long: 0 }, + 'America/Swift_Current': { lat: 0, long: 0 }, + 'America/Tegucigalpa': { lat: 0, long: 0 }, + 'America/Thule': { lat: 0, long: 0 }, + 'America/Thunder_Bay': { lat: 0, long: 0 }, + 'America/Tijuana': { lat: 0, long: 0 }, + 'America/Toronto': { lat: 0, long: 0 }, + 'America/Tortola': { lat: 0, long: 0 }, + 'America/Vancouver': { lat: 0, long: 0 }, + 'America/Whitehorse': { lat: 0, long: 0 }, + 'America/Winnipeg': { lat: 0, long: 0 }, + 'America/Yakutat': { lat: 0, long: 0 }, + 'America/Yellowknife': { lat: 0, long: 0 }, + 'Antarctica/Casey': { lat: 0, long: 0 }, + 'Antarctica/Davis': { lat: 0, long: 0 }, + 'Antarctica/DumontDUrville': { lat: 0, long: 0 }, + 'Antarctica/Macquarie': { lat: 0, long: 0 }, + 'Antarctica/Mawson': { lat: 0, long: 0 }, + 'Antarctica/McMurdo': { lat: 0, long: 0 }, + 'Antarctica/Palmer': { lat: 0, long: 0 }, + 'Antarctica/Rothera': { lat: 0, long: 0 }, + 'Antarctica/Syowa': { lat: 0, long: 0 }, + 'Antarctica/Troll': { lat: 0, long: 0 }, + 'Antarctica/Vostok': { lat: 0, long: 0 }, + 'Arctic/Longyearbyen': { lat: 0, long: 0 }, + 'Asia/Aden': { lat: 0, long: 0 }, + 'Asia/Almaty': { lat: 0, long: 0 }, + 'Asia/Amman': { lat: 0, long: 0 }, + 'Asia/Anadyr': { lat: 0, long: 0 }, + 'Asia/Aqtau': { lat: 0, long: 0 }, + 'Asia/Aqtobe': { lat: 0, long: 0 }, + 'Asia/Ashgabat': { lat: 0, long: 0 }, + 'Asia/Atyrau': { lat: 0, long: 0 }, + 'Asia/Baghdad': { lat: 0, long: 0 }, + 'Asia/Bahrain': { lat: 0, long: 0 }, + 'Asia/Baku': { lat: 0, long: 0 }, + 'Asia/Bangkok': { lat: 0, long: 0 }, + 'Asia/Barnaul': { lat: 0, long: 0 }, + 'Asia/Beirut': { lat: 0, long: 0 }, + 'Asia/Bishkek': { lat: 0, long: 0 }, + 'Asia/Brunei': { lat: 0, long: 0 }, + 'Asia/Chita': { lat: 0, long: 0 }, + 'Asia/Choibalsan': { lat: 0, long: 0 }, + 'Asia/Colombo': { lat: 0, long: 0 }, + 'Asia/Damascus': { lat: 0, long: 0 }, + 'Asia/Dhaka': { lat: 0, long: 0 }, + 'Asia/Dili': { lat: 0, long: 0 }, + 'Asia/Dubai': { lat: 0, long: 0 }, + 'Asia/Dushanbe': { lat: 0, long: 0 }, + 'Asia/Famagusta': { lat: 0, long: 0 }, + 'Asia/Gaza': { lat: 0, long: 0 }, + 'Asia/Hebron': { lat: 0, long: 0 }, + 'Asia/Ho_Chi_Minh': { lat: 0, long: 0 }, + 'Asia/Hong_Kong': { lat: 0, long: 0 }, + 'Asia/Hovd': { lat: 0, long: 0 }, + 'Asia/Irkutsk': { lat: 0, long: 0 }, + 'Asia/Jakarta': { lat: 0, long: 0 }, + 'Asia/Jayapura': { lat: 0, long: 0 }, + 'Asia/Jerusalem': { lat: 0, long: 0 }, + 'Asia/Kabul': { lat: 0, long: 0 }, + 'Asia/Kamchatka': { lat: 0, long: 0 }, + 'Asia/Karachi': { lat: 0, long: 0 }, + 'Asia/Kathmandu': { lat: 0, long: 0 }, + 'Asia/Khandyga': { lat: 0, long: 0 }, + 'Asia/Kolkata': { lat: 0, long: 0 }, + 'Asia/Krasnoyarsk': { lat: 0, long: 0 }, + 'Asia/Kuala_Lumpur': { lat: 0, long: 0 }, + 'Asia/Kuching': { lat: 0, long: 0 }, + 'Asia/Kuwait': { lat: 0, long: 0 }, + 'Asia/Macau': { lat: 0, long: 0 }, + 'Asia/Magadan': { lat: 0, long: 0 }, + 'Asia/Makassar': { lat: 0, long: 0 }, + 'Asia/Manila': { lat: 0, long: 0 }, + 'Asia/Muscat': { lat: 0, long: 0 }, + 'Asia/Nicosia': { lat: 0, long: 0 }, + 'Asia/Novokuznetsk': { lat: 0, long: 0 }, + 'Asia/Novosibirsk': { lat: 0, long: 0 }, + 'Asia/Omsk': { lat: 0, long: 0 }, + 'Asia/Oral': { lat: 0, long: 0 }, + 'Asia/Phnom_Penh': { lat: 0, long: 0 }, + 'Asia/Pontianak': { lat: 0, long: 0 }, + 'Asia/Pyongyang': { lat: 0, long: 0 }, + 'Asia/Qatar': { lat: 0, long: 0 }, + 'Asia/Qostanay': { lat: 0, long: 0 }, + 'Asia/Qyzylorda': { lat: 0, long: 0 }, + 'Asia/Riyadh': { lat: 0, long: 0 }, + 'Asia/Sakhalin': { lat: 0, long: 0 }, + 'Asia/Samarkand': { lat: 0, long: 0 }, + 'Asia/Seoul': { lat: 0, long: 0 }, + 'Asia/Shanghai': { lat: 0, long: 0 }, + 'Asia/Singapore': { lat: 0, long: 0 }, + 'Asia/Srednekolymsk': { lat: 0, long: 0 }, + 'Asia/Taipei': { lat: 0, long: 0 }, + 'Asia/Tashkent': { lat: 0, long: 0 }, + 'Asia/Tbilisi': { lat: 0, long: 0 }, + 'Asia/Tehran': { lat: 0, long: 0 }, + 'Asia/Thimphu': { lat: 0, long: 0 }, + 'Asia/Tokyo': { lat: 0, long: 0 }, + 'Asia/Tomsk': { lat: 0, long: 0 }, + 'Asia/Ulaanbaatar': { lat: 0, long: 0 }, + 'Asia/Urumqi': { lat: 0, long: 0 }, + 'Asia/Ust-Nera': { lat: 0, long: 0 }, + 'Asia/Vientiane': { lat: 0, long: 0 }, + 'Asia/Vladivostok': { lat: 0, long: 0 }, + 'Asia/Yakutsk': { lat: 0, long: 0 }, + 'Asia/Yangon': { lat: 0, long: 0 }, + 'Asia/Yekaterinburg': { lat: 0, long: 0 }, + 'Asia/Yerevan': { lat: 0, long: 0 }, + 'Atlantic/Azores': { lat: 0, long: 0 }, + 'Atlantic/Bermuda': { lat: 0, long: 0 }, + 'Atlantic/Canary': { lat: 0, long: 0 }, + 'Atlantic/Cape_Verde': { lat: 0, long: 0 }, + 'Atlantic/Faroe': { lat: 0, long: 0 }, + 'Atlantic/Madeira': { lat: 0, long: 0 }, + 'Atlantic/Reykjavik': { lat: 0, long: 0 }, + 'Atlantic/South_Georgia': { lat: 0, long: 0 }, + 'Atlantic/St_Helena': { lat: 0, long: 0 }, + 'Atlantic/Stanley': { lat: 0, long: 0 }, + 'Australia/Adelaide': { lat: 0, long: 0 }, + 'Australia/Brisbane': { lat: 0, long: 0 }, + 'Australia/Broken_Hill': { lat: 0, long: 0 }, + 'Australia/Darwin': { lat: 0, long: 0 }, + 'Australia/Eucla': { lat: 0, long: 0 }, + 'Australia/Hobart': { lat: 0, long: 0 }, + 'Australia/Lindeman': { lat: 0, long: 0 }, + 'Australia/Lord_Howe': { lat: 0, long: 0 }, + 'Australia/Melbourne': { lat: 0, long: 0 }, + 'Australia/Perth': { lat: 0, long: 0 }, + 'Australia/Sydney': { lat: 0, long: 0 }, + 'Europe/Amsterdam': { lat: 0, long: 0 }, + 'Europe/Andorra': { lat: 0, long: 0 }, + 'Europe/Astrakhan': { lat: 0, long: 0 }, + 'Europe/Athens': { lat: 0, long: 0 }, + 'Europe/Belgrade': { lat: 0, long: 0 }, + 'Europe/Berlin': { lat: 0, long: 0 }, + 'Europe/Bratislava': { lat: 0, long: 0 }, + 'Europe/Brussels': { lat: 0, long: 0 }, + 'Europe/Bucharest': { lat: 0, long: 0 }, + 'Europe/Budapest': { lat: 0, long: 0 }, + 'Europe/Busingen': { lat: 0, long: 0 }, + 'Europe/Chisinau': { lat: 0, long: 0 }, + 'Europe/Copenhagen': { lat: 0, long: 0 }, + 'Europe/Dublin': { lat: 0, long: 0 }, + 'Europe/Gibraltar': { lat: 0, long: 0 }, + 'Europe/Guernsey': { lat: 0, long: 0 }, + 'Europe/Helsinki': { lat: 0, long: 0 }, + 'Europe/Isle_of_Man': { lat: 0, long: 0 }, + 'Europe/Istanbul': { lat: 0, long: 0 }, + 'Europe/Jersey': { lat: 0, long: 0 }, + 'Europe/Kaliningrad': { lat: 0, long: 0 }, + 'Europe/Kiev': { lat: 0, long: 0 }, + 'Europe/Kirov': { lat: 0, long: 0 }, + 'Europe/Lisbon': { lat: 0, long: 0 }, + 'Europe/Ljubljana': { lat: 0, long: 0 }, + 'Europe/London': { lat: 0, long: 0 }, + 'Europe/Luxembourg': { lat: 0, long: 0 }, + 'Europe/Madrid': { lat: 0, long: 0 }, + 'Europe/Malta': { lat: 0, long: 0 }, + 'Europe/Mariehamn': { lat: 0, long: 0 }, + 'Europe/Minsk': { lat: 0, long: 0 }, + 'Europe/Monaco': { lat: 0, long: 0 }, + 'Europe/Moscow': { lat: 0, long: 0 }, + 'Europe/Oslo': { lat: 0, long: 0 }, + 'Europe/Paris': { lat: 0, long: 0 }, + 'Europe/Podgorica': { lat: 0, long: 0 }, + 'Europe/Prague': { lat: 0, long: 0 }, + 'Europe/Riga': { lat: 0, long: 0 }, + 'Europe/Rome': { lat: 0, long: 0 }, + 'Europe/Samara': { lat: 0, long: 0 }, + 'Europe/San_Marino': { lat: 0, long: 0 }, + 'Europe/Sarajevo': { lat: 0, long: 0 }, + 'Europe/Saratov': { lat: 0, long: 0 }, + 'Europe/Simferopol': { lat: 0, long: 0 }, + 'Europe/Skopje': { lat: 0, long: 0 }, + 'Europe/Sofia': { lat: 0, long: 0 }, + 'Europe/Stockholm': { lat: 0, long: 0 }, + 'Europe/Tallinn': { lat: 0, long: 0 }, + 'Europe/Tirane': { lat: 0, long: 0 }, + 'Europe/Ulyanovsk': { lat: 0, long: 0 }, + 'Europe/Uzhgorod': { lat: 0, long: 0 }, + 'Europe/Vaduz': { lat: 0, long: 0 }, + 'Europe/Vatican': { lat: 0, long: 0 }, + 'Europe/Vienna': { lat: 0, long: 0 }, + 'Europe/Vilnius': { lat: 0, long: 0 }, + 'Europe/Volgograd': { lat: 0, long: 0 }, + 'Europe/Warsaw': { lat: 0, long: 0 }, + 'Europe/Zagreb': { lat: 0, long: 0 }, + 'Europe/Zaporozhye': { lat: 0, long: 0 }, + 'Europe/Zurich': { lat: 0, long: 0 }, + 'Indian/Antananarivo': { lat: 0, long: 0 }, + 'Indian/Chagos': { lat: 0, long: 0 }, + 'Indian/Christmas': { lat: 0, long: 0 }, + 'Indian/Cocos': { lat: 0, long: 0 }, + 'Indian/Comoro': { lat: 0, long: 0 }, + 'Indian/Kerguelen': { lat: 0, long: 0 }, + 'Indian/Mahe': { lat: 0, long: 0 }, + 'Indian/Maldives': { lat: 0, long: 0 }, + 'Indian/Mauritius': { lat: 0, long: 0 }, + 'Indian/Mayotte': { lat: 0, long: 0 }, + 'Indian/Reunion': { lat: 0, long: 0 }, + 'Pacific/Apia': { lat: 0, long: 0 }, + 'Pacific/Auckland': { lat: 0, long: 0 }, + 'Pacific/Bougainville': { lat: 0, long: 0 }, + 'Pacific/Chatham': { lat: 0, long: 0 }, + 'Pacific/Chuuk': { lat: 0, long: 0 }, + 'Pacific/Easter': { lat: 0, long: 0 }, + 'Pacific/Efate': { lat: 0, long: 0 }, + 'Pacific/Fakaofo': { lat: 0, long: 0 }, + 'Pacific/Fiji': { lat: 0, long: 0 }, + 'Pacific/Funafuti': { lat: 0, long: 0 }, + 'Pacific/Galapagos': { lat: 0, long: 0 }, + 'Pacific/Gambier': { lat: 0, long: 0 }, + 'Pacific/Guadalcanal': { lat: 0, long: 0 }, + 'Pacific/Guam': { lat: 0, long: 0 }, + 'Pacific/Honolulu': { lat: 0, long: 0 }, + // 'Pacific/Kanton': {lat: 0, long: 0}, // Why is this not valid?, + 'Pacific/Kiritimati': { lat: 0, long: 0 }, + 'Pacific/Kosrae': { lat: 0, long: 0 }, + 'Pacific/Kwajalein': { lat: 0, long: 0 }, + 'Pacific/Majuro': { lat: 0, long: 0 }, + 'Pacific/Marquesas': { lat: 0, long: 0 }, + 'Pacific/Midway': { lat: 0, long: 0 }, + 'Pacific/Nauru': { lat: 0, long: 0 }, + 'Pacific/Niue': { lat: 0, long: 0 }, + 'Pacific/Norfolk': { lat: 0, long: 0 }, + 'Pacific/Noumea': { lat: 0, long: 0 }, + 'Pacific/Pago_Pago': { lat: 0, long: 0 }, + 'Pacific/Palau': { lat: 0, long: 0 }, + 'Pacific/Pitcairn': { lat: 0, long: 0 }, + 'Pacific/Pohnpei': { lat: 0, long: 0 }, + 'Pacific/Port_Moresby': { lat: 0, long: 0 }, + 'Pacific/Rarotonga': { lat: 0, long: 0 }, + 'Pacific/Saipan': { lat: 0, long: 0 }, + 'Pacific/Tahiti': { lat: 0, long: 0 }, + 'Pacific/Tarawa': { lat: 0, long: 0 }, + 'Pacific/Tongatapu': { lat: 0, long: 0 }, + 'Pacific/Wake': { lat: 0, long: 0 }, + 'Pacific/Wallis': { lat: 0, long: 0 }, } \ No newline at end of file diff --git a/src/app/timezone/services/timezone.service.ts b/src/app/timezone/services/timezone.service.ts index 9b182d4..aa2676c 100644 --- a/src/app/timezone/services/timezone.service.ts +++ b/src/app/timezone/services/timezone.service.ts @@ -1,459 +1,36 @@ import { Injectable } from '@angular/core'; import { DateTime } from 'luxon'; -import { Timezone, TimezoneCompare } from '../models/timezone.model'; +import { Timezone, TimezoneCompare, TimezoneList } from '../models/timezone.model'; @Injectable({ providedIn: 'root' }) export class TimezoneService { - timezones: string[] = [ - 'Africa/Abidjan', - 'Africa/Accra', - 'Africa/Addis_Ababa', - 'Africa/Algiers', - 'Africa/Asmara', - 'Africa/Bamako', - 'Africa/Bangui', - 'Africa/Banjul', - 'Africa/Bissau', - 'Africa/Blantyre', - 'Africa/Brazzaville', - 'Africa/Bujumbura', - 'Africa/Cairo', - 'Africa/Casablanca', - 'Africa/Ceuta', - 'Africa/Conakry', - 'Africa/Dakar', - 'Africa/Dar_es_Salaam', - 'Africa/Djibouti', - 'Africa/Douala', - 'Africa/El_Aaiun', - 'Africa/Freetown', - 'Africa/Gaborone', - 'Africa/Harare', - 'Africa/Johannesburg', - 'Africa/Juba', - 'Africa/Kampala', - 'Africa/Khartoum', - 'Africa/Kigali', - 'Africa/Kinshasa', - 'Africa/Lagos', - 'Africa/Libreville', - 'Africa/Lome', - 'Africa/Luanda', - 'Africa/Lubumbashi', - 'Africa/Lusaka', - 'Africa/Malabo', - 'Africa/Maputo', - 'Africa/Maseru', - 'Africa/Mbabane', - 'Africa/Mogadishu', - 'Africa/Monrovia', - 'Africa/Nairobi', - 'Africa/Ndjamena', - 'Africa/Niamey', - 'Africa/Nouakchott', - 'Africa/Ouagadougou', - 'Africa/Porto-Novo', - 'Africa/Sao_Tome', - 'Africa/Tripoli', - 'Africa/Tunis', - 'Africa/Windhoek', - 'America/Adak', - 'America/Anchorage', - 'America/Anguilla', - 'America/Antigua', - 'America/Araguaina', - 'America/Argentina/Buenos_Aires', - 'America/Argentina/Catamarca', - 'America/Argentina/Cordoba', - 'America/Argentina/Jujuy', - 'America/Argentina/La_Rioja', - 'America/Argentina/Mendoza', - 'America/Argentina/Rio_Gallegos', - 'America/Argentina/Salta', - 'America/Argentina/San_Juan', - 'America/Argentina/San_Luis', - 'America/Argentina/Tucuman', - 'America/Argentina/Ushuaia', - 'America/Aruba', - 'America/Asuncion', - 'America/Atikokan', - 'America/Bahia', - 'America/Bahia_Banderas', - 'America/Barbados', - 'America/Belem', - 'America/Belize', - 'America/Blanc-Sablon', - 'America/Boa_Vista', - 'America/Bogota', - 'America/Boise', - 'America/Cambridge_Bay', - 'America/Campo_Grande', - 'America/Cancun', - 'America/Caracas', - 'America/Cayenne', - 'America/Cayman', - 'America/Chicago', - 'America/Chihuahua', - 'America/Costa_Rica', - 'America/Creston', - 'America/Cuiaba', - 'America/Curacao', - 'America/Danmarkshavn', - 'America/Dawson', - 'America/Dawson_Creek', - 'America/Denver', - 'America/Detroit', - 'America/Dominica', - 'America/Edmonton', - 'America/Eirunepe', - 'America/El_Salvador', - 'America/Fort_Nelson', - 'America/Fortaleza', - 'America/Glace_Bay', - 'America/Goose_Bay', - 'America/Grand_Turk', - 'America/Grenada', - 'America/Guadeloupe', - 'America/Guatemala', - 'America/Guayaquil', - 'America/Guyana', - 'America/Halifax', - 'America/Havana', - 'America/Hermosillo', - 'America/Indiana/Indianapolis', - 'America/Indiana/Knox', - 'America/Indiana/Marengo', - 'America/Indiana/Petersburg', - 'America/Indiana/Tell_City', - 'America/Indiana/Vevay', - 'America/Indiana/Vincennes', - 'America/Indiana/Winamac', - 'America/Inuvik', - 'America/Iqaluit', - 'America/Jamaica', - 'America/Juneau', - 'America/Kentucky/Louisville', - 'America/Kentucky/Monticello', - 'America/Kralendijk', - 'America/La_Paz', - 'America/Lima', - 'America/Los_Angeles', - 'America/Lower_Princes', - 'America/Maceio', - 'America/Managua', - 'America/Manaus', - 'America/Marigot', - 'America/Martinique', - 'America/Matamoros', - 'America/Mazatlan', - 'America/Menominee', - 'America/Merida', - 'America/Metlakatla', - 'America/Mexico_City', - 'America/Miquelon', - 'America/Moncton', - 'America/Monterrey', - 'America/Montevideo', - 'America/Montserrat', - 'America/Nassau', - 'America/New_York', - 'America/Nipigon', - 'America/Nome', - 'America/Noronha', - 'America/North_Dakota/Beulah', - 'America/North_Dakota/Center', - 'America/North_Dakota/New_Salem', - 'America/Nuuk', - 'America/Ojinaga', - 'America/Panama', - 'America/Pangnirtung', - 'America/Paramaribo', - 'America/Phoenix', - 'America/Port-au-Prince', - 'America/Port_of_Spain', - 'America/Porto_Velho', - 'America/Puerto_Rico', - 'America/Punta_Arenas', - 'America/Rainy_River', - 'America/Rankin_Inlet', - 'America/Recife', - 'America/Regina', - 'America/Resolute', - 'America/Rio_Branco', - 'America/Santarem', - 'America/Santiago', - 'America/Santo_Domingo', - 'America/Sao_Paulo', - 'America/Scoresbysund', - 'America/Sitka', - 'America/St_Barthelemy', - 'America/St_Johns', - 'America/St_Kitts', - 'America/St_Lucia', - 'America/St_Thomas', - 'America/St_Vincent', - 'America/Swift_Current', - 'America/Tegucigalpa', - 'America/Thule', - 'America/Thunder_Bay', - 'America/Tijuana', - 'America/Toronto', - 'America/Tortola', - 'America/Vancouver', - 'America/Whitehorse', - 'America/Winnipeg', - 'America/Yakutat', - 'America/Yellowknife', - 'Antarctica/Casey', - 'Antarctica/Davis', - 'Antarctica/DumontDUrville', - 'Antarctica/Macquarie', - 'Antarctica/Mawson', - 'Antarctica/McMurdo', - 'Antarctica/Palmer', - 'Antarctica/Rothera', - 'Antarctica/Syowa', - 'Antarctica/Troll', - 'Antarctica/Vostok', - 'Arctic/Longyearbyen', - 'Asia/Aden', - 'Asia/Almaty', - 'Asia/Amman', - 'Asia/Anadyr', - 'Asia/Aqtau', - 'Asia/Aqtobe', - 'Asia/Ashgabat', - 'Asia/Atyrau', - 'Asia/Baghdad', - 'Asia/Bahrain', - 'Asia/Baku', - 'Asia/Bangkok', - 'Asia/Barnaul', - 'Asia/Beirut', - 'Asia/Bishkek', - 'Asia/Brunei', - 'Asia/Chita', - 'Asia/Choibalsan', - 'Asia/Colombo', - 'Asia/Damascus', - 'Asia/Dhaka', - 'Asia/Dili', - 'Asia/Dubai', - 'Asia/Dushanbe', - 'Asia/Famagusta', - 'Asia/Gaza', - 'Asia/Hebron', - 'Asia/Ho_Chi_Minh', - 'Asia/Hong_Kong', - 'Asia/Hovd', - 'Asia/Irkutsk', - 'Asia/Jakarta', - 'Asia/Jayapura', - 'Asia/Jerusalem', - 'Asia/Kabul', - 'Asia/Kamchatka', - 'Asia/Karachi', - 'Asia/Kathmandu', - 'Asia/Khandyga', - 'Asia/Kolkata', - 'Asia/Krasnoyarsk', - 'Asia/Kuala_Lumpur', - 'Asia/Kuching', - 'Asia/Kuwait', - 'Asia/Macau', - 'Asia/Magadan', - 'Asia/Makassar', - 'Asia/Manila', - 'Asia/Muscat', - 'Asia/Nicosia', - 'Asia/Novokuznetsk', - 'Asia/Novosibirsk', - 'Asia/Omsk', - 'Asia/Oral', - 'Asia/Phnom_Penh', - 'Asia/Pontianak', - 'Asia/Pyongyang', - 'Asia/Qatar', - 'Asia/Qostanay', - 'Asia/Qyzylorda', - 'Asia/Riyadh', - 'Asia/Sakhalin', - 'Asia/Samarkand', - 'Asia/Seoul', - 'Asia/Shanghai', - 'Asia/Singapore', - 'Asia/Srednekolymsk', - 'Asia/Taipei', - 'Asia/Tashkent', - 'Asia/Tbilisi', - 'Asia/Tehran', - 'Asia/Thimphu', - 'Asia/Tokyo', - 'Asia/Tomsk', - 'Asia/Ulaanbaatar', - 'Asia/Urumqi', - 'Asia/Ust-Nera', - 'Asia/Vientiane', - 'Asia/Vladivostok', - 'Asia/Yakutsk', - 'Asia/Yangon', - 'Asia/Yekaterinburg', - 'Asia/Yerevan', - 'Atlantic/Azores', - 'Atlantic/Bermuda', - 'Atlantic/Canary', - 'Atlantic/Cape_Verde', - 'Atlantic/Faroe', - 'Atlantic/Madeira', - 'Atlantic/Reykjavik', - 'Atlantic/South_Georgia', - 'Atlantic/St_Helena', - 'Atlantic/Stanley', - 'Australia/Adelaide', - 'Australia/Brisbane', - 'Australia/Broken_Hill', - 'Australia/Darwin', - 'Australia/Eucla', - 'Australia/Hobart', - 'Australia/Lindeman', - 'Australia/Lord_Howe', - 'Australia/Melbourne', - 'Australia/Perth', - 'Australia/Sydney', - 'Europe/Amsterdam', - 'Europe/Andorra', - 'Europe/Astrakhan', - 'Europe/Athens', - 'Europe/Belgrade', - 'Europe/Berlin', - 'Europe/Bratislava', - 'Europe/Brussels', - 'Europe/Bucharest', - 'Europe/Budapest', - 'Europe/Busingen', - 'Europe/Chisinau', - 'Europe/Copenhagen', - 'Europe/Dublin', - 'Europe/Gibraltar', - 'Europe/Guernsey', - 'Europe/Helsinki', - 'Europe/Isle_of_Man', - 'Europe/Istanbul', - 'Europe/Jersey', - 'Europe/Kaliningrad', - 'Europe/Kiev', - 'Europe/Kirov', - 'Europe/Lisbon', - 'Europe/Ljubljana', - 'Europe/London', - 'Europe/Luxembourg', - 'Europe/Madrid', - 'Europe/Malta', - 'Europe/Mariehamn', - 'Europe/Minsk', - 'Europe/Monaco', - 'Europe/Moscow', - 'Europe/Oslo', - 'Europe/Paris', - 'Europe/Podgorica', - 'Europe/Prague', - 'Europe/Riga', - 'Europe/Rome', - 'Europe/Samara', - 'Europe/San_Marino', - 'Europe/Sarajevo', - 'Europe/Saratov', - 'Europe/Simferopol', - 'Europe/Skopje', - 'Europe/Sofia', - 'Europe/Stockholm', - 'Europe/Tallinn', - 'Europe/Tirane', - 'Europe/Ulyanovsk', - 'Europe/Uzhgorod', - 'Europe/Vaduz', - 'Europe/Vatican', - 'Europe/Vienna', - 'Europe/Vilnius', - 'Europe/Volgograd', - 'Europe/Warsaw', - 'Europe/Zagreb', - 'Europe/Zaporozhye', - 'Europe/Zurich', - 'Indian/Antananarivo', - 'Indian/Chagos', - 'Indian/Christmas', - 'Indian/Cocos', - 'Indian/Comoro', - 'Indian/Kerguelen', - 'Indian/Mahe', - 'Indian/Maldives', - 'Indian/Mauritius', - 'Indian/Mayotte', - 'Indian/Reunion', - 'Pacific/Apia', - 'Pacific/Auckland', - 'Pacific/Bougainville', - 'Pacific/Chatham', - 'Pacific/Chuuk', - 'Pacific/Easter', - 'Pacific/Efate', - 'Pacific/Fakaofo', - 'Pacific/Fiji', - 'Pacific/Funafuti', - 'Pacific/Galapagos', - 'Pacific/Gambier', - 'Pacific/Guadalcanal', - 'Pacific/Guam', - 'Pacific/Honolulu', - // 'Pacific/Kanton', // Why is this not valid? - 'Pacific/Kiritimati', - 'Pacific/Kosrae', - 'Pacific/Kwajalein', - 'Pacific/Majuro', - 'Pacific/Marquesas', - 'Pacific/Midway', - 'Pacific/Nauru', - 'Pacific/Niue', - 'Pacific/Norfolk', - 'Pacific/Noumea', - 'Pacific/Pago_Pago', - 'Pacific/Palau', - 'Pacific/Pitcairn', - 'Pacific/Pohnpei', - 'Pacific/Port_Moresby', - 'Pacific/Rarotonga', - 'Pacific/Saipan', - 'Pacific/Tahiti', - 'Pacific/Tarawa', - 'Pacific/Tongatapu', - 'Pacific/Wake', - 'Pacific/Wallis', - ] - constructor() { } + public getCurrentTimezone() { + return DateTime.now().zoneName + } + public getTimezones(): string[] { - return this.timezones + return TimezoneList() } public getCurrentTimeForTimezone(timezone: string): DateTime | null { - + var dateTime = DateTime.local().setZone(timezone) return dateTime.isValid ? dateTime : null; - + } public getCurrentTimeInTimezones(timezones: string[]): Timezone[] { var dates: Timezone[] = []; - this.timezones.forEach(element => { + timezones.forEach(element => { var date = this.getCurrentTimeForTimezone(element); - if(date != null){ + if (date != null) { dates.push({ name: element, time: date }) } }); From d057766a01675bf2d540707095ad8fc41fd90536 Mon Sep 17 00:00:00 2001 From: Joel Wetzell Date: Thu, 2 Dec 2021 11:45:49 -0600 Subject: [PATCH 2/7] Add more lat/longs --- src/app/timezone/models/timezone.model.ts | 88 +++++++++++------------ 1 file changed, 43 insertions(+), 45 deletions(-) diff --git a/src/app/timezone/models/timezone.model.ts b/src/app/timezone/models/timezone.model.ts index c2fe7ee..9750fc3 100644 --- a/src/app/timezone/models/timezone.model.ts +++ b/src/app/timezone/models/timezone.model.ts @@ -34,8 +34,6 @@ export function GetClosestTimezoneFrom(timezone: string, timezones: Timezone[]) timezones.forEach(element => { var location2 = timezoneMap[element.name] - var radius = 6371; - var deltaLat = (location2.lat - location1.lat) * (Math.PI / 180); var deltaLong = (location2.long - location2.long) * (Math.PI / 180); @@ -43,10 +41,10 @@ export function GetClosestTimezoneFrom(timezone: string, timezones: Timezone[]) Math.cos(location1.lat * (Math.PI / 180)) * Math.cos(location2.lat * (Math.PI / 180)) * Math.sin(deltaLong / 2) * Math.sin(deltaLong / 2); - var distance = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a)) * radius; + var dist = Math.atan2(Math.sqrt(a), Math.sqrt(1 - a)); - if (distance < closestDist) { - closestDist = distance + if (dist < closestDist) { + closestDist = dist closestTimezone = element } }); @@ -75,47 +73,47 @@ export var timezoneMap: { [key: string]: TimezoneLocation } = { 'Africa/Bissau': { lat: 11.8632, long: -15.5843 }, 'Africa/Blantyre': { lat: -15.7667, long: 35.0168 }, 'Africa/Brazzaville': { lat: -4.2634, long: 15.2429 }, - 'Africa/Bujumbura': { lat: 0, long: 0 }, + 'Africa/Bujumbura': { lat: -3.3614, long: 29.3599 }, 'Africa/Cairo': { lat: 30.0444, long: 31.2357 }, - 'Africa/Casablanca': { lat: 0, long: 0 }, - 'Africa/Ceuta': { lat: 0, long: 0 }, - 'Africa/Conakry': { lat: 0, long: 0 }, - 'Africa/Dakar': { lat: 0, long: 0 }, - 'Africa/Dar_es_Salaam': { lat: 0, long: 0 }, - 'Africa/Djibouti': { lat: 0, long: 0 }, - 'Africa/Douala': { lat: 0, long: 0 }, - 'Africa/El_Aaiun': { lat: 0, long: 0 }, - 'Africa/Freetown': { lat: 0, long: 0 }, - 'Africa/Gaborone': { lat: 0, long: 0 }, - 'Africa/Harare': { lat: 0, long: 0 }, - 'Africa/Johannesburg': { lat: 0, long: 0 }, - 'Africa/Juba': { lat: 0, long: 0 }, - 'Africa/Kampala': { lat: 0, long: 0 }, - 'Africa/Khartoum': { lat: 0, long: 0 }, - 'Africa/Kigali': { lat: 0, long: 0 }, - 'Africa/Kinshasa': { lat: 0, long: 0 }, - 'Africa/Lagos': { lat: 0, long: 0 }, - 'Africa/Libreville': { lat: 0, long: 0 }, - 'Africa/Lome': { lat: 0, long: 0 }, - 'Africa/Luanda': { lat: 0, long: 0 }, - 'Africa/Lubumbashi': { lat: 0, long: 0 }, - 'Africa/Lusaka': { lat: 0, long: 0 }, - 'Africa/Malabo': { lat: 0, long: 0 }, - 'Africa/Maputo': { lat: 0, long: 0 }, - 'Africa/Maseru': { lat: 0, long: 0 }, - 'Africa/Mbabane': { lat: 0, long: 0 }, - 'Africa/Mogadishu': { lat: 0, long: 0 }, - 'Africa/Monrovia': { lat: 0, long: 0 }, - 'Africa/Nairobi': { lat: 0, long: 0 }, - 'Africa/Ndjamena': { lat: 0, long: 0 }, - 'Africa/Niamey': { lat: 0, long: 0 }, - 'Africa/Nouakchott': { lat: 0, long: 0 }, - 'Africa/Ouagadougou': { lat: 0, long: 0 }, - 'Africa/Porto-Novo': { lat: 0, long: 0 }, - 'Africa/Sao_Tome': { lat: 0, long: 0 }, - 'Africa/Tripoli': { lat: 0, long: 0 }, - 'Africa/Tunis': { lat: 0, long: 0 }, - 'Africa/Windhoek': { lat: 0, long: 0 }, + 'Africa/Casablanca': { lat: 33.5731, long: -7.5898 }, + 'Africa/Ceuta': { lat: 35.8894, long: -5.3213 }, + 'Africa/Conakry': { lat: 9.6412, long: -13.5784 }, + 'Africa/Dakar': { lat: 14.7167, long: -17.4677 }, + 'Africa/Dar_es_Salaam': { lat: -6.7924, long: 39.2083 }, + 'Africa/Djibouti': { lat: 11.5721, long: 43.1456 }, + 'Africa/Douala': { lat: 4.0511, long: 9.7679 }, + 'Africa/El_Aaiun': { lat: 27.1500, long: -13.1991 }, + 'Africa/Freetown': { lat: 8.4657, long: -13.2317 }, + 'Africa/Gaborone': { lat: -24.6282, long: 25.9231 }, + 'Africa/Harare': { lat: -17.8216, long: 31.0492 }, + 'Africa/Johannesburg': { lat: -26.2041, long: 28.0473 }, + 'Africa/Juba': { lat: 4.8594, long: 31.5713 }, + 'Africa/Kampala': { lat: 0.3476, long: 32.5825 }, + 'Africa/Khartoum': { lat: 15.5007, long: 32.5599 }, + 'Africa/Kigali': { lat: -1.9579, long: 30.1127 }, + 'Africa/Kinshasa': { lat: -4.4419, long: 15.2663 }, + 'Africa/Lagos': { lat: 6.5244, long: 3.3792 }, + 'Africa/Libreville': { lat: 0.4162, long: 9.4673 }, + 'Africa/Lome': { lat: 6.1256, long: 1.2254 }, + 'Africa/Luanda': { lat: -8.8147, long: 13.2302 }, + 'Africa/Lubumbashi': { lat: -11.6876, long: 27.5026 }, + 'Africa/Lusaka': { lat: -15.3875, long: 28.3228 }, + 'Africa/Malabo': { lat: 3.7550, long: 8.7821 }, + 'Africa/Maputo': { lat: -25.9692, long: 32.5732 }, + 'Africa/Maseru': { lat: -29.3151, long: 27.4869 }, + 'Africa/Mbabane': { lat: -26.3054, long: 31.1367 }, + 'Africa/Mogadishu': { lat: 2.0469, long: 45.3182 }, + 'Africa/Monrovia': { lat: 6.3156, long: -10.8074 }, + 'Africa/Nairobi': {lat: -1.2921, long: 36.8219}, + 'Africa/Ndjamena': { lat: 12.1348, long: 15.0557 }, + 'Africa/Niamey': { lat: 13.5116, long: 2.1254 }, + 'Africa/Nouakchott': { lat: 18.0735, long: -15.9582 }, + 'Africa/Ouagadougou': { lat: 12.3714, long: -1.5197 }, + 'Africa/Porto-Novo': { lat: 6.4969, long: 2.6289 }, + 'Africa/Sao_Tome': { lat: 0.1864, long: 6.6131 }, + 'Africa/Tripoli': { lat: 32.8872, long: 13.1913 }, + 'Africa/Tunis': { lat: 36.8065, long: 10.1815 }, + 'Africa/Windhoek': { lat: -22.5609, long: 17.0658 }, 'America/Adak': { lat: 0, long: 0 }, 'America/Anchorage': { lat: 0, long: 0 }, 'America/Anguilla': { lat: 0, long: 0 }, From 76439a933a3da42d7bd1d383b96eba87dfb7af6a Mon Sep 17 00:00:00 2001 From: Joel Wetzell Date: Thu, 2 Dec 2021 21:46:24 -0600 Subject: [PATCH 3/7] More progress toward locations --- src/app/timezone/models/timezone.model.ts | 160 +++++++++++----------- 1 file changed, 80 insertions(+), 80 deletions(-) diff --git a/src/app/timezone/models/timezone.model.ts b/src/app/timezone/models/timezone.model.ts index 9750fc3..5ce0ccc 100644 --- a/src/app/timezone/models/timezone.model.ts +++ b/src/app/timezone/models/timezone.model.ts @@ -102,9 +102,9 @@ export var timezoneMap: { [key: string]: TimezoneLocation } = { 'Africa/Maputo': { lat: -25.9692, long: 32.5732 }, 'Africa/Maseru': { lat: -29.3151, long: 27.4869 }, 'Africa/Mbabane': { lat: -26.3054, long: 31.1367 }, - 'Africa/Mogadishu': { lat: 2.0469, long: 45.3182 }, - 'Africa/Monrovia': { lat: 6.3156, long: -10.8074 }, - 'Africa/Nairobi': {lat: -1.2921, long: 36.8219}, + 'Africa/Mogadishu': { lat: 2.0469, long: 45.3182 }, + 'Africa/Monrovia': { lat: 6.3156, long: -10.8074 }, + 'Africa/Nairobi': { lat: -1.2921, long: 36.8219 }, 'Africa/Ndjamena': { lat: 12.1348, long: 15.0557 }, 'Africa/Niamey': { lat: 13.5116, long: 2.1254 }, 'Africa/Nouakchott': { lat: 18.0735, long: -15.9582 }, @@ -114,84 +114,84 @@ export var timezoneMap: { [key: string]: TimezoneLocation } = { 'Africa/Tripoli': { lat: 32.8872, long: 13.1913 }, 'Africa/Tunis': { lat: 36.8065, long: 10.1815 }, 'Africa/Windhoek': { lat: -22.5609, long: 17.0658 }, - 'America/Adak': { lat: 0, long: 0 }, - 'America/Anchorage': { lat: 0, long: 0 }, - 'America/Anguilla': { lat: 0, long: 0 }, - 'America/Antigua': { lat: 0, long: 0 }, - 'America/Araguaina': { lat: 0, long: 0 }, - 'America/Argentina/Buenos_Aires': { lat: 0, long: 0 }, - 'America/Argentina/Catamarca': { lat: 0, long: 0 }, - 'America/Argentina/Cordoba': { lat: 0, long: 0 }, - 'America/Argentina/Jujuy': { lat: 0, long: 0 }, - 'America/Argentina/La_Rioja': { lat: 0, long: 0 }, - 'America/Argentina/Mendoza': { lat: 0, long: 0 }, - 'America/Argentina/Rio_Gallegos': { lat: 0, long: 0 }, - 'America/Argentina/Salta': { lat: 0, long: 0 }, - 'America/Argentina/San_Juan': { lat: 0, long: 0 }, - 'America/Argentina/San_Luis': { lat: 0, long: 0 }, - 'America/Argentina/Tucuman': { lat: 0, long: 0 }, - 'America/Argentina/Ushuaia': { lat: 0, long: 0 }, - 'America/Aruba': { lat: 0, long: 0 }, - 'America/Asuncion': { lat: 0, long: 0 }, - 'America/Atikokan': { lat: 0, long: 0 }, - 'America/Bahia': { lat: 0, long: 0 }, - 'America/Bahia_Banderas': { lat: 0, long: 0 }, - 'America/Barbados': { lat: 0, long: 0 }, - 'America/Belem': { lat: 0, long: 0 }, - 'America/Belize': { lat: 0, long: 0 }, - 'America/Blanc-Sablon': { lat: 0, long: 0 }, - 'America/Boa_Vista': { lat: 0, long: 0 }, - 'America/Bogota': { lat: 0, long: 0 }, - 'America/Boise': { lat: 0, long: 0 }, - 'America/Cambridge_Bay': { lat: 0, long: 0 }, - 'America/Campo_Grande': { lat: 0, long: 0 }, - 'America/Cancun': { lat: 0, long: 0 }, - 'America/Caracas': { lat: 0, long: 0 }, - 'America/Cayenne': { lat: 0, long: 0 }, - 'America/Cayman': { lat: 0, long: 0 }, + 'America/Adak': { lat: 51.8800, long: -176.6581 }, + 'America/Anchorage': { lat: 61.2181, long: -149.9003 }, + 'America/Anguilla': { lat: 18.2206, long: -63.0686 }, + 'America/Antigua': { lat: 14.5573, long: -90.7332 }, + 'America/Araguaina': { lat: -7.1916, long: -48.2095 }, + 'America/Argentina/Buenos_Aires': { lat: -34.6037, long: -58.3816 }, + 'America/Argentina/Catamarca': { lat: -28.4696, long: -65.7795 }, + 'America/Argentina/Cordoba': { lat: -31.4201, long: -64.1888 }, + 'America/Argentina/Jujuy': { lat: -24.1858, long: -65.2995 }, + 'America/Argentina/La_Rioja': { lat: 42.2871, long: -2.5396 }, + 'America/Argentina/Mendoza': { lat: -32.8895, long: -68.8458 }, + 'America/Argentina/Rio_Gallegos': { lat: -51.6230, long: -69.2168 }, + 'America/Argentina/Salta': { lat: -24.7821, long: -65.4232 }, + 'America/Argentina/San_Juan': { lat: -31.5351, long: -68.5386 }, + 'America/Argentina/San_Luis': { lat: -33.3017, long: -66.3378 }, + 'America/Argentina/Tucuman': { lat: -26.8083, long: -65.2176 }, + 'America/Argentina/Ushuaia': { lat: -54.8019, long: -68.3030 }, + 'America/Aruba': { lat: 12.5211, long: -69.9683 }, + 'America/Asuncion': { lat: -25.2637, long: -57.5759 }, + 'America/Atikokan': { lat: 48.7575, long: -91.6218 }, + 'America/Bahia': { lat: -11.4099, long: -41.2809 }, + 'America/Bahia_Banderas': { lat: 20.8075, long: -105.2481 }, + 'America/Barbados': { lat: 13.1939, long: -59.5432 }, + 'America/Belem': { lat: -1.4563, long: -48.5013 }, + 'America/Belize': { lat: 17.5046, long: -88.1962 }, + 'America/Blanc-Sablon': { lat: 51.4264, long: -57.1313 }, + 'America/Boa_Vista': { lat: 2.8206, long: -60.6738 }, + 'America/Bogota': { lat: 4.7110, long: -74.0721 }, + 'America/Boise': { lat: 43.6150, long: -116.2023 }, + 'America/Cambridge_Bay': { lat: 69.1169, long: -105.0597 }, + 'America/Campo_Grande': { lat: -20.4649, long: -54.6218 }, + 'America/Cancun': { lat: 21.1619, long: -86.8515 }, + 'America/Caracas': { lat: 10.4806, long: -66.9036 }, + 'America/Cayenne': { lat: 4.9224, long: -52.3135 }, + 'America/Cayman': { lat: 19.3133, long: -81.2546 }, 'America/Chicago': { lat: 41.8781, long: -87.6298 }, - 'America/Chihuahua': { lat: 0, long: 0 }, - 'America/Costa_Rica': { lat: 0, long: 0 }, - 'America/Creston': { lat: 0, long: 0 }, - 'America/Cuiaba': { lat: 0, long: 0 }, - 'America/Curacao': { lat: 0, long: 0 }, - 'America/Danmarkshavn': { lat: 0, long: 0 }, - 'America/Dawson': { lat: 0, long: 0 }, - 'America/Dawson_Creek': { lat: 0, long: 0 }, - 'America/Denver': { lat: 0, long: 0 }, - 'America/Detroit': { lat: 0, long: 0 }, - 'America/Dominica': { lat: 0, long: 0 }, - 'America/Edmonton': { lat: 0, long: 0 }, - 'America/Eirunepe': { lat: 0, long: 0 }, - 'America/El_Salvador': { lat: 0, long: 0 }, - 'America/Fort_Nelson': { lat: 0, long: 0 }, - 'America/Fortaleza': { lat: 0, long: 0 }, - 'America/Glace_Bay': { lat: 0, long: 0 }, - 'America/Goose_Bay': { lat: 0, long: 0 }, - 'America/Grand_Turk': { lat: 0, long: 0 }, - 'America/Grenada': { lat: 0, long: 0 }, - 'America/Guadeloupe': { lat: 0, long: 0 }, - 'America/Guatemala': { lat: 0, long: 0 }, - 'America/Guayaquil': { lat: 0, long: 0 }, - 'America/Guyana': { lat: 0, long: 0 }, - 'America/Halifax': { lat: 0, long: 0 }, - 'America/Havana': { lat: 0, long: 0 }, - 'America/Hermosillo': { lat: 0, long: 0 }, - 'America/Indiana/Indianapolis': { lat: 0, long: 0 }, - 'America/Indiana/Knox': { lat: 0, long: 0 }, - 'America/Indiana/Marengo': { lat: 0, long: 0 }, - 'America/Indiana/Petersburg': { lat: 0, long: 0 }, - 'America/Indiana/Tell_City': { lat: 0, long: 0 }, - 'America/Indiana/Vevay': { lat: 0, long: 0 }, - 'America/Indiana/Vincennes': { lat: 0, long: 0 }, - 'America/Indiana/Winamac': { lat: 0, long: 0 }, - 'America/Inuvik': { lat: 0, long: 0 }, - 'America/Iqaluit': { lat: 0, long: 0 }, - 'America/Jamaica': { lat: 0, long: 0 }, - 'America/Juneau': { lat: 0, long: 0 }, - 'America/Kentucky/Louisville': { lat: 0, long: 0 }, - 'America/Kentucky/Monticello': { lat: 0, long: 0 }, - 'America/Kralendijk': { lat: 0, long: 0 }, + 'America/Chihuahua': { lat: 28.6330, long: -106.0691 }, + 'America/Costa_Rica': { lat: 9.7489, long: -83.7534 }, + 'America/Creston': { lat: 41.0586, long: -94.3613 }, + 'America/Cuiaba': { lat: -15.5954, long: -56.0926 }, + 'America/Curacao': { lat: 12.1696, long: -68.9900 }, + 'America/Danmarkshavn': { lat: 76.7667, long: -18.6667 }, + 'America/Dawson': { lat: 46.8686, long: -99.7515 }, + 'America/Dawson_Creek': { lat: 55.7596, long: -120.2377 }, + 'America/Denver': { lat: 39.7392, long: -104.9903 }, + 'America/Detroit': { lat: 42.3314, long: -83.0458 }, + 'America/Dominica': { lat: 15.4150, long: -61.3710 }, + 'America/Edmonton': { lat: 53.5461, long: -113.4938 }, + 'America/Eirunepe': { lat: -6.6571, long: -69.8667 }, + 'America/El_Salvador': { lat: 13.7942, long: -88.8965 }, + 'America/Fort_Nelson': { lat: 58.8050, long: -122.6972 }, + 'America/Fortaleza': { lat: -3.7327, long: -38.5270 }, + 'America/Glace_Bay': { lat: 46.1969, long: -59.9570 }, + 'America/Goose_Bay': { lat: 53.3017, long: -60.3261 }, + 'America/Grand_Turk': { lat: 21.4675, long: -71.1389 }, + 'America/Grenada': { lat: 12.1165, long: -61.6790 }, + 'America/Guadeloupe': { lat: 16.2650, long: -61.5510 }, + 'America/Guatemala': { lat: 15.7835, long: -90.2308 }, + 'America/Guayaquil': { lat: -2.1894, long: -79.8891 }, + 'America/Guyana': { lat: 4.8604, long: -58.9302 }, + 'America/Halifax': { lat: 44.6488, long: -63.5752 }, + 'America/Havana': { lat: 23.1136, long: -82.3666 }, + 'America/Hermosillo': { lat: 29.0730, long: -110.9559 }, + 'America/Indiana/Indianapolis': { lat: 39.7684, long: -86.1581 }, + 'America/Indiana/Knox': { lat: 41.2959, long: -86.6250 }, + 'America/Indiana/Marengo': { lat: 38.3692, long: -86.3436 }, + 'America/Indiana/Petersburg': { lat: 38.4920, long: -87.2786 }, + 'America/Indiana/Tell_City': { lat: 37.9514, long: -86.7678 }, + 'America/Indiana/Vevay': { lat: 38.7478, long: -85.0672 }, + 'America/Indiana/Vincennes': { lat: 38.6773, long: -87.5286 }, + 'America/Indiana/Winamac': { lat: 41.0514, long: -86.6031 }, + 'America/Inuvik': { lat: 68.3607, long: -133.7230 }, + 'America/Iqaluit': { lat: 63.7467, long: -68.5170 }, + 'America/Jamaica': { lat: 18.1096, long: -77.2975 }, + 'America/Juneau': { lat: 58.3019, long: -134.4197 }, + 'America/Kentucky/Louisville': { lat: 38.2527, long: -85.7585 }, + 'America/Kentucky/Monticello': { lat: 36.8298, long: -84.8491 }, + 'America/Kralendijk': { lat: 12.1443, long: -68.2655 }, 'America/La_Paz': { lat: 0, long: 0 }, 'America/Lima': { lat: 0, long: 0 }, 'America/Los_Angeles': { lat: 0, long: 0 }, From d370b5923c944bf707a89d3a92ff2c150a85d823 Mon Sep 17 00:00:00 2001 From: Joel Wetzell Date: Thu, 2 Dec 2021 21:53:14 -0600 Subject: [PATCH 4/7] Another round of timezone locations --- src/app/timezone/models/timezone.model.ts | 30 +++++++++++------------ 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/app/timezone/models/timezone.model.ts b/src/app/timezone/models/timezone.model.ts index 5ce0ccc..1a98378 100644 --- a/src/app/timezone/models/timezone.model.ts +++ b/src/app/timezone/models/timezone.model.ts @@ -192,21 +192,21 @@ export var timezoneMap: { [key: string]: TimezoneLocation } = { 'America/Kentucky/Louisville': { lat: 38.2527, long: -85.7585 }, 'America/Kentucky/Monticello': { lat: 36.8298, long: -84.8491 }, 'America/Kralendijk': { lat: 12.1443, long: -68.2655 }, - 'America/La_Paz': { lat: 0, long: 0 }, - 'America/Lima': { lat: 0, long: 0 }, - 'America/Los_Angeles': { lat: 0, long: 0 }, - 'America/Lower_Princes': { lat: 0, long: 0 }, - 'America/Maceio': { lat: 0, long: 0 }, - 'America/Managua': { lat: 0, long: 0 }, - 'America/Manaus': { lat: 0, long: 0 }, - 'America/Marigot': { lat: 0, long: 0 }, - 'America/Martinique': { lat: 0, long: 0 }, - 'America/Matamoros': { lat: 0, long: 0 }, - 'America/Mazatlan': { lat: 0, long: 0 }, - 'America/Menominee': { lat: 0, long: 0 }, - 'America/Merida': { lat: 0, long: 0 }, - 'America/Metlakatla': { lat: 0, long: 0 }, - 'America/Mexico_City': { lat: 0, long: 0 }, + 'America/La_Paz': { lat: -16.4897, long: -68.1193 }, + 'America/Lima': { lat: -12.0464, long: -77.0428 }, + 'America/Los_Angeles': { lat: 34.0522, long: -118.2437 }, + 'America/Lower_Princes': { lat: 18.0513, long: -63.0471 }, + 'America/Maceio': { lat: -9.6660, long: -35.7352 }, + 'America/Managua': { lat: 12.1150, long: -86.2362 }, + 'America/Manaus': { lat: -3.1190, long: -60.0217 }, + 'America/Marigot': { lat: 18.0675, long: -63.0825 }, + 'America/Martinique': { lat: 14.6415, long: -61.0242 }, + 'America/Matamoros': { lat: 25.8690, long: -97.5027 }, + 'America/Mazatlan': { lat: 23.2494, long: -106.4111 }, + 'America/Menominee': { lat: 45.1078, long: -87.6143 }, + 'America/Merida': { lat: 20.9674, long: -89.5926 }, + 'America/Metlakatla': { lat: 55.1292, long: -131.5722 }, + 'America/Mexico_City': { lat: 19.4326, long: -99.1332 }, 'America/Miquelon': { lat: 0, long: 0 }, 'America/Moncton': { lat: 0, long: 0 }, 'America/Monterrey': { lat: 0, long: 0 }, From 9877249e541b4969056bf074e64b6109201b93c3 Mon Sep 17 00:00:00 2001 From: Joel Wetzell Date: Thu, 9 Dec 2021 22:50:32 -0600 Subject: [PATCH 5/7] Add Pacific, Indian and Antarctica time zones --- src/app/timezone/models/timezone.model.ts | 122 +++++++++++----------- 1 file changed, 61 insertions(+), 61 deletions(-) diff --git a/src/app/timezone/models/timezone.model.ts b/src/app/timezone/models/timezone.model.ts index 1a98378..273ab10 100644 --- a/src/app/timezone/models/timezone.model.ts +++ b/src/app/timezone/models/timezone.model.ts @@ -261,18 +261,18 @@ export var timezoneMap: { [key: string]: TimezoneLocation } = { 'America/Winnipeg': { lat: 0, long: 0 }, 'America/Yakutat': { lat: 0, long: 0 }, 'America/Yellowknife': { lat: 0, long: 0 }, - 'Antarctica/Casey': { lat: 0, long: 0 }, - 'Antarctica/Davis': { lat: 0, long: 0 }, - 'Antarctica/DumontDUrville': { lat: 0, long: 0 }, - 'Antarctica/Macquarie': { lat: 0, long: 0 }, - 'Antarctica/Mawson': { lat: 0, long: 0 }, - 'Antarctica/McMurdo': { lat: 0, long: 0 }, - 'Antarctica/Palmer': { lat: 0, long: 0 }, - 'Antarctica/Rothera': { lat: 0, long: 0 }, - 'Antarctica/Syowa': { lat: 0, long: 0 }, - 'Antarctica/Troll': { lat: 0, long: 0 }, - 'Antarctica/Vostok': { lat: 0, long: 0 }, - 'Arctic/Longyearbyen': { lat: 0, long: 0 }, + 'Antarctica/Casey': { lat: -66.2821, long: 110.5285 }, + 'Antarctica/Davis': { lat: -68.5762, long: 77.9696 }, + 'Antarctica/DumontDUrville': { lat: -66.6630, long: 140.0019 }, + 'Antarctica/Macquarie': { lat: -54.6208, long: 158.8556 }, + 'Antarctica/Mawson': { lat: -67.6033, long: 62.8742 }, + 'Antarctica/McMurdo': { lat: -77.8419, long: 166.6863 }, + 'Antarctica/Palmer': { lat: -64.7743, long: -64.0538 }, + 'Antarctica/Rothera': { lat: -67.5666644,long: -68.1333328 }, + 'Antarctica/Syowa': { lat: -69.0044, long: 39.5816 }, + 'Antarctica/Troll': { lat: -72.0166, long: 2.5333 }, + 'Antarctica/Vostok': { lat: -78.4645, long: 106.8339 }, + 'Arctic/Longyearbyen': { lat: 78.2232, long: 15.6267 }, 'Asia/Aden': { lat: 0, long: 0 }, 'Asia/Almaty': { lat: 0, long: 0 }, 'Asia/Amman': { lat: 0, long: 0 }, @@ -437,53 +437,53 @@ export var timezoneMap: { [key: string]: TimezoneLocation } = { 'Europe/Zagreb': { lat: 0, long: 0 }, 'Europe/Zaporozhye': { lat: 0, long: 0 }, 'Europe/Zurich': { lat: 0, long: 0 }, - 'Indian/Antananarivo': { lat: 0, long: 0 }, - 'Indian/Chagos': { lat: 0, long: 0 }, - 'Indian/Christmas': { lat: 0, long: 0 }, - 'Indian/Cocos': { lat: 0, long: 0 }, - 'Indian/Comoro': { lat: 0, long: 0 }, - 'Indian/Kerguelen': { lat: 0, long: 0 }, - 'Indian/Mahe': { lat: 0, long: 0 }, - 'Indian/Maldives': { lat: 0, long: 0 }, - 'Indian/Mauritius': { lat: 0, long: 0 }, - 'Indian/Mayotte': { lat: 0, long: 0 }, - 'Indian/Reunion': { lat: 0, long: 0 }, - 'Pacific/Apia': { lat: 0, long: 0 }, - 'Pacific/Auckland': { lat: 0, long: 0 }, - 'Pacific/Bougainville': { lat: 0, long: 0 }, - 'Pacific/Chatham': { lat: 0, long: 0 }, - 'Pacific/Chuuk': { lat: 0, long: 0 }, - 'Pacific/Easter': { lat: 0, long: 0 }, - 'Pacific/Efate': { lat: 0, long: 0 }, - 'Pacific/Fakaofo': { lat: 0, long: 0 }, - 'Pacific/Fiji': { lat: 0, long: 0 }, - 'Pacific/Funafuti': { lat: 0, long: 0 }, - 'Pacific/Galapagos': { lat: 0, long: 0 }, - 'Pacific/Gambier': { lat: 0, long: 0 }, - 'Pacific/Guadalcanal': { lat: 0, long: 0 }, - 'Pacific/Guam': { lat: 0, long: 0 }, - 'Pacific/Honolulu': { lat: 0, long: 0 }, - // 'Pacific/Kanton': {lat: 0, long: 0}, // Why is this not valid?, - 'Pacific/Kiritimati': { lat: 0, long: 0 }, - 'Pacific/Kosrae': { lat: 0, long: 0 }, - 'Pacific/Kwajalein': { lat: 0, long: 0 }, - 'Pacific/Majuro': { lat: 0, long: 0 }, - 'Pacific/Marquesas': { lat: 0, long: 0 }, - 'Pacific/Midway': { lat: 0, long: 0 }, - 'Pacific/Nauru': { lat: 0, long: 0 }, - 'Pacific/Niue': { lat: 0, long: 0 }, - 'Pacific/Norfolk': { lat: 0, long: 0 }, - 'Pacific/Noumea': { lat: 0, long: 0 }, - 'Pacific/Pago_Pago': { lat: 0, long: 0 }, - 'Pacific/Palau': { lat: 0, long: 0 }, - 'Pacific/Pitcairn': { lat: 0, long: 0 }, - 'Pacific/Pohnpei': { lat: 0, long: 0 }, - 'Pacific/Port_Moresby': { lat: 0, long: 0 }, - 'Pacific/Rarotonga': { lat: 0, long: 0 }, - 'Pacific/Saipan': { lat: 0, long: 0 }, - 'Pacific/Tahiti': { lat: 0, long: 0 }, - 'Pacific/Tarawa': { lat: 0, long: 0 }, - 'Pacific/Tongatapu': { lat: 0, long: 0 }, - 'Pacific/Wake': { lat: 0, long: 0 }, - 'Pacific/Wallis': { lat: 0, long: 0 }, + 'Indian/Antananarivo': { lat: -18.8792, long: 47.5079 }, + 'Indian/Chagos': { lat: -4.416665, long: 72.5999976 }, + 'Indian/Christmas': { lat: -10.4475, long: 105.6904 }, + 'Indian/Cocos': { lat: -12.1642, long: 96.8710 }, + 'Indian/Comoro': { lat: -11.6455, long: 43.3333 }, + 'Indian/Kerguelen': { lat: -49.3948, long: 69.3545 }, + 'Indian/Mahe': { lat: -4.6827, long: 55.4804 }, + 'Indian/Maldives': { lat: 3.2028, long: 73.2207 }, + 'Indian/Mauritius': { lat: -20.3484, long: 57.5522 }, + 'Indian/Mayotte': { lat: -12.8275, long: 45.1662 }, + 'Indian/Reunion': { lat: -21.1151, long: 55.5364 }, + 'Pacific/Apia': { lat: -13.8507, long: -171.7514 }, + 'Pacific/Auckland': { lat: -36.8509, long: 174.7645 }, + 'Pacific/Bougainville': { lat: -6.3754, long: 155.3807 }, + 'Pacific/Chatham': { lat: -44.0058, long: -176.5401 }, + 'Pacific/Chuuk': { lat: 7.417, long: 151.783 }, + 'Pacific/Easter': { lat: -27.1127, long: -109.3497 }, + 'Pacific/Efate': { lat: -17.6577, long: 168.4297 }, + 'Pacific/Fakaofo': { lat: -9.3803, long: -171.2188 }, + 'Pacific/Fiji': { lat: -17.7134, long: 178.0650 }, + 'Pacific/Funafuti': { lat: -8.5211, long: 179.1962 }, + 'Pacific/Galapagos': { lat: -0.7772, long: -91.1425 }, + 'Pacific/Gambier': { lat: 40.3756, long: -82.3971 }, + 'Pacific/Guadalcanal': { lat: -9.5773, long: 160.1456 }, + 'Pacific/Guam': { lat: 13.4443, long: 144.7937 }, + 'Pacific/Honolulu': { lat: 21.3069, long: -157.8583 }, + // 'Pacific/Kanton': { lat: -2.8040, long: -171.6432 }, // Why is this not valid?, + 'Pacific/Kiritimati': { lat: 1.8721, long: -157.4278 }, + 'Pacific/Kosrae': { lat: 5.2992, long: 162.9697 }, + 'Pacific/Kwajalein': { lat: 8.7167, long: 167.7333 }, + 'Pacific/Majuro': { lat: 7.0667, long: 171.2667 }, + 'Pacific/Marquesas': { lat: -9.7812, long: -139.0817 }, + 'Pacific/Midway': { lat: 28.2072, long: -177.3735 }, + 'Pacific/Nauru': { lat: -0.5228, long: 166.9315 }, + 'Pacific/Niue': { lat: -19.0544, long: -169.8672 }, + 'Pacific/Norfolk': { lat: -29.0408, long: 167.9547 }, + 'Pacific/Noumea': { lat: -22.2735, long: 166.4481 }, + 'Pacific/Pago_Pago': { lat: -14.2756, long: -170.7020 }, + 'Pacific/Palau': { lat: 7.5150, long: 134.5825 }, + 'Pacific/Pitcairn': { lat: -24.3768, long: -128.3242 }, + 'Pacific/Pohnpei': { lat: 6.8541, long: 158.2624 }, + 'Pacific/Port_Moresby': { lat: -9.4438, long: 147.1803 }, + 'Pacific/Rarotonga': { lat: -21.2292, long: -159.7763 }, + 'Pacific/Saipan': { lat: 15.1850, long: 145.7467 }, + 'Pacific/Tahiti': { lat: -17.6509, long: -149.4260 }, + 'Pacific/Tarawa': { lat: 1.4518, long: 172.9717 }, + 'Pacific/Tongatapu': { lat: -21.1466, long: -175.2515 }, + 'Pacific/Wake': { lat: 19.2796, long: 166.6499 }, + 'Pacific/Wallis': { lat: -14.2938, long: -178.1165 }, } \ No newline at end of file From 3cabf260e8eabc6008b686f9452e8f07650c5264 Mon Sep 17 00:00:00 2001 From: Joel Wetzell Date: Fri, 10 Dec 2021 14:45:52 -0600 Subject: [PATCH 6/7] Add route for closest and list --- src/app/app-routing.module.ts | 15 +++++ src/app/app.component.html | 5 +- src/app/app.component.scss | 52 ----------------- src/app/app.module.ts | 8 ++- .../timezone-closest.component.html | 8 +++ .../timezone-closest.component.scss | 46 +++++++++++++++ .../timezone-closest.component.spec.ts | 25 ++++++++ .../timezone-closest.component.ts | 33 +++++++++++ .../timezone-list.component.html | 8 +++ .../timezone-list.component.scss | 57 +++++++++++++++++++ .../timezone-list.component.spec.ts | 25 ++++++++ .../timezone-list/timezone-list.component.ts | 32 +++++++++++ src/styles.scss | 6 +- 13 files changed, 261 insertions(+), 59 deletions(-) create mode 100644 src/app/app-routing.module.ts create mode 100644 src/app/timezone/components/timezone-closest/timezone-closest.component.html create mode 100644 src/app/timezone/components/timezone-closest/timezone-closest.component.scss create mode 100644 src/app/timezone/components/timezone-closest/timezone-closest.component.spec.ts create mode 100644 src/app/timezone/components/timezone-closest/timezone-closest.component.ts create mode 100644 src/app/timezone/components/timezone-list/timezone-list.component.html create mode 100644 src/app/timezone/components/timezone-list/timezone-list.component.scss create mode 100644 src/app/timezone/components/timezone-list/timezone-list.component.spec.ts create mode 100644 src/app/timezone/components/timezone-list/timezone-list.component.ts diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts new file mode 100644 index 0000000..cd5ea69 --- /dev/null +++ b/src/app/app-routing.module.ts @@ -0,0 +1,15 @@ +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from '@angular/router'; +import { TimezoneClosestComponent } from './timezone/components/timezone-closest/timezone-closest.component'; +import { TimezoneListComponent } from './timezone/components/timezone-list/timezone-list.component'; + +const routes: Routes = [ + { path: '', component: TimezoneListComponent }, + { path: 'closest', component: TimezoneClosestComponent }, +]; + +@NgModule({ + imports: [RouterModule.forRoot(routes)], + exports: [RouterModule] +}) +export class AppRoutingModule { } diff --git a/src/app/app.component.html b/src/app/app.component.html index 5b4cdcf..90c6b64 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -1,4 +1 @@ -
-

{{fiveOclock.name}}

-

{{fiveOclock.time?.toFormat('tt')}}

-
\ No newline at end of file + \ No newline at end of file diff --git a/src/app/app.component.scss b/src/app/app.component.scss index e19a8e0..e69de29 100644 --- a/src/app/app.component.scss +++ b/src/app/app.component.scss @@ -1,52 +0,0 @@ -.container { - display:flex; - align-items: center; - flex-direction: column; - justify-content: center; - width: 100%; - margin: 0; - padding: 0; -} - -.single-container { - display:flex; - align-items: center; - flex-direction: column; - justify-content: center; - height: 100%; - width: 100%; - margin: 0; - padding: 0; -} - -@media (max-width: 350px) { - .timezone { - font-size: 1.0em; - } - - .time { - font-size: 0.5em - } -} - -@media (min-width:350px) and (max-width: 500px) { - .timezone { - font-size: 1.5em; - } - - .time { - font-size: 1.0em - } -} - -.timezone { - font-family: "Open Sans", "HelveticaNeue", "Helvetica Neue", Helvetica, Arial, sans-serif; - color: whitesmoke; - margin-bottom: 0; -} - -.time { - font-family: "Open Sans", "HelveticaNeue", "Helvetica Neue", Helvetica, Arial, sans-serif; - color: whitesmoke; - margin-top: 0; -} \ No newline at end of file diff --git a/src/app/app.module.ts b/src/app/app.module.ts index e2a353d..bce10b6 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -3,13 +3,19 @@ import { BrowserModule } from '@angular/platform-browser'; import { AppComponent } from './app.component'; import { TimezoneService } from './timezone/services/timezone.service'; +import { AppRoutingModule } from './app-routing.module'; +import { TimezoneListComponent } from './timezone/components/timezone-list/timezone-list.component'; +import { TimezoneClosestComponent } from './timezone/components/timezone-closest/timezone-closest.component'; @NgModule({ declarations: [ - AppComponent + AppComponent, + TimezoneListComponent, + TimezoneClosestComponent ], imports: [ BrowserModule, + AppRoutingModule, ], providers: [TimezoneService], bootstrap: [AppComponent] diff --git a/src/app/timezone/components/timezone-closest/timezone-closest.component.html b/src/app/timezone/components/timezone-closest/timezone-closest.component.html new file mode 100644 index 0000000..7b35d03 --- /dev/null +++ b/src/app/timezone/components/timezone-closest/timezone-closest.component.html @@ -0,0 +1,8 @@ +
+ +
+

{{fiveOclock.name}}

+

{{fiveOclock.time?.toFormat('tt')}}

+
+ +
\ No newline at end of file diff --git a/src/app/timezone/components/timezone-closest/timezone-closest.component.scss b/src/app/timezone/components/timezone-closest/timezone-closest.component.scss new file mode 100644 index 0000000..7cba226 --- /dev/null +++ b/src/app/timezone/components/timezone-closest/timezone-closest.component.scss @@ -0,0 +1,46 @@ +.container { + display:flex; + align-items: center; + flex-direction: column; + justify-content: center; + height: 100%; + width: 100%; + margin: 0; + padding: 0; +} + +@media (max-width: 350px) { + .timezone { + font-size: 1.0em; + } + + .time { + font-size: 0.5em + } +} + +@media (min-width:350px) and (max-width: 500px) { + .timezone { + font-size: 1.5em; + } + + .time { + font-size: 1.0em + } +} + +.timezone { + font-family: "Open Sans", "HelveticaNeue", "Helvetica Neue", Helvetica, Arial, sans-serif; + color: whitesmoke; + margin-bottom: 0; +} + +.time { + font-family: "Open Sans", "HelveticaNeue", "Helvetica Neue", Helvetica, Arial, sans-serif; + color: whitesmoke; + margin-top: 0; +} + +.background { + height: 100% +} \ No newline at end of file diff --git a/src/app/timezone/components/timezone-closest/timezone-closest.component.spec.ts b/src/app/timezone/components/timezone-closest/timezone-closest.component.spec.ts new file mode 100644 index 0000000..79ecd54 --- /dev/null +++ b/src/app/timezone/components/timezone-closest/timezone-closest.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { TimezoneClosestComponent } from './timezone-closest.component'; + +describe('TimezoneClosestComponent', () => { + let component: TimezoneClosestComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ TimezoneClosestComponent ] + }) + .compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(TimezoneClosestComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/timezone/components/timezone-closest/timezone-closest.component.ts b/src/app/timezone/components/timezone-closest/timezone-closest.component.ts new file mode 100644 index 0000000..74cc834 --- /dev/null +++ b/src/app/timezone/components/timezone-closest/timezone-closest.component.ts @@ -0,0 +1,33 @@ +import { Component, OnInit } from '@angular/core'; +import { interval } from 'rxjs'; +import { GetClosestTimezoneFrom, Timezone } from '../../models/timezone.model'; +import { TimezoneService } from '../../services/timezone.service'; + +@Component({ + selector: 'app-timezone-closest', + templateUrl: './timezone-closest.component.html', + styleUrls: ['./timezone-closest.component.scss'] +}) +export class TimezoneClosestComponent implements OnInit { + + fiveOclock: Timezone | undefined; + + constructor(private timezoneService: TimezoneService){ + var second = interval(1000) + + second.subscribe(()=>{ + var fiveOclocks: Timezone[] = []; + this.timezoneService.getCurrentTimeInTimezones(this.timezoneService.getTimezones()).forEach((timezoneObj)=>{ + if(timezoneObj.time?.hour === 17){ + fiveOclocks.push(timezoneObj); + } + }) + this.fiveOclock = GetClosestTimezoneFrom(this.timezoneService.getCurrentTimezone(), fiveOclocks) + }) + + } + + ngOnInit(): void { + } + +} diff --git a/src/app/timezone/components/timezone-list/timezone-list.component.html b/src/app/timezone/components/timezone-list/timezone-list.component.html new file mode 100644 index 0000000..b48a8a7 --- /dev/null +++ b/src/app/timezone/components/timezone-list/timezone-list.component.html @@ -0,0 +1,8 @@ +
+ +
+

{{timezone.name}}

+

{{timezone.time?.toFormat('tt')}}

+
+ +
\ No newline at end of file diff --git a/src/app/timezone/components/timezone-list/timezone-list.component.scss b/src/app/timezone/components/timezone-list/timezone-list.component.scss new file mode 100644 index 0000000..97e7fa3 --- /dev/null +++ b/src/app/timezone/components/timezone-list/timezone-list.component.scss @@ -0,0 +1,57 @@ +.container { + display:flex; + align-items: center; + flex-direction: column; + justify-content: center; + width: 100%; + margin: 0; + padding: 0; +} + +.single-container { + display:flex; + align-items: center; + flex-direction: column; + justify-content: center; + height: 100%; + width: 100%; + margin: 0; + padding: 0; +} + +@media (max-width: 350px) { + .timezone { + font-size: 1.0em; + } + + .time { + font-size: 0.5em + } +} + +@media (min-width:350px) and (max-width: 500px) { + .timezone { + font-size: 1.5em; + } + + .time { + font-size: 1.0em + } +} + +.timezone { + font-family: "Open Sans", "HelveticaNeue", "Helvetica Neue", Helvetica, Arial, sans-serif; + color: whitesmoke; + margin-bottom: 0; +} + +.time { + font-family: "Open Sans", "HelveticaNeue", "Helvetica Neue", Helvetica, Arial, sans-serif; + color: whitesmoke; + margin-top: 0; +} + +.background { + background: #2e2e2e; + height: 100%; +} \ No newline at end of file diff --git a/src/app/timezone/components/timezone-list/timezone-list.component.spec.ts b/src/app/timezone/components/timezone-list/timezone-list.component.spec.ts new file mode 100644 index 0000000..e02259e --- /dev/null +++ b/src/app/timezone/components/timezone-list/timezone-list.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { TimezoneListComponent } from './timezone-list.component'; + +describe('TimezoneListComponent', () => { + let component: TimezoneListComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ TimezoneListComponent ] + }) + .compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(TimezoneListComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/timezone/components/timezone-list/timezone-list.component.ts b/src/app/timezone/components/timezone-list/timezone-list.component.ts new file mode 100644 index 0000000..1f96f28 --- /dev/null +++ b/src/app/timezone/components/timezone-list/timezone-list.component.ts @@ -0,0 +1,32 @@ +import { Component, OnInit } from '@angular/core'; +import { interval, Observable } from 'rxjs'; +import { Timezone } from '../../models/timezone.model'; +import { TimezoneService } from '../../services/timezone.service'; + +@Component({ + selector: 'app-timezone-list', + templateUrl: './timezone-list.component.html', + styleUrls: ['./timezone-list.component.scss'] +}) +export class TimezoneListComponent implements OnInit { + + fiveOclocks: Timezone[] = []; + + constructor(private timezoneService: TimezoneService){ + var second = interval(1000) + + second.subscribe(()=>{ + this.fiveOclocks = []; + this.timezoneService.getCurrentTimeInTimezones(this.timezoneService.getTimezones()).forEach((timezoneObj)=>{ + if(timezoneObj.time?.hour === 17){ + this.fiveOclocks.push(timezoneObj); + } + }) + }) + + } + + ngOnInit(): void { + } + +} diff --git a/src/styles.scss b/src/styles.scss index e54e037..368036f 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -1,8 +1,10 @@ /* You can add global styles to this file, and also import other style files */ body { - height: 100vh; + height: 100%; margin:0; padding:0; background: #2e2e2e; - +} +html { + height: 100%; } \ No newline at end of file From 8541588d965e06cd219c4b53bfd31e5dece75050 Mon Sep 17 00:00:00 2001 From: Joel Wetzell Date: Thu, 16 Dec 2021 22:44:57 -0600 Subject: [PATCH 7/7] Add option for single and list of timezones --- src/app/app-routing.module.ts | 5 +- src/app/app.component.ts | 26 +- src/app/app.module.ts | 6 +- src/app/fiveoclock/fiveoclock.component.html | 7 + src/app/fiveoclock/fiveoclock.component.scss | 0 .../fiveoclock.component.spec.ts} | 12 +- src/app/fiveoclock/fiveoclock.component.ts | 42 ++ .../timezone-closest.component.html | 8 - .../timezone-closest.component.ts | 33 -- .../timezone-list.component.html | 2 +- .../timezone-list/timezone-list.component.ts | 19 +- .../timezone-single.component.html | 8 + .../timezone-single.component.scss} | 0 .../timezone-single.component.spec.ts | 25 + .../timezone-single.component.ts | 18 + src/app/timezone/models/timezone.model.ts | 465 +++++++++--------- src/app/timezone/services/timezone.service.ts | 10 +- 17 files changed, 355 insertions(+), 331 deletions(-) create mode 100644 src/app/fiveoclock/fiveoclock.component.html create mode 100644 src/app/fiveoclock/fiveoclock.component.scss rename src/app/{timezone/components/timezone-closest/timezone-closest.component.spec.ts => fiveoclock/fiveoclock.component.spec.ts} (51%) create mode 100644 src/app/fiveoclock/fiveoclock.component.ts delete mode 100644 src/app/timezone/components/timezone-closest/timezone-closest.component.html delete mode 100644 src/app/timezone/components/timezone-closest/timezone-closest.component.ts create mode 100644 src/app/timezone/components/timezone-single/timezone-single.component.html rename src/app/timezone/components/{timezone-closest/timezone-closest.component.scss => timezone-single/timezone-single.component.scss} (100%) create mode 100644 src/app/timezone/components/timezone-single/timezone-single.component.spec.ts create mode 100644 src/app/timezone/components/timezone-single/timezone-single.component.ts diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index cd5ea69..0abf337 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -1,11 +1,10 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { TimezoneClosestComponent } from './timezone/components/timezone-closest/timezone-closest.component'; +import { FiveoclockComponent } from './fiveoclock/fiveoclock.component'; import { TimezoneListComponent } from './timezone/components/timezone-list/timezone-list.component'; const routes: Routes = [ - { path: '', component: TimezoneListComponent }, - { path: 'closest', component: TimezoneClosestComponent }, + { path: '', component: FiveoclockComponent }, ]; @NgModule({ diff --git a/src/app/app.component.ts b/src/app/app.component.ts index d77d8bc..b13f2e1 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -1,8 +1,4 @@ import { Component } from '@angular/core'; -import { interval, Observable } from 'rxjs'; -import { startWith } from 'rxjs/operators'; -import { GetClosestTimezoneFrom, Timezone } from './timezone/models/timezone.model'; -import { TimezoneService } from './timezone/services/timezone.service'; @Component({ selector: 'app-root', templateUrl: './app.component.html', @@ -10,25 +6,5 @@ import { TimezoneService } from './timezone/services/timezone.service'; }) export class AppComponent { - dates: any[] = [] - - fiveOclock: Timezone | undefined; - second: Observable; - - fiveOclocks: Timezone[] = []; - - constructor(private timezoneService: TimezoneService) { - this.second = interval(1000).pipe(startWith(0)) //every second and give it a starter value - - this.second.subscribe(() => { - this.fiveOclocks = []; - this.timezoneService.getCurrentTimeInTimezones(this.timezoneService.getTimezones()).forEach((timezoneObj) => { - if (timezoneObj.time?.hour === 17) { - this.fiveOclocks.push(timezoneObj); - } - this.fiveOclock = GetClosestTimezoneFrom(this.timezoneService.getCurrentTimezone(), this.fiveOclocks) - }) - }) - - } + constructor() { } } diff --git a/src/app/app.module.ts b/src/app/app.module.ts index bce10b6..0776627 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -5,13 +5,15 @@ import { AppComponent } from './app.component'; import { TimezoneService } from './timezone/services/timezone.service'; import { AppRoutingModule } from './app-routing.module'; import { TimezoneListComponent } from './timezone/components/timezone-list/timezone-list.component'; -import { TimezoneClosestComponent } from './timezone/components/timezone-closest/timezone-closest.component'; +import { FiveoclockComponent } from './fiveoclock/fiveoclock.component'; +import { TimezoneSingleComponent } from './timezone/components/timezone-single/timezone-single.component'; @NgModule({ declarations: [ AppComponent, TimezoneListComponent, - TimezoneClosestComponent + TimezoneSingleComponent, + FiveoclockComponent ], imports: [ BrowserModule, diff --git a/src/app/fiveoclock/fiveoclock.component.html b/src/app/fiveoclock/fiveoclock.component.html new file mode 100644 index 0000000..a0a21e7 --- /dev/null +++ b/src/app/fiveoclock/fiveoclock.component.html @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/app/fiveoclock/fiveoclock.component.scss b/src/app/fiveoclock/fiveoclock.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/timezone/components/timezone-closest/timezone-closest.component.spec.ts b/src/app/fiveoclock/fiveoclock.component.spec.ts similarity index 51% rename from src/app/timezone/components/timezone-closest/timezone-closest.component.spec.ts rename to src/app/fiveoclock/fiveoclock.component.spec.ts index 79ecd54..9b75fdf 100644 --- a/src/app/timezone/components/timezone-closest/timezone-closest.component.spec.ts +++ b/src/app/fiveoclock/fiveoclock.component.spec.ts @@ -1,20 +1,20 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { TimezoneClosestComponent } from './timezone-closest.component'; +import { FiveoclockComponent } from './fiveoclock.component'; -describe('TimezoneClosestComponent', () => { - let component: TimezoneClosestComponent; - let fixture: ComponentFixture; +describe('FiveoclockComponent', () => { + let component: FiveoclockComponent; + let fixture: ComponentFixture; beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [ TimezoneClosestComponent ] + declarations: [ FiveoclockComponent ] }) .compileComponents(); }); beforeEach(() => { - fixture = TestBed.createComponent(TimezoneClosestComponent); + fixture = TestBed.createComponent(FiveoclockComponent); component = fixture.componentInstance; fixture.detectChanges(); }); diff --git a/src/app/fiveoclock/fiveoclock.component.ts b/src/app/fiveoclock/fiveoclock.component.ts new file mode 100644 index 0000000..f351f44 --- /dev/null +++ b/src/app/fiveoclock/fiveoclock.component.ts @@ -0,0 +1,42 @@ +import { Component, OnInit } from '@angular/core'; +import { interval, startWith } from 'rxjs'; +import { GetClosestTimezoneFrom, Timezone, TimezoneCompare, TimezoneList } from '../timezone/models/timezone.model'; +import { TimezoneService } from '../timezone/services/timezone.service'; + +@Component({ + selector: 'app-fiveoclock', + templateUrl: './fiveoclock.component.html', + styleUrls: ['./fiveoclock.component.scss'] +}) +export class FiveoclockComponent implements OnInit { + + fiveOclocks: Timezone[] = []; + fiveOclock: Timezone | undefined; + + justClosest: boolean = true; + + timezones: string[] =[] + + constructor(private timezoneService: TimezoneService){ + this.timezones = this.timezoneService.getTimezones() + var second = interval(10000).pipe(startWith(0)) + + second.subscribe(()=>{ + this.fiveOclocks = []; + this.timezoneService.getCurrentTimeInTimezones(this.timezones).forEach((timezoneObj)=>{ + if(timezoneObj.time?.hour === 17){ + this.fiveOclocks.push(timezoneObj); + } + }) + this.fiveOclock = GetClosestTimezoneFrom(this.timezoneService.getCurrentTimezone(), this.fiveOclocks) + }) + + } + + ngOnInit(): void { } + + toggleView(){ + this.justClosest = !this.justClosest + } + +} diff --git a/src/app/timezone/components/timezone-closest/timezone-closest.component.html b/src/app/timezone/components/timezone-closest/timezone-closest.component.html deleted file mode 100644 index 7b35d03..0000000 --- a/src/app/timezone/components/timezone-closest/timezone-closest.component.html +++ /dev/null @@ -1,8 +0,0 @@ -
- -
-

{{fiveOclock.name}}

-

{{fiveOclock.time?.toFormat('tt')}}

-
- -
\ No newline at end of file diff --git a/src/app/timezone/components/timezone-closest/timezone-closest.component.ts b/src/app/timezone/components/timezone-closest/timezone-closest.component.ts deleted file mode 100644 index 74cc834..0000000 --- a/src/app/timezone/components/timezone-closest/timezone-closest.component.ts +++ /dev/null @@ -1,33 +0,0 @@ -import { Component, OnInit } from '@angular/core'; -import { interval } from 'rxjs'; -import { GetClosestTimezoneFrom, Timezone } from '../../models/timezone.model'; -import { TimezoneService } from '../../services/timezone.service'; - -@Component({ - selector: 'app-timezone-closest', - templateUrl: './timezone-closest.component.html', - styleUrls: ['./timezone-closest.component.scss'] -}) -export class TimezoneClosestComponent implements OnInit { - - fiveOclock: Timezone | undefined; - - constructor(private timezoneService: TimezoneService){ - var second = interval(1000) - - second.subscribe(()=>{ - var fiveOclocks: Timezone[] = []; - this.timezoneService.getCurrentTimeInTimezones(this.timezoneService.getTimezones()).forEach((timezoneObj)=>{ - if(timezoneObj.time?.hour === 17){ - fiveOclocks.push(timezoneObj); - } - }) - this.fiveOclock = GetClosestTimezoneFrom(this.timezoneService.getCurrentTimezone(), fiveOclocks) - }) - - } - - ngOnInit(): void { - } - -} diff --git a/src/app/timezone/components/timezone-list/timezone-list.component.html b/src/app/timezone/components/timezone-list/timezone-list.component.html index b48a8a7..0dce130 100644 --- a/src/app/timezone/components/timezone-list/timezone-list.component.html +++ b/src/app/timezone/components/timezone-list/timezone-list.component.html @@ -1,5 +1,5 @@
- +

{{timezone.name}}

{{timezone.time?.toFormat('tt')}}

diff --git a/src/app/timezone/components/timezone-list/timezone-list.component.ts b/src/app/timezone/components/timezone-list/timezone-list.component.ts index 1f96f28..1904e4d 100644 --- a/src/app/timezone/components/timezone-list/timezone-list.component.ts +++ b/src/app/timezone/components/timezone-list/timezone-list.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, Input, OnInit } from '@angular/core'; import { interval, Observable } from 'rxjs'; import { Timezone } from '../../models/timezone.model'; import { TimezoneService } from '../../services/timezone.service'; @@ -10,23 +10,12 @@ import { TimezoneService } from '../../services/timezone.service'; }) export class TimezoneListComponent implements OnInit { - fiveOclocks: Timezone[] = []; + @Input() timezones: Timezone[] = []; - constructor(private timezoneService: TimezoneService){ - var second = interval(1000) - - second.subscribe(()=>{ - this.fiveOclocks = []; - this.timezoneService.getCurrentTimeInTimezones(this.timezoneService.getTimezones()).forEach((timezoneObj)=>{ - if(timezoneObj.time?.hour === 17){ - this.fiveOclocks.push(timezoneObj); - } - }) - }) - - } + constructor(){} ngOnInit(): void { } } + diff --git a/src/app/timezone/components/timezone-single/timezone-single.component.html b/src/app/timezone/components/timezone-single/timezone-single.component.html new file mode 100644 index 0000000..970f561 --- /dev/null +++ b/src/app/timezone/components/timezone-single/timezone-single.component.html @@ -0,0 +1,8 @@ +
+ +
+

{{timezone.name}}

+

{{timezone.time?.toFormat('tt')}}

+
+ +
\ No newline at end of file diff --git a/src/app/timezone/components/timezone-closest/timezone-closest.component.scss b/src/app/timezone/components/timezone-single/timezone-single.component.scss similarity index 100% rename from src/app/timezone/components/timezone-closest/timezone-closest.component.scss rename to src/app/timezone/components/timezone-single/timezone-single.component.scss diff --git a/src/app/timezone/components/timezone-single/timezone-single.component.spec.ts b/src/app/timezone/components/timezone-single/timezone-single.component.spec.ts new file mode 100644 index 0000000..d9c9468 --- /dev/null +++ b/src/app/timezone/components/timezone-single/timezone-single.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { TimezoneSingleComponent } from './timezone-single.component'; + +describe('TimezoneSingleComponent', () => { + let component: TimezoneSingleComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ TimezoneSingleComponent ] + }) + .compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(TimezoneSingleComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/timezone/components/timezone-single/timezone-single.component.ts b/src/app/timezone/components/timezone-single/timezone-single.component.ts new file mode 100644 index 0000000..2fde846 --- /dev/null +++ b/src/app/timezone/components/timezone-single/timezone-single.component.ts @@ -0,0 +1,18 @@ +import { Component, Input, OnInit } from '@angular/core'; +import { Timezone } from '../../models/timezone.model'; + +@Component({ + selector: 'app-timezone-single', + templateUrl: './timezone-single.component.html', + styleUrls: ['./timezone-single.component.scss'] +}) +export class TimezoneSingleComponent implements OnInit { + + @Input() timezone: Timezone | undefined; + + constructor(){ } + + ngOnInit(): void { + } + +} diff --git a/src/app/timezone/models/timezone.model.ts b/src/app/timezone/models/timezone.model.ts index 273ab10..19849d3 100644 --- a/src/app/timezone/models/timezone.model.ts +++ b/src/app/timezone/models/timezone.model.ts @@ -1,4 +1,5 @@ import { DateTime } from 'luxon'; +import { min } from 'rxjs'; export interface Timezone { name: string; @@ -8,8 +9,8 @@ export interface Timezone { export function TimezoneCompare(a: Timezone, b: Timezone) { if (a.time != undefined && b.time != undefined) { - if (a.time > b.time) return 1; - if (a.time < b.time) return -1; + if (a.time.startOf("day") < b.time.startOf("day")) return 1; + if (a.time.startOf("day") > b.time.startOf("day")) return -1; return 0; } @@ -27,27 +28,27 @@ export function TimezoneCompare(a: Timezone, b: Timezone) { // http://www.movable-type.co.uk/scripts/latlong.html export function GetClosestTimezoneFrom(timezone: string, timezones: Timezone[]) { var location1 = timezoneMap[timezone] - - var closestDist = Number.MAX_SAFE_INTEGER - var closestTimezone = undefined - timezones.forEach(element => { - var location2 = timezoneMap[element.name] + var closestTimezone: Timezone | undefined = undefined + + timezones.forEach((timezone) => { + var location2 = timezoneMap[timezone.name] var deltaLat = (location2.lat - location1.lat) * (Math.PI / 180); - var deltaLong = (location2.long - location2.long) * (Math.PI / 180); + var deltaLong = (location2.long - location1.long) * (Math.PI / 180); var a = Math.sin(deltaLat / 2) * Math.sin(deltaLat / 2) + Math.cos(location1.lat * (Math.PI / 180)) * Math.cos(location2.lat * (Math.PI / 180)) * Math.sin(deltaLong / 2) * Math.sin(deltaLong / 2); - var dist = Math.atan2(Math.sqrt(a), Math.sqrt(1 - a)); + var dist = Math.atan2(Math.sqrt(a), Math.sqrt(1 - a)) if (dist < closestDist) { closestDist = dist - closestTimezone = element + closestTimezone = timezone } - }); + }) + return closestTimezone } @@ -207,60 +208,60 @@ export var timezoneMap: { [key: string]: TimezoneLocation } = { 'America/Merida': { lat: 20.9674, long: -89.5926 }, 'America/Metlakatla': { lat: 55.1292, long: -131.5722 }, 'America/Mexico_City': { lat: 19.4326, long: -99.1332 }, - 'America/Miquelon': { lat: 0, long: 0 }, - 'America/Moncton': { lat: 0, long: 0 }, - 'America/Monterrey': { lat: 0, long: 0 }, - 'America/Montevideo': { lat: 0, long: 0 }, - 'America/Montserrat': { lat: 0, long: 0 }, - 'America/Nassau': { lat: 0, long: 0 }, - 'America/New_York': { lat: 0, long: 0 }, - 'America/Nipigon': { lat: 0, long: 0 }, - 'America/Nome': { lat: 0, long: 0 }, - 'America/Noronha': { lat: 0, long: 0 }, - 'America/North_Dakota/Beulah': { lat: 0, long: 0 }, - 'America/North_Dakota/Center': { lat: 0, long: 0 }, - 'America/North_Dakota/New_Salem': { lat: 0, long: 0 }, - 'America/Nuuk': { lat: 0, long: 0 }, - 'America/Ojinaga': { lat: 0, long: 0 }, - 'America/Panama': { lat: 0, long: 0 }, - 'America/Pangnirtung': { lat: 0, long: 0 }, - 'America/Paramaribo': { lat: 0, long: 0 }, - 'America/Phoenix': { lat: 0, long: 0 }, - 'America/Port-au-Prince': { lat: 0, long: 0 }, - 'America/Port_of_Spain': { lat: 0, long: 0 }, - 'America/Porto_Velho': { lat: 0, long: 0 }, - 'America/Puerto_Rico': { lat: 0, long: 0 }, - 'America/Punta_Arenas': { lat: 0, long: 0 }, - 'America/Rainy_River': { lat: 0, long: 0 }, - 'America/Rankin_Inlet': { lat: 0, long: 0 }, - 'America/Recife': { lat: 0, long: 0 }, - 'America/Regina': { lat: 0, long: 0 }, - 'America/Resolute': { lat: 0, long: 0 }, - 'America/Rio_Branco': { lat: 0, long: 0 }, - 'America/Santarem': { lat: 0, long: 0 }, - 'America/Santiago': { lat: 0, long: 0 }, - 'America/Santo_Domingo': { lat: 0, long: 0 }, - 'America/Sao_Paulo': { lat: 0, long: 0 }, - 'America/Scoresbysund': { lat: 0, long: 0 }, - 'America/Sitka': { lat: 0, long: 0 }, - 'America/St_Barthelemy': { lat: 0, long: 0 }, - 'America/St_Johns': { lat: 0, long: 0 }, - 'America/St_Kitts': { lat: 0, long: 0 }, - 'America/St_Lucia': { lat: 0, long: 0 }, - 'America/St_Thomas': { lat: 0, long: 0 }, - 'America/St_Vincent': { lat: 0, long: 0 }, - 'America/Swift_Current': { lat: 0, long: 0 }, - 'America/Tegucigalpa': { lat: 0, long: 0 }, - 'America/Thule': { lat: 0, long: 0 }, - 'America/Thunder_Bay': { lat: 0, long: 0 }, - 'America/Tijuana': { lat: 0, long: 0 }, - 'America/Toronto': { lat: 0, long: 0 }, - 'America/Tortola': { lat: 0, long: 0 }, - 'America/Vancouver': { lat: 0, long: 0 }, - 'America/Whitehorse': { lat: 0, long: 0 }, - 'America/Winnipeg': { lat: 0, long: 0 }, - 'America/Yakutat': { lat: 0, long: 0 }, - 'America/Yellowknife': { lat: 0, long: 0 }, + 'America/Miquelon': { lat: 46.0878, long: -64.7782 }, + 'America/Moncton': { lat: 46.0878, long: -64.7782 }, + 'America/Monterrey': { lat: 46.8852, long: -56.3159 }, + 'America/Montevideo': { lat: -34.9011, long: -56.1645 }, + 'America/Montserrat': { lat: 16.7425, long: -62.1874 }, + 'America/Nassau': { lat: 25.0443, long: -77.3504 }, + 'America/New_York': { lat: 40.7128, long: -74.0060 }, + 'America/Nipigon': { lat: 49.0125, long: -88.2633 }, + 'America/Nome': { lat: 64.5011, long: -165.4064 }, + 'America/Noronha': { lat: -3.8576, long: -32.4297 }, + 'America/North_Dakota/Beulah': { lat: 47.2633, long: -101.7779 }, + 'America/North_Dakota/Center': { lat: 47.1164, long: -101.2996 }, + 'America/North_Dakota/New_Salem': { lat: 46.8450, long: -101.4113 }, + 'America/Nuuk': { lat: 64.1814, long: -51.6941 }, + 'America/Ojinaga': { lat: 29.5459, long: -104.4083 }, + 'America/Panama': { lat: 8.5380, long: -80.7821 }, + 'America/Pangnirtung': { lat: 66.1466, long: -65.7012 }, + 'America/Paramaribo': { lat: 5.8520, long: -55.2038 }, + 'America/Phoenix': { lat: 33.4484, long: -112.0740 }, + 'America/Port-au-Prince': { lat: 18.5944, long: -72.3074 }, + 'America/Port_of_Spain': { lat: 10.6603, long: -61.5086 }, + 'America/Porto_Velho': { lat: -8.7636, long: -63.8972 }, + 'America/Puerto_Rico': { lat: 18.2208, long: -66.5901 }, + 'America/Punta_Arenas': { lat: -53.1638, long: -70.9171 }, + 'America/Rainy_River': { lat: 48.7217, long: -94.5695 }, + 'America/Rankin_Inlet': { lat: 62.8084, long: -92.0853 }, + 'America/Recife': { lat: 8.0577, long: -34.8830 }, + 'America/Regina': { lat: 50.4452, long: -104.6189 }, + 'America/Resolute': { lat: 74.6973, long: -94.8297 }, + 'America/Rio_Branco': { lat: 9.9740, long: -67.8098 }, + 'America/Santarem': { lat: -2.4407, long: -54.7136 }, + 'America/Santiago': { lat: 33.4489, long: -70.6693 }, + 'America/Santo_Domingo': { lat: 18.4861, long: -69.9312 }, + 'America/Sao_Paulo': { lat: -23.5558, long: -46.6396 }, + 'America/Scoresbysund': { lat: 71.0036, long: -22.2862 }, + 'America/Sitka': { lat: 57.0531, long: -135.3300 }, + 'America/St_Barthelemy': { lat: 17.89618, long: -62.84978 }, + 'America/St_Johns': { lat: 47.5615, long: -52.7126 }, + 'America/St_Kitts': { lat: 17.3578, long: -62.7830 }, + 'America/St_Lucia': { lat: 13.9094, long: -60.9789 }, + 'America/St_Thomas': { lat: 18.3381, long: -64.8941 }, + 'America/St_Vincent': { lat: 12.9843, long: -61.2872 }, + 'America/Swift_Current': { lat: 50.2851, long: -107.7972 }, + 'America/Tegucigalpa': { lat: 14.0650, long: -87.1715 }, + 'America/Thule': { lat: 77.4228, long: -68.2423 }, + 'America/Thunder_Bay': { lat: 48.3809, long: -89.2477 }, + 'America/Tijuana': { lat: 32.5149, long: -117.0382 }, + 'America/Toronto': { lat: 43.6532, long: -79.3832 }, + 'America/Tortola': { lat: 18.4335, long: -64.6333 }, + 'America/Vancouver': { lat: 49.2827, long: -123.1207 }, + 'America/Whitehorse': { lat: 60.7212, long: -135.0568 }, + 'America/Winnipeg': { lat: 49.8951, long: -97.1384 }, + 'America/Yakutat': { lat: 59.5469, long: -139.7272 }, + 'America/Yellowknife': { lat: 62.4540, long: -114.3718 }, 'Antarctica/Casey': { lat: -66.2821, long: 110.5285 }, 'Antarctica/Davis': { lat: -68.5762, long: 77.9696 }, 'Antarctica/DumontDUrville': { lat: -66.6630, long: 140.0019 }, @@ -268,177 +269,177 @@ export var timezoneMap: { [key: string]: TimezoneLocation } = { 'Antarctica/Mawson': { lat: -67.6033, long: 62.8742 }, 'Antarctica/McMurdo': { lat: -77.8419, long: 166.6863 }, 'Antarctica/Palmer': { lat: -64.7743, long: -64.0538 }, - 'Antarctica/Rothera': { lat: -67.5666644,long: -68.1333328 }, + 'Antarctica/Rothera': { lat: -67.5666644, long: -68.1333328 }, 'Antarctica/Syowa': { lat: -69.0044, long: 39.5816 }, 'Antarctica/Troll': { lat: -72.0166, long: 2.5333 }, 'Antarctica/Vostok': { lat: -78.4645, long: 106.8339 }, 'Arctic/Longyearbyen': { lat: 78.2232, long: 15.6267 }, - 'Asia/Aden': { lat: 0, long: 0 }, - 'Asia/Almaty': { lat: 0, long: 0 }, - 'Asia/Amman': { lat: 0, long: 0 }, - 'Asia/Anadyr': { lat: 0, long: 0 }, - 'Asia/Aqtau': { lat: 0, long: 0 }, - 'Asia/Aqtobe': { lat: 0, long: 0 }, - 'Asia/Ashgabat': { lat: 0, long: 0 }, - 'Asia/Atyrau': { lat: 0, long: 0 }, - 'Asia/Baghdad': { lat: 0, long: 0 }, - 'Asia/Bahrain': { lat: 0, long: 0 }, - 'Asia/Baku': { lat: 0, long: 0 }, - 'Asia/Bangkok': { lat: 0, long: 0 }, - 'Asia/Barnaul': { lat: 0, long: 0 }, - 'Asia/Beirut': { lat: 0, long: 0 }, - 'Asia/Bishkek': { lat: 0, long: 0 }, - 'Asia/Brunei': { lat: 0, long: 0 }, - 'Asia/Chita': { lat: 0, long: 0 }, - 'Asia/Choibalsan': { lat: 0, long: 0 }, - 'Asia/Colombo': { lat: 0, long: 0 }, - 'Asia/Damascus': { lat: 0, long: 0 }, - 'Asia/Dhaka': { lat: 0, long: 0 }, - 'Asia/Dili': { lat: 0, long: 0 }, - 'Asia/Dubai': { lat: 0, long: 0 }, - 'Asia/Dushanbe': { lat: 0, long: 0 }, - 'Asia/Famagusta': { lat: 0, long: 0 }, - 'Asia/Gaza': { lat: 0, long: 0 }, - 'Asia/Hebron': { lat: 0, long: 0 }, - 'Asia/Ho_Chi_Minh': { lat: 0, long: 0 }, - 'Asia/Hong_Kong': { lat: 0, long: 0 }, - 'Asia/Hovd': { lat: 0, long: 0 }, - 'Asia/Irkutsk': { lat: 0, long: 0 }, - 'Asia/Jakarta': { lat: 0, long: 0 }, - 'Asia/Jayapura': { lat: 0, long: 0 }, - 'Asia/Jerusalem': { lat: 0, long: 0 }, - 'Asia/Kabul': { lat: 0, long: 0 }, - 'Asia/Kamchatka': { lat: 0, long: 0 }, - 'Asia/Karachi': { lat: 0, long: 0 }, - 'Asia/Kathmandu': { lat: 0, long: 0 }, - 'Asia/Khandyga': { lat: 0, long: 0 }, - 'Asia/Kolkata': { lat: 0, long: 0 }, - 'Asia/Krasnoyarsk': { lat: 0, long: 0 }, - 'Asia/Kuala_Lumpur': { lat: 0, long: 0 }, - 'Asia/Kuching': { lat: 0, long: 0 }, - 'Asia/Kuwait': { lat: 0, long: 0 }, - 'Asia/Macau': { lat: 0, long: 0 }, - 'Asia/Magadan': { lat: 0, long: 0 }, - 'Asia/Makassar': { lat: 0, long: 0 }, - 'Asia/Manila': { lat: 0, long: 0 }, - 'Asia/Muscat': { lat: 0, long: 0 }, - 'Asia/Nicosia': { lat: 0, long: 0 }, - 'Asia/Novokuznetsk': { lat: 0, long: 0 }, - 'Asia/Novosibirsk': { lat: 0, long: 0 }, - 'Asia/Omsk': { lat: 0, long: 0 }, - 'Asia/Oral': { lat: 0, long: 0 }, - 'Asia/Phnom_Penh': { lat: 0, long: 0 }, - 'Asia/Pontianak': { lat: 0, long: 0 }, - 'Asia/Pyongyang': { lat: 0, long: 0 }, - 'Asia/Qatar': { lat: 0, long: 0 }, - 'Asia/Qostanay': { lat: 0, long: 0 }, - 'Asia/Qyzylorda': { lat: 0, long: 0 }, - 'Asia/Riyadh': { lat: 0, long: 0 }, - 'Asia/Sakhalin': { lat: 0, long: 0 }, - 'Asia/Samarkand': { lat: 0, long: 0 }, - 'Asia/Seoul': { lat: 0, long: 0 }, - 'Asia/Shanghai': { lat: 0, long: 0 }, - 'Asia/Singapore': { lat: 0, long: 0 }, - 'Asia/Srednekolymsk': { lat: 0, long: 0 }, - 'Asia/Taipei': { lat: 0, long: 0 }, - 'Asia/Tashkent': { lat: 0, long: 0 }, - 'Asia/Tbilisi': { lat: 0, long: 0 }, - 'Asia/Tehran': { lat: 0, long: 0 }, - 'Asia/Thimphu': { lat: 0, long: 0 }, - 'Asia/Tokyo': { lat: 0, long: 0 }, - 'Asia/Tomsk': { lat: 0, long: 0 }, - 'Asia/Ulaanbaatar': { lat: 0, long: 0 }, - 'Asia/Urumqi': { lat: 0, long: 0 }, - 'Asia/Ust-Nera': { lat: 0, long: 0 }, - 'Asia/Vientiane': { lat: 0, long: 0 }, - 'Asia/Vladivostok': { lat: 0, long: 0 }, - 'Asia/Yakutsk': { lat: 0, long: 0 }, - 'Asia/Yangon': { lat: 0, long: 0 }, - 'Asia/Yekaterinburg': { lat: 0, long: 0 }, - 'Asia/Yerevan': { lat: 0, long: 0 }, - 'Atlantic/Azores': { lat: 0, long: 0 }, - 'Atlantic/Bermuda': { lat: 0, long: 0 }, - 'Atlantic/Canary': { lat: 0, long: 0 }, - 'Atlantic/Cape_Verde': { lat: 0, long: 0 }, - 'Atlantic/Faroe': { lat: 0, long: 0 }, - 'Atlantic/Madeira': { lat: 0, long: 0 }, - 'Atlantic/Reykjavik': { lat: 0, long: 0 }, - 'Atlantic/South_Georgia': { lat: 0, long: 0 }, - 'Atlantic/St_Helena': { lat: 0, long: 0 }, - 'Atlantic/Stanley': { lat: 0, long: 0 }, - 'Australia/Adelaide': { lat: 0, long: 0 }, - 'Australia/Brisbane': { lat: 0, long: 0 }, - 'Australia/Broken_Hill': { lat: 0, long: 0 }, - 'Australia/Darwin': { lat: 0, long: 0 }, - 'Australia/Eucla': { lat: 0, long: 0 }, - 'Australia/Hobart': { lat: 0, long: 0 }, - 'Australia/Lindeman': { lat: 0, long: 0 }, - 'Australia/Lord_Howe': { lat: 0, long: 0 }, - 'Australia/Melbourne': { lat: 0, long: 0 }, - 'Australia/Perth': { lat: 0, long: 0 }, - 'Australia/Sydney': { lat: 0, long: 0 }, - 'Europe/Amsterdam': { lat: 0, long: 0 }, - 'Europe/Andorra': { lat: 0, long: 0 }, - 'Europe/Astrakhan': { lat: 0, long: 0 }, - 'Europe/Athens': { lat: 0, long: 0 }, - 'Europe/Belgrade': { lat: 0, long: 0 }, - 'Europe/Berlin': { lat: 0, long: 0 }, - 'Europe/Bratislava': { lat: 0, long: 0 }, - 'Europe/Brussels': { lat: 0, long: 0 }, - 'Europe/Bucharest': { lat: 0, long: 0 }, - 'Europe/Budapest': { lat: 0, long: 0 }, - 'Europe/Busingen': { lat: 0, long: 0 }, - 'Europe/Chisinau': { lat: 0, long: 0 }, - 'Europe/Copenhagen': { lat: 0, long: 0 }, - 'Europe/Dublin': { lat: 0, long: 0 }, - 'Europe/Gibraltar': { lat: 0, long: 0 }, - 'Europe/Guernsey': { lat: 0, long: 0 }, - 'Europe/Helsinki': { lat: 0, long: 0 }, - 'Europe/Isle_of_Man': { lat: 0, long: 0 }, - 'Europe/Istanbul': { lat: 0, long: 0 }, - 'Europe/Jersey': { lat: 0, long: 0 }, - 'Europe/Kaliningrad': { lat: 0, long: 0 }, - 'Europe/Kiev': { lat: 0, long: 0 }, - 'Europe/Kirov': { lat: 0, long: 0 }, - 'Europe/Lisbon': { lat: 0, long: 0 }, - 'Europe/Ljubljana': { lat: 0, long: 0 }, - 'Europe/London': { lat: 0, long: 0 }, - 'Europe/Luxembourg': { lat: 0, long: 0 }, - 'Europe/Madrid': { lat: 0, long: 0 }, - 'Europe/Malta': { lat: 0, long: 0 }, - 'Europe/Mariehamn': { lat: 0, long: 0 }, - 'Europe/Minsk': { lat: 0, long: 0 }, - 'Europe/Monaco': { lat: 0, long: 0 }, - 'Europe/Moscow': { lat: 0, long: 0 }, - 'Europe/Oslo': { lat: 0, long: 0 }, - 'Europe/Paris': { lat: 0, long: 0 }, - 'Europe/Podgorica': { lat: 0, long: 0 }, - 'Europe/Prague': { lat: 0, long: 0 }, - 'Europe/Riga': { lat: 0, long: 0 }, - 'Europe/Rome': { lat: 0, long: 0 }, - 'Europe/Samara': { lat: 0, long: 0 }, - 'Europe/San_Marino': { lat: 0, long: 0 }, - 'Europe/Sarajevo': { lat: 0, long: 0 }, - 'Europe/Saratov': { lat: 0, long: 0 }, - 'Europe/Simferopol': { lat: 0, long: 0 }, - 'Europe/Skopje': { lat: 0, long: 0 }, - 'Europe/Sofia': { lat: 0, long: 0 }, - 'Europe/Stockholm': { lat: 0, long: 0 }, - 'Europe/Tallinn': { lat: 0, long: 0 }, - 'Europe/Tirane': { lat: 0, long: 0 }, - 'Europe/Ulyanovsk': { lat: 0, long: 0 }, - 'Europe/Uzhgorod': { lat: 0, long: 0 }, - 'Europe/Vaduz': { lat: 0, long: 0 }, - 'Europe/Vatican': { lat: 0, long: 0 }, - 'Europe/Vienna': { lat: 0, long: 0 }, - 'Europe/Vilnius': { lat: 0, long: 0 }, - 'Europe/Volgograd': { lat: 0, long: 0 }, - 'Europe/Warsaw': { lat: 0, long: 0 }, - 'Europe/Zagreb': { lat: 0, long: 0 }, - 'Europe/Zaporozhye': { lat: 0, long: 0 }, - 'Europe/Zurich': { lat: 0, long: 0 }, + 'Asia/Aden': { lat: 12.7855, long: 45.0187 }, + 'Asia/Almaty': { lat: 43.2220, long: 76.8512 }, + 'Asia/Amman': { lat: 31.9539, long: 35.9106 }, + 'Asia/Anadyr': { lat: 64.7337, long: 177.4968 }, + 'Asia/Aqtau': { lat: 43.6588, long: 51.1975 }, + 'Asia/Aqtobe': { lat: 50.2839, long: 57.1670 }, + 'Asia/Ashgabat': { lat: 37.9601, long: 58.3261 }, + 'Asia/Atyrau': { lat: 47.0945, long: 51.9238 }, + 'Asia/Baghdad': { lat: 33.3152, long: 44.3661 }, + 'Asia/Bahrain': { lat: 26.0667, long: 50.5577 }, + 'Asia/Baku': { lat: 40.4093, long: 49.8671 }, + 'Asia/Bangkok': { lat: 13.7563, long: 100.5018 }, + 'Asia/Barnaul': { lat: 53.3497, long: 83.7836 }, + 'Asia/Beirut': { lat: 33.8938, long: 35.5018 }, + 'Asia/Bishkek': { lat: 42.8746, long: 74.5698 }, + 'Asia/Brunei': { lat: 4.5353, long: 114.7277 }, + 'Asia/Chita': { lat: 52.0515, long: 113.4712 }, + 'Asia/Choibalsan': { lat: 48.0951, long: 114.5356 }, + 'Asia/Colombo': { lat: 6.9271, long: 79.8612 }, + 'Asia/Damascus': { lat: 33.5138, long: 36.2765 }, + 'Asia/Dhaka': { lat: 23.8103, long: 90.4125 }, + 'Asia/Dili': { lat: -8.5569, long: 125.5603 }, + 'Asia/Dubai': { lat: 25.2048, long: 55.2708 }, + 'Asia/Dushanbe': { lat: 38.5598, long: 68.7870 }, + 'Asia/Famagusta': { lat: 35.1149, long: 33.9192 }, + 'Asia/Gaza': { lat: 31.3547, long: 34.3088 }, + 'Asia/Hebron': { lat: 31.5326, long: 35.0998 }, + 'Asia/Ho_Chi_Minh': { lat: 10.8231, long: 106.6297 }, + 'Asia/Hong_Kong': { lat: 22.3193, long: 114.1694 }, + 'Asia/Hovd': { lat: 47.9795, long: 91.6348 }, + 'Asia/Irkutsk': { lat: 52.2855, long: 104.2890 }, + 'Asia/Jakarta': { lat: -6.2088, long: 106.8456 }, + 'Asia/Jayapura': { lat: -2.5916, long: 140.6690 }, + 'Asia/Jerusalem': { lat: 31.7683, long: 35.2137 }, + 'Asia/Kabul': { lat: 34.5553, long: 69.2075 }, + 'Asia/Kamchatka': { lat: 56.1327, long: 159.5314 }, + 'Asia/Karachi': { lat: 24.8607, long: 67.0011 }, + 'Asia/Kathmandu': { lat: 27.7172, long: 85.3240 }, + 'Asia/Khandyga': { lat: 62.6564, long: 135.5540 }, + 'Asia/Kolkata': { lat: 22.5726, long: 88.3639 }, + 'Asia/Krasnoyarsk': { lat: 56.0153, long: 92.8932 }, + 'Asia/Kuala_Lumpur': { lat: 3.1390, long: 101.6869 }, + 'Asia/Kuching': { lat: 1.5535, long: 110.3593 }, + 'Asia/Kuwait': { lat: 29.3117, long: 47.4818 }, + 'Asia/Macau': { lat: 22.1987, long: 113.5439 }, + 'Asia/Magadan': { lat: 59.5594, long: 150.8128 }, + 'Asia/Makassar': { lat: -5.1477, long: 119.4327 }, + 'Asia/Manila': { lat: 14.5995, long: 120.9842 }, + 'Asia/Muscat': { lat: 23.5880, long: 58.3829 }, + 'Asia/Nicosia': { lat: 35.1856, long: 33.38230 }, + 'Asia/Novokuznetsk': { lat: 53.7596, long: 87.1216 }, + 'Asia/Novosibirsk': { lat: 54.9833, long: 82.8964 }, + 'Asia/Omsk': { lat: 54.9914, long: 73.3645 }, + 'Asia/Oral': { lat: 51.2278, long: 51.3865 }, + 'Asia/Phnom_Penh': { lat: 11.5564, long: 104.9282 }, + 'Asia/Pontianak': { lat: -0.0263, long: 109.3425 }, + 'Asia/Pyongyang': { lat: 39.0738, long: 125.8198 }, + 'Asia/Qatar': { lat: 25.3548, long: 51.1839 }, + 'Asia/Qostanay': { lat: 53.2198, long: 63.6354 }, + 'Asia/Qyzylorda': { lat: 44.8488, long: 65.4823 }, + 'Asia/Riyadh': { lat: 24.7136, long: 46.6753 }, + 'Asia/Sakhalin': { lat: 50.6910, long: 142.9506 }, + 'Asia/Samarkand': { lat: 39.6270, long: 66.9750 }, + 'Asia/Seoul': { lat: 37.5665, long: 126.9780 }, + 'Asia/Shanghai': { lat: 31.2304, long: 121.4737 }, + 'Asia/Singapore': { lat: 1.3521, long: 103.8198 }, + 'Asia/Srednekolymsk': { lat: 67.4373, long: 153.7287 }, + 'Asia/Taipei': { lat: 25.0330, long: 121.5654 }, + 'Asia/Tashkent': { lat: 41.2995, long: 69.2401 }, + 'Asia/Tbilisi': { lat: 41.7151, long: 44.8271 }, + 'Asia/Tehran': { lat: 35.6892, long: 35.6892 }, + 'Asia/Thimphu': { lat: 27.4712, long: 89.6339 }, + 'Asia/Tokyo': { lat: 35.6762, long: 139.6503 }, + 'Asia/Tomsk': { lat: 56.4884, long: 84.9480 }, + 'Asia/Ulaanbaatar': { lat: 47.8864, long: 106.9057 }, + 'Asia/Urumqi': { lat: 43.8266, long: 87.6169 }, + 'Asia/Ust-Nera': { lat: 64.5672, long: 143.2265 }, + 'Asia/Vientiane': { lat: 17.9757, long: 102.6331 }, + 'Asia/Vladivostok': { lat: 43.1332, long: 131.9113 }, + 'Asia/Yakutsk': { lat: 62.0397, long: 129.7422 }, + 'Asia/Yangon': { lat: 16.8409, long: 96.1735 }, + 'Asia/Yekaterinburg': { lat: 56.8431, long: 60.6454 }, + 'Asia/Yerevan': { lat: 40.1872, long: 44.5152 }, + 'Atlantic/Azores': { lat: 38.7216, long: -27.2206 }, + 'Atlantic/Bermuda': { lat: 32.2937, long: -64.7755 }, + 'Atlantic/Canary': { lat: 28.2916, long: -16.6291 }, + 'Atlantic/Cape_Verde': { lat: 16.4969, long: -23.1918 }, + 'Atlantic/Faroe': { lat: 61.8925022, long: -6.9729703 }, + 'Atlantic/Madeira': { lat: 32.7607, long: -16.9595 }, + 'Atlantic/Reykjavik': { lat: 65.4215, long: -19.0346 }, + 'Atlantic/South_Georgia': { lat: -55.9654, long: -29.9202 }, + 'Atlantic/St_Helena': { lat: -23.8689, long: -9.1899 }, + 'Atlantic/Stanley': { lat: -51.6882, long: 59.8139 }, + 'Australia/Adelaide': { lat: -34.9285, long: 138.6007 }, + 'Australia/Brisbane': { lat: -27.4705, long: 153.0260 }, + 'Australia/Broken_Hill': { lat: -31.9596, long: 141.4608 }, + 'Australia/Darwin': { lat: -12.462827, long: 130.841782 }, + 'Australia/Eucla': { lat: -35.306179, long: 149.126419 }, + 'Australia/Hobart': { lat: -42.880554, long: 147.324997 }, + 'Australia/Lindeman': { lat: -35.306179, long: 149.126419 }, + 'Australia/Lord_Howe': { lat: -31.555326, long: 159.082121 }, + 'Australia/Melbourne': { lat: -37.8136, long: 144.9631 }, + 'Australia/Perth': { lat: -31.9523, long: 115.8613 }, + 'Australia/Sydney': { lat: -33.8688, long: 151.2093 }, + 'Europe/Amsterdam': { lat: 52.3676, long: 4.9041 }, + 'Europe/Andorra': { lat: 42.5063, long: 1.5218 }, + 'Europe/Astrakhan': { lat: 46.3586, long: 48.0569 }, + 'Europe/Athens': { lat: 37.9838, long: 23.7275 }, + 'Europe/Belgrade': { lat: 44.8125, long: 20.4612 }, + 'Europe/Berlin': { lat: 52.5200, long: 13.4050 }, + 'Europe/Bratislava': { lat: 48.1486, long: 17.1077 }, + 'Europe/Brussels': { lat: 50.8476, long: 4.3572 }, + 'Europe/Bucharest': { lat: 44.4268, long: 26.1025 }, + 'Europe/Budapest': { lat: 47.4979, long: 19.0402 }, + 'Europe/Busingen': { lat: 47.6970, long: 8.6904 }, + 'Europe/Chisinau': { lat: 47.0105, long: 28.8638 }, + 'Europe/Copenhagen': { lat: 55.6761, long: 12.5683 }, + 'Europe/Dublin': { lat: 53.3498, long: -6.2603 }, + 'Europe/Gibraltar': { lat: 36.1408, long: -5.3536 }, + 'Europe/Guernsey': { lat: 49.4482, long: -2.5895 }, + 'Europe/Helsinki': { lat: 60.1699, long: 24.9384 }, + 'Europe/Isle_of_Man': { lat: 54.2361, long: -4.5481 }, + 'Europe/Istanbul': { lat: 41.0082, long: 28.9784 }, + 'Europe/Jersey': { lat: 49.2138, long: -2.1358 }, + 'Europe/Kaliningrad': { lat: 54.7104, long: 20.4522 }, + 'Europe/Kiev': { lat: 50.4501, long: 30.5234 }, + 'Europe/Kirov': { lat: 58.6030, long: 49.6679 }, + 'Europe/Lisbon': { lat: 38.7223, long: -9.1393 }, + 'Europe/Ljubljana': { lat: 46.0569, long: 14.5058 }, + 'Europe/London': { lat: 51.5072, long: -0.1276 }, + 'Europe/Luxembourg': { lat: 49.8153, long: 6.1296 }, + 'Europe/Madrid': { lat: 40.4168, long: -3.7038 }, + 'Europe/Malta': { lat: 35.9375, long: 14.3754 }, + 'Europe/Mariehamn': { lat: 60.0971, long: 19.9348 }, + 'Europe/Minsk': { lat: 53.9006, long: 27.5590 }, + 'Europe/Monaco': { lat: 3.7384, long: 7.4246 }, + 'Europe/Moscow': { lat: 55.7558, long: 37.6173 }, + 'Europe/Oslo': { lat: 59.9139, long: 10.7522 }, + 'Europe/Paris': { lat: 48.8566, long: 2.3522 }, + 'Europe/Podgorica': { lat: 42.4304, long: 19.2594 }, + 'Europe/Prague': { lat: 50.0755, long: 14.4378 }, + 'Europe/Riga': { lat: 56.9496, long: 24.1052 }, + 'Europe/Rome': { lat: 41.9028, long: 12.4964 }, + 'Europe/Samara': { lat: 53.2038, long: 50.1606 }, + 'Europe/San_Marino': { lat: 43.9424, long: 12.4578 }, + 'Europe/Sarajevo': { lat: 43.8563, long: 18.4131 }, + 'Europe/Saratov': { lat: 51.5462, long: 46.0154 }, + 'Europe/Simferopol': { lat: 44.9521, long: 34.1024 }, + 'Europe/Skopje': { lat: 41.9981, long: 21.4254 }, + 'Europe/Sofia': { lat: 42.6977, long: 23.3219 }, + 'Europe/Stockholm': { lat: 59.3293, long: 18.0686 }, + 'Europe/Tallinn': { lat: 59.4370, long: 24.7536 }, + 'Europe/Tirane': { lat: 41.3275, long: 19.8187 }, + 'Europe/Ulyanovsk': { lat: 54.3187, long: 48.3978 }, + 'Europe/Uzhgorod': { lat: 48.6208, long: 22.2879 }, + 'Europe/Vaduz': { lat: 47.1410, long: 9.5209 }, + 'Europe/Vatican': { lat: 41.9029, long: 12.4534 }, + 'Europe/Vienna': { lat: 48.2082, long: 16.3738 }, + 'Europe/Vilnius': { lat: 54.6872, long: 25.2797 }, + 'Europe/Volgograd': { lat: 48.7080, long: 44.5133 }, + 'Europe/Warsaw': { lat: 52.2297, long: 21.0122 }, + 'Europe/Zagreb': { lat: 45.8150, long: 15.9819 }, + 'Europe/Zaporozhye': { lat: 47.8388, long: 35.1396 }, + 'Europe/Zurich': { lat: 47.3769, long: 8.5417 }, 'Indian/Antananarivo': { lat: -18.8792, long: 47.5079 }, - 'Indian/Chagos': { lat: -4.416665, long: 72.5999976 }, + 'Indian/Chagos': { lat: -4.416665, long: 72.5999976 }, 'Indian/Christmas': { lat: -10.4475, long: 105.6904 }, 'Indian/Cocos': { lat: -12.1642, long: 96.8710 }, 'Indian/Comoro': { lat: -11.6455, long: 43.3333 }, @@ -452,7 +453,7 @@ export var timezoneMap: { [key: string]: TimezoneLocation } = { 'Pacific/Auckland': { lat: -36.8509, long: 174.7645 }, 'Pacific/Bougainville': { lat: -6.3754, long: 155.3807 }, 'Pacific/Chatham': { lat: -44.0058, long: -176.5401 }, - 'Pacific/Chuuk': { lat: 7.417, long: 151.783 }, + 'Pacific/Chuuk': { lat: 7.417, long: 151.783 }, 'Pacific/Easter': { lat: -27.1127, long: -109.3497 }, 'Pacific/Efate': { lat: -17.6577, long: 168.4297 }, 'Pacific/Fakaofo': { lat: -9.3803, long: -171.2188 }, diff --git a/src/app/timezone/services/timezone.service.ts b/src/app/timezone/services/timezone.service.ts index aa2676c..93b0fc1 100644 --- a/src/app/timezone/services/timezone.service.ts +++ b/src/app/timezone/services/timezone.service.ts @@ -31,13 +31,11 @@ export class TimezoneService { timezones.forEach(element => { var date = this.getCurrentTimeForTimezone(element); if (date != null) { - dates.push({ name: element, time: date }) + const timezone = { name: element, time: date } + dates.push(timezone) } }); - - dates.sort(TimezoneCompare) - - return dates; - + + return dates.sort(TimezoneCompare); } }