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

This commit is contained in:
markigail
2016-05-08 16:46:42 +02:00
parent 1a4f369e2b
commit 190a72cab5
5 changed files with 22 additions and 10 deletions

View File

@@ -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,

View File

@@ -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;

View File

@@ -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),