diff --git a/earth.inc b/earth.inc index c02e844..df5172e 100644 --- a/earth.inc +++ b/earth.inc @@ -1,14 +1,6 @@ , - * the creator of these routines, Ka-Ping Yee, authorized these routines to be - * distributed under the GPL. - */ - -/** * @file * Trigonometry for calculating geographical distances. * All function arguments and return values measure distances in metres @@ -16,6 +8,14 @@ * Ka-Ping Yee, 2003-08-11 */ +/** + * License clarification: + * + * On Feb 13, 2005, in message , + * the creator of these routines, Ka-Ping Yee, authorized these routines to be + * distributed under the GPL. + */ + //$earth_radius_semimajor = 6378137.0; //$earth_flattening = 1/298.257223563; //$earth_radius_semiminor = $earth_radius_semimajor * (1 - $earth_flattening); @@ -167,7 +167,8 @@ function earth_latitude_range($longitude, $latitude, $distance) { $minlat = $lat - $angle; $maxlat = $lat + $angle; $rightangle = pi() / 2; - if ($minlat < -$rightangle) { // wrapped around the south pole + // Wrapped around the south pole. + if ($minlat < -$rightangle) { $overshoot = -$minlat - $rightangle; $minlat = -$rightangle + $overshoot; if ($minlat > $maxlat) { @@ -175,7 +176,8 @@ function earth_latitude_range($longitude, $latitude, $distance) { } $minlat = -$rightangle; } - if ($maxlat > $rightangle) { // wrapped around the north pole + // Wrapped around the north pole. + if ($maxlat > $rightangle) { $overshoot = $maxlat - $rightangle; $maxlat = $rightangle - $overshoot; if ($maxlat < $minlat) { diff --git a/location.georss.inc b/location.georss.inc index 3ca4cae..9326cc3 100644 --- a/location.georss.inc +++ b/location.georss.inc @@ -14,8 +14,10 @@ function location_rss_namespaces($mode = 'simple') { case 'w3c': case 'w3c_bugcompat': return array('xmlns:geo' => 'http://www.w3.org/2003/01/geo/wgs84_pos#'); + case 'simple': return array('xmlns:georss' => 'http://www.georss.org/georss'); + case 'gml': return array( 'xmlns:georss' => 'http://www.georss.org/georss', @@ -42,7 +44,9 @@ function _location_rss_item($location, $mode = 'simple') { array('key' => 'geo:long', 'value' => $location['longitude']), ), ); + break; + // Location 1.x-2.x bug compatible. // W3C Basic Geo Vocabulary with a misspelled longitude tag. case 'w3c_bugcompat': @@ -54,16 +58,19 @@ function _location_rss_item($location, $mode = 'simple') { array('key' => 'geo:lon', 'value' => $location['longitude']), ), ); + break; - // GeoRSS-Simple + + // GeoRSS-Simple. case 'simple': $ret = array( 'key' => 'georss:point', 'namespace' => array('xmlns:georss' => 'http://www.georss.org/georss'), 'value' => "$location[latitude] $location[longitude]", ); + break; - // + case 'gml': $ret = array( 'key' => 'georss:where', diff --git a/location.tpl.php b/location.tpl.php index 116e5e2..ca9aba1 100644 --- a/location.tpl.php +++ b/location.tpl.php @@ -1,3 +1,10 @@ +
@@ -45,9 +52,13 @@
- + - + , diff --git a/location.views.inc b/location.views.inc index 25db35a..a96e86c 100644 --- a/location.views.inc +++ b/location.views.inc @@ -74,14 +74,6 @@ function location_views_handlers() { 'location_handler_sort_location_country' => array( 'parent' => 'views_handler_sort', ), -// 'location_handler_relationship_location_distance' => array( -// 'parent' => 'views_handler_relationship', -// ), - -// 'location_handler_field_location_coordinates_user' => array( -// 'parent' => 'views_handler_field', -// ), - ), ); } @@ -139,10 +131,11 @@ function location_views_data() { // lid $data['location']['lid'] = array( 'title' => t('Lid'), - 'help' => t('The location ID of the location.'), // The help that appears on the UI, + // The help that appears on the UI. + 'help' => t('The location ID of the location.'), // Information for displaying the lid 'field' => array( - 'handler' => 'views_handler_field', // @@@ + 'handler' => 'views_handler_field', 'click sortable' => TRUE, ), // Information for accepting a lid as an argument @@ -318,7 +311,8 @@ function location_views_data() { 'title' => t('Coordinates'), 'help' => t("The coordinates of the selected location in 'lat, long' format."), 'field' => array( - 'field' => 'latitude', // The handler adds the longitude. + // The handler adds the longitude. + 'field' => 'latitude', 'handler' => 'location_views_handler_field_coordinates', 'click sortable' => FALSE, ), @@ -339,33 +333,9 @@ function location_views_data() { ), 'filter' => array( 'handler' => 'location_views_handler_filter_proximity', - ), -// 'relationship' => array( -// 'handler' => 'location_handler_relationship_location_distance', -// ), + ) ); -// $data['location']['coordinates_user'] = array( -// 'title' => t('Coordinates of logged-on user'), -// 'help' => t('This will contain the coordinates of the logged-on user.'), -// 'field' => array( -// 'handler' => 'location_handler_field_location_coordinates_user', -// 'click sortable' => FALSE, -// ), -// ); - - /* - 'latitude' => array( - 'name' => t('Latitude'), - 'sortable' => TRUE, - ), - 'longitude' => array( - 'name' => t('Longitude'), - 'sortable' => TRUE, - ), - */ - - $data['location']['address'] = array( 'title' => t('Address'), 'help' => t('The entire address block for the location.'), @@ -376,7 +346,6 @@ function location_views_data() { ), ); - $data['location_instance']['table']['group'] = t('Location', array(), array('context' => 'geolocation')); $data['location_instance']['table']['join'] = array( @@ -402,7 +371,6 @@ function location_views_data() { ), ); - // Tell the base tables about us. $data['node']['table']['join']['location'] = array( 'left_table' => 'location_instance', @@ -517,6 +485,7 @@ function location_views_proximity_get_reference_location($view, $options) { } } break; + case 'static': case 'latlon_gmap': // Validate actual values @@ -525,6 +494,7 @@ function location_views_proximity_get_reference_location($view, $options) { $coordinates['longitude'] = (float) $options['longitude']; } break; + case 'tied': if (!empty($view->filter)) { foreach ($view->filter as $filter) { @@ -550,6 +520,7 @@ function location_views_proximity_get_reference_location($view, $options) { } } break; + case 'postal': case 'postal_default': // Force default for country. @@ -565,6 +536,7 @@ function location_views_proximity_get_reference_location($view, $options) { } } break; + case 'php': ob_start(); $result = eval($options['php_code']); @@ -574,6 +546,7 @@ function location_views_proximity_get_reference_location($view, $options) { $coordinates['longitude'] = (float) $result['longitude']; } break; + case 'nid_arg': if ($nodehandler = $view->display_handler->get_handler('argument', $options['nid_arg'])) { $nid = $nodehandler->get_value(NULL); @@ -601,6 +574,7 @@ function location_views_proximity_get_reference_location($view, $options) { } } break; + case 'uid_arg': if ($userhandler = $view->display_handler->get_handler('argument', $options['uid_arg'])) { $uid = $userhandler->get_value(); @@ -610,17 +584,20 @@ function location_views_proximity_get_reference_location($view, $options) { } } break; + case 'distance_arg': foreach ($view->argument as $argument) { if ($argument->field == 'distance') { list($coords, $search_distance) = explode('_', $view->args[$argument->position]); list($lat, $lon) = explode(',', $coords); break; + } } $coordinates['latitude'] = (float) $lat; $coordinates['longitude'] = (float) $lon; break; + case 'geoip': $coordinates['latitude'] = (float) $options['latitude']; $coordinates['longitude'] = (float) $options['longitude']; @@ -634,7 +611,8 @@ function location_views_proximity_get_reference_location($view, $options) { } } elseif (module_exists('geoip')) { - if ($geoip_location = geoip_city()) { // intentional assignment of $geoip + // Intentional assignment of $geoip. + if ($geoip_location = geoip_city()) { $coordinates['latitude'] = $geoip_location->latitude; $coordinates['longitude'] = $geoip_location->longitude; } diff --git a/locations.tpl.php b/locations.tpl.php index e43099a..0be4128 100644 --- a/locations.tpl.php +++ b/locations.tpl.php @@ -1,3 +1,10 @@ +

diff --git a/tests/cow.test b/tests/cow.test index 0bf7185..e0211e8 100644 --- a/tests/cow.test +++ b/tests/cow.test @@ -7,21 +7,24 @@ require_once drupal_get_path('module', 'location') . '/tests/location_testcase.test'; +/** + * Class CowInstanceTest. + */ class CowInstanceTest extends LocationTestCase { /** * A global administrative user. */ - var $admin_user; + public $admin_user; /** * A global normal user. */ - var $normal_user; + public $normal_user; /** * Simple content type using defaults. */ - var $content_type; + public $content_type; public static function getInfo() { @@ -32,13 +35,13 @@ class CowInstanceTest extends LocationTestCase { ); } - function setUp() { + public function setUp() { parent::setUp('location', 'location_node', 'devel'); $web_admin = $this->drupalCreateUser(array_keys(module_invoke_all('permission'))); $this->drupalLogin($web_admin); } - function testCreateLocation() { + public function testCreateLocation() { $settings = array(); $location_type = $this->addLocationContentType($settings); @@ -62,7 +65,7 @@ class CowInstanceTest extends LocationTestCase { $this->assertEqual($location1_name, $node2->locations[0]['name'], t('Testing basic save/load')); } - function testLocpickOnly() { + public function testLocpickOnly() { $settings = array(); $location_type = $this->addLocationContentType($settings); @@ -89,7 +92,7 @@ class CowInstanceTest extends LocationTestCase { $this->assertEqual($node2->locations[0]['latitude'], 44.25, t('Testing coordinate-only save/load')); } - function testMultipleLocationOnSingleNode() { + public function testMultipleLocationOnSingleNode() { $settings = array(); $location_type = $this->addLocationContentType($settings, array('multiple' => array('max' => 3, 'add' => 3))); @@ -140,7 +143,7 @@ class CowInstanceTest extends LocationTestCase { ); } - function testSharedLocation() { + public function testSharedLocation() { $settings = array(); $location_type = $this->addLocationContentType($settings); @@ -202,7 +205,7 @@ class CowInstanceTest extends LocationTestCase { } } - function testNodeRevisionCOW() { + public function testNodeRevisionCOW() { $settings = array(); $location_type = $this->addLocationContentType($settings, array('multiple' => array('max' => 3, 'add' => 3))); @@ -214,11 +217,13 @@ class CowInstanceTest extends LocationTestCase { array( 'type' => $location_type, 'locations' => array( - 0 => array( // First + // First. + 0 => array( 'name' => $location1_name, 'location_settings' => $settings, ), - 1 => array( // Second + // Second. + 1 => array( 'name' => $location2_name, 'location_settings' => $settings, ), @@ -233,10 +238,12 @@ class CowInstanceTest extends LocationTestCase { 'revision' => TRUE, 'log' => $this->randomName(20), 'locations' => array( - 0 => array( // Delete First + // Delete First. + 0 => array( 'delete_location' => TRUE, ), - 2 => array( // Third + // Third. + 2 => array( 'name' => $location3_name, ), ), @@ -277,25 +284,9 @@ class CowInstanceTest extends LocationTestCase { ); $this->assertFalse(node_revision_delete($node1->vid)); -// @todo fixme - /* $result = db_query('SELECT * FROM {location} WHERE lid = :lid', array(':lid' => $node1->locations[0]['lid'])); - if ($row != $result->fetch()) { - $this->fail(t('Ensuring location on deleted revision is garbage collected')); - } - else { - $this->pass(t('Ensuring location on deleted revision is garbage collected')); - } - - $result = db_query('SELECT * FROM {location} WHERE lid = :lid', array(':lid' => $node1->locations[1]['lid'])); - if ($row2 != $result->fetch()) { - $this->pass(t('Ensuring shared location on deleted revision is NOT garbage collected')); - } - else { - $this->fail(t('Ensuring shared location on deleted revision is NOT garbage collected')); - }*/ } - function testCOWConservation() { + public function testCOWConservation() { $settings = array(); $location_type = $this->addLocationContentType($settings); diff --git a/tests/earth.test b/tests/earth.test index 8fa08c9..35392d6 100644 --- a/tests/earth.test +++ b/tests/earth.test @@ -18,11 +18,11 @@ class LocationEarthTest extends LocationTestCase { ); } - function setUp() { + public function setUp() { parent::setUp('location', 'location_node', 'devel'); } - function testXYZ() { + public function testXYZ() { $expected = array(5076436.1926031, 3086400.2318368, 2312685.5571307); $result = earth_xyz(31.299, 21.4); $this->assertArrayEpsilon($result, $expected, 0.01); diff --git a/tests/google_geocoder.test b/tests/google_geocoder.test index abc2cda..d9eb57e 100644 --- a/tests/google_geocoder.test +++ b/tests/google_geocoder.test @@ -8,6 +8,9 @@ require_once drupal_get_path('module', 'location') . '/tests/location_testcase.test'; require_once drupal_get_path('module', 'location') . '/tests/geocoder_api_keys.inc'; +/** + * Class LocationGoogleGeocoderTest. + */ class LocationGoogleGeocoderTest extends LocationTestCase { public static function getInfo() { @@ -18,14 +21,14 @@ class LocationGoogleGeocoderTest extends LocationTestCase { ); } - function setUp() { + public function setUp() { parent::setUp('location', 'location_node', 'devel'); variable_set('location_geocode_google_apikey', TESTING_APIKEY_GOOGLE_MAPS); $web_admin = $this->drupalCreateUser(array_keys(module_invoke_all('permission'))); $this->drupalLogin($web_admin); } - function testUSA() { + public function testUSA() { // Initialize the geocoder. $settings = array( 'location_geocode_us' => 'google', diff --git a/tests/location_cck.test b/tests/location_cck.test index bcc4a4f..88838cc 100644 --- a/tests/location_cck.test +++ b/tests/location_cck.test @@ -7,21 +7,24 @@ require_once drupal_get_path('module', 'location') . '/tests/location_testcase.test'; +/** + * Class LocationCCKTest. + */ class LocationCCKTest extends LocationCCK2Test { /** * A global administrative user. */ - var $admin_user; + public $admin_user; /** * A global normal user. */ - var $normal_user; + public $normal_user; /** * A default content type. */ - var $content_type; + public $content_type; public static function getInfo() { return array( @@ -31,7 +34,7 @@ class LocationCCKTest extends LocationCCK2Test { ); } - function setUp() { + public function setUp() { parent::setUp('location', 'location_cck', 'devel', 'field_ui'); $this->admin_user = $this->drupalCreateUser(array_keys(module_invoke_all('permission'))); $this->normal_user = $this->drupalCreateUser(array('access content')); @@ -59,7 +62,6 @@ class LocationCCKTest extends LocationCCK2Test { $name = strtolower($this->randomName(8)); - $form = array( 'name' => $name, 'type' => $name, @@ -91,37 +93,37 @@ class LocationCCKTest extends LocationCCK2Test { /** * @ */ - function testCreateLocation() { + public function testCreateLocation() { // @todo fixme return TRUE; } - function testLocpickOnly() { + public function testLocpickOnly() { // @todo fixme return TRUE; } - function testMultipleLocationOnSingleNode() { + public function testMultipleLocationOnSingleNode() { // @todo fixme return TRUE; } - function testSharedLocation() { + public function testSharedLocation() { // @todo fixme return TRUE; } - function testNodeRevisionCOW() { + public function testNodeRevisionCOW() { // @todo fixme return TRUE; } - function testNodeRevisionCleanup() { + public function testNodeRevisionCleanup() { // @todo fixme return TRUE; } - function testCOWConservation() { + public function testCOWConservation() { // @todo fixme return TRUE; } diff --git a/tests/location_cck2.test b/tests/location_cck2.test index c0e60f2..b20ac74 100644 --- a/tests/location_cck2.test +++ b/tests/location_cck2.test @@ -11,27 +11,27 @@ class LocationCCK2Test extends LocationTestCase { /** * A global administrative user. */ - var $admin_user; + public $admin_user; /** * A global normal user. */ - var $normal_user; + public $normal_user; /** * A default content type. */ - var $content_type; + public $content_type; /** * A default content name. */ - static $name; + static public $name; /** * A default content name. */ - static $field_name; + static public $field_name; public static function getInfo() { return array( @@ -79,7 +79,6 @@ class LocationCCK2Test extends LocationTestCase { $this->assertText(t('The content type ' . self::$name . ' has been added')); unset($form); - if (!self::$field_name) { self::$field_name = strtolower($this->randomName(8)); @@ -126,8 +125,6 @@ class LocationCCK2Test extends LocationTestCase { 'type' => $this->getTestContentName(), ) ); -// @todo remove debug -// $this->fail('
' . print_r($node2, TRUE) . '
', 'Debug'); $fieldname = 'field_' . $this->getTestFieldName(); $fielddata = $node2->$fieldname; // @todo remove debug diff --git a/tests/location_testcase.php b/tests/location_testcase.php deleted file mode 100644 index eae83c2..0000000 --- a/tests/location_testcase.php +++ /dev/null @@ -1,202 +0,0 @@ -drupalCreateUser(array_keys(module_invoke_all('permission'))); -// $this->drupalLogin($web_admin); -// } - - /** - * Custom assertion -- will check each element of an array against a reference value. - */ - protected function assertArrayEpsilon($result, $expected, $epsilon, $message = '', $group = 'Other') { - foreach ($expected as $k => $test) { - $lower = $test - $epsilon; - $upper = $test + $epsilon; - if ($result[$k] < $lower || $result[$k] > $upper) { - $this->assert( - 'fail', - $message ? $message : t( - 'Value deviates by @amt, which is more than @maxdev.', - array( - '@amt' => abs($test - $result[$k]), - '@maxdev' => $epsilon - ) - ), - $group - ); - } - else { - $this->assert('pass', $message ? $message : t('Value within expected margin.'), $group); - } - } - } - - /** - * Get a set of location field defaults. - * This will also enable collection on all parts of the location field. - */ - protected function getLocationFieldDefaults() { - // Get the (settable) defaults. - $defaults = array(); - $d = location_invoke_locationapi($location, 'defaults'); - $fields = location_field_names(); - foreach ($fields as $k => $v) { - if (!isset($d[$k]['nodiff'])) { - $defaults[$k] = $d[$k]; - } - } - - foreach ($defaults as $k => $v) { - // Change collection to allow. - $defaults[$k]['collect'] = 1; - } - - return $defaults; - } - - /** - * Flatten a post settings array because drupalPost isn't smart enough to. - */ - protected function flattenPostData(&$edit) { - do { - $edit_flattened = TRUE; - foreach ($edit as $k => $v) { - if (is_array($v)) { - $edit_flattened = FALSE; - foreach ($v as $kk => $vv) { - $edit["{$k}[{$kk}]"] = $vv; - } - unset($edit[$k]); - } - } - } while (!$edit_flattened); - } - - protected function addLocationContentType(&$settings, $add = array()) { - // find a non-existent random type name. - - $name = strtolower($this->randomName(8)); - - // Get the (settable) defaults. - $defaults = $this->getLocationFieldDefaults(); - - $settings = array( - 'name' => $name, - 'type' => $name, - 'location_settings' => array( - 'multiple' => array( - 'max' => 1, - 'add' => 1, - ), - 'form' => array( - 'fields' => $defaults, - ), - ), - ); - - //$settings['location_settings'] = array_merge_recursive($settings['location_settings'], $add); - $this->flattenPostData($settings); - $add = array('location_settings' => $add); - $this->flattenPostData($add); - $settings = array_merge($settings, $add); - $this->drupalPost('admin/structure/types/add', $settings, 'Save content type'); - $this->refreshVariables(); - $settings = variable_get('location_settings_node_' . $name, array()); - - return $name; - } - - /** - * Delete a node. - */ - protected function deleteNode($nid) { - // Implemention taken from node_delete, with some assumptions regarding - // function_exists removed. - node_delete($nid); -// $node = node_load($nid); -// db_query('DELETE FROM {node} WHERE nid = %d', $node->nid); -// db_query('DELETE FROM {node_revisions} WHERE nid = %d', $node->nid); -// -// // Call the node-specific callback (if any): -// node_invoke($node, 'delete'); -// node_invoke_nodeapi($node, 'delete'); -// -// // Clear the page and block caches. -// cache_clear_all(); - } - - /** - * Order locations in a node by LID for testing repeatability purposes. - */ - protected function reorderLocations(&$node, $field = 'locations') { - $locations = array(); - foreach ($node->{$field} as $location) { - if ($location['lid']) { - $locations[$location['lid']] = $location; - } - } - ksort($locations); - $node->{$field} = array(); - foreach ($locations as $location) { - $node->{$field}[] = $location; - } - } - - /** - * Creates a node based on default settings. This uses the internal simpletest - * browser, meaning the node will be owned by the current simpletest _browser user. - * - * Code modified from #212304. - * This is mainly for testing for differences between node_save() and - * submitting a node/add/* form. - * - * @param values - * An associative array of values to change from the defaults, keys are - * node properties, for example 'body' => 'Hello, world!'. - * @return object Created node object. - */ - protected function drupalCreateNodeViaForm($values = array()) { - $defaults = array( - 'type' => 'page', - 'title' => $this->randomName(8), - ); - - $edit = ($values + $defaults); - - if (empty($edit['body'])) { - $content_type = db_fetch_array(db_query("select name, has_body from {node_type} where type='%s'", $edit['type'])); - - if ($content_type['has_body']) { - $edit['body'] = $this->randomName(32); - } - } - $type = $edit['type']; - unset($edit['type']); // Only used in URL. - $this->flattenPostData($edit); // Added by me. - $this->drupalPost('node/add/' . str_replace('_', '-', $type), $edit, t('Save')); - - $node = node_load(array('title' => $edit['title'])); - $this->assertRaw( - t( - '@type %title has been created.', - array( - '@type' => node_get_types('name', $node), - '%title' => $edit['title'] - ) - ), - t('Node created successfully.') - ); - - return $node; - } - -} diff --git a/tests/location_testcase.test b/tests/location_testcase.test index eae83c2..b7c57dd 100644 --- a/tests/location_testcase.test +++ b/tests/location_testcase.test @@ -4,15 +4,11 @@ * @file * Common functions for Location tests. */ -class LocationTestCase extends DrupalWebTestCase { -// -// function setUp() { -// parent::setUp('location', 'devel'); -// module_enable(array('location_node')); -// $web_admin = $this->drupalCreateUser(array_keys(module_invoke_all('permission'))); -// $this->drupalLogin($web_admin); -// } +/** + * Class LocationTestCase. + */ +class LocationTestCase extends DrupalWebTestCase { /** * Custom assertion -- will check each element of an array against a reference value. @@ -119,19 +115,7 @@ class LocationTestCase extends DrupalWebTestCase { * Delete a node. */ protected function deleteNode($nid) { - // Implemention taken from node_delete, with some assumptions regarding - // function_exists removed. node_delete($nid); -// $node = node_load($nid); -// db_query('DELETE FROM {node} WHERE nid = %d', $node->nid); -// db_query('DELETE FROM {node_revisions} WHERE nid = %d', $node->nid); -// -// // Call the node-specific callback (if any): -// node_invoke($node, 'delete'); -// node_invoke_nodeapi($node, 'delete'); -// -// // Clear the page and block caches. -// cache_clear_all(); } /** @@ -180,8 +164,9 @@ class LocationTestCase extends DrupalWebTestCase { } } $type = $edit['type']; - unset($edit['type']); // Only used in URL. - $this->flattenPostData($edit); // Added by me. + // Only used in URL. + unset($edit['type']); + $this->flattenPostData($edit); $this->drupalPost('node/add/' . str_replace('_', '-', $type), $edit, t('Save')); $node = node_load(array('title' => $edit['title']));