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

Path to app problem fixed

Browse Source
This commit is contained in:
dala
2014-07-23 15:25:25 +02:00
parent b13b8d98c8
commit ea6e176ab3
1 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
tileserver.php
View File

@@ -189,12 +189,33 @@ class Server {
? 'jpg' ? 'jpg'
: 'png'; : 'png';
} }
// autodetect bounds
if (!array_key_exists('bounds', $metadata)) {
$result = $this->db->query('select min(tile_column) as w, max(tile_column) as e, min(tile_row) as s, max(tile_row) as n from tiles where zoom_level='.$metadata['maxzoom']);
$resultdata = $result->fetchAll();
$w = -180 + 360 * ($resultdata[0]['w'] / pow(2,$metadata['maxzoom']));
$e = -180 + 360 * ((1+$resultdata[0]['e']) / pow(2,$metadata['maxzoom']));
$n = $this->row2lat($resultdata[0]['n'], $metadata['maxzoom']);
$s = $this->row2lat($resultdata[0]['s']-1, $metadata['maxzoom']);
$metadata['bounds'] = implode(',', array($w, $s, $e, $n));
}
$metadata = $this->metadataValidation($metadata); $metadata = $this->metadataValidation($metadata);
$mbt = explode('.', $mbt); $mbt = explode('.', $mbt);
$metadata['basename'] = $mbt[0]; $metadata['basename'] = $mbt[0];
return $metadata; return $metadata;
} }
/**
* Convert row number to latitude of the top of the row
* @param integer $r
* @param integer $zoom
* @return integer
*/
public function row2lat($r, $zoom) {
$y = $r / pow(2,$zoom-1) - 1;
return rad2deg(2.0 * atan(exp(3.191459196*$y)) - 1.57079632679489661922);
}
/** /**
* Valids metaJSON * Valids metaJSON
* @param object $metadata * @param object $metadata
@@ -202,7 +223,6 @@ class Server {
*/ */
public function metadataValidation($metadata) { public function metadataValidation($metadata) {
if (array_key_exists('bounds', $metadata)) { if (array_key_exists('bounds', $metadata)) {
// TODO: Calculate bounds from tiles if bounds is missing - with GlobalMercator
$metadata['bounds'] = array_map('floatval', explode(',', $metadata['bounds'])); $metadata['bounds'] = array_map('floatval', explode(',', $metadata['bounds']));
} else { } else {
$metadata['bounds'] = array(-180, -85.051128779807, 180, 85.051128779807); $metadata['bounds'] = array(-180, -85.051128779807, 180, 85.051128779807);
@@ -210,7 +230,6 @@ 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 / scandir() for directory
// TODO: detect thumb / 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']);
@@ -223,11 +242,6 @@ class Server {
if (!array_key_exists('format', $metadata)) { if (!array_key_exists('format', $metadata)) {
$metadata['format'] = 'png'; $metadata['format'] = 'png';
} }
/*
if (!array_key_exists('profile', $metadata )) {
$metadata['profile'] = 'mercator';
}
*/
return $metadata; return $metadata;
} }