php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-29 11:42:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

- MFB: Fixed bug #39965 (Latitude and longitude are backwards in date_sun_info()).

Browse Source
This commit is contained in:
Derick Rethans
2007-04-13 08:34:11 +00:00
parent 3eef99f6cd
commit 59fcb5299d
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ext/date/php_date.c
View File

@@ -2544,7 +2544,7 @@ PHP_FUNCTION(date_sun_info)
array_init(return_value);
/* Get sun up/down and transit */
rs = timelib_astro_rise_set_altitude(t, latitude, longitude, -35.0/60, 1, &ddummy, &ddummy, &rise, &set, &transit);
rs = timelib_astro_rise_set_altitude(t, longitude, latitude, -35.0/60, 1, &ddummy, &ddummy, &rise, &set, &transit);
switch (rs) {
case -1: /* always below */
add_ascii_assoc_bool(return_value, "sunrise", 0);
@@ -2564,7 +2564,7 @@ PHP_FUNCTION(date_sun_info)
add_ascii_assoc_long(return_value, "transit", timelib_date_to_int(t2, &dummy));
/* Get civil twilight */
rs = timelib_astro_rise_set_altitude(t, latitude, longitude, -6.0, 0, &ddummy, &ddummy, &rise, &set, &transit);
rs = timelib_astro_rise_set_altitude(t, longitude, latitude, -6.0, 0, &ddummy, &ddummy, &rise, &set, &transit);
switch (rs) {
case -1: /* always below */
add_ascii_assoc_bool(return_value, "civil_twilight_begin", 0);
@@ -2582,7 +2582,7 @@ PHP_FUNCTION(date_sun_info)
}
/* Get nautical twilight */
rs = timelib_astro_rise_set_altitude(t, latitude, longitude, -12.0, 0, &ddummy, &ddummy, &rise, &set, &transit);
rs = timelib_astro_rise_set_altitude(t, longitude, latitude, -12.0, 0, &ddummy, &ddummy, &rise, &set, &transit);
switch (rs) {
case -1: /* always below */
add_ascii_assoc_bool(return_value, "nautical_twilight_begin", 0);
@@ -2600,7 +2600,7 @@ PHP_FUNCTION(date_sun_info)
}
/* Get astronomical twilight */
rs = timelib_astro_rise_set_altitude(t, latitude, longitude, -18.0, 0, &ddummy, &ddummy, &rise, &set, &transit);
rs = timelib_astro_rise_set_altitude(t, longitude, latitude, -18.0, 0, &ddummy, &ddummy, &rise, &set, &transit);
switch (rs) {
case -1: /* always below */
add_ascii_assoc_bool(return_value, "astronomical_twilight_begin", 0);

18
ext/date/tests/date_sun_info_001.phpt
View File

@@ -11,22 +11,22 @@ echo "Done\n";
--EXPECTF--
array(9) {
["sunrise"]=>
int(1165899133)
int(1165897782)
["sunset"]=>
int(1165934481)
int(1165934168)
["transit"]=>
int(1165916807)
int(1165915975)
["civil_twilight_begin"]=>
int(1165897449)
int(1165896176)
["civil_twilight_end"]=>
int(1165936165)
int(1165935773)
["nautical_twilight_begin"]=>
int(1165895547)
int(1165894353)
["nautical_twilight_end"]=>
int(1165938067)
int(1165937597)
["astronomical_twilight_begin"]=>
int(1165893693)
int(1165892570)
["astronomical_twilight_end"]=>
int(1165939921)
int(1165939380)
}
Done