From 5c43821ebe5de5892dcc4aa482d02c72e86bf637 Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Wed, 1 Feb 2012 21:13:05 +0000
Subject: [PATCH 01/16] munin graph for the import lag

---
 munin/nominatim_importlag | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100755 munin/nominatim_importlag

diff --git a/munin/nominatim_importlag b/munin/nominatim_importlag
new file mode 100755
index 00000000..8d69f3ce
--- /dev/null
+++ b/munin/nominatim_importlag
@@ -0,0 +1,27 @@
+#!/bin/sh
+#
+# Plugin to monitor the age of the imported data in the rendering db
+#
+# Parameters: 
+#
+#       config   (required)
+#       autoconf (optional - used by munin-config)
+#
+ 
+if [ "$1" = "config" ]; then
+ 
+        echo 'graph_title Data import lag' 
+        echo 'graph_args --base 1000 -l 0' 
+        echo 'graph_vlabel minutes' 
+        echo 'graph_category nominatim' 
+        echo 'age.label DB import age' 
+        echo 'age.type GAUGE' 
+        echo 'age.cdef age,60,/'
+        exit 0
+fi
+ 
+
+delay=`psql -d nominatim -c 'copy (select extract(epoch from now()-lastimportdate)::int from import_status) to stdout'`
+ 
+ 
+echo "age.value $delay"
-- 
2.39.5


From d3c883f1b5e1db91997ec5c4fe4a631e7135dc3f Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sat, 4 Feb 2012 07:53:02 +0000
Subject: [PATCH 02/16] remove trailing commas in HTML to make IE happy (thanks
 to TomH)

---
 lib/template/details-html.php | 4 ++--
 lib/template/search-html.php  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/template/details-html.php b/lib/template/details-html.php
index a02d3abf..721af44d 100644
--- a/lib/template/details-html.php
+++ b/lib/template/details-html.php
@@ -52,7 +52,7 @@ body {
                 numZoomLevels: 19,
                 units: 'm',
                 projection: new OpenLayers.Projection("EPSG:900913"),
-                displayProjection: new OpenLayers.Projection("EPSG:4326"),
+                displayProjection: new OpenLayers.Projection("EPSG:4326")
             	} );
 			map.addLayer(new OpenLayers.Layer.OSM.<?php echo CONST_Tile_Default;?>("Default"));
 
@@ -69,7 +69,7 @@ body {
 				fillColor: "#F0F7FF",
 				strokeWidth: 2,
 				strokeOpacity: 0.75,
-				fillOpacity: 0.75,
+				fillOpacity: 0.75
 			};
 			var proj_EPSG4326 = new OpenLayers.Projection("EPSG:4326");
 			var proj_map = map.getProjectionObject();
diff --git a/lib/template/search-html.php b/lib/template/search-html.php
index f7013793..a9d328a8 100644
--- a/lib/template/search-html.php
+++ b/lib/template/search-html.php
@@ -290,7 +290,7 @@ form{
                 projection: new OpenLayers.Projection("EPSG:900913"),
                 displayProjection: new OpenLayers.Projection("EPSG:4326"),
                 eventListeners: {
-									"moveend": mapEventMove,
+									"moveend": mapEventMove
 								}
             	} );
 			map.addLayer(new OpenLayers.Layer.OSM.<?php echo CONST_Tile_Default;?>("Default"));
-- 
2.39.5


From c9d51fe7b8c915e898d95af57dc2c013b9cf84a0 Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sat, 4 Feb 2012 08:20:51 +0000
Subject: [PATCH 03/16] remove unused protolib

---
 lib/template/details-html.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/template/details-html.php b/lib/template/details-html.php
index 721af44d..eca76c7e 100644
--- a/lib/template/details-html.php
+++ b/lib/template/details-html.php
@@ -33,7 +33,6 @@ body {
     </style>
 	<script src="js/OpenLayers.js"></script>
 	<script src="js/tiles.js"></script>
-	<script src="prototype-1.6.0.3.js"></script>
 	<script type="text/javascript">
         
 		var map;
-- 
2.39.5


From 3abbeb5f081c648a6f2fe0213663627ad6b37198 Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Mon, 6 Feb 2012 22:26:08 +0000
Subject: [PATCH 04/16] don't print address details if they are not requested

---
 lib/template/address-xml.php | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/lib/template/address-xml.php b/lib/template/address-xml.php
index d6061e3d..185601ad 100644
--- a/lib/template/address-xml.php
+++ b/lib/template/address-xml.php
@@ -29,15 +29,17 @@
 		if (isset($aPlace['lon'])) echo ' lon="'.htmlspecialchars($aPlace['lon']).'"';
 		echo ">".htmlspecialchars($aPlace['langaddress'])."</result>";
 
-		echo "<addressparts>";
-		foreach($aAddress as $sKey => $sValue)
-		{
-			$sKey = str_replace(' ','_',$sKey);
-			echo "<$sKey>";
-			echo htmlspecialchars($sValue);
-			echo "</$sKey>";
-		}
-		echo "</addressparts>";
+        if ($bShowAddressDetails) {
+			echo "<addressparts>";
+			foreach($aAddress as $sKey => $sValue)
+			{
+				$sKey = str_replace(' ','_',$sKey);
+				echo "<$sKey>";
+				echo htmlspecialchars($sValue);
+				echo "</$sKey>";
+			}
+			echo "</addressparts>";
+        }
 	}
 	
 	echo "</reversegeocode>";
-- 
2.39.5


From 7239687e5b7fab3c48a567cfee811fc8e9d1f2e8 Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Mon, 6 Feb 2012 23:14:21 +0000
Subject: [PATCH 05/16] avoid warnings when geometry of object cannot be
 determined

---
 lib/template/details-html.php | 2 ++
 lib/template/search-xml.php   | 2 +-
 website/search.php            | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/template/details-html.php b/lib/template/details-html.php
