Changeset 527069

Timestamp:

04/04/2012 04:52:19 AM (14 years ago)

Author:

rxn

Message:

daylight savings time

Location:

sunrise-sunset/trunk

Files:

• cities.txt (modified) (1 diff)
• sunrisesunset.php (modified) (1 diff)

sunrise-sunset/trunk/cities.txt

@@ -1 +1 @@
 city:latitude:longitude:timezone:summertimezone
-Tucson, AZ:33.29:-122.04:MST:none
+Tucson, AZ:33.29:-122.04:MST:MST
 Atlanta, GA:33.65:-84.42:EST:EDT
 Charlotte,NC:35.22:-80.93:EST:EDT

sunrise-sunset/trunk/sunrisesunset.php

@@ -167 +167 @@
     {
         $newTimestamp = 0;
+        $daylightSavingsTime = 0;
+        $time_format = 'Y-m-d';
+
+
+        $dstStart = '2012-03-11';
+        $dstEnd = '2012-11-04';
+        $today = date($time_format, $timestamp);
+
+        if (( ( $today >= $dstStart ) && ( $today <= $dstEnd) )) {
+            $daylightSavingsTime = 1;
+        }
 
         switch ($city->getTimezone()) {
             case 'EST':
-                $newTimestamp = $timestamp - (5 * 60 * 60);
+                $newTimestamp = $timestamp - ((5 - $daylightSavingsTime) * 60 * 60);
                 break;
             case 'EDT':
-                $newTimestamp = $timestamp - (4 * 60 * 60);
+                $newTimestamp = $timestamp - ((4 - $daylightSavingsTime) * 60 * 60);
                 break;
             case 'MST':
-                $newTimestamp = $timestamp - (7 * 60 * 60);
+                $newTimestamp = $timestamp - ((7 - $daylightSavingsTime) * 60 * 60);
                 break;
             case 'CST':
-                $newTimestamp = $timestamp - (6 * 60 * 60);
+                $newTimestamp = $timestamp - ((6 - $daylightSavingsTime) * 60 * 60);
                 break;
             case 'CDT':
-                $newTimestamp = $timestamp - (5 * 60 * 60);
+                $newTimestamp = $timestamp - ((5 - $daylightSavingsTime) * 60 * 60);
                 break;
             case 'PST':
-                $newTimestamp = $timestamp - (8 * 60 * 60);
+                $newTimestamp = $timestamp - ((8 - $daylightSavingsTime) * 60 * 60);
                 break;
             case 'PDT':
-                $newTimestamp = $timestamp - (7 * 60 * 60);
-                break;
-        }
-
-        $time_format = 'h:i A';
+                $newTimestamp = $timestamp - ((7 - $daylightSavingsTime) * 60 * 60);
+                break;
+        }
+
 
         $olddate = date($time_format, $timestamp);