Fix bug in index.c and remove column admin_level from location_property_osmline.

diff --git a/lib/Geocode.php b/lib/Geocode.php
index 83eb647aaf0a1c96e2623028771293659e43a459..e6e6e3eb7ec1208cd69a3ce264f3d2902f8db0c9 100644 (file)
--- a/lib/Geocode.php
+++ b/lib/Geocode.php
@@ -1331,11 +1331,11 @@
                                                        {
                                                                $sHouseNumberRegex = '\\\\m'.$aSearch['sHouseNumber'].'\\\\M';
                                 $aOrder[] = "";
-                                                               $aOrder[0] = " exists(select place_id from placex where parent_place_id = search_name.place_id";
+                                                               $aOrder[0] = " (exists(select place_id from placex where parent_place_id = search_name.place_id";
                                 $aOrder[0] .= " and transliteration(housenumber) ~* E'".$sHouseNumberRegex."' limit 1) ";
                                                                // also housenumbers from interpolation lines table are needed
                                                                $aOrder[0] .= " or exists(select place_id from location_property_osmline where parent_place_id = search_name.place_id";
-                                $aOrder[0] .= " and ".intval($aSearch['sHouseNumber']).">=startnumber and ".intval($aSearch['sHouseNumber'])."<=endnumber limit 1)";
+                                $aOrder[0] .= " and ".intval($aSearch['sHouseNumber']).">=startnumber and ".intval($aSearch['sHouseNumber'])."<=endnumber limit 1))";
                                                                $aOrder[0] .= " desc";
                                                        }
 

diff --git a/nominatim/index.c b/nominatim/index.c
index ca301f45b305ea5826f214fb90f5504b7ae00ed1..02392cd3c61b33031bb11d6dc63e3f8bf98bd38f 100644 (file)
--- a/nominatim/index.c
+++ b/nominatim/index.c
@@ -156,14 +156,14 @@ struct index_thread_data * thread_data, const char *structuredoutputfile)
                 }
                 else
                 {
-                    iResult = PQsendQueryPrepared(conn, "index_nosector_places", 1, paramValues, paramLengths, paramFormats, 1);
+                    iResult = PQsendQueryPrepared(conn, "index_nosector_places", 2, paramValues, paramLengths, paramFormats, 1);
                 }
             }
             else
             {
                 if (interpolation)
                 {
-                                       iResult = PQsendQueryPrepared(conn, "index_sector_places_osmline", 1, paramValues, paramLengths, paramFormats, 1);
+                                       iResult = PQsendQueryPrepared(conn, "index_sector_places_osmline", 2, paramValues, paramLengths, paramFormats, 1);
 
                 }
                 else
@@ -216,7 +216,15 @@ struct index_thread_data * thread_data, const char *structuredoutputfile)
                     if (sleepcount++ > 500)
                     {
                         rankPerSecond = ((float)rankCountTuples + (float)count) / MAX(difftime(time(0), rankStartTime),1);
-                        fprintf(stderr, "  Done %i in %i @ %f per second - Rank %i ETA (seconds): %f\n", (rankCountTuples + count), (int)(difftime(time(0), rankStartTime)), rankPerSecond, rank, ((float)(rankTotalTuples - (rankCountTuples + count)))/rankPerSecond);
+                        if(interpolation)
+                        {
+                            fprintf(stderr, "  Done %i in %i @ %f per second - Interpolation lines ETA (seconds): %f\n", (rankCountTuples + count), (int)(difftime(time(0), rankStartTime)), rankPerSecond, ((float)(rankTotalTuples - (rankCountTuples + count)))/rankPerSecond);
+                        }
+                        else
+                        {
+                            fprintf(stderr, "  Done %i in %i @ %f per second - Rank %i ETA (seconds): %f\n", (rankCountTuples + count), (int)(difftime(time(0), rankStartTime)), rankPerSecond, rank, ((float)(rankTotalTuples - (rankCountTuples + count)))/rankPerSecond);
+                        }
+                        
                         sleepcount = 0;
                     }
                 }