index eca76c7e..9124d594 100644
--- a/lib/template/details-html.php
+++ b/lib/template/details-html.php
@@ -74,10 +74,12 @@ body {
 			var proj_map = map.getProjectionObject();
 			var latlon;
 <?php
+if (isset($aPolyPoints)) {
 foreach($aPolyPoints as $aPolyPoint)
 {
 	echo "                        pointList.push(new OpenLayers.Geometry.Point(".$aPolyPoint[1].",".$aPolyPoint[2]."));\n";
 }
+}
 ?>
 			var linearRing = new OpenLayers.Geometry.LinearRing(pointList).transform(proj_EPSG4326, proj_map);;
 			var polygonFeature = new OpenLayers.Feature.Vector(new OpenLayers.Geometry.Polygon([linearRing]),null,style);
diff --git a/lib/template/search-xml.php b/lib/template/search-xml.php
index b15c9a2e..6e48be4c 100644
--- a/lib/template/search-xml.php
+++ b/lib/template/search-xml.php
@@ -42,7 +42,7 @@
 			echo ','.$aResult['aBoundingBox'][3];
 			echo '"';
 
-			if ($bShowPolygons)
+			if ($bShowPolygons && isset($aResult['aPolyPoints']))
 			{
 				echo ' polygonpoints=\'';
 				echo javascript_renderData($aResult['aPolyPoints']);
diff --git a/website/search.php b/website/search.php
index 4a75c768..7169c829 100755
--- a/website/search.php
+++ b/website/search.php
@@ -1161,7 +1161,7 @@
 				}
 
 				// Output data suitable for display (points and a bounding box)
-				if ($bShowPolygons)
+				if ($bShowPolygons && isset($aPolyPoints))
 				{
 					$aResult['aPolyPoints'] = array();
 					foreach($aPolyPoints as $aPoint)
-- 
2.39.5


From 8c7bd6beabb9b877a155c554147f4a3ce8378e7e Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Fri, 10 Feb 2012 21:01:35 +0000
Subject: [PATCH 06/16] during initial setup defer creation of non-vital until
 after nominatim indexing, analyse DB during nominatim indexing so the query
 planer uses indexes correctly

---
 sql/indices.src.sql    | 28 ++++++++++++++++++++++++++++
 sql/partitions.src.sql |  5 -----
 sql/tables.sql         | 19 +------------------
 utils/setup.php        | 41 ++++++++++++++++++++++++++++++++++++++---
 4 files changed, 67 insertions(+), 26 deletions(-)
 create mode 100644 sql/indices.src.sql

diff --git a/sql/indices.src.sql b/sql/indices.src.sql
new file mode 100644
index 00000000..1664a96b
--- /dev/null
+++ b/sql/indices.src.sql
@@ -0,0 +1,28 @@
+CREATE INDEX idx_word_word_id on word USING BTREE (word_id);
+
+CREATE INDEX search_name_name_vector_idx ON search_name USING GIN (name_vector) WITH (fastupdate = off);
+CREATE INDEX searchnameplacesearch_search_nameaddress_vector_idx ON search_name USING GIN (nameaddress_vector) WITH (fastupdate = off);
+CREATE INDEX idx_search_name_centroid ON search_name USING GIST (centroid);
+
+CREATE INDEX idx_place_addressline_address_place_id on place_addressline USING BTREE (address_place_id);
+
+CREATE INDEX idx_place_boundingbox_place_id on place_boundingbox USING BTREE (place_id);
+CREATE INDEX idx_place_boundingbox_outline ON place_boundingbox USING GIST (outline);
+
+DROP INDEX IF EXISTS idx_placex_rank_search;
+CREATE INDEX idx_placex_rank_search ON placex USING BTREE (rank_search);
+CREATE INDEX idx_placex_rank_address ON placex USING BTREE (rank_address);
+CREATE INDEX idx_placex_pendingsector ON placex USING BTREE (rank_search,geometry_sector) where indexed_status > 0;
+CREATE INDEX idx_placex_parent_place_id ON placex USING BTREE (parent_place_id) where parent_place_id IS NOT NULL;
+CREATE INDEX idx_placex_interpolation ON placex USING BTREE (geometry_sector) where indexed_status > 0 and class='place' and type='houses';
+CREATE INDEX idx_placex_sector ON placex USING BTREE (geometry_sector,rank_address,osm_type,osm_id);
+
+CREATE INDEX idx_location_area_country_place_id ON location_area_country USING BTREE (place_id);
+
+CREATE INDEX idx_search_name_country_centroid ON search_name_country USING GIST (centroid);
+CREATE INDEX idx_search_name_country_nameaddress_vector ON search_name_country USING GIN (nameaddress_vector) WITH (fastupdate = off);
+
+-- start
+CREATE INDEX idx_search_name_-partition-_nameaddress_vector ON search_name_-partition- USING GIN (nameaddress_vector) WITH (fastupdate = off);
+CREATE INDEX idx_location_property_-partition-_centroid ON location_property_-partition- USING GIST (centroid);
+-- end
diff --git a/sql/partitions.src.sql b/sql/partitions.src.sql
index b4177a02..df4b3b16 100644
--- a/sql/partitions.src.sql
+++ b/sql/partitions.src.sql
@@ -14,14 +14,11 @@ create type nearfeature as (
 );
 
 CREATE TABLE location_area_country () INHERITS (location_area_large);
-CREATE INDEX idx_location_area_country_place_id ON location_area_country USING BTREE (place_id);
 CREATE INDEX idx_location_area_country_geometry ON location_area_country USING GIST (geometry);
 
 CREATE TABLE search_name_country () INHERITS (search_name_blank);
 CREATE INDEX idx_search_name_country_place_id ON search_name_country USING BTREE (place_id);
-CREATE INDEX idx_search_name_country_centroid ON search_name_country USING GIST (centroid);
 CREATE INDEX idx_search_name_country_name_vector ON search_name_country USING GIN (name_vector) WITH (fastupdate = off);
-CREATE INDEX idx_search_name_country_nameaddress_vector ON search_name_country USING GIN (nameaddress_vector) WITH (fastupdate = off);
 
 -- start
 CREATE TABLE location_area_large_-partition- () INHERITS (location_area_large);
@@ -32,13 +29,11 @@ CREATE TABLE search_name_-partition- () INHERITS (search_name_blank);
 CREATE INDEX idx_search_name_-partition-_place_id ON search_name_-partition- USING BTREE (place_id);
 CREATE INDEX idx_search_name_-partition-_centroid ON search_name_-partition- USING GIST (centroid);
 CREATE INDEX idx_search_name_-partition-_name_vector ON search_name_-partition- USING GIN (name_vector) WITH (fastupdate = off);
-CREATE INDEX idx_search_name_-partition-_nameaddress_vector ON search_name_-partition- USING GIN (nameaddress_vector) WITH (fastupdate = off);
 
 CREATE TABLE location_property_-partition- () INHERITS (location_property);
 CREATE INDEX idx_location_property_-partition-_place_id ON location_property_-partition- USING BTREE (place_id);
 CREATE INDEX idx_location_property_-partition-_parent_place_id ON location_property_-partition- USING BTREE (parent_place_id);
 CREATE INDEX idx_location_property_-partition-_housenumber_parent_place_id ON location_property_-partition- USING BTREE (parent_place_id, housenumber);
---CREATE INDEX idx_location_property_-partition-_centroid ON location_property_-partition- USING GIST (centroid);
 
 CREATE TABLE location_road_-partition- (
   partition integer,
diff --git a/sql/tables.sql b/sql/tables.sql
index 78de9e8c..19d8c084 100644
--- a/sql/tables.sql
+++ b/sql/tables.sql
@@ -78,7 +78,6 @@ CREATE TABLE word (
   operator TEXT
   );
 SELECT AddGeometryColumn('word', 'location', 4326, 'GEOMETRY', 2);
-CREATE INDEX idx_word_word_id on word USING BTREE (word_id);
 CREATE INDEX idx_word_word_token on word USING BTREE (word_token);
 --CREATE INDEX idx_word_trigram ON word USING gin(word_trigram gin_trgm_ops) WITH (fastupdate = off);
 GRANT SELECT ON word TO "www-data" ;
@@ -138,9 +137,6 @@ SELECT AddGeometryColumn('search_name_blank', 'centroid', 4326, 'GEOMETRY', 2);
 
 drop table IF EXISTS search_name;
 CREATE TABLE search_name () INHERITS (search_name_blank);
-CREATE INDEX search_name_name_vector_idx ON search_name USING GIN (name_vector) WITH (fastupdate = off);
-CREATE INDEX searchnameplacesearch_search_nameaddress_vector_idx ON search_name USING GIN (nameaddress_vector) WITH (fastupdate = off);
-CREATE INDEX idx_search_name_centroid ON search_name USING GIST (centroid);
 CREATE INDEX idx_search_name_place_id ON search_name USING BTREE (place_id);
 
 drop table IF EXISTS place_addressline;
@@ -153,7 +149,6 @@ CREATE TABLE place_addressline (
   cached_rank_address integer
   );
 CREATE INDEX idx_place_addressline_place_id on place_addressline USING BTREE (place_id);
-CREATE INDEX idx_place_addressline_address_place_id on place_addressline USING BTREE (address_place_id);
 
 drop table IF EXISTS place_boundingbox CASCADE;
 CREATE TABLE place_boundingbox (
@@ -165,9 +160,7 @@ CREATE TABLE place_boundingbox (
   numfeatures integer,
   area float
   );
-CREATE INDEX idx_place_boundingbox_place_id on place_boundingbox USING BTREE (place_id);
 SELECT AddGeometryColumn('place_boundingbox', 'outline', 4326, 'GEOMETRY', 2);
-CREATE INDEX idx_place_boundingbox_outline ON place_boundingbox USING GIST (outline);
 GRANT SELECT on place_boundingbox to "www-data" ;
 GRANT INSERT on place_boundingbox to "www-data" ;
 
@@ -221,23 +214,13 @@ CREATE TABLE placex (
 SELECT AddGeometryColumn('placex', 'geometry', 4326, 'GEOMETRY', 2);
 CREATE UNIQUE INDEX idx_place_id ON placex USING BTREE (place_id);
 CREATE INDEX idx_placex_osmid ON placex USING BTREE (osm_type, osm_id);
-CREATE INDEX idx_placex_rank_search ON placex USING BTREE (rank_search);
-CREATE INDEX idx_placex_rank_address ON placex USING BTREE (rank_address);
+CREATE INDEX idx_placex_rank_search ON placex USING BTREE (rank_search, geometry_sector);
 CREATE INDEX idx_placex_geometry ON placex USING GIST (geometry);
 
 --CREATE INDEX idx_placex_indexed ON placex USING BTREE (indexed);
 
-CREATE INDEX idx_placex_pending ON placex USING BTREE (rank_search) where indexed_status > 0;
-CREATE INDEX idx_placex_pendingsector ON placex USING BTREE (rank_search,geometry_sector) where indexed_status > 0;
-
 --CREATE INDEX idx_placex_pendingbylatlon ON placex USING BTREE (geometry_index(geometry_sector,indexed,name),rank_search)  where geometry_index(geometry_sector,indexed,name) IS NOT NULL;
 
-CREATE INDEX idx_placex_parent_place_id ON placex USING BTREE (parent_place_id) where parent_place_id IS NOT NULL;
-CREATE INDEX idx_placex_interpolation ON placex USING BTREE (geometry_sector) where indexed_status > 0 and class='place' and type='houses';
-
-CREATE INDEX idx_placex_sector ON placex USING BTREE (geometry_sector,rank_address,osm_type,osm_id);
-CLUSTER placex USING idx_placex_sector;
-
 DROP SEQUENCE seq_place;
 CREATE SEQUENCE seq_place start 1;
 GRANT SELECT on placex to "www-data" ;
diff --git a/utils/setup.php b/utils/setup.php
index b0eecfc8..0521b15d 100755
--- a/utils/setup.php
+++ b/utils/setup.php
@@ -30,6 +30,7 @@
 		array('osmosis-init-date', '', 0, 1, 1, 1, 'string', 'Generate default osmosis configuration'),
 		array('index', '', 0, 1, 0, 0, 'bool', 'Index the data'),
 		array('index-output', '', 0, 1, 1, 1, 'string', 'File to dump index information to'),
+		array('create-search-indices', '', 0, 1, 0, 0, 'bool', 'Create additional indices required for search and update'),
 		array('create-website', '', 0, 1, 1, 1, 'realpath', 'Create symlinks to setup web directory'),
 	);
 	getCmdOpt($_SERVER['argv'], $aCMDOptions, $aCMDResult, true, true);
@@ -107,7 +108,6 @@
 		$osm2pgsql = CONST_Osm2pgsql_Binary;
 		if (!file_exists($osm2pgsql)) fail("please download and build osm2pgsql");
 		passthru($osm2pgsql.' -lsc -O gazetteer -C 12000 --hstore -d '.$aDSNInfo['database'].' '.$aCMDResult['osm-file']);
-        pgsqlRunScript('ANALYSE');
 
 		$oDB =& getDB();
 		$x = $oDB->getRow('select * from place limit 1');
@@ -241,6 +241,8 @@
 			echo '.';
 		}
 		echo "\n";
+		echo "Reanalysing database...\n";
+		pgsqlRunScript('ANALYSE');
 	}
 
 	if ($aCMDResult['create-roads'])
@@ -344,7 +346,7 @@
 		if (!pg_query($oDB->connection, $sSQL)) fail(pg_last_error($oDB->connection));
 	}
 
-	if (($aCMDResult['osmosis-init'] || $aCMDResult['all']) && isset($aCMDResult['osmosis-init-date']))
+	if ($aCMDResult['osmosis-init'] && isset($aCMDResult['osmosis-init-date']))
 	{
 		$bDidSomething = true;
 
@@ -365,7 +367,40 @@
 		$bDidSomething = true;
 		$sOutputFile = '';
 		if (isset($aCMDResult['index-output'])) $sOutputFile = ' -F '.$aCMDResult['index-output'];
-		passthru(CONST_BasePath.'/nominatim/nominatim -i -d '.$aDSNInfo['database'].' -t '.$iInstances.$sOutputFile);
+		$sBaseCmd = CONST_BasePath.'/nominatim/nominatim -i -d '.$aDSNInfo['database'].' -t '.$iInstances.$sOutputFile;
+		passthru($sBaseCmd.' -R 4');
+		pgsqlRunScript('ANALYSE');
+		passthru($sBaseCmd.' -r 5 -R 25');
+		pgsqlRunScript('ANALYSE');
+		passthru($sBaseCmd.' -r 26');
+	}
+
+	if ($aCMDResult['create-search-indices'] || $aCMDResult['all'])
+	{
+		echo "Search indices\n";
+		$bDidSomething = true;
+		$oDB =& getDB();
+		$sSQL = 'select partition from country_name order by country_code';
+		$aPartitions = $oDB->getCol($sSQL);
+		if (PEAR::isError($aPartitions))
+		{
+			fail($aPartitions->getMessage());
+		}
+		$aPartitions[] = 0;
+
+		$sTemplate = file_get_contents(CONST_BasePath.'/sql/indices.src.sql');
+		preg_match_all('#^-- start(.*?)^-- end#ms', $sTemplate, $aMatches, PREG_SET_ORDER);
+		foreach($aMatches as $aMatch)
+		{
+			$sResult = '';
+			foreach($aPartitions as $sPartitionName)
+			{
+				$sResult .= str_replace('-partition-', $sPartitionName, $aMatch[1]);
+			}
+			$sTemplate = str_replace($aMatch[0], $sResult, $sTemplate);
+		}
+
+		pgsqlRunScript($sTemplate);
 	}
 
 	if (isset($aCMDResult['create-website']))
-- 
2.39.5


From e081983bcd36e396cebfe2259815a2358741d60a Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sat, 11 Feb 2012 09:19:42 +0000
Subject: [PATCH 07/16] enable exact search of GB postcodes in aux postcode
 data, partial search still disabled due to performance problems

---
 lib/lib.php        | 6 +++++-
 website/search.php | 3 +--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/lib.php b/lib/lib.php
index 20b1f8ce..d04c191b 100644
--- a/lib/lib.php
+++ b/lib/lib.php
@@ -179,6 +179,10 @@
 			return array(array('lat' => $aNearPostcodes[0]['lat'], 'lon' => $aNearPostcodes[0]['lon'], 'radius' => 0.005));
 		}
 
