mirror/php-tileserver
1
0
Fork 0
mirror of https://github.com/klokantech/tileserver-php.git synced 2025-08-06 14:47:21 +02:00
Code Issues Releases Wiki Activity

Strict standards error in PHP 5.4+ on function declarations Fixes #30 - Classes in server renamed.

Browse Source
This commit is contained in:
dala
2014-06-05 21:54:40 +02:00
parent 779e320dec
commit 8170e02397
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tileserver.php
View File

@@ -258,7 +258,7 @@ class Server {
* @param integer $x * @param integer $x
* @param string $ext * @param string $ext
*/ */
public function getTile($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('HTTP/1.1 304 Not Modified'); header('HTTP/1.1 304 Not Modified');
@@ -322,7 +322,7 @@ class Server {
* @param integer $y * @param integer $y
* @param integer $x * @param integer $x
*/ */
public function getUTFGrid($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');
@@ -567,7 +567,7 @@ class Json extends Server {
* Returns UTFGrid in JSON format * Returns UTFGrid in JSON format
*/ */
public function getUTFGrid() { public function getUTFGrid() {
parent::getUTFGrid($this->layer, $this->z, $this->y, $this->x); parent::renderUTFGrid($this->layer, $this->z, $this->y, $this->x);
} }
} }
@@ -1092,9 +1092,9 @@ class Wmts extends Server {
} else { } else {
$format = $this->getGlobal('Format'); $format = $this->getGlobal('Format');
} }
parent::getTile($this->getGlobal('Layer'), $this->getGlobal('TileMatrix'), $this->getGlobal('TileRow'), $this->getGlobal('TileCol'), $format); parent::renderTile($this->getGlobal('Layer'), $this->getGlobal('TileMatrix'), $this->getGlobal('TileRow'), $this->getGlobal('TileCol'), $format);
} else { } else {
parent::getTile($this->layer, $this->z, $this->y, $this->x, $this->ext); parent::renderTile($this->layer, $this->z, $this->y, $this->x, $this->ext);
} }
} }
@@ -1213,7 +1213,7 @@ class Tms extends Server {
* Process getTile request * Process getTile request
*/ */
public function getTile() { public function getTile() {
parent::getTile($this->layer, $this->z, $this->y, $this->x, $this->ext); parent::renderTile($this->layer, $this->z, $this->y, $this->x, $this->ext);
} }
} }