@@ -287,8 +287,8 @@ |
||
| 287 | 287 | $min = $this->_convertRationaltoFloat($param [1]) / 60; |
| 288 | 288 | $sec = $this->_convertRationaltoFloat($param [2]) / 60 / 60; |
| 289 | 289 | // Hemisphere (N, S, W or E) |
| 290 | - $hem = ($param [3] === 'N' || $param [3] === 'E') ? 1 : -1; |
|
| 291 | - return $hem * ($deg + $min + $sec); |
|
| 290 | + $hem = ($param [3] === 'N' || $param [3] === 'E') ? 1 : -1; |
|
| 291 | + return $hem * ($deg + $min + $sec); |
|
| 292 | 292 | } |
| 293 | 293 | |
| 294 | 294 | private function _convertRationaltoFloat($param) { |
@@ -10,51 +10,51 @@ |
||
| 10 | 10 | */ |
| 11 | 11 | class index_test extends \DokuWikiTest { |
| 12 | 12 | |
| 13 | - protected $pluginsEnabled = array('spatialhelper'); |
|
| 14 | - |
|
| 15 | - /** |
|
| 16 | - * Testdata for @see index_test::test_convertDMStoD |
|
| 17 | - * |
|
| 18 | - * @return array |
|
| 19 | - */ |
|
| 20 | - public static function convertDMStoD_testdata() { |
|
| 21 | - return array( |
|
| 22 | - array( |
|
| 23 | - array ( 0 => '52/1', 1 => '31/1', 2 => '2/1', 3 => 'N', ), |
|
| 24 | - 52.5172, |
|
| 25 | - 'Latitude in Europe' |
|
| 26 | - ), |
|
| 27 | - array( |
|
| 28 | - array ( 0 => '13/1', 1 => '30/1', 2 => '38/1', 3 => 'E', ), |
|
| 29 | - 13.5105, |
|
| 30 | - 'Longitude in Europe' |
|
| 31 | - ), |
|
| 32 | - array( |
|
| 33 | - array ( 0 => '50/1', 1 => '34251480/1000000', 2 => '0/1', 3 => 'N', ), |
|
| 34 | - 50.5708, |
|
| 35 | - 'Latitude in North America' |
|
| 36 | - ), |
|
| 37 | - array( |
|
| 38 | - array ( 0 => '109/1', 1 => '28041300/1000000', 2 => '0/1', 3 => 'W', ), |
|
| 39 | - -109.4673, |
|
| 40 | - 'Longitude in North America' |
|
| 41 | - ), |
|
| 42 | - ); |
|
| 43 | - } |
|
| 44 | - |
|
| 45 | - |
|
| 46 | - /** |
|
| 47 | - * @dataProvider convertDMStoD_testdata |
|
| 48 | - * |
|
| 49 | - */ |
|
| 50 | - public function test_convertDMStoD($input, $expected_output, $msg) { |
|
| 51 | - /** @var \helper_plugin_spatialhelper_index $index */ |
|
| 52 | - $index = plugin_load('helper', 'spatialhelper_index'); |
|
| 53 | - |
|
| 54 | - $actual_output = $index->_convertDMStoD($input); |
|
| 55 | - |
|
| 56 | - $this->assertEquals($expected_output, $actual_output, $msg, 0.0001); |
|
| 57 | - } |
|
| 13 | + protected $pluginsEnabled = array('spatialhelper'); |
|
| 14 | + |
|
| 15 | + /** |
|
| 16 | + * Testdata for @see index_test::test_convertDMStoD |
|
| 17 | + * |
|
| 18 | + * @return array |
|
| 19 | + */ |
|
| 20 | + public static function convertDMStoD_testdata() { |
|
| 21 | + return array( |
|
| 22 | + array( |
|
| 23 | + array ( 0 => '52/1', 1 => '31/1', 2 => '2/1', 3 => 'N', ), |
|
| 24 | + 52.5172, |
|
| 25 | + 'Latitude in Europe' |
|
| 26 | + ), |
|
| 27 | + array( |
|
| 28 | + array ( 0 => '13/1', 1 => '30/1', 2 => '38/1', 3 => 'E', ), |
|
| 29 | + 13.5105, |
|
| 30 | + 'Longitude in Europe' |
|
| 31 | + ), |
|
| 32 | + array( |
|
| 33 | + array ( 0 => '50/1', 1 => '34251480/1000000', 2 => '0/1', 3 => 'N', ), |
|
| 34 | + 50.5708, |
|
| 35 | + 'Latitude in North America' |
|
| 36 | + ), |
|
| 37 | + array( |
|
| 38 | + array ( 0 => '109/1', 1 => '28041300/1000000', 2 => '0/1', 3 => 'W', ), |
|
| 39 | + -109.4673, |
|
| 40 | + 'Longitude in North America' |
|
| 41 | + ), |
|
| 42 | + ); |
|
| 43 | + } |
|
| 44 | + |
|
| 45 | + |
|
| 46 | + /** |
|
| 47 | + * @dataProvider convertDMStoD_testdata |
|
| 48 | + * |
|
| 49 | + */ |
|
| 50 | + public function test_convertDMStoD($input, $expected_output, $msg) { |
|
| 51 | + /** @var \helper_plugin_spatialhelper_index $index */ |
|
| 52 | + $index = plugin_load('helper', 'spatialhelper_index'); |
|
| 53 | + |
|
| 54 | + $actual_output = $index->_convertDMStoD($input); |
|
| 55 | + |
|
| 56 | + $this->assertEquals($expected_output, $actual_output, $msg, 0.0001); |
|
| 57 | + } |
|
| 58 | 58 | |
| 59 | 59 | |
| 60 | 60 | } |