+		return false;
+
+		/* partial search disabled because it sequentially scans placex
+		
 		$sSQL = 'select substring(upper(postcode) from \'^[A-Z][A-Z]?[0-9][0-9A-Z]? [0-9]([A-Z][A-Z])$\'),ST_X(ST_Centroid(geometry)) as lon,ST_Y(ST_Centroid(geometry)) as lat from placex where country_code::text = \'gb\'::text AND substring(postcode from \'^([A-Z][A-Z]?[0-9][0-9A-Z]? [0-9])[A-Z][A-Z]$\') = \''.$sPostcodeSector.'\' and class=\'place\' and type=\'postcode\' ';
 		$sSQL .= ' union ';
 		$sSQL .= 'select substring(upper(postcode) from \'^[A-Z][A-Z]?[0-9][0-9A-Z]? [0-9]([A-Z][A-Z])$\'),ST_X(ST_Centroid(geometry)) as lon,ST_Y(ST_Centroid(geometry)) as lat from gb_postcode where substring(postcode from \'^([A-Z][A-Z]?[0-9][0-9A-Z]? [0-9])[A-Z][A-Z]$\') = \''.$sPostcodeSector.'\'';
@@ -217,7 +221,7 @@
 			return array(array('lat' => $fLat, 'lon' => $fLon, 'radius' => $fRadius));
 		}
 		return false;
-
+		*/
 		/*
 			$fTotalFac is a suprisingly good indicator of accuracy
 			$iZoom = 18 + round(log($fTotalFac,32));
diff --git a/website/search.php b/website/search.php
index 7169c829..37ddd23c 100755
--- a/website/search.php
+++ b/website/search.php
@@ -354,7 +354,7 @@
 				}
 			}
 			if ($bSuggestion) $sSuggestion = join(', ',$aSuggestion);
-/*
+
 			// Try and calculate GB postcodes we might be missing
 			foreach($aTokens as $sToken)
 			{
@@ -372,7 +372,6 @@
 					}
 				}
 			}
-*/
 
 			foreach($aTokens as $sToken)
 			{
-- 
2.39.5


From b07185c93450d097c6e3428f3c32475c69f21313 Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sun, 12 Feb 2012 10:12:51 +0000
Subject: [PATCH 08/16] move place=isolated_dwelling up to the same rank as
 place=locality

---
 sql/functions.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sql/functions.sql b/sql/functions.sql
index de850718..3029d015 100644
--- a/sql/functions.sql
+++ b/sql/functions.sql
@@ -985,7 +985,7 @@ BEGIN
       ELSEIF NEW.type in ('suburb','croft','subdivision') THEN
         NEW.rank_search := 20;
         NEW.rank_address := NEW.rank_search;
-      ELSEIF NEW.type in ('farm','locality','islet') THEN
+      ELSEIF NEW.type in ('farm','locality','islet','isolated_dwelling') THEN
         NEW.rank_search := 20;
         NEW.rank_address := 0;
       ELSEIF NEW.type in ('hall_of_residence','neighbourhood','housing_estate','nature_reserve') THEN
-- 
2.39.5


From 6f9d3a9d8004e3e9d40d07e9fd67fd9eaf6a7d4f Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sun, 12 Feb 2012 12:01:24 +0000
Subject: [PATCH 09/16] return a marginally better error message when query
 string is not in UTF-8, force UTF-8 in search formular

---
 lib/template/search-html.php | 2 +-
 website/search.php           | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/template/search-html.php b/lib/template/search-html.php
index a9d328a8..09b7021f 100644
--- a/lib/template/search-html.php
+++ b/lib/template/search-html.php
@@ -317,7 +317,7 @@ form{
 	<div id="seachheaderfade1"></div><div id="seachheaderfade2"></div><div id="seachheaderfade3"></div><div id="seachheaderfade4"></div>
 
 	<div id="seachheader">
-		<form action="<?php echo CONST_Website_BaseURL; ?>search.php" method="get">
+		<form accept-charset="UTF-8" action="<?php echo CONST_Website_BaseURL; ?>search.php" method="get">
 			<table border="0" width="100%">
 				<tr>
 					<td valign="center" style="width:30px;"><img src="images/logo.gif"></td>
diff --git a/website/search.php b/website/search.php
index 37ddd23c..f4b9b924 100755
--- a/website/search.php
+++ b/website/search.php
@@ -271,7 +271,8 @@
 				$aPhrase = $oDB->getRow("select make_standard_name('".pg_escape_string($sPhrase)."') as string");
 				if (PEAR::isError($aPhrase))
 				{
-					var_dump($aPhrase);
+					echo "Illegal query string (not an UTF-8 string): ".$sPhrase;
+					if (CONST_Debug) var_dump($aPhrase);
 					exit;
 				}
 				if (trim($aPhrase['string']))
-- 
2.39.5


From 5d10d538a54f127c074ac5ecd6459f0010d649f6 Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Mon, 13 Feb 2012 22:37:03 +0000
Subject: [PATCH 10/16] hack around yes quotes in wiki and add a simple sanity
 check against wiki accidents

---
 utils/specialphrases.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/utils/specialphrases.php b/utils/specialphrases.php
index 5b3abe40..7751a2f7 100755
--- a/utils/specialphrases.php
+++ b/utils/specialphrases.php
@@ -3,6 +3,7 @@
 
         require_once(dirname(dirname(__FILE__)).'/lib/init-cmd.php');
         ini_set('memory_limit', '800M');
+        ini_set('display_errors', 'stderr');
 
         $aCMDOptions = array(
                 "Import and export special phrases",
@@ -63,6 +64,15 @@
 					$sLabel = $aMatch[1];
 					$sClass = $aMatch[2];
 					$sType = $aMatch[3];
+					# hack around a bug where building=yes was imported with
+					# quotes into the wiki
+					$sType = preg_replace('/&quot;/', '', $sType);
+					# sanity check, in case somebody added garbage in the wiki
+					if (preg_match('/^\\w+$/', $sClass) < 1 ||
+						preg_match('/^\\w+$/', $sType) < 1) {
+						trigger_error("Bad class/type for language $sLanguage: $sClass=$sType");
+						exit;
+					}	
 					$aPairs[$sClass.'|'.$sType] = array($sClass, $sType);
 
 					switch(trim($aMatch[4]))
-- 
2.39.5


From c186a4ead0b6fc903f2a6682315a85d676715bc7 Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Fri, 17 Feb 2012 20:34:28 +0000
Subject: [PATCH 11/16] extend scripts for Tiger 2011 data

---
 utils/imports.php           | 53 +++++++++++++++++++++++++++++++++++--
 utils/setup.php             |  2 +-
 utils/tigerAddressImport.py |  4 ++-
 3 files changed, 55 insertions(+), 4 deletions(-)

diff --git a/utils/imports.php b/utils/imports.php
index 112ebd89..db0f7dbc 100755
--- a/utils/imports.php
+++ b/utils/imports.php
@@ -10,7 +10,8 @@
 		array('quiet', 'q', 0, 1, 0, 0, 'bool', 'Quiet output'),
 		array('verbose', 'v', 0, 1, 0, 0, 'bool', 'Verbose output'),
 
-		array('parse-tiger', '', 0, 1, 1, 1, 'realpath', 'Convert tigger edge files to nominatim sql import'),
+		array('parse-tiger', '', 0, 1, 1, 1, 'realpath', 'Convert tiger edge files to nominatim sql import'),
+		array('parse-tiger-2011', '', 0, 1, 1, 1, 'realpath', 'Convert tiger edge files to nominatim sql import (source: edges directory of tiger data)'),
 	);
 	getCmdOpt($_SERVER['argv'], $aCMDOptions, $aCMDResult, true, true);
 
@@ -18,6 +19,7 @@
 
 	if (isset($aCMDResult['parse-tiger']))
 	{
+        $bDidSomething = true;
 		foreach(glob($aCMDResult['parse-tiger'].'/??_*', GLOB_ONLYDIR) as $sStateFolder)
 		{
 			preg_match('#([0-9]{2})_(.*)#',basename($sStateFolder), $aMatch);
@@ -35,7 +37,7 @@
 				echo "'$sCountyID' : '$sCountyName' ,\n";
 			}
 		}
-exit;
+		exit;
 
 		if (!file_exists(CONST_BasePath.'/data/tiger2009')) mkdir(CONST_BasePath.'/data/tiger2009');
 
@@ -84,3 +86,50 @@ exit;
 			}
 		}
 	}
