Changeset 527100

Timestamp:

04/04/2012 06:34:09 AM (14 years ago)

Author:

rxn

Message:

added capital cities

Location:

sunrise-sunset/trunk

Files:

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

sunrise-sunset/trunk/cities.txt

@@ -1 +1 @@
 city:latitude:longitude:timezone:summertimezone
-Tucson, AZ:33.29:-122.04:MST:MST
+Albany,NY:42.652594:-73.757314:EST:EDT
+Annapolis, MD:38.972944:-76.501158:EST:EDT
+Augusta, ME:44.310556:-69.78:EST:EDT
+Austin, TX:30.25:-97.75:CST:CDT
 Atlanta, GA:33.65:-84.42:EST:EDT
+Baton Rouge, LA:30.458056:-91.140278:CST:CDT
+Bismarck, ND:46.813333:-100.778889:CST:CDT
+Boise, ID:43.613611:-116.203333:MST:MDT
+Boston,MA:42.357778:-71.061667:EST:EDT
+Carson City, NV:39.160833:-119.753889:PST:PDT
 Charlotte,NC:35.22:-80.93:EST:EDT
+Charleston, WV:38.347222:-81.633333:EST:EDT
+Cheyenne, WY:41.145556:-104.801944:MST:MDT
 Chicago, IL:41.51:-87.39:CST:CDT
 Citra,FL:29.41167:-82.11:EST:EDT
+Columbus, OH:39.983333:-82.983333:EST:EDT
+Columbia, SC:34.000556:-81.044167:EST:EDT
+Concord, NH:43.206667:-71.538056:EST:EDT
 Crossville,TN:35.95:-85.08:CST:CDT
+Denver,CO:39.739167:-104.984722:MST:MDT
+Des Moines, IA:41.590833:-93.620833:CST:CDT
+Dover,DE:39.161944:-75.526667:EST:EDT
+Frankfort, KY:38.197222:84.863056:EST:EDT
+Harrisburg, PA:40.269722:-76.875556:EST:EDT
+Hartford, CT:41.762736:-72.674286:EST:EDT
+Helena, MT:46.595806:-112.027031:MST:MDT
+Honolulu,HI:21.308889:157.826111:HAST:HAST
+Indianapolis,IN:39.7683:-86.1582:EST:EDT
+Jackson, MS:32.298889:-90.184722:CST:CDT
+Jefferson City, MO:38.576667:-92.173611:CST:CDT
+Juneau, AK:58.444444:-134.229722:AKST:AKDT
+Lansing, MI:42.7335:-84.5467:EST:EDT
+Lincoln, NE:40.809722:-96.675278:CST:CDT
 Los Angeles, CA:34.30:-118.15:PST:PDT
 Lexington, KY:38.05:-85.00:EST:EDT
+Little Rock, AR:34.736111:-92.331111:AR:CST:CDT
+Madison, WI:43.066667:-89.4:CST:CDT
 Miami, FL:25.82:-80.28:EST:EDT
+Montgomery, AL:32.361667:-86.279167:CST:CDT
+Montpelier, VT:44.25:-72.566667:EST:EDT
 Nashville,TN:36.12:-86.68:CST:CDT
+Oklahoma City,OK:35.4823:-97.5352:CST:CDT
+Olympia, WA:47.0425:-122.893056:PST:PDT
 Orlando,FL:28.55:-81.33:EST:EDT
+Phoenix, AZ:33.45:-112.066667:MST:MST
+Pierre, SD:44.368056:-100.336389:CST:CDT
+Providence, RI:41.823611:-71.422222:EST:EDT
+Raleigh, NC:35.818889:-78.644722:EST:EDT
 Richmond,VA:37.50:-77.33:EST:EDT
 Roanoke Muni,VA:37.32:-79.97:EST:EDT
+Sacramento, CA:38.555556:-121.468889:PST:PDT
+Salem, OR:44.930833:-123.028889:PST:PDT
+Salt Lake City, UT:40.75:-111.883333:MST:MDT
+Santa Fe, NM:35.667222:-105.964444:MST:MDT
+Springfield, IL:39.78325:-89.650373:CST:CDT
+Saint Paul, MA:44.9441:-93.0852:CST:CDT
+Tallahassee, FL:30.451667:-84.268533:EST:EDT
+Trenton, NJ:40.223748:-74.764001:EST:EDT
+Topeka, KS:39.055833:-95.689444:CST:CDT
+Tucson, AZ:33.29:-122.04:MST:MST
 Waynesville, NC:35.483226:-82.994511:EST:EDT

sunrise-sunset/trunk/city.php

@@ -11 +11 @@
     function __construct($name, $latitude, $longitude, $timezone, $summerTimezone)
     {
-        $this->_name = $name;
-        $this->_latitude = $latitude;
-        $this->_longitude = $longitude;
-        $this->_timezone = $timezone;
-        $this->_summerTimezone = $summerTimezone;
+        $this->_name = trim($name);
+        $this->_latitude = trim($latitude);
+        $this->_longitude = trim($longitude);
+        $this->_timezone = trim($timezone);
+        $this->_summerTimezone = trim($summerTimezone);
     }
 

sunrise-sunset/trunk/readme.txt

@@ -4 +4 @@
 Requires at least: 3.0
 Tested up to: 3.3.1
-Stable tag: 1.1.1
+Stable tag: 1.1.2
 License: GPLv2
 
