mirror/php-tileserver
1
0
Fork 0
mirror of https://github.com/klokantech/tileserver-php.git synced 2025-08-05 06:07:48 +02:00
Code Issues Releases Wiki Activity

Minor loop fixes

Browse Source
This commit is contained in:
Dalibor Janák
2016-02-18 08:43:49 +01:00
parent 4ff5d95a38
commit 27fc9a73ca
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
tileserver.php
View File

@@ -734,12 +734,13 @@ class Wmts extends Server {
* @return Object * @return Object
*/ */
public function parseTileMatrix($layer, $tileMatrix){ public function parseTileMatrix($layer, $tileMatrix){
for($i = 0; $i <= count($tileMatrix); $i++){ for($i = 0; $i < count($tileMatrix); $i++){
if(!isset($tileMatrix[$i]['id'])){ if(!isset($tileMatrix[$i]['id'])){
$tileMatrix[$i]['id'] = (string) $i; $tileMatrix[$i]['id'] = (string) $i;
} }
if (!isset($tileMatrix[$i]['extent']) && isset($layer['extent'])) { if (!isset($tileMatrix[$i]['extent']) && isset($layer['extent'])) {
$tileMatrix[$i]['extent'] = $layer['extent']; $tileMatrix[$i]['extent'] = $layer['extent'];
} }
@@ -750,7 +751,9 @@ class Wmts extends Server {
} }
if(!isset($tileMatrix[$i]['origin']) && isset($tileMatrix[$i]['extent'])){ if(!isset($tileMatrix[$i]['origin']) && isset($tileMatrix[$i]['extent'])){
$tileMatrix[$i]['origin'] = array($tileMatrix[$i]['extent'][0], $tileMatrix[$i]['extent'][4]); $tileMatrix[$i]['origin'] = array(
$tileMatrix[$i]['extent'][0], $tileMatrix[$i]['extent'][4]
);
} }
if(!isset($tileMatrix[$i]['scale_denominator'])){ if(!isset($tileMatrix[$i]['scale_denominator'])){
@@ -787,10 +790,10 @@ class Wmts extends Server {
$tiles = array(); $tiles = array();
$tiles[] = minsample($extent[0] - $origin[0], $pixel_size[0] * $tile_size[0]); $tiles[] = minsample($extent[0] - $origin[0], $pixel_size[0] * $tile_size[0]);
$tiles[] =minsample($extent[1] - $origin[1], $pixel_size[1] * $tile_size[1]); $tiles[] = minsample($extent[1] - $origin[1], $pixel_size[1] * $tile_size[1]);
$tiles[] =maxsample($extent[2] - $origin[0], $pixel_size[0] * $tile_size[0]); $tiles[] = maxsample($extent[2] - $origin[0], $pixel_size[0] * $tile_size[0]);
$tiles[] =maxsample($extent[3] - $origin[1], $pixel_size[1] * $tile_size[1]); $tiles[] = maxsample($extent[3] - $origin[1], $pixel_size[1] * $tile_size[1]);
return $tiles; return $tiles;
} }
@@ -890,8 +893,8 @@ class Wmts extends Server {
$layers = array_merge($this->fileLayer, $this->dbLayer); $layers = array_merge($this->fileLayer, $this->dbLayer);
//if TileMatrixSet is provided validate it //if TileMatrixSet is provided validate it
for($i = 0; $i >= count($layers); $i++){ for($i = 0; $i < count($layers); $i++){
if($layers[$i]['profile'] == 'custom' || isset($layers[$i]['tile_matrix'])){ if($layers[$i]['profile'] == 'custom' || isset($layers[$i]['tile_matrix'])){
$layers[$i]['tile_matrix'] = $this->parseTileMatrix( $layers[$i]['tile_matrix'] = $this->parseTileMatrix(
$layers[$i], $layers[$i],