+
+
+	if (isset($aCMDResult['parse-tiger-2011']))
+	{
+		if (!file_exists(CONST_BasePath.'/data/tiger2011')) mkdir(CONST_BasePath.'/data/tiger2011');
+
+		$sTempDir = tempnam('/tmp', 'tiger');
+		unlink($sTempDir);
+		mkdir($sTempDir);
+
+
+        $bDidSomething = true;
+		foreach(glob($aCMDResult['parse-tiger-2011'].'/tl_2011_?????_edges.zip', 0) as $sImportFile)
+		{
+			set_time_limit(30);
+			preg_match('#([0-9]{5})_(.*)#',basename($sImportFile), $aMatch);
+			$sCountyID = $aMatch[1];
+			echo "Processing ".$sCountyID."...\n";
+			$sUnzipCmd = "unzip -d $sTempDir $sImportFile";
+			exec($sUnzipCmd);
+			$sShapeFile = $sTempDir.'/'.basename($sImportFile, '.zip').'.shp';
+			if (!file_exists($sShapeFile))
+			{
+				echo "Failed unzip ($sImportFile)\n";
+			}
+			else
+			{
+				$sParseCmd = CONST_BasePath.'/utils/tigerAddressImport.py '.$sShapeFile;
+				exec($sParseCmd);
+				$sOsmFile = $sTempDir.'/'.basename($sImportFile, '.zip').'.osm1.osm';
+				if (!file_exists($sOsmFile))
+				{
+					echo "Failed parse ($sImportFile)\n";
+				}
+				else
+				{
+					copy($sOsmFile, CONST_BasePath.'/data/tiger2011/'.$sCountyID.'.sql');
+				}
+			}
+			// Cleanup
+			foreach(glob($sTempDir.'/*') as $sTmpFile)
+			{
+				unlink($sTmpFile);
+			}
+
+		}
+	}
diff --git a/utils/setup.php b/utils/setup.php
index 0521b15d..cf465b15 100755
--- a/utils/setup.php
+++ b/utils/setup.php
@@ -284,7 +284,7 @@
 			$aDBInstances[$i] =& getDB(true);
 		}
 
