Changeset 527059

Timestamp:

04/04/2012 04:23:29 AM (14 years ago)

Author:

rxn

Message:

refactored to use date_sun_info()

Location:

sunrise-sunset/trunk

Files:

• cities.txt (modified) (1 diff)
• city.php (modified) (1 diff)
• functions.php (modified) (1 diff)
• readme.txt (modified) (4 diffs)
• sunrisesunset.php (modified) (4 diffs)

sunrise-sunset/trunk/cities.txt

@@ -1 @@
-Arizona:33.29:-122.04
-Atlanta:33.65:-84.42
-Charlotte,NC:35.22:-80.93
-Chicago:41.51:-87.39
-Crossville,TN:35.95:-85.08
-Los Angeles:34.30:-118.15
-Lexington, KY:38.05:-85.00
-Miami:25.82:-80.28
-Nashville,TN:36.12:-86.68
-Orlando,FL:28.55:-81.33
-Richmond,VA:37.50:-77.33
-Roanoke Muni,VA:37.32:-79.97
+city:latitude:longitude:timezone:summertimezone
+Tucson, AZ:33.29:-122.04:MST:none
+Atlanta, GA:33.65:-84.42:EST:EDT
+Charlotte,NC:35.22:-80.93:EST:EDT
+Chicago, IL:41.51:-87.39:CST:CDT
+Crossville,TN:35.95:-85.08:CST:CDT
+Los Angeles, CA:34.30:-118.15:PST:PDT
+Lexington, KY:38.05:-85.00:EST:EDT
+Miami, FL:25.82:-80.28:EST:EDT
+Nashville,TN:36.12:-86.68:CST:CDT
+Orlando,FL:28.55:-81.33:EST:EDT
+Richmond,VA:37.50:-77.33:EST:EDT
+Roanoke Muni,VA:37.32:-79.97:EST:EDT

sunrise-sunset/trunk/city.php

@@ -3 +3 @@
 class City
 {
+    private $_name;
+    private $_latitude;
+    private $_longitude;
+    private $_timezone;
+    private $_summerTimezone;
 
-    private $name;
-    private $latitude;
-    private $longitude;
-
-    function __construct($name, $latitude, $longitude)
+    function __construct($name, $latitude, $longitude, $timezone, $summerTimezone)
     {
-        $this->name = $name;
-        $this->latitude = $latitude;
-        $this->longitude = $longitude;
+        $this->_name = $name;
+        $this->_latitude = $latitude;
+        $this->_longitude = $longitude;
+        $this->_timezone = $timezone;
+        $this->_summerTimezone = $summerTimezone;
     }
 
 
+    public function setSummerTimezone($summerTimezone)
+    {
+        $this->_summerTimezone = $summerTimezone;
+    }
+
+    public function getSummerTimezone()
+    {
+        return $this->_summerTimezone;
+    }
+
+    public function setTimezone($timezone)
+    {
+        $this->_timezone = $timezone;
+    }
+
+    public function getTimezone()
+    {
+        return $this->_timezone;
+    }
+
     public function setLatitude($latitude)
     {
-        $this->latitude = $latitude;
+        $this->_latitude = $latitude;
     }
 
     public function getLatitude()
     {
-        return $this->latitude;
+        return $this->_latitude;
     }
 
     public function setLongitude($longitude)
     {
-        $this->longitude = $longitude;
+        $this->_longitude = $longitude;
     }
 
     public function getLongitude()
     {
-        return $this->longitude;
+        return $this->_longitude;
     }
 
     public function setName($name)
     {
-        $this->name = $name;
+        $this->_name = $name;
     }
 
     public function getName()
     {
-        return $this->name;
+        return $this->_name;
     }
 }

sunrise-sunset/trunk/functions.php

@@ -2 +2 @@
 
 
-
-function populateLatitude()
-{
-    //    $latitude = array('America/Chicago' => 41.51, 'America/Los_Angeles' => 34.30, 'America/New_York' => 40.47, 'US/Arizona' => 33.29);
-
-    $latitude = array();
-
-    global $CITIES;
-    foreach ($CITIES as $city) {
-        $latitude[$city->getTimezone] = $city->getLatitude();
-    }
-    return $latitude;
-
-}
-

sunrise-sunset/trunk/readme.txt

@@ -4 +4 @@
 Requires at least: 3.0
 Tested up to: 3.3.1
-Stable tag: 1.0.8
+Stable tag: 1.0.9
 License: GPLv2
 
