diff --git a/tileserver.php b/tileserver.php
index 5540200..d3fd156 100644
--- a/tileserver.php
+++ b/tileserver.php
@@ -4,7 +4,7 @@
* TileServer.php project
* ======================
* https://github.com/klokantech/tileserver-php/
- * Copyright (C) 2014 - Klokan Technologies GmbH
+ * Copyright (C) 2016 - Klokan Technologies GmbH
*/
global $config;
@@ -143,7 +143,7 @@ class Server {
}
/**
- *
+ * Get metadata from metadataJson
* @param string $jsonFileName
* @return array
*/
@@ -166,7 +166,7 @@ class Server {
$resultdata = $result->fetchAll();
foreach ($resultdata as $r) {
- $value = preg_replace('/(\\n)+/','',$r['value']);
+ $value = preg_replace('/(\\n)+/', '', $r['value']);
$metadata[$r['name']] = addslashes($value);
}
if (!array_key_exists('minzoom', $metadata)
@@ -175,10 +175,12 @@ class Server {
// 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))
+ if (!array_key_exists('minzoom', $metadata)){
$metadata['minzoom'] = $resultdata[0]['min'];
- if (!array_key_exists('maxzoom', $metadata))
+ }
+ if (!array_key_exists('maxzoom', $metadata)){
$metadata['maxzoom'] = $resultdata[0]['max'];
+ }
}
// autodetect format using JPEG magic number FFD8
if (!array_key_exists('format', $metadata)) {
@@ -192,10 +194,10 @@ class Server {
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']));
+ $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']);
+ $s = $this->row2lat($resultdata[0]['s'] - 1, $metadata['maxzoom']);
$metadata['bounds'] = implode(',', array($w, $s, $e, $n));
}
$metadata = $this->metadataValidation($metadata);
@@ -211,8 +213,8 @@ class Server {
* @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);
+ $y = $r / pow(2, $zoom - 1 ) - 1;
+ return rad2deg(2.0 * atan(exp(3.191459196 * $y)) - 1.57079632679489661922);
}
/**
@@ -229,23 +231,25 @@ class Server {
if (!array_key_exists('profile', $metadata)) {
$metadata['profile'] = 'mercator';
}
-// TODO: detect thumb / SQL for mbtiles
- if (array_key_exists('minzoom', $metadata))
+ if (array_key_exists('minzoom', $metadata)){
$metadata['minzoom'] = intval($metadata['minzoom']);
- else
+ }else{
$metadata['minzoom'] = 0;
- if (array_key_exists('maxzoom', $metadata))
+ }
+ if (array_key_exists('maxzoom', $metadata)){
$metadata['maxzoom'] = intval($metadata['maxzoom']);
- else
+ }else{
$metadata['maxzoom'] = 18;
+ }
if (!array_key_exists('format', $metadata)) {
$metadata['format'] = 'png';
}
-
if (!array_key_exists('scale', $metadata)) {
$metadata['scale'] = 1;
}
-
+
+ // TODO: detect thumb / SQL for mbtiles
+
return $metadata;
}
@@ -277,8 +281,8 @@ class Server {
$filename = $filename . '.mbtiles';
$lastModifiedTime = filemtime($filename);
$eTag = md5($lastModifiedTime);
- header("Last-Modified: " . gmdate("D, d M Y H:i:s", $lastModifiedTime) . " GMT");
- header("Etag:" . $eTag);
+ header('Last-Modified: ' . gmdate('D, d M Y H:i:s', $lastModifiedTime) . ' GMT');
+ header('Etag:' . $eTag);
if (@strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']) == $lastModifiedTime ||
@trim($_SERVER['HTTP_IF_NONE_MATCH']) == $eTag) {
return TRUE;
@@ -356,7 +360,7 @@ class Server {
die;
} else {
//scale of tile (for retina tiles)
- $meta = json_decode(file_get_contents($tileset.'/metadata.json'));
+ $meta = json_decode(file_get_contents($tileset . '/metadata.json'));
if(!isset($meta->scale)){
$meta->scale = 1;
}
@@ -364,7 +368,7 @@ class Server {
$this->getCleanTile($meta->scale, $ext);
} else {
header('HTTP/1.1 404 Not Found');
- echo 'Server: Unknown or not specified dataset "'.$tileset.'"';
+ echo 'Server: Unknown or not specified dataset "' . $tileset . '"';
die;
}
}
@@ -483,7 +487,7 @@ class Server {
. $this->config['baseUrls'][0] . '/' . $map['basename'] . '.json
';
echo 'Bounds: ' . $extend . '
Copyright (C) 2014 - Klokan Technologies GmbH
'; + echo 'Copyright (C) 2016 - Klokan Technologies GmbH
'; echo '