-		foreach(glob(CONST_BasePath.'/data/tiger2009/*.sql') as $sFile)
+		foreach(glob(CONST_BasePath.'/data/tiger2011/*.sql') as $sFile)
 		{
 			echo $sFile.': ';
 			$hFile = fopen($sFile, "r");
diff --git a/utils/tigerAddressImport.py b/utils/tigerAddressImport.py
index ce00270d..a784b93b 100755
--- a/utils/tigerAddressImport.py
+++ b/utils/tigerAddressImport.py
@@ -385,6 +385,7 @@ county_fips = {
 '08011' : 'Bent, CO' ,
 '08013' : 'Boulder, CO' ,
 '08015' : 'Chaffee, CO' ,
+'08014' : 'Broomfield, CO',
 '08017' : 'Cheyenne, CO' ,
 '08019' : 'Clear Creek, CO' ,
 '08021' : 'Conejos, CO' ,
@@ -499,6 +500,7 @@ county_fips = {
 '12081' : 'Manatee, FL' ,
 '12083' : 'Marion, FL' ,
 '12085' : 'Martin, FL' ,
+'12086' : 'Miami-Dade, FL' ,
 '12087' : 'Monroe, FL' ,
 '12089' : 'Nassau, FL' ,
 '12091' : 'Okaloosa, FL' ,
@@ -3463,7 +3465,7 @@ def parse_shp_for_osm( filename ):
 
         divroad = poFeature.GetField("DIVROAD")
         if divroad != None:
-	    if divroad == "Y" and tags["highway"] == "residential":
+	    if divroad == "Y" and "highway" in tags and tags["highway"] == "residential":
                 tags["highway"] = "tertiary"
             tags["tiger:separated"] = divroad
 
-- 
2.39.5


From 01f4723b7bcd74bda121d8268d6655940dea061f Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sun, 19 Feb 2012 10:33:21 +0000
Subject: [PATCH 12/16] update classtype tables for special phrases along with
 the places

---
 sql/functions.sql        | 20 ++++++++++++++++++++
 utils/specialphrases.php |  7 ++++---
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/sql/functions.sql b/sql/functions.sql
index 3029d015..af9c47bb 100644
--- a/sql/functions.sql
+++ b/sql/functions.sql
@@ -875,6 +875,7 @@ DECLARE
   country_code VARCHAR(2);
   default_language VARCHAR(10);
   diameter FLOAT;
+  classtable TEXT;
 BEGIN
 --  RAISE WARNING '%',NEW.osm_id;
 
@@ -1148,6 +1149,17 @@ BEGIN
 
   END IF;
 
+   -- add to tables for special search
+   -- Note: won't work on initial import because the classtype tables
+   -- do not yet exist. It won't hurt either.
+  classtable := 'place_classtype_' || NEW.class || '_' || NEW.type;
+  SELECT count(*)>0 FROM pg_tables WHERE tablename = classtable INTO result;
+  IF result THEN
+    EXECUTE 'INSERT INTO ' || classtable::regclass || ' (place_id, centroid) VALUES ($1,$2)' 
+    USING NEW.place_id, ST_Centroid(NEW.geometry);
+  END IF;
+
+
 --  IF NEW.rank_search < 26 THEN
 --    RAISE WARNING 'placex insert: % % % %',NEW.osm_type,NEW.osm_id,NEW.class,NEW.type;
 --  END IF;
@@ -1558,6 +1570,7 @@ CREATE OR REPLACE FUNCTION placex_delete() RETURNS TRIGGER
   AS $$
 DECLARE
   b BOOLEAN;
+  classtable TEXT;
 BEGIN
 
   IF OLD.rank_address < 30 THEN
@@ -1584,6 +1597,13 @@ BEGIN
 
   DELETE FROM place_addressline where place_id = OLD.place_id;
 
+  -- remove from tables for special search
+  classtable := 'place_classtype_' || OLD.class || '_' || OLD.type;
+  SELECT count(*)>0 FROM pg_tables WHERE tablename = classtable INTO b;
+  IF b THEN
+    EXECUTE 'DELETE FROM ' || classtable::regclass || ' WHERE place_id = $1' USING OLD.place_id;
+  END IF;
+
   RETURN OLD;
 
 END;
diff --git a/utils/specialphrases.php b/utils/specialphrases.php
index 7751a2f7..d928d3c2 100755
--- a/utils/specialphrases.php
+++ b/utils/specialphrases.php
@@ -91,12 +91,13 @@
 			}
 		}
 
-        echo "create index idx_placex_classtype on placex (class, type);";
+        echo "create index idx_placex_classtype on placex (class, type);\n";
 
 		foreach($aPairs as $aPair)
 		{
 			if ($aPair[1] == 'highway') continue;
 
+			echo "drop table if exists place_classtype_".pg_escape_string($aPair[0])."_".pg_escape_string($aPair[1]).";\n";
 			echo "create table place_classtype_".pg_escape_string($aPair[0])."_".pg_escape_string($aPair[1])." as ";
 			echo "select place_id as place_id,st_centroid(geometry) as centroid from placex where ";
 			echo "class = '".pg_escape_string($aPair[0])."' and type = '".pg_escape_string($aPair[1])."';\n";
@@ -107,9 +108,9 @@
 			echo "CREATE INDEX idx_place_classtype_".pg_escape_string($aPair[0])."_".pg_escape_string($aPair[1])."_place_id ";
 			echo "ON place_classtype_".pg_escape_string($aPair[0])."_".pg_escape_string($aPair[1])." USING btree(place_id);\n";
 
-            echo "GRANT SELECT ON place_classtype_".pg_escape_string($aPair[0])."_".pg_escape_string($aPair[1])." TO \"www-data\";";
+            echo "GRANT SELECT ON place_classtype_".pg_escape_string($aPair[0])."_".pg_escape_string($aPair[1])." TO \"www-data\";\n";
 
 		}
 
-        echo "drop index idx_placex_classtype;";
+        echo "drop index idx_placex_classtype;\n";
 	}
