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

Merge pull request #34 from Fil/patch-2

Browse Source 
Autodetect minzoom, maxzoom and format for mbtiles
This commit is contained in:
Dalibor Janák
2014-07-23 13:42:04 +02:00
parent f08d72262d 34ffddb765
commit b13b8d98c8
1 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
tileserver.php
View File

@@ -170,6 +170,25 @@ class Server {
$value = preg_replace('/(\\n)+/','',$r['value']); $value = preg_replace('/(\\n)+/','',$r['value']);
$metadata[$r['name']] = addslashes($value); $metadata[$r['name']] = addslashes($value);
} }
if (!array_key_exists('minzoom', $metadata)
|| !array_key_exists('maxzoom', $metadata)
) {
// autodetect minzoom and maxzoom
$result = $this->db->query('select min(zoom_level) as min, max(zoom_level) as max from tiles');
$resultdata = $result->fetchAll();
if (!array_key_exists('minzoom', $metadata))
$metadata['minzoom'] = $resultdata[0]['min'];
if (!array_key_exists('maxzoom', $metadata))
$metadata['maxzoom'] = $resultdata[0]['max'];
}
// autodetect format using JPEG magic number FFD8
if (!array_key_exists('format', $metadata)) {
$result = $this->db->query('select hex(substr(tile_data,1,2)) as magic from tiles limit 1');
$resultdata = $result->fetchAll();
$metadata['format'] = ($resultdata[0]['magic'] == 'FFD8')
? 'jpg'
: 'png';
}
$metadata = $this->metadataValidation($metadata); $metadata = $this->metadataValidation($metadata);
$mbt = explode('.', $mbt); $mbt = explode('.', $mbt);
$metadata['basename'] = $mbt[0]; $metadata['basename'] = $mbt[0];
@@ -191,8 +210,8 @@ class Server {
if (!array_key_exists('profile', $metadata)) { if (!array_key_exists('profile', $metadata)) {
$metadata['profile'] = 'mercator'; $metadata['profile'] = 'mercator';
} }
// TODO: detect format, minzoom, maxzoom, thumb // TODO: detect format, minzoom, maxzoom, thumb / scandir() for directory
// scandir() for directory / SQL for mbtiles // TODO: detect thumb / SQL for mbtiles
if (array_key_exists('minzoom', $metadata)) if (array_key_exists('minzoom', $metadata))
$metadata['minzoom'] = intval($metadata['minzoom']); $metadata['minzoom'] = intval($metadata['minzoom']);
else else
@@ -205,7 +224,7 @@ class Server {
$metadata['format'] = 'png'; $metadata['format'] = 'png';
} }
/* /*
if (!array_key_exists('thumb', $metadata )) { if (!array_key_exists('profile', $metadata )) {
$metadata['profile'] = 'mercator'; $metadata['profile'] = 'mercator';
} }
*/ */