Skip to content
This repository has been archived by the owner on Jun 25, 2024. It is now read-only.

Add prefix to mbtiles, return 204 on no tile #88

Merged
merged 1 commit into from
Aug 29, 2016
Merged

Add prefix to mbtiles, return 204 on no tile #88

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions tileserver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
global $config;
$config['serverTitle'] = 'Maps hosted with TileServer-php v2.0';
$config['availableFormats'] = array('png', 'jpg', 'jpeg', 'gif', 'webp', 'pbf', 'hybrid');
$config['mbtilesPrefix'] = './';
//$config['template'] = 'template.php';
//$config['baseUrls'] = array('t0.server.com', 't1.server.com');

Expand Down Expand Up @@ -86,7 +87,7 @@ public function __construct() {
*/
public function setDatasets() {
$mjs = glob('*/metadata.json');
$mbts = glob('*.mbtiles');
$mbts = glob($this->config['mbtilesPrefix'] . '*.mbtiles');
if ($mjs) {
foreach (array_filter($mjs, 'is_readable') as $mj) {
$layer = $this->metadataFromMetadataJson($mj);
Expand Down Expand Up @@ -139,7 +140,7 @@ public function getGlobal($isKey) {
* @return boolean
*/
public function isDBLayer($layer) {
if (is_file($layer . '.mbtiles')) {
if (is_file($this->config['mbtilesPrefix'] . $layer . '.mbtiles')) {
return TRUE;
} else {
return FALSE;
Expand Down Expand Up @@ -310,7 +311,7 @@ public function DBconnect($tileset) {
* @return boolean
*/
public function isModified($filename) {
$filename = $filename . '.mbtiles';
$filename = $this->config['mbtilesPrefix'] . $filename . '.mbtiles';
$lastModifiedTime = filemtime($filename);
$eTag = md5($lastModifiedTime);
header('Last-Modified: ' . gmdate('D, d M Y H:i:s', $lastModifiedTime) . ' GMT');
Expand Down Expand Up @@ -338,7 +339,7 @@ public function renderTile($tileset, $z, $y, $x, $ext) {
header('HTTP/1.1 304 Not Modified');
die;
}
$this->DBconnect($tileset . '.mbtiles');
$this->DBconnect($this->config['mbtilesPrefix'] . $tileset . '.mbtiles');
$z = floatval($z);
$y = floatval($y);
$x = floatval($x);
Expand Down Expand Up @@ -412,7 +413,8 @@ public function renderTile($tileset, $z, $y, $x, $ext) {
public function getCleanTile($scale = 1, $format = 'png') {
switch ($format) {
case 'pbf':
header('HTTP/1.1 404 Not Found');
header('Access-Control-Allow-Origin: *');
header('HTTP/1.1 204 No Content');
header('Content-Type: application/json; charset=utf-8');
echo '{"message":"Tile does not exist"}';
break;
Expand Down Expand Up @@ -453,7 +455,7 @@ public function renderUTFGrid($tileset, $z, $y, $x, $flip = TRUE) {
$y = pow(2, $z) - 1 - $y;
}
try {
$this->DBconnect($tileset . '.mbtiles');
$this->DBconnect($this->config['mbtilesPrefix'] . $tileset . '.mbtiles');

$query = 'SELECT grid FROM grids WHERE tile_column = ' . $x . ' AND '
. 'tile_row = ' . $y . ' AND zoom_level = ' . $z;
Expand Down Expand Up @@ -618,7 +620,7 @@ public function metadataTileJson($metadata) {
$metadata['tilejson'] = '2.0.0';
$metadata['scheme'] = 'xyz';
if ($this->isDBLayer($metadata['basename'])) {
$this->DBconnect($metadata['basename'] . '.mbtiles');
$this->DBconnect($this->config['mbtilesPrefix'] . $metadata['basename'] . '.mbtiles');
$res = $this->db->query('SELECT name FROM sqlite_master WHERE name="grids";');
if ($res) {
foreach ($this->config['baseUrls'] as $url) {
Expand Down Expand Up @@ -1147,7 +1149,7 @@ public function getCapabilities() {
} else {
$srs = 'EPSG:3857';
}
$url = $this->config['protocol'] . '://' . $this->config['baseUrls'][0]
$url = $this->config['protocol'] . '://' . $this->config['baseUrls'][0]
. '/tms/' . $basename;
echo '<TileMap title="' . $title . '" srs="' . $srs
. '" type="InvertedTMS" ' . 'profile="global-' . $profile
Expand Down