-- 
2.39.5


From 88b07b8fc20023f7da758a45220f8ee7ea4f67b7 Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sun, 26 Feb 2012 20:32:40 +0000
Subject: [PATCH 13/16] creation of special phrases for country codes
 (forwardported from gazeteer)

---
 utils/specialphrases.php | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/utils/specialphrases.php b/utils/specialphrases.php
index d928d3c2..1c3eff5b 100755
--- a/utils/specialphrases.php
+++ b/utils/specialphrases.php
@@ -10,8 +10,8 @@
                 array('help', 'h', 0, 1, 0, 0, false, 'Show Help'),
                 array('quiet', 'q', 0, 1, 0, 0, 'bool', 'Quiet output'),
                 array('verbose', 'v', 0, 1, 0, 0, 'bool', 'Verbose output'),
-
-                array('wiki-import', '', 0, 1, 0, 0, 'bool', 'Create nominatim db'),
+                array('countries', '', 0, 1, 0, 0, 'bool', 'Create import script for coutry codes and names'),
+                array('wiki-import', '', 0, 1, 0, 0, 'bool', 'Create import script for search phrases '),
         );
         getCmdOpt($_SERVER['argv'], $aCMDOptions, $aCMDResult, true, true);
 
@@ -49,6 +49,18 @@
 			'vi',
 		);
 