@@ -14 +14 @@
 using a drop down list.
 
-In order to add a city please add a line to the cities.txt file. The file formate is:
-<cityname>:<timezone>:<latitude>:<longitude>
+To Add a city go to city.txt and add a line with the following format:
+<city>:<latitude>:<longitude>:<timezone>:<summertimezone>
 
 For example:
-Orlando,FL:America/New_York:28.55:-81.33
+Miami, FL:25.82:-80.28:EST:EDT
 
-Logitude is always negative for cities in the United States.  This plugin should handle cities from different
+Logitude is always negative for cities  in the United States.  This plugin should handle cities from different
 countries, but it has not been tested.
 
@@ -48 +48 @@
 = How do I add more cities to this list? =
 Add a line in the cities.txt file with the following format:
-<cityname>:<timezone>:<latitude>:<longitude>
+<city>:<latitude>:<longitude>:<timezone>:<summertimezone>
 
 For example:
-Orlando,FL:America/New_York:28.55:-81.33
+Miami, FL:25.82:-80.28:EST:EDT
 
 
@@ -60 +60 @@
 
 == Changelog ==
+= 1.0.9 =
+* Fixed times for most cities.
+
 = 1.0.8 =
 * Removed hacked code - reported to WordPress.org forums

sunrise-sunset/trunk/sunrisesunset.php

@@ -4 +4 @@
 Plugin URI: http://wordpress.org/extend/plugins/sunrise-sunset/
 Description: Displays Sunrise and Sunset Times
-Version: 1.0.8
+Version:  1.0.9
 Author: Rex Posadas ([email protected])
 Author URI: http://www.rxnfx.com/ss-plugin
@@ -37 +37 @@
 class sunrise_sunset extends WP_Widget
 {
-
     private $_cities;
-    private $_latitude;
-    private $_longitude;
 
     private function populateCities()
@@ -47 +44 @@
         foreach ($lines as $line) {
             $pieces = explode(":", $line);
-            $this->_cities[$pieces[0]] = new City($pieces[0], $pieces[1], $pieces[2]);
+            if ($pieces[0] == 'city') continue;
+            $this->_cities[$pieces[0]] = new City($pieces[0], $pieces[1], $pieces[2], $pieces[3], $pieces[4]);
         }
     }
@@ -166 +164 @@
     }
 
+    private function convertTimezone($timestamp, $city)
+    {
+        $newTimestamp = 0;
+
+        switch ($city->getTimezone()) {
+            case 'EST':
+                $newTimestamp = $timestamp - (5 * 60 * 60);
+                break;
+            case 'EDT':
+                $newTimestamp = $timestamp - (4 * 60 * 60);
+                break;
+            case 'MST':
+                $newTimestamp = $timestamp - (7 * 60 * 60);
+                break;
+            case 'CST':
+                $newTimestamp = $timestamp - (6 * 60 * 60);
+                break;
+            case 'CDT':
+                $newTimestamp = $timestamp - (5 * 60 * 60);
+                break;
+            case 'PST':
+                $newTimestamp = $timestamp - (8 * 60 * 60);
+                break;
+            case 'PDT':
+                $newTimestamp = $timestamp - (7 * 60 * 60);
+                break;
+        }
+
+        $time_format = 'h:i A';
+
+        $olddate = date($time_format, $timestamp);
+        $newdate = date($time_format, $newTimestamp);
+
+
+        return $newTimestamp;
+    }
+
 
     function ss_get_times($instance)
     {
         $time_format = 'h:i A';
-
-        $lat = $this->_cities[$instance['city']]->getLatitude();
-        $long = $this->_cities[$instance['city']]->getLongitude();
-
-//        $suninfo = date_sun_info(time(), floatval($lat), floatval($long));
-        $suninfo = date_sun_info(time(), floatval($long), floatval($lat));
-
-        $sunrise_time = date($time_format, $suninfo['sunrise']);
-        $sunset_time = date($time_format, $suninfo['sunset']);
+        $targetCity = $this->_cities[$instance['city']];
+
+        $lat = $targetCity->getLatitude();
+        $long = $targetCity->getLongitude();
+
+        $suninfo = date_sun_info(time(), $lat, $long);
+
+        $sunrise_time = date($time_format, $this->convertTimezone($suninfo['sunrise'], $targetCity));
+        $sunset_time = date($time_format, $this->convertTimezone($suninfo['sunset'], $targetCity));
 
         return array('sunrise' => $sunrise_time, 'sunset' => $sunset_time);