make map tile layer configurable

This commit is contained in:
Marc Tobias Metten
2016-01-27 19:42:49 +01:00
parent 4cade95b24
commit 21385f5e51
8 changed files with 49 additions and 29 deletions

View File

@@ -112,9 +112,11 @@
<?php
$aNominatimMapInit = [
'zoom' => isset($_GET['zoom'])?htmlspecialchars($_GET['zoom']):NULL,
'lat' => isset($_GET['lat'] )?htmlspecialchars($_GET['lat']):NULL,
'lon' => isset($_GET['lon'] )?htmlspecialchars($_GET['lon']):NULL
'zoom' => isset($_GET['zoom']) ? htmlspecialchars($_GET['zoom']) : CONST_Default_Zoom,
'lat' => isset($_GET['lat'] ) ? htmlspecialchars($_GET['lat'] ) : CONST_Default_Lat,
'lon' => isset($_GET['lon'] ) ? htmlspecialchars($_GET['lon'] ) : CONST_Default_Lon,
'tile_url' => $sTileURL,
'tile_attribution' => $sTileAttribution
];
echo 'var nominatim_map_init = ' . json_encode($aNominatimMapInit, JSON_PRETTY_PRINT) . ';';

View File

@@ -6,7 +6,6 @@
<link href="css/details.css" rel="stylesheet" type="text/css" />
</head>
<?php include(CONST_BasePath.'/lib/template/includes/html-top-navigation.php'); ?>
<?php
@@ -114,6 +113,7 @@
<body id="details-page">
<?php include(CONST_BasePath.'/lib/template/includes/html-top-navigation.php'); ?>
<div class="container">
<div class="row">
<div class="col-sm-10">
@@ -261,13 +261,23 @@
</div>
<script type="text/javascript">
<?php
var nominatim_result = {
outlinestring: '<?php echo $aPointDetails['outlinestring'];?>',
lon: <?php echo $aPointDetails['lon'];?>,
lat: <?php echo $aPointDetails['lat'];?>,
};
$aNominatimMapInit = [
'tile_url' => $sTileURL,
'tile_attribution' => $sTileAttribution
];
echo 'var nominatim_map_init = ' . json_encode($aNominatimMapInit, JSON_PRETTY_PRINT) . ';';
$aPlace = [
'outlinestring' => $aPointDetails['outlinestring'],
'lon' => $aPointDetails['lon'],
'lat' => $aPointDetails['lat'],
];
echo 'var nominatim_result = ' . json_encode($aPlace, JSON_PRETTY_PRINT) . ';';
?>
</script>

View File

@@ -99,7 +99,9 @@
$aNominatimMapInit = [
'zoom' => $iZoom,
'lat' => $fLat,
'lon' => $fLon
'lon' => $fLon,
'tile_url' => $sTileURL,
'tile_attribution' => $sTileAttribution
];
echo 'var nominatim_map_init = ' . json_encode($aNominatimMapInit, JSON_PRETTY_PRINT) . ';';