+    if ($aCMDResult['countries']) {
+        echo "select getorcreate_country(make_standard_name('uk'), 'gb');\n";
+        echo "select getorcreate_country(make_standard_name('united states'), 'us');\n";
+        echo "select count(*) from (select getorcreate_country(make_standard_name(country_code), country_code) from country_name where country_code is not null) as x;\n";
+
+        echo "select count(*) from (select getorcreate_country(make_standard_name(get_name_by_language(country_name.name,ARRAY['name'])), country_code) from country_name where get_name_by_language(country_name.name, ARRAY['name']) is not null) as x;\n";
+        foreach($aLanguageIn as $sLanguage)
+		{
+            echo "select count(*) from (select getorcreate_country(make_standard_name(get_name_by_language(country_name.name,ARRAY['name:".$sLanguage."'])), country_code) from country_name where get_name_by_language(country_name.name, ARRAY['name:".$sLanguage."']) is not null) as x;\n";
+        }
+    }
+
 	if ($aCMDResult['wiki-import'])
 	{
 		$aPairs = array();
@@ -91,13 +103,12 @@
 			}
 		}
 
-        echo "create index idx_placex_classtype on placex (class, type);\n";
+        echo "create index idx_placex_classtype on placex (class, type);";
 
 		foreach($aPairs as $aPair)
 		{
 			if ($aPair[1] == 'highway') continue;
 
-			echo "drop table if exists place_classtype_".pg_escape_string($aPair[0])."_".pg_escape_string($aPair[1]).";\n";
 			echo "create table place_classtype_".pg_escape_string($aPair[0])."_".pg_escape_string($aPair[1])." as ";
 			echo "select place_id as place_id,st_centroid(geometry) as centroid from placex where ";
 			echo "class = '".pg_escape_string($aPair[0])."' and type = '".pg_escape_string($aPair[1])."';\n";
@@ -108,9 +119,9 @@
 			echo "CREATE INDEX idx_place_classtype_".pg_escape_string($aPair[0])."_".pg_escape_string($aPair[1])."_place_id ";
 			echo "ON place_classtype_".pg_escape_string($aPair[0])."_".pg_escape_string($aPair[1])." USING btree(place_id);\n";
 
-            echo "GRANT SELECT ON place_classtype_".pg_escape_string($aPair[0])."_".pg_escape_string($aPair[1])." TO \"www-data\";\n";
+            echo "GRANT SELECT ON place_classtype_".pg_escape_string($aPair[0])."_".pg_escape_string($aPair[1])." TO \"www-data\";";
 
 		}
 
-        echo "drop index idx_placex_classtype;\n";
+        echo "drop index idx_placex_classtype;";
 	}
-- 
2.39.5


From d7e91469b728304025dfc182bd1ebbdde4ac2e76 Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sun, 4 Mar 2012 10:54:07 +0100
Subject: [PATCH 14/16] add script to list broken polygons

---
 website/polygons.php | 145 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 145 insertions(+)
 create mode 100755 website/polygons.php

