hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-26 11:08:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

replace AddGeometryColumn() functions

Browse Source 
Directly add the columns to the table definitions instead.
This commit is contained in:
Sarah Hoffmann
2017-06-29 23:34:09 +02:00
parent 71ddeb40a6
commit bdec4e6488
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/partition-tables.src.sql
View File

@@ -29,9 +29,9 @@ CREATE TABLE search_name_blank (
place_id BIGINT, place_id BIGINT,
search_rank smallint, search_rank smallint,
address_rank smallint, address_rank smallint,
name_vector integer[] name_vector integer[],
centroid GEOMETRY(Geometry, 4326)
); );
SELECT AddGeometryColumn('search_name_blank', 'centroid', 4326, 'GEOMETRY', 2);
CREATE TABLE location_area_country () INHERITS (location_area_large) {ts:address-data}; CREATE TABLE location_area_country () INHERITS (location_area_large) {ts:address-data};
@@ -54,9 +54,9 @@ CREATE INDEX idx_search_name_-partition-_name_vector ON search_name_-partition-
CREATE TABLE location_road_-partition- ( CREATE TABLE location_road_-partition- (
place_id BIGINT, place_id BIGINT,
partition SMALLINT, partition SMALLINT,
country_code VARCHAR(2) country_code VARCHAR(2),
geometry GEOMETRY(Geometry, 4326)
) {ts:address-data}; ) {ts:address-data};
SELECT AddGeometryColumn('location_road_-partition-', 'geometry', 4326, 'GEOMETRY', 2);
CREATE INDEX idx_location_road_-partition-_geometry ON location_road_-partition- USING GIST (geometry) {ts:address-index}; CREATE INDEX idx_location_road_-partition-_geometry ON location_road_-partition- USING GIST (geometry) {ts:address-index};
CREATE INDEX idx_location_road_-partition-_place_id ON location_road_-partition- USING BTREE (place_id) {ts:address-index}; CREATE INDEX idx_location_road_-partition-_place_id ON location_road_-partition- USING BTREE (place_id) {ts:address-index};

24
sql/tables.sql
View File

@@ -61,10 +61,10 @@ CREATE TABLE location_area (
rank_search SMALLINT NOT NULL, rank_search SMALLINT NOT NULL,
rank_address SMALLINT NOT NULL, rank_address SMALLINT NOT NULL,
country_code VARCHAR(2), country_code VARCHAR(2),
isguess BOOL isguess BOOL,
centroid GEOMETRY(Point, 4326),
geometry GEOMETRY(Geometry, 4326)
); );
SELECT AddGeometryColumn('location_area', 'centroid', 4326, 'POINT', 2);
SELECT AddGeometryColumn('location_area', 'geometry', 4326, 'GEOMETRY', 2);
CREATE TABLE location_area_large () INHERITS (location_area); CREATE TABLE location_area_large () INHERITS (location_area);
@@ -74,9 +74,9 @@ CREATE TABLE location_property (
parent_place_id BIGINT, parent_place_id BIGINT,
partition SMALLINT, partition SMALLINT,
housenumber TEXT, housenumber TEXT,
postcode TEXT postcode TEXT,
centroid GEOMETRY(Point, 4326)
); );
SELECT AddGeometryColumn('location_property', 'centroid', 4326, 'POINT', 2);
CREATE TABLE location_property_aux () INHERITS (location_property); CREATE TABLE location_property_aux () INHERITS (location_property);
CREATE INDEX idx_location_property_aux_place_id ON location_property_aux USING BTREE (place_id); CREATE INDEX idx_location_property_aux_place_id ON location_property_aux USING BTREE (place_id);
@@ -125,9 +125,9 @@ CREATE TABLE search_name (
address_rank SMALLINT, address_rank SMALLINT,
name_vector integer[], name_vector integer[],
nameaddress_vector integer[], nameaddress_vector integer[],
country_code varchar(2) country_code varchar(2),
centroid GEOMETRY(Geometry, 4326)
) {ts:search-data}; ) {ts:search-data};
SELECT AddGeometryColumn('search_name', 'centroid', 4326, 'GEOMETRY', 2);
CREATE INDEX idx_search_name_place_id ON search_name USING BTREE (place_id) {ts:search-index}; CREATE INDEX idx_search_name_place_id ON search_name USING BTREE (place_id) {ts:search-index};
drop table IF EXISTS place_addressline; drop table IF EXISTS place_addressline;
@@ -157,9 +157,9 @@ CREATE TABLE placex (
wikipedia TEXT, -- calculated wikipedia article name (language:title) wikipedia TEXT, -- calculated wikipedia article name (language:title)
country_code varchar(2), country_code varchar(2),
housenumber TEXT, housenumber TEXT,
postcode TEXT postcode TEXT,
centroid GEOMETRY(Geometry, 4326)
) {ts:search-data}; ) {ts:search-data};
SELECT AddGeometryColumn('placex', 'centroid', 4326, 'GEOMETRY', 2);
CREATE UNIQUE INDEX idx_place_id ON placex USING BTREE (place_id) {ts:search-index}; CREATE UNIQUE INDEX idx_place_id ON placex USING BTREE (place_id) {ts:search-index};
CREATE INDEX idx_placex_osmid ON placex USING BTREE (osm_type, osm_id) {ts:search-index}; CREATE INDEX idx_placex_osmid ON placex USING BTREE (osm_type, osm_id) {ts:search-index};
CREATE INDEX idx_placex_linked_place_id ON placex USING BTREE (linked_place_id) {ts:address-index} WHERE linked_place_id IS NOT NULL; CREATE INDEX idx_placex_linked_place_id ON placex USING BTREE (linked_place_id) {ts:address-index} WHERE linked_place_id IS NOT NULL;
@@ -224,10 +224,10 @@ CREATE TABLE import_polygon_error (
name HSTORE, name HSTORE,
country_code varchar(2), country_code varchar(2),
updated timestamp, updated timestamp,
errormessage text errormessage text,
prevgeometry GEOMTRY(Geometry, 4326),
newgeometry GEOMTRY(Geometry, 4326)
); );
SELECT AddGeometryColumn('import_polygon_error', 'prevgeometry', 4326, 'GEOMETRY', 2);
SELECT AddGeometryColumn('import_polygon_error', 'newgeometry', 4326, 'GEOMETRY', 2);
CREATE INDEX idx_import_polygon_error_osmid ON import_polygon_error USING BTREE (osm_type, osm_id); CREATE INDEX idx_import_polygon_error_osmid ON import_polygon_error USING BTREE (osm_type, osm_id);
GRANT SELECT ON import_polygon_error TO "{www-user}"; GRANT SELECT ON import_polygon_error TO "{www-user}";