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

Utfgrid empty response bug fixed (related #62)

Browse Source
This commit is contained in:
Dalibor Janák
2016-01-26 22:55:34 +01:00
parent f5408fd108
commit 6b5933e21f
1 changed files with 48 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
tileserver.php
View File

@@ -406,20 +406,22 @@ class Server {
} }
try { try {
$this->DBconnect($tileset . '.mbtiles'); $this->DBconnect($tileset . '.mbtiles');
$result = $this->db->query('SELECT grid FROM grids WHERE tile_column = ' . $x . ' AND tile_row = ' . $y . ' AND zoom_level = ' . $z);
if (!isset($result) || $result === FALSE) {
header('Access-Control-Allow-Origin: *');
echo '{}';
die;
} else {
$data = $result->fetchColumn();
$grid = gzuncompress($data); $query = 'SELECT grid FROM grids WHERE tile_column = ' . $x . ' AND '
. 'tile_row = ' . $y . ' AND zoom_level = ' . $z;
$result = $this->db->query($query);
$data = $result->fetch(PDO::FETCH_ASSOC);
if ($data !== FALSE) {
$grid = gzuncompress($data['grid']);
$grid = substr(trim($grid), 0, -1); $grid = substr(trim($grid), 0, -1);
//adds legend (data) to output //adds legend (data) to output
$grid .= ',"data":{'; $grid .= ',"data":{';
$result = $this->db->query('SELECT key_name as key, key_json as json FROM grid_data WHERE zoom_level=' . $z . ' and tile_column=' . $x . ' and tile_row=' . $y); $kquery = 'SELECT key_name as key, key_json as json FROM grid_data '
. 'WHERE zoom_level=' . $z . ' and '
. 'tile_column=' . $x . ' and tile_row=' . $y;
$result = $this->db->query($kquery);
while ($r = $result->fetch(PDO::FETCH_ASSOC)) { while ($r = $result->fetch(PDO::FETCH_ASSOC)) {
$grid .= '"' . $r['key'] . '":' . $r['json'] . ','; $grid .= '"' . $r['key'] . '":' . $r['json'] . ',';
} }
@@ -427,14 +429,18 @@ class Server {
header('Access-Control-Allow-Origin: *'); header('Access-Control-Allow-Origin: *');
if (isset($_GET['callback']) && !empty($_GET['callback'])) { if (isset($_GET['callback']) && !empty($_GET['callback'])) {
header("Content-Type:text/javascript charset=utf-8"); header('Content-Type:text/javascript charset=utf-8');
echo $_GET['callback'] . '(' . $grid . ');'; echo $_GET['callback'] . '(' . $grid . ');';
} else { } else {
header("Content-Type:text/javascript; charset=utf-8"); header('Content-Type:text/javascript; charset=utf-8');
echo $grid; echo $grid;
} }
} else {
header('Access-Control-Allow-Origin: *');
echo '{}';
die;
} }
} catch (PDOException $e) { } catch (Exception $e) {
header('Content-type: text/plain'); header('Content-type: text/plain');
print 'Error querying the database: ' . $e->getMessage(); print 'Error querying the database: ' . $e->getMessage();
} }