From: Brian Quinion <openstreetmap@brian.quinion.co.uk>
Date: Mon, 30 Apr 2012 00:05:13 +0000 (+0100)
Subject: Merge branch 'master' of github.com:twain47/Nominatim
X-Git-Tag: v2.0.0~77
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/7164fd310dcb9d657e17661d35cccc0f19931248

Merge branch 'master' of github.com:twain47/Nominatim
---

7164fd310dcb9d657e17661d35cccc0f19931248
diff --cc sql/tables.sql
index fd01663e,ff9c1c50..48740f23
--- a/sql/tables.sql
+++ b/sql/tables.sql
@@@ -210,10 -199,8 +199,9 @@@ CREATE TABLE placex 
    importance FLOAT,
    indexed_status INTEGER,
    indexed_date TIMESTAMP,
 +  wikipedia TEXT, -- calculated wikipedia article name (language:title)
    geometry_sector INTEGER
    );
- SELECT AddGeometryColumn('placex', 'geometry', 4326, 'GEOMETRY', 2);
  SELECT AddGeometryColumn('placex', 'centroid', 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);