1
0
mirror of https://github.com/klokantech/tileserver-php.git synced 2025-08-03 21:27:52 +02:00

Merge pull request #143 from CodeLingoBot/rewrite-klokantech-tileserver-php-psr2-lower-case-constant-values

Change PHP keywords to comply with PSR2
This commit is contained in:
Dalibor Janák
2019-04-04 07:52:45 +02:00
committed by GitHub

View File

@@ -73,16 +73,16 @@ class Server {
//Get config from enviroment //Get config from enviroment
$envServerTitle = getenv('serverTitle'); $envServerTitle = getenv('serverTitle');
if($envServerTitle !== FALSE){ if($envServerTitle !== false){
$this->config['serverTitle'] = $envServerTitle; $this->config['serverTitle'] = $envServerTitle;
} }
$envBaseUrls = getenv('baseUrls'); $envBaseUrls = getenv('baseUrls');
if($envBaseUrls !== FALSE){ if($envBaseUrls !== false){
$this->config['baseUrls'] = is_array($envBaseUrls) ? $this->config['baseUrls'] = is_array($envBaseUrls) ?
$envBaseUrls : explode(',', $envBaseUrls); $envBaseUrls : explode(',', $envBaseUrls);
} }
$envTemplate = getenv('template'); $envTemplate = getenv('template');
if($envBaseUrls !== FALSE){ if($envBaseUrls !== false){
$this->config['template'] = $envTemplate; $this->config['template'] = $envTemplate;
} }
} }
@@ -120,7 +120,7 @@ class Server {
$this->x = $params[1]; $this->x = $params[1];
$file = explode('.', $params[0]); $file = explode('.', $params[0]);
$this->y = $file[0]; $this->y = $file[0];
$this->ext = isset($file[1]) ? $file[1] : NULL; $this->ext = isset($file[1]) ? $file[1] : null;
} }
} }
@@ -136,7 +136,7 @@ class Server {
return $value; return $value;
} }
} }
return FALSE; return false;
} }
/** /**
@@ -146,9 +146,9 @@ class Server {
*/ */
public function isDBLayer($layer) { public function isDBLayer($layer) {
if (is_file($this->config['dataRoot'] . $layer . '.mbtiles')) { if (is_file($this->config['dataRoot'] . $layer . '.mbtiles')) {
return TRUE; return true;
} else { } else {
return FALSE; return false;
} }
} }
@@ -159,9 +159,9 @@ class Server {
*/ */
public function isFileLayer($layer) { public function isFileLayer($layer) {
if (is_dir($layer)) { if (is_dir($layer)) {
return TRUE; return true;
} else { } else {
return FALSE; return false;
} }
} }
@@ -323,9 +323,9 @@ class Server {
header('Etag:' . $eTag); header('Etag:' . $eTag);
if (@strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']) == $lastModifiedTime || if (@strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']) == $lastModifiedTime ||
@trim($_SERVER['HTTP_IF_NONE_MATCH']) == $eTag) { @trim($_SERVER['HTTP_IF_NONE_MATCH']) == $eTag) {
return TRUE; return true;
} else { } else {
return FALSE; return false;
} }
} }
@@ -339,7 +339,7 @@ class Server {
*/ */
public function renderTile($tileset, $z, $y, $x, $ext) { public function renderTile($tileset, $z, $y, $x, $ext) {
if ($this->isDBLayer($tileset)) { if ($this->isDBLayer($tileset)) {
if ($this->isModified($tileset) == TRUE) { if ($this->isModified($tileset) == true) {
header('Access-Control-Allow-Origin: *'); header('Access-Control-Allow-Origin: *');
header('HTTP/1.1 304 Not Modified'); header('HTTP/1.1 304 Not Modified');
die; die;
@@ -354,17 +354,17 @@ class Server {
} }
$result = $this->db->query('select tile_data as t from tiles where zoom_level=' . $z . ' and tile_column=' . $x . ' and tile_row=' . $y); $result = $this->db->query('select tile_data as t from tiles where zoom_level=' . $z . ' and tile_column=' . $x . ' and tile_row=' . $y);
$data = $result->fetchColumn(); $data = $result->fetchColumn();
if (!isset($data) || $data === FALSE) { if (!isset($data) || $data === false) {
//if tile doesn't exist //if tile doesn't exist
//select scale of tile (for retina tiles) //select scale of tile (for retina tiles)
$result = $this->db->query('select value from metadata where name="scale"'); $result = $this->db->query('select value from metadata where name="scale"');
$resultdata = $result->fetchColumn(); $resultdata = $result->fetchColumn();
$scale = isset($resultdata) && $resultdata !== FALSE ? $resultdata : 1; $scale = isset($resultdata) && $resultdata !== false ? $resultdata : 1;
$this->getCleanTile($scale, $ext); $this->getCleanTile($scale, $ext);
} else { } else {
$result = $this->db->query('select value from metadata where name="format"'); $result = $this->db->query('select value from metadata where name="format"');
$resultdata = $result->fetchColumn(); $resultdata = $result->fetchColumn();
$format = isset($resultdata) && $resultdata !== FALSE ? $resultdata : 'png'; $format = isset($resultdata) && $resultdata !== false ? $resultdata : 'png';
if ($format == 'jpg') { if ($format == 'jpg') {
$format = 'jpeg'; $format = 'jpeg';
} }
@@ -380,11 +380,11 @@ class Server {
} elseif ($this->isFileLayer($tileset)) { } elseif ($this->isFileLayer($tileset)) {
$name = './' . $tileset . '/' . $z . '/' . $x . '/' . $y; $name = './' . $tileset . '/' . $z . '/' . $x . '/' . $y;
$mime = 'image/'; $mime = 'image/';
if($ext != NULL){ if($ext != null){
$name .= '.' . $ext; $name .= '.' . $ext;
} }
if ($fp = @fopen($name, 'rb')) { if ($fp = @fopen($name, 'rb')) {
if($ext != NULL){ if($ext != null){
$mime .= $ext; $mime .= $ext;
}else{ }else{
//detect image type from file //detect image type from file
@@ -450,9 +450,9 @@ class Server {
* @param integer $y * @param integer $y
* @param integer $x * @param integer $x
*/ */
public function renderUTFGrid($tileset, $z, $y, $x, $flip = TRUE) { public function renderUTFGrid($tileset, $z, $y, $x, $flip = true) {
if ($this->isDBLayer($tileset)) { if ($this->isDBLayer($tileset)) {
if ($this->isModified($tileset) == TRUE) { if ($this->isModified($tileset) == true) {
header('HTTP/1.1 304 Not Modified'); header('HTTP/1.1 304 Not Modified');
} }
if ($flip) { if ($flip) {
@@ -466,7 +466,7 @@ class Server {
$result = $this->db->query($query); $result = $this->db->query($query);
$data = $result->fetch(PDO::FETCH_ASSOC); $data = $result->fetch(PDO::FETCH_ASSOC);
if ($data !== FALSE) { if ($data !== false) {
$grid = gzuncompress($data['grid']); $grid = gzuncompress($data['grid']);
$grid = substr(trim($grid), 0, -1); $grid = substr(trim($grid), 0, -1);
@@ -756,7 +756,7 @@ class Wmts extends Server {
*/ */
public function get() { public function get() {
$request = $this->getGlobal('Request'); $request = $this->getGlobal('Request');
if ($request !== FALSE && $request == 'gettile') { if ($request !== false && $request == 'gettile') {
$this->getTile(); $this->getTile();
} else { } else {
parent::setDatasets(); parent::setDatasets();
@@ -1079,7 +1079,7 @@ class Wmts extends Server {
public function getTile() { public function getTile() {
$request = $this->getGlobal('Request'); $request = $this->getGlobal('Request');
if ($request) { if ($request) {
if (strpos('/', $_GET['Format']) !== FALSE) { if (strpos('/', $_GET['Format']) !== false) {
$format = explode('/', $_GET['Format']); $format = explode('/', $_GET['Format']);
$format = $format[1]; $format = $format[1];
} else { } else {
@@ -1292,7 +1292,7 @@ class Router {
if (!isset($config['baseUrls'][0])) { if (!isset($config['baseUrls'][0])) {
$config['baseUrls'][0] = $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']; $config['baseUrls'][0] = $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
} }
if (strpos($_SERVER['REQUEST_URI'], '=') != FALSE) { if (strpos($_SERVER['REQUEST_URI'], '=') != false) {
$kvp = explode('=', $_SERVER['REQUEST_URI']); $kvp = explode('=', $_SERVER['REQUEST_URI']);
$_GET['callback'] = $kvp[1]; $_GET['callback'] = $kvp[1];
$params[0] = 'index'; $params[0] = 'index';