@@ -327,7 +335,7 @@ void nominatim_index(int rank_min, int rank_max, int num_threads, const char *co
     
     pg_prepare_params[0] = PG_OID_INT4;
     res = PQprepare(conn, "index_sector_places_osmline",
-                    "select place_id from location_property_osmline where geometry_sector = $1 and indexed_status > 0",
+                    "select place_id from location_property_osmline where geometry_sector = $2 and indexed_status > 0",
                     1, pg_prepare_params);
     if (PQresultStatus(res) != PGRES_COMMAND_OK)
     {

diff --git a/sql/functions.sql b/sql/functions.sql
index 9b095ce7b9636067c2df0c1b249d1a114a572845..a5200973af3f1a7d49e597eba606f7298c32d18c 100644 (file)
--- a/sql/functions.sql
+++ b/sql/functions.sql
@@ -734,9 +734,9 @@ BEGIN
                              and place_id != prevnode.place_id and class = 'place'
                              and type = 'house';
         insert into location_property_osmline
-          values (sectiongeo, nextval('seq_place'), partition, wayid, NULL, startnumber, endnumber, interpolationtype, prevnode.admin_level,
-           street, coalesce(prevnode.postcode, defpostalcode),
-           calculated_country_code, geometry_sector, 2, now());
+          values (sectiongeo, nextval('seq_place'), partition, wayid, NULL, startnumber, endnumber, 
+          interpolationtype, street, coalesce(prevnode.postcode, defpostalcode),
+          calculated_country_code, geometry_sector, 2, now());
       END IF;
 
       -- early break if we are out of line string,

diff --git a/sql/indices.src.sql b/sql/indices.src.sql
index 5ee621df94c1a2b1f87fc57d2a9713279e97eed6..bf6093e0020c7068be6956544a2a8c49ca48cb21 100644 (file)
--- a/sql/indices.src.sql
+++ b/sql/indices.src.sql
@@ -17,6 +17,11 @@ CREATE INDEX idx_placex_parent_place_id ON placex USING BTREE (parent_place_id)
 CREATE INDEX idx_placex_reverse_geometry ON placex USING gist (geometry) {ts:search-index} where rank_search != 28 and (name is not null or housenumber is not null) and class not in ('waterway','railway','tunnel','bridge','man_made');
 CREATE INDEX idx_location_area_country_place_id ON location_area_country USING BTREE (place_id) {ts:address-index};
 
+CREATE UNIQUE INDEX idx_osmline_place_id ON location_property_osmline USING BTREE (place_id) {ts:search-index};
+CREATE INDEX idx_osmline_parent_place_id ON location_property_osmline USING BTREE (parent_place_id) {ts:search-index};
+CREATE INDEX idx_osmline_geometry_sector ON location_property_osmline USING BTREE (geometry_sector) {ts:address-index};
+CREATE INDEX idx_osmline_linegeo ON location_property_osmline USING GIST (linegeo) {ts:search-index};
+
 CREATE INDEX idx_search_name_country_centroid ON search_name_country USING GIST (centroid) {ts:address-index};
 
 DROP INDEX IF EXISTS place_id_idx;

diff --git a/sql/tables.sql b/sql/tables.sql
index b4aecdd9b72b5fb53fcee6ba017ec074846e4588..2578aa91cc0bd9a798221218a3a179c25ddf0127 100644 (file)
--- a/sql/tables.sql
+++ b/sql/tables.sql
@@ -94,7 +94,6 @@ CREATE TABLE location_property_osmline (
     startnumber INTEGER,
     endnumber INTEGER,
     interpolationtype TEXT,
-    admin_level INTEGER,
     street TEXT,
     postcode TEXT,
     calculated_country_code VARCHAR(2),