From 12f830fbbb9177d8a4d172b2da2ed37dfa9c5fc4 Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sun, 17 Nov 2019 23:58:43 +0100
Subject: [PATCH] fix loading of data without wikipedia files

Also removes unused place_boundingbox table.
---
 lib/setup/SetupClass.php | 13 ++-----------
 sql/functions.sql        |  2 +-
 sql/tables.sql           |  4 +++-
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/lib/setup/SetupClass.php b/lib/setup/SetupClass.php
index 1c4547e3..2fdb3926 100755
--- a/lib/setup/SetupClass.php
+++ b/lib/setup/SetupClass.php
@@ -160,13 +160,6 @@ class SetupFunctions
         if ($this->bNoPartitions) {
             $this->pgsqlRunScript('update country_name set partition = 0');
         }
-
-        // the following will be needed by createFunctions later but
-        // is only defined in the subsequently called createTables
-        // Create dummies here that will be overwritten by the proper
-        // versions in create-tables.
-        $this->pgsqlRunScript('CREATE TABLE IF NOT EXISTS place_boundingbox ()');
-        $this->pgsqlRunScript('CREATE TYPE wikipedia_article_match AS ()', false);
     }
 
     public function importData($sOSMFile)
@@ -323,11 +316,11 @@ class SetupFunctions
 
     public function importWikipediaArticles()
     {
-        $this->pgExec('DROP TABLE wikipedia_article');
-        $this->pgExec('DROP TABLE wikipedia_redirect');
         $sWikiArticlesFile = CONST_Wikipedia_Data_Path.'/wikimedia-importance.sql.gz';
         if (file_exists($sWikiArticlesFile)) {
             info('Importing wikipedia articles and redirects');
+            $this->pgExec('DROP TABLE IF EXISTS wikipedia_article');
+            $this->pgExec('DROP TABLE IF EXISTS wikipedia_redirect');
             $this->pgsqlRunScriptFile($sWikiArticlesFile);
         } else {
             warn('wikipedia importance dump file not found - places will have default importance');
@@ -346,8 +339,6 @@ class SetupFunctions
         echo '.';
         $this->pgExec('TRUNCATE place_addressline');
         echo '.';
-        $this->pgExec('TRUNCATE place_boundingbox');
-        echo '.';
         $this->pgExec('TRUNCATE location_area');
         echo '.';
         if (!$this->dbReverseOnly()) {
diff --git a/sql/functions.sql b/sql/functions.sql
index 9a78887b..ad2007cb 100644
--- a/sql/functions.sql
+++ b/sql/functions.sql
@@ -2622,7 +2622,7 @@ END;
 $$
 LANGUAGE plpgsql IMMUTABLE;
 
-DROP TYPE wikipedia_article_match CASCADE;
+DROP TYPE IF EXISTS wikipedia_article_match CASCADE;
 create type wikipedia_article_match as (
   language TEXT,
   title TEXT,
diff --git a/sql/tables.sql b/sql/tables.sql
index 0559abd4..0245e3c3 100644
--- a/sql/tables.sql
+++ b/sql/tables.sql
@@ -268,7 +268,9 @@ CREATE TABLE wikipedia_article (
     lon double precision,
     importance double precision,
     osm_type character(1),
-    osm_id bigint
+    osm_id bigint,
+    wd_page_title text,
+    instance_of text
 );
 ALTER TABLE ONLY wikipedia_article ADD CONSTRAINT wikipedia_article_pkey PRIMARY KEY (language, title);
 CREATE INDEX idx_wikipedia_article_osm_id ON wikipedia_article USING btree (osm_type, osm_id);
-- 
2.45.2