mirror/php-tileserver
1
0
Fork 0
mirror of https://github.com/klokantech/tileserver-php.git synced 2025-08-02 20:57:29 +02:00
Code Issues Releases Wiki Activity

Implementation of MapBox vector tiles (MBTiles pbf) serving #42

Browse Source
This commit is contained in:
Petr Pridal
2015-09-05 04:44:45 +02:00
parent e66e577d5d
commit f9e801849e
1 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
tileserver.php
View File

@@ -321,8 +321,13 @@ class Server {
if ($format == 'jpg') { if ($format == 'jpg') {
$format = 'jpeg'; $format = 'jpeg';
} }
header('Access-Control-Allow-Origin: *'); if ($format == 'pbf') {
header('Content-type: application/x-protobuf');
header('Content-Encoding:gzip');
} else {
header('Content-type: image/' . $format); header('Content-type: image/' . $format);
}
header('Access-Control-Allow-Origin: *');
echo $data; echo $data;
} }
} elseif ($this->isFileLayer($tileset)) { } elseif ($this->isFileLayer($tileset)) {
@@ -339,10 +344,17 @@ class Server {
if(!isset($meta->scale)){ if(!isset($meta->scale)){
$meta->scale = 1; $meta->scale = 1;
} }
if ($ext == 'pbf') {
header('HTTP/1.1 404 Not Found');
header('Content-Type: application/json; charset=utf-8');
echo '{"message":"Tile does not exist"}';
die;
}
$this->getCleanTile($meta->scale); $this->getCleanTile($meta->scale);
} }
} else { } else {
echo 'Serverr: Unknown or not specified dataset "'.$tileset.'"'; header('HTTP/1.1 404 Not Found');
echo 'Server: Unknown or not specified dataset "'.$tileset.'"';
die; die;
} }
} }
@@ -553,6 +565,13 @@ class Json extends Server {
$metadata['grids'] = $grids; $metadata['grids'] = $grids;
} }
} }
if (array_key_exists('json', $metadata)) {
$mjson = json_decode(stripslashes($metadata['json']));
foreach ($mjson as $key => $value) {
$metadata[$key] = $value;
}
unset($metadata['json']);
}
return $metadata; return $metadata;
} }
@@ -594,7 +613,7 @@ class Json extends Server {
public function getJson() { public function getJson() {
parent::setDatasets(); parent::setDatasets();
header('Access-Control-Allow-Origin: *'); header('Access-Control-Allow-Origin: *');
header("Content-Type:application/javascript charset=utf-8"); header("Content-Type: application/json; charset=utf-8");
if ($this->callback !== 'grid') { if ($this->callback !== 'grid') {
echo $this->callback . '(' . $this->createJson($this->layer) . ');'; die; echo $this->callback . '(' . $this->createJson($this->layer) . ');'; die;
} else { } else {
@@ -608,7 +627,7 @@ class Json extends Server {
public function getJsonp() { public function getJsonp() {
parent::setDatasets(); parent::setDatasets();
header('Access-Control-Allow-Origin: *'); header('Access-Control-Allow-Origin: *');
header("Content-Type:text/javascript charset=utf-8"); header("Content-Type: application/javascript; charset=utf-8");
echo $this->callback . '(' . $this->createJson($this->layer) . ');'; echo $this->callback . '(' . $this->createJson($this->layer) . ');';
} }