-SunriseSunset(ss) displays sunrise and sunset times. The three major cities included are: New York, Chicago and Los Angeles.
+SunriseSunset displays sunrise and sunset times for the capital cities of the America (including miscellaneous cities).
+Times displayed are local time.
+
+I would love to hear from you: [email protected]
+
 
 == Description ==
 
-This widget displays the sunrise and sunset times for select cities. You can set the location
-using a drop down list.
+This widget displays the sunrise and sunset times for select cities.
 
-To Add a city go to city.txt and add a line with the following format:
-<city>:<latitude>:<longitude>:<timezone>:<summertimezone>
+IF YOU ARE UPGRADING please change the settings of the widget in the dashboard right after upgrading.
 
-For example:
-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
-countries, but it has not been tested.
-
+IF YOU ARE A DESIGNER: I am looking for someone to help me skin the widget.  I'll add you to the list of contributes
+if you help make the widget look presentable.
 
 Please email me if you have any questions or requests: [email protected]
+
+Options includes:
+1) What city to display.
+2) Should sunrise be displayed?
+3) Should sunset be displayed?
+4) The title display at the top of the widget.
+
 
 == Installation ==
@@ -32 +37 @@
 1. Upload the SunriseSunset plugin to the /wp-content directory.
 2. Activate it.
-3. Add it to your sidebar as a widget.
+3. Configure the settings in the Widget Admin Dashboard.
 
 
@@ -40 +45 @@
 Yes, you can. Simply email me and I'll try to accomodate your request : [email protected]
 
+= I saw a bug! How can I help? =
+You can write to me at [email protected].  Or send me a patch.
+
+I will try to accommodate you ASAP.
+
 = What updates are planned for this widget? =
 Here are some:
-# Adding more cities.
-# Better design.
-# The ability to use custom longitude and latitude.
+* Better design.
+* The ability to add images.
+* The ablity to add cities in the Admin Dashboard.
 
 = How do I add more cities to this list? =
@@ -58 +68 @@
 2. You can adjust the title and the city in the Dashboard. The widget uses local time.
 
+== Changelog ==
+= 1.1.2 =
+* Added all capital cities of America.
 
-== Changelog ==
 = 1.1.1 =
-* Taking into account DST
-* Added more cities
+* Taking into account DST.
+* Added more cities.
 
 = 1.0.9 =

sunrise-sunset/trunk/sunrisesunset.php

@@ -4 +4 @@
 Plugin URI: http://wordpress.org/extend/plugins/sunrise-sunset/
 Description: Displays Sunrise and Sunset Times
-Version:  1.1.1
+Version:  1.1.2
 Author: Rex Posadas ([email protected])
 Author URI: http://www.rxnfx.com/ss-plugin
@@ -167 +167 @@
     {
         $newTimestamp = 0;
-        $daylightSavingsTime = 0;
         $time_format = 'Y-m-d';
-
+        $currentTimezone = $city->getTimezone();
 
         $dstStart = '2012-03-11';
@@ -175 +174 @@
         $today = date($time_format, $timestamp);
 
-        if (( ( $today >= $dstStart ) && ( $today <= $dstEnd) )) {
-            $daylightSavingsTime = 1;
-        }
-
-        switch ($city->getTimezone()) {
+        if ((($today >= $dstStart) && ($today <= $dstEnd))) {
+            $currentTimezone = $city->getSummerTimezone();
+        }
+
+        switch ($currentTimezone) {
             case 'EST':
-                $newTimestamp = $timestamp - ((5 - $daylightSavingsTime) * 60 * 60);
+                $newTimestamp = $timestamp - (5 * 60 * 60);
                 break;
             case 'EDT':
-                $newTimestamp = $timestamp - ((4 - $daylightSavingsTime) * 60 * 60);
+                $newTimestamp = $timestamp - (4 * 60 * 60);
                 break;
             case 'MST':
-                $newTimestamp = $timestamp - ((7 - $daylightSavingsTime) * 60 * 60);
+                $newTimestamp = $timestamp - (7 * 60 * 60);
+                break;
+            case 'MDT':
+                $newTimestamp = $timestamp - (6 * 60 * 60);
                 break;
             case 'CST':
-                $newTimestamp = $timestamp - ((6 - $daylightSavingsTime) * 60 * 60);
+                $newTimestamp = $timestamp - (6 * 60 * 60);
                 break;
             case 'CDT':
-                $newTimestamp = $timestamp - ((5 - $daylightSavingsTime) * 60 * 60);
+                $newTimestamp = $timestamp - (5 * 60 * 60);
                 break;
             case 'PST':
-                $newTimestamp = $timestamp - ((8 - $daylightSavingsTime) * 60 * 60);
+                $newTimestamp = $timestamp - (8 * 60 * 60);
                 break;
             case 'PDT':
-                $newTimestamp = $timestamp - ((7 - $daylightSavingsTime) * 60 * 60);
-                break;
-        }
-
-
-        $olddate = date($time_format, $timestamp);
-        $newdate = date($time_format, $newTimestamp);
+                $newTimestamp = $timestamp - (7 * 60 * 60);
+                break;
+            case 'AKST':
+                $newTimestamp = $timestamp - (9 * 60 * 60);
+                break;
+            case 'AKDT':
+                $newTimestamp = $timestamp - (8 * 60 * 60);
+                break;
+            case 'HAST':
+                $newTimestamp = $timestamp - (10 * 60 * 60);
+                break;
+        }