Ysurac /
FlightAirMap
@@ -4,13 +4,13 @@ |
||
| 4 | 4 | * This Script will try to find all real arrival airports for all flights in DB |
| 5 | 5 | * |
| 6 | 6 | */ |
| 7 | - require_once('../require/settings.php'); |
|
| 8 | - if ($globalInstalled) { |
|
| 9 | - echo '$globalInstalled must be set to FALSE in require/settings.php'; |
|
| 10 | - exit; |
|
| 11 | - } |
|
| 12 | - require('../require/class.Spotter.php'); |
|
| 13 | - $Spotter = new Spotter(); |
|
| 14 | - $Spotter->updateArrivalAirports(); |
|
| 7 | + require_once('../require/settings.php'); |
|
| 8 | + if ($globalInstalled) { |
|
| 9 | + echo '$globalInstalled must be set to FALSE in require/settings.php'; |
|
| 10 | + exit; |
|
| 11 | + } |
|
| 12 | + require('../require/class.Spotter.php'); |
|
| 13 | + $Spotter = new Spotter(); |
|
| 14 | + $Spotter->updateArrivalAirports(); |
|
| 15 | 15 | |
| 16 | 16 | ?> |
| 17 | 17 | \ No newline at end of file |
@@ -10,7 +10,7 @@ discard block |
||
| 10 | 10 | |
| 11 | 11 | $page_url = $globalURL.'/tools-notam'; |
| 12 | 12 | |
| 13 | -$message = filter_input(INPUT_POST,'notam_message',FILTER_SANITIZE_STRING); |
|
| 13 | +$message = filter_input(INPUT_POST, 'notam_message', FILTER_SANITIZE_STRING); |
|
| 14 | 14 | |
| 15 | 15 | print '<div class="info column">'; |
| 16 | 16 | print '<h1>'._("Parse NOTAM messages").'</h1>'; |
@@ -34,7 +34,7 @@ discard block |
||
| 34 | 34 | if (!empty($notam_parse)) { |
| 35 | 35 | print '<p>'._("NOTAM message in human readable format:").'</p>'; |
| 36 | 36 | foreach ($notam_parse as $key => $value) { |
| 37 | - print '<b>'.strtoupper(str_replace('_',' ',$key)).'</b>: '.$value.'<br />'; |
|
| 37 | + print '<b>'.strtoupper(str_replace('_', ' ', $key)).'</b>: '.$value.'<br />'; |
|
| 38 | 38 | } |
| 39 | 39 | } else { |
| 40 | 40 | print '<p>'._("This NOTAM message can't be translated in human readable format :(").'</p>'; |
@@ -23,7 +23,9 @@ |
||
| 23 | 23 | print '<fieldset class="form-group">'; |
| 24 | 24 | print '<label for="notam_message">'._("NOTAM Message").'</label>'; |
| 25 | 25 | print '<textarea class="form-control" name="notam_message" id="notam_message" rows="5">'; |
| 26 | -if ($message != '') print $message; |
|
| 26 | +if ($message != '') { |
|
| 27 | + print $message; |
|
| 28 | +} |
|
| 27 | 29 | print '</textarea>'; |
| 28 | 30 | print '</fieldset>'; |
| 29 | 31 | print '<button type="submit" class="btn btn-primary">Submit</button>'; |
@@ -7,13 +7,13 @@ discard block |
||
| 7 | 7 | die(); |
| 8 | 8 | } |
| 9 | 9 | $Spotter = new Spotter(); |
| 10 | -$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING); |
|
| 11 | -$ident = filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING); |
|
| 12 | -$spotter_array = $Spotter->getSpotterDataByIdent($ident,"0,1", $sort); |
|
| 10 | +$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING); |
|
| 11 | +$ident = filter_input(INPUT_GET, 'ident', FILTER_SANITIZE_STRING); |
|
| 12 | +$spotter_array = $Spotter->getSpotterDataByIdent($ident, "0,1", $sort); |
|
| 13 | 13 | |
| 14 | 14 | if (!empty($spotter_array)) |
| 15 | 15 | { |
| 16 | - $title = sprintf(_("Most Common Routes of %s"),$spotter_array[0]['ident']); |
|
| 16 | + $title = sprintf(_("Most Common Routes of %s"), $spotter_array[0]['ident']); |
|
| 17 | 17 | require_once('header.php'); |
| 18 | 18 | print '<div class="info column">'; |
| 19 | 19 | print '<h1>'.$spotter_array[0]['ident'].'</h1>'; |
@@ -24,7 +24,7 @@ discard block |
||
| 24 | 24 | include('ident-sub-menu.php'); |
| 25 | 25 | print '<div class="column">'; |
| 26 | 26 | print '<h2>'._("Most Common Routes").'</h2>'; |
| 27 | - print '<p>'.sprintf(_("The statistic below shows the most common routes from flights with the ident/callsign <strong>%s</strong>."),$spotter_array[0]['ident']).'</p>'; |
|
| 27 | + print '<p>'.sprintf(_("The statistic below shows the most common routes from flights with the ident/callsign <strong>%s</strong>."), $spotter_array[0]['ident']).'</p>'; |
|
| 28 | 28 | |
| 29 | 29 | $route_array = $Spotter->countAllRoutesByIdent($ident); |
| 30 | 30 | if (!empty($route_array)) |
@@ -41,7 +41,7 @@ discard block |
||
| 41 | 41 | print '</thead>'; |
| 42 | 42 | print '<tbody>'; |
| 43 | 43 | $i = 1; |
| 44 | - foreach($route_array as $route_item) |
|
| 44 | + foreach ($route_array as $route_item) |
|
| 45 | 45 | { |
| 46 | 46 | print '<tr>'; |
| 47 | 47 | print '<td><strong>'.$i.'</strong></td>'; |
@@ -3,8 +3,8 @@ |
||
| 3 | 3 | require_once('require/class.Spotter.php'); |
| 4 | 4 | require_once('require/class.Language.php'); |
| 5 | 5 | if (!isset($_GET['ident'])) { |
| 6 | - header('Location: '.$globalURL.'/ident'); |
|
| 7 | - die(); |
|
| 6 | + header('Location: '.$globalURL.'/ident'); |
|
| 7 | + die(); |
|
| 8 | 8 | } |
| 9 | 9 | $Spotter = new Spotter(); |
| 10 | 10 | $sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING); |
@@ -9,281 +9,281 @@ |
||
| 9 | 9 | } |
| 10 | 10 | |
| 11 | 11 | function testMethods() { |
| 12 | - $format = 'gpx'; |
|
| 13 | - $value = file_get_contents('./input/20120702.gpx'); |
|
| 14 | - $geometry = geoPHP::load($value, $format); |
|
| 12 | + $format = 'gpx'; |
|
| 13 | + $value = file_get_contents('./input/20120702.gpx'); |
|
| 14 | + $geometry = geoPHP::load($value, $format); |
|
| 15 | 15 | |
| 16 | - $methods = array( |
|
| 17 | - array('name' => 'area'), |
|
| 18 | - array('name' => 'boundary'), |
|
| 19 | - array('name' => 'getBBox'), |
|
| 20 | - array('name' => 'centroid'), |
|
| 21 | - array('name' => 'length'), |
|
| 22 | - array('name' => 'greatCircleLength', 'argument' => 6378137), |
|
| 23 | - array('name' => 'haversineLength'), |
|
| 24 | - array('name' => 'y'), |
|
| 25 | - array('name' => 'x'), |
|
| 26 | - array('name' => 'numGeometries'), |
|
| 27 | - array('name' => 'geometryN', 'argument' => '1'), |
|
| 28 | - array('name' => 'startPoint'), |
|
| 29 | - array('name' => 'endPoint'), |
|
| 30 | - array('name' => 'isRing'), |
|
| 31 | - array('name' => 'isClosed'), |
|
| 32 | - array('name' => 'numPoints'), |
|
| 33 | - array('name' => 'pointN', 'argument' => '1'), |
|
| 34 | - array('name' => 'exteriorRing'), |
|
| 35 | - array('name' => 'numInteriorRings'), |
|
| 36 | - array('name' => 'interiorRingN', 'argument' => '1'), |
|
| 37 | - array('name' => 'dimension'), |
|
| 38 | - array('name' => 'geometryType'), |
|
| 39 | - array('name' => 'SRID'), |
|
| 40 | - array('name' => 'setSRID', 'argument' => '4326'), |
|
| 41 | - ); |
|
| 16 | + $methods = array( |
|
| 17 | + array('name' => 'area'), |
|
| 18 | + array('name' => 'boundary'), |
|
| 19 | + array('name' => 'getBBox'), |
|
| 20 | + array('name' => 'centroid'), |
|
| 21 | + array('name' => 'length'), |
|
| 22 | + array('name' => 'greatCircleLength', 'argument' => 6378137), |
|
| 23 | + array('name' => 'haversineLength'), |
|
| 24 | + array('name' => 'y'), |
|
| 25 | + array('name' => 'x'), |
|
| 26 | + array('name' => 'numGeometries'), |
|
| 27 | + array('name' => 'geometryN', 'argument' => '1'), |
|
| 28 | + array('name' => 'startPoint'), |
|
| 29 | + array('name' => 'endPoint'), |
|
| 30 | + array('name' => 'isRing'), |
|
| 31 | + array('name' => 'isClosed'), |
|
| 32 | + array('name' => 'numPoints'), |
|
| 33 | + array('name' => 'pointN', 'argument' => '1'), |
|
| 34 | + array('name' => 'exteriorRing'), |
|
| 35 | + array('name' => 'numInteriorRings'), |
|
| 36 | + array('name' => 'interiorRingN', 'argument' => '1'), |
|
| 37 | + array('name' => 'dimension'), |
|
| 38 | + array('name' => 'geometryType'), |
|
| 39 | + array('name' => 'SRID'), |
|
| 40 | + array('name' => 'setSRID', 'argument' => '4326'), |
|
| 41 | + ); |
|
| 42 | 42 | |
| 43 | - foreach($methods as $method) { |
|
| 44 | - $argument = NULL; |
|
| 45 | - $method_name = $method['name']; |
|
| 46 | - if (isset($method['argument'])) { |
|
| 47 | - $argument = $method['argument']; |
|
| 48 | - } |
|
| 49 | - $this->_methods_tester($geometry, $method_name, $argument); |
|
| 50 | - } |
|
| 43 | + foreach($methods as $method) { |
|
| 44 | + $argument = NULL; |
|
| 45 | + $method_name = $method['name']; |
|
| 46 | + if (isset($method['argument'])) { |
|
| 47 | + $argument = $method['argument']; |
|
| 48 | + } |
|
| 49 | + $this->_methods_tester($geometry, $method_name, $argument); |
|
| 50 | + } |
|
| 51 | 51 | } |
| 52 | 52 | |
| 53 | 53 | function _methods_tester($geometry, $method_name, $argument) { |
| 54 | 54 | |
| 55 | - if (!method_exists($geometry, $method_name)) { |
|
| 56 | - $this->fail("Method ".$method_name.'() doesn\'t exists.'); |
|
| 57 | - return; |
|
| 58 | - } |
|
| 55 | + if (!method_exists($geometry, $method_name)) { |
|
| 56 | + $this->fail("Method ".$method_name.'() doesn\'t exists.'); |
|
| 57 | + return; |
|
| 58 | + } |
|
| 59 | 59 | |
| 60 | - switch ($method_name) { |
|
| 61 | - case 'y': |
|
| 62 | - case 'x': |
|
| 63 | - if ($geometry->geometryType() == 'Point') { |
|
| 64 | - $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 65 | - } |
|
| 66 | - if ($geometry->geometryType() == 'LineString') { |
|
| 67 | - $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 68 | - } |
|
| 69 | - if ($geometry->geometryType() == 'MultiLineString') { |
|
| 70 | - $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 71 | - } |
|
| 72 | - break; |
|
| 73 | - case 'geometryN': |
|
| 74 | - if ($geometry->geometryType() == 'Point') { |
|
| 75 | - $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 76 | - } |
|
| 77 | - if ($geometry->geometryType() == 'LineString') { |
|
| 78 | - $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 79 | - } |
|
| 80 | - if ($geometry->geometryType() == 'MultiLineString') { |
|
| 81 | - $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 82 | - } |
|
| 83 | - break; |
|
| 84 | - case 'startPoint': |
|
| 85 | - if ($geometry->geometryType() == 'Point') { |
|
| 86 | - $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 87 | - } |
|
| 88 | - if ($geometry->geometryType() == 'LineString') { |
|
| 89 | - $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 90 | - } |
|
| 91 | - if ($geometry->geometryType() == 'MultiLineString') { |
|
| 92 | - //TODO: Add a method startPoint() to MultiLineString. |
|
| 93 | - //$this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 94 | - } |
|
| 95 | - break; |
|
| 96 | - case 'endPoint': |
|
| 97 | - if ($geometry->geometryType() == 'Point') { |
|
| 98 | - $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 99 | - } |
|
| 100 | - if ($geometry->geometryType() == 'LineString') { |
|
| 101 | - $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 102 | - } |
|
| 103 | - if ($geometry->geometryType() == 'MultiLineString') { |
|
| 104 | - //TODO: Add a method endPoint() to MultiLineString. |
|
| 105 | - //$this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 106 | - } |
|
| 107 | - break; |
|
| 108 | - case 'isRing': |
|
| 109 | - if ($geometry->geometryType() == 'Point') { |
|
| 110 | - $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 111 | - } |
|
| 112 | - if ($geometry->geometryType() == 'LineString') { |
|
| 113 | - $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 114 | - } |
|
| 115 | - if ($geometry->geometryType() == 'MultiLineString') { |
|
| 116 | - $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 117 | - } |
|
| 118 | - break; |
|
| 119 | - case 'isClosed': |
|
| 120 | - if ($geometry->geometryType() == 'Point') { |
|
| 121 | - $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 122 | - } |
|
| 123 | - if ($geometry->geometryType() == 'LineString') { |
|
| 124 | - $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 125 | - } |
|
| 126 | - if ($geometry->geometryType() == 'MultiLineString') { |
|
| 127 | - $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 128 | - } |
|
| 129 | - break; |
|
| 130 | - case 'pointN': |
|
| 131 | - if ($geometry->geometryType() == 'Point') { |
|
| 132 | - $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 133 | - } |
|
| 134 | - if ($geometry->geometryType() == 'LineString') { |
|
| 135 | - $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 136 | - } |
|
| 137 | - if ($geometry->geometryType() == 'MultiLineString') { |
|
| 138 | - //TODO: Add a method pointN() to MultiLineString. |
|
| 139 | - //$this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 140 | - } |
|
| 141 | - break; |
|
| 142 | - case 'exteriorRing': |
|
| 143 | - if ($geometry->geometryType() == 'Point') { |
|
| 144 | - $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 145 | - } |
|
| 146 | - if ($geometry->geometryType() == 'LineString') { |
|
| 147 | - $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 148 | - } |
|
| 149 | - if ($geometry->geometryType() == 'MultiLineString') { |
|
| 150 | - $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 151 | - } |
|
| 152 | - break; |
|
| 153 | - case 'numInteriorRings': |
|
| 154 | - if ($geometry->geometryType() == 'Point') { |
|
| 155 | - $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 156 | - } |
|
| 157 | - if ($geometry->geometryType() == 'LineString') { |
|
| 158 | - $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 159 | - } |
|
| 160 | - if ($geometry->geometryType() == 'MultiLineString') { |
|
| 161 | - $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 162 | - } |
|
| 163 | - break; |
|
| 164 | - case 'interiorRingN': |
|
| 165 | - if ($geometry->geometryType() == 'Point') { |
|
| 166 | - $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 167 | - } |
|
| 168 | - if ($geometry->geometryType() == 'LineString') { |
|
| 169 | - $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 170 | - } |
|
| 171 | - if ($geometry->geometryType() == 'MultiLineString') { |
|
| 172 | - $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 173 | - } |
|
| 174 | - break; |
|
| 175 | - case 'setSRID': |
|
| 176 | - //TODO: The method setSRID() should return TRUE. |
|
| 177 | - break; |
|
| 178 | - case 'SRID': |
|
| 179 | - if ($geometry->geometryType() == 'Point') { |
|
| 180 | - $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 181 | - } |
|
| 182 | - if ($geometry->geometryType() == 'LineString') { |
|
| 183 | - $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 184 | - } |
|
| 185 | - if ($geometry->geometryType() == 'MultiLineString') { |
|
| 186 | - $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 187 | - } |
|
| 188 | - break; |
|
| 189 | - case 'getBBox': |
|
| 190 | - if ($geometry->geometryType() == 'Point') { |
|
| 191 | - $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 192 | - } |
|
| 193 | - if ($geometry->geometryType() == 'LineString') { |
|
| 194 | - $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 195 | - } |
|
| 196 | - if ($geometry->geometryType() == 'MultiLineString') { |
|
| 197 | - $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 198 | - } |
|
| 199 | - break; |
|
| 200 | - case 'centroid': |
|
| 201 | - if ($geometry->geometryType() == 'Point') { |
|
| 202 | - $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 203 | - } |
|
| 204 | - if ($geometry->geometryType() == 'LineString') { |
|
| 205 | - $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 206 | - } |
|
| 207 | - if ($geometry->geometryType() == 'MultiLineString') { |
|
| 208 | - $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 209 | - } |
|
| 210 | - break; |
|
| 211 | - case 'length': |
|
| 212 | - if ($geometry->geometryType() == 'Point') { |
|
| 213 | - $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 214 | - } |
|
| 215 | - if ($geometry->geometryType() == 'LineString') { |
|
| 216 | - $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 217 | - } |
|
| 218 | - if ($geometry->geometryType() == 'MultiLineString') { |
|
| 219 | - $this->assertEquals($geometry->$method_name($argument), (float) '0.11624637315233', 'Failed on ' . $method_name); |
|
| 220 | - } |
|
| 221 | - break; |
|
| 222 | - case 'numGeometries': |
|
| 223 | - if ($geometry->geometryType() == 'Point') { |
|
| 224 | - $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 225 | - } |
|
| 226 | - if ($geometry->geometryType() == 'LineString') { |
|
| 227 | - $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 228 | - } |
|
| 229 | - if ($geometry->geometryType() == 'MultiLineString') { |
|
| 230 | - $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 231 | - } |
|
| 232 | - break; |
|
| 233 | - case 'numPoints': |
|
| 234 | - if ($geometry->geometryType() == 'Point') { |
|
| 235 | - $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 236 | - } |
|
| 237 | - if ($geometry->geometryType() == 'LineString') { |
|
| 238 | - $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 239 | - } |
|
| 240 | - if ($geometry->geometryType() == 'MultiLineString') { |
|
| 241 | - $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 242 | - } |
|
| 243 | - break; |
|
| 244 | - case 'dimension': |
|
| 245 | - if ($geometry->geometryType() == 'Point') { |
|
| 246 | - $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 247 | - } |
|
| 248 | - if ($geometry->geometryType() == 'LineString') { |
|
| 249 | - $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 250 | - } |
|
| 251 | - if ($geometry->geometryType() == 'MultiLineString') { |
|
| 252 | - $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 253 | - } |
|
| 254 | - break; |
|
| 255 | - case 'boundary': |
|
| 256 | - if ($geometry->geometryType() == 'Point') { |
|
| 257 | - $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 258 | - } |
|
| 259 | - if ($geometry->geometryType() == 'LineString') { |
|
| 260 | - $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 261 | - } |
|
| 262 | - if ($geometry->geometryType() == 'MultiLineString') { |
|
| 263 | - $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 264 | - } |
|
| 265 | - break; |
|
| 266 | - case 'greatCircleLength': |
|
| 267 | - if ($geometry->geometryType() == 'Point') { |
|
| 268 | - $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 269 | - } |
|
| 270 | - if ($geometry->geometryType() == 'LineString') { |
|
| 271 | - $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 272 | - } |
|
| 273 | - if ($geometry->geometryType() == 'MultiLineString') { |
|
| 274 | - $this->assertNotEquals($geometry->$method_name($argument), '9500.9359867418', 'Failed on ' . $method_name); |
|
| 275 | - } |
|
| 276 | - break; |
|
| 277 | - case 'haversineLength': |
|
| 278 | - case 'area': |
|
| 279 | - $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 280 | - break; |
|
| 281 | - case 'geometryType': |
|
| 282 | - $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 283 | - break; |
|
| 284 | - default: |
|
| 285 | - $this->assertTrue($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 286 | - } |
|
| 60 | + switch ($method_name) { |
|
| 61 | + case 'y': |
|
| 62 | + case 'x': |
|
| 63 | + if ($geometry->geometryType() == 'Point') { |
|
| 64 | + $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 65 | + } |
|
| 66 | + if ($geometry->geometryType() == 'LineString') { |
|
| 67 | + $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 68 | + } |
|
| 69 | + if ($geometry->geometryType() == 'MultiLineString') { |
|
| 70 | + $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 71 | + } |
|
| 72 | + break; |
|
| 73 | + case 'geometryN': |
|
| 74 | + if ($geometry->geometryType() == 'Point') { |
|
| 75 | + $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 76 | + } |
|
| 77 | + if ($geometry->geometryType() == 'LineString') { |
|
| 78 | + $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 79 | + } |
|
| 80 | + if ($geometry->geometryType() == 'MultiLineString') { |
|
| 81 | + $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 82 | + } |
|
| 83 | + break; |
|
| 84 | + case 'startPoint': |
|
| 85 | + if ($geometry->geometryType() == 'Point') { |
|
| 86 | + $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 87 | + } |
|
| 88 | + if ($geometry->geometryType() == 'LineString') { |
|
| 89 | + $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 90 | + } |
|
| 91 | + if ($geometry->geometryType() == 'MultiLineString') { |
|
| 92 | + //TODO: Add a method startPoint() to MultiLineString. |
|
| 93 | + //$this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 94 | + } |
|
| 95 | + break; |
|
| 96 | + case 'endPoint': |
|
| 97 | + if ($geometry->geometryType() == 'Point') { |
|
| 98 | + $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 99 | + } |
|
| 100 | + if ($geometry->geometryType() == 'LineString') { |
|
| 101 | + $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 102 | + } |
|
| 103 | + if ($geometry->geometryType() == 'MultiLineString') { |
|
| 104 | + //TODO: Add a method endPoint() to MultiLineString. |
|
| 105 | + //$this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 106 | + } |
|
| 107 | + break; |
|
| 108 | + case 'isRing': |
|
| 109 | + if ($geometry->geometryType() == 'Point') { |
|
| 110 | + $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 111 | + } |
|
| 112 | + if ($geometry->geometryType() == 'LineString') { |
|
| 113 | + $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 114 | + } |
|
| 115 | + if ($geometry->geometryType() == 'MultiLineString') { |
|
| 116 | + $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 117 | + } |
|
| 118 | + break; |
|
| 119 | + case 'isClosed': |
|
| 120 | + if ($geometry->geometryType() == 'Point') { |
|
| 121 | + $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 122 | + } |
|
| 123 | + if ($geometry->geometryType() == 'LineString') { |
|
| 124 | + $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 125 | + } |
|
| 126 | + if ($geometry->geometryType() == 'MultiLineString') { |
|
| 127 | + $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 128 | + } |
|
| 129 | + break; |
|
| 130 | + case 'pointN': |
|
| 131 | + if ($geometry->geometryType() == 'Point') { |
|
| 132 | + $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 133 | + } |
|
| 134 | + if ($geometry->geometryType() == 'LineString') { |
|
| 135 | + $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 136 | + } |
|
| 137 | + if ($geometry->geometryType() == 'MultiLineString') { |
|
| 138 | + //TODO: Add a method pointN() to MultiLineString. |
|
| 139 | + //$this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 140 | + } |
|
| 141 | + break; |
|
| 142 | + case 'exteriorRing': |
|
| 143 | + if ($geometry->geometryType() == 'Point') { |
|
| 144 | + $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 145 | + } |
|
| 146 | + if ($geometry->geometryType() == 'LineString') { |
|
| 147 | + $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 148 | + } |
|
| 149 | + if ($geometry->geometryType() == 'MultiLineString') { |
|
| 150 | + $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 151 | + } |
|
| 152 | + break; |
|
| 153 | + case 'numInteriorRings': |
|
| 154 | + if ($geometry->geometryType() == 'Point') { |
|
| 155 | + $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 156 | + } |
|
| 157 | + if ($geometry->geometryType() == 'LineString') { |
|
| 158 | + $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 159 | + } |
|
| 160 | + if ($geometry->geometryType() == 'MultiLineString') { |
|
| 161 | + $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 162 | + } |
|
| 163 | + break; |
|
| 164 | + case 'interiorRingN': |
|
| 165 | + if ($geometry->geometryType() == 'Point') { |
|
| 166 | + $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 167 | + } |
|
| 168 | + if ($geometry->geometryType() == 'LineString') { |
|
| 169 | + $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 170 | + } |
|
| 171 | + if ($geometry->geometryType() == 'MultiLineString') { |
|
| 172 | + $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 173 | + } |
|
| 174 | + break; |
|
| 175 | + case 'setSRID': |
|
| 176 | + //TODO: The method setSRID() should return TRUE. |
|
| 177 | + break; |
|
| 178 | + case 'SRID': |
|
| 179 | + if ($geometry->geometryType() == 'Point') { |
|
| 180 | + $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 181 | + } |
|
| 182 | + if ($geometry->geometryType() == 'LineString') { |
|
| 183 | + $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 184 | + } |
|
| 185 | + if ($geometry->geometryType() == 'MultiLineString') { |
|
| 186 | + $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 187 | + } |
|
| 188 | + break; |
|
| 189 | + case 'getBBox': |
|
| 190 | + if ($geometry->geometryType() == 'Point') { |
|
| 191 | + $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 192 | + } |
|
| 193 | + if ($geometry->geometryType() == 'LineString') { |
|
| 194 | + $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 195 | + } |
|
| 196 | + if ($geometry->geometryType() == 'MultiLineString') { |
|
| 197 | + $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 198 | + } |
|
| 199 | + break; |
|
| 200 | + case 'centroid': |
|
| 201 | + if ($geometry->geometryType() == 'Point') { |
|
| 202 | + $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 203 | + } |
|
| 204 | + if ($geometry->geometryType() == 'LineString') { |
|
| 205 | + $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 206 | + } |
|
| 207 | + if ($geometry->geometryType() == 'MultiLineString') { |
|
| 208 | + $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 209 | + } |
|
| 210 | + break; |
|
| 211 | + case 'length': |
|
| 212 | + if ($geometry->geometryType() == 'Point') { |
|
| 213 | + $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 214 | + } |
|
| 215 | + if ($geometry->geometryType() == 'LineString') { |
|
| 216 | + $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 217 | + } |
|
| 218 | + if ($geometry->geometryType() == 'MultiLineString') { |
|
| 219 | + $this->assertEquals($geometry->$method_name($argument), (float) '0.11624637315233', 'Failed on ' . $method_name); |
|
| 220 | + } |
|
| 221 | + break; |
|
| 222 | + case 'numGeometries': |
|
| 223 | + if ($geometry->geometryType() == 'Point') { |
|
| 224 | + $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 225 | + } |
|
| 226 | + if ($geometry->geometryType() == 'LineString') { |
|
| 227 | + $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 228 | + } |
|
| 229 | + if ($geometry->geometryType() == 'MultiLineString') { |
|
| 230 | + $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 231 | + } |
|
| 232 | + break; |
|
| 233 | + case 'numPoints': |
|
| 234 | + if ($geometry->geometryType() == 'Point') { |
|
| 235 | + $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 236 | + } |
|
| 237 | + if ($geometry->geometryType() == 'LineString') { |
|
| 238 | + $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 239 | + } |
|
| 240 | + if ($geometry->geometryType() == 'MultiLineString') { |
|
| 241 | + $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 242 | + } |
|
| 243 | + break; |
|
| 244 | + case 'dimension': |
|
| 245 | + if ($geometry->geometryType() == 'Point') { |
|
| 246 | + $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 247 | + } |
|
| 248 | + if ($geometry->geometryType() == 'LineString') { |
|
| 249 | + $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 250 | + } |
|
| 251 | + if ($geometry->geometryType() == 'MultiLineString') { |
|
| 252 | + $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 253 | + } |
|
| 254 | + break; |
|
| 255 | + case 'boundary': |
|
| 256 | + if ($geometry->geometryType() == 'Point') { |
|
| 257 | + $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 258 | + } |
|
| 259 | + if ($geometry->geometryType() == 'LineString') { |
|
| 260 | + $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 261 | + } |
|
| 262 | + if ($geometry->geometryType() == 'MultiLineString') { |
|
| 263 | + $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 264 | + } |
|
| 265 | + break; |
|
| 266 | + case 'greatCircleLength': |
|
| 267 | + if ($geometry->geometryType() == 'Point') { |
|
| 268 | + $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 269 | + } |
|
| 270 | + if ($geometry->geometryType() == 'LineString') { |
|
| 271 | + $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 272 | + } |
|
| 273 | + if ($geometry->geometryType() == 'MultiLineString') { |
|
| 274 | + $this->assertNotEquals($geometry->$method_name($argument), '9500.9359867418', 'Failed on ' . $method_name); |
|
| 275 | + } |
|
| 276 | + break; |
|
| 277 | + case 'haversineLength': |
|
| 278 | + case 'area': |
|
| 279 | + $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 280 | + break; |
|
| 281 | + case 'geometryType': |
|
| 282 | + $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 283 | + break; |
|
| 284 | + default: |
|
| 285 | + $this->assertTrue($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 286 | + } |
|
| 287 | 287 | } |
| 288 | 288 | } |
| 289 | 289 | |
@@ -40,7 +40,7 @@ discard block |
||
| 40 | 40 | array('name' => 'setSRID', 'argument' => '4326'), |
| 41 | 41 | ); |
| 42 | 42 | |
| 43 | - foreach($methods as $method) { |
|
| 43 | + foreach ($methods as $method) { |
|
| 44 | 44 | $argument = NULL; |
| 45 | 45 | $method_name = $method['name']; |
| 46 | 46 | if (isset($method['argument'])) { |
@@ -61,32 +61,32 @@ discard block |
||
| 61 | 61 | case 'y': |
| 62 | 62 | case 'x': |
| 63 | 63 | if ($geometry->geometryType() == 'Point') { |
| 64 | - $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 64 | + $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name); |
|
| 65 | 65 | } |
| 66 | 66 | if ($geometry->geometryType() == 'LineString') { |
| 67 | - $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 67 | + $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name); |
|
| 68 | 68 | } |
| 69 | 69 | if ($geometry->geometryType() == 'MultiLineString') { |
| 70 | - $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 70 | + $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name); |
|
| 71 | 71 | } |
| 72 | 72 | break; |
| 73 | 73 | case 'geometryN': |
| 74 | 74 | if ($geometry->geometryType() == 'Point') { |
| 75 | - $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 75 | + $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name); |
|
| 76 | 76 | } |
| 77 | 77 | if ($geometry->geometryType() == 'LineString') { |
| 78 | - $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 78 | + $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name); |
|
| 79 | 79 | } |
| 80 | 80 | if ($geometry->geometryType() == 'MultiLineString') { |
| 81 | - $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 81 | + $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name); |
|
| 82 | 82 | } |
| 83 | 83 | break; |
| 84 | 84 | case 'startPoint': |
| 85 | 85 | if ($geometry->geometryType() == 'Point') { |
| 86 | - $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 86 | + $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name); |
|
| 87 | 87 | } |
| 88 | 88 | if ($geometry->geometryType() == 'LineString') { |
| 89 | - $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 89 | + $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name); |
|
| 90 | 90 | } |
| 91 | 91 | if ($geometry->geometryType() == 'MultiLineString') { |
| 92 | 92 | //TODO: Add a method startPoint() to MultiLineString. |
@@ -95,10 +95,10 @@ discard block |
||
| 95 | 95 | break; |
| 96 | 96 | case 'endPoint': |
| 97 | 97 | if ($geometry->geometryType() == 'Point') { |
| 98 | - $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 98 | + $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name); |
|
| 99 | 99 | } |
| 100 | 100 | if ($geometry->geometryType() == 'LineString') { |
| 101 | - $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 101 | + $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name); |
|
| 102 | 102 | } |
| 103 | 103 | if ($geometry->geometryType() == 'MultiLineString') { |
| 104 | 104 | //TODO: Add a method endPoint() to MultiLineString. |
@@ -107,32 +107,32 @@ discard block |
||
| 107 | 107 | break; |
| 108 | 108 | case 'isRing': |
| 109 | 109 | if ($geometry->geometryType() == 'Point') { |
| 110 | - $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 110 | + $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name); |
|
| 111 | 111 | } |
| 112 | 112 | if ($geometry->geometryType() == 'LineString') { |
| 113 | - $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 113 | + $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name); |
|
| 114 | 114 | } |
| 115 | 115 | if ($geometry->geometryType() == 'MultiLineString') { |
| 116 | - $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 116 | + $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name); |
|
| 117 | 117 | } |
| 118 | 118 | break; |
| 119 | 119 | case 'isClosed': |
| 120 | 120 | if ($geometry->geometryType() == 'Point') { |
| 121 | - $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 121 | + $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name); |
|
| 122 | 122 | } |
| 123 | 123 | if ($geometry->geometryType() == 'LineString') { |
| 124 | - $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 124 | + $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name); |
|
| 125 | 125 | } |
| 126 | 126 | if ($geometry->geometryType() == 'MultiLineString') { |
| 127 | - $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 127 | + $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name); |
|
| 128 | 128 | } |
| 129 | 129 | break; |
| 130 | 130 | case 'pointN': |
| 131 | 131 | if ($geometry->geometryType() == 'Point') { |
| 132 | - $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 132 | + $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name); |
|
| 133 | 133 | } |
| 134 | 134 | if ($geometry->geometryType() == 'LineString') { |
| 135 | - $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 135 | + $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name); |
|
| 136 | 136 | } |
| 137 | 137 | if ($geometry->geometryType() == 'MultiLineString') { |
| 138 | 138 | //TODO: Add a method pointN() to MultiLineString. |
@@ -141,35 +141,35 @@ discard block |
||
| 141 | 141 | break; |
| 142 | 142 | case 'exteriorRing': |
| 143 | 143 | if ($geometry->geometryType() == 'Point') { |
| 144 | - $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 144 | + $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name); |
|
| 145 | 145 | } |
| 146 | 146 | if ($geometry->geometryType() == 'LineString') { |
| 147 | - $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 147 | + $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name); |
|
| 148 | 148 | } |
| 149 | 149 | if ($geometry->geometryType() == 'MultiLineString') { |
| 150 | - $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 150 | + $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name); |
|
| 151 | 151 | } |
| 152 | 152 | break; |
| 153 | 153 | case 'numInteriorRings': |
| 154 | 154 | if ($geometry->geometryType() == 'Point') { |
| 155 | - $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 155 | + $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name); |
|
| 156 | 156 | } |
| 157 | 157 | if ($geometry->geometryType() == 'LineString') { |
| 158 | - $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 158 | + $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name); |
|
| 159 | 159 | } |
| 160 | 160 | if ($geometry->geometryType() == 'MultiLineString') { |
| 161 | - $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 161 | + $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name); |
|
| 162 | 162 | } |
| 163 | 163 | break; |
| 164 | 164 | case 'interiorRingN': |
| 165 | 165 | if ($geometry->geometryType() == 'Point') { |
| 166 | - $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 166 | + $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name); |
|
| 167 | 167 | } |
| 168 | 168 | if ($geometry->geometryType() == 'LineString') { |
| 169 | - $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 169 | + $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name); |
|
| 170 | 170 | } |
| 171 | 171 | if ($geometry->geometryType() == 'MultiLineString') { |
| 172 | - $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 172 | + $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name); |
|
| 173 | 173 | } |
| 174 | 174 | break; |
| 175 | 175 | case 'setSRID': |
@@ -177,112 +177,112 @@ discard block |
||
| 177 | 177 | break; |
| 178 | 178 | case 'SRID': |
| 179 | 179 | if ($geometry->geometryType() == 'Point') { |
| 180 | - $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 180 | + $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name); |
|
| 181 | 181 | } |
| 182 | 182 | if ($geometry->geometryType() == 'LineString') { |
| 183 | - $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 183 | + $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name); |
|
| 184 | 184 | } |
| 185 | 185 | if ($geometry->geometryType() == 'MultiLineString') { |
| 186 | - $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 186 | + $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name); |
|
| 187 | 187 | } |
| 188 | 188 | break; |
| 189 | 189 | case 'getBBox': |
| 190 | 190 | if ($geometry->geometryType() == 'Point') { |
| 191 | - $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 191 | + $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name); |
|
| 192 | 192 | } |
| 193 | 193 | if ($geometry->geometryType() == 'LineString') { |
| 194 | - $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 194 | + $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name); |
|
| 195 | 195 | } |
| 196 | 196 | if ($geometry->geometryType() == 'MultiLineString') { |
| 197 | - $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 197 | + $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name); |
|
| 198 | 198 | } |
| 199 | 199 | break; |
| 200 | 200 | case 'centroid': |
| 201 | 201 | if ($geometry->geometryType() == 'Point') { |
| 202 | - $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 202 | + $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name); |
|
| 203 | 203 | } |
| 204 | 204 | if ($geometry->geometryType() == 'LineString') { |
| 205 | - $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 205 | + $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name); |
|
| 206 | 206 | } |
| 207 | 207 | if ($geometry->geometryType() == 'MultiLineString') { |
| 208 | - $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 208 | + $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name); |
|
| 209 | 209 | } |
| 210 | 210 | break; |
| 211 | 211 | case 'length': |
| 212 | 212 | if ($geometry->geometryType() == 'Point') { |
| 213 | - $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 213 | + $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name); |
|
| 214 | 214 | } |
| 215 | 215 | if ($geometry->geometryType() == 'LineString') { |
| 216 | - $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 216 | + $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name); |
|
| 217 | 217 | } |
| 218 | 218 | if ($geometry->geometryType() == 'MultiLineString') { |
| 219 | - $this->assertEquals($geometry->$method_name($argument), (float) '0.11624637315233', 'Failed on ' . $method_name); |
|
| 219 | + $this->assertEquals($geometry->$method_name($argument), (float) '0.11624637315233', 'Failed on '.$method_name); |
|
| 220 | 220 | } |
| 221 | 221 | break; |
| 222 | 222 | case 'numGeometries': |
| 223 | 223 | if ($geometry->geometryType() == 'Point') { |
| 224 | - $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 224 | + $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name); |
|
| 225 | 225 | } |
| 226 | 226 | if ($geometry->geometryType() == 'LineString') { |
| 227 | - $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 227 | + $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name); |
|
| 228 | 228 | } |
| 229 | 229 | if ($geometry->geometryType() == 'MultiLineString') { |
| 230 | - $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 230 | + $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name); |
|
| 231 | 231 | } |
| 232 | 232 | break; |
| 233 | 233 | case 'numPoints': |
| 234 | 234 | if ($geometry->geometryType() == 'Point') { |
| 235 | - $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 235 | + $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name); |
|
| 236 | 236 | } |
| 237 | 237 | if ($geometry->geometryType() == 'LineString') { |
| 238 | - $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 238 | + $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name); |
|
| 239 | 239 | } |
| 240 | 240 | if ($geometry->geometryType() == 'MultiLineString') { |
| 241 | - $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 241 | + $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name); |
|
| 242 | 242 | } |
| 243 | 243 | break; |
| 244 | 244 | case 'dimension': |
| 245 | 245 | if ($geometry->geometryType() == 'Point') { |
| 246 | - $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 246 | + $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name); |
|
| 247 | 247 | } |
| 248 | 248 | if ($geometry->geometryType() == 'LineString') { |
| 249 | - $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 249 | + $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name); |
|
| 250 | 250 | } |
| 251 | 251 | if ($geometry->geometryType() == 'MultiLineString') { |
| 252 | - $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 252 | + $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name); |
|
| 253 | 253 | } |
| 254 | 254 | break; |
| 255 | 255 | case 'boundary': |
| 256 | 256 | if ($geometry->geometryType() == 'Point') { |
| 257 | - $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 257 | + $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name); |
|
| 258 | 258 | } |
| 259 | 259 | if ($geometry->geometryType() == 'LineString') { |
| 260 | - $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 260 | + $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name); |
|
| 261 | 261 | } |
| 262 | 262 | if ($geometry->geometryType() == 'MultiLineString') { |
| 263 | - $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 263 | + $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name); |
|
| 264 | 264 | } |
| 265 | 265 | break; |
| 266 | 266 | case 'greatCircleLength': |
| 267 | 267 | if ($geometry->geometryType() == 'Point') { |
| 268 | - $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 268 | + $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name); |
|
| 269 | 269 | } |
| 270 | 270 | if ($geometry->geometryType() == 'LineString') { |
| 271 | - $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 271 | + $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name); |
|
| 272 | 272 | } |
| 273 | 273 | if ($geometry->geometryType() == 'MultiLineString') { |
| 274 | - $this->assertNotEquals($geometry->$method_name($argument), '9500.9359867418', 'Failed on ' . $method_name); |
|
| 274 | + $this->assertNotEquals($geometry->$method_name($argument), '9500.9359867418', 'Failed on '.$method_name); |
|
| 275 | 275 | } |
| 276 | 276 | break; |
| 277 | 277 | case 'haversineLength': |
| 278 | 278 | case 'area': |
| 279 | - $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 279 | + $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name); |
|
| 280 | 280 | break; |
| 281 | 281 | case 'geometryType': |
| 282 | - $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 282 | + $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name); |
|
| 283 | 283 | break; |
| 284 | 284 | default: |
| 285 | - $this->assertTrue($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 285 | + $this->assertTrue($geometry->$method_name($argument), 'Failed on '.$method_name); |
|
| 286 | 286 | } |
| 287 | 287 | } |
| 288 | 288 | } |
@@ -9,78 +9,78 @@ |
||
| 9 | 9 | } |
| 10 | 10 | |
| 11 | 11 | function testGeos() { |
| 12 | - foreach (scandir('./input') as $file) { |
|
| 13 | - $parts = explode('.',$file); |
|
| 14 | - if ($parts[0]) { |
|
| 15 | - $format = $parts[1]; |
|
| 16 | - $value = file_get_contents('./input/'.$file); |
|
| 17 | - $geometry = geoPHP::load($value, $format); |
|
| 12 | + foreach (scandir('./input') as $file) { |
|
| 13 | + $parts = explode('.',$file); |
|
| 14 | + if ($parts[0]) { |
|
| 15 | + $format = $parts[1]; |
|
| 16 | + $value = file_get_contents('./input/'.$file); |
|
| 17 | + $geometry = geoPHP::load($value, $format); |
|
| 18 | 18 | |
| 19 | - $geosMethods = array( |
|
| 20 | - array('name' => 'geos'), |
|
| 21 | - array('name' => 'setGeos', 'argument' => $geometry->geos()), |
|
| 22 | - array('name' => 'PointOnSurface'), |
|
| 23 | - array('name' => 'equals', 'argument' => $geometry), |
|
| 24 | - array('name' => 'equalsExact', 'argument' => $geometry), |
|
| 25 | - array('name' => 'relate', 'argument' => $geometry), |
|
| 26 | - array('name' => 'checkValidity'), |
|
| 27 | - array('name' => 'isSimple'), |
|
| 28 | - array('name' => 'buffer', 'argument' => '10'), |
|
| 29 | - array('name' => 'intersection', 'argument' => $geometry), |
|
| 30 | - array('name' => 'convexHull'), |
|
| 31 | - array('name' => 'difference', 'argument' => $geometry), |
|
| 32 | - array('name' => 'symDifference', 'argument' => $geometry), |
|
| 33 | - array('name' => 'union', 'argument' => $geometry), |
|
| 34 | - array('name' => 'simplify', 'argument' => '0'), |
|
| 35 | - array('name' => 'disjoint', 'argument' => $geometry), |
|
| 36 | - array('name' => 'touches', 'argument' => $geometry), |
|
| 37 | - array('name' => 'intersects', 'argument' => $geometry), |
|
| 38 | - array('name' => 'crosses', 'argument' => $geometry), |
|
| 39 | - array('name' => 'within', 'argument' => $geometry), |
|
| 40 | - array('name' => 'contains', 'argument' => $geometry), |
|
| 41 | - array('name' => 'overlaps', 'argument' => $geometry), |
|
| 42 | - array('name' => 'covers', 'argument' => $geometry), |
|
| 43 | - array('name' => 'coveredBy', 'argument' => $geometry), |
|
| 44 | - array('name' => 'distance', 'argument' => $geometry), |
|
| 45 | - array('name' => 'hausdorffDistance', 'argument' => $geometry), |
|
| 46 | - ); |
|
| 19 | + $geosMethods = array( |
|
| 20 | + array('name' => 'geos'), |
|
| 21 | + array('name' => 'setGeos', 'argument' => $geometry->geos()), |
|
| 22 | + array('name' => 'PointOnSurface'), |
|
| 23 | + array('name' => 'equals', 'argument' => $geometry), |
|
| 24 | + array('name' => 'equalsExact', 'argument' => $geometry), |
|
| 25 | + array('name' => 'relate', 'argument' => $geometry), |
|
| 26 | + array('name' => 'checkValidity'), |
|
| 27 | + array('name' => 'isSimple'), |
|
| 28 | + array('name' => 'buffer', 'argument' => '10'), |
|
| 29 | + array('name' => 'intersection', 'argument' => $geometry), |
|
| 30 | + array('name' => 'convexHull'), |
|
| 31 | + array('name' => 'difference', 'argument' => $geometry), |
|
| 32 | + array('name' => 'symDifference', 'argument' => $geometry), |
|
| 33 | + array('name' => 'union', 'argument' => $geometry), |
|
| 34 | + array('name' => 'simplify', 'argument' => '0'), |
|
| 35 | + array('name' => 'disjoint', 'argument' => $geometry), |
|
| 36 | + array('name' => 'touches', 'argument' => $geometry), |
|
| 37 | + array('name' => 'intersects', 'argument' => $geometry), |
|
| 38 | + array('name' => 'crosses', 'argument' => $geometry), |
|
| 39 | + array('name' => 'within', 'argument' => $geometry), |
|
| 40 | + array('name' => 'contains', 'argument' => $geometry), |
|
| 41 | + array('name' => 'overlaps', 'argument' => $geometry), |
|
| 42 | + array('name' => 'covers', 'argument' => $geometry), |
|
| 43 | + array('name' => 'coveredBy', 'argument' => $geometry), |
|
| 44 | + array('name' => 'distance', 'argument' => $geometry), |
|
| 45 | + array('name' => 'hausdorffDistance', 'argument' => $geometry), |
|
| 46 | + ); |
|
| 47 | 47 | |
| 48 | - foreach($geosMethods as $method) { |
|
| 49 | - $argument = NULL; |
|
| 50 | - $method_name = $method['name']; |
|
| 51 | - if (isset($method['argument'])) { |
|
| 52 | - $argument = $method['argument']; |
|
| 53 | - } |
|
| 48 | + foreach($geosMethods as $method) { |
|
| 49 | + $argument = NULL; |
|
| 50 | + $method_name = $method['name']; |
|
| 51 | + if (isset($method['argument'])) { |
|
| 52 | + $argument = $method['argument']; |
|
| 53 | + } |
|
| 54 | 54 | |
| 55 | - switch ($method_name) { |
|
| 56 | - case 'isSimple': |
|
| 57 | - case 'equals': |
|
| 58 | - case 'geos': |
|
| 59 | - if ($geometry->geometryType() == 'Point') { |
|
| 60 | - $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 61 | - } |
|
| 62 | - if ($geometry->geometryType() == 'LineString') { |
|
| 63 | - $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 64 | - } |
|
| 65 | - if ($geometry->geometryType() == 'MultiLineString') { |
|
| 66 | - $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 67 | - } |
|
| 68 | - break; |
|
| 69 | - default: |
|
| 70 | - if ($geometry->geometryType() == 'Point') { |
|
| 71 | - $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 72 | - } |
|
| 73 | - if ($geometry->geometryType() == 'LineString') { |
|
| 74 | - $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 75 | - } |
|
| 76 | - if ($geometry->geometryType() == 'MultiLineString') { |
|
| 77 | - $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 78 | - } |
|
| 79 | - } |
|
| 80 | - } |
|
| 55 | + switch ($method_name) { |
|
| 56 | + case 'isSimple': |
|
| 57 | + case 'equals': |
|
| 58 | + case 'geos': |
|
| 59 | + if ($geometry->geometryType() == 'Point') { |
|
| 60 | + $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 61 | + } |
|
| 62 | + if ($geometry->geometryType() == 'LineString') { |
|
| 63 | + $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 64 | + } |
|
| 65 | + if ($geometry->geometryType() == 'MultiLineString') { |
|
| 66 | + $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 67 | + } |
|
| 68 | + break; |
|
| 69 | + default: |
|
| 70 | + if ($geometry->geometryType() == 'Point') { |
|
| 71 | + $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 72 | + } |
|
| 73 | + if ($geometry->geometryType() == 'LineString') { |
|
| 74 | + $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 75 | + } |
|
| 76 | + if ($geometry->geometryType() == 'MultiLineString') { |
|
| 77 | + $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 78 | + } |
|
| 79 | + } |
|
| 80 | + } |
|
| 81 | 81 | |
| 82 | - } |
|
| 83 | - } |
|
| 82 | + } |
|
| 83 | + } |
|
| 84 | 84 | } |
| 85 | 85 | |
| 86 | 86 | } |
@@ -10,7 +10,7 @@ discard block |
||
| 10 | 10 | |
| 11 | 11 | function testGeos() { |
| 12 | 12 | foreach (scandir('./input') as $file) { |
| 13 | - $parts = explode('.',$file); |
|
| 13 | + $parts = explode('.', $file); |
|
| 14 | 14 | if ($parts[0]) { |
| 15 | 15 | $format = $parts[1]; |
| 16 | 16 | $value = file_get_contents('./input/'.$file); |
@@ -45,7 +45,7 @@ discard block |
||
| 45 | 45 | array('name' => 'hausdorffDistance', 'argument' => $geometry), |
| 46 | 46 | ); |
| 47 | 47 | |
| 48 | - foreach($geosMethods as $method) { |
|
| 48 | + foreach ($geosMethods as $method) { |
|
| 49 | 49 | $argument = NULL; |
| 50 | 50 | $method_name = $method['name']; |
| 51 | 51 | if (isset($method['argument'])) { |
@@ -57,24 +57,24 @@ discard block |
||
| 57 | 57 | case 'equals': |
| 58 | 58 | case 'geos': |
| 59 | 59 | if ($geometry->geometryType() == 'Point') { |
| 60 | - $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 60 | + $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name); |
|
| 61 | 61 | } |
| 62 | 62 | if ($geometry->geometryType() == 'LineString') { |
| 63 | - $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 63 | + $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name); |
|
| 64 | 64 | } |
| 65 | 65 | if ($geometry->geometryType() == 'MultiLineString') { |
| 66 | - $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 66 | + $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name); |
|
| 67 | 67 | } |
| 68 | 68 | break; |
| 69 | 69 | default: |
| 70 | 70 | if ($geometry->geometryType() == 'Point') { |
| 71 | - $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 71 | + $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name); |
|
| 72 | 72 | } |
| 73 | 73 | if ($geometry->geometryType() == 'LineString') { |
| 74 | - $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 74 | + $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name); |
|
| 75 | 75 | } |
| 76 | 76 | if ($geometry->geometryType() == 'MultiLineString') { |
| 77 | - $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 77 | + $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name); |
|
| 78 | 78 | } |
| 79 | 79 | } |
| 80 | 80 | } |
@@ -9,101 +9,101 @@ |
||
| 9 | 9 | } |
| 10 | 10 | |
| 11 | 11 | function testAliases() { |
| 12 | - foreach (scandir('./input') as $file) { |
|
| 13 | - $parts = explode('.',$file); |
|
| 14 | - if ($parts[0]) { |
|
| 15 | - $format = $parts[1]; |
|
| 16 | - $value = file_get_contents('./input/'.$file); |
|
| 17 | - $geometry = geoPHP::load($value, $format); |
|
| 12 | + foreach (scandir('./input') as $file) { |
|
| 13 | + $parts = explode('.',$file); |
|
| 14 | + if ($parts[0]) { |
|
| 15 | + $format = $parts[1]; |
|
| 16 | + $value = file_get_contents('./input/'.$file); |
|
| 17 | + $geometry = geoPHP::load($value, $format); |
|
| 18 | 18 | |
| 19 | - $aliases = array( |
|
| 20 | - array('name' => 'getCentroid'), |
|
| 21 | - array('name' => 'getArea'), |
|
| 22 | - array('name' => 'getX'), |
|
| 23 | - array('name' => 'getY'), |
|
| 24 | - array('name' => 'getGeos'), |
|
| 25 | - array('name' => 'getGeomType'), |
|
| 26 | - array('name' => 'getSRID'), |
|
| 27 | - array('name' => 'asText'), |
|
| 28 | - array('name' => 'asBinary'), |
|
| 29 | - ); |
|
| 19 | + $aliases = array( |
|
| 20 | + array('name' => 'getCentroid'), |
|
| 21 | + array('name' => 'getArea'), |
|
| 22 | + array('name' => 'getX'), |
|
| 23 | + array('name' => 'getY'), |
|
| 24 | + array('name' => 'getGeos'), |
|
| 25 | + array('name' => 'getGeomType'), |
|
| 26 | + array('name' => 'getSRID'), |
|
| 27 | + array('name' => 'asText'), |
|
| 28 | + array('name' => 'asBinary'), |
|
| 29 | + ); |
|
| 30 | 30 | |
| 31 | - foreach($aliases as $alias) { |
|
| 32 | - $argument = NULL; |
|
| 33 | - $alias_name = $alias['name']; |
|
| 34 | - if (isset($alias['argument'])) { |
|
| 35 | - $argument = $alias['argument']; |
|
| 36 | - } |
|
| 31 | + foreach($aliases as $alias) { |
|
| 32 | + $argument = NULL; |
|
| 33 | + $alias_name = $alias['name']; |
|
| 34 | + if (isset($alias['argument'])) { |
|
| 35 | + $argument = $alias['argument']; |
|
| 36 | + } |
|
| 37 | 37 | |
| 38 | - switch ($alias_name) { |
|
| 39 | - case 'getSRID': |
|
| 40 | - if ($geometry->geometryType() == 'Point') { |
|
| 41 | - $this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name); |
|
| 42 | - } |
|
| 43 | - if ($geometry->geometryType() == 'LineString') { |
|
| 44 | - $this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name); |
|
| 45 | - } |
|
| 46 | - if ($geometry->geometryType() == 'MultiLineString') { |
|
| 47 | - $this->assertNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name); |
|
| 48 | - } |
|
| 49 | - break; |
|
| 50 | - case 'getGeos': |
|
| 51 | - if ($geometry->geometryType() == 'Point') { |
|
| 52 | - $this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name); |
|
| 53 | - } |
|
| 54 | - if ($geometry->geometryType() == 'LineString') { |
|
| 55 | - $this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name); |
|
| 56 | - } |
|
| 57 | - if ($geometry->geometryType() == 'MultiLineString') { |
|
| 58 | - $this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name); |
|
| 59 | - } |
|
| 60 | - break; |
|
| 61 | - case 'getX': |
|
| 62 | - case 'getY': |
|
| 63 | - if ($geometry->geometryType() == 'Point') { |
|
| 64 | - $this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name); |
|
| 65 | - } |
|
| 66 | - if ($geometry->geometryType() == 'LineString') { |
|
| 67 | - $this->assertNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name); |
|
| 68 | - } |
|
| 69 | - if ($geometry->geometryType() == 'MultiLineString') { |
|
| 70 | - $this->assertNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name); |
|
| 71 | - } |
|
| 72 | - break; |
|
| 73 | - case 'getArea': |
|
| 74 | - if ($geometry->geometryType() == 'Point') { |
|
| 75 | - $this->assertNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name); |
|
| 76 | - } |
|
| 77 | - if ($geometry->geometryType() == 'LineString') { |
|
| 78 | - $this->assertNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name); |
|
| 79 | - } |
|
| 80 | - if ($geometry->geometryType() == 'MultiLineString') { |
|
| 81 | - $this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name); |
|
| 82 | - } |
|
| 83 | - break; |
|
| 84 | - case 'getCentroid': |
|
| 85 | - if ($geometry->geometryType() == 'Point') { |
|
| 86 | - $this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name); |
|
| 87 | - } |
|
| 88 | - if ($geometry->geometryType() == 'LineString') { |
|
| 89 | - $this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name); |
|
| 90 | - } |
|
| 91 | - if ($geometry->geometryType() == 'MultiLineString') { |
|
| 92 | - $this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name); |
|
| 93 | - } |
|
| 94 | - break; |
|
| 95 | - case 'asText': |
|
| 96 | - case 'asBinary': |
|
| 97 | - case 'getGeomType': |
|
| 98 | - $this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name); |
|
| 99 | - break; |
|
| 100 | - default: |
|
| 101 | - $this->assertTrue($geometry->$alias_name($argument), 'Failed on ' . $alias_name); |
|
| 102 | - } |
|
| 103 | - } |
|
| 38 | + switch ($alias_name) { |
|
| 39 | + case 'getSRID': |
|
| 40 | + if ($geometry->geometryType() == 'Point') { |
|
| 41 | + $this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name); |
|
| 42 | + } |
|
| 43 | + if ($geometry->geometryType() == 'LineString') { |
|
| 44 | + $this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name); |
|
| 45 | + } |
|
| 46 | + if ($geometry->geometryType() == 'MultiLineString') { |
|
| 47 | + $this->assertNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name); |
|
| 48 | + } |
|
| 49 | + break; |
|
| 50 | + case 'getGeos': |
|
| 51 | + if ($geometry->geometryType() == 'Point') { |
|
| 52 | + $this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name); |
|
| 53 | + } |
|
| 54 | + if ($geometry->geometryType() == 'LineString') { |
|
| 55 | + $this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name); |
|
| 56 | + } |
|
| 57 | + if ($geometry->geometryType() == 'MultiLineString') { |
|
| 58 | + $this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name); |
|
| 59 | + } |
|
| 60 | + break; |
|
| 61 | + case 'getX': |
|
| 62 | + case 'getY': |
|
| 63 | + if ($geometry->geometryType() == 'Point') { |
|
| 64 | + $this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name); |
|
| 65 | + } |
|
| 66 | + if ($geometry->geometryType() == 'LineString') { |
|
| 67 | + $this->assertNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name); |
|
| 68 | + } |
|
| 69 | + if ($geometry->geometryType() == 'MultiLineString') { |
|
| 70 | + $this->assertNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name); |
|
| 71 | + } |
|
| 72 | + break; |
|
| 73 | + case 'getArea': |
|
| 74 | + if ($geometry->geometryType() == 'Point') { |
|
| 75 | + $this->assertNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name); |
|
| 76 | + } |
|
| 77 | + if ($geometry->geometryType() == 'LineString') { |
|
| 78 | + $this->assertNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name); |
|
| 79 | + } |
|
| 80 | + if ($geometry->geometryType() == 'MultiLineString') { |
|
| 81 | + $this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name); |
|
| 82 | + } |
|
| 83 | + break; |
|
| 84 | + case 'getCentroid': |
|
| 85 | + if ($geometry->geometryType() == 'Point') { |
|
| 86 | + $this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name); |
|
| 87 | + } |
|
| 88 | + if ($geometry->geometryType() == 'LineString') { |
|
| 89 | + $this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name); |
|
| 90 | + } |
|
| 91 | + if ($geometry->geometryType() == 'MultiLineString') { |
|
| 92 | + $this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name); |
|
| 93 | + } |
|
| 94 | + break; |
|
| 95 | + case 'asText': |
|
| 96 | + case 'asBinary': |
|
| 97 | + case 'getGeomType': |
|
| 98 | + $this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name); |
|
| 99 | + break; |
|
| 100 | + default: |
|
| 101 | + $this->assertTrue($geometry->$alias_name($argument), 'Failed on ' . $alias_name); |
|
| 102 | + } |
|
| 103 | + } |
|
| 104 | 104 | |
| 105 | - } |
|
| 106 | - } |
|
| 105 | + } |
|
| 106 | + } |
|
| 107 | 107 | } |
| 108 | 108 | |
| 109 | 109 | } |
@@ -10,7 +10,7 @@ discard block |
||
| 10 | 10 | |
| 11 | 11 | function testAliases() { |
| 12 | 12 | foreach (scandir('./input') as $file) { |
| 13 | - $parts = explode('.',$file); |
|
| 13 | + $parts = explode('.', $file); |
|
| 14 | 14 | if ($parts[0]) { |
| 15 | 15 | $format = $parts[1]; |
| 16 | 16 | $value = file_get_contents('./input/'.$file); |
@@ -28,7 +28,7 @@ discard block |
||
| 28 | 28 | array('name' => 'asBinary'), |
| 29 | 29 | ); |
| 30 | 30 | |
| 31 | - foreach($aliases as $alias) { |
|
| 31 | + foreach ($aliases as $alias) { |
|
| 32 | 32 | $argument = NULL; |
| 33 | 33 | $alias_name = $alias['name']; |
| 34 | 34 | if (isset($alias['argument'])) { |
@@ -38,67 +38,67 @@ discard block |
||
| 38 | 38 | switch ($alias_name) { |
| 39 | 39 | case 'getSRID': |
| 40 | 40 | if ($geometry->geometryType() == 'Point') { |
| 41 | - $this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name); |
|
| 41 | + $this->assertNotNull($geometry->$alias_name($argument), 'Failed on '.$alias_name); |
|
| 42 | 42 | } |
| 43 | 43 | if ($geometry->geometryType() == 'LineString') { |
| 44 | - $this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name); |
|
| 44 | + $this->assertNotNull($geometry->$alias_name($argument), 'Failed on '.$alias_name); |
|
| 45 | 45 | } |
| 46 | 46 | if ($geometry->geometryType() == 'MultiLineString') { |
| 47 | - $this->assertNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name); |
|
| 47 | + $this->assertNull($geometry->$alias_name($argument), 'Failed on '.$alias_name); |
|
| 48 | 48 | } |
| 49 | 49 | break; |
| 50 | 50 | case 'getGeos': |
| 51 | 51 | if ($geometry->geometryType() == 'Point') { |
| 52 | - $this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name); |
|
| 52 | + $this->assertNotNull($geometry->$alias_name($argument), 'Failed on '.$alias_name); |
|
| 53 | 53 | } |
| 54 | 54 | if ($geometry->geometryType() == 'LineString') { |
| 55 | - $this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name); |
|
| 55 | + $this->assertNotNull($geometry->$alias_name($argument), 'Failed on '.$alias_name); |
|
| 56 | 56 | } |
| 57 | 57 | if ($geometry->geometryType() == 'MultiLineString') { |
| 58 | - $this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name); |
|
| 58 | + $this->assertNotNull($geometry->$alias_name($argument), 'Failed on '.$alias_name); |
|
| 59 | 59 | } |
| 60 | 60 | break; |
| 61 | 61 | case 'getX': |
| 62 | 62 | case 'getY': |
| 63 | 63 | if ($geometry->geometryType() == 'Point') { |
| 64 | - $this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name); |
|
| 64 | + $this->assertNotNull($geometry->$alias_name($argument), 'Failed on '.$alias_name); |
|
| 65 | 65 | } |
| 66 | 66 | if ($geometry->geometryType() == 'LineString') { |
| 67 | - $this->assertNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name); |
|
| 67 | + $this->assertNull($geometry->$alias_name($argument), 'Failed on '.$alias_name); |
|
| 68 | 68 | } |
| 69 | 69 | if ($geometry->geometryType() == 'MultiLineString') { |
| 70 | - $this->assertNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name); |
|
| 70 | + $this->assertNull($geometry->$alias_name($argument), 'Failed on '.$alias_name); |
|
| 71 | 71 | } |
| 72 | 72 | break; |
| 73 | 73 | case 'getArea': |
| 74 | 74 | if ($geometry->geometryType() == 'Point') { |
| 75 | - $this->assertNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name); |
|
| 75 | + $this->assertNull($geometry->$alias_name($argument), 'Failed on '.$alias_name); |
|
| 76 | 76 | } |
| 77 | 77 | if ($geometry->geometryType() == 'LineString') { |
| 78 | - $this->assertNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name); |
|
| 78 | + $this->assertNull($geometry->$alias_name($argument), 'Failed on '.$alias_name); |
|
| 79 | 79 | } |
| 80 | 80 | if ($geometry->geometryType() == 'MultiLineString') { |
| 81 | - $this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name); |
|
| 81 | + $this->assertNotNull($geometry->$alias_name($argument), 'Failed on '.$alias_name); |
|
| 82 | 82 | } |
| 83 | 83 | break; |
| 84 | 84 | case 'getCentroid': |
| 85 | 85 | if ($geometry->geometryType() == 'Point') { |
| 86 | - $this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name); |
|
| 86 | + $this->assertNotNull($geometry->$alias_name($argument), 'Failed on '.$alias_name); |
|
| 87 | 87 | } |
| 88 | 88 | if ($geometry->geometryType() == 'LineString') { |
| 89 | - $this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name); |
|
| 89 | + $this->assertNotNull($geometry->$alias_name($argument), 'Failed on '.$alias_name); |
|
| 90 | 90 | } |
| 91 | 91 | if ($geometry->geometryType() == 'MultiLineString') { |
| 92 | - $this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name); |
|
| 92 | + $this->assertNotNull($geometry->$alias_name($argument), 'Failed on '.$alias_name); |
|
| 93 | 93 | } |
| 94 | 94 | break; |
| 95 | 95 | case 'asText': |
| 96 | 96 | case 'asBinary': |
| 97 | 97 | case 'getGeomType': |
| 98 | - $this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name); |
|
| 98 | + $this->assertNotNull($geometry->$alias_name($argument), 'Failed on '.$alias_name); |
|
| 99 | 99 | break; |
| 100 | 100 | default: |
| 101 | - $this->assertTrue($geometry->$alias_name($argument), 'Failed on ' . $alias_name); |
|
| 101 | + $this->assertTrue($geometry->$alias_name($argument), 'Failed on '.$alias_name); |
|
| 102 | 102 | } |
| 103 | 103 | } |
| 104 | 104 | |
@@ -9,56 +9,56 @@ |
||
| 9 | 9 | } |
| 10 | 10 | |
| 11 | 11 | function testAdapters() { |
| 12 | - foreach (scandir('./input') as $file) { |
|
| 13 | - $parts = explode('.',$file); |
|
| 14 | - if ($parts[0]) { |
|
| 15 | - $format = $parts[1]; |
|
| 16 | - $input = file_get_contents('./input/'.$file); |
|
| 17 | - $geometry = geoPHP::load($input, $format); |
|
| 12 | + foreach (scandir('./input') as $file) { |
|
| 13 | + $parts = explode('.',$file); |
|
| 14 | + if ($parts[0]) { |
|
| 15 | + $format = $parts[1]; |
|
| 16 | + $input = file_get_contents('./input/'.$file); |
|
| 17 | + $geometry = geoPHP::load($input, $format); |
|
| 18 | 18 | |
| 19 | - // Test adapter output and input. Do a round-trip and re-test |
|
| 20 | - foreach (geoPHP::getAdapterMap() as $adapter_key => $adapter_class) { |
|
| 21 | - if ($adapter_key != 'google_geocode') { //Don't test google geocoder regularily. Uncomment to test |
|
| 22 | - $output = $geometry->out($adapter_key); |
|
| 23 | - $this->assertNotNull($output, "Empty output on " . $adapter_key); |
|
| 24 | - if ($output) { |
|
| 25 | - $adapter_loader = new $adapter_class(); |
|
| 26 | - $test_geom_1 = $adapter_loader->read($output); |
|
| 27 | - $test_geom_2 = $adapter_loader->read($test_geom_1->out($adapter_key)); |
|
| 28 | - $this->assertEquals($test_geom_1->out('wkt'), $test_geom_2->out('wkt'), "Mismatched adapter output in ".$adapter_class); |
|
| 29 | - } |
|
| 30 | - } |
|
| 31 | - } |
|
| 19 | + // Test adapter output and input. Do a round-trip and re-test |
|
| 20 | + foreach (geoPHP::getAdapterMap() as $adapter_key => $adapter_class) { |
|
| 21 | + if ($adapter_key != 'google_geocode') { //Don't test google geocoder regularily. Uncomment to test |
|
| 22 | + $output = $geometry->out($adapter_key); |
|
| 23 | + $this->assertNotNull($output, "Empty output on " . $adapter_key); |
|
| 24 | + if ($output) { |
|
| 25 | + $adapter_loader = new $adapter_class(); |
|
| 26 | + $test_geom_1 = $adapter_loader->read($output); |
|
| 27 | + $test_geom_2 = $adapter_loader->read($test_geom_1->out($adapter_key)); |
|
| 28 | + $this->assertEquals($test_geom_1->out('wkt'), $test_geom_2->out('wkt'), "Mismatched adapter output in ".$adapter_class); |
|
| 29 | + } |
|
| 30 | + } |
|
| 31 | + } |
|
| 32 | 32 | |
| 33 | - // Test to make sure adapter work the same wether GEOS is ON or OFF |
|
| 34 | - // Cannot test methods if GEOS is not intstalled |
|
| 35 | - if (!geoPHP::geosInstalled()) return; |
|
| 33 | + // Test to make sure adapter work the same wether GEOS is ON or OFF |
|
| 34 | + // Cannot test methods if GEOS is not intstalled |
|
| 35 | + if (!geoPHP::geosInstalled()) return; |
|
| 36 | 36 | |
| 37 | - foreach (geoPHP::getAdapterMap() as $adapter_key => $adapter_class) { |
|
| 38 | - if ($adapter_key != 'google_geocode') { //Don't test google geocoder regularily. Uncomment to test |
|
| 39 | - // Turn GEOS on |
|
| 40 | - geoPHP::geosInstalled(TRUE); |
|
| 37 | + foreach (geoPHP::getAdapterMap() as $adapter_key => $adapter_class) { |
|
| 38 | + if ($adapter_key != 'google_geocode') { //Don't test google geocoder regularily. Uncomment to test |
|
| 39 | + // Turn GEOS on |
|
| 40 | + geoPHP::geosInstalled(TRUE); |
|
| 41 | 41 | |
| 42 | - $output = $geometry->out($adapter_key); |
|
| 43 | - if ($output) { |
|
| 44 | - $adapter_loader = new $adapter_class(); |
|
| 42 | + $output = $geometry->out($adapter_key); |
|
| 43 | + if ($output) { |
|
| 44 | + $adapter_loader = new $adapter_class(); |
|
| 45 | 45 | |
| 46 | - $test_geom_1 = $adapter_loader->read($output); |
|
| 46 | + $test_geom_1 = $adapter_loader->read($output); |
|
| 47 | 47 | |
| 48 | - // Turn GEOS off |
|
| 49 | - geoPHP::geosInstalled(FALSE); |
|
| 48 | + // Turn GEOS off |
|
| 49 | + geoPHP::geosInstalled(FALSE); |
|
| 50 | 50 | |
| 51 | - $test_geom_2 = $adapter_loader->read($output); |
|
| 51 | + $test_geom_2 = $adapter_loader->read($output); |
|
| 52 | 52 | |
| 53 | - // Turn GEOS back On |
|
| 54 | - geoPHP::geosInstalled(TRUE); |
|
| 53 | + // Turn GEOS back On |
|
| 54 | + geoPHP::geosInstalled(TRUE); |
|
| 55 | 55 | |
| 56 | - // Check to make sure a both are the same with geos and without |
|
| 57 | - $this->assertEquals($test_geom_1->out('wkt'), $test_geom_2->out('wkt'), "Mismatched adapter output between GEOS and NORM in ".$adapter_class); |
|
| 58 | - } |
|
| 59 | - } |
|
| 60 | - } |
|
| 61 | - } |
|
| 62 | - } |
|
| 56 | + // Check to make sure a both are the same with geos and without |
|
| 57 | + $this->assertEquals($test_geom_1->out('wkt'), $test_geom_2->out('wkt'), "Mismatched adapter output between GEOS and NORM in ".$adapter_class); |
|
| 58 | + } |
|
| 59 | + } |
|
| 60 | + } |
|
| 61 | + } |
|
| 62 | + } |
|
| 63 | 63 | } |
| 64 | 64 | } |
@@ -10,7 +10,7 @@ discard block |
||
| 10 | 10 | |
| 11 | 11 | function testAdapters() { |
| 12 | 12 | foreach (scandir('./input') as $file) { |
| 13 | - $parts = explode('.',$file); |
|
| 13 | + $parts = explode('.', $file); |
|
| 14 | 14 | if ($parts[0]) { |
| 15 | 15 | $format = $parts[1]; |
| 16 | 16 | $input = file_get_contents('./input/'.$file); |
@@ -20,7 +20,7 @@ discard block |
||
| 20 | 20 | foreach (geoPHP::getAdapterMap() as $adapter_key => $adapter_class) { |
| 21 | 21 | if ($adapter_key != 'google_geocode') { //Don't test google geocoder regularily. Uncomment to test |
| 22 | 22 | $output = $geometry->out($adapter_key); |
| 23 | - $this->assertNotNull($output, "Empty output on " . $adapter_key); |
|
| 23 | + $this->assertNotNull($output, "Empty output on ".$adapter_key); |
|
| 24 | 24 | if ($output) { |
| 25 | 25 | $adapter_loader = new $adapter_class(); |
| 26 | 26 | $test_geom_1 = $adapter_loader->read($output); |
@@ -32,7 +32,9 @@ |
||
| 32 | 32 | |
| 33 | 33 | // Test to make sure adapter work the same wether GEOS is ON or OFF |
| 34 | 34 | // Cannot test methods if GEOS is not intstalled |
| 35 | - if (!geoPHP::geosInstalled()) return; |
|
| 35 | + if (!geoPHP::geosInstalled()) { |
|
| 36 | + return; |
|
| 37 | + } |
|
| 36 | 38 | |
| 37 | 39 | foreach (geoPHP::getAdapterMap() as $adapter_key => $adapter_class) { |
| 38 | 40 | if ($adapter_key != 'google_geocode') { //Don't test google geocoder regularily. Uncomment to test |
@@ -9,65 +9,65 @@ |
||
| 9 | 9 | } |
| 10 | 10 | |
| 11 | 11 | function testPlaceholders() { |
| 12 | - foreach (scandir('./input') as $file) { |
|
| 13 | - $parts = explode('.',$file); |
|
| 14 | - if ($parts[0]) { |
|
| 15 | - $format = $parts[1]; |
|
| 16 | - $value = file_get_contents('./input/'.$file); |
|
| 17 | - $geometry = geoPHP::load($value, $format); |
|
| 12 | + foreach (scandir('./input') as $file) { |
|
| 13 | + $parts = explode('.',$file); |
|
| 14 | + if ($parts[0]) { |
|
| 15 | + $format = $parts[1]; |
|
| 16 | + $value = file_get_contents('./input/'.$file); |
|
| 17 | + $geometry = geoPHP::load($value, $format); |
|
| 18 | 18 | |
| 19 | - $placeholders = array( |
|
| 20 | - array('name' => 'hasZ'), |
|
| 21 | - array('name' => 'is3D'), |
|
| 22 | - array('name' => 'isMeasured'), |
|
| 23 | - array('name' => 'isEmpty'), |
|
| 24 | - array('name' => 'coordinateDimension'), |
|
| 25 | - array('name' => 'z'), |
|
| 26 | - array('name' => 'm'), |
|
| 27 | - ); |
|
| 19 | + $placeholders = array( |
|
| 20 | + array('name' => 'hasZ'), |
|
| 21 | + array('name' => 'is3D'), |
|
| 22 | + array('name' => 'isMeasured'), |
|
| 23 | + array('name' => 'isEmpty'), |
|
| 24 | + array('name' => 'coordinateDimension'), |
|
| 25 | + array('name' => 'z'), |
|
| 26 | + array('name' => 'm'), |
|
| 27 | + ); |
|
| 28 | 28 | |
| 29 | - foreach($placeholders as $method) { |
|
| 30 | - $argument = NULL; |
|
| 31 | - $method_name = $method['name']; |
|
| 32 | - if (isset($method['argument'])) { |
|
| 33 | - $argument = $method['argument']; |
|
| 34 | - } |
|
| 29 | + foreach($placeholders as $method) { |
|
| 30 | + $argument = NULL; |
|
| 31 | + $method_name = $method['name']; |
|
| 32 | + if (isset($method['argument'])) { |
|
| 33 | + $argument = $method['argument']; |
|
| 34 | + } |
|
| 35 | 35 | |
| 36 | - switch ($method_name) { |
|
| 37 | - case 'm': |
|
| 38 | - case 'z': |
|
| 39 | - if ($geometry->geometryType() == 'Point') { |
|
| 40 | - $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 41 | - } |
|
| 42 | - if ($geometry->geometryType() == 'LineString') { |
|
| 43 | - $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 44 | - } |
|
| 45 | - if ($geometry->geometryType() == 'MultiLineString') { |
|
| 46 | - $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 47 | - } |
|
| 48 | - break; |
|
| 49 | - case 'coordinateDimension': |
|
| 50 | - case 'isEmpty': |
|
| 51 | - case 'isMeasured': |
|
| 52 | - case 'is3D': |
|
| 53 | - case 'hasZ': |
|
| 54 | - if ($geometry->geometryType() == 'Point') { |
|
| 55 | - $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 56 | - } |
|
| 57 | - if ($geometry->geometryType() == 'LineString') { |
|
| 58 | - $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 59 | - } |
|
| 60 | - if ($geometry->geometryType() == 'MultiLineString') { |
|
| 61 | - $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 62 | - } |
|
| 63 | - break; |
|
| 64 | - default: |
|
| 65 | - $this->assertTrue($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 66 | - } |
|
| 67 | - } |
|
| 36 | + switch ($method_name) { |
|
| 37 | + case 'm': |
|
| 38 | + case 'z': |
|
| 39 | + if ($geometry->geometryType() == 'Point') { |
|
| 40 | + $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 41 | + } |
|
| 42 | + if ($geometry->geometryType() == 'LineString') { |
|
| 43 | + $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 44 | + } |
|
| 45 | + if ($geometry->geometryType() == 'MultiLineString') { |
|
| 46 | + $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 47 | + } |
|
| 48 | + break; |
|
| 49 | + case 'coordinateDimension': |
|
| 50 | + case 'isEmpty': |
|
| 51 | + case 'isMeasured': |
|
| 52 | + case 'is3D': |
|
| 53 | + case 'hasZ': |
|
| 54 | + if ($geometry->geometryType() == 'Point') { |
|
| 55 | + $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 56 | + } |
|
| 57 | + if ($geometry->geometryType() == 'LineString') { |
|
| 58 | + $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 59 | + } |
|
| 60 | + if ($geometry->geometryType() == 'MultiLineString') { |
|
| 61 | + $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 62 | + } |
|
| 63 | + break; |
|
| 64 | + default: |
|
| 65 | + $this->assertTrue($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 66 | + } |
|
| 67 | + } |
|
| 68 | 68 | |
| 69 | - } |
|
| 70 | - } |
|
| 69 | + } |
|
| 70 | + } |
|
| 71 | 71 | |
| 72 | 72 | } |
| 73 | 73 | } |
@@ -10,7 +10,7 @@ discard block |
||
| 10 | 10 | |
| 11 | 11 | function testPlaceholders() { |
| 12 | 12 | foreach (scandir('./input') as $file) { |
| 13 | - $parts = explode('.',$file); |
|
| 13 | + $parts = explode('.', $file); |
|
| 14 | 14 | if ($parts[0]) { |
| 15 | 15 | $format = $parts[1]; |
| 16 | 16 | $value = file_get_contents('./input/'.$file); |
@@ -26,7 +26,7 @@ discard block |
||
| 26 | 26 | array('name' => 'm'), |
| 27 | 27 | ); |
| 28 | 28 | |
| 29 | - foreach($placeholders as $method) { |
|
| 29 | + foreach ($placeholders as $method) { |
|
| 30 | 30 | $argument = NULL; |
| 31 | 31 | $method_name = $method['name']; |
| 32 | 32 | if (isset($method['argument'])) { |
@@ -37,13 +37,13 @@ discard block |
||
| 37 | 37 | case 'm': |
| 38 | 38 | case 'z': |
| 39 | 39 | if ($geometry->geometryType() == 'Point') { |
| 40 | - $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 40 | + $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name); |
|
| 41 | 41 | } |
| 42 | 42 | if ($geometry->geometryType() == 'LineString') { |
| 43 | - $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 43 | + $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name); |
|
| 44 | 44 | } |
| 45 | 45 | if ($geometry->geometryType() == 'MultiLineString') { |
| 46 | - $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 46 | + $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name); |
|
| 47 | 47 | } |
| 48 | 48 | break; |
| 49 | 49 | case 'coordinateDimension': |
@@ -52,17 +52,17 @@ discard block |
||
| 52 | 52 | case 'is3D': |
| 53 | 53 | case 'hasZ': |
| 54 | 54 | if ($geometry->geometryType() == 'Point') { |
| 55 | - $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 55 | + $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name); |
|
| 56 | 56 | } |
| 57 | 57 | if ($geometry->geometryType() == 'LineString') { |
| 58 | - $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 58 | + $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name); |
|
| 59 | 59 | } |
| 60 | 60 | if ($geometry->geometryType() == 'MultiLineString') { |
| 61 | - $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 61 | + $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name); |
|
| 62 | 62 | } |
| 63 | 63 | break; |
| 64 | 64 | default: |
| 65 | - $this->assertTrue($geometry->$method_name($argument), 'Failed on ' . $method_name); |
|
| 65 | + $this->assertTrue($geometry->$method_name($argument), 'Failed on '.$method_name); |
|
| 66 | 66 | } |
| 67 | 67 | } |
| 68 | 68 | |
@@ -13,15 +13,15 @@ |
||
| 13 | 13 | * @return string The Extended-WKT string representation of the input geometries |
| 14 | 14 | */ |
| 15 | 15 | public function write(Geometry $geometry) { |
| 16 | - $srid = $geometry->SRID(); |
|
| 17 | - $wkt = ''; |
|
| 18 | - if ($srid) { |
|
| 19 | - $wkt = 'SRID=' . $srid . ';'; |
|
| 20 | - $wkt .= $geometry->out('wkt'); |
|
| 21 | - return $wkt; |
|
| 22 | - } |
|
| 23 | - else { |
|
| 24 | - return $geometry->out('wkt'); |
|
| 25 | - } |
|
| 16 | + $srid = $geometry->SRID(); |
|
| 17 | + $wkt = ''; |
|
| 18 | + if ($srid) { |
|
| 19 | + $wkt = 'SRID=' . $srid . ';'; |
|
| 20 | + $wkt .= $geometry->out('wkt'); |
|
| 21 | + return $wkt; |
|
| 22 | + } |
|
| 23 | + else { |
|
| 24 | + return $geometry->out('wkt'); |
|
| 25 | + } |
|
| 26 | 26 | } |
| 27 | 27 | } |
@@ -16,7 +16,7 @@ |
||
| 16 | 16 | $srid = $geometry->SRID(); |
| 17 | 17 | $wkt = ''; |
| 18 | 18 | if ($srid) { |
| 19 | - $wkt = 'SRID=' . $srid . ';'; |
|
| 19 | + $wkt = 'SRID='.$srid.';'; |
|
| 20 | 20 | $wkt .= $geometry->out('wkt'); |
| 21 | 21 | return $wkt; |
| 22 | 22 | } |
@@ -19,8 +19,7 @@ |
||
| 19 | 19 | $wkt = 'SRID=' . $srid . ';'; |
| 20 | 20 | $wkt .= $geometry->out('wkt'); |
| 21 | 21 | return $wkt; |
| 22 | - } |
|
| 23 | - else { |
|
| 22 | + } else { |
|
| 24 | 23 | return $geometry->out('wkt'); |
| 25 | 24 | } |
| 26 | 25 | } |
