From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sat, 14 May 2016 19:09:57 +0000 (+0200)
Subject: Merge remote-tracking branch 'markus/master' into master
X-Git-Tag: v3.0.0~170^2~11
X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/234b1b0293aff8fe8bd13df986805e7d1b39bca2?hp=f07d620ee8f70a91f6375fa376266242995e75dd

Merge remote-tracking branch 'markus/master' into master
---

diff --git a/lib/template/address-html.php b/lib/template/address-html.php
index b943c530..ed5c39eb 100644
--- a/lib/template/address-html.php
+++ b/lib/template/address-html.php
@@ -111,13 +111,13 @@
 	<script type="text/javascript">
 	<?php
 
-		$aNominatimMapInit = [
+		$aNominatimMapInit = array(
 			'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,
+			'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) . ';';
 
 		echo 'var nominatim_results = ' . json_encode([$aPlace], JSON_PRETTY_PRINT) . ';'; 
diff --git a/lib/template/details-html.php b/lib/template/details-html.php
index 3e9e39d7..ae36b411 100644
--- a/lib/template/details-html.php
+++ b/lib/template/details-html.php
@@ -78,18 +78,6 @@
 		return $sHTML;
 	}
 
-	// function hash_to_subtable($aAssociatedList)
-	// {
-	// 	$sHTML = '<table class="table">';
-	// 	foreach($aAssociatedList as $sKey => $sValue)
-	// 	{
-	// 		$sHTML = $sHTML . '<tr><td>'.$sKey.'</td><td class="name">'.$sValue.'</td></tr>'."\n";
-	// 	}
-	// 	$sHTML = $sHTML . '</table>';
-	// 	return $sHTML;
-	// }
-
-
 	function map_icon($sIcon)
 	{
 		if ($sIcon){
@@ -106,8 +94,6 @@
 		echo '  <td>' . $aAddressLine['class'].':'.$aAddressLine['type'] . "</td>\n";
 		echo '  <td>' . osm_link($aAddressLine) . "</td>\n";
 		echo '  <td>' . (isset($aAddressLine['admin_level']) ? $aAddressLine['admin_level'] : '') . "</td>\n";
-		// echo '<td>' . (isset($aAddressLine['rank_search_label']) ? $aAddressLine['rank_search_label'] : '') ."</td>\n";
-		// echo ', <span class="area">'.($aAddressLine['fromarea']=='t'?'Polygon':'Point').'</span>';
 		echo '  <td>' . format_distance($aAddressLine['distance'])."</td>\n";
 		echo '  <td>' . nominatim_link($aAddressLine,'details &gt;') . "</td>\n";
 		echo "</tr>\n";
@@ -187,7 +173,6 @@
 					  <td>Type</td>
 					  <td>OSM</td>
 					  <td>Admin level</td>
-					  <!-- <td>Search rank</td> -->
 					  <td>Distance</td>
 					  <td></td>
 					</tr>
@@ -264,9 +249,6 @@
 		}
 	}
 
-	// headline('Other Parts');
-	// headline('Linked To');
-
 	echo "</table>\n";
 ?>
 
@@ -277,17 +259,17 @@
 	<script type="text/javascript">
 	<?php
 
-		$aNominatimMapInit = [
+		$aNominatimMapInit = array(
 		  'tile_url' => $sTileURL,
 		  'tile_attribution' => $sTileAttribution
-		];
+		);
 		echo 'var nominatim_map_init = ' . json_encode($aNominatimMapInit, JSON_PRETTY_PRINT) . ';';
 
-		$aPlace = [
+		$aPlace = array(
 				'outlinestring' => $aPointDetails['outlinestring'],
 				'lon' => $aPointDetails['lon'],
 				'lat' => $aPointDetails['lat'],
-		];
+		);
 		echo 'var nominatim_result = ' . json_encode($aPlace, JSON_PRETTY_PRINT) . ';'; 
 
 
diff --git a/lib/template/search-html.php b/lib/template/search-html.php
index 8b995b62..dc4dcc74 100644
--- a/lib/template/search-html.php
+++ b/lib/template/search-html.php
@@ -96,13 +96,13 @@
 	<script type="text/javascript">
 	<?php
 
-		$aNominatimMapInit = [
-			'zoom' => $iZoom,
-			'lat' => $fLat,
-			'lon' => $fLon,
-			'tile_url' => $sTileURL,
-			'tile_attribution' => $sTileAttribution
-		];
+		$aNominatimMapInit = array(
+			'zoom' => CONST_Default_Zoom,
+			'lat' => CONST_Default_Lat,
+			'lon' => CONST_Default_Lon,
+			'tile_url' => CONST_Map_Tile_URL,
+			'tile_attribution' => CONST_Map_Tile_Attribution
+		);
 		echo 'var nominatim_map_init = ' . json_encode($aNominatimMapInit, JSON_PRETTY_PRINT) . ';';
 
 		echo 'var nominatim_results = ' . json_encode($aSearchResults, JSON_PRETTY_PRINT) . ';'; 
diff --git a/utils/setup.php b/utils/setup.php
index 166dfee9..b9045e70 100755
--- a/utils/setup.php
+++ b/utils/setup.php
@@ -668,7 +668,7 @@
 		@symlink(CONST_BasePath.'/website/css', $sTargetDir.'/css');
 		echo "Symlinks created\n";
 
-		$sTestFile = @file_get_contents(CONST_Website_BaseURL.'js/tiles.js');
+		$sTestFile = @file_get_contents(CONST_Website_BaseURL.'js/nominatim-ui.js');
 		if (!$sTestFile)
 		{
 			echo "\nWARNING: Unable to access the website at ".CONST_Website_BaseURL."\n";
diff --git a/website/js/nominatim-ui.js b/website/js/nominatim-ui.js
index 3e0aabd2..31044d02 100644
--- a/website/js/nominatim-ui.js
+++ b/website/js/nominatim-ui.js
@@ -118,8 +118,12 @@ jQuery(document).on('ready', function(){
 			var bounds = [[result.aBoundingBox[0]*1,result.aBoundingBox[2]*1], [result.aBoundingBox[1]*1,result.aBoundingBox[3]*1]];
 			map.fitBounds(bounds);
 			if (result.astext && result.astext.match(/(POLY)|(LINE)/) ){
-				var layer = omnivore.wkt.parse(result.astext);
-				layerGroup.addLayer(layer);
+				var geojson_layer = L.geoJson(null, {
+					// http://leafletjs.com/reference.html#geojson-style
+					style: function(feature) { return { clickable: false, color: 'blue' }; }
+				});
+				omnivore.wkt.parse(result.astext,null,geojson_layer);
+				layerGroup.addLayer(geojson_layer);
 			}
 			else {
 				// var layer = L.rectangle(bounds, {color: "#ff7800", weight: 1} );
@@ -199,9 +203,14 @@ jQuery(document).on('ready', function(){
 		map.addLayer(circle);
 
 		if ( nominatim_result.outlinestring ){
-			var outline = omnivore.wkt.parse(nominatim_result.outlinestring);
-			map.addLayer(outline);
-			map.fitBounds(outline.getBounds());
+
+			var geojson_layer = L.geoJson(null, {
+				// http://leafletjs.com/reference.html#geojson-style
+				style: function(feature) { return { clickable: false, color: 'blue' }; }
+			});
+			omnivore.wkt.parse(nominatim_result.outlinestring,null,geojson_layer);
+			layerGroup.addLayer(geojson_layer);
+			map.fitBounds(geojson_layer.getBounds());
 		} else {
 			map.setView([nominatim_result.lat,nominatim_result.lon],10);
 		}
diff --git a/website/search.php b/website/search.php
index 8b160f8f..31944974 100755
--- a/website/search.php
+++ b/website/search.php
@@ -10,11 +10,6 @@
 
 	$oDB =& getDB();
 
-	// Display defaults
-	$fLat = CONST_Default_Lat;
-	$fLon = CONST_Default_Lon;
-	$iZoom = CONST_Default_Zoom;
-
 	$oGeocode = new Geocode($oDB);
 
 	$aLangPrefOrder = getPreferredLanguages();
@@ -120,8 +115,6 @@
 	if ($sOutputFormat=='html')
 	{
 		$sDataDate = $oDB->getOne("select TO_CHAR(lastimportdate - '2 minutes'::interval,'YYYY/MM/DD HH24:MI')||' GMT' from import_status limit 1");
-		$sTileURL = CONST_Map_Tile_URL;
-		$sTileAttribution = CONST_Map_Tile_Attribution;
 	}
 	logEnd($oDB, $hLog, sizeof($aSearchResults));