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

Increase the speed with mbtiles.

Browse Source
This commit is contained in:
Dalibor Janák
2014-04-25 10:22:02 +02:00
parent 9bbb1bce05
commit 1f1dd22227
1 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
tileserver.php
View File

@@ -23,7 +23,6 @@ Router::serve(array(
'/:string/:number/:number/:number.:string' => 'Wmts:getTile', '/:string/:number/:number/:number.:string' => 'Wmts:getTile',
'/tms' => 'Tms:getCapabilities', '/tms' => 'Tms:getCapabilities',
'/tms/:string' => 'Tms:getLayerCapabilities', '/tms/:string' => 'Tms:getLayerCapabilities',
'/:string/tms/:number/:number/:number.:string' => 'Tms:getTile',
)); ));
/** /**
@@ -88,7 +87,7 @@ class Server {
// die; // die;
// } // }
} }
/** /**
* Processing params from router <server>/<layer>/<z>/<x>/<y>.ext * Processing params from router <server>/<layer>/<z>/<x>/<y>.ext
* @param array $params * @param array $params
@@ -128,13 +127,11 @@ class Server {
* @return boolean * @return boolean
*/ */
public function isDBLayer($layer) { public function isDBLayer($layer) {
foreach ($this->dbLayer as $DBLayer) { if(is_file($layer.'.mbtiles')){
$basename = explode('.', $DBLayer['basename']); return TRUE;
if ($basename[0] == $layer) { } else {
return TRUE; return FALSE;
}
} }
return false;
} }
/** /**
@@ -143,12 +140,11 @@ class Server {
* @return boolean * @return boolean
*/ */
public function isFileLayer($layer) { public function isFileLayer($layer) {
foreach ($this->fileLayer as $DBLayer) { if(is_dir($layer)){
if ($DBLayer['basename'] == $layer) { return TRUE;
return TRUE; } else {
} return FALSE;
} }
return false;
} }
/** /**
@@ -470,7 +466,6 @@ class Json extends Server {
public function __construct($params) { public function __construct($params) {
parent::__construct(); parent::__construct();
parent::setParams($params); parent::setParams($params);
parent::setDatasets();
if (isset($_GET['callback']) && !empty($_GET['callback'])) { if (isset($_GET['callback']) && !empty($_GET['callback'])) {
$this->callback = $_GET['callback']; $this->callback = $_GET['callback'];
} }
@@ -524,6 +519,7 @@ class Json extends Server {
* Returns JSON with callback * Returns JSON with callback
*/ */
public function getJson() { public function getJson() {
parent::setDatasets();
header('Access-Control-Allow-Origin: *'); header('Access-Control-Allow-Origin: *');
header("Content-Type:application/javascript charset=utf-8"); header("Content-Type:application/javascript charset=utf-8");
if ($this->callback !== 'grid') { if ($this->callback !== 'grid') {
@@ -537,6 +533,7 @@ class Json extends Server {
* Returns JSONP with callback * Returns JSONP with callback
*/ */
public function getJsonp() { public function getJsonp() {
parent::setDatasets();
header('Access-Control-Allow-Origin: *'); header('Access-Control-Allow-Origin: *');
header("Content-Type:text/javascript charset=utf-8"); header("Content-Type:text/javascript charset=utf-8");
echo $this->callback . '(' . $this->createJson($this->layer) . ');'; echo $this->callback . '(' . $this->createJson($this->layer) . ');';
@@ -587,7 +584,6 @@ class Wmts extends Server {
*/ */
public function __construct($params) { public function __construct($params) {
parent::__construct(); parent::__construct();
parent::setDatasets();
if (isset($params)) { if (isset($params)) {
parent::setParams($params); parent::setParams($params);
} }
@@ -601,6 +597,7 @@ class Wmts extends Server {
if($request !== FALSE && $request == 'gettile'){ if($request !== FALSE && $request == 'gettile'){
$this->getTile(); $this->getTile();
}else{ }else{
parent::setDatasets();
$this->getCapabilities(); $this->getCapabilities();
} }
} }
@@ -1114,13 +1111,13 @@ class Tms extends Server {
public function __construct($params) { public function __construct($params) {
parent::__construct(); parent::__construct();
parent::setParams($params); parent::setParams($params);
parent::setDatasets();
} }
/** /**
* Returns getCapabilities metadata request * Returns getCapabilities metadata request
*/ */
public function getCapabilities() { public function getCapabilities() {
parent::setDatasets();
$maps = array_merge($this->fileLayer, $this->dbLayer); $maps = array_merge($this->fileLayer, $this->dbLayer);
header("Content-type: application/xml"); header("Content-type: application/xml");
echo'<TileMapService version="1.0.0"><TileMaps>'; echo'<TileMapService version="1.0.0"><TileMaps>';
@@ -1144,6 +1141,7 @@ class Tms extends Server {
* Prints metadata about layer * Prints metadata about layer
*/ */
public function getLayerCapabilities() { public function getLayerCapabilities() {
parent::setDatasets();
$maps = array_merge($this->fileLayer, $this->dbLayer); $maps = array_merge($this->fileLayer, $this->dbLayer);
foreach ($maps as $map) { foreach ($maps as $map) {
if (strpos($map['basename'], $this->layer) !== false) { if (strpos($map['basename'], $this->layer) !== false) {