Ysurac /
FlightAirMap
@@ -1,30 +1,30 @@ |
||
| 1 | 1 | #!/usr/bin/php |
| 2 | 2 | <?php |
| 3 | - require_once('../require/settings.php'); |
|
| 4 | - if ($globalInstalled) { |
|
| 5 | - echo '$globalInstalled must be set to FALSE in require/settings.php'; |
|
| 6 | - exit; |
|
| 7 | - } |
|
| 8 | - require('class.create_db.php'); |
|
| 9 | - echo "Create and import all tables..."; |
|
| 10 | - create_db::import_all_db('../db/'); |
|
| 11 | - echo "Done !\n"; |
|
| 3 | + require_once('../require/settings.php'); |
|
| 4 | + if ($globalInstalled) { |
|
| 5 | + echo '$globalInstalled must be set to FALSE in require/settings.php'; |
|
| 6 | + exit; |
|
| 7 | + } |
|
| 8 | + require('class.create_db.php'); |
|
| 9 | + echo "Create and import all tables..."; |
|
| 10 | + create_db::import_all_db('../db/'); |
|
| 11 | + echo "Done !\n"; |
|
| 12 | 12 | |
| 13 | - require('class.update_db.php'); |
|
| 14 | - echo "Populate all tables...\n"; |
|
| 15 | - update_db::update_all(); |
|
| 16 | - echo "\nInstall waypoints...(VERY slow!)"; |
|
| 17 | - update_db::update_waypoints(); |
|
| 18 | - echo "Done !\n"; |
|
| 19 | - echo "Install airspace..."; |
|
| 20 | - update_db::update_airspace(); |
|
| 21 | - echo "Done !\n"; |
|
| 22 | - echo 'All is now installed ! Thanks'."\n"; |
|
| 23 | - if ($globalSBS1) { |
|
| 24 | - echo 'You need to run cron-sbs.php as a daemon. You can use init script in the install/init directory.'."\n"; |
|
| 25 | - } |
|
| 26 | - if ($globalACARS) { |
|
| 27 | - echo 'You need to run cron-acars.php as a daemon. You can use init script in the install/init directory.'."\n"; |
|
| 28 | - } |
|
| 13 | + require('class.update_db.php'); |
|
| 14 | + echo "Populate all tables...\n"; |
|
| 15 | + update_db::update_all(); |
|
| 16 | + echo "\nInstall waypoints...(VERY slow!)"; |
|
| 17 | + update_db::update_waypoints(); |
|
| 18 | + echo "Done !\n"; |
|
| 19 | + echo "Install airspace..."; |
|
| 20 | + update_db::update_airspace(); |
|
| 21 | + echo "Done !\n"; |
|
| 22 | + echo 'All is now installed ! Thanks'."\n"; |
|
| 23 | + if ($globalSBS1) { |
|
| 24 | + echo 'You need to run cron-sbs.php as a daemon. You can use init script in the install/init directory.'."\n"; |
|
| 25 | + } |
|
| 26 | + if ($globalACARS) { |
|
| 27 | + echo 'You need to run cron-acars.php as a daemon. You can use init script in the install/init directory.'."\n"; |
|
| 28 | + } |
|
| 29 | 29 | |
| 30 | 30 | ?> |
| 31 | 31 | \ No newline at end of file |
@@ -1,23 +1,23 @@ |
||
| 1 | 1 | #!/usr/bin/php |
| 2 | 2 | <?php |
| 3 | - require_once('../require/settings.php'); |
|
| 4 | - if ($globalInstalled) { |
|
| 5 | - echo '$globalInstalled must be set to FALSE in require/settings.php'; |
|
| 6 | - exit; |
|
| 7 | - } |
|
| 8 | - require('class.update_db.php'); |
|
| 9 | - if (isset($globalVATSIM) && $globalVATSIM) { |
|
| 3 | + require_once('../require/settings.php'); |
|
| 4 | + if ($globalInstalled) { |
|
| 5 | + echo '$globalInstalled must be set to FALSE in require/settings.php'; |
|
| 6 | + exit; |
|
| 7 | + } |
|
| 8 | + require('class.update_db.php'); |
|
| 9 | + if (isset($globalVATSIM) && $globalVATSIM) { |
|
| 10 | 10 | echo "Install VATSIM airlines..."; |
| 11 | 11 | update_db::update_vatsim(); |
| 12 | 12 | echo "Done !\n"; |
| 13 | - } |
|
| 14 | - if (isset($globalIVAO) && $globalIVAO) { |
|
| 13 | + } |
|
| 14 | + if (isset($globalIVAO) && $globalIVAO) { |
|
| 15 | 15 | if (!file_exists('tmp/ivae_feb2013.zip')) { |
| 16 | 16 | echo "You have to download the file ivae_feb2013.zip from https://www.ivao.aero/softdev/mirrors.asp?software=IvAeDataUp and put it in install/tmp directory"; |
| 17 | 17 | } else { |
| 18 | - echo "Install IVAO airlines and logos..."; |
|
| 19 | - update_db::update_IVAO(); |
|
| 18 | + echo "Install IVAO airlines and logos..."; |
|
| 19 | + update_db::update_IVAO(); |
|
| 20 | 20 | echo "Done !\n"; |
| 21 | 21 | } |
| 22 | - } |
|
| 22 | + } |
|
| 23 | 23 | ?> |
| 24 | 24 | \ No newline at end of file |
@@ -68,27 +68,27 @@ discard block |
||
| 68 | 68 | } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'database_import') { |
| 69 | 69 | if (update_schema::check_version(false) == '0') { |
| 70 | 70 | if ($globalDBdriver == 'mysql') { |
| 71 | - $error .= create_db::import_all_db('../db/'); |
|
| 71 | + $error .= create_db::import_all_db('../db/'); |
|
| 72 | 72 | } elseif ($globalDBdriver == 'pgsql') { |
| 73 | - $error .= create_db::import_all_db('../db/pgsql/'); |
|
| 73 | + $error .= create_db::import_all_db('../db/pgsql/'); |
|
| 74 | 74 | } |
| 75 | 75 | if ($error != '') { |
| 76 | - $_SESSION['error'] = $error; |
|
| 76 | + $_SESSION['error'] = $error; |
|
| 77 | 77 | } |
| 78 | 78 | $_SESSION['done'] = array_merge($_SESSION['done'],array('Create and import tables')); |
| 79 | 79 | if ($globalSBS1 && !$globalIVAO && !$globalVATSIM && !$globalphpVMS) { |
| 80 | 80 | $_SESSION['install'] = 'populate'; |
| 81 | 81 | $_SESSION['next'] = 'Populate aircraft_modes table with externals data for ADS-B'; |
| 82 | 82 | } else { |
| 83 | - $_SESSION['install'] = 'sources'; |
|
| 84 | - $_SESSION['next'] = 'Insert data in source table'; |
|
| 83 | + $_SESSION['install'] = 'sources'; |
|
| 84 | + $_SESSION['next'] = 'Insert data in source table'; |
|
| 85 | 85 | } |
| 86 | 86 | $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
| 87 | 87 | print json_encode($result); |
| 88 | 88 | } else { |
| 89 | 89 | $error .= update_schema::check_version(true); |
| 90 | 90 | if ($error != '') { |
| 91 | - $_SESSION['error'] = $error; |
|
| 91 | + $_SESSION['error'] = $error; |
|
| 92 | 92 | } |
| 93 | 93 | $_SESSION['done'] = array_merge($_SESSION['done'],array('Update schema if needed')); |
| 94 | 94 | $_SESSION['install'] = 'sources'; |
@@ -118,25 +118,25 @@ discard block |
||
| 118 | 118 | $error .= update_db::update_countries(); |
| 119 | 119 | $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate countries database')); |
| 120 | 120 | if (isset($globalNOTAM) && $globalNOTAM && isset($globalNOTAMSource) && $globalNOTAMSource != '') { |
| 121 | - $_SESSION['install'] = 'notam'; |
|
| 122 | - $_SESSION['next'] = 'Populate NOTAM table with externals data'; |
|
| 123 | - $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 124 | - print json_encode($result); |
|
| 121 | + $_SESSION['install'] = 'notam'; |
|
| 122 | + $_SESSION['next'] = 'Populate NOTAM table with externals data'; |
|
| 123 | + $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 124 | + print json_encode($result); |
|
| 125 | 125 | } elseif (isset($_SESSION['owner']) && $_SESSION['owner'] == 1) { |
| 126 | - $_SESSION['install'] = 'owner'; |
|
| 127 | - $_SESSION['next'] = 'Populate owner table with externals data'; |
|
| 128 | - unset($_SESSION['owner']); |
|
| 129 | - $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 130 | - print json_encode($result); |
|
| 126 | + $_SESSION['install'] = 'owner'; |
|
| 127 | + $_SESSION['next'] = 'Populate owner table with externals data'; |
|
| 128 | + unset($_SESSION['owner']); |
|
| 129 | + $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 130 | + print json_encode($result); |
|
| 131 | 131 | } else { |
| 132 | - $_SESSION['install'] = 'sources'; |
|
| 133 | - $_SESSION['next'] = 'Insert data in source table'; |
|
| 134 | - $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 135 | - print json_encode($result); |
|
| 132 | + $_SESSION['install'] = 'sources'; |
|
| 133 | + $_SESSION['next'] = 'Insert data in source table'; |
|
| 134 | + $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 135 | + print json_encode($result); |
|
| 136 | 136 | } |
| 137 | 137 | } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'populate') { |
| 138 | 138 | if (!is_writable('tmp')) { |
| 139 | - $error = 'The directory <i>install/tmp</i> must be writable.'; |
|
| 139 | + $error = 'The directory <i>install/tmp</i> must be writable.'; |
|
| 140 | 140 | $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
| 141 | 141 | print json_encode($result); |
| 142 | 142 | } else { |
@@ -152,7 +152,7 @@ discard block |
||
| 152 | 152 | } |
| 153 | 153 | } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'populate_flarm') { |
| 154 | 154 | if (!is_writable('tmp')) { |
| 155 | - $error = 'The directory <i>install/tmp</i> must be writable.'; |
|
| 155 | + $error = 'The directory <i>install/tmp</i> must be writable.'; |
|
| 156 | 156 | $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
| 157 | 157 | print json_encode($result); |
| 158 | 158 | } else { |
@@ -185,7 +185,7 @@ discard block |
||
| 185 | 185 | } |
| 186 | 186 | } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'routes') { |
| 187 | 187 | if (!is_writable('tmp')) { |
| 188 | - $error = 'The directory <i>install/tmp</i> must be writable.'; |
|
| 188 | + $error = 'The directory <i>install/tmp</i> must be writable.'; |
|
| 189 | 189 | $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
| 190 | 190 | print json_encode($result); |
| 191 | 191 | } else { |
@@ -200,7 +200,7 @@ discard block |
||
| 200 | 200 | } |
| 201 | 201 | } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'translation') { |
| 202 | 202 | if (!is_writable('tmp')) { |
| 203 | - $error = 'The directory <i>install/tmp</i> must be writable.'; |
|
| 203 | + $error = 'The directory <i>install/tmp</i> must be writable.'; |
|
| 204 | 204 | $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
| 205 | 205 | print json_encode($result); |
| 206 | 206 | } else { |
@@ -229,7 +229,7 @@ discard block |
||
| 229 | 229 | } |
| 230 | 230 | } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'owner') { |
| 231 | 231 | if (!is_writable('tmp')) { |
| 232 | - $error = 'The directory <i>install/tmp</i> must be writable.'; |
|
| 232 | + $error = 'The directory <i>install/tmp</i> must be writable.'; |
|
| 233 | 233 | $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
| 234 | 234 | print json_encode($result); |
| 235 | 235 | } else { |
@@ -244,7 +244,7 @@ discard block |
||
| 244 | 244 | } |
| 245 | 245 | } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'notam') { |
| 246 | 246 | if (!is_writable('tmp')) { |
| 247 | - $error = 'The directory <i>install/tmp</i> must be writable.'; |
|
| 247 | + $error = 'The directory <i>install/tmp</i> must be writable.'; |
|
| 248 | 248 | $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
| 249 | 249 | print json_encode($result); |
| 250 | 250 | } else { |
@@ -296,17 +296,17 @@ discard block |
||
| 296 | 296 | */ |
| 297 | 297 | } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'sources') { |
| 298 | 298 | if (isset($_SESSION['sources']) && count($_SESSION['sources']) > 0) { |
| 299 | - $sources = $_SESSION['sources']; |
|
| 299 | + $sources = $_SESSION['sources']; |
|
| 300 | 300 | |
| 301 | - include_once('../require/class.Source.php'); |
|
| 302 | - $globalDebug = FALSE; |
|
| 303 | - $Source = new Source(); |
|
| 304 | - $Source->deleteAllLocation(); |
|
| 305 | - foreach ($sources as $src) { |
|
| 301 | + include_once('../require/class.Source.php'); |
|
| 302 | + $globalDebug = FALSE; |
|
| 303 | + $Source = new Source(); |
|
| 304 | + $Source->deleteAllLocation(); |
|
| 305 | + foreach ($sources as $src) { |
|
| 306 | 306 | if (isset($src['latitude']) && $src['latitude'] != '') $Source->addLocation($src['name'],$src['latitude'],$src['longitude'],$src['altitude'],$src['city'],$src['country'],$src['source'],'antenna.png'); |
| 307 | - } |
|
| 308 | - $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert data in source table')); |
|
| 309 | - unset($_SESSION['sources']); |
|
| 307 | + } |
|
| 308 | + $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert data in source table')); |
|
| 309 | + unset($_SESSION['sources']); |
|
| 310 | 310 | } |
| 311 | 311 | /* |
| 312 | 312 | if (isset($globalIVAO) && $globalIVAO) $_SESSION['install'] = 'ivao'; |
@@ -164,15 +164,21 @@ discard block |
||
| 164 | 164 | |
| 165 | 165 | if ((isset($globalVATSIM) && $globalVATSIM) && (isset($globalIVAO) && $globalIVAO)) { |
| 166 | 166 | $_SESSION['install'] = 'vatsim'; |
| 167 | - if (file_exists('tmp/ivae_feb2013.zip')) $_SESSION['next'] = 'Insert IVAO data'; |
|
| 168 | - else $_SESSION['next'] = 'Insert VATSIM data'; |
|
| 167 | + if (file_exists('tmp/ivae_feb2013.zip')) { |
|
| 168 | + $_SESSION['next'] = 'Insert IVAO data'; |
|
| 169 | + } else { |
|
| 170 | + $_SESSION['next'] = 'Insert VATSIM data'; |
|
| 171 | + } |
|
| 169 | 172 | } elseif (isset($globalVATSIM) && $globalVATSIM) { |
| 170 | 173 | $_SESSION['install'] = 'vatsim'; |
| 171 | 174 | $_SESSION['next'] = 'Insert VATSIM data'; |
| 172 | 175 | } elseif (isset($globalIVAO) && $globalIVAO) { |
| 173 | 176 | $_SESSION['install'] = 'vatsim'; |
| 174 | - if (file_exists('tmp/ivae_feb2013.zip')) $_SESSION['next'] = 'Insert IVAO data'; |
|
| 175 | - else $_SESSION['next'] = 'Insert VATSIM data (IVAO not found)'; |
|
| 177 | + if (file_exists('tmp/ivae_feb2013.zip')) { |
|
| 178 | + $_SESSION['next'] = 'Insert IVAO data'; |
|
| 179 | + } else { |
|
| 180 | + $_SESSION['next'] = 'Insert VATSIM data (IVAO not found)'; |
|
| 181 | + } |
|
| 176 | 182 | } elseif (isset($globalphpVMS) && $globalphpVMS) { |
| 177 | 183 | $_SESSION['install'] = 'vatsim'; |
| 178 | 184 | $_SESSION['next'] = 'Insert phpVMS data'; |
@@ -303,7 +309,9 @@ discard block |
||
| 303 | 309 | $Source = new Source(); |
| 304 | 310 | $Source->deleteAllLocation(); |
| 305 | 311 | foreach ($sources as $src) { |
| 306 | - if (isset($src['latitude']) && $src['latitude'] != '') $Source->addLocation($src['name'],$src['latitude'],$src['longitude'],$src['altitude'],$src['city'],$src['country'],$src['source'],'antenna.png'); |
|
| 312 | + if (isset($src['latitude']) && $src['latitude'] != '') { |
|
| 313 | + $Source->addLocation($src['name'],$src['latitude'],$src['longitude'],$src['altitude'],$src['city'],$src['country'],$src['source'],'antenna.png'); |
|
| 314 | + } |
|
| 307 | 315 | } |
| 308 | 316 | $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert data in source table')); |
| 309 | 317 | unset($_SESSION['sources']); |
@@ -314,15 +322,21 @@ discard block |
||
| 314 | 322 | */ |
| 315 | 323 | if ((isset($globalVATSIM) && $globalVATSIM) && (isset($globalIVAO) && $globalIVAO)) { |
| 316 | 324 | $_SESSION['install'] = 'vatsim'; |
| 317 | - if (file_exists('tmp/ivae_feb2013.zip')) $_SESSION['next'] = 'Insert IVAO data'; |
|
| 318 | - else $_SESSION['next'] = 'Insert VATSIM data'; |
|
| 325 | + if (file_exists('tmp/ivae_feb2013.zip')) { |
|
| 326 | + $_SESSION['next'] = 'Insert IVAO data'; |
|
| 327 | + } else { |
|
| 328 | + $_SESSION['next'] = 'Insert VATSIM data'; |
|
| 329 | + } |
|
| 319 | 330 | } elseif (isset($globalVATSIM) && $globalVATSIM) { |
| 320 | 331 | $_SESSION['install'] = 'vatsim'; |
| 321 | 332 | $_SESSION['next'] = 'Insert VATSIM data'; |
| 322 | 333 | } elseif (isset($globalIVAO) && $globalIVAO) { |
| 323 | 334 | $_SESSION['install'] = 'vatsim'; |
| 324 | - if (file_exists('tmp/ivae_feb2013.zip')) $_SESSION['next'] = 'Insert IVAO data'; |
|
| 325 | - else $_SESSION['next'] = 'Insert VATSIM data (IVAO not found)'; |
|
| 335 | + if (file_exists('tmp/ivae_feb2013.zip')) { |
|
| 336 | + $_SESSION['next'] = 'Insert IVAO data'; |
|
| 337 | + } else { |
|
| 338 | + $_SESSION['next'] = 'Insert VATSIM data (IVAO not found)'; |
|
| 339 | + } |
|
| 326 | 340 | } elseif (isset($globalphpVMS) && $globalphpVMS) { |
| 327 | 341 | $_SESSION['install'] = 'vatsim'; |
| 328 | 342 | $_SESSION['next'] = 'Insert phpVMS data'; |
@@ -68,15 +68,15 @@ discard block |
||
| 68 | 68 | } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'database_create') { |
| 69 | 69 | $dbroot = $_SESSION['database_root']; |
| 70 | 70 | $dbrootpass = $_SESSION['database_rootpass']; |
| 71 | - $error .= create_db::create_database($dbroot,$dbrootpass,$globalDBuser,$globalDBpass,$globalDBname,$globalDBdriver,$globalDBhost); |
|
| 71 | + $error .= create_db::create_database($dbroot, $dbrootpass, $globalDBuser, $globalDBpass, $globalDBname, $globalDBdriver, $globalDBhost); |
|
| 72 | 72 | sleep(5); |
| 73 | 73 | if ($error != '') { |
| 74 | 74 | $_SESSION['error'] = $error; |
| 75 | 75 | } |
| 76 | - $_SESSION['done'] = array_merge($_SESSION['done'],array('Create database')); |
|
| 76 | + $_SESSION['done'] = array_merge($_SESSION['done'], array('Create database')); |
|
| 77 | 77 | $_SESSION['install'] = 'database_import'; |
| 78 | 78 | $_SESSION['next'] = 'Create and import tables'; |
| 79 | - $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 79 | + $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 80 | 80 | print json_encode($result); |
| 81 | 81 | } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'database_import') { |
| 82 | 82 | if (update_schema::check_version(false) == '0') { |
@@ -88,7 +88,7 @@ discard block |
||
| 88 | 88 | if ($error != '') { |
| 89 | 89 | $_SESSION['error'] = $error; |
| 90 | 90 | } |
| 91 | - $_SESSION['done'] = array_merge($_SESSION['done'],array('Create and import tables')); |
|
| 91 | + $_SESSION['done'] = array_merge($_SESSION['done'], array('Create and import tables')); |
|
| 92 | 92 | if ($globalSBS1 && !$globalIVAO && !$globalVATSIM && !$globalphpVMS) { |
| 93 | 93 | $_SESSION['install'] = 'populate'; |
| 94 | 94 | $_SESSION['next'] = 'Populate aircraft_modes table with externals data for ADS-B'; |
@@ -96,84 +96,84 @@ discard block |
||
| 96 | 96 | $_SESSION['install'] = 'sources'; |
| 97 | 97 | $_SESSION['next'] = 'Insert data in source table'; |
| 98 | 98 | } |
| 99 | - $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 99 | + $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 100 | 100 | print json_encode($result); |
| 101 | 101 | } else { |
| 102 | 102 | $error .= update_schema::check_version(true); |
| 103 | 103 | if ($error != '') { |
| 104 | 104 | $_SESSION['error'] = $error; |
| 105 | 105 | } |
| 106 | - $_SESSION['done'] = array_merge($_SESSION['done'],array('Update schema if needed')); |
|
| 106 | + $_SESSION['done'] = array_merge($_SESSION['done'], array('Update schema if needed')); |
|
| 107 | 107 | $_SESSION['install'] = 'sources'; |
| 108 | 108 | $_SESSION['next'] = 'Insert data in source table'; |
| 109 | - $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 109 | + $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 110 | 110 | print json_encode($result); |
| 111 | 111 | } |
| 112 | 112 | } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'waypoints') { |
| 113 | 113 | include_once('class.update_db.php'); |
| 114 | 114 | $error .= update_db::update_waypoints(); |
| 115 | - $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate waypoints database')); |
|
| 115 | + $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate waypoints database')); |
|
| 116 | 116 | |
| 117 | 117 | $_SESSION['install'] = 'airspace'; |
| 118 | 118 | $_SESSION['next'] = 'Populate airspace table'; |
| 119 | - $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 119 | + $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 120 | 120 | print json_encode($result); |
| 121 | 121 | } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'airspace') { |
| 122 | 122 | include_once('class.update_db.php'); |
| 123 | 123 | $error .= update_db::update_airspace_fam(); |
| 124 | - $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate airspace database')); |
|
| 124 | + $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate airspace database')); |
|
| 125 | 125 | $_SESSION['install'] = 'countries'; |
| 126 | 126 | $_SESSION['next'] = 'Populate countries table'; |
| 127 | - $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 127 | + $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 128 | 128 | print json_encode($result); |
| 129 | 129 | } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'countries') { |
| 130 | 130 | include_once('class.update_db.php'); |
| 131 | 131 | $error .= update_db::update_countries(); |
| 132 | - $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate countries database')); |
|
| 132 | + $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate countries database')); |
|
| 133 | 133 | if (isset($globalNOTAM) && $globalNOTAM && isset($globalNOTAMSource) && $globalNOTAMSource != '') { |
| 134 | 134 | $_SESSION['install'] = 'notam'; |
| 135 | 135 | $_SESSION['next'] = 'Populate NOTAM table with externals data'; |
| 136 | - $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 136 | + $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 137 | 137 | print json_encode($result); |
| 138 | 138 | } elseif (isset($_SESSION['owner']) && $_SESSION['owner'] == 1) { |
| 139 | 139 | $_SESSION['install'] = 'owner'; |
| 140 | 140 | $_SESSION['next'] = 'Populate owner table with externals data'; |
| 141 | 141 | unset($_SESSION['owner']); |
| 142 | - $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 142 | + $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 143 | 143 | print json_encode($result); |
| 144 | 144 | } else { |
| 145 | 145 | $_SESSION['install'] = 'sources'; |
| 146 | 146 | $_SESSION['next'] = 'Insert data in source table'; |
| 147 | - $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 147 | + $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 148 | 148 | print json_encode($result); |
| 149 | 149 | } |
| 150 | 150 | } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'populate') { |
| 151 | 151 | if (!is_writable('tmp')) { |
| 152 | 152 | $error = 'The directory <i>install/tmp</i> must be writable.'; |
| 153 | - $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 153 | + $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 154 | 154 | print json_encode($result); |
| 155 | 155 | } else { |
| 156 | 156 | include_once('class.update_db.php'); |
| 157 | 157 | $globalDebug = FALSE; |
| 158 | 158 | $error .= update_db::update_ModeS_fam(); |
| 159 | - $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate aircraft_modes table with externals data for ADS-B')); |
|
| 159 | + $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate aircraft_modes table with externals data for ADS-B')); |
|
| 160 | 160 | |
| 161 | 161 | $_SESSION['install'] = 'populate_flarm'; |
| 162 | 162 | $_SESSION['next'] = 'Populate aircraft_modes table with externals data for FLARM'; |
| 163 | - $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 163 | + $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 164 | 164 | print json_encode($result); |
| 165 | 165 | } |
| 166 | 166 | } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'populate_flarm') { |
| 167 | 167 | if (!is_writable('tmp')) { |
| 168 | 168 | $error = 'The directory <i>install/tmp</i> must be writable.'; |
| 169 | - $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 169 | + $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 170 | 170 | print json_encode($result); |
| 171 | 171 | } else { |
| 172 | 172 | include_once('class.update_db.php'); |
| 173 | 173 | $globalDebug = FALSE; |
| 174 | 174 | //$error .= update_db::update_ModeS_flarm(); |
| 175 | 175 | $error .= update_db::update_ModeS_ogn(); |
| 176 | - $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate aircraft_modes table with externals data for FLARM')); |
|
| 176 | + $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate aircraft_modes table with externals data for FLARM')); |
|
| 177 | 177 | |
| 178 | 178 | if ((isset($globalVATSIM) && $globalVATSIM) && (isset($globalIVAO) && $globalIVAO)) { |
| 179 | 179 | $_SESSION['install'] = 'vatsim'; |
@@ -193,34 +193,34 @@ discard block |
||
| 193 | 193 | $_SESSION['install'] = 'routes'; |
| 194 | 194 | $_SESSION['next'] = 'Populate routes table with externals data'; |
| 195 | 195 | } |
| 196 | - $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 196 | + $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 197 | 197 | print json_encode($result); |
| 198 | 198 | } |
| 199 | 199 | } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'routes') { |
| 200 | 200 | if (!is_writable('tmp')) { |
| 201 | 201 | $error = 'The directory <i>install/tmp</i> must be writable.'; |
| 202 | - $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 202 | + $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 203 | 203 | print json_encode($result); |
| 204 | 204 | } else { |
| 205 | 205 | include_once('class.update_db.php'); |
| 206 | 206 | $globalDebug = FALSE; |
| 207 | 207 | $error .= update_db::update_routes(); |
| 208 | - $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate routes table with externals data')); |
|
| 208 | + $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate routes table with externals data')); |
|
| 209 | 209 | $_SESSION['install'] = 'translation'; |
| 210 | 210 | $_SESSION['next'] = 'Populate translation table with externals data'; |
| 211 | - $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 211 | + $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 212 | 212 | print json_encode($result); |
| 213 | 213 | } |
| 214 | 214 | } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'translation') { |
| 215 | 215 | if (!is_writable('tmp')) { |
| 216 | 216 | $error = 'The directory <i>install/tmp</i> must be writable.'; |
| 217 | - $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 217 | + $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 218 | 218 | print json_encode($result); |
| 219 | 219 | } else { |
| 220 | 220 | include_once('class.update_db.php'); |
| 221 | 221 | $globalDebug = FALSE; |
| 222 | 222 | $error .= update_db::update_translation(); |
| 223 | - $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate translation table with externals data')); |
|
| 223 | + $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate translation table with externals data')); |
|
| 224 | 224 | |
| 225 | 225 | if ($_SESSION['waypoints'] == 1) { |
| 226 | 226 | $_SESSION['install'] = 'waypoints'; |
@@ -237,48 +237,48 @@ discard block |
||
| 237 | 237 | $_SESSION['install'] = 'sources'; |
| 238 | 238 | $_SESSION['next'] = 'Insert data in source table'; |
| 239 | 239 | } |
| 240 | - $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 240 | + $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 241 | 241 | print json_encode($result); |
| 242 | 242 | } |
| 243 | 243 | } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'owner') { |
| 244 | 244 | if (!is_writable('tmp')) { |
| 245 | 245 | $error = 'The directory <i>install/tmp</i> must be writable.'; |
| 246 | - $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 246 | + $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 247 | 247 | print json_encode($result); |
| 248 | 248 | } else { |
| 249 | 249 | include_once('class.update_db.php'); |
| 250 | 250 | $globalDebug = FALSE; |
| 251 | 251 | $error = update_db::update_owner_fam(); |
| 252 | - $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate owner table with externals data')); |
|
| 252 | + $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate owner table with externals data')); |
|
| 253 | 253 | $_SESSION['install'] = 'sources'; |
| 254 | 254 | $_SESSION['next'] = 'Insert data in source table'; |
| 255 | - $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 255 | + $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 256 | 256 | print json_encode($result); |
| 257 | 257 | } |
| 258 | 258 | } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'notam') { |
| 259 | 259 | if (!is_writable('tmp')) { |
| 260 | 260 | $error = 'The directory <i>install/tmp</i> must be writable.'; |
| 261 | - $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 261 | + $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 262 | 262 | print json_encode($result); |
| 263 | 263 | } else { |
| 264 | 264 | include_once('class.update_db.php'); |
| 265 | 265 | $globalDebug = FALSE; |
| 266 | 266 | if (isset($globalNOTAMSource) && $globalNOTAMSource != '') { |
| 267 | 267 | $error .= update_db::update_notam(); |
| 268 | - $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate notam table with externals data')); |
|
| 268 | + $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate notam table with externals data')); |
|
| 269 | 269 | } else { |
| 270 | - $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate notam table with externals data (no source defined)')); |
|
| 270 | + $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate notam table with externals data (no source defined)')); |
|
| 271 | 271 | } |
| 272 | 272 | if (isset($_SESSION['owner']) && $_SESSION['owner'] == 1) { |
| 273 | 273 | $_SESSION['install'] = 'owner'; |
| 274 | 274 | $_SESSION['next'] = 'Populate owner table'; |
| 275 | 275 | unset($_SESSION['owner']); |
| 276 | - $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 276 | + $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 277 | 277 | print json_encode($result); |
| 278 | 278 | } else { |
| 279 | 279 | $_SESSION['install'] = 'sources'; |
| 280 | 280 | $_SESSION['next'] = 'Insert data in source table'; |
| 281 | - $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 281 | + $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 282 | 282 | print json_encode($result); |
| 283 | 283 | } |
| 284 | 284 | } |
@@ -316,9 +316,9 @@ discard block |
||
| 316 | 316 | $Source = new Source(); |
| 317 | 317 | $Source->deleteAllLocation(); |
| 318 | 318 | foreach ($sources as $src) { |
| 319 | - if (isset($src['latitude']) && $src['latitude'] != '') $Source->addLocation($src['name'],$src['latitude'],$src['longitude'],$src['altitude'],$src['city'],$src['country'],$src['source'],'antenna.png'); |
|
| 319 | + if (isset($src['latitude']) && $src['latitude'] != '') $Source->addLocation($src['name'], $src['latitude'], $src['longitude'], $src['altitude'], $src['city'], $src['country'], $src['source'], 'antenna.png'); |
|
| 320 | 320 | } |
| 321 | - $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert data in source table')); |
|
| 321 | + $_SESSION['done'] = array_merge($_SESSION['done'], array('Insert data in source table')); |
|
| 322 | 322 | unset($_SESSION['sources']); |
| 323 | 323 | } |
| 324 | 324 | /* |
@@ -343,7 +343,7 @@ discard block |
||
| 343 | 343 | $_SESSION['install'] = 'finish'; |
| 344 | 344 | $_SESSION['next'] = 'finish'; |
| 345 | 345 | } |
| 346 | - $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 346 | + $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 347 | 347 | print json_encode($result); |
| 348 | 348 | } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'vatsim') { |
| 349 | 349 | include_once('../install/class.create_db.php'); |
@@ -353,36 +353,36 @@ discard block |
||
| 353 | 353 | if ((isset($globalVATSIM) && $globalVATSIM) && (isset($globalIVAO) && $globalIVAO)) { |
| 354 | 354 | if (file_exists('tmp/ivae_feb2013.zip')) { |
| 355 | 355 | $error .= update_db::update_IVAO(); |
| 356 | - $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert IVAO data')); |
|
| 356 | + $_SESSION['done'] = array_merge($_SESSION['done'], array('Insert IVAO data')); |
|
| 357 | 357 | } else { |
| 358 | 358 | $error .= update_db::update_vatsim(); |
| 359 | - $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data')); |
|
| 359 | + $_SESSION['done'] = array_merge($_SESSION['done'], array('Insert VATSIM data')); |
|
| 360 | 360 | } |
| 361 | 361 | } elseif (isset($globalVATSIM) && $globalVATSIM) { |
| 362 | 362 | $error .= update_db::update_vatsim(); |
| 363 | - $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data')); |
|
| 363 | + $_SESSION['done'] = array_merge($_SESSION['done'], array('Insert VATSIM data')); |
|
| 364 | 364 | } elseif (isset($globalIVAO) && $globalIVAO) { |
| 365 | 365 | if (file_exists('tmp/ivae_feb2013.zip')) { |
| 366 | 366 | $error .= update_db::update_IVAO(); |
| 367 | - $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert IVAO data')); |
|
| 367 | + $_SESSION['done'] = array_merge($_SESSION['done'], array('Insert IVAO data')); |
|
| 368 | 368 | } else { |
| 369 | 369 | $error .= update_db::update_vatsim(); |
| 370 | - $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data (IVAO not found)')); |
|
| 370 | + $_SESSION['done'] = array_merge($_SESSION['done'], array('Insert VATSIM data (IVAO not found)')); |
|
| 371 | 371 | } |
| 372 | 372 | } elseif (isset($globalphpVMS) && $globalphpVMS) { |
| 373 | - $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert phpVMS data')); |
|
| 373 | + $_SESSION['done'] = array_merge($_SESSION['done'], array('Insert phpVMS data')); |
|
| 374 | 374 | } |
| 375 | 375 | //$_SESSION['install'] = 'routes'; |
| 376 | 376 | //$_SESSION['next'] = 'Populate routes table with externals data'; |
| 377 | 377 | $_SESSION['install'] = 'finish'; |
| 378 | 378 | $_SESSION['next'] = 'finish'; |
| 379 | 379 | |
| 380 | - $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 380 | + $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 381 | 381 | print json_encode($result); |
| 382 | 382 | } else { |
| 383 | 383 | //unset($_SESSION['install']); |
| 384 | 384 | $_SESSION['error'] = 'Unknwon task : '.$_SESSION['install']; |
| 385 | - $result = array('error' => 'Unknwon task : '.$_SESSION['install'],'done' => $_SESSION['done'],'next' => 'finish','install' => 'finish'); |
|
| 385 | + $result = array('error' => 'Unknwon task : '.$_SESSION['install'], 'done' => $_SESSION['done'], 'next' => 'finish', 'install' => 'finish'); |
|
| 386 | 386 | print json_encode($result); |
| 387 | 387 | } |
| 388 | 388 | ?> |
| 389 | 389 | \ No newline at end of file |
@@ -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>'; |
@@ -10,7 +10,7 @@ |
||
| 10 | 10 | $output = '{'; |
| 11 | 11 | $output .= '"flights": ['; |
| 12 | 12 | if (!empty($spotter_array)) { |
| 13 | - foreach($spotter_array as $spotter_item) |
|
| 13 | + foreach ($spotter_array as $spotter_item) |
|
| 14 | 14 | { |
| 15 | 15 | $output .= '{'; |
| 16 | 16 | $output .= '"flight_id": "'.$spotter_item['spotter_id'].'",'; |
@@ -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); |
@@ -24,54 +24,54 @@ discard block |
||
| 24 | 24 | } |
| 25 | 25 | |
| 26 | 26 | class Language { |
| 27 | - public $all_languages = array('ar_SA' => array('العَرَبِيَّةُ', 'ar', 'arabic'), |
|
| 28 | - 'bg_BG' => array('Български', 'bg', 'bulgarian'), |
|
| 29 | - 'id_ID' => array('Bahasa Indonesia', 'id', 'indonesian'), |
|
| 30 | - 'ms_MY' => array('Bahasa Melayu', 'ms', 'malay'), |
|
| 31 | - 'ca_ES' => array('Català', 'ca', 'catalan'), // ca_CA |
|
| 32 | - 'cs_CZ' => array('Čeština', 'cs', 'czech'), |
|
| 33 | - 'de_DE' => array('Deutsch', 'de', 'german'), |
|
| 34 | - 'da_DK' => array('Dansk', 'da', 'danish') , // dk_DK |
|
| 35 | - 'et_EE' => array('Eesti', 'et', 'estonian'), // ee_ET |
|
| 36 | - 'en_GB' => array('English', 'en', 'english'), |
|
| 37 | - 'en_US' => array('English (US)', 'en', 'english'), |
|
| 38 | - 'es_AR' => array('Español (Argentina)', 'es', 'spanish'), |
|
| 39 | - 'es_CO' => array('Español (Colombia)', 'es', 'spanish'), |
|
| 40 | - 'es_ES' => array('Español (España)', 'es', 'spanish'), |
|
| 41 | - 'es_419' => array('Español (América Latina)', 'es', 'spanish'), |
|
| 42 | - 'es_MX' => array('Español (Mexico)', 'es', 'spanish'), |
|
| 43 | - 'es_VE' => array('Español (Venezuela)', 'es', 'spanish'), |
|
| 44 | - 'eu_ES' => array('Euskara', 'en', 'basque'), |
|
| 45 | - 'fr_FR' => array('Français', 'fr', 'french'), |
|
| 46 | - 'gl_ES' => array('Galego', 'gl', 'galician'), |
|
| 47 | - 'el_GR' => array('Ελληνικά', 'el', 'greek'), // el_EL |
|
| 48 | - 'he_IL' => array('עברית', 'he', 'hebrew'), // he_HE |
|
| 49 | - 'hr_HR' => array('Hrvatski', 'hr', 'croatian'), |
|
| 50 | - 'hu_HU' => array('Magyar', 'hu', 'hungarian'), |
|
| 51 | - 'it_IT' => array('Italiano', 'it', 'italian'), |
|
| 52 | - 'lv_LV' => array('Latviešu', 'lv', 'latvian'), |
|
| 53 | - 'lt_LT' => array('Lietuvių', 'lt', 'lithuanian'), |
|
| 54 | - 'nl_NL' => array('Nederlands', 'nl', 'dutch'), |
|
| 55 | - 'nb_NO' => array('Norsk (Bokmål)', 'nb', 'norwegian'), // no_NB |
|
| 56 | - 'nn_NO' => array('Norsk (Nynorsk)', 'nn', 'norwegian'), // no_NN |
|
| 57 | - 'fa_IR' => array('فارسی', 'fa', 'persian'), |
|
| 58 | - 'pl_PL' => array('Polski', 'pl', 'polish'), |
|
| 59 | - 'pt_PT' => array('Português', 'pt', 'portuguese'), |
|
| 60 | - 'pt_BR' => array('Português do Brasil', 'pt', 'brazilian portuguese'), |
|
| 61 | - 'ro_RO' => array('Română', 'en', 'romanian'), |
|
| 62 | - 'ru_RU' => array('Pусский', 'ru', 'russian'), |
|
| 63 | - 'sk_SK' => array('Slovenčina', 'sk', 'slovak'), |
|
| 64 | - 'sl_SI' => array('Slovenščina', 'sl', 'slovenian slovene'), |
|
| 65 | - 'sr_RS' => array('Srpski', 'sr', 'serbian'), |
|
| 66 | - 'fi_FI' => array('Suomi', 'fi', 'finish'), |
|
| 67 | - 'sv_SE' => array('Svenska', 'sv', 'swedish'), |
|
| 68 | - 'vi_VN' => array('Tiếng Việt', 'vi', 'vietnamese'), |
|
| 69 | - 'th_TH' => array('ภาษาไทย', 'th', 'thai'), |
|
| 70 | - 'tr_TR' => array('Türkçe', 'tr', 'turkish'), |
|
| 71 | - 'uk_UA' => array('Українська', 'en', 'ukrainian'), // ua_UA |
|
| 72 | - 'ja_JP' => array('日本語', 'ja', 'japanese'), |
|
| 73 | - 'zh_CN' => array('简体中文', 'zh', 'chinese'), |
|
| 74 | - 'zh_TW' => array('繁體中文', 'zh', 'chinese') |
|
| 27 | + public $all_languages = array('ar_SA' => array('العَرَبِيَّةُ', 'ar', 'arabic'), |
|
| 28 | + 'bg_BG' => array('Български', 'bg', 'bulgarian'), |
|
| 29 | + 'id_ID' => array('Bahasa Indonesia', 'id', 'indonesian'), |
|
| 30 | + 'ms_MY' => array('Bahasa Melayu', 'ms', 'malay'), |
|
| 31 | + 'ca_ES' => array('Català', 'ca', 'catalan'), // ca_CA |
|
| 32 | + 'cs_CZ' => array('Čeština', 'cs', 'czech'), |
|
| 33 | + 'de_DE' => array('Deutsch', 'de', 'german'), |
|
| 34 | + 'da_DK' => array('Dansk', 'da', 'danish'), // dk_DK |
|
| 35 | + 'et_EE' => array('Eesti', 'et', 'estonian'), // ee_ET |
|
| 36 | + 'en_GB' => array('English', 'en', 'english'), |
|
| 37 | + 'en_US' => array('English (US)', 'en', 'english'), |
|
| 38 | + 'es_AR' => array('Español (Argentina)', 'es', 'spanish'), |
|
| 39 | + 'es_CO' => array('Español (Colombia)', 'es', 'spanish'), |
|
| 40 | + 'es_ES' => array('Español (España)', 'es', 'spanish'), |
|
| 41 | + 'es_419' => array('Español (América Latina)', 'es', 'spanish'), |
|
| 42 | + 'es_MX' => array('Español (Mexico)', 'es', 'spanish'), |
|
| 43 | + 'es_VE' => array('Español (Venezuela)', 'es', 'spanish'), |
|
| 44 | + 'eu_ES' => array('Euskara', 'en', 'basque'), |
|
| 45 | + 'fr_FR' => array('Français', 'fr', 'french'), |
|
| 46 | + 'gl_ES' => array('Galego', 'gl', 'galician'), |
|
| 47 | + 'el_GR' => array('Ελληνικά', 'el', 'greek'), // el_EL |
|
| 48 | + 'he_IL' => array('עברית', 'he', 'hebrew'), // he_HE |
|
| 49 | + 'hr_HR' => array('Hrvatski', 'hr', 'croatian'), |
|
| 50 | + 'hu_HU' => array('Magyar', 'hu', 'hungarian'), |
|
| 51 | + 'it_IT' => array('Italiano', 'it', 'italian'), |
|
| 52 | + 'lv_LV' => array('Latviešu', 'lv', 'latvian'), |
|
| 53 | + 'lt_LT' => array('Lietuvių', 'lt', 'lithuanian'), |
|
| 54 | + 'nl_NL' => array('Nederlands', 'nl', 'dutch'), |
|
| 55 | + 'nb_NO' => array('Norsk (Bokmål)', 'nb', 'norwegian'), // no_NB |
|
| 56 | + 'nn_NO' => array('Norsk (Nynorsk)', 'nn', 'norwegian'), // no_NN |
|
| 57 | + 'fa_IR' => array('فارسی', 'fa', 'persian'), |
|
| 58 | + 'pl_PL' => array('Polski', 'pl', 'polish'), |
|
| 59 | + 'pt_PT' => array('Português', 'pt', 'portuguese'), |
|
| 60 | + 'pt_BR' => array('Português do Brasil', 'pt', 'brazilian portuguese'), |
|
| 61 | + 'ro_RO' => array('Română', 'en', 'romanian'), |
|
| 62 | + 'ru_RU' => array('Pусский', 'ru', 'russian'), |
|
| 63 | + 'sk_SK' => array('Slovenčina', 'sk', 'slovak'), |
|
| 64 | + 'sl_SI' => array('Slovenščina', 'sl', 'slovenian slovene'), |
|
| 65 | + 'sr_RS' => array('Srpski', 'sr', 'serbian'), |
|
| 66 | + 'fi_FI' => array('Suomi', 'fi', 'finish'), |
|
| 67 | + 'sv_SE' => array('Svenska', 'sv', 'swedish'), |
|
| 68 | + 'vi_VN' => array('Tiếng Việt', 'vi', 'vietnamese'), |
|
| 69 | + 'th_TH' => array('ภาษาไทย', 'th', 'thai'), |
|
| 70 | + 'tr_TR' => array('Türkçe', 'tr', 'turkish'), |
|
| 71 | + 'uk_UA' => array('Українська', 'en', 'ukrainian'), // ua_UA |
|
| 72 | + 'ja_JP' => array('日本語', 'ja', 'japanese'), |
|
| 73 | + 'zh_CN' => array('简体中文', 'zh', 'chinese'), |
|
| 74 | + 'zh_TW' => array('繁體中文', 'zh', 'chinese') |
|
| 75 | 75 | ); |
| 76 | 76 | |
| 77 | 77 | /** |
@@ -99,7 +99,7 @@ discard block |
||
| 99 | 99 | |
| 100 | 100 | public function getLocale($locale) |
| 101 | 101 | { |
| 102 | - return array($locale,$this->all_languages[$locale][1],$this->all_languages[$locale][2],$locale.'.utf8',$locale.'.UTF8'); |
|
| 102 | + return array($locale, $this->all_languages[$locale][1], $this->all_languages[$locale][2], $locale.'.utf8', $locale.'.UTF8'); |
|
| 103 | 103 | } |
| 104 | 104 | |
| 105 | 105 | /** |
@@ -86,7 +86,9 @@ discard block |
||
| 86 | 86 | return $result; |
| 87 | 87 | } |
| 88 | 88 | $handle = @opendir('./locale'); |
| 89 | - if ($handle === false) return $result; |
|
| 89 | + if ($handle === false) { |
|
| 90 | + return $result; |
|
| 91 | + } |
|
| 90 | 92 | while (false !== ($file = readdir($handle))) { |
| 91 | 93 | $path = './locale'.'/'.$file.'/LC_MESSAGES/fam.mo'; |
| 92 | 94 | if ($file != "." && $file != ".." && @file_exists($path)) { |
@@ -112,7 +114,9 @@ discard block |
||
| 112 | 114 | $available = $this->listLocaleDir(); |
| 113 | 115 | $allAvailableLanguages = array(); |
| 114 | 116 | foreach ($available as $lang) { |
| 115 | - if (isset($this->all_languages[$lang])) $allAvailableLanguages[$lang] = $this->all_languages[$lang]; |
|
| 117 | + if (isset($this->all_languages[$lang])) { |
|
| 118 | + $allAvailableLanguages[$lang] = $this->all_languages[$lang]; |
|
| 119 | + } |
|
| 116 | 120 | } |
| 117 | 121 | return $allAvailableLanguages; |
| 118 | 122 | } |
@@ -70,7 +70,7 @@ |
||
| 70 | 70 | /** |
| 71 | 71 | * Returns list of available locales |
| 72 | 72 | * |
| 73 | - * @return array |
|
| 73 | + * @return string[] |
|
| 74 | 74 | */ |
| 75 | 75 | public function listLocaleDir() |
| 76 | 76 | { |
@@ -68,10 +68,10 @@ discard block |
||
| 68 | 68 | ); |
| 69 | 69 | |
| 70 | 70 | /** |
| 71 | - * Returns list of available locales |
|
| 72 | - * |
|
| 73 | - * @return array |
|
| 74 | - */ |
|
| 71 | + * Returns list of available locales |
|
| 72 | + * |
|
| 73 | + * @return array |
|
| 74 | + */ |
|
| 75 | 75 | public function listLocaleDir() |
| 76 | 76 | { |
| 77 | 77 | $result = array('en_GB'); |
@@ -96,9 +96,9 @@ discard block |
||
| 96 | 96 | } |
| 97 | 97 | |
| 98 | 98 | /** |
| 99 | - * Returns list of available languages |
|
| 100 | - * |
|
| 101 | - * @return array |
|
| 99 | + * Returns list of available languages |
|
| 100 | + * |
|
| 101 | + * @return array |
|
| 102 | 102 | */ |
| 103 | 103 | public function getLanguages() |
| 104 | 104 | { |
@@ -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 | } |