diff --git a/website/polygons.php b/website/polygons.php
new file mode 100755
index 00000000..3e2e878c
--- /dev/null
+++ b/website/polygons.php
@@ -0,0 +1,145 @@
+<?php
+        require_once(dirname(dirname(__FILE__)).'/lib/init-website.php');
+        require_once(CONST_BasePath.'/lib/log.php');
+
+	$sOutputFormat = 'html';
+	ini_set('memory_limit', '200M');
+
+	$oDB =& getDB();
+	if (!isset($_GET['days'])) $_GET['days'] = 1;
+	$bReduced = false;
+	if (isset($_GET['reduced'])) $bReduced = true;
+	$sClass = false;
+	if (isset($_GET['class'])) $sClass = $_GET['class'];
+
+	$aPolygons = array();
+	while(!sizeof($aPolygons))
+	{
+		$sSQL = 'select osm_type as "type",osm_id as "id",class as "key",type as "value",name->\'name\' as "name",';
+		$sSQL .= 'country_code as "country",errormessage as "error message",updated';
+		$sSQL .= " from import_polygon_error";
+		if ($_GET['days'])
+		{
+			$sSQL .= " where updated > 'now'::timestamp - '".(int)$_GET['days']." day'::interval";
+			$_GET['days']++;
+		}
+		if ($bReduced)
+		{
+			$sSQL .= " and errormessage like 'Area reduced%'";
+		}
+		if ($sClass)
+		{
+			$sSQL .= " and class = '".pg_escape_string($sClass)."'";
+		}
+		$sSQL .= " order by updated desc limit 1000";
+		$aPolygons = $oDB->getAll($sSQL);
+	}
+//var_dump($aPolygons);
+?>
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8"/>
+    <meta http-equiv="Content-Type" content="text/html;charset=utf-8" >
+    
+    <title>Nominatim Broken Polygon Data</title>
+    
+    <meta name="description" content="List of broken OSM polygon data by date" lang="en-US" />
+
+</head>
+
+<body>
+<style type="text/css">
+table {
+	border-width: 1px;
+	border-spacing: 0px;
+	border-style: solid;
+	border-color: gray;
+	border-collapse: collapse;
+	background-color: white;
+	margin: 10px;
+}
+table th {
+	border-width: 1px;
+	padding: 2px;
+	border-style: inset;
+	border-color: gray;
+	border-left-color: #ddd;
+	border-right-color: #ddd;
+	background-color: #eee;
+	-moz-border-radius: 0px 0px 0px 0px;
+}
+table td {
+	border-width: 1px;
+	padding: 2px;
+	border-style: inset;
+	border-color: gray;
+	border-left-color: #ddd;
+	border-right-color: #ddd;
+	background-color: white;
+	-moz-border-radius: 0px 0px 0px 0px;
+}
+</style>
+
+<?php
+
+	echo "<table>";
+	echo "<tr>";
+//var_dump($aPolygons[0]);
+	foreach($aPolygons[0] as $sCol => $sVal)
+	{
+		echo "<th>".$sCol."</th>";
+	}
+	echo "<th>&nbsp;</th>";
+	echo "<th>&nbsp;</th>";
+	echo "</tr>";
+	$aSeen = array();
+	foreach($aPolygons as $aRow)
+	{
+		if (isset($aSeen[$aRow['type'].$aRow['id']])) continue;
+		$aSeen[$aRow['type'].$aRow['id']] = 1;
+		echo "<tr>";
+		foreach($aRow as $sCol => $sVal)
+		{
+			switch($sCol)
+			{
+			case 'error message':
+				if (preg_match('/Self-intersection\\[([0-9.\\-]+) ([0-9.\\-]+)\\]/',$sVal,$aMatch))
+				{
+					$aRow['lat'] = $aMatch[2];
+					$aRow['lon'] = $aMatch[1];
+					echo "<td><a href=\"http://www.openstreetmap.org/?lat=".$aMatch[2]."&lon=".$aMatch[1]."&zoom=18&layers=M&".$sOSMType."=".$aRow['id']."\">".($sVal?$sVal:'&nbsp;')."</a></td>";
+				}
+				else
+				{
+					echo "<td>".($sVal?$sVal:'&nbsp;')."</td>";
+				}
+				break;
+			case 'id':
+				$sOSMType = ($aRow['type'] == 'N'?'node':($aRow['type'] == 'W'?'way':($aRow['type'] == 'R'?'relation':'')));
+				echo '<td><a href="http://www.openstreetmap.org/browse/'.$sOSMType.'/'.$aRow['id'].'" target="_new">'.$aRow['id'].'</a></td>';
+				break;
+			default:
+				echo "<td>".($sVal?$sVal:'&nbsp;')."</td>";
+				break;
+			}
+		}
+		echo "<td><a href=\"http://localhost:8111/import?url=http://www.openstreetmap.org/api/0.6/".$sOSMType.'/'.$aRow['id']."/full\" target=\"josm\">josm</a></td>";
+		if (isset($aRow['lat']))
+		{
+			echo "<td><a href=\"http://open.mapquestapi.com/dataedit/index_flash.html?lat=".$aRow['lat']."&lon=".$aRow['lon']."&zoom=18\" target=\"potlatch2\">P2</a></td>";
+		}
+		else
+		{
+			echo "<td>&nbsp;</td>";	
+		}
+		echo "</tr>";
+	}
+	echo "</table>";
+
+
+
+//	include(CONST_BasePath.'/lib/template/details-'.$sOutputFormat.'.php');
+?>
+</body>
+</html>
-- 
2.39.5


From 0005dc0a0fbed975cd9202f7f118b2997632a4f1 Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sun, 4 Mar 2012 12:50:45 +0100
Subject: [PATCH 15/16] configurable file logging

Respect CONST_Log_File setting and add two new configuration
variables CONST_Log_File_SearchLog and CONST_Log_File_ReverseLog
for the log file names.
---
 lib/log.php           | 9 ++++++---
 settings/settings.php | 2 ++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/lib/log.php b/lib/log.php
index 8b5f00fd..93ad8f95 100644
--- a/lib/log.php
+++ b/lib/log.php
@@ -26,10 +26,11 @@
 			$oDB->query($sSQL);
 		}
 
+		if (CONST_Log_File && CONST_Log_File_ReverseLog != '') {
                 if ($sType == 'reverse')
                 {
                         $aStartTime = explode('.',$hLog[0]);
-                        file_put_contents('/data/mapquest/opentile_http/logs/nominatimreverse',
+                        file_put_contents(CONST_Log_File_ReverseLog,
                                 $aStartTime[0].','.$aStartTime[1].','.
                                 php_uname('n').','.
                                 '"'.addslashes(isset($_SERVER['HTTP_REFERER'])?$_SERVER['HTTP_REFERER']:'').'",'.
@@ -41,7 +42,7 @@
                                 '"'.addslashes($_GET['format']).'"'."\n",
                         FILE_APPEND);
                 }
-
+		}
 
 		return $hLog;
 	}
@@ -67,8 +68,9 @@
 			$oDB->query($sSQL);
 		}
 
+		if (CONST_Log_File && CONST_Log_File_SearchLog != '') {
                 $aStartTime = explode('.',$hLog[0]);
-                file_put_contents('/data/mapquest/opentile_http/logs/nominatimsearch',
+                file_put_contents(CONST_Log_File_SearchLog,
                                 $aStartTime[0].','.$aStartTime[1].','.
                                 php_uname('n').','.
                                 '"'.addslashes(isset($_SERVER['HTTP_REFERER'])?$_SERVER['HTTP_REFERER']:'').'",'.
@@ -78,5 +80,6 @@
                                 '"'.addslashes($_GET['format']).'",'.
                                 $iNumResults."\n",
                         FILE_APPEND);
+		}
 
 	}
diff --git a/settings/settings.php b/settings/settings.php
index 3493a34a..591af1c6 100644
--- a/settings/settings.php
+++ b/settings/settings.php
@@ -34,3 +34,5 @@
 	@define('CONST_Log_DB', true);
 	@define('CONST_Log_File', false);
 	@define('CONST_Log_File_Format', 'TODO'); // Currently hard coded
+	@define('CONST_Log_File_SearchLog', '');
+	@define('CONST_Log_File_ReverseLog', '');
-- 
2.39.5


From fec4c3c30189a771e177d585b8d4ad95e697fc00 Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sun, 4 Mar 2012 14:40:13 +0100
Subject: [PATCH 16/16] create proper token array for unknown housenumbers

---
 website/search.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/website/search.php b/website/search.php
index f4b9b924..c6aa05d1 100755
--- a/website/search.php
+++ b/website/search.php
@@ -379,7 +379,7 @@
 				// Unknown single word token with a number - assume it is a house number
 				if (!isset($aValidTokens[' '.$sToken]) && strpos($sToken,' ') === false && preg_match('/[0-9]/', $sToken))
 				{
-					$aValidTokens[' '.$sToken] = array('class'=>'place','type'=>'house');
+					$aValidTokens[' '.$sToken] = array(array('class'=>'place','type'=>'house'));
 				}
 			}
 
-- 
2.39.5