use new geo server for tiles

This commit is contained in:
2019-03-24 00:05:14 +01:00
parent 1dea80d6a1
commit b4b6cea6eb
4 changed files with 7 additions and 26 deletions

View File

@@ -41,7 +41,6 @@ class Spot extends Main
array('name'=>'feed', 'project'=>true),
array('name'=>'project', 'project'=>true),
array('name'=>'picture', 'project'=>true),
array('name'=>'wmts', 'project'=>false),
array('name'=>'converter', 'project'=>true)
);
parent::__construct($oClassManagement, $sProcessPage, $asClasses);
@@ -121,11 +120,11 @@ class Spot extends Main
array(
'vars' => array(
'chunk_size' => self::FEED_CHUNK_SIZE,
'mapbox_key' => Settings::MAPBOX_KEY,
'default_project_codename' => $this->oProject->getProjectCodeName(),
'projects' => $this->oProject->getProjects()
),
'consts' => array(
'geo_server' => Settings::GEO_SERVER,
'modes' => Project::MODES,
'site_timezone' => Settings::TIMEZONE,
'site_timezone_desc' => self::getTimeZoneDesc(Settings::TIMEZONE)
@@ -133,7 +132,7 @@ class Spot extends Main
),
'index',
array(
'host_url' => Settings::HOST_SERVER,
'host_url' => $this->asContext['serv_name'],
'filepath_css' => self::addTimestampToFilePath('style/spot.css'),
'filepath_js_d3' => self::addTimestampToFilePath('script/d3.min.js'),
'filepath_js_leaflet' => self::addTimestampToFilePath('script/leaflet.min.js'),
@@ -328,15 +327,6 @@ class Spot extends Main
return self::getJsonResult(true, '');
}
public function getTile($sMapId, $iX, $iY, $iZ)
{
if(isset($_SERVER['HTTP_REFERER']) && $_SERVER['HTTP_REFERER'] == $this->asContext['serv_name'] || Settings::DEBUG) {
$oWmts = new Wmts($sMapId);
return $oWmts->pushTile($iX, $iY, $iZ);
}
else self::goTo403();
}
public static function DecToDMS($dValue, $sType='lat') {
if($sType=='lat') $sDirection = ($dValue >= 0)?'N':'S';
else $sDirection = ($dValue >= 0)?'E':'W';