vagrant centOS: amake sure that Posgresql 12 is found

Fixes #1998.

.github/ISSUE_TEMPLATE/config.yml

@@ -1,4 +0,0 @@
-contact_links:
-  - name: Nominatim Discussions
-    url: https://github.com/osm-search/Nominatim/discussions
-    about: Ask questions, get support, share ideas and discuss with community members.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,22 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: ''
-assignees: ''
-
----
-
-Before opening a new feature request, please search through the open issue to check that your request hasn't been reported already.
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.

.github/ISSUE_TEMPLATE/report-issues-with-search-results.md

@@ -1,36 +0,0 @@
----
-name: Report issues with search results
-about: You have searched something with Nominatim and did not get the expected result.
-title: ''
-labels: ''
-assignees: ''
-
----
-
-## What did you search for?
-
-Please try to provide a link to your search. You  can go to https://nominatim.openstreetmap.org and repeat your search there. If you originally found the issue somewhere else, please tell us what software/website you were using.
-
-## What result did you get?
-
-## What result did you expect?
-
-**Is the result in the right place and just named wrongly?** 
-
-Please tell us the display name you expected.
-
-**Is the result missing completely?**
-
-Make sure that the data you are looking for is in OpenStreetMap. Provide a link to the OpenStreetMap object or if you cannot get it, a link to the map on https://openstreetmap.org where you expect the result to be.
-
-To get the link to the OSM object, you can try the following:
-
- * Go to [https://openstreetmap.org](https://openstreetmap.org).
- * Move to the area of the map where you expect the result and then zoom in as much as possible.
- * Click on the question mark on the right side of the map. You get a question cursor. Use it to click on the map where your object is located.
- * Find the object of interest in the list that appears on the left side.
- * Click on the object and report back the URL that the browser shows.
-
-## Further details
-
-Anything else we should know about the search. Particularities with addresses in the area etc.

.github/ISSUE_TEMPLATE/report-problems-with-the-software.md

@@ -1,31 +0,0 @@
----
-name: Report problems with the software
-about: You have your own installation of Nominatim and found a bug.
-title: ''
-labels: ''
-assignees: ''
-
----
-
-___Note: if you are installing Nominatim through a docker image, you should report issues with the installation process with the docker repository first.___
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Please describe what you did to get to the issue.
-
-**Software Environment (please complete the following information):**
-- Nominatim version: 
-- Postgresql version: 
-- Postgis version:
-- OS: 
-
-**Hardware Configuration (please complete the following information):**
-- RAM: 
-- number of CPUs:
-- type and size of disks:
-- bare metal/AWS/other cloud service: 
-
-**Additional context**
-Add any other context about the problem here.

.github/actions/build-nominatim/action.yml

@@ -1,28 +0,0 @@
-name: 'Build Nominatim'
-
-runs:
-    using: "composite"
-
-    steps:
-        - name: Install prerequisits
-          run: sudo apt-get install -y -qq libboost-system-dev libboost-filesystem-dev libexpat1-dev zlib1g-dev libbz2-dev libpq-dev libproj-dev python3-psycopg2 python3-pyosmium
-          shell: bash
-
-        - name: Configure
-          run: mkdir build && cd build && cmake ..
-          shell: bash
-
-        - name: Build
-          run: |
-              make -j2 all
-              ./utils/setup.php --setup-website
-          shell: bash
-          working-directory: build
-
-        - name: Download dependencies
-          run: |
-              if [ ! -f data/country_osm_grid.sql.gz ]; then
-                  wget --no-verbose -O data/country_osm_grid.sql.gz https://www.nominatim.org/data/country_grid.sql.gz
-              fi
-          shell: bash
-

.github/actions/setup-postgresql/action.yml

@@ -1,45 +0,0 @@
-name: 'Setup Postgresql and Postgis'
-
-inputs:
-    postgresql-version:
-        description: 'Version of PostgreSQL to install'
-        required: true
-    postgis-version:
-        description: 'Version of Postgis to install'
-        required: true
-
-runs:
-    using: "composite"
-
-    steps:
-        - name: Remove existing PostgreSQL
-          run: |
-              sudo apt-get update -qq
-              sudo apt-get purge -yq postgresql*
-          shell: bash
-
-        - name: Install PostgreSQL
-          run: |
-              sudo apt-get install -y -qq --no-install-suggests --no-install-recommends postgresql-client-${PGVER} postgresql-${PGVER}-postgis-${POSTGISVER} postgresql-${PGVER}-postgis-${POSTGISVER}-scripts postgresql-contrib-${PGVER} postgresql-${PGVER} postgresql-server-dev-${PGVER}
-          shell: bash
-          env:
-              PGVER: ${{ inputs.postgresql-version }}
-              POSTGISVER: ${{ inputs.postgis-version }}
-
-        - name: Adapt postgresql configuration
-          run: |
-              echo 'fsync = off' | sudo tee /etc/postgresql/${PGVER}/main/conf.d/local.conf
-              echo 'synchronous_commit = off' | sudo tee -a /etc/postgresql/${PGVER}/main/conf.d/local.conf
-              echo 'full_page_writes = off' | sudo tee -a /etc/postgresql/${PGVER}/main/conf.d/local.conf
-              echo 'shared_buffers = 1GB' | sudo tee -a /etc/postgresql/${PGVER}/main/conf.d/local.conf
-              echo 'port = 5432' | sudo tee -a /etc/postgresql/${PGVER}/main/conf.d/local.conf
-          shell: bash
-          env:
-              PGVER: ${{ inputs.postgresql-version }}
-
-        - name: Setup database
-          run: |
-              sudo systemctl restart postgresql
-              sudo -u postgres createuser -S www-data
-              sudo -u postgres createuser -s runner
-          shell: bash

.github/workflows/ci-tests.yml

@@ -1,120 +0,0 @@
-name: CI Tests
-
-on: [ push, pull_request ]
-
-jobs:
-    tests:
-        runs-on: ubuntu-20.04
-
-        strategy:
-            matrix:
-                postgresql: [9.5, 13]
-                include:
-                    - postgresql: 9.5
-                      postgis: 2.5
-                    - postgresql: 13
-                      postgis: 3
-
-        steps:
-            - uses: actions/checkout@v2
-              with:
-                  submodules: true
-
-            - name: Get Date
-              id: get-date
-              run: |
-                  echo "::set-output name=date::$(/bin/date -u "+%Y%W")"
-              shell: bash
-
-            - uses: actions/cache@v2
-              with:
-                  path: |
-                      data/country_osm_grid.sql.gz
-                      monaco-latest.osm.pbf
-                  key: nominatim-data-${{ steps.get-date.outputs.date }}
-
-            - uses: ./.github/actions/setup-postgresql
-              with:
-                  postgresql-version: ${{ matrix.postgresql }}
-                  postgis-version: ${{ matrix.postgis }}
-            - uses: ./.github/actions/build-nominatim
-
-            - name: Install test prerequsites
-              run: |
-                   sudo apt-get install -y -qq php-codesniffer python3-tidylib
-                   sudo pip3 install behave nose
-
-            - name: PHP linting
-              run: phpcs --report-width=120 .
-
-            - name: PHP unit tests
-              run: phpunit ./
-              working-directory: test/php
-
-            - name: BDD tests
-              run: behave -DREMOVE_TEMPLATE=1 --format=progress3 db osm2pgsql
-              working-directory: test/bdd
-
-    import:
-        runs-on: ubuntu-20.04
-
-        steps:
-            - uses: actions/checkout@v2
-              with:
-                  submodules: true
-
-            - name: Get Date
-              id: get-date
-              run: |
-                  echo "::set-output name=date::$(/bin/date -u "+%Y%W")"
-              shell: bash
-
-            - uses: actions/cache@v2
-              with:
-                  path: |
-                      data/country_osm_grid.sql.gz
-                      monaco-latest.osm.pbf
-                  key: nominatim-data-${{ steps.get-date.outputs.date }}
-
-            - uses: ./.github/actions/setup-postgresql
-              with:
-                  postgresql-version: 13
-                  postgis-version: 3
-            - uses: ./.github/actions/build-nominatim
-
-            - name: Create configuration
-              run: |
-                   echo '<?php' > settings/local.php
-                   echo " @define('CONST_Pyosmium_Binary', '/usr/lib/python3-pyosmium/pyosmium-get-changes');" >> settings/local.php
-              working-directory: build
-
-            - name: Download import data
-              run: |
-                  if [ ! -f monaco-latest.osm.pbf ]; then
-                      wget --no-verbose https://download.geofabrik.de/europe/monaco-latest.osm.pbf
-                  fi
-              shell: bash
-
-            - name: Import
-              run: php ./utils/setup.php --osm-file ../monaco-latest.osm.pbf --osm2pgsql-cache 500 --all
-              working-directory: build
-
-            - name: Import special phrases
-              run: php ./utils/specialphrases.php --wiki-import | psql -d nominatim
-              working-directory: build
-
-            - name: Check import
-              run: php ./utils/check_import_finished.php
-              working-directory: build
-
-            - name: Run update
-              run: |
-                   php ./utils/update.php --init-updates
-                   php ./utils/update.php --import-osmosis
-              working-directory: build
-
-            - name: Run reverse-only import
-              run : |
-                  dropdb nominatim
-                  php ./utils/setup.php --osm-file ../monaco-latest.osm.pbf --reverse-only --all
-              working-directory: build

.travis.yml

@@ -0,0 +1,39 @@
+---
+os: linux
+dist: bionic
+language: python
+python:
+  - "3.6"
+addons:
+  postgresql: "9.6"
+  apt:
+    packages:
+      postgresql-server-dev-9.6
+      postgresql-client-9.6
+git:
+  depth: 3
+env:
+  - TEST_SUITE=tests
+  - TEST_SUITE=monaco
+before_install:
+  - phpenv global 7.1
+install:
+  - vagrant/install-on-travis-ci.sh
+before_script:
+  - psql -U postgres -c "create extension postgis"
+script:
+  - cd $TRAVIS_BUILD_DIR/
+  - if [[ $TEST_SUITE == "tests" ]]; then phpcs --report-width=120 . ; fi
+  - cd $TRAVIS_BUILD_DIR/test/php
+  - if [[ $TEST_SUITE == "tests" ]]; then /usr/bin/phpunit ./ ; fi
+  - cd $TRAVIS_BUILD_DIR/test/bdd
+  - # behave --format=progress3 api
+  - if [[ $TEST_SUITE == "tests" ]]; then behave -DREMOVE_TEMPLATE=1 --format=progress3 db ; fi
+  - if [[ $TEST_SUITE == "tests" ]]; then behave --format=progress3 osm2pgsql ; fi
+  - cd $TRAVIS_BUILD_DIR/build
+  - if [[ $TEST_SUITE == "monaco" ]]; then wget --no-verbose --output-document=../data/monaco.osm.pbf http://download.geofabrik.de/europe/monaco-latest.osm.pbf; fi
+  - if [[ $TEST_SUITE == "monaco" ]]; then /usr/bin/env php ./utils/setup.php --osm-file ../data/monaco.osm.pbf --osm2pgsql-cache 1000 --all 2>&1 | grep -v 'ETA (seconds)'; fi
+  - if [[ $TEST_SUITE == "monaco" ]]; then /usr/bin/env php ./utils/specialphrases.php --wiki-import | psql -d test_api_nominatim >/dev/null; fi
+  - if [[ $TEST_SUITE == "monaco" ]]; then /usr/bin/env php ./utils/check_import_finished.php; fi
+notifications:
+  email: false

CMakeLists.txt

@@ -19,7 +19,7 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
 project(nominatim)
 
 set(NOMINATIM_VERSION_MAJOR 3)
-set(NOMINATIM_VERSION_MINOR 6)
+set(NOMINATIM_VERSION_MINOR 5)
 set(NOMINATIM_VERSION_PATCH 0)
 
 set(NOMINATIM_VERSION "${NOMINATIM_VERSION_MAJOR}.${NOMINATIM_VERSION_MINOR}.${NOMINATIM_VERSION_PATCH}")
@@ -79,16 +79,14 @@ endif()
 
 # Setting PHP binary variable as to command line (prevailing) or auto detect
 
-if (BUILD_API OR BUILD_IMPORTER)
-    if (NOT PHP_BIN)
-         find_program (PHP_BIN php)
-    endif()
-    # sanity check if PHP binary exists
-    if (NOT EXISTS ${PHP_BIN})
-        message(FATAL_ERROR "PHP binary not found. Install php or provide location with -DPHP_BIN=/path/php ")
-    endif()
-    message (STATUS "Using PHP binary " ${PHP_BIN})
+if (NOT PHP_BIN)
+     find_program (PHP_BIN php)
 endif()
+# sanity check if PHP binary exists
+if (NOT EXISTS ${PHP_BIN})
+    message(FATAL_ERROR "PHP binary not found. Install php or provide location with -DPHP_BIN=/path/php ")
+endif()
+message (STATUS "Using PHP binary " ${PHP_BIN})
 
 #-----------------------------------------------------------------------------
 # import scripts and utilities (importer only)
@@ -121,6 +119,7 @@ if (BUILD_API)
    set(WEBSITESCRIPTS
        website/deletable.php
        website/details.php
+       website/hierarchy.php
        website/lookup.php
        website/polygons.php
        website/reverse.php
@@ -140,16 +139,6 @@ if (BUILD_API)
            COMMAND ln -sf ${PROJECT_SOURCE_DIR}/website/${wp} ${PROJECT_BINARY_DIR}/website/
        )
    endforeach()
-
-   add_custom_target(serve
-           php -S 127.0.0.1:8088
-           WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/website
-   )
-
-   add_custom_target(serve-global
-           php -S 0.0.0.0:8088
-           WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/website
-   )
 endif()
 
 #-----------------------------------------------------------------------------

CONTRIBUTING.md

@@ -7,6 +7,41 @@ Please always open a separate issue for each problem. In particular, do
 not add your bugs to closed issues. They may looks similar to you but
 often are completely different from the maintainer's point of view.
 
+### When Reporting Bad Search Results...
+
+Please make sure to add the following information:
+
+ * the URL of the query that produces the bad result
+ * the result you are getting
+ * the expected result, preferably a link to the OSM object you want to find,
+   otherwise an address that is as precise as possible
+
+To get the link to the OSM object, you can try the following:
+
+ * go to https://openstreetmap.org
+ * zoom to the area of the map where you expect the result and
+   zoom in as much as possible
+ * click on the question mark on the right side of the map,
+   then with the queston cursor on the map where your object is located
+ * find the object of interest in the list that appears on the left side
+ * click on the object and report the URL back that the browser shows
+
+### When Reporting Bugs...
+
+Please add the following information to your issue:
+
+ * hardware configuration: RAM size, CPUs, kind and size of disks
+ * Operating system (also mention if you are running on a cloud service)
+ * Postgres and Postgis version
+ * list of settings you changed in your Postgres configuration
+ * Nominatim version (release version or,
+   if you run from the git repo, the output of `git rev-parse HEAD`)
+ * (if applicable) exact command line of the command that was causing the issue
+
+Bug reports that do not include extensive information about your system,
+about the problem and about what you have been trying to debug the problem
+will be closed.
+
 ## Workflow for Pull Requests
 
 We love to get pull requests from you. We operate the "Fork & Pull" model

ChangeLog

@@ -1,50 +1,3 @@
-3.6.0
-
- * add full support for searching by and displaying of addr:* tags
- * improve address output for large-area objects
- * better use of country names from OSM data for search and display
- * better debug output for reverse call
- * add support for addr:place links without an place equivalent in OSM
- * improve finding postcodes with normalisation artefacts
- * batch object to index for rank 30, avoiding a wrap-around of transaction
-   IDs in PostgreSQL
- * introduce dynamic address rank computation for administrative boundaries
-   depending on linked objects and their place in the admin level hierarchy
- * add country-specific address ranking for Indonesia, Russia, Belgium and
-   the Netherlands (thanks @hendrikmoree)
- * make sure wikidata/wikipedia tags are imported for all styles
- * make POIs searchable by name and housenumber (thanks @joy-yyd)
- * reverse geocoding now ignores places without an address rank (rivers etc.)
- * installation of a webserver is no longer mandatory, for development
-   use the php internal webserver via 'make serve
- * reduce the influence of place nodes in addresses
- * drop support for the unspecific is_in tag
- * various minor tweaks to supplied styles
- * move HTML web frontend into its own project
- * move scripts for processing external data sources into separate directories
- * introduce separate configuration for website (thanks @krahulreddy)
- * update documentation, in particular, clean up development docs
- * update osm2pgsql to 1.4.0
-
-3.5.2
-
- * ensure that wikipedia tags are imported for all styles
- * reinstate verbosity for indexing during updates
- * make house number reappear in display name on named POIs
- * introduce batch processing in indexer to avoid transaction ID overrun
- * increase splitting for large geometries to improve indexing speed
- * remove deprecated get_magic_quotes_gpc() function
- * make sure that all postcodes have an entry in word and are thus searchable
- * remove use of ST_Covers in conjunction woth ST_Intersects,
-   causes bad query planning and slow updates in Postgis3
- * update osm2pgsql
-
-3.5.1
-
- * disable jit and parallel processing in PostgreSQL for osm2pgsql
- * update libosmium to 2.15.6 (fixes an issue with processing hanging
-   on large multipolygons)
-
 3.5.0
 
  * structured select on HTML search page
@@ -58,7 +11,7 @@
  * cleanup of partition function
  * improve parenting for large POIs
  * add support for Postgresql 12 and Postgis 3
- * add earlier cleanup when --drop is given, to reduce memory usage
+ * add earlier cleanup when --drop is given, to reduce meory usage
  * remove use of place_id in URLs
  * replace C nominatim indexer with a simpler Python implementation
  * split up the huge sql/functions.sql file

README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://github.com/osm-search/Nominatim/workflows/CI%20Tests/badge.svg)](https://github.com/osm-search/Nominatim/actions?query=workflow%3A%22CI+Tests%22)
+[![Build Status](https://travis-ci.org/osm-search/Nominatim.svg?branch=master)](https://travis-ci.org/osm-search/Nominatim)
 
 Nominatim
 =========

VAGRANT.md

@@ -160,9 +160,9 @@ You can configure/download other Vagrant boxes from [https://app.vagrantup.com/b
 
 Let's say you have a Postgres database named `nominatim_it` on server `your-server.com` and port `5432`. The Postgres username is `postgres`. You can edit `settings/local.php` and point Nominatim to it.
 
-    pgsql:host=your-server.com;port=5432;user=postgres;dbname=nominatim_it
+    pgsql://postgres@your-server.com:5432/nominatim_it
     
-No data import or restarting necessary.
+No data import necessary or restarting necessary.
 
 If the Postgres installation is behind a firewall, you can try
 

Vagrantfile

@@ -4,38 +4,18 @@
 Vagrant.configure("2") do |config|
   # Apache webserver
   config.vm.network "forwarded_port", guest: 80, host: 8089
-  config.vm.network "forwarded_port", guest: 8088, host: 8088
 
   # If true, then any SSH connections made will enable agent forwarding.
   config.ssh.forward_agent = true
 
-  # Never sync the current directory to /vagrant.
-  config.vm.synced_folder ".", "/vagrant", disabled: true
-
   checkout = "yes"
   if ENV['CHECKOUT'] != 'y' then
-    checkout = "no"
-  end
-
-  config.vm.provider "virtualbox" do |vb, override|
-    vb.gui = false
-    vb.memory = 2048
-    vb.customize ["setextradata", :id, "VBoxInternal2/SharedFoldersEnableSymlinksCreate//vagrant","0"]
-    if ENV['CHECKOUT'] != 'y' then
-      override.vm.synced_folder ".", "/home/vagrant/Nominatim"
-    end
-  end
-
-  config.vm.provider "libvirt" do |lv, override|
-    lv.memory = 2048
-    lv.nested = true
-    if ENV['CHECKOUT'] != 'y' then
-      override.vm.synced_folder ".", "/home/vagrant/Nominatim", type: 'nfs'
-    end
+      config.vm.synced_folder ".", "/home/vagrant/Nominatim"
+      checkout = "no"
   end
 
   config.vm.define "ubuntu", primary: true do |sub|
-      sub.vm.box = "generic/ubuntu2004"
+      sub.vm.box = "bento/ubuntu-20.04"
       sub.vm.provision :shell do |s|
         s.path = "vagrant/Install-on-Ubuntu-20.sh"
         s.privileged = false
@@ -43,26 +23,8 @@ Vagrant.configure("2") do |config|
       end
   end
 
-  config.vm.define "ubuntu-apache" do |sub|
-      sub.vm.box = "generic/ubuntu2004"
-      sub.vm.provision :shell do |s|
-        s.path = "vagrant/Install-on-Ubuntu-20.sh"
-        s.privileged = false
-        s.args = [checkout, "install-apache"]
-      end
-  end
-
-  config.vm.define "ubuntu-nginx" do |sub|
-      sub.vm.box = "generic/ubuntu2004"
-      sub.vm.provision :shell do |s|
-        s.path = "vagrant/Install-on-Ubuntu-20.sh"
-        s.privileged = false
-        s.args = [checkout, "install-nginx"]
-      end
-  end
-
-  config.vm.define "ubuntu18" do |sub|
-      sub.vm.box = "generic/ubuntu1804"
+  config.vm.define "ubuntu18", primary: true do |sub|
+      sub.vm.box = "bento/ubuntu-18.04"
       sub.vm.provision :shell do |s|
         s.path = "vagrant/Install-on-Ubuntu-18.sh"
         s.privileged = false
@@ -70,41 +32,60 @@ Vagrant.configure("2") do |config|
       end
   end
 
-  config.vm.define "ubuntu18-apache" do |sub|
-      sub.vm.box = "generic/ubuntu1804"
+  config.vm.define "ubuntu18nginx" do |sub|
+      sub.vm.box = "bento/ubuntu-18.04"
       sub.vm.provision :shell do |s|
-        s.path = "vagrant/Install-on-Ubuntu-18.sh"
+        s.path = "vagrant/Install-on-Ubuntu-18-nginx.sh"
         s.privileged = false
-        s.args = [checkout, "install-apache"]
+        s.args = [checkout]
       end
   end
 
-  config.vm.define "ubuntu18-nginx" do |sub|
-      sub.vm.box = "generic/ubuntu1804"
+  config.vm.define "ubuntu16" do |sub|
+      sub.vm.box = "bento/ubuntu-16.04"
       sub.vm.provision :shell do |s|
-        s.path = "vagrant/Install-on-Ubuntu-18.sh"
+        s.path = "vagrant/Install-on-Ubuntu-16.sh"
         s.privileged = false
-        s.args = [checkout, "install-nginx"]
+        s.args = [checkout]
       end
   end
 
-  config.vm.define "centos7" do |sub|
-      sub.vm.box = "centos/7"
+  config.vm.define "travis" do |sub|
+      sub.vm.box = "bento/ubuntu-14.04"
       sub.vm.provision :shell do |s|
-        s.path = "vagrant/Install-on-Centos-7.sh"
+        s.path = "vagrant/install-on-travis-ci.sh"
         s.privileged = false
         s.args = [checkout]
       end
   end
 
   config.vm.define "centos" do |sub|
+      sub.vm.box = "centos/7"
+      sub.vm.provision :shell do |s|
+        s.path = "vagrant/Install-on-Centos-7.sh"
+        s.privileged = false
+        s.args = "yes"
+      end
+      sub.vm.synced_folder ".", "/home/vagrant/Nominatim", disabled: true
+      sub.vm.synced_folder ".", "/vagrant", disabled: true
+  end
+
+  config.vm.define "centos8" do |sub|
       sub.vm.box = "generic/centos8"
       sub.vm.provision :shell do |s|
         s.path = "vagrant/Install-on-Centos-8.sh"
         s.privileged = false
-        s.args = [checkout]
+        s.args = "yes"
       end
+      sub.vm.synced_folder ".", "/home/vagrant/Nominatim", disabled: true
+      sub.vm.synced_folder ".", "/vagrant", disabled: true
   end
 
 
+  config.vm.provider "virtualbox" do |vb|
+    vb.gui = false
+    vb.memory = 2048
+    vb.customize ["setextradata", :id, "VBoxInternal2/SharedFoldersEnableSymlinksCreate//vagrant","0"]
+  end
+
 end

cmake/website.tmpl

@@ -1,5 +1,3 @@
 <?php
-@define('CONST_Debug', (isset($_GET['debug']) && $_GET['debug']));
-require_once(dirname(dirname(__FILE__)).'/settings/settings-frontend.php');
-
+require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
 require_once(CONST_BasePath.'/@script_source@');

data-sources/country-grid/README.md

@@ -0,0 +1,77 @@
+# Fallback Country Boundaries
+
+Each place is assigned a `country_code` and partition. Partitions derive from `country_code`.
+
+Nominatim imports two pre-generated files
+
+   * `data/country_name.sql` (country code, name, default language, partition)
+   * `data/country_osm_grid.sql` (country code, geometry)
+
+before creating places in the database. This helps with fast lookups and missing data (e.g. if the data the user wants to import doesn't contain any country places).
+
+The number of countries in the world can change (South Sudan created 2011, Germany reunification), so can their boundaries. This document explain how the pre-generated files can be updated.
+
+
+
+## Country code
+
+Each place is assigned a two letter country_code based on its location, e.g. `gb` for Great Britain. Or `NULL` if no suitable country is found (usually it's in open water then).
+
+In `sql/functions.sql: get_country_code(geometry)` the place's center is checked against
+
+   1. country places already imported from the user's data file. Places are imported by rank low-to-high. Lowest rank 2 is countries so most places should be matched. Still the data file might be incomplete.
+   2. if unmatched: OSM grid boundaries
+   3. if still unmatched: OSM grid boundaries, but allow a small distance
+
+
+
+## Partitions
+
+Each place is assigned partition, which is a number 0..250. 0 is fallback/other.
+
+During place indexing (`sql/functions.sql: placex_insert()`) a place is assigned the partition based on its country code (`sql/functions.sql: get_partition(country_code)`). It checks in the `country_name` table.
+
+Most countries have their own partition, some share a partition. Thus partition counts vary greatly.
+
+Several database tables are split by partition to allow queries to run against less indices and improve caching.
+
+   * `location_area_large_<partition>`
+   * `search_name_<partition>`
+   * `location_road_<partition>`
+
+
+
+
+
+## Data files
+
+### data/country_name.sql
+
+Export from existing database table plus manual changes. `country_default_language_code` most taken from [https://wiki.openstreetmap.org/wiki/Nominatim/Country_Codes](), see `utils/country_languages.php`.
+
+
+
+### data/country_osm_grid.sql
+
+`country_grid.sql` merges territories by country. Then uses `function.sql: quad_split_geometry` to split each country into multiple [Quadtree](https://en.wikipedia.org/wiki/Quadtree) polygons for faster point-in-polygon lookups.
+
+To visualize one country as geojson feature collection, e.g. for loading into [geojson.io](http://geojson.io/):
+
+```
+-- http://www.postgresonline.com/journal/archives/267-Creating-GeoJSON-Feature-Collections-with-JSON-and-PostGIS-functions.html
+
+SELECT row_to_json(fc)
+FROM (
+  SELECT 'FeatureCollection' As type, array_to_json(array_agg(f)) As features
+  FROM (
+    SELECT 'Feature' As type,
+    ST_AsGeoJSON(lg.geometry)::json As geometry,
+    row_to_json((country_code, area)) As properties
+    FROM country_osm_grid As lg where country_code='mx'
+  ) As f
+) As fc;
+```
+
+`cat /tmp/query.sql | psql -At nominatim > /tmp/mexico.quad.geojson`
+
+![mexico](mexico.quad.png)

data-sources/country-grid/country_grid.sql

@@ -0,0 +1,33 @@
+-- Script to build a calculated country grid from existing tables
+DROP TABLE IF EXISTS tmp_country_osm_grid;
+CREATE TABLE tmp_country_osm_grid as select country_name.country_code,st_union(placex.geometry) as geometry from country_name,
+  placex
+  where (lower(placex.country_code) = country_name.country_code)
+    and placex.rank_search < 16 and st_area(placex.geometry) > 0 
+  group by country_name.country_code;
+ALTER TABLE tmp_country_osm_grid add column area double precision;
+UPDATE tmp_country_osm_grid set area = st_area(geometry::geography);
+
+-- compare old and new
+select country_code, round, round(log(area)) from (select distinct country_code,round(log(area)) from country_osm_grid order by country_code) as x 
+  left outer join tmp_country_osm_grid using (country_code) where area is null or round(log(area)) != round;
+
+DROP TABLE IF EXISTS new_country_osm_grid;
+CREATE TABLE new_country_osm_grid as select country_code,area,quad_split_geometry(geometry,0.5,20) as geometry from tmp_country_osm_grid;
+CREATE INDEX new_idx_country_osm_grid_geometry ON new_country_osm_grid USING GIST (geometry);
+
+-- Sometimes there are problems calculating area due to invalid data - optionally recalc
+UPDATE new_country_osm_grid set area = sum from (select country_code,sum(case when st_area(geometry::geography) = 'NaN' THEN 0 ELSE st_area(geometry::geography) END) 
+ from new_country_osm_grid group by country_code) as x where x.country_code = new_country_osm_grid.country_code;
+
+-- compare old and new
+select country_code, x.round, y.round from (select distinct country_code,round(log(area)) from country_osm_grid order by country_code) as x
+  left outer join (select distinct country_code,round(log(area)) from new_country_osm_grid order by country_code) as y
+    using (country_code) where x.round != y.round;
+
+-- Flip the new table in
+BEGIN;
+DROP TABLE IF EXISTS country_osm_grid;
+ALTER TABLE new_country_osm_grid rename to country_osm_grid;
+ALTER INDEX new_idx_country_osm_grid_geometry RENAME TO idx_country_osm_grid_geometry;
+COMMIT;

data-sources/gb-postcodes/README.md

@@ -0,0 +1,56 @@
+# GB Postcodes
+
+
+The server [importing instructions](https://www.nominatim.org/release-docs/latest/admin/Import-and-Update/) allow optionally download [`gb_postcode_data.sql.gz`](https://www.nominatim.org/data/gb_postcode_data.sql.gz). This document explains how the file got created.
+
+## GB vs UK
+
+GB (Great Britain) is more correct as the Ordnance Survey dataset doesn't contain postcodes from Northern Ireland.
+
+## Importing separately after the initial import
+
+If you forgot to download the file, or have a new version, you can import it separately:
+
+1. Import the downloaded `gb_postcode_data.sql.gz` file.
+
+2. Run the SQL query `SELECT count(getorcreate_postcode_id(postcode)) FROM gb_postcode;`. This will update the search index.
+
+3. Run `utils/setup.php --calculate-postcodes` from the build directory. This will copy data form the `gb_postcode` table to the `location_postcodes` table.
+
+
+
+## Converting Code-Point Open data
+
+1. Download from [Code-Point® Open](https://www.ordnancesurvey.co.uk/business-and-government/products/code-point-open.html). It requires an email address where a download link will be send to.
+
+2. `unzip codepo_gb.zip`
+
+    Unpacked you'll see a directory of CSV files.
+
+        $ more codepo_gb/Data/CSV/n.csv
+        "N1 0AA",10,530626,183961,"E92000001","E19000003","E18000007","","E09000019","E05000368"
+        "N1 0AB",10,530559,183978,"E92000001","E19000003","E18000007","","E09000019","E05000368"
+
+    The coordinates are "Northings" and "Eastings" in [OSGB 1936](http://epsg.io/1314) projection. They can be projected to WGS84 like this
+
+        SELECT ST_AsText(ST_Transform(ST_SetSRID('POINT(530626 183961)'::geometry,27700), 4326));
+        POINT(-0.117872733220225 51.5394424719303)
+
+    [-0.117872733220225 51.5394424719303 on OSM map](https://www.openstreetmap.org/?mlon=-0.117872733220225&mlat=51.5394424719303&zoom=16)
+
+
+
+3. Create database, import CSV files, add geometry column, dump into file
+
+        DBNAME=create_gb_postcode_file
+        createdb $DBNAME
+        echo 'CREATE EXTENSION postgis' | psql $DBNAME
+
+        cat data/gb_postcode_table.sql | psql $DBNAME      
+        cat codepo_gb/Data/CSV/*.csv | ./data-sources/gb-postcodes/convert_codepoint.php | psql $DBNAME
+        cat codepo_gb/Doc/licence.txt | iconv -f iso-8859-1 -t utf-8 | dos2unix | sed 's/^/-- /g' > gb_postcode_data.sql
+        pg_dump -a -t gb_postcode $DBNAME | grep -v '^--' >> gb_postcode_data.sql
+      
+        gzip -9 -f gb_postcode_data.sql
+        ls -lah gb_postcode_data.*
+        # dropdb $DBNAME

data-sources/gb-postcodes/convert_codepoint.php

@@ -0,0 +1,37 @@
+#!/usr/bin/env php
+<?php
+
+echo <<< EOT
+
+ALTER TABLE gb_postcode ADD COLUMN easting bigint;
+ALTER TABLE gb_postcode ADD COLUMN northing bigint;
+
+TRUNCATE gb_postcode;
+
+COPY gb_postcode (id, postcode, easting, northing) FROM stdin;
+
+EOT;
+
+$iCounter = 0;
+while ($sLine = fgets(STDIN)) {
+    $aColumns = str_getcsv($sLine);
+
+    // insert space before the third last position
+    // https://stackoverflow.com/a/9144834
+    $postcode = $aColumns[0];
+    $postcode = preg_replace('/\s*(...)$/', ' $1', $postcode);
+
+    echo join("\t", array($iCounter, $postcode, $aColumns[2], $aColumns[3]))."\n";
+
+    $iCounter = $iCounter + 1;
+}
+
+echo <<< EOT
+\.
+
+UPDATE gb_postcode SET geometry=ST_Transform(ST_SetSRID(CONCAT('POINT(', easting, ' ', northing, ')')::geometry, 27700), 4326);
+
+ALTER TABLE gb_postcode DROP COLUMN easting;
+ALTER TABLE gb_postcode DROP COLUMN northing;
+
+EOT;

data-sources/us-tiger/README.md

@@ -0,0 +1,26 @@
+# US TIGER address data
+
+Convert [TIGER](https://www.census.gov/geographies/mapping-files/time-series/geo/tiger-line-file.html)/Line dataset of the US Census Bureau to SQL files which can be imported by Nominatim. The created tables in the Nominatim database are separate from OpenStreetMap tables and get queried at search time separately.
+
+The dataset gets updated once per year. Downloading is prone to be slow (can take a full day) and converting them can take hours as well.
+
+Replace '2019' with the current year throughout.
+
+  1. Install the GDAL library and python bindings and the unzip tool
+
+        # Ubuntu:
+        sudo apt-get install python3-gdal unzip
+
+  2. Get the TIGER 2019 data. You will need the EDGES files
+     (3,233 zip files, 11GB total).
+
+         wget -r ftp://ftp2.census.gov/geo/tiger/TIGER2019/EDGES/
+
+  3. Convert the data into SQL statements. Adjust the file paths in the scripts as needed
+
+        cd data-sources/us-tiger
+        ./convert.sh <input-path> <output-path>
+
+  4. Maybe: package the created files
+  
+        tar -czf tiger2019-nominatim-preprocessed.tar.gz tiger

data-sources/us-tiger/convert.sh

@@ -0,0 +1,48 @@
+#!/bin/bash
+
+INPATH=$1
+OUTPATH=$2
+
+if [[ ! -d "$INPATH" ]]; then
+    echo "input path does not exist"
+    exit 1
+fi
+
+if [[ ! -d "$OUTPATH" ]]; then
+    echo "output path does not exist"
+    exit 1
+fi
+
+INREGEX='_([0-9]{5})_edges.zip'
+WORKPATH="$OUTPATH/tmp-workdir/"
+mkdir -p "$WORKPATH"
+
+
+
+INFILES=($INPATH/*.zip)
+echo "Found ${#INFILES[*]} files."
+
+for F in ${INFILES[*]}; do
+    # echo $F
+
+    if [[ "$F" =~ $INREGEX ]]; then
+        COUNTYID=${BASH_REMATCH[1]}
+        SHAPEFILE="$WORKPATH/$(basename $F '.zip').shp"
+        SQLFILE="$OUTPATH/$COUNTYID.sql"
+
+        unzip -o -q -d "$WORKPATH" "$F"
+        if [[ ! -e "$SHAPEFILE" ]]; then
+            echo "Unzip failed. $SHAPEFILE not found."
+            exit 1
+        fi
+
+        ./tiger_address_convert.py "$SHAPEFILE" "$SQLFILE"
+
+        rm $WORKPATH/*
+    fi
+done
+
+OUTFILES=($OUTPATH/*.sql)
+echo "Wrote ${#OUTFILES[*]} files."
+
+rmdir $WORKPATH

data-sources/us-tiger/tiger_address_convert.py

@@ -0,0 +1,620 @@
+#!/usr/bin/python3
+# Tiger road data to OSM conversion script
+# Creates Karlsruhe-style address ways beside the main way
+# based on the Massachusetts GIS script by christopher schmidt
+
+#BUGS:
+# On very tight curves, a loop may be generated in the address way.
+# It would be nice if the ends of the address ways were not pulled back from dead ends
+
+
+# Ways that include these mtfccs should not be uploaded
+# H1100 Connector
+# H3010 Stream/River
+# H3013 Braided Stream
+# H3020 Canal, Ditch or Aqueduct
+# L4130 Point-to-Point Line
+# L4140 Property/Parcel Line (Including PLSS)
+# P0001 Nonvisible Linear Legal/Statistical Boundary
+# P0002 Perennial Shoreline
+# P0003 Intermittent Shoreline
+# P0004 Other non-visible bounding Edge (e.g., Census water boundary, boundary of an areal feature)
+ignoremtfcc = [ "H1100", "H3010", "H3013", "H3020", "L4130", "L4140", "P0001", "P0002", "P0003", "P0004" ]
+
+# Sets the distance that the address ways should be from the main way, in feet.
+address_distance = 30
+
+# Sets the distance that the ends of the address ways should be pulled back from the ends of the main way, in feet
+address_pullback = 45
+
+import sys, os.path, json
+try:
+    from osgeo import ogr
+    from osgeo import osr
+except:
+    import ogr
+    import osr
+
+# https://www.census.gov/geo/reference/codes/cou.html 
+# tiger_county_fips.json was generated from the following:
+# wget https://www2.census.gov/geo/docs/reference/codes/files/national_county.txt
+# cat national_county.txt | perl -F, -naE'($F[0] ne 'AS') && $F[3] =~ s/ ((city|City|County|District|Borough|City and Borough|Municipio|Municipality|Parish|Island|Census Area)(?:, |\Z))+//; say qq(  "$F[1]$F[2]": "$F[3], $F[0]",)'
+json_fh = open(os.path.dirname(sys.argv[0]) + "/tiger_county_fips.json")
+county_fips_data = json.load(json_fh)
+
+def parse_shp_for_geom_and_tags( filename ):
+    #ogr.RegisterAll()
+
+    dr = ogr.GetDriverByName("ESRI Shapefile")
+    poDS = dr.Open( filename )
+
+    if poDS == None:
+        raise "Open failed."
+
+    poLayer = poDS.GetLayer( 0 )
+
+    fieldNameList = []
+    layerDefinition = poLayer.GetLayerDefn()
+    for i in range(layerDefinition.GetFieldCount()):
+        fieldNameList.append(layerDefinition.GetFieldDefn(i).GetName())
+    # sys.stderr.write(",".join(fieldNameList))
+
+    poLayer.ResetReading()
+
+    ret = []
+
+    poFeature = poLayer.GetNextFeature()
+    while poFeature:
+        tags = {}
+        
+        # WAY ID
+        tags["tiger:way_id"] = int( poFeature.GetField("TLID") )
+        
+        # FEATURE IDENTIFICATION
+        mtfcc = poFeature.GetField("MTFCC");
+        if mtfcc != None:
+
+            if mtfcc == "L4010":        #Pipeline
+                tags["man_made"] = "pipeline"
+            if mtfcc == "L4020":        #Powerline
+                tags["power"] = "line"
+            if mtfcc == "L4031":        #Aerial Tramway/Ski Lift
+                tags["aerialway"] = "cable_car"
+            if mtfcc == "L4110":        #Fence Line
+                tags["barrier"] = "fence"
+            if mtfcc == "L4125":        #Cliff/Escarpment
+                tags["natural"] = "cliff"
+            if mtfcc == "L4165":        #Ferry Crossing
+                tags["route"] = "ferry"
+            if mtfcc == "R1011":        #Railroad Feature (Main, Spur, or Yard)
+                tags["railway"] = "rail"
+                ttyp = poFeature.GetField("TTYP")
+                if ttyp != None:
+                    if ttyp == "S":
+                        tags["service"] = "spur"
+                    if ttyp == "Y":
+                        tags["service"] = "yard"
+                    tags["tiger:ttyp"] = ttyp
+            if mtfcc == "R1051":        #Carline, Streetcar Track, Monorail, Other Mass Transit Rail)
+                tags["railway"] = "light_rail"
+            if mtfcc == "R1052":        #Cog Rail Line, Incline Rail Line, Tram
+                tags["railway"] = "incline"
+            if mtfcc == "S1100":
+                tags["highway"] = "primary"
+            if mtfcc == "S1200":
+                tags["highway"] = "secondary"
+            if mtfcc == "S1400":
+                tags["highway"] = "residential"
+            if mtfcc == "S1500":
+                tags["highway"] = "track"
+            if mtfcc == "S1630":        #Ramp
+                tags["highway"] = "motorway_link"
+            if mtfcc == "S1640":        #Service Drive usually along a limited access highway
+                tags["highway"] = "service"
+            if mtfcc == "S1710":        #Walkway/Pedestrian Trail
+                tags["highway"] = "path"
+            if mtfcc == "S1720":
+                tags["highway"] = "steps"
+            if mtfcc == "S1730":        #Alley
+                tags["highway"] = "service"
+                tags["service"] = "alley"
+            if mtfcc == "S1740":        #Private Road for service vehicles (logging, oil, fields, ranches, etc.)
+                tags["highway"] = "service"
+                tags["access"] = "private"
+            if mtfcc == "S1750":        #Private Driveway
+                tags["highway"] = "service"
+                tags["access"] = "private"
+                tags["service"] = "driveway"
+            if mtfcc == "S1780":        #Parking Lot Road
+                tags["highway"] = "service"
+                tags["service"] = "parking_aisle"
+            if mtfcc == "S1820":        #Bike Path or Trail
+                tags["highway"] = "cycleway"
+            if mtfcc == "S1830":        #Bridle Path
+                tags["highway"] = "bridleway"
+            tags["tiger:mtfcc"] = mtfcc
+
+        # FEATURE NAME
+        if poFeature.GetField("FULLNAME"):
+            #capitalizes the first letter of each word
+            name = poFeature.GetField( "FULLNAME" )
+            tags["name"] = name
+
+            #Attempt to guess highway grade
+            if name[0:2] == "I-":
+                tags["highway"] = "motorway"
+            if name[0:3] == "US ":
+                tags["highway"] = "primary"
+            if name[0:3] == "US-":
+                tags["highway"] = "primary"
+            if name[0:3] == "Hwy":
+                if tags["highway"] != "primary":
+                    tags["highway"] = "secondary"
+
+        # TIGER 2017 no longer contains this field
+        if 'DIVROAD' in fieldNameList:
+            divroad = poFeature.GetField("DIVROAD")
+            if divroad != None:
+                if divroad == "Y" and "highway" in tags and tags["highway"] == "residential":
+                    tags["highway"] = "tertiary"
+                tags["tiger:separated"] = divroad
+
+        statefp = poFeature.GetField("STATEFP")
+        countyfp = poFeature.GetField("COUNTYFP")
+        if (statefp != None) and (countyfp != None):
+            county_name = county_fips_data.get(statefp + '' + countyfp)
+            if county_name:
+                tags["tiger:county"] = county_name
+
+        # tlid = poFeature.GetField("TLID")
+        # if tlid != None:
+        #     tags["tiger:tlid"] = tlid
+
+        lfromadd = poFeature.GetField("LFROMADD")
+        if lfromadd != None:
+            tags["tiger:lfromadd"] = lfromadd
+
+        rfromadd = poFeature.GetField("RFROMADD")
+        if rfromadd != None:
+            tags["tiger:rfromadd"] = rfromadd
+
+        ltoadd = poFeature.GetField("LTOADD")
+        if ltoadd != None:
+            tags["tiger:ltoadd"] = ltoadd
+
+        rtoadd = poFeature.GetField("RTOADD")
+        if rtoadd != None:
+            tags["tiger:rtoadd"] = rtoadd
+
+        zipl = poFeature.GetField("ZIPL")
+        if zipl != None:
+            tags["tiger:zip_left"] = zipl
+
+        zipr = poFeature.GetField("ZIPR")
+        if zipr != None:
+            tags["tiger:zip_right"] = zipr
+
+        if mtfcc not in ignoremtfcc:
+            # COPY DOWN THE GEOMETRY
+            geom = []
+            
+            rawgeom = poFeature.GetGeometryRef()
+            for i in range( rawgeom.GetPointCount() ):
+                geom.append( (rawgeom.GetX(i), rawgeom.GetY(i)) )
+    
+            ret.append( (geom, tags) )
+        poFeature = poLayer.GetNextFeature()
+        
+    return ret
+
+
+# ====================================
+# to do read .prj file for this data
+# Change the Projcs_wkt to match your datas prj file.
+# ====================================
+projcs_wkt = \
+"""GEOGCS["GCS_North_American_1983",
+        DATUM["D_North_American_1983",
+        SPHEROID["GRS_1980",6378137,298.257222101]],
+        PRIMEM["Greenwich",0],
+        UNIT["Degree",0.017453292519943295]]"""
+
+from_proj = osr.SpatialReference()
+from_proj.ImportFromWkt( projcs_wkt )
+
+# output to WGS84
+to_proj = osr.SpatialReference()
+to_proj.SetWellKnownGeogCS( "EPSG:4326" )
+
+tr = osr.CoordinateTransformation( from_proj, to_proj )
+
+import math
+def length(segment, nodelist):
+    '''Returns the length (in feet) of a segment'''
+    first = True
+    distance = 0
+    lat_feet = 364613  #The approximate number of feet in one degree of latitude
+    for point in segment:
+        pointid, (lat, lon) = nodelist[ round_point( point ) ]
+        if first:
+            first = False
+        else:
+            #The approximate number of feet in one degree of longitute
+            lrad = math.radians(lat)
+            lon_feet = 365527.822 * math.cos(lrad) - 306.75853 * math.cos(3 * lrad) + 0.3937 * math.cos(5 * lrad)
+            distance += math.sqrt(((lat - previous[0])*lat_feet)**2 + ((lon - previous[1])*lon_feet)**2)
+        previous = (lat, lon)
+    return distance
+
+def addressways(waylist, nodelist, first_id):
+    id = first_id
+    lat_feet = 364613  #The approximate number of feet in one degree of latitude
+    distance = float(address_distance)
+    ret = []
+
+    for waykey, segments in waylist.items():
+        waykey = dict(waykey)
+        rsegments = []
+        lsegments = []
+        for segment in segments:
+            lsegment = []
+            rsegment = []
+            lastpoint = None
+
+            # Don't pull back the ends of very short ways too much
+            seglength = length(segment, nodelist)
+            if seglength < float(address_pullback) * 3.0:
+                pullback = seglength / 3.0
+            else:
+                pullback = float(address_pullback)
+            if "tiger:lfromadd" in waykey:
+                lfromadd = waykey["tiger:lfromadd"]
+            else:
+                lfromadd = None
+            if "tiger:ltoadd" in waykey:
+                ltoadd = waykey["tiger:ltoadd"]
+            else:
+                ltoadd = None
+            if "tiger:rfromadd" in waykey:
+                rfromadd = waykey["tiger:rfromadd"]
+            else: 
+                rfromadd = None
+            if "tiger:rtoadd" in waykey:
+                rtoadd = waykey["tiger:rtoadd"]
+            else:
+                rtoadd = None
+            if rfromadd != None and rtoadd != None:
+                right = True
+            else:
+                right = False
+            if lfromadd != None and ltoadd != None:
+                left = True
+            else:
+                left = False
+            if left or right:
+                first = True
+                firstpointid, firstpoint = nodelist[ round_point( segment[0] ) ]
+
+                finalpointid, finalpoint = nodelist[ round_point( segment[len(segment) - 1] ) ]
+                for point in segment:
+                    pointid, (lat, lon) = nodelist[ round_point( point ) ]
+
+                    #The approximate number of feet in one degree of longitute
+                    lrad = math.radians(lat)
+                    lon_feet = 365527.822 * math.cos(lrad) - 306.75853 * math.cos(3 * lrad) + 0.3937 * math.cos(5 * lrad)
+
+#Calculate the points of the offset ways
+                    if lastpoint != None:
+                        #Skip points too close to start
+                        if math.sqrt((lat * lat_feet - firstpoint[0] * lat_feet)**2 + (lon * lon_feet - firstpoint[1] * lon_feet)**2) < pullback:
+                            #Preserve very short ways (but will be rendered backwards)
+                            if pointid != finalpointid:
+                                continue
+                        #Skip points too close to end
+                        if math.sqrt((lat * lat_feet - finalpoint[0] * lat_feet)**2 + (lon * lon_feet - finalpoint[1] * lon_feet)**2) < pullback:
+                            #Preserve very short ways (but will be rendered backwards)
+                            if (pointid != firstpointid) and (pointid != finalpointid):
+                                continue
+
+                        X = (lon - lastpoint[1]) * lon_feet
+                        Y = (lat - lastpoint[0]) * lat_feet
+                        if Y != 0:
+                            theta = math.pi/2 - math.atan( X / Y)
+                            Xp = math.sin(theta) * distance
+                            Yp = math.cos(theta) * distance
+                        else:
+                            Xp = 0
+                            if X > 0:
+                                Yp = -distance
+                            else:
+                                Yp = distance
+
+                        if Y > 0:
+                            Xp = -Xp
+                        else:
+                            Yp = -Yp
+                                
+                        if first:
+                            first = False
+                            dX =  - (Yp * (pullback / distance)) / lon_feet #Pull back the first point
+                            dY = (Xp * (pullback / distance)) / lat_feet
+                            if left:
+                                lpoint = (lastpoint[0] + (Yp / lat_feet) - dY, lastpoint[1] + (Xp / lon_feet) - dX)
+                                lsegment.append( (id, lpoint) )
+                                id += 1
+                            if right:
+                                rpoint = (lastpoint[0] - (Yp / lat_feet) - dY, lastpoint[1] - (Xp / lon_feet) - dX)
+                                rsegment.append( (id, rpoint) )
+                                id += 1
+
+                        else:
+                            #round the curves
+                            if delta[1] != 0:
+                                theta = abs(math.atan(delta[0] / delta[1]))
+                            else:
+                                theta = math.pi / 2
+                            if Xp != 0:
+                                theta = theta - abs(math.atan(Yp / Xp))
+                            else: theta = theta - math.pi / 2
+                            r = 1 + abs(math.tan(theta/2))
+                            if left:
+                                lpoint = (lastpoint[0] + (Yp + delta[0]) * r / (lat_feet * 2), lastpoint[1] + (Xp + delta[1]) * r / (lon_feet * 2))
+                                lsegment.append( (id, lpoint) )
+                                id += 1
+                            if right:
+                                rpoint = (lastpoint[0] - (Yp + delta[0]) * r / (lat_feet * 2), lastpoint[1] - (Xp + delta[1]) * r / (lon_feet * 2))
+                                
+                                rsegment.append( (id, rpoint) )
+                                id += 1
+
+                        delta = (Yp, Xp)
+
+                    lastpoint = (lat, lon)
+
+
+#Add in the last node
+                dX =  - (Yp * (pullback / distance)) / lon_feet
+                dY = (Xp * (pullback / distance)) / lat_feet
+                if left:
+                    lpoint = (lastpoint[0] + (Yp + delta[0]) / (lat_feet * 2) + dY, lastpoint[1] + (Xp + delta[1]) / (lon_feet * 2) + dX )
+                    lsegment.append( (id, lpoint) )
+                    id += 1
+                if right:
+                    rpoint = (lastpoint[0] - Yp / lat_feet + dY, lastpoint[1] - Xp / lon_feet + dX)
+                    rsegment.append( (id, rpoint) )
+                    id += 1
+
+#Generate the tags for ways and nodes
+                zipr = ''
+                zipl = ''
+                name = ''
+                county = ''
+                if "tiger:zip_right" in waykey:
+                    zipr = waykey["tiger:zip_right"]
+                if "tiger:zip_left" in waykey:
+                    zipl = waykey["tiger:zip_left"]
+                if "name" in waykey:
+                    name = waykey["name"]
+                if "tiger:county" in waykey:
+                    county = waykey["tiger:county"]
+                if "tiger:separated" in waykey: # No longer set in Tiger-2017
+                    separated = waykey["tiger:separated"]
+                else:
+                    separated = "N"
+
+#Write the nodes of the offset ways
+                if right:
+                    rlinestring = [];
+                    for i, point in rsegment:
+                        rlinestring.append( "%f %f" % (point[1], point[0]) )
+                if left:
+                    llinestring = [];
+                    for i, point in lsegment:
+                        llinestring.append( "%f %f" % (point[1], point[0]) )
+                if right:
+                    rsegments.append( rsegment )
+                if left:
+                    lsegments.append( lsegment )
+                rtofromint = right        #Do the addresses convert to integers?
+                ltofromint = left        #Do the addresses convert to integers?
+                if right:
+                    try: rfromint = int(rfromadd)
+                    except:
+                        print("Non integer address: %s" % rfromadd)
+                        rtofromint = False
+                    try: rtoint = int(rtoadd)
+                    except:
+                        print("Non integer address: %s" % rtoadd)
+                        rtofromint = False
+                if left:
+                    try: lfromint = int(lfromadd)
+                    except:
+                        print("Non integer address: %s" % lfromadd)
+                        ltofromint = False
+                    try: ltoint = int(ltoadd)
+                    except:
+                        print("Non integer address: %s" % ltoadd)
+                        ltofromint = False
+                if right:
+                    id += 1
+
+                    interpolationtype = "all";
+                    if rtofromint:
+                        if (rfromint % 2) == 0 and (rtoint % 2) == 0:
+                            if separated == "Y":        #Doesn't matter if there is another side
+                                interpolationtype = "even";
+                            elif ltofromint and (lfromint % 2) == 1 and (ltoint % 2) == 1:
+                                interpolationtype = "even";
+                        elif (rfromint % 2) == 1 and (rtoint % 2) == 1:
+                            if separated == "Y":        #Doesn't matter if there is another side
+                                interpolationtype = "odd";
+                            elif ltofromint and (lfromint % 2) == 0 and (ltoint % 2) == 0:
+                                interpolationtype = "odd";
+
+                    ret.append( "SELECT tiger_line_import(ST_GeomFromText('LINESTRING(%s)',4326), %s, %s, %s, %s, %s, %s);" %
+                                ( ",".join(rlinestring), sql_quote(rfromadd), sql_quote(rtoadd), sql_quote(interpolationtype), sql_quote(name), sql_quote(county), sql_quote(zipr) ) )
+
+                if left:
+                    id += 1
+
+                    interpolationtype = "all";
+                    if ltofromint:
+                        if (lfromint % 2) == 0 and (ltoint % 2) == 0:
+                            if separated == "Y":
+                                interpolationtype = "even";
+                            elif rtofromint and (rfromint % 2) == 1 and (rtoint % 2) == 1:
+                                interpolationtype = "even";
+                        elif (lfromint % 2) == 1 and (ltoint % 2) == 1:
+                            if separated == "Y":
+                                interpolationtype = "odd";
+                            elif rtofromint and (rfromint %2 ) == 0 and (rtoint % 2) == 0:
+                                interpolationtype = "odd";
+
+                    ret.append( "SELECT tiger_line_import(ST_GeomFromText('LINESTRING(%s)',4326), %s, %s, %s, %s, %s, %s);" %
+                                ( ",".join(llinestring), sql_quote(lfromadd), sql_quote(ltoadd), sql_quote(interpolationtype), sql_quote(name), sql_quote(county), sql_quote(zipl) ) )
+
+    return ret
+
+def sql_quote( string ):
+    return "'" + string.replace("'", "''") + "'"
+
+def unproject( point ):
+    pt = tr.TransformPoint( point[0], point[1] )
+    return (pt[1], pt[0])
+
+def round_point( point, accuracy=8 ):
+    return tuple( [ round(x,accuracy) for x in point ] )
+
+def compile_nodelist( parsed_gisdata, first_id=1 ):
+    nodelist = {}
+    
+    i = first_id
+    for geom, tags in parsed_gisdata:
+        if len( geom )==0:
+            continue
+        
+        for point in geom:
+            r_point = round_point( point )
+            if r_point not in nodelist:
+                nodelist[ r_point ] = (i, unproject( point ))
+                i += 1
+            
+    return (i, nodelist)
+
+def adjacent( left, right ):
+    left_left = round_point(left[0])
+    left_right = round_point(left[-1])
+    right_left = round_point(right[0])
+    right_right = round_point(right[-1])
+    
+    return ( left_left == right_left or
+             left_left == right_right or
+             left_right == right_left or
+             left_right == right_right )
+             
+def glom( left, right ):
+    left = list( left )
+    right = list( right )
+    
+    left_left = round_point(left[0])
+    left_right = round_point(left[-1])
+    right_left = round_point(right[0])
+    right_right = round_point(right[-1])
+    
+    if left_left == right_left:
+        left.reverse()
+        return left[0:-1] + right
+        
+    if left_left == right_right:
+        return right[0:-1] + left
+        
+    if left_right == right_left:
+        return left[0:-1] + right
+        
+    if left_right == right_right:
+        right.reverse()
+        return left[0:-1] + right
+        
+    raise 'segments are not adjacent'
+
+def glom_once( segments ):
+    if len(segments)==0:
+        return segments
+    
+    unsorted = list( segments )
+    x = unsorted.pop(0)
+    
+    while len( unsorted ) > 0:
+        n = len( unsorted )
+        
+        for i in range(0, n):
+            y = unsorted[i]
+            if adjacent( x, y ):
+                y = unsorted.pop(i)
+                x = glom( x, y )
+                break
+                
+        # Sorted and unsorted lists have no adjacent segments
+        if len( unsorted ) == n:
+            break
+            
+    return x, unsorted
+    
+def glom_all( segments ):
+    unsorted = segments
+    chunks = []
+    
+    while unsorted != []:
+        chunk, unsorted = glom_once( unsorted )
+        chunks.append( chunk )
+        
+    return chunks
+        
+                
+
+def compile_waylist( parsed_gisdata ):
+    waylist = {}
+    
+    #Group by tiger:way_id
+    for geom, tags in parsed_gisdata:
+        way_key = tags.copy()
+        way_key = ( way_key['tiger:way_id'], tuple( [(k,v) for k,v in way_key.items()] ) )
+        
+        if way_key not in waylist:
+            waylist[way_key] = []
+            
+        waylist[way_key].append( geom )
+    
+    ret = {}
+    for (way_id, way_key), segments in waylist.items():
+        ret[way_key] = glom_all( segments )
+    return ret
+            
+
+def shape_to_sql( shp_filename, sql_filename ):
+    
+    print("parsing shpfile %s" % shp_filename)
+    parsed_features = parse_shp_for_geom_and_tags( shp_filename )
+    
+    print("compiling nodelist")
+    i, nodelist = compile_nodelist( parsed_features )
+    
+    print("compiling waylist")
+    waylist = compile_waylist( parsed_features )
+
+    print("preparing address ways")
+    sql_lines = addressways(waylist, nodelist, i)
+
+    print("writing %s" % sql_filename)
+    fp = open( sql_filename, "w" )
+    fp.write( "\n".join( sql_lines ) )
+    fp.close()
+    
+if __name__ == '__main__':
+    import sys, os.path
+    if len(sys.argv) < 3:
+        print("%s input.shp output.sql" % sys.argv[0])
+        sys.exit()
+    shp_filename = sys.argv[1]
+    sql_filename = sys.argv[2]
+    shape_to_sql(shp_filename, sql_filename)

data-sources/wikipedia-wikidata/README.md

@@ -0,0 +1,58 @@
+## Add Wikipedia and Wikidata to Nominatim
+
+OSM contributors frequently tag items with links to Wikipedia and Wikidata. Nominatim can use the page ranking of Wikipedia pages to help indicate the relative importance of osm features. This is done by calculating an importance score between 0 and 1 based on the number of inlinks to an article for a location. If two places have the same name and one is more important than the other, the wikipedia score often points to the correct place. 
+
+These scripts extract and prepare both Wikipedia page rank and Wikidata links for use in Nominatim.  
+
+#### Create a new postgres DB for Processing
+
+Due to the size of initial and intermediate tables, processing can be done in an external database:
+```
+CREATE DATABASE wikiprocessingdb;
+```
+---
+Wikipedia
+---  
+
+Processing these data requires a large amount of disk space (~1TB) and considerable time (>24 hours).
+
+#### Import & Process Wikipedia tables
+
+This step downloads and converts [Wikipedia](https://dumps.wikimedia.org/) page data SQL dumps to postgreSQL files which can be imported and processed with pagelink information from Wikipedia language sites to calculate importance scores.
+
+- The script will processes data from whatever set of Wikipedia languages are specified in the initial languages array
+
+- Note that processing the top 40 Wikipedia languages can take over a day, and will add nearly 1TB to the processing database. The final output tables will be approximately 11GB and 2GB in size
+
+To download, convert, and import the data, then process summary statistics and compute importance scores, run:
+```
+./import_wikipedia.sh
+```
+---
+Wikidata
+---
+
+This script downloads and processes Wikidata to enrich the previously created Wikipedia tables for use in Nominatim.
+
+#### Import & Process Wikidata
+
+This step downloads and converts [Wikidata](https://dumps.wikimedia.org/wikidatawiki/) page data SQL dumps to postgreSQL files which can be processed and imported into Nominatim database. Also utilizes Wikidata Query Service API to discover and include place types.
+
+- Script presumes that the user has already processed Wikipedia tables as specified above
+
+- Script requires wikidata_place_types.txt and wikidata_place_type_levles.csv
+
+- script requires the [jq json parser](https://stedolan.github.io/jq/)
+
+- Script processes data from whatever set of Wikipedia languages are specified in the initial languages array
+
+- Script queries Wikidata Query Service API and imports all instances of place types listed in wikidata_place_types.txt
+
+- Script updates wikipedia_articles table with extracted wikidata 
+
+By including Wikidata in the wikipedia_articles table, new connections can be made on the fly from the Nominatim placex table to wikipedia_article importance scores. 
+
+To download, convert, and import the data, then process required items, run:
+``` 
+./import_wikidata.sh
+```

data-sources/wikipedia-wikidata/import_wikidata.sh

@@ -0,0 +1,274 @@
+#!/bin/bash
+
+psqlcmd() {
+     psql --quiet wikiprocessingdb
+}
+
+mysql2pgsqlcmd() {
+     ./mysql2pgsql.perl /dev/stdin /dev/stdout
+}
+
+download() {
+     echo "Downloading $1"
+     wget --quiet --no-clobber --tries 3 "$1"
+}
+
+# languages to process (refer to List of Wikipedias here: https://en.wikipedia.org/wiki/List_of_Wikipedias)
+# requires Bash 4.0
+readarray -t LANGUAGES < languages.txt
+
+
+
+echo "====================================================================="
+echo "Download wikidata dump tables"
+echo "====================================================================="
+
+# 114M  wikidatawiki-latest-geo_tags.sql.gz
+# 1.7G  wikidatawiki-latest-page.sql.gz
+# 1.2G  wikidatawiki-latest-wb_items_per_site.sql.gz
+download https://dumps.wikimedia.org/wikidatawiki/latest/wikidatawiki-latest-geo_tags.sql.gz
+download https://dumps.wikimedia.org/wikidatawiki/latest/wikidatawiki-latest-page.sql.gz
+download https://dumps.wikimedia.org/wikidatawiki/latest/wikidatawiki-latest-wb_items_per_site.sql.gz
+
+
+
+
+echo "====================================================================="
+echo "Import wikidata dump tables"
+echo "====================================================================="
+
+echo "Importing wikidatawiki-latest-geo_tags"
+gzip -dc wikidatawiki-latest-geo_tags.sql.gz          | mysql2pgsqlcmd | psqlcmd
+
+echo "Importing wikidatawiki-latest-page"
+gzip -dc wikidatawiki-latest-page.sql.gz              | mysql2pgsqlcmd | psqlcmd
+
+echo "Importing wikidatawiki-latest-wb_items_per_site"
+gzip -dc wikidatawiki-latest-wb_items_per_site.sql.gz | mysql2pgsqlcmd | psqlcmd
+
+
+
+
+
+
+echo "====================================================================="
+echo "Get wikidata places from wikidata query API"
+echo "====================================================================="
+
+echo "Number of place types:"
+wc -l wikidata_place_types.txt
+
+while read F  ; do
+    echo "Querying for place type $F..."
+    wget --quiet "https://query.wikidata.org/bigdata/namespace/wdq/sparql?format=json&query=SELECT ?item WHERE{?item wdt:P31*/wdt:P279*wd:$F;}" -O $F.json
+    jq -r '.results | .[] | .[] | [.item.value] | @csv' $F.json >> $F.txt
+    awk -v qid=$F '{print $0 ","qid}' $F.txt | sed -e 's!"http://www.wikidata.org/entity/!!' | sed 's/"//g' >> $F.csv
+    cat $F.csv >> wikidata_place_dump.csv
+    rm $F.json $F.txt $F.csv
+done < wikidata_place_types.txt
+
+
+
+
+echo "====================================================================="
+echo "Import wikidata places"
+echo "====================================================================="
+
+echo "CREATE TABLE wikidata_place_dump (
+        item        text,
+        instance_of text
+      );"  | psqlcmd
+
+echo "COPY wikidata_place_dump (item, instance_of)
+      FROM '/srv/nominatim/Nominatim/data-sources/wikipedia-wikidata/wikidata_place_dump.csv'
+      DELIMITER ','
+      CSV
+      ;"  | psqlcmd
+
+echo "CREATE TABLE wikidata_place_type_levels (
+        place_type text,
+        level      integer
+      );" | psqlcmd
+
+echo "COPY wikidata_place_type_levels (place_type, level)
+      FROM '/srv/nominatim/Nominatim/data-sources/wikipedia-wikidata/wikidata_place_type_levels.csv'
+      DELIMITER ','
+      CSV
+      HEADER
+      ;" | psqlcmd
+
+
+
+
+echo "====================================================================="
+echo "Create derived tables"
+echo "====================================================================="
+
+echo "CREATE TABLE geo_earth_primary AS
+      SELECT gt_page_id,
+             gt_lat,
+             gt_lon
+      FROM geo_tags
+      WHERE gt_globe = 'earth'
+        AND gt_primary = 1
+        AND NOT(    gt_lat < -90
+                 OR gt_lat > 90
+                 OR gt_lon < -180
+                 OR gt_lon > 180
+                 OR gt_lat=0
+                 OR gt_lon=0)
+      ;" | psqlcmd
+
+echo "CREATE TABLE geo_earth_wikidata AS
+      SELECT DISTINCT geo_earth_primary.gt_page_id,
+                      geo_earth_primary.gt_lat,
+                      geo_earth_primary.gt_lon,
+                      page.page_title,
+                      page.page_namespace
+      FROM geo_earth_primary
+      LEFT OUTER JOIN page
+                   ON (geo_earth_primary.gt_page_id = page.page_id)
+      ORDER BY geo_earth_primary.gt_page_id
+      ;" | psqlcmd
+
+echo "ALTER TABLE wikidata_place_dump
+      ADD COLUMN ont_level integer,
+      ADD COLUMN lat numeric(11,8),
+      ADD COLUMN lon numeric(11,8)
+      ;" | psqlcmd
+
+echo "UPDATE wikidata_place_dump
+      SET ont_level = wikidata_place_type_levels.level
+      FROM wikidata_place_type_levels
+      WHERE wikidata_place_dump.instance_of = wikidata_place_type_levels.place_type
+      ;" | psqlcmd
+
+echo "CREATE TABLE wikidata_places
+      AS
+      SELECT DISTINCT ON (item) item,
+                                instance_of,
+                                MAX(ont_level) AS ont_level,
+                                lat,
+                                lon
+      FROM wikidata_place_dump
+      GROUP BY item,
+               instance_of,
+               ont_level,
+               lat,
+               lon
+      ORDER BY item
+      ;" | psqlcmd
+
+echo "UPDATE wikidata_places
+      SET lat = geo_earth_wikidata.gt_lat,
+          lon = geo_earth_wikidata.gt_lon
+      FROM geo_earth_wikidata
+      WHERE wikidata_places.item = geo_earth_wikidata.page_title
+      ;" | psqlcmd
+
+
+
+
+echo "====================================================================="
+echo "Process language pages"
+echo "====================================================================="
+
+
+echo "CREATE TABLE wikidata_pages (
+        item          text,
+        instance_of   text,
+        lat           numeric(11,8),
+        lon           numeric(11,8),
+        ips_site_page text,
+        language      text
+      );" | psqlcmd
+
+for i in "${LANGUAGES[@]}"
+do
+   echo "CREATE TABLE wikidata_${i}_pages AS
+         SELECT wikidata_places.item,
+                wikidata_places.instance_of,
+                wikidata_places.lat,
+                wikidata_places.lon,
+                wb_items_per_site.ips_site_page
+         FROM wikidata_places
+         LEFT JOIN wb_items_per_site
+                ON (CAST (( LTRIM(wikidata_places.item, 'Q')) AS INTEGER) = wb_items_per_site.ips_item_id)
+         WHERE ips_site_id = '${i}wiki'
+           AND LEFT(wikidata_places.item,1) = 'Q'
+         ORDER BY wikidata_places.item
+         ;" | psqlcmd
+
+   echo "ALTER TABLE wikidata_${i}_pages
+         ADD COLUMN language text
+         ;" | psqlcmd
+
+   echo "UPDATE wikidata_${i}_pages
+         SET language = '${i}'
+         ;" | psqlcmd
+
+   echo "INSERT INTO wikidata_pages
+         SELECT item,
+                instance_of,
+                lat,
+                lon,
+                ips_site_page,
+                language
+         FROM wikidata_${i}_pages
+         ;" | psqlcmd
+done
+
+echo "ALTER TABLE wikidata_pages
+      ADD COLUMN wp_page_title text
+      ;" | psqlcmd
+echo "UPDATE wikidata_pages
+      SET wp_page_title = REPLACE(ips_site_page, ' ', '_')
+      ;" | psqlcmd
+echo "ALTER TABLE wikidata_pages
+      DROP COLUMN ips_site_page
+      ;" | psqlcmd
+
+
+
+
+echo "====================================================================="
+echo "Add wikidata to wikipedia_article table"
+echo "====================================================================="
+
+echo "UPDATE wikipedia_article
+      SET lat = wikidata_pages.lat,
+          lon = wikidata_pages.lon,
+          wd_page_title = wikidata_pages.item,
+          instance_of = wikidata_pages.instance_of
+      FROM wikidata_pages
+      WHERE wikipedia_article.language = wikidata_pages.language
+        AND wikipedia_article.title  = wikidata_pages.wp_page_title
+      ;" | psqlcmd
+
+echo "CREATE TABLE wikipedia_article_slim
+      AS
+      SELECT * FROM wikipedia_article
+      WHERE wikidata_id IS NOT NULL
+      ;" | psqlcmd
+
+echo "ALTER TABLE wikipedia_article
+      RENAME TO wikipedia_article_full
+      ;" | psqlcmd
+
+echo "ALTER TABLE wikipedia_article_slim
+      RENAME TO wikipedia_article
+      ;" | psqlcmd
+
+
+
+
+echo "====================================================================="
+echo "Dropping intermediate tables"
+echo "====================================================================="
+
+echo "DROP TABLE wikidata_place_dump;" | psqlcmd
+echo "DROP TABLE geo_earth_primary;" | psqlcmd
+for i in "${LANGUAGES[@]}"
+do
+    echo "DROP TABLE wikidata_${i}_pages;" | psqlcmd
+done

data-sources/wikipedia-wikidata/import_wikipedia.sh

@@ -0,0 +1,297 @@
+#!/bin/bash
+
+psqlcmd() {
+     psql --quiet wikiprocessingdb |& \
+     grep -v 'does not exist, skipping' |& \
+     grep -v 'violates check constraint' |& \
+     grep -vi 'Failing row contains'
+}
+
+mysql2pgsqlcmd() {
+     ./mysql2pgsql.perl --nodrop /dev/stdin /dev/stdout
+}
+
+download() {
+     echo "Downloading $1"
+     wget --quiet --no-clobber --tries=3 "$1"
+}
+
+
+# languages to process (refer to List of Wikipedias here: https://en.wikipedia.org/wiki/List_of_Wikipedias)
+# requires Bash 4.0
+readarray -t LANGUAGES < languages.txt
+
+
+
+echo "====================================================================="
+echo "Create wikipedia calculation tables"
+echo "====================================================================="
+
+echo "CREATE TABLE linkcounts (
+        language text,
+        title    text,
+        count    integer,
+        sumcount integer,
+        lat      double precision,
+        lon      double precision
+     );"  | psqlcmd
+
+echo "CREATE TABLE wikipedia_article (
+        language    text NOT NULL,
+        title       text NOT NULL,
+        langcount   integer,
+        othercount  integer,
+        totalcount  integer,
+        lat double  precision,
+        lon double  precision,
+        importance  double precision,
+        title_en    text,
+        osm_type    character(1),
+        osm_id      bigint
+      );" | psqlcmd
+
+echo "CREATE TABLE wikipedia_redirect (
+        language   text,
+        from_title text,
+        to_title   text
+     );" | psqlcmd
+
+
+
+
+
+echo "====================================================================="
+echo "Download individual wikipedia language tables"
+echo "====================================================================="
+
+
+for i in "${LANGUAGES[@]}"
+do
+    echo "Language: $i"
+
+    # english is the largest
+    # 1.7G  enwiki-latest-page.sql.gz
+    # 6.2G  enwiki-latest-pagelinks.sql.gz
+    # 355M  enwiki-latest-langlinks.sql.gz
+    # 128M  enwiki-latest-redirect.sql.gz
+
+    # example of smaller languge turkish
+    #  53M  trwiki-latest-page.sql.gz
+    # 176M  trwiki-latest-pagelinks.sql.gz
+    # 106M  trwiki-latest-langlinks.sql.gz
+    # 3.2M  trwiki-latest-redirect.sql.gz
+
+    download https://dumps.wikimedia.org/${i}wiki/latest/${i}wiki-latest-page.sql.gz
+    download https://dumps.wikimedia.org/${i}wiki/latest/${i}wiki-latest-pagelinks.sql.gz
+    download https://dumps.wikimedia.org/${i}wiki/latest/${i}wiki-latest-langlinks.sql.gz
+    download https://dumps.wikimedia.org/${i}wiki/latest/${i}wiki-latest-redirect.sql.gz
+done
+
+
+
+
+
+echo "====================================================================="
+echo "Import individual wikipedia language tables"
+echo "====================================================================="
+
+for i in "${LANGUAGES[@]}"
+do
+    echo "Language: $i"
+
+    # We pre-create the table schema. This allows us to
+    # 1. Skip index creation. Most queries we do are full table scans
+    # 2. Add constrain to only import namespace=0 (wikipedia articles)
+    # Both cuts down data size considerably (50%+)
+
+    echo "Importing ${i}wiki-latest-pagelinks"
+
+    echo "DROP TABLE IF EXISTS ${i}pagelinks;" | psqlcmd
+    echo "CREATE TABLE ${i}pagelinks (
+       pl_from            int  NOT NULL DEFAULT '0',
+       pl_namespace       int  NOT NULL DEFAULT '0',
+       pl_title           text NOT NULL DEFAULT '',
+       pl_from_namespace  int  NOT NULL DEFAULT '0'
+    );" | psqlcmd
+
+    time \
+      gzip -dc ${i}wiki-latest-pagelinks.sql.gz | \
+      sed "s/\`pagelinks\`/\`${i}pagelinks\`/g" | \
+      mysql2pgsqlcmd | \
+      grep -v '^CREATE INDEX ' | \
+      psqlcmd
+
+
+
+
+    echo "Importing ${i}wiki-latest-page"
+
+    # autoincrement serial8 4byte
+    echo "DROP TABLE IF EXISTS ${i}page;" | psqlcmd
+    echo "CREATE TABLE ${i}page (
+       page_id             int NOT NULL,
+       page_namespace      int NOT NULL DEFAULT '0',
+       page_title          text NOT NULL DEFAULT '',
+       page_restrictions   text NOT NULL,
+       page_is_redirect    smallint NOT NULL DEFAULT '0',
+       page_is_new         smallint NOT NULL DEFAULT '0',
+       page_random         double precision NOT NULL DEFAULT '0',
+       page_touched        text NOT NULL DEFAULT '',
+       page_links_updated  text DEFAULT NULL,
+       page_latest         int NOT NULL DEFAULT '0',
+       page_len            int NOT NULL DEFAULT '0',
+       page_content_model  text DEFAULT NULL,
+       page_lang           text DEFAULT NULL
+     );" | psqlcmd
+
+    time \
+      gzip -dc ${i}wiki-latest-page.sql.gz | \
+      sed "s/\`page\`/\`${i}page\`/g" | \
+      mysql2pgsqlcmd | \
+      grep -v '^CREATE INDEX ' | \
+      psqlcmd
+
+
+
+
+    echo "Importing ${i}wiki-latest-langlinks"
+
+    echo "DROP TABLE IF EXISTS ${i}langlinks;" | psqlcmd
+    echo "CREATE TABLE ${i}langlinks (
+       ll_from   int  NOT NULL DEFAULT '0',
+       ll_lang   text NOT NULL DEFAULT '',
+       ll_title  text NOT NULL DEFAULT ''
+    );" | psqlcmd
+
+    time \
+      gzip -dc ${i}wiki-latest-langlinks.sql.gz | \
+      sed "s/\`langlinks\`/\`${i}langlinks\`/g" | \
+      mysql2pgsqlcmd | \
+      grep -v '^CREATE INDEX ' | \
+      psqlcmd
+
+
+
+
+
+    echo "Importing ${i}wiki-latest-redirect"
+
+    echo "DROP TABLE IF EXISTS ${i}redirect;" | psqlcmd
+    echo "CREATE TABLE ${i}redirect (
+       rd_from       int   NOT NULL DEFAULT '0',
+       rd_namespace  int   NOT NULL DEFAULT '0',
+       rd_title      text  NOT NULL DEFAULT '',
+       rd_interwiki  text  DEFAULT NULL,
+       rd_fragment   text  DEFAULT NULL
+    );" | psqlcmd
+
+    time \
+      gzip -dc ${i}wiki-latest-redirect.sql.gz | \
+      sed "s/\`redirect\`/\`${i}redirect\`/g" | \
+      mysql2pgsqlcmd | \
+      grep -v '^CREATE INDEX ' | \
+      psqlcmd
+done
+
+
+
+
+
+echo "====================================================================="
+echo "Process language tables and associated pagelink counts"
+echo "====================================================================="
+
+
+for i in "${LANGUAGES[@]}"
+do
+    echo "Language: $i"
+
+    echo "CREATE TABLE ${i}pagelinkcount
+          AS
+          SELECT pl_title AS title,
+                 COUNT(*) AS count,
+                 0::bigint as othercount
+          FROM ${i}pagelinks
+          WHERE pl_namespace = 0
+          GROUP BY pl_title
+          ;" | psqlcmd
+
+    echo "INSERT INTO linkcounts
+          SELECT '${i}',
+                 pl_title,
+                 COUNT(*)
+          FROM ${i}pagelinks
+          WHERE pl_namespace = 0
+          GROUP BY pl_title
+          ;" | psqlcmd
+
+    echo "INSERT INTO wikipedia_redirect
+          SELECT '${i}',
+                 page_title,
+                 rd_title
+          FROM ${i}redirect
+          JOIN ${i}page ON (rd_from = page_id)
+          WHERE page_namespace = 0
+            AND rd_namespace = 0
+          ;" | psqlcmd
+
+done
+
+
+for i in "${LANGUAGES[@]}"
+do
+    for j in "${LANGUAGES[@]}"
+    do
+        echo "UPDATE ${i}pagelinkcount
+              SET othercount = ${i}pagelinkcount.othercount + x.count
+              FROM (
+                SELECT page_title AS title,
+                       count
+                FROM ${i}langlinks
+                JOIN ${i}page ON (ll_from = page_id)
+                JOIN ${j}pagelinkcount ON (ll_lang = '${j}' AND ll_title = title)
+              ) AS x
+              WHERE x.title = ${i}pagelinkcount.title
+              ;" | psqlcmd
+    done
+
+    echo "INSERT INTO wikipedia_article
+          SELECT '${i}',
+                 title,
+                 count,
+                 othercount,
+                 count + othercount
+          FROM ${i}pagelinkcount
+          ;" | psqlcmd
+done
+
+
+
+
+
+echo "====================================================================="
+echo "Calculate importance score for each wikipedia page"
+echo "====================================================================="
+
+echo "UPDATE wikipedia_article
+      SET importance = LOG(totalcount)/LOG((SELECT MAX(totalcount) FROM wikipedia_article))
+      ;" | psqlcmd
+
+
+
+
+
+echo "====================================================================="
+echo "Clean up intermediate tables to conserve space"
+echo "====================================================================="
+
+for i in "${LANGUAGES[@]}"
+do
+    echo "DROP TABLE ${i}pagelinks;"     | psqlcmd
+    echo "DROP TABLE ${i}page;"          | psqlcmd
+    echo "DROP TABLE ${i}langlinks;"     | psqlcmd
+    echo "DROP TABLE ${i}redirect;"      | psqlcmd
+    echo "DROP TABLE ${i}pagelinkcount;" | psqlcmd
+done
+
+echo "all done."

data-sources/wikipedia-wikidata/languages.txt

@@ -0,0 +1,39 @@
+ar
+bg
+ca
+cs
+da
+de
+en
+es
+eo
+eu
+fa
+fr
+ko
+hi
+hr
+id
+it
+he
+lt
+hu
+ms
+nl
+ja
+no
+pl
+pt
+kk
+ro
+ru
+sk
+sl
+sr
+fi
+sv
+tr
+uk
+vi
+war
+zh

data-sources/wikipedia-wikidata/mysql2pgsql.perl

@@ -0,0 +1,951 @@
+#!/usr/bin/perl -w
+# mysql2pgsql
+# MySQL to PostgreSQL dump file converter
+#
+# For usage: perl mysql2pgsql.perl --help
+#
+# ddl statments are changed but none or only minimal real data
+# formatting are done.
+# data consistency is up to the DBA.
+#
+# (c) 2004-2007 Jose M Duarte and Joseph Speigle ... gborg
+#
+# (c) 2000-2004 Maxim Rudensky  <fonin@omnistaronline.com>
+# (c) 2000 Valentine Danilchuk  <valdan@ziet.zhitomir.ua>
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+# This product includes software developed by the Max Rudensky
+# and its contributors.
+# 4. Neither the name of the author nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+
+use Getopt::Long;
+
+use POSIX;
+
+use strict;
+use warnings;
+
+
+# main sections
+# -------------
+# 1 variable declarations
+# 2 subroutines
+# 3 get commandline options and specify help statement
+# 4 loop through file and process
+# 5. print_plpgsql function prototype
+
+#################################################################
+#  1.  variable declarations
+#################################################################
+# command line options
+my( $ENC_IN, $ENC_OUT, $PRESERVE_CASE, $HELP, $DEBUG, $SCHEMA, $LOWERCASE, $CHAR2VARCHAR, $NODROP, $SEP_FILE, $opt_debug, $opt_help, $opt_schema, $opt_preserve_case, $opt_char2varchar, $opt_nodrop, $opt_sepfile, $opt_enc_in, $opt_enc_out );
+# variables for constructing pre-create-table entities
+my $pre_create_sql='';    # comments, 'enum' constraints preceding create table statement
+my $auto_increment_seq= '';    # so we can easily substitute it if we need a default value
+my $create_sql='';    # all the datatypes in the create table section
+my $post_create_sql='';   # create indexes, foreign keys, table comments
+my $function_create_sql = '';  # for the set (function,trigger) and CURRENT_TIMESTAMP ( function,trigger )
+#  constraints
+my ($type, $column_valuesStr, @column_values, $value );
+my %constraints=(); #  holds values constraints used to emulate mysql datatypes (e.g. year, set)
+# datatype conversion variables
+my ( $index,$seq);
+my ( $column_name, $col, $quoted_column);
+my ( @year_holder, $year, $constraint_table_name);
+my $table="";   # table_name for create sql statements
+my $table_no_quotes="";   # table_name for create sql statements
+my $sl = '^\s+\w+\s+';  # matches the column name
+my $tables_first_timestamp_column= 1;  #  decision to print warnings about default_timestamp not being in postgres
+my $mysql_numeric_datatypes = "TINYINT|SMALLINT|MEDIUMINT|INT|INTEGER|BIGINT|REAL|DOUBLE|FLOAT|DECIMAL|NUMERIC";
+my $mysql_datetime_datatypes = "|DATE|TIME|TIMESTAMP|DATETIME|YEAR";
+my $mysql_text_datatypes = "CHAR|VARCHAR|BINARY|VARBINARY|TINYBLOB|BLOB|MEDIUMBLOB|LONGBLOB|TINYTEXT|TEXT|MEDIUMTEXT|LONGTEXT|ENUM|SET";
+my $mysql_datatypesStr =  $mysql_numeric_datatypes . "|". $mysql_datetime_datatypes . "|". $mysql_text_datatypes ;
+# handling INSERT INTO statements
+my $rowRe = qr{
+    \(                  # opening parens
+        (               #  (start capture)
+            (?:         #  (start group)
+            '           # string start
+                [^'\\]*     # up to string-end or backslash (escape)
+                (?:     #  (start group)
+                \\.     # gobble escaped character
+                [^'\\]*     # up to string-end of backslash
+                )*      #  (end group, repeat zero or more)
+            '           # string end
+            |           #  (OR)
+            .*?         # everything else (not strings)
+            )*          #  (end group, repeat zero or more)
+        )               #  (end capture)
+    \)                  # closing parent
+}x;
+
+my ($insert_table, $valueString);
+#
+########################################################
+# 2.  subroutines
+#
+# get_identifier
+# print_post_create_sql()
+# quote_and_lc()
+# make_plpgsql($table,$column_name) -- at end of file
+########################################################
+
+# returns an identifier with the given suffix doing controlled
+# truncation if necessary
+sub get_identifier($$$) {
+    my ($table, $col, $suffix) = @_;
+    my $name = '';
+    $table=~s/\"//g; # make sure that $table doesn't have quotes so we don't end up with redundant quoting
+    # in the case of multiple columns
+    my @cols = split(/,/,$col);
+    $col =~ s/,//g;
+    # in case all columns together too long we have to truncate them
+    if (length($col) > 55) {
+        my $totaltocut = length($col)-55;
+        my $tocut = ceil($totaltocut / @cols);
+        @cols = map {substr($_,0,abs(length($_)-$tocut))} @cols;
+        $col="";
+        foreach (@cols){
+            $col.=$_;
+        }
+    }
+
+    my $max_table_length = 63 - length("_${col}_$suffix");
+
+    if (length($table) > $max_table_length) {
+        $table = substr($table, length($table) - $max_table_length, $max_table_length);
+    }
+    return quote_and_lc("${table}_${col}_${suffix}");
+}
+
+
+#
+#
+# called when we encounter next CREATE TABLE statement
+# also called at EOF to print out for last table
+# prints comments, indexes, foreign key constraints (the latter 2 possibly to a separate file)
+sub print_post_create_sql() {
+    my ( @create_idx_comments_constraints_commandsArr, $stmts, $table_field_combination);
+    my %stmts;
+    # loop to check for duplicates in $post_create_sql
+    # Needed because of duplicate key declarations ( PRIMARY KEY and KEY), auto_increment columns
+
+    @create_idx_comments_constraints_commandsArr = split(';\n?', $post_create_sql);
+    if ($SEP_FILE) {
+        open(SEP_FILE, ">>:encoding($ENC_OUT)", $SEP_FILE) or die "Unable to open $SEP_FILE for output: $!\n";
+    }
+
+    foreach (@create_idx_comments_constraints_commandsArr) {
+        if (m/CREATE INDEX "*(\S+)"*\s/i) {  #  CREATE INDEX korean_english_wordsize_idx ON korean_english USING btree  (wordsize);
+            $table_field_combination =  $1;
+            # if this particular table_field_combination was already used do not print the statement:
+            if ($SEP_FILE) {
+                print SEP_FILE "$_;\n" if !defined($stmts{$table_field_combination});
+            } else {
+                print OUT "$_;\n" if !defined($stmts{$table_field_combination});
+            }
+            $stmts{$table_field_combination} = 1;
+        }
+        elsif (m/COMMENT/i) {  # COMMENT ON object IS 'text'; but comment may be part of table name so use 'elsif'
+            print OUT "$_;\n"
+        } else {  # foreign key constraint  or comments (those preceded by -- )
+            if ($SEP_FILE) {
+                print SEP_FILE "$_;\n";
+            } else {
+                print OUT "$_;\n"
+            }
+        }
+    }
+
+    if ($SEP_FILE) {
+        close SEP_FILE;
+    }
+    $post_create_sql='';
+    # empty %constraints for next " create table" statement
+}
+
+# quotes a string or a multicolumn string (comma separated)
+# and optionally lowercase (if LOWERCASE is set)
+# lowercase .... if user wants default postgres behavior
+# quotes .... to preserve keywords and to preserve case when case-sensitive tables are to be used
+sub quote_and_lc($)
+{
+    my $col = shift;
+    if ($LOWERCASE) {
+        $col = lc($col);
+    }
+    if ($col =~ m/,/) {
+        my @cols = split(/,\s?/, $col);
+        @cols = map {"\"$_\""} @cols;
+        return join(', ', @cols);
+    } else {
+        return "\"$col\"";
+    }
+}
+
+########################################################
+# 3.  get commandline options and maybe print help
+########################################################
+
+GetOptions("help", "debug"=> \$opt_debug, "schema=s" => \$SCHEMA, "preserve_case" => \$opt_preserve_case, "char2varchar" => \$opt_char2varchar, "nodrop" => \$opt_nodrop, "sepfile=s" => \$opt_sepfile, "enc_in=s" => \$opt_enc_in, "enc_out=s" => \$opt_enc_out );
+
+$HELP = $opt_help || 0;
+$DEBUG = $opt_debug || 0;
+$PRESERVE_CASE = $opt_preserve_case || 0;
+if ($PRESERVE_CASE == 1) { $LOWERCASE = 0; }
+else { $LOWERCASE = 1; }
+$CHAR2VARCHAR = $opt_char2varchar || 0;
+$NODROP = $opt_nodrop || 0;
+$SEP_FILE = $opt_sepfile || 0;
+$ENC_IN = $opt_enc_in || 'utf8';
+$ENC_OUT = $opt_enc_out || 'utf8';
+
+if (($HELP) || ! defined($ARGV[0]) || ! defined($ARGV[1])) {
+    print "\n\nUsage: perl $0 {--help --debug --preserve_case --char2varchar --nodrop --schema --sepfile --enc_in --enc_out } mysql.sql pg.sql\n";
+    print "\t* OPTIONS WITHOUT ARGS\n";
+    print "\t--help:  prints this message \n";
+    print "\t--debug: output the commented-out mysql line above the postgres line in pg.sql \n";
+    print "\t--preserve_case: prevents automatic case-lowering of column and table names\n";
+    print "\t\tIf you want to preserve case, you must set this flag. For example,\n";
+    print "\t\tIf your client application quotes table and column-names and they have cases in them, set this flag\n";
+    print "\t--char2varchar: converts all char fields to varchar\n";
+    print "\t--nodrop: strips out DROP TABLE statements\n";
+    print "\t\totherise harmless warnings are printed by psql when the dropped table does not exist\n";
+    print "\n\t* OPTIONS WITH ARGS\n";
+    print "\t--schema: outputs a line into the postgres sql file setting search_path \n";
+    print "\t--sepfile: output foreign key constraints and indexes to a separate file so that it can be\n";
+    print "\t\timported after large data set is inserted from another dump file\n";
+    print "\t--enc_in: encoding of mysql in file (default utf8) \n";
+    print "\t--enc_out: encoding of postgres out file (default utf8) \n";
+    print "\n\t* REQUIRED ARGUMENTS\n";
+    if (defined ($ARGV[0])) {
+        print "\tmysql.sql ($ARGV[0])\n";
+    } else {
+        print "\tmysql.sql (undefined)\n";
+    }
+    if (defined ($ARGV[1])) {
+        print "\tpg.sql ($ARGV[1])\n";
+    } else {
+        print "\tpg.sql (undefined)\n";
+    }
+    print "\n";
+    exit 1;
+}
+########################################################
+# 4.  process through mysql_dump.sql file
+# in a big loop
+########################################################
+
+# open in and out files
+open(IN,"<:encoding($ENC_IN)", $ARGV[0]) || die "can't open mysql dump file $ARGV[0]";
+open(OUT,">:encoding($ENC_OUT)", $ARGV[1]) || die "can't open pg dump file $ARGV[1]";
+
+# output header
+print OUT "--\n";
+print OUT "-- Generated from mysql2pgsql.perl\n";
+print OUT "-- http://gborg.postgresql.org/project/mysql2psql/\n";
+print OUT "-- (c) 2001 - 2007 Jose M. Duarte, Joseph Speigle\n";
+print OUT "--\n";
+print OUT "\n";
+print OUT "-- warnings are printed for drop tables if they do not exist\n";
+print OUT "-- please see http://archives.postgresql.org/pgsql-novice/2004-10/msg00158.php\n\n";
+print OUT "-- ##############################################################\n";
+
+if ($SCHEMA ) {
+    print OUT "set search_path='" . $SCHEMA . "'\\g\n" ;
+}
+
+# loop through mysql file  on a per-line basis
+while(<IN>) {
+
+##############     flow     #########################
+# (the lines are directed to different string variables at different times)
+#
+# handle drop table , unlock, connect statements
+# if ( start of create table)   {
+#   print out post_create table (indexes, foreign key constraints, comments from previous table)
+#   add drop table statement if !$NODROP to pre_create_sql
+#   next;
+# }
+# else if ( inside create table) {
+#   add comments in this portion to create_sql
+#   if ( end of create table) {
+#      delete mysql-unique CREATE TABLE commands
+#      print pre_create_sql
+#      print the constraint tables for set and year datatypes
+#      print create_sql
+#      print function_create_sql (this is for the enum columns only)
+#      next;
+#   }
+#   do substitutions
+#    -- NUMERIC DATATYPES
+#    -- CHARACTER DATATYPES
+#    -- DATE AND TIME DATATYPES
+#    -- KEY AND UNIQUE CREATIONS
+#    and append them to create_sql
+# } else {
+#   print inserts on-the-spot (this script only changes default timestamp of 0000-00-00)
+# }
+# LOOP until EOF
+#
+########################################################
+
+
+if (!/^\s*insert into/i) { # not inside create table so don't worry about data corruption
+    s/`//g;  #  '`pgsql uses no backticks to denote table name (CREATE TABLE `sd`) or around field
+            # and table names like  mysql
+            # doh!  we hope all dashes and special chars are caught by the regular expressions :)
+}
+if (/^\s*USE\s*([^;]*);/) {
+    print OUT "\\c ". $1;
+    next;
+}
+if (/^(UN)?LOCK TABLES/i  || /drop\s+table/i ) {
+
+    # skip
+    # DROP TABLE is added when we see the CREATE TABLE
+    next;
+}
+if (/(create\s+table\s+)([-_\w]+)\s/i) { #  example: CREATE TABLE `english_english`
+    print_post_create_sql();   # for last table
+    $tables_first_timestamp_column= 1;  #  decision to print warnings about default_timestamp not being in postgres
+    $create_sql = '';
+    $table_no_quotes = $2 ;
+    $table=quote_and_lc($2);
+    if ( !$NODROP )  {  # always print drop table if user doesn't explicitly say not to
+        #  to drop a table that is referenced by a view or a foreign-key constraint of another table,
+        #  CASCADE must be specified. (CASCADE will remove a dependent view entirely, but in the
+        #  in the foreign-key case it will only remove the foreign-key constraint, not the other table entirely.)
+        #  (source: 8.1.3 docs, section "drop table")
+        warn "table $table will be dropped CASCADE\n";
+        $pre_create_sql .= "DROP TABLE $table CASCADE;\n";    # custom dumps may be missing the 'dump' commands
+    }
+
+    s/(create\s+table\s+)([-_\w]+)\s/$1 $table /i;
+    if ($DEBUG) {
+        $create_sql .=  '-- ' . $_;
+    }
+    $create_sql .= $_;
+    next;
+}
+if ($create_sql ne "") {         # we are inside create table statement so lets process datatypes
+    # print out comments or empty lines in context
+    if ($DEBUG) {
+        $create_sql .=  '-- ' . $_;
+    }
+    if (/^#/ || /^$/ || /^\s*--/) {
+        s/^#/--/;   #  Two hyphens (--) is the SQL-92 standard indicator for comments
+        $create_sql.=$_;
+        next;
+    }
+
+    if (/\).*;/i) {    # end of create table squence
+
+        s/INSERT METHOD[=\s+][^;\s]+//i;
+        s/PASSWORD=[^;\s]+//i;
+        s/ROW_FORMAT=(?:DEFAULT|DYNAMIC|FIXED|COMPRESSED|REDUNDANT|COMPACT)+//i;
+        s/KEY_BLOCK_SIZE=8//i;
+        s/DELAY KEY WRITE=[^;\s]+//i;
+        s/INDEX DIRECTORY[=\s+][^;\s]+//i;
+        s/DATA DIRECTORY=[^;\s]+//i;
+        s/CONNECTION=[^;\s]+//i;
+        s/CHECKSUM=[^;\s]+//i;
+        s/Type=[^;\s]+//i; # ISAM ,   # older versions
+        s/COLLATE=[^;\s]+//i;         # table's collate
+        s/COLLATE\s+[^;\s]+//i;         # table's collate
+        # possible AUTO_INCREMENT starting index, it is used in mysql 5.0.26, not sure since which version
+        if (/AUTO_INCREMENT=(\d+)/i) {
+        # should take < ----  ) ENGINE=MyISAM AUTO_INCREMENT=16 DEFAULT CHARSET=latin1;
+        # and should ouput --->  CREATE SEQUENCE "rhm_host_info_id_seq" START WITH 16;
+        my $start_value = $1;
+        print $auto_increment_seq . "--\n";
+        # print $pre_create_sql . "--\n";
+        $pre_create_sql =~ s/(CREATE SEQUENCE $auto_increment_seq )/$1 START WITH $start_value /;
+    }
+        s/AUTO_INCREMENT=\d+//i;
+        s/PACK_KEYS=\d//i;            # mysql 5.0.22
+        s/DEFAULT CHARSET=[^;\s]+//i; #  my mysql version is 4.1.11
+        s/ENGINE\s*=\s*[^;\s]+//i;   #  my mysql version is 4.1.11
+        s/ROW_FORMAT=[^;\s]+//i;   #  my mysql version is 5.0.22
+        s/KEY_BLOCK_SIZE=8//i; 
+        s/MIN_ROWS=[^;\s]+//i;
+        s/MAX_ROWS=[^;\s]+//i;
+        s/AVG_ROW_LENGTH=[^;\s]+//i;
+        if (/COMMENT='([^']*)'/) {  # ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='must be country zones';
+            $post_create_sql.="COMMENT ON TABLE $table IS '$1'\;"; # COMMENT ON table_name IS 'text';
+            s/COMMENT='[^']*'//i;
+        }
+        $create_sql =~ s/,$//g;    # strip last , inside create table
+        # make sure we end in a comma, as KEY statments are turned
+        # into post_create_sql indices
+        # they often are the last line so leaving a 'hanging comma'
+        my @array = split("\n", $create_sql);
+        for (my $a = $#array; $a >= 0; $a--) {  #loop backwards
+            if ($a == $#array  && $array[$a] =~ m/,\s*$/) {    # for last line
+                $array[$a] =~ s/,\s*$//;
+                next;
+            }
+            if ($array[$a] !~ m/create table/i) {  # i.e. if there was more than one column in table
+                if ($a != $#array  && $array[$a] !~ m/,\s*$/  ) {  # for second to last
+                    $array[$a] =~ s/$/,/;
+                    last;
+                }
+                elsif ($a != $#array  && $array[$a] =~ m/,\s*$/ ) {  # for second to last
+                    last;
+                }
+            }
+        }
+        $create_sql = join("\n", @array) . "\n";
+        $create_sql .=  $_;
+
+        # put comments out first
+        print OUT $pre_create_sql;
+
+        # create separate table to reference and to hold mysql's possible set data-type
+        # values.  do that table's creation before create table
+        # definition
+        foreach $column_name (keys %constraints) {
+            $type=$constraints{$column_name}{'type'};
+            $column_valuesStr = $constraints{$column_name}{'values'};
+            $constraint_table_name = get_identifier(${table},${column_name} ,"constraint_table");
+            if ($type eq 'set') {
+                print OUT qq~DROP TABLE $constraint_table_name  CASCADE\\g\n~ ;
+                print OUT qq~create table $constraint_table_name  ( set_values varchar UNIQUE)\\g\n~ ;
+                $function_create_sql .= make_plpgsql($table,$column_name);
+            } elsif ($type eq 'year')  {
+                print OUT qq~DROP TABLE $constraint_table_name  CASCADE\\g\n~ ;
+                print OUT qq~create table $constraint_table_name  ( year_values varchar UNIQUE)\\g\n~ ;
+            }
+            @column_values = split /,/, $column_valuesStr;
+            foreach $value (@column_values) {
+                print OUT qq~insert into $constraint_table_name   values (  $value  )\\g\n~; # ad ' for ints and varchars
+            }
+        }
+
+        $create_sql =~ s/double double/double precision/g;
+
+        # print create table and reset create table vars
+        # when moving from each "create table" to "insert" part of dump
+        print OUT $create_sql;
+        print OUT $function_create_sql;
+        $pre_create_sql="";
+        $auto_increment_seq="";
+        $create_sql="";
+        $function_create_sql='';
+        %constraints=();
+        # the post_create_sql for this table is output at the beginning of the next table def
+        # in case we want to make indexes after doing inserting
+        next;
+    }
+    if (/^\s*(\w+)\s+.*COMMENT\s*'([^']*)'/) {  #`zone_country_id` int(11) COMMENT 'column comment here',
+        $quoted_column=quote_and_lc($1);
+        $post_create_sql.="COMMENT ON COLUMN $table"."."." $quoted_column IS '$2'\;"; # COMMENT ON table_name.column_name IS 'text';
+        s/COMMENT\s*'[^']*'//i;
+    }
+
+
+    # NUMERIC DATATYPES
+    #
+    # auto_increment -> sequences
+    # UNSIGNED conversions
+    # TINYINT
+    # SMALLINT
+    # MEDIUMINT
+    # INT, INTEGER
+    # BIGINT
+    #
+    # DOUBLE [PRECISION], REAL
+    # DECIMAL(M,D), NUMERIC(M,D)
+    # FLOAT(p)
+    # FLOAT
+
+    s/(\w*int)\(\d+\)/$1/g;  # hack of the (n) stuff for e.g. mediumint(2) int(3)
+
+    if (/^(\s*)(\w+)\s*.*numeric.*auto_increment/i) {         # int,auto_increment -> serial
+        $seq = get_identifier($table, $2, 'seq');
+        $quoted_column=quote_and_lc($2);
+        # Smash datatype to int8 and autogenerate the sequence.
+        s/^(\s*)(\w+)\s*.*NUMERIC(.*)auto_increment([^,]*)/$1 $quoted_column serial8 $4/ig;
+        $create_sql.=$_;
+        next;
+    }
+    if (/^\s*(\w+)\s+.*int.*auto_increment/i) {  #  example: data_id mediumint(8) unsigned NOT NULL auto_increment,
+        $seq = get_identifier($table, $1, 'seq');
+        $quoted_column=quote_and_lc($1);
+        s/(\s*)(\w+)\s+.*int.*auto_increment([^,]*)/$1 $quoted_column serial8 $3/ig;
+        $create_sql.=$_;
+        next;
+    }
+
+
+
+
+    # convert UNSIGNED to CHECK constraints
+    if (m/^(\s*)(\w+)\s+((float|double precision|double|real|decimal|numeric))(.*)unsigned/i) {
+        $quoted_column = quote_and_lc($2);
+        s/^(\s*)(\w+)\s+((float|double precision|double|real|decimal|numeric))(.*)unsigned/$1 $quoted_column $3 $4 CHECK ($quoted_column >= 0)/i;
+    }
+    # example:  `wordsize` tinyint(3) unsigned default NULL,
+    if (m/^(\s+)(\w+)\s+(\w+)\s+unsigned/i) {
+        $quoted_column=quote_and_lc($2);
+        s/^(\s+)(\w+)\s+(\w+)\s+unsigned/$1 $quoted_column $3 CHECK ($quoted_column >= 0)/i;
+    }
+    if (m/^(\s*)(\w+)\s+(bigint.*)unsigned/) {
+        $quoted_column=quote_and_lc($2);
+        #  see http://archives.postgresql.org/pgsql-general/2005-07/msg01178.php
+        #  and see http://www.postgresql.org/docs/8.2/interactive/datatype-numeric.html
+        # see  http://dev.mysql.com/doc/refman/5.1/en/numeric-types.html  max size == 20 digits
+        s/^(\s*)(\w+)\s+bigint(.*)unsigned/$1 $quoted_column NUMERIC (20,0) CHECK ($quoted_column >= 0)/i;
+
+    }
+
+    # int type conversion
+    # TINYINT    (signed) -128 to 127 (unsigned) 0   255
+    #  SMALLINT A small integer. The signed range is -32768 to 32767. The unsigned range is 0 to 65535.
+    #  MEDIUMINT  A medium-sized integer. The signed range is -8388608 to 8388607. The unsigned range is 0 to 16777215.
+    #  INT A normal-size integer. The signed range is -2147483648 to 2147483647. The unsigned range is 0 to 4294967295.
+    # BIGINT The signed range is -9223372036854775808 to 9223372036854775807. The unsigned range is 0 to 18446744073709551615
+    # for postgres see http://www.postgresql.org/docs/8.2/static/datatype-numeric.html#DATATYPE-INT
+    s/^(\s+"*\w+"*\s+)tinyint/$1 smallint/i;
+    s/^(\s+"*\w+"*\s+)mediumint/$1 integer/i;
+
+    # the floating point types
+    #   double -> double precision
+    #   double(n,m) -> double precision
+    #   float - no need for conversion
+    #   float(n) - no need for conversion
+    #   float(n,m) -> double precision
+
+    s/(^\s*\w+\s+)double(\(\d+,\d+\))?/$1float/i;
+    s/float(\(\d+,\d+\))/float/i;
+
+    #
+    # CHARACTER TYPES
+    #
+    # set
+    # enum
+    # binary(M), VARBINARy(M), tinyblob, tinytext,
+    # bit
+    # char(M), varchar(M)
+    # blob -> text
+    # mediumblob
+    # longblob, longtext
+    # text -> text
+    # mediumtext
+    # longtext
+    #  mysql docs: A BLOB is a binary large object that can hold a variable amount of data.
+
+    # set
+    # For example, a column specified as SET('one', 'two') NOT NULL can have any of these values:
+    # ''
+    # 'one'
+    # 'two'
+    # 'one,two'
+    if (/(\w*)\s+set\(((?:['"]\w+['"]\s*,*)+(?:['"]\w+['"])*)\)(.*)$/i) { # example:  `au_auth` set('r','w','d') NOT NULL default '',
+        $column_name = $1;
+        $constraints{$column_name}{'values'} = $2;  # 'abc','def', ...
+        $constraints{$column_name}{'type'} = "set";  # 'abc','def', ...
+        $_ =  qq~ $column_name varchar , ~;
+        $column_name = quote_and_lc($1);
+        $create_sql.=$_;
+        next;
+
+    }
+    if (/(\S*)\s+enum\(((?:['"][^'"]+['"]\s*,)+['"][^'"]+['"])\)(.*)$/i) { # enum handling
+        #  example:  `test` enum('?','+','-') NOT NULL default '?'
+        # $2  is the values of the enum 'abc','def', ...
+        $quoted_column=quote_and_lc($1);
+        #  "test" NOT NULL default '?' CONSTRAINT test_test_constraint CHECK ("test" IN ('?','+','-'))
+        $_ = qq~ $quoted_column varchar CHECK ($quoted_column IN ( $2 ))$3\n~;  # just assume varchar?
+        $create_sql.=$_;
+        next;
+    }
+    # Take care of "binary" option for char and varchar
+    # (pre-4.1.2, it indicated a byte array; from 4.1.2, indicates
+    # a binary collation)
+    s/(?:var)?char(?:\(\d+\))? (?:byte|binary)/text/i;
+    if (m/(?:var)?binary\s*\(\d+\)/i) {   #  c varBINARY(3) in Mysql
+        warn "WARNING in table '$table' '$_':  binary type is converted to bytea (unsized) for Postgres\n";
+    }
+    s/(?:var)?binary(?:\(\d+\))?/text/i;   #  c varBINARY(3) in Mysql
+    s/bit(?:\(\d+\))?/bytea/i;   #  bit datatype -> bytea
+
+    # large datatypes
+    s/\w*blob/bytea/gi;
+    s/tinytext/text/gi;
+    s/mediumtext/text/gi;
+    s/longtext/text/gi;
+
+    # char -> varchar -- if specified as a command line option
+    # PostgreSQL would otherwise pad with spaces as opposed
+    # to MySQL! Your user interface may depend on this!
+    if ($CHAR2VARCHAR) {
+        s/(^\s+\S+\s+)char/${1}varchar/gi;
+    }
+
+    # nuke column's collate and character set
+    s/(\S+)\s+character\s+set\s+\w+/$1/gi;
+    s/(\S+)\s+collate\s+\w+/$1/gi;
+
+    #
+    # DATE AND TIME TYPES
+    #
+    # date  time
+    # year
+    # datetime
+    # timestamp
+
+    # date  time
+    # these are the same types in postgres, just do the replacement of 0000-00-00 date
+
+    if (m/default '(\d+)-(\d+)-(\d+)([^']*)'/i) { # we grab the year, month and day
+        # NOTE: times of 00:00:00 are possible and are okay
+        my $time = '';
+        my $year=$1;
+        my $month= $2;
+        my $day = $3;
+        if ($4) {
+            $time = $4;
+        }
+        if ($year eq "0000") { $year = '1970'; }
+        if ($month eq "00") { $month = '01'; }
+        if ($day eq "00") { $day = '01'; }
+        s/default '[^']+'/default '$year-$month-$day$time'/i; # finally we replace with $datetime
+    }
+
+    # convert mysql's year datatype to a constraint
+    if (/(\w*)\s+year\(4\)(.*)$/i) { # can be integer OR string 1901-2155
+        $constraint_table_name = get_identifier($table,$1 ,"constraint_table");
+        $column_name=quote_and_lc($1);
+        @year_holder = ();
+        $year='';
+        for (1901 .. 2155) {
+                $year = "'$_'";
+            unless ($year =~ /2155/) { $year .= ','; }
+             push( @year_holder, $year);
+        }
+        $constraints{$column_name}{'values'} = join('','',@year_holder);   # '1901','1902', ...
+        $constraints{$column_name}{'type'} = "year";
+        $_ =  qq~ $column_name varchar CONSTRAINT ${table}_${column_name}_constraint REFERENCES $constraint_table_name ("year_values") $2\n~;
+        $create_sql.=$_;
+        next;
+    } elsif (/(\w*)\s+year\(2\)(.*)$/i) { # same for a 2-integer string
+        $constraint_table_name = get_identifier($table,$1 ,"constraint_table");
+        $column_name=quote_and_lc($1);
+        @year_holder = ();
+        $year='';
+        for (1970 .. 2069) {
+            $year = "'$_'";
+            if ($year =~ /2069/) { next; }
+            push( @year_holder, $year);
+        }
+        push( @year_holder, '0000');
+        $constraints{$column_name}{'values'} = join(',',@year_holder);   # '1971','1972', ...
+        $constraints{$column_name}{'type'} = "year";  # 'abc','def', ...
+        $_ =  qq~ $1 varchar CONSTRAINT ${table}_${column_name}_constraint REFERENCES $constraint_table_name ("year_values") $2\n~;
+        $create_sql.=$_;
+        next;
+    }
+
+    # datetime
+    # Default on a dump from MySQL 5.0.22 is in the same form as datetime so let it flow down
+    # to the timestamp section and deal with it there
+    s/(${sl})datetime /$1timestamp without time zone /i;
+
+    # change not null datetime field to null valid ones
+    # (to support remapping of "zero time" to null
+    # s/($sl)datetime not null/$1timestamp without time zone/i;
+
+
+    # timestamps
+    #
+    # nuke datetime representation (not supported in PostgreSQL)
+    # change default time of 0000-00-00 to 1970-01-01
+
+    # we may possibly need to create a trigger to provide
+    # equal functionality with ON UPDATE CURRENT TIMESTAMP
+
+
+    if (m/${sl}timestamp/i) {
+        if ( m/ON UPDATE CURRENT_TIMESTAMP/i )  {  # the ... default CURRENT_TIMESTAMP  only applies for blank inserts, not updates
+            s/ON UPDATE CURRENT_TIMESTAMP//i ;
+            m/^\s*(\w+)\s+timestamp/i ;
+            # automatic trigger creation
+            $table_no_quotes =~ s/"//g;
+$function_create_sql .= " CREATE OR REPLACE FUNCTION update_". $table_no_quotes . "() RETURNS trigger AS '
+BEGIN
+    NEW.$1 := CURRENT_TIMESTAMP;
+    RETURN NEW;
+END;
+' LANGUAGE 'plpgsql';
+
+-- before INSERT is handled by 'default CURRENT_TIMESTAMP'
+CREATE TRIGGER add_current_date_to_".$table_no_quotes." BEFORE UPDATE ON ". $table . " FOR EACH ROW EXECUTE PROCEDURE
+update_".$table_no_quotes."();\n";
+
+        }
+        if ($tables_first_timestamp_column && m/DEFAULT NULL/i) {
+            # DEFAULT NULL is the same as DEFAULT CURRENT_TIMESTAMP for the first TIMESTAMP  column. (MYSQL manual)
+            s/($sl)(timestamp\s+)default null/$1 $2 DEFAULT CURRENT_TIMESTAMP/i;
+        }
+        $tables_first_timestamp_column= 0;
+        if (m/${sl}timestamp\s*\(\d+\)/i) {   # fix for timestamps with width spec not handled (ID: 1628)
+            warn "WARNING for in table '$table' '$_': your default timestamp width is being ignored for table $table \n";
+            s/($sl)timestamp(?:\(\d+\))/$1datetime/i;
+        }
+    } # end timestamp section
+
+    # KEY AND UNIQUE CREATIONS
+    #
+    # unique
+    if ( /^\s+unique\s+\(([^(]+)\)/i ) { #  example    UNIQUE `name` (`name`), same as UNIQUE KEY
+        #  POSTGRESQL:  treat same as mysql unique
+        $quoted_column = quote_and_lc($1);
+        s/\s+unique\s+\(([^(]+)\)/ unique ($quoted_column) /i;
+            $create_sql.=$_;
+        next;
+        } elsif ( /^\s+unique\s+key\s*(\w+)\s*\(([^(]+)\)/i ) { #  example    UNIQUE KEY `name` (`name`)
+            #  MYSQL: unique  key: allows null=YES, allows duplicates=NO (*)
+            #  ... new ... UNIQUE KEY `unique_fullname` (`fullname`)  in my mysql v. Ver 14.12 Distrib 5.1.7-beta
+            #  POSTGRESQL:  treat same as mysql unique
+        # just quote columns
+        $quoted_column = quote_and_lc($2);
+            s/\s+unique\s+key\s*(\w+)\s*\(([^(]+)\)/ unique ($quoted_column) /i;
+            $create_sql.=$_;
+        # the index corresponding to the 'key' is automatically created
+            next;
+    }
+    # keys
+    if ( /^\s+fulltext key\s+/i) { # example:  FULLTEXT KEY `commenttext` (`commenttext`)
+    # that is key as a word in the first check for a match
+        # the tsvector datatype is made for these types of things
+        # example mysql file:
+        #  what is tsvector datatype?
+        #  http://www.sai.msu.su/~megera/postgres/gist/tsearch/V2/docs/tsearch-V2-intro.html
+        warn "dba must do fulltext key transformation for $table\n";
+        next;
+    }
+    if ( /^(\s+)constraint (\S+) foreign key \((\S+)\) references (\S+) \((\S+)\)(.*)/i ) {
+        $quoted_column =quote_and_lc($3);
+        $col=quote_and_lc($5);
+        $post_create_sql .= "ALTER TABLE $table ADD FOREIGN KEY ($quoted_column) REFERENCES " . quote_and_lc($4) . " ($col);\n";
+        next;
+    }
+    if ( /^\s*primary key\s*\(([^)]+)\)([,\s]+)/i ) { #  example    PRIMARY KEY (`name`)
+        # MYSQL: primary key: allows null=NO , allows duplicates=NO
+        #  POSTGRESQL: When an index is declared unique, multiple table rows with equal indexed values will not be
+        #       allowed. Null values are not considered equal.
+        #  POSTGRESQL quote's source: 8.1.3 docs section 11.5 "unique indexes"
+        #  so, in postgres, we need to add a NOT NULL to the UNIQUE constraint
+        # and, primary key (mysql) == primary key (postgres) so that we *really* don't need change anything
+        $quoted_column = quote_and_lc($1);
+        s/(\s*)primary key\s+\(([^)]+)\)([,\s]+)/$1 primary key ($quoted_column)$3/i;
+        # indexes are automatically created for unique columns
+        $create_sql.=$_;
+        next;
+    } elsif (m/^\s+key\s[-_\s\w]+\((.+)\)/i    ) {     # example:   KEY `idx_mod_english_def_word` (`word`),
+        # regular key: allows null=YES, allows duplicates=YES
+        # MYSQL:   KEY is normally a synonym for INDEX.  http://dev.mysql.com/doc/refman/5.1/en/create-table.html
+        #
+        #  * MySQL: ALTER TABLE {$table} ADD KEY $column ($column)
+        #  * PostgreSQL: CREATE INDEX {$table}_$column_idx ON {$table}($column) // Please note the _idx "extension"
+        #    PRIMARY KEY (`postid`),
+        #    KEY `ownerid` (`ownerid`)
+        # create an index for everything which has a key listed for it.
+        my $col = $1;
+        # TODO we don't have a translation for the substring syntax in text columns in MySQL (e.g. "KEY my_idx (mytextcol(20))")
+        # for now just getting rid of the brackets and numbers (the substring specifier):
+        $col=~s/\(\d+\)//g;
+        $quoted_column = quote_and_lc($col);
+        if ($col =~ m/,/) {
+            $col =  s/,/_/;
+        }
+        $index = get_identifier($table, $col, 'idx');
+        $post_create_sql.="CREATE INDEX $index ON $table USING btree ($quoted_column)\;";
+        # just create index do not add to create table statement
+        next;
+    }
+
+    # handle 'key' declared at end of column
+    if (/\w+.*primary key/i) {   # mysql: key is normally just a synonym for index
+    # just leave as is ( postgres has primary key type)
+
+
+    } elsif (/(\w+\s+(?:$mysql_datatypesStr)\s+.*)key/i) {   # mysql: key is normally just a synonym for index
+    # I can't find a reference for 'key' in a postgres command without using the word 'primary key'
+        s/$1key/$1/i ;
+        $index = get_identifier($table, $1, 'idx');
+        $quoted_column =quote_and_lc($1);
+        $post_create_sql.="CREATE INDEX $index ON $table USING btree ($quoted_column) \;";
+        $create_sql.=$_;
+    }
+
+
+
+    # do we really need this anymore?
+    # remap colums with names of existing system attribute
+    if (/"oid"/i) {
+        s/"oid"/"_oid"/g;
+        print STDERR "WARNING: table $table uses column \"oid\" which is renamed to \"_oid\"\nYou should fix application manually! Press return to continue.";
+        my $wait=<STDIN>;
+    }
+
+    s/oid/_oid/i if (/key/i && /oid/i); # fix oid in key
+
+    # FINAL QUOTING OF ALL COLUMNS
+    # quote column names which were not already quoted
+    # perhaps they were not quoted because they were not explicitly handled
+    if (!/^\s*"(\w+)"(\s+)/i) {
+        /^(\s*)(\w+)(\s+)(.*)$/i ;
+        $quoted_column= quote_and_lc($2);
+        s/^(\s*)(\w+)(\s+)(.*)$/$1 $quoted_column $3 $4 /;
+    }
+    $create_sql.=$_;
+    #  END of if ($create_sql ne "") i.e. were inside create table statement so processed datatypes
+}
+# add "not in create table" comments or empty lines to pre_create_sql
+elsif (/^#/ || /^$/ || /^\s*--/) {
+    s/^#/--/;   #  Two hyphens (--) is the SQL-92 standard indicator for comments
+    $pre_create_sql .=  $_ ;  # printed above create table statement
+    next;
+}
+elsif (/^\s*insert into/i) { # not inside create table and doing insert
+    # fix mysql's zero/null value for timestamps
+    s/'0000-00-00/'1970-01-01/gi;
+    # commented out to fix bug "Field contents interpreted as a timestamp", what was the point of this line anyway?
+    #s/([12]\d\d\d)([01]\d)([0-3]\d)([0-2]\d)([0-6]\d)([0-6]\d)/'$1-$2-$3 $4:$5:$6'/;
+
+    #---- fix data in inserted data: (from MS world)
+    s!\x96!-!g;    # --
+    s!\x93!"!g;    # ``
+    s!\x94!"!g;    # ''
+    s!\x85!... !g;    # \ldots
+    s!\x92!`!g;
+
+    print OUT $pre_create_sql;    # print comments preceding the insert section
+    $pre_create_sql="";
+    $auto_increment_seq = "";
+
+    s/'((?:[^'\\]++|\\.)*+)'(?=[),])/E'$1'/g;
+    # for the E'' see http://www.postgresql.org/docs/8.2/interactive/release-8-1.html
+    s!\\\\!\\\\\\\\!g;      # replace \\ with ]\\\\
+
+    # split 'extended' INSERT INTO statements to something PostgreSQL can  understand
+    ( $insert_table,  $valueString) = $_ =~ m/^INSERT\s+INTO\s+['`"]*(.*?)['`"]*\s+VALUES\s*(.*)/i;
+    $insert_table = quote_and_lc($insert_table);
+
+    s/^INSERT INTO.*?\);//i;  # hose the statement which is to be replaced whether a run-on or not
+    # guarantee table names are quoted
+    print OUT qq(INSERT INTO $insert_table VALUES $valueString \n);
+
+} else {
+    print OUT $_ ;  #  example: /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
+}
+#  keep looping and get next line of IN file
+
+} # END while(<IN>)
+
+print_post_create_sql();   # in case there is extra from the last table
+
+#################################################################
+#  5.  print_plgsql function prototype
+#      emulate the set datatype with the following plpgsql function
+#      looks ugly so putting at end of file
+#################################################################
+#
+sub make_plpgsql {
+my ($table,$column_name) = ($_[0],$_[1]);
+$table=~s/\"//g; # make sure that $table doesn't have quotes so we don't end up with redundant quoting
+my $constraint_table = get_identifier($table,$column_name ,"constraint_table");
+return "
+-- this function is called by the insert/update trigger
+-- it checks if the INSERT/UPDATE for the 'set' column
+-- contains members which comprise a valid mysql set
+-- this TRIGGER function therefore acts like a constraint
+--  provided limited functionality for mysql's set datatype
+-- just verifies and matches for string representations of the set at this point
+-- though the set datatype uses bit comparisons, the only supported arguments to our
+-- set datatype are VARCHAR arguments
+-- to add a member to the set add it to the ".$table."_".$column_name." table
+CREATE OR REPLACE FUNCTION check_".$table."_".$column_name."_set(  ) RETURNS TRIGGER AS \$\$\n
+DECLARE
+----
+arg_str VARCHAR ;
+argx VARCHAR := '';
+nobreak INT := 1;
+rec_count INT := 0;
+psn INT := 0;
+str_in VARCHAR := NEW.$column_name;
+----
+BEGIN
+----
+IF str_in IS NULL THEN RETURN NEW ; END IF;
+arg_str := REGEXP_REPLACE(str_in, '\\',\\'', ',');  -- str_in is CONSTANT
+arg_str := REGEXP_REPLACE(arg_str, '^\\'', '');
+arg_str := REGEXP_REPLACE(arg_str, '\\'\$', '');
+-- RAISE NOTICE 'arg_str %',arg_str;
+psn := POSITION(',' in arg_str);
+IF psn > 0 THEN
+    psn := psn - 1; -- minus-1 from comma position
+    -- RAISE NOTICE 'psn %',psn;
+    argx := SUBSTRING(arg_str FROM 1 FOR psn);  -- get one set member
+    psn := psn + 2; -- go to first starting letter
+    arg_str := SUBSTRING(arg_str FROM psn);   -- hack it off
+ELSE
+    psn := 0; -- minus-1 from comma position
+    argx := arg_str;
+END IF;
+-- RAISE NOTICE 'argx %',argx;
+-- RAISE NOTICE 'new arg_str: %',arg_str;
+WHILE nobreak LOOP
+    EXECUTE 'SELECT count(*) FROM $constraint_table WHERE set_values = ' || quote_literal(argx) INTO rec_count;
+    IF rec_count = 0 THEN RAISE EXCEPTION 'one of the set values was not found';
+    END IF;
+    IF psn > 0 THEN
+        psn := psn - 1; -- minus-1 from comma position
+        -- RAISE NOTICE 'psn %',psn;
+        argx := SUBSTRING(arg_str FROM 1 FOR psn);  -- get one set member
+        psn := psn + 2; -- go to first starting letter
+        arg_str := SUBSTRING(arg_str FROM psn);   -- hack it off
+        psn := POSITION(',' in arg_str);
+    ELSE nobreak = 0;
+    END IF;
+    -- RAISE NOTICE 'next argx % and next arg_str %', argx, arg_str;
+END LOOP;
+RETURN NEW;
+----
+END;
+\$\$ LANGUAGE 'plpgsql' VOLATILE;
+
+drop trigger set_test ON $table;
+-- make a trigger for each set field
+-- make trigger and hard-code in column names
+-- see http://archives.postgresql.org/pgsql-interfaces/2005-02/msg00020.php
+CREATE   TRIGGER    set_test
+BEFORE   INSERT OR   UPDATE  ON $table   FOR  EACH  ROW
+EXECUTE  PROCEDURE  check_".$table."_".$column_name."_set();\n";
+} #  end sub make_plpgsql();
+

data-sources/wikipedia-wikidata/wikidata_place_type_levels.csv

@@ -0,0 +1,199 @@
+place_type,level
+Q9842,4
+Q9430,3
+Q928830,4
+Q9259,1
+Q91028,5
+Q8514,2
+Q8502,2
+Q83405,3
+Q82794,2
+Q820477,1
+Q811979,1
+Q8072,2
+Q79007,2
+Q786014,3
+Q75848,2
+Q75520,2
+Q728937,4
+Q7275,2
+Q719456,3
+Q7075,3
+Q697295,4
+Q6852233,2
+Q682943,3
+Q665487,5
+Q655686,3
+Q643589,5
+Q641226,2
+Q631305,2
+Q6256,2
+Q6023295,2
+Q5773747,5
+Q56061,1
+Q55659167,4
+Q55488,4
+Q55465477,3
+Q54050,2
+Q532,3
+Q53060,2
+Q52177058,4
+Q515716,5
+Q5153984,4
+Q515,3
+Q5144960,5
+Q5119,4
+Q5119,4
+Q5107,2
+Q5084,4
+Q5031071,4
+Q5003624,2
+Q4989906,1
+Q4976993,3
+Q486972,1
+Q486972,2
+Q483110,3
+Q4830453,4
+Q47521,3
+Q473972,1
+Q46831,2
+Q46614560,5
+Q44782,3
+Q44613,4
+Q44539,4
+Q44494,2
+Q44377,2
+Q4421,2
+Q43501,2
+Q4286337,3
+Q42523,3
+Q41176,2
+Q40357,3
+Q4022,4
+Q40080,2
+Q39816,2
+Q39715,3
+Q39614,1
+Q3957,3
+Q3947,4
+Q3914,3
+Q38723,2
+Q38720,3
+Q3623867,5
+Q35666,2
+Q355304,3
+Q35509,2
+Q35112127,3
+Q34985575,4
+Q34876,5
+Q34763,2
+Q34627,4
+Q3455524,3
+Q34442,4
+Q33837,2
+Q33506,3
+Q32815,4
+Q3257686,2
+Q3240715,2
+Q3191695,5
+Q3153117,2
+Q30198,2
+Q30139652,3
+Q294422,3
+Q2870166,3
+Q27686,3
+Q274153,3
+Q271669,1
+Q2659904,2
+Q24529780,2
+Q24354,3
+Q2354973,4
+Q23442,2
+Q23413,3
+Q23397,3
+Q2327515,4
+Q2311958,5
+Q22927291,6
+Q22698,1
+Q2175765,4
+Q205495,4
+Q204832,3
+Q2042028,2
+Q202216,6
+Q1970725,3
+Q194203,5
+Q194195,2
+Q190429,2
+Q185187,3
+Q185113,2
+Q183366,2
+Q1799794,1
+Q1788454,4
+Q1785071,3
+Q1777138,3
+Q177634,2
+Q177380,2
+Q174814,4
+Q174782,2
+Q17350442,2
+Q17343829,3
+Q17334923,0
+Q17018380,3
+Q16970,4
+Q16917,3
+Q16831714,4
+Q165,3
+Q160742,4
+Q159719,3
+Q159334,4
+Q15640612,5
+Q15324,2
+Q15284,5
+Q15243209,6
+Q152081,1
+Q15195406,4
+Q1500350,5
+Q149621,5
+Q14757767,4
+Q14350,3
+Q1410668,3
+Q1394476,3
+Q1377575,2
+Q1353183,3
+Q134447,4
+Q133215,3
+Q133056,2
+Q13221722,3
+Q13220204,2
+Q1311958,4
+Q1303167,3
+Q130003,3
+Q12518,2
+Q12516,3
+Q1248784,3
+Q123705,3
+Q12323,3
+Q12284,4
+Q12280,4
+Q121359,2
+Q1210950,2
+Q11755880,3
+Q11707,3
+Q11315,3
+Q11303,3
+Q1115575,4
+Q1107656,1
+Q10864048,1
+Q1076486,2
+Q105731,3
+Q105190,3
+Q1048525,3
+Q102496,5
+Q28872924,1
+Q15617994,1
+Q159313,2
+Q24398318,3
+Q327333,2
+Q43229,1
+Q860861,1
+Q4989906,1

data-sources/wikipedia-wikidata/wikidata_place_types.txt

@@ -0,0 +1,195 @@
+Q9842
+Q9430
+Q928830
+Q9259
+Q91028
+Q8514
+Q8502
+Q83405
+Q82794
+Q820477
+Q811979
+Q8072
+Q79007
+Q786014
+Q75848
+Q75520
+Q728937
+Q7275
+Q719456
+Q7075
+Q697295
+Q6852233
+Q682943
+Q665487
+Q655686
+Q643589
+Q641226
+Q631305
+Q6256
+Q6023295
+Q5773747
+Q56061
+Q55659167
+Q55488
+Q55465477
+Q54050
+Q532
+Q53060
+Q52177058
+Q515716
+Q5153984
+Q515
+Q5144960
+Q5119
+Q5107
+Q5084
+Q5031071
+Q5003624
+Q4989906
+Q4976993
+Q486972
+Q483110
+Q4830453
+Q47521
+Q473972
+Q46831
+Q46614560
+Q44782
+Q44613
+Q44539
+Q44494
+Q44377
+Q4421
+Q43501
+Q4286337
+Q42523
+Q41176
+Q40357
+Q4022
+Q40080
+Q39816
+Q39715
+Q39614
+Q3957
+Q3947
+Q3914
+Q38723
+Q38720
+Q3623867
+Q35666
+Q355304
+Q35509
+Q35112127
+Q34985575
+Q34876
+Q34763
+Q34627
+Q3455524
+Q34442
+Q33837
+Q33506
+Q32815
+Q3257686
+Q3240715
+Q3191695
+Q3153117
+Q30198
+Q30139652
+Q294422
+Q2870166
+Q27686
+Q274153
+Q271669
+Q2659904
+Q24529780
+Q24354
+Q2354973
+Q23442
+Q23413
+Q23397
+Q2327515
+Q2311958
+Q22927291
+Q22698
+Q2175765
+Q205495
+Q204832
+Q2042028
+Q202216
+Q1970725
+Q194203
+Q194195
+Q190429
+Q185187
+Q185113
+Q183366
+Q1799794
+Q1788454
+Q1785071
+Q1777138
+Q177634
+Q177380
+Q174814
+Q174782
+Q17350442
+Q17343829
+Q17334923
+Q17018380
+Q16970
+Q16917
+Q16831714
+Q165
+Q160742
+Q159719
+Q159334
+Q15640612
+Q15324
+Q15284
+Q15243209
+Q152081
+Q15195406
+Q1500350
+Q149621
+Q14757767
+Q14350
+Q1410668
+Q1394476
+Q1377575
+Q1353183
+Q134447
+Q133215
+Q133056
+Q13221722
+Q13220204
+Q1311958
+Q1303167
+Q130003
+Q12518
+Q12516
+Q1248784
+Q123705
+Q12323
+Q12284
+Q12280
+Q121359
+Q1210950
+Q11755880
+Q11707
+Q11315
+Q11303
+Q1115575
+Q1107656
+Q10864048
+Q1076486
+Q105731
+Q105190
+Q1048525
+Q102496
+Q28872924
+Q15617994
+Q159313
+Q24398318
+Q327333
+Q43229
+Q860861

data-sources/wikipedia-wikidata/wikidata_places.md

@@ -0,0 +1,200 @@
+
+## Wikidata place types and related OSM Tags
+
+Wikidata does not have any official ontologies, however the [DBpedia project](https://wiki.dbpedia.org/) has created an [ontology](https://wiki.dbpedia.org/services-resources/ontology) that covered [place types](http://mappings.dbpedia.org/server/ontology/classes/#Place). The table below used the DBpedia place ontology as a starting point, and is provided as a cross-reference to the relevant OSM tags.
+
+The Wikidata place types listed in the table below can be used in conjunction with the [Wikidata Query Service](https://query.wikidata.org/) to retrieve instances of those place types from the Wikidata knowledgebase. 
+
+```
+SELECT ?item ?lat ?lon
+WHERE {
+  ?item wdt:P31*/wdt:P279*wd:Q9430; wdt:P625 ?pt.
+  ?item p:P625?loc.
+  ?loc psv:P625?cnode.
+  ?cnode wikibase:geoLatitude?lat.
+  ?cnode wikibase:geoLongitude?lon.
+}
+```
+
+An example json return for all instances of the Wikidata item "Q9430" (Ocean) can be seen at [json](https://query.wikidata.org/bigdata/namespace/wdq/sparql?format=json&query=SELECT?item?lat?lon%20WHERE{?item%20wdt:P31*/wdt:P279*wd:Q9430;wdt:P625?pt.?item%20p:P625?loc.?loc%20psv:P625?cnode.?cnode%20wikibase:geoLatitude?lat.?cnode%20wikibase:geoLongitude?lon.})
+
+**NOTE** the OSM tags listed are those listed in the wikidata entries, and not all the possible matches for tags within OSM.
+
+
+   title   |             concept                   |       OSM Tag     | 
+-----------|---------------------------------------|------------------|
+[Q17334923](https://www.wikidata.org/entity/Q17334923)  | Location | | 
+[Q811979](https://www.wikidata.org/entity/Q811979)           | Architectural Structure | | 
+[Q194195](https://www.wikidata.org/entity/Q194195)   | Amusement park | 
+[Q204832](https://www.wikidata.org/entity/Q204832)   | Roller coaster | [attraction=roller_coaster](https://wiki.openstreetmap.org/wiki/Tag:attraction=roller_coaster) | 
+[Q2870166](https://www.wikidata.org/entity/Q2870166)   | Water ride | |
+[Q641226](https://www.wikidata.org/entity/Q641226)    | Arena | [amenity=events_centre](https://wiki.openstreetmap.org/wiki/Tag:amenity=events_centre) | 
+[Q41176](https://www.wikidata.org/entity/Q41176)     | Building | [building=yes](https://wiki.openstreetmap.org/wiki/Key:building) |
+[Q1303167](https://www.wikidata.org/entity/Q1303167)   | Barn | [building=barn](https://wiki.openstreetmap.org/wiki/Tag:building=barn) |
+[Q655686](https://www.wikidata.org/entity/Q655686)   | Commercial building | [building=commercial](https://wiki.openstreetmap.org/wiki/Tag:building=commercial) | 
+[Q4830453](https://www.wikidata.org/entity/Q4830453)   | Business | |
+[Q7075](https://www.wikidata.org/entity/Q7075)     | Library | [amenity=library](https://wiki.openstreetmap.org/wiki/Tag:amenity=library) |
+[Q133215](https://www.wikidata.org/entity/Q133215)   | Casino | [amenity=casino](https://wiki.openstreetmap.org/wiki/Tag:amenity=casino) | 
+[Q23413](https://www.wikidata.org/entity/Q23413)     | Castle | [historic=castle](https://wiki.openstreetmap.org/wiki/Tag:historic=castle) |
+[Q83405](https://www.wikidata.org/entity/Q83405)     | Factory | | 
+[Q53060](https://www.wikidata.org/entity/Q53060)     | Gate  | [barrier=gate](https://wiki.openstreetmap.org/wiki/Tag:barrier=gate) |cnode%20wikibase:geoLatitude?lat.?cnode%20wikibase:geoLongitude?lon.})
+[Q11755880](https://www.wikidata.org/entity/Q11755880)           | Residential Building  | [building=residential](https://wiki.openstreetmap.org/wiki/Tag:building=residential) | 
+[Q3947](https://www.wikidata.org/entity/Q3947)      | House  | [building=house](https://wiki.openstreetmap.org/wiki/Tag:building=house) |
+[Q35112127](https://www.wikidata.org/entity/Q35112127)           | Historic Building  | |
+[Q5773747](https://www.wikidata.org/entity/Q5773747)   | Historic house  | | 
+[Q38723](https://www.wikidata.org/entity/Q38723)           | Higher Education Institution  | 
+[Q3914](https://www.wikidata.org/entity/Q3914)      | School  | [amenity=school](https://wiki.openstreetmap.org/wiki/Tag:amenity=school) | 
+[Q9842](https://www.wikidata.org/entity/Q9842)      | Primary school  | | 
+[Q159334](https://www.wikidata.org/entity/Q159334)    | Secondary school  | | 
+[Q16917](https://www.wikidata.org/entity/Q16917)     | Hospital  | [amenity=hospital](https://wiki.openstreetmap.org/wiki/Tag:amenity=hospital), [healthcare=hospital](https://wiki.openstreetmap.org/wiki/Tag:healthcare=hospital), [building=hospital](https://wiki.openstreetmap.org/wiki/Tag:building=hospital) |
+[Q27686](https://www.wikidata.org/entity/Q27686)     | Hotel  | [tourism=hotel](https://wiki.openstreetmap.org/wiki/Tag:tourism=hotel), [building=hotel](https://wiki.openstreetmap.org/wiki/Tag:building=hotel) |
+[Q33506](https://www.wikidata.org/entity/Q33506)     | Museum  | [tourism=museum](https://wiki.openstreetmap.org/wiki/Tag:tourism=museum) |
+[Q40357](https://www.wikidata.org/entity/Q40357)     | Prison  | [amenity=prison](https://wiki.openstreetmap.org/wiki/Tag:amenity=prison) |
+[Q24398318](https://www.wikidata.org/entity/Q24398318)           | Religious Building  | |
+[Q160742](https://www.wikidata.org/entity/Q160742)    | Abbey  | |
+[Q16970](https://www.wikidata.org/entity/Q16970)     | Church (building)  | [building=church](https://wiki.openstreetmap.org/wiki/Tag:building=church) |
+[Q44613](https://www.wikidata.org/entity/Q44613)     | Monastery  | [amenity=monastery](https://wiki.openstreetmap.org/wiki/Tag:amenity=monastery) | 
+[Q32815](https://www.wikidata.org/entity/Q32815)     | Mosque  | [building=mosque](https://wiki.openstreetmap.org/wiki/Tag:building=mosque) | 
+[Q697295](https://www.wikidata.org/entity/Q697295)    | Shrine  | [building=shrine](https://wiki.openstreetmap.org/wiki/Tag:building=shrine) |
+[Q34627](https://www.wikidata.org/entity/Q34627)     | Synagogue  | [building=synagogue](https://wiki.openstreetmap.org/wiki/Tag:building=synagogue) |
+[Q44539](https://www.wikidata.org/entity/Q44539)     | Temple  | [building=temple](https://wiki.openstreetmap.org/wiki/Tag:building=temple) | 
+[Q11707](https://www.wikidata.org/entity/Q11707)     | Restaurant  | [amenity=restaurant](https://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant) |
+[Q11315](https://www.wikidata.org/entity/Q11315)     | Shopping mall  | [shop=mall](https://wiki.openstreetmap.org/wiki/Tag:shop=mall), [shop=shopping_centre](https://wiki.openstreetmap.org/wiki/Tag:shop=shopping_centre) | 
+[Q11303](https://www.wikidata.org/entity/Q11303)     | Skyscraper  | |
+[Q17350442](https://www.wikidata.org/entity/Q17350442)           | Venue  | |
+[Q41253](https://www.wikidata.org/entity/Q41253)           | Movie Theater  | [amenity=cinema](https://wiki.openstreetmap.org/wiki/Tag:amenity=cinema) | 
+[Q483110](https://www.wikidata.org/entity/Q483110)    | Stadium  | [leisure=stadium](https://wiki.openstreetmap.org/wiki/Tag:leisure=stadium), [building=stadium](https://wiki.openstreetmap.org/wiki/Tag:building=stadium) |
+[Q24354](https://www.wikidata.org/entity/Q24354)     | Theater (structure)  | [amenity=theatre](https://wiki.openstreetmap.org/wiki/Tag:amenity=theatre) |
+[Q121359](https://www.wikidata.org/entity/Q121359)    | Infrastructure  | |
+[Q1248784](https://www.wikidata.org/entity/Q1248784)   | Airport  | |
+[Q12323](https://www.wikidata.org/entity/Q12323)     | Dam  | [waterway=dam](https://wiki.openstreetmap.org/wiki/Tag:waterway=dam) |
+[Q1353183](https://www.wikidata.org/entity/Q1353183)   | Launch pad  | | 
+[Q105190](https://www.wikidata.org/entity/Q105190)   | Levee  | [man_made=dyke](https://wiki.openstreetmap.org/wiki/Tag:man_made=dyke) |
+[Q105731](https://www.wikidata.org/entity/Q105731)    | Lock (water navigation)   | [lock=yes](https://wiki.openstreetmap.org/wiki/Key:lock) |
+[Q44782](https://www.wikidata.org/entity/Q44782)     | Port  | |
+[Q159719](https://www.wikidata.org/entity/Q159719)    | Power station  | [power=plant](https://wiki.openstreetmap.org/wiki/Tag:power=plant) |
+[Q174814](https://www.wikidata.org/entity/Q174814)    | Electrical substation   |  |
+[Q134447](https://www.wikidata.org/entity/Q134447)    | Nuclear power plant  | [plant:source=nuclear](https://wiki.openstreetmap.org/wiki/Tag:plant:source=nuclear) |
+[Q786014](https://www.wikidata.org/entity/Q786014)   | Rest area  | [highway=rest_area](https://wiki.openstreetmap.org/wiki/Tag:highway=rest_area), [highway=services](https://wiki.openstreetmap.org/wiki/Tag:highway=services) |
+[Q12280](https://www.wikidata.org/entity/Q12280)     | Bridge  | [bridge=* ](https://wiki.openstreetmap.org/wiki/Key:bridge), [man_made=bridge](https://wiki.openstreetmap.org/wiki/Tag:man_made=bridge) |
+[Q728937](https://www.wikidata.org/entity/Q728937)           | Railroad Line  | [railway=rail](https://wiki.openstreetmap.org/wiki/Tag:railway=rail) | 
+[Q1311958](https://www.wikidata.org/entity/Q1311958)           | Railway Tunnel  | | 
+[Q34442](https://www.wikidata.org/entity/Q34442)     | Road  | [highway=* ](https://wiki.openstreetmap.org/wiki/Key:highway), [route=road](https://wiki.openstreetmap.org/wiki/Tag:route=road) |
+[Q1788454](https://www.wikidata.org/entity/Q1788454)   | Road junction  |  | 
+[Q44377](https://www.wikidata.org/entity/Q44377)     | Tunnel  | [tunnel=* ](https://wiki.openstreetmap.org/wiki/Key:tunnel) |
+[Q5031071](https://www.wikidata.org/entity/Q5031071)  | Canal tunnel  | |
+[Q719456](https://www.wikidata.org/entity/Q719456)    | Station  | [public_transport=station](https://wiki.openstreetmap.org/wiki/Tag:public_transport=station) |
+[Q205495](https://www.wikidata.org/entity/Q205495)    | Filling station  | [amenity=fuel](https://wiki.openstreetmap.org/wiki/Tag:amenity=fuel) |
+[Q928830](https://www.wikidata.org/entity/Q928830)    | Metro station  | [station=subway](https://wiki.openstreetmap.org/wiki/Tag:station=subway) |
+[Q55488](https://www.wikidata.org/entity/Q55488)     | Train station  | [railway=station](https://wiki.openstreetmap.org/wiki/Tag:railway=station) |
+[Q2175765](https://www.wikidata.org/entity/Q2175765)   | Tram stop  | [railway=tram_stop](https://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop), [public_transport=stop_position](https://wiki.openstreetmap.org/wiki/Tag:public_transport=stop_position) |
+[Q6852233](https://www.wikidata.org/entity/Q6852233)   | Military building  | |
+[Q44494](https://www.wikidata.org/entity/Q44494)     | Mill (grinding)  | |
+[Q185187](https://www.wikidata.org/entity/Q185187)    | Watermill  | [man_made=watermill](https://wiki.openstreetmap.org/wiki/Tag:man_made=watermill) |
+[Q38720](https://www.wikidata.org/entity/Q38720)     | Windmill  | [man_made=windmill](https://wiki.openstreetmap.org/wiki/Tag:man_made=windmill) | 
+[Q4989906](https://www.wikidata.org/entity/Q4989906)   | Monument  | [historic=monument](https://wiki.openstreetmap.org/wiki/Tag:historic=monument) |
+[Q5003624](https://www.wikidata.org/entity/Q5003624)   | Memorial  | [historic=memorial](https://wiki.openstreetmap.org/wiki/Tag:historic=memorial) |
+[Q271669](https://www.wikidata.org/entity/Q271669)   | Landform  | |
+[Q190429](https://www.wikidata.org/entity/Q190429)    | Depression (geology)  | |
+[Q17018380](https://www.wikidata.org/entity/Q17018380)  | Bight (geography)  | | 
+[Q54050](https://www.wikidata.org/entity/Q54050)     | Hill  | |
+[Q1210950](https://www.wikidata.org/entity/Q1210950)   | Channel (geography)  | |
+[Q23442](https://www.wikidata.org/entity/Q23442)    | Island  | [place=island](https://wiki.openstreetmap.org/wiki/Tag:place=island) | 
+[Q42523](https://www.wikidata.org/entity/Q42523)    | Atoll  | |
+[Q34763](https://www.wikidata.org/entity/Q34763)    | Peninsula  | | 
+[Q355304](https://www.wikidata.org/entity/Q355304)   | Watercourse  | |
+[Q30198](https://www.wikidata.org/entity/Q30198)    | Marsh  | [wetland=marsh](https://wiki.openstreetmap.org/wiki/Tag:wetland=marsh) |
+[Q75520](https://www.wikidata.org/entity/Q75520)    | Plateau  | |
+[Q2042028](https://www.wikidata.org/entity/Q2042028)  | Ravine  | |
+[Q631305](https://www.wikidata.org/entity/Q631305)   | Rock formation  | | 
+[Q12516](https://www.wikidata.org/entity/Q12516)    | Pyramid  | |
+[Q1076486](https://www.wikidata.org/entity/Q1076486) | Sports venue  |  |
+[Q682943](https://www.wikidata.org/entity/Q682943)   | Cricket field  | [sport=cricket](https://wiki.openstreetmap.org/wiki/Tag:sport=cricket) | 
+[Q1048525](https://www.wikidata.org/entity/Q1048525)  | Golf course  | [leisure=golf_course](https://wiki.openstreetmap.org/wiki/Tag:leisure=golf_course) |
+[Q1777138](https://www.wikidata.org/entity/Q1777138)  | Race track  | [highway=raceway](https://wiki.openstreetmap.org/wiki/Tag:highway=raceway) | 
+[Q130003](https://www.wikidata.org/entity/Q130003)   | Ski resort  | |
+[Q174782](https://www.wikidata.org/entity/Q174782)   | Town square  | [place=square](https://wiki.openstreetmap.org/wiki/Tag:place=square) |
+[Q12518](https://www.wikidata.org/entity/Q12518)    | Tower  | [building=tower](https://wiki.openstreetmap.org/wiki/Tag:building=tower), [man_made=tower](https://wiki.openstreetmap.org/wiki/Tag:man_made=tower) |
+[Q39715](https://www.wikidata.org/entity/Q39715)    | Lighthouse  | [man_made=lighthouse](https://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse) |
+[Q274153](https://www.wikidata.org/entity/Q274153)   | Water tower | [building=water_tower](https://wiki.openstreetmap.org/wiki/Tag:building=water_tower), [man_made=water_tower](https://wiki.openstreetmap.org/wiki/Tag:man_made=water_tower) |
+[Q43501](https://www.wikidata.org/entity/Q43501)    | Zoo  | [tourism=zoo](https://wiki.openstreetmap.org/wiki/Tag:tourism=zoo) | 
+[Q39614](https://www.wikidata.org/entity/Q39614)    | Cemetery  | [amenity=grave_yard](https://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard), [landuse=cemetery](https://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery) |
+[Q152081](https://www.wikidata.org/entity/Q152081)   | Concentration camp  | |
+[Q1107656](https://www.wikidata.org/entity/Q1107656)  | Garden  | [leisure=garden](https://wiki.openstreetmap.org/wiki/Tag:leisure=garden) |
+[Q820477](https://www.wikidata.org/entity/Q820477)   | Mine |  | 
+[Q33837](https://www.wikidata.org/entity/Q33837) | Archipelago  | [place=archipelago](https://wiki.openstreetmap.org/wiki/Tag:place=archipelago) | 
+[Q40080](https://www.wikidata.org/entity/Q40080)    | Beach  | [natural=beach](https://wiki.openstreetmap.org/wiki/Tag:natural=beach) |
+[Q15324](https://www.wikidata.org/entity/Q15324)    | Body of water | [natural=water](https://wiki.openstreetmap.org/wiki/Tag:natural=water) | 
+[Q23397](https://www.wikidata.org/entity/Q23397)    | Lake  | [water=lake](https://wiki.openstreetmap.org/wiki/Tag:water=lake) | 
+[Q9430](https://www.wikidata.org/entity/Q9430)     | Ocean  | |
+[Q165](https://www.wikidata.org/entity/Q165)    | Sea  | |
+[Q47521](https://www.wikidata.org/entity/Q47521)    | Stream  | | 
+[Q12284](https://www.wikidata.org/entity/Q12284)    | Canal  | [waterway=canal](https://wiki.openstreetmap.org/wiki/Tag:waterway=canal) |
+[Q4022](https://www.wikidata.org/entity/Q4022)     | River  | [waterway=river](https://wiki.openstreetmap.org/wiki/Tag:waterway=river), [type=waterway](https://wiki.openstreetmap.org/wiki/Relation:waterway) |
+[Q185113](https://www.wikidata.org/entity/Q185113)   | Cape | [natural=cape](https://wiki.openstreetmap.org/wiki/Tag:natural=cape) | 
+[Q35509](https://www.wikidata.org/entity/Q35509)    | Cave  | [natural=cave_entrance](https://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance) | 
+[Q8514](https://www.wikidata.org/entity/Q8514)     | Desert  | | 
+[Q4421](https://www.wikidata.org/entity/Q4421)     | Forest  | [natural=wood](https://wiki.openstreetmap.org/wiki/Tag:natural=wood) |
+[Q35666](https://www.wikidata.org/entity/Q35666)    | Glacier  | [natural=glacier](https://wiki.openstreetmap.org/wiki/Tag:natural=glacier) |
+[Q177380](https://www.wikidata.org/entity/Q177380)   | Hot spring | | 
+[Q8502](https://www.wikidata.org/entity/Q8502)     | Mountain  | [natural=peak](https://wiki.openstreetmap.org/wiki/Tag:natural=peak) | 
+[Q133056](https://www.wikidata.org/entity/Q133056)   | Mountain pass  | | 
+[Q46831](https://www.wikidata.org/entity/Q46831)    | Mountain range  | |
+[Q39816](https://www.wikidata.org/entity/Q39816)    | Valley  | [natural=valley](https://wiki.openstreetmap.org/wiki/Tag:natural=valley) |
+[Q8072](https://www.wikidata.org/entity/Q8072)     | Volcano  | [natural=volcano](https://wiki.openstreetmap.org/wiki/Tag:natural=volcano) |
+[Q43229](https://www.wikidata.org/entity/Q43229)    | Organization  |  | 
+[Q327333](https://www.wikidata.org/entity/Q327333)   | Government agency  | [office=government](https://wiki.openstreetmap.org/wiki/Tag:office=government)|
+[Q22698](https://www.wikidata.org/entity/Q22698)    | Park | [leisure=park](https://wiki.openstreetmap.org/wiki/Tag:leisure=park) | 
+[Q159313](https://www.wikidata.org/entity/Q159313)   | Urban agglomeration | |
+[Q177634](https://www.wikidata.org/entity/Q177634)   | Community  | |
+[Q5107](https://www.wikidata.org/entity/Q5107)    | Continent | [place=continent](https://wiki.openstreetmap.org/wiki/Tag:place=continent) |
+[Q6256](https://www.wikidata.org/entity/Q6256)     | Country  | [place=country](https://wiki.openstreetmap.org/wiki/Tag:place=country) | 
+[Q75848](https://www.wikidata.org/entity/Q75848)    | Gated community | | 
+[Q3153117](https://www.wikidata.org/entity/Q3153117) | Intercommunality  | |
+[Q82794](https://www.wikidata.org/entity/Q82794)    | Region  | | 
+[Q56061](https://www.wikidata.org/entity/Q56061)    | Administrative division  | [boundary=administrative](https://wiki.openstreetmap.org/wiki/Tag:boundary=administrative)  | 
+[Q665487](https://www.wikidata.org/entity/Q665487)   | Diocese | | 
+[Q4976993](https://www.wikidata.org/entity/Q4976993)  | Parish | [boundary=civil_parish](https://wiki.openstreetmap.org/wiki/Tag:boundary=civil_parish) |
+[Q194203](https://www.wikidata.org/entity/Q194203)   | Arrondissements of France  | |
+[Q91028](https://www.wikidata.org/entity/Q91028)    | Arrondissements of Belgium  | | 
+[Q3623867](https://www.wikidata.org/entity/Q3623867)  | Arrondissements of Benin  | | 
+[Q2311958](https://www.wikidata.org/entity/Q2311958)  | Canton (country subdivision) | [political_division=canton](https://wiki.openstreetmap.org/wiki/FR:Cantons_in_France) |
+[Q643589](https://www.wikidata.org/entity/Q643589)   | Department |  | 
+[Q202216](https://www.wikidata.org/entity/Q202216)   | Overseas department and region  | |
+[Q149621](https://www.wikidata.org/entity/Q149621)   | District  | [place=district](https://wiki.openstreetmap.org/wiki/Tag:place=district) |
+[Q15243209](https://www.wikidata.org/wiki/Q15243209) | Historic district  | |
+[Q5144960](https://www.wikidata.org/entity/Q5144960)  | Microregion  | | 
+[Q15284](https://www.wikidata.org/entity/Q15284)    | Municipality  | |
+[Q515716](https://www.wikidata.org/entity/Q515716)   | Prefecture  | |
+[Q34876](https://www.wikidata.org/entity/Q34876)    | Province  | |
+[Q3191695](https://www.wikidata.org/entity/Q3191695)  | Regency (Indonesia)  | |
+[Q1970725](https://www.wikidata.org/entity/Q1970725)  | Natural region  | |
+[Q486972](https://www.wikidata.org/entity/Q486972)   | Human settlement  | | 
+[Q515](https://www.wikidata.org/entity/Q515)      | City  | [place=city](https://wiki.openstreetmap.org/wiki/Tag:place=city) |
+[Q5119](https://www.wikidata.org/entity/Q5119)     | Capital city | [capital=yes](https://wiki.openstreetmap.org/wiki/Key:capital) |
+[Q4286337](https://www.wikidata.org/entity/Q4286337)  | City district  | | 
+[Q1394476](https://www.wikidata.org/entity/Q1394476)  | Civil township  | | 
+[Q1115575](https://www.wikidata.org/entity/Q1115575)  | Civil parish  | [designation=civil_parish](https://wiki.openstreetmap.org/wiki/Tag:designation=civil_parish) |
+[Q5153984](https://www.wikidata.org/entity/Q5153984)  | Commune-level subdivisions  | |
+[Q123705](https://www.wikidata.org/entity/Q123705)   | Neighbourhood  | [place=neighbourhood](https://wiki.openstreetmap.org/wiki/Tag:place=neighbourhood) |
+[Q1500350](https://www.wikidata.org/entity/Q1500350)  | Townships of China  | |
+[Q17343829](https://www.wikidata.org/entity/Q17343829)           | Unincorporated Community  | |
+[Q3957](https://www.wikidata.org/entity/Q3957)     | Town  | [place=town](https://wiki.openstreetmap.org/wiki/Tag:place=town) | 
+[Q532](https://www.wikidata.org/entity/Q532)      | Village  | [place=village](https://wiki.openstreetmap.org/wiki/Tag:place=village) |
+[Q5084](https://www.wikidata.org/entity/Q5084)     | Hamlet   | [place=hamlet](https://wiki.openstreetmap.org/wiki/Tag:place=hamlet) | 
+[Q7275](https://www.wikidata.org/entity/Q7275)     | State  | | 
+[Q79007](https://www.wikidata.org/entity/Q79007)    | Street  | |
+[Q473972](https://www.wikidata.org/entity/Q473972)   | Protected area  | [boundary=protected_area](https://wiki.openstreetmap.org/wiki/Tag:boundary=protected_area) |
+[Q1377575](https://www.wikidata.org/entity/Q1377575)  | Wildlife refuge  | | 
+[Q1410668](https://www.wikidata.org/entity/Q1410668)  | National Wildlife Refuge  | [protection_title=National Wildlife Refuge](ownership=national), [ownership=national](https://wiki.openstreetmap.org/wiki/Tag:ownership=national)|
+[Q9259](https://www.wikidata.org/entity/Q9259)     | World Heritage Site  | |
+
+---
+
+### Future Work
+
+The Wikidata improvements to Nominatim can be further enhanced by:
+
+- continuing to add new Wikidata links to OSM objects
+- increasing the number of place types accounted for in the wikipedia_articles table
+- working to use place types in the wikipedia_article matching process

docs/CMakeLists.txt

@@ -5,6 +5,7 @@
 
 configure_file(mkdocs.yml ../mkdocs.yml)
 file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/appendix)
+file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/data-sources)
 
 set (DOC_SOURCES
      admin
@@ -13,6 +14,7 @@ set (DOC_SOURCES
      index.md
      extra.css
      styles.css
+     data-sources/overview.md
     )
 
 foreach (src ${DOC_SOURCES})
@@ -21,6 +23,22 @@ foreach (src ${DOC_SOURCES})
     )
 endforeach()
 
+execute_process(
+   COMMAND ${CMAKE_COMMAND} -E create_symlink ${PROJECT_SOURCE_DIR}/data-sources/us-tiger/README.md ${CMAKE_CURRENT_BINARY_DIR}/data-sources/US-Tiger.md
+)
+execute_process(
+   COMMAND ${CMAKE_COMMAND} -E create_symlink ${PROJECT_SOURCE_DIR}/data-sources/gb-postcodes/README.md ${CMAKE_CURRENT_BINARY_DIR}/data-sources/GB-Postcodes.md
+)
+execute_process(
+   COMMAND ${CMAKE_COMMAND} -E create_symlink ${PROJECT_SOURCE_DIR}/data-sources/country-grid/README.md ${CMAKE_CURRENT_BINARY_DIR}/data-sources/Country-Grid.md
+)
+execute_process(
+   COMMAND ${CMAKE_COMMAND} -E create_symlink ${PROJECT_SOURCE_DIR}/data-sources/country-grid/mexico.quad.png ${CMAKE_CURRENT_BINARY_DIR}/data-sources/mexico.quad.png
+)
+execute_process(
+   COMMAND ${CMAKE_COMMAND} -E create_symlink ${PROJECT_SOURCE_DIR}/data-sources/wikipedia-wikidata/README.md  ${CMAKE_CURRENT_BINARY_DIR}/data-sources/Wikipedia-Wikidata.md
+)
+
 ADD_CUSTOM_TARGET(doc
    COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/bash2md.sh ${PROJECT_SOURCE_DIR}/vagrant/Install-on-Centos-7.sh ${CMAKE_CURRENT_BINARY_DIR}/appendix/Install-on-Centos-7.md
    COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/bash2md.sh ${PROJECT_SOURCE_DIR}/vagrant/Install-on-Centos-8.sh ${CMAKE_CURRENT_BINARY_DIR}/appendix/Install-on-Centos-8.md

docs/admin/Advanced-Installations.md

@@ -51,8 +51,7 @@ The file `import_multiple_regions.sh` needs to be edited as per your requirement
 !!! tip
     If your database already exists and you want to add more countries, replace the setting up part
     `${SETUPFILE} --osm-file ${UPDATEDIR}/tmp/combined.osm.pbf --all 2>&1`
-    with `${UPDATEFILE} --import-file ${UPDATEDIR}/tmp/combined.osm.pbf --index --index-instances N 2>&1`
-    where N is the numbers of CPUs in your system.
+    with `${UPDATEFILE} --import-file ${UPDATEDIR}/tmp/combined.osm.pbf 2>&1`.
 
 ### Setting up multiple regions
 

docs/admin/Deployment.md

@@ -1,141 +0,0 @@
-# Deploying Nominatim
-
-The Nominatim API is implemented as a PHP application. The `website/` directory
-in the build directory contains the configured website. You can serve this
-in a production environment with any web server that is capable to run
-PHP scripts.
-
-This section gives a quick overview on how to configure Apache and Nginx to
-serve Nominatim. It is not meant as a full system administration guide on how
-to run a web service. Please refer to the documentation of
-[Apache](http://httpd.apache.org/docs/current/) and
-[Nginx](https://nginx.org/en/docs/)
-for background information on configuring the services.
-
-!!! Note
-    Throughout this page, we assume that your Nominatim build directory is
-    located in `/srv/nominatim/build` and the source code in
-    `/srv/nominatim/Nominatim`. If you have put it somewhere else, you
-    need to adjust the commands and configuration accordingly.
-
-    We further assume that your web server runs as user `www-data`. Older
-    versions of CentOS may still use the user name `apache`. You also need
-    to adapt the instructions in this case.
-
-## Making the website directory accessible
-
-You need to make sure that the `website` directory is accessible for the
-web server user. You can check that the permissions are correct by accessing
-on of the php files as the web server user:
-
-``` sh
-sudo -u www-data head -n 1 /srv/nominatim/build/website/search.php
-```
-
-If this shows a permission error, then you need to adapt the permissions of
-each directory in the path so that it is executable for `www-data`.
-
-If you have SELinux enabled, further adjustments may be necessary to give the
-web server access. At a minimum the following SELinux labelling should be done
-for Nominatim:
-
-``` sh
-sudo semanage fcontext -a -t httpd_sys_content_t "/srv/nominatim/Nominatim/(website|lib|settings)(/.*)?"
-sudo semanage fcontext -a -t httpd_sys_content_t "/srv/nominatim/build/(website|settings)(/.*)?"
-sudo semanage fcontext -a -t lib_t "/srv/nominatim/build/module/nominatim.so"
-sudo restorecon -R -v /srv/nominatim/Nominatim
-sudo restorecon -R -v /srv/nominatim/build
-```
-
-## Nominatim with Apache
-
-### Installing the required packages
-
-With Apache you can use the PHP module to run Nominatim.
-
-Under Ubuntu/Debian install them with:
-
-``` sh
-sudo apt install apache2 libapache2-mod-php
-```
-
-### Configuring Apache
-
-Make sure your Apache configuration contains the required permissions for the
-directory and create an alias:
-
-``` apache
-<Directory "/srv/nominatim/build/website">
-  Options FollowSymLinks MultiViews
-  AddType text/html   .php
-  DirectoryIndex search.php
-  Require all granted
-</Directory>
-Alias /nominatim /srv/nominatim/build/website
-```
-
-After making changes in the apache config you need to restart apache.
-The website should now be available on `http://localhost/nominatim`.
-
-## Nominatim with Nginx
-
-### Installing the required packages
-
-Nginx has no built-in PHP interpreter. You need to use php-fpm as a deamon for
-serving PHP cgi.
-
-On Ubuntu/Debian install nginx and php-fpm with:
-
-``` sh
-sudo apt install nginx php-fpm
-```
-
-### Configure php-fpm and Nginx
-
-By default php-fpm listens on a network socket. If you want it to listen to a
-Unix socket instead, change the pool configuration
-(`/etc/php/<php version>/fpm/pool.d/www.conf`) as follows:
-
-``` ini
-; Replace the tcp listener and add the unix socket
-listen = /var/run/php-fpm.sock
-
-; Ensure that the daemon runs as the correct user
-listen.owner = www-data
-listen.group = www-data
-listen.mode = 0666
-```
-
-Tell nginx that php files are special and to fastcgi_pass to the php-fpm
-unix socket by adding the location definition to the default configuration.
-
-``` nginx
-root /srv/nominatim/build/website;
-index search.php;
-location / {
-    try_files $uri $uri/ @php;
-}
-
-location @php {
-    fastcgi_param SCRIPT_FILENAME "$document_root$uri.php";
-    fastcgi_param PATH_TRANSLATED "$document_root$uri.php";
-    fastcgi_param QUERY_STRING    $args;
-    fastcgi_pass unix:/var/run/php-fpm.sock;
-    fastcgi_index index.php;
-    include fastcgi_params;
-}
-
-location ~ [^/]\.php(/|$) {
-    fastcgi_split_path_info ^(.+?\.php)(/.*)$;
-    if (!-f $document_root$fastcgi_script_name) {
-        return 404;
-    }
-    fastcgi_pass unix:/var/run/php-fpm.sock;
-    fastcgi_index search.php;
-    include fastcgi.conf;
-}
-```
-
-Restart the nginx and php-fpm services and the website should now be available
-at `http://localhost/`.
-

docs/admin/Import.md

@@ -29,7 +29,7 @@ Add to your `settings/local.php`:
     @define('CONST_Osm2pgsql_Flatnode_File', '/path/to/flatnode.file');
 
 Replace the second part with a suitable path on your system and make sure
-the directory exists. There should be at least 75GB of free space.
+the directory exists. There should be at least 64GB of free space.
 
 ## Downloading additional data
 
@@ -43,7 +43,7 @@ This data is available as a binary download:
     cd $NOMINATIM_SOURCE_DIR/data
     wget https://www.nominatim.org/data/wikimedia-importance.sql.gz
 
-The file is about 400MB and adds around 4GB to the Nominatim database.
+The file is about 400MB and adds around 4GB to Nominatim database.
 
 !!! tip
     If you forgot to download the wikipedia rankings, you can also add
@@ -60,21 +60,21 @@ involve a GB or US postcode. This data can be optionally downloaded:
     wget https://www.nominatim.org/data/gb_postcode_data.sql.gz
     wget https://www.nominatim.org/data/us_postcode_data.sql.gz
 
-## Choosing the data to import
+## Choosing the Data to Import
 
 In its default setup Nominatim is configured to import the full OSM data
 set for the entire planet. Such a setup requires a powerful machine with
-at least 64GB of RAM and around 900GB of SSD hard disks. Depending on your
+at least 64GB of RAM and around 800GB of SSD hard disks. Depending on your
 use case there are various ways to reduce the amount of data imported. This
 section discusses these methods. They can also be combined.
 
 ### Using an extract
 
-If you only need geocoding for a smaller region, then precomputed OSM extracts
+If you only need geocoding for a smaller region, then precomputed extracts
 are a good way to reduce the database size and import time.
 [Geofabrik](https://download.geofabrik.de) offers extracts for most countries.
 They even have daily updates which can be used with the update process described
-[in the next section](../Update). There are also
+below. There are also
 [other providers for extracts](https://wiki.openstreetmap.org/wiki/Planet.osm#Downloading).
 
 Please be aware that some extracts are not cut exactly along the country
@@ -128,23 +128,21 @@ The style can be changed with the configuration `CONST_Import_Style`.
 
 To give you an idea of the impact of using the different styles, the table
 below gives rough estimates of the final database size after import of a
-2020 planet and after using the `--drop` option. It also shows the time
-needed for the import on a machine with 64GB RAM, 4 CPUS and NVME disks.
-Note that the given sizes are just an estimate meant for comparison of
-style requirements. Your planet import is likely to be larger as the
-OSM data grows with time.
+2018 planet and after using the `--drop` option. It also shows the time
+needed for the import on a machine with 64GB RAM, 4 CPUS and SSDs. Note that
+the given sizes are just an estimate meant for comparison of style requirements.
+Your planet import is likely to be larger as the OSM data grows with time.
 
 style     | Import time  |  DB size   |  after drop
 ----------|--------------|------------|------------
-admin     |    4h        |  215 GB    |   20 GB
-street    |   22h        |  440 GB    |  185 GB
-address   |   36h        |  545 GB    |  260 GB
-full      |   54h        |  640 GB    |  330 GB
-extratags |   54h        |  650 GB    |  340 GB
+admin     |    5h        |  190 GB    |   20 GB
+street    |   42h        |  400 GB    |  180 GB
+address   |   59h        |  500 GB    |  260 GB
+full      |   80h        |  575 GB    |  300 GB
+extratags |   80h        |  585 GB    |  310 GB
 
-You can also customize the styles further.
-A [description of the style format](../develop/Import.md#configuring-the-import) 
-can be found in the development section.
+You can also customize the styles further. For a description of the
+style format see [the development section](../develop/Import.md).
 
 ## Initial import of the data
 
@@ -152,17 +150,15 @@ can be found in the development section.
     First try the import with a small extract, for example from
     [Geofabrik](https://download.geofabrik.de).
 
-Download the data to import. Then issue the following command
-from the **build directory** to start the import:
+Download the data to import and load the data with the following command
+from the build directory:
 
 ```sh
 ./utils/setup.php --osm-file <data file> --all 2>&1 | tee setup.log
 ```
 
-### Notes on full planet imports
-
-Even on a perfectly configured machine
-the import of a full planet takes around 2 days. Once you see messages
+***Note for full planet imports:*** Even on a perfectly configured machine
+the import of a full planet takes at least 2 days. Once you see messages
 with `Rank .. ETA` appear, the indexing process has started. This part takes
 the most time. There are 30 ranks to process. Rank 26 and 30 are the most complex.
 They take each about a third of the total import time. If you have not reached
@@ -171,12 +167,11 @@ configuration as it may not be optimal for the import.
 
 ### Notes on memory usage
 
-In the first step of the import Nominatim uses [osm2pgsql](https://osm2pgsql.org)
-to load the OSM data into the PostgreSQL database. This step is very demanding
-in terms of RAM usage. osm2pgsql and PostgreSQL are running in parallel at 
-this point. PostgreSQL blocks at least the part of RAM that has been configured
-with the `shared_buffers` parameter during
-[PostgreSQL tuning](Installation#postgresql-tuning)
+In the first step of the import Nominatim uses osm2pgsql to load the OSM data
+into the PostgreSQL database. This step is very demanding in terms of RAM usage.
+osm2pgsql and PostgreSQL are running in parallel at this point. PostgreSQL
+blocks at least the part of RAM that has been configured with the
+`shared_buffers` parameter during [PostgreSQL tuning](Installation#postgresql-tuning)
 and needs some memory on top of that. osm2pgsql needs at least 2GB of RAM for
 its internal data structures, potentially more when it has to process very large
 relations. In addition it needs to maintain a cache for node locations. The size
@@ -187,12 +182,12 @@ completely and leave the memory for the flatnode file. Nominatim will do this
 by default, so you do not need to configure anything in this case.
 
 For imports without a flatnode file, set `--osm2pgsql-cache` approximately to
-the size of the OSM pbf file you are importing. The size needs to be given in
-MB. Make sure you leave enough RAM for PostgreSQL and osm2pgsql as mentioned
-above. If the system starts swapping or you are getting out-of-memory errors,
-reduce the cache size or even consider using a flatnode file.
+the size of the OSM pbf file (in MB) you are importing. Make sure you leave
+enough RAM for PostgreSQL and osm2pgsql as mentioned above. If the system starts
+swapping or you are getting out-of-memory errors, reduce the cache size or
+even consider using a flatnode file.
 
-### Verify the import
+### Verify import finished
 
 Run this script to verify all required tables and indices got created successfully.
 
@@ -200,30 +195,6 @@ Run this script to verify all required tables and indices got created successful
 ./utils/check_import_finished.php
 ```
 
-### Setting up the website
-
-Run the following command to set up the configuration file for the API frontend
-`settings/settings-frontend.php`. These settings are used in website/*.php files.
-
-```sh
-./utils/setup.php --setup-website
-```
-!!! Note
-    This step is not necessary if you use `--all` option while setting up the DB.
-
-Now you can try out your installation by running:
-
-```sh
-make serve
-```
-
-This runs a small test server normally used for development. You can use it
-to verify that your installation is working. Go to
-`http://localhost:8088/status.php` and you should see the message `OK`.
-You can also run a search query, e.g. `http://localhost:8088/search.php?q=Berlin`.
-
-To run Nominatim via webservers like Apache or nginx, please read the
-[Deployment chapter](Deployment.md).
 
 ## Tuning the database
 
@@ -265,6 +236,8 @@ entire US adds about 10GB to your database.
         wget https://nominatim.org/data/tiger2019-nominatim-preprocessed.tar.gz
         tar xf tiger2019-nominatim-preprocessed.tar.gz
 
+    `data-source/us-tiger/README.md` explains how the data got preprocessed.
+
   2. Import the data into your Nominatim database:
 
         ./utils/setup.php --import-tiger-data
@@ -280,6 +253,3 @@ entire US adds about 10GB to your database.
 ```
 
 
-See the [developer's guide](../develop/data-sources.md#us-census-tiger) for more
-information on how the data got preprocessed.
-

docs/admin/Installation.md

@@ -43,13 +43,17 @@ For running Nominatim:
   * [PHP](https://php.net) (7.0 or later)
   * PHP-pgsql
   * PHP-intl (bundled with PHP)
+  * a webserver (apache or nginx are recommended)
 
 For running continuous updates:
 
   * [pyosmium](https://osmcode.org/pyosmium/) (with Python 3)
 
-For dependencies for running tests and building documentation, see
-the [Development section](../develop/Development-Environment.md).
+For running tests:
+
+  * [behave](https://behave.readthedocs.io)
+  * [nose](https://nose.readthedocs.io)
+  * [phpunit](https://phpunit.de) >= 7.3
 
 ### Hardware
 
@@ -57,14 +61,16 @@ A minimum of 2GB of RAM is required or installation will fail. For a full
 planet import 64GB of RAM or more are strongly recommended. Do not report
 out of memory problems if you have less than 64GB RAM.
 
-For a full planet install you will need at least 900GB of hard disk space.
-Take into account that the OSM database is growing fast.
-Fast disks are essential. Using NVME disks is recommended.
+For a full planet install you will need at least 800GB of hard disk space
+(take into account that the OSM database is growing fast). SSD disks
+will help considerably to speed up import and queries.
 
 Even on a well configured machine the import of a full planet takes
-around 2 days. On traditional spinning disks, 7-8 days are more realistic.
+at least 2 days. Without SSDs 7-8 days are more realistic.
 
-## Tuning the PostgreSQL database
+## Setup of the server
+
+### PostgreSQL tuning
 
 You might want to tune your PostgreSQL installation so that the later steps
 make best use of your hardware. You should tune the following parameters in
@@ -104,44 +110,82 @@ Don't forget to reenable them after the initial import or you risk database
 corruption.
 
 
-## Downloading and building Nominatim
+### Webserver setup
 
-### Downloading the latest release
+The `website/` directory in the build directory contains the configured
+website. Include the directory into your webbrowser to serve php files
+from there.
 
-You can download the [latest release from nominatim.org](https://nominatim.org/downloads/).
-The release contains all necessary files. Just unpack it.
+#### Configure for use with Apache
 
-### Downloading the latest development version
+Make sure your Apache configuration contains the required permissions for the
+directory and create an alias:
 
-If you want to install latest development version from github, make sure to
-also check out the osm2pgsql subproject:
-
-```
-git clone --recursive git://github.com/openstreetmap/Nominatim.git
+``` apache
+<Directory "/srv/nominatim/build/website">
+  Options FollowSymLinks MultiViews
+  AddType text/html   .php
+  DirectoryIndex search.php
+  Require all granted
+</Directory>
+Alias /nominatim /srv/nominatim/build/website
 ```
 
-The development version does not include the country grid. Download it separately:
+`/srv/nominatim/build` should be replaced with the location of your
+build directory.
 
-```
-wget -O Nominatim/data/country_osm_grid.sql.gz https://www.nominatim.org/data/country_grid.sql.gz
+After making changes in the apache config you need to restart apache.
+The website should now be available on http://localhost/nominatim.
+
+#### Configure for use with Nginx
+
+Use php-fpm as a deamon for serving PHP cgi. Install php-fpm together with nginx.
+
+By default php listens on a network socket. If you want it to listen to a
+Unix socket instead, change the pool configuration (`pool.d/www.conf`) as
+follows:
+
+    ; Comment out the tcp listener and add the unix socket
+    ;listen = 127.0.0.1:9000
+    listen = /var/run/php5-fpm.sock
+
+    ; Ensure that the daemon runs as the correct user
+    listen.owner = www-data
+    listen.group = www-data
+    listen.mode = 0666
+
+Tell nginx that php files are special and to fastcgi_pass to the php-fpm
+unix socket by adding the location definition to the default configuration.
+
+``` nginx
+root /srv/nominatim/build/website;
+index search.php;
+location / {
+    try_files $uri $uri/ @php;
+}
+
+location @php {
+    fastcgi_param SCRIPT_FILENAME "$document_root$uri.php";
+    fastcgi_param PATH_TRANSLATED "$document_root$uri.php";
+    fastcgi_param QUERY_STRING    $args;
+    fastcgi_pass unix:/var/run/php/php7.3-fpm.sock;
+    fastcgi_index index.php;
+    include fastcgi_params;
+}
+
+location ~ [^/]\.php(/|$) {
+    fastcgi_split_path_info ^(.+?\.php)(/.*)$;
+    if (!-f $document_root$fastcgi_script_name) {
+        return 404;
+    }
+    fastcgi_pass unix:/var/run/php7.3-fpm.sock;
+    fastcgi_index search.php;
+    include fastcgi.conf;
+}
 ```
 
-### Building Nominatim
+Restart the nginx and php5-fpm services and the website should now be available
+at `http://localhost/`.
 
-The code must be built in a separate directory. Create the directory and
-change into it.
-
-```
-mkdir build
-cd build
-```
-
-Nominatim uses cmake and make for building. Assuming that you have created the
-build at the same level as the Nominatim source directory run:
-
-```
-cmake ../Nominatim
-make
-```
 
 Now continue with [importing the database](Import.md).

docs/admin/Migration.md

@@ -6,68 +6,6 @@ to newer versions of Nominatim.
 SQL statements should be executed from the PostgreSQL commandline. Execute
 `psql nominatim` to enter command line mode.
 
-## 3.5.0 -> 3.6.0
-
-### Change of layout of search_name_* tables
-
-The table need a different index for nearest place lookup. Recreate the
-indexes using the following shell script:
-
-```bash
-for table in `psql -d nominatim -c "SELECT tablename FROM pg_tables WHERE tablename LIKE 'search_name_%'" -tA | grep -v search_name_blank`;
-do
-    psql -d nominatim -c "DROP INDEX idx_${table}_centroid_place; CREATE INDEX idx_${table}_centroid_place ON ${table} USING gist (centroid) WHERE ((address_rank >= 2) AND (address_rank <= 25)); DROP INDEX idx_${table}_centroid_street; CREATE INDEX idx_${table}_centroid_street ON ${table} USING gist (centroid) WHERE ((address_rank >= 26) AND (address_rank <= 27))";
-done
-```
-
-### Removal of html output
-
-The debugging UI is no longer directly provided with Nominatim. Instead we
-now provide a simple Javascript application. Please refer to
-[Setting up the Nominatim UI](../Setup-Nominatim-UI) for details on how to
-set up the UI.
-
-The icons served together with the API responses have been moved to the
-nominatim-ui project as well. If you want to keep the `icon` field in the
-response, you need to set `CONST_MapIcon_URL` to the URL of the `/mapicon`
-directory of nominatim-ui.
-
-### Change order during indexing
-
-When reindexing places during updates, there is now a different order used
-which needs a different database index. Create it with the following SQL command:
-
-```sql
-CREATE INDEX idx_placex_pendingsector_rank_address
-  ON placex
-  USING BTREE (rank_address, geometry_sector)
-  WHERE indexed_status > 0;
-```
-
-You can then drop the old index with:
-
-```sql
-DROP INDEX idx_placex_pendingsector;
-```
-
-### Unused index
-
-This index has been unused ever since the query using it was changed two years ago. Saves about 12GB on a planet installation.
-
-```sql
-DROP INDEX idx_placex_geometry_reverse_lookupPoint;
-```
-
-### Switching to dotenv
-
-As part of the work changing the configuration format, the configuration for
-the website is now using a separate configuration file. To create the
-configuration file, run the following command after updating:
-
-```sh
-./utils/setup.php --setup-website
-```
-
 ## 3.4.0 -> 3.5.0
 
 ### New Wikipedia/Wikidata importance tables
@@ -80,14 +18,10 @@ follows:
   * reimport the tables: `./utils/setup.php --import-wikipedia-articles`
   * update the functions: `./utils/setup.php --create-functions --enable-diff-updates`
   * create a new lookup index:
-```sql
-CREATE INDEX idx_placex_wikidata
-  ON placex
-  USING BTREE ((extratags -> 'wikidata'))
-  WHERE extratags ? 'wikidata'
-    AND class = 'place'
-    AND osm_type = 'N'
-    AND rank_search < 26;
+```
+CREATE INDEX idx_placex_wikidata on placex
+USING BTREE ((extratags -> 'wikidata'))
+WHERE extratags ? 'wikidata' and class = 'place' and osm_type = 'N' and rank_search < 26
 ```
   * compute importance: `./utils/update.php --recompute-importance`
 
@@ -144,7 +78,7 @@ The new format is
 
 ### Natural Earth country boundaries no longer needed as fallback
 
-```sql
+```
 DROP TABLE country_naturalearthdata;
 ```
 
@@ -170,37 +104,27 @@ following command:
 The reverse algorithm has changed and requires new indexes. Run the following
 SQL statements to create the indexes:
 
-```sql
+```
 CREATE INDEX idx_placex_geometry_reverse_lookupPoint
-  ON placex
-  USING gist (geometry)
-  WHERE (name IS NOT null or housenumber IS NOT null or rank_address BETWEEN 26 AND 27)
-    AND class NOT IN ('railway','tunnel','bridge','man_made')
-    AND rank_address >= 26
-    AND indexed_status = 0
-    AND linked_place_id IS null;
+  ON placex USING gist (geometry)
+  WHERE (name is not null or housenumber is not null or rank_address between 26 and 27)
+    AND class not in ('railway','tunnel','bridge','man_made')
+    AND rank_address >= 26 AND indexed_status = 0 AND linked_place_id is null;
 CREATE INDEX idx_placex_geometry_reverse_lookupPolygon
   ON placex USING gist (geometry)
   WHERE St_GeometryType(geometry) in ('ST_Polygon', 'ST_MultiPolygon')
-    AND rank_address between 4 and 25
-    AND type != 'postcode'
-    AND name is not null
-    AND indexed_status = 0
-    AND linked_place_id is null;
+    AND rank_address between 4 and 25 AND type != 'postcode'
+    AND name is not null AND indexed_status = 0 AND linked_place_id is null;
 CREATE INDEX idx_placex_geometry_reverse_placeNode
   ON placex USING gist (geometry)
-  WHERE osm_type = 'N'
-    AND rank_search between 5 and 25
-    AND class = 'place'
-    AND type != 'postcode'
-    AND name is not null
-    AND indexed_status = 0
-    AND linked_place_id is null;
+  WHERE osm_type = 'N' AND rank_search between 5 and 25
+    AND class = 'place' AND type != 'postcode'
+    AND name is not null AND indexed_status = 0 AND linked_place_id is null;
 ```
 
 You also need to grant the website user access to the `country_osm_grid` table:
 
-```sql
+```
 GRANT SELECT ON table country_osm_grid to "www-user";
 ```
 
@@ -208,7 +132,7 @@ Replace the `www-user` with the user name of your website server if necessary.
 
 You can now drop the unused indexes:
 
-```sql
+```
 DROP INDEX idx_placex_reverse_geometry;
 ```
 
@@ -237,8 +161,8 @@ CREATE INDEX idx_postcode_geometry ON location_postcode USING GIST (geometry);
 CREATE UNIQUE INDEX idx_postcode_id ON location_postcode USING BTREE (place_id);
 CREATE INDEX idx_postcode_postcode ON location_postcode USING BTREE (postcode);
 GRANT SELECT ON location_postcode TO "www-data";
-DROP TYPE IF EXISTS nearfeaturecentr CASCADE;
-CREATE TYPE nearfeaturecentr AS (
+drop type if exists nearfeaturecentr cascade;
+create type nearfeaturecentr as (
   place_id BIGINT,
   keywords int[],
   rank_address smallint,

docs/admin/Setup-Nominatim-UI.md

@@ -1,185 +0,0 @@
-# Setting up the Nominatim UI
-
-Nominatim is a search API, it does not provide a website interface on its
-own. [nominatim-ui](https://github.com/osm-search/nominatim-ui) offers a
-small website for testing your setup and inspecting the database content.
-
-This section provides a quick start how to use nominatim-ui with your
-installation. For more details, please also have a look at the
-[README of nominatim-ui](https://github.com/osm-search/nominatim-ui/blob/master/README.md).
-
-## Installing nominatim-ui
-
-nominatim-ui does not need any special installation, just download, configure
-and run it.
-
-Clone the source from github:
-
-    git clone https://github.com/osm-search/nominatim-ui
-
-Copy the example configuration into the right place:
-
-    cd nominatim-ui
-    cp dist/config.example.js dist/config.js
-
-Now adapt the configuration to your needs. You need at least
-to change the `Nominatim_API_Endpoint` to point to your Nominatim installation.
-
-Then you can just test it locally by spinning up a webserver in the `dist`
-directory. For example, with Python:
-
-    cd nominatim-ui/dist
-    python3 -m http.server 8765
-
-The website is now available at `http://localhost:8765`.
-
-## Forwarding searches to nominatim-ui
-
-Nominatim used to provide the search interface directly by itself when
-`format=html` was requested. For all endpoints except for `/reverse` and
-`/lookup` this even used to be the default.
-
-The following section describes how to set up Apache or nginx, so that your
-users are forwarded to nominatim-ui when they go to URL that formerly presented
-the UI.
-
-### Setting up forwarding in Nginx
-
-First of all make nominatim-ui available under `/ui` on your webserver:
-
-``` nginx
-server {
-
-    # Here is the Nominatim setup as described in the Installation section
-
-    location /ui/ {
-        alias <full path to the nominatim-ui directory>/dist/;
-        index index.html;
-    }
-}
-```
-
-Now we need to find out if a URL should be forwarded to the UI. Add the
-following `map` commands *outside* the server section:
-
-``` nginx
-# Inspect the format parameter in the query arguments. We are interested
-# if it is set to html or something else or if it is missing completely.
-map $args $format {
-    default                  default;
-    ~(^|&)format=html(&|$)   html;
-    ~(^|&)format=            other;
-}
-
-# Determine from the URI and the format parameter above if forwarding is needed.
-map $uri/$format $forward_to_ui {
-    default               1;   # The default is to forward.
-    ~^/ui                 0;   # If the URI point to the UI already, we are done.
-    ~/other$              0;   # An explicit non-html format parameter. No forwarding.
-    ~/reverse.*/default   0;   # Reverse and lookup assume xml format when
-    ~/lookup.*/default    0;   #   no format parameter is given. No forwarding.
-}
-```
-
-The `$forward_to_ui` parameter can now be used to conditionally forward the
-calls:
-
-```
-# When no endpoint is given, default to search.
-# Need to add a rewrite so that the rewrite rules below catch it correctly.
-rewrite ^/$ /search;
-
-location @php {
-    # fastcgi stuff..
-    if ($forward_to_ui) {
-        rewrite ^(/[^/]*) https://yourserver.com/ui$1.html redirect;
-    }
-}
-
-location ~ [^/]\.php(/|$) {
-    # fastcgi stuff..
-    if ($forward_to_ui) {
-        rewrite (.*).php https://yourserver.com/ui$1.html redirect;
-    }
-}
-```
-
-!!! warning
-    Be aware that the rewrite commands are slightly different for URIs with and
-    without the .php suffix.
-
-Reload nginx and the UI should be available.
-
-### Setting up forwarding in Apache
-
-First of all make nominatim-ui available in the `ui/` subdirectory where
-Nominatim is installed. For example, given you have set up an alias under
-`nominatim` like this:
-
-``` apache
-Alias /nominatim /home/vagrant/build/website
-```
-
-you need to insert the following rules for nominatim-ui before that alias:
-
-```
-<Directory "/home/vagrant/nominatim-ui/dist">
-  DirectoryIndex search.html
-  Require all granted
-</Directory>
-
-Alias /nominatim/ui /home/vagrant/nominatim-ui/dist
-```
-
-Replace `/home/vagrant/nominatim-ui` with the directory where you have cloned
-nominatim-ui.
-
-!!! important
-    The alias for nominatim-ui must come before the alias for the Nominatim
-    website directory.
-
-To set up forwarding, the Apache rewrite module is needed. Enable it with:
-
-``` sh
-sudo a2enmod rewrite
-```
-
-Then add rewrite rules to the `Directory` directive of the Nominatim website
-directory like this:
-
-``` apache
-<Directory "/home/vagrant/build/website">
-  Options FollowSymLinks MultiViews
-  AddType text/html   .php
-  Require all granted
-
-  RewriteEngine On
-
-  # This must correspond to the URL where nominatim can be found.
-  RewriteBase "/nominatim/"
-
-  # If no endpoint is given, then use search.
-  RewriteRule ^(/|$)   "search.php"
-
-  # If format-html is explicity requested, forward to the UI.
-  RewriteCond %{QUERY_STRING} "format=html"
-  RewriteRule ^([^/]+).php ui/$1.html [R,END]
-  # Same but .php suffix is missing.
-  RewriteCond %{QUERY_STRING} "format=html"
-  RewriteRule ^([^/]+) ui/$1.html [R,END]
-
-  # If no format parameter is there then forward anything
-  # but /reverse and /lookup to the UI.
-  RewriteCond %{QUERY_STRING} "!format="
-  RewriteCond %{REQUEST_URI}  "!/lookup"
-  RewriteCond %{REQUEST_URI}  "!/reverse"
-  RewriteRule ^([^/]+).php ui/$1.html [R,END]
-  # Same but .php suffix is missing.
-  RewriteCond %{QUERY_STRING} "!format="
-  RewriteCond %{REQUEST_URI}  "!/lookup"
-  RewriteCond %{REQUEST_URI}  "!/reverse"
-  RewriteRule ^([^/]+) ui/$1.html [R,END]
-</Directory>
-```
-
-Restart Apache and the UI should be available.

docs/admin/Update.md

@@ -4,9 +4,9 @@ There are many different ways to update your Nominatim database.
 The following section describes how to keep it up-to-date with Pyosmium.
 For a list of other methods see the output of `./utils/update.php --help`.
 
-!!! important
+!!! warning
     If you have configured a flatnode file for the import, then you
-    need to keep this flatnode file around for updates.
+    need to keep this flatnode file around for updates as well.
 
 #### Installing the newest version of Pyosmium
 

docs/api/Details.md

@@ -1,22 +1,19 @@
 # Place details
 
-Show all details about a single place saved in the database.
+Lookup details about a single place by id. The default output is HTML for debugging search logic and results.
 
-!!! warning
-    The details page exists for debugging only. You may not use it in scripts
-    or to automatically query details about a result.
-    See [Nominatim Usage Policy](https://operations.osmfoundation.org/policies/nominatim/).
+**The details page (including JSON output) exists for debugging only and must not be downloaded automatically**, see [Nominatim Usage Policy](https://operations.osmfoundation.org/policies/nominatim/).
 
 
 ## Parameters
 
 The details API supports the following two request formats:
 
-``` xml
-https://nominatim.openstreetmap.org/details?osmtype=[N|W|R]&osmid=<value>&class=<value>
+```
+  https://nominatim.openstreetmap.org/details?osmtype=[N|W|R]&osmid=<value>&class=<value>
 ```
 
-`osmtype` and `osmid` are required parameters. The type is one of node (N), way (W)
+`osmtype` and `osmid` are required parameter. The type is one of node (N), way (W)
 or relation (R). The id must be a number. The `class` parameter is optional and
 allows to distinguish between entries, when the corresponding OSM object has more
 than one main tag. For example, when a place is tagged with `tourism=hotel` and
@@ -26,34 +23,36 @@ to get exactly the one you want. If there are multiple places in the database
 but the `class` parameter is left out, then one of the places will be chosen
 at random and displayed.
 
-``` xml
-https://nominatim.openstreetmap.org/details?place_id=<value>
+```
+  https://nominatim.openstreetmap.org/details?place_id=<value>
 ```
 
-Place IDs are assigned sequentially during Nominatim data import. The ID
-for a place is different between Nominatim installation (servers) and
-changes when data gets reimported. Therefore it cannot be used as
-a permanent id and shouldn't be used in bug reports.
+Placeids are assigned sequentially during Nominatim data import. The id for a place is different between Nominatim installation (servers) and changes when data gets reimported. Therefore it can't be used as permanent id and shouldn't be used in bug reports.
 
 
 Additional optional parameters are explained below.
 
 ### Output format
 
+* `format=[html|json]`
+
+See [Place Output Formats](Output.md) for details on each format. (Default: html)
+
 * `json_callback=<string>`
 
 Wrap JSON output in a callback function (JSONP) i.e. `<string>(<json>)`.
+Only has an effect for JSON output formats.
 
 * `pretty=[0|1]`
 
-Add indentation to make it more human-readable. (Default: 0)
+For JSON output will add indentation to make it more human-readable. (Default: 0)
 
 
 ### Output details
 
 * `addressdetails=[0|1]`
 
-Include a breakdown of the address into elements. (Default: 0)
+Include a breakdown of the address into elements. (Default for JSON: 0, for HTML: 1)
 
 * `keywords=[0|1]`
 
@@ -61,16 +60,11 @@ Include a list of name keywords and address keywords (word ids). (Default: 0)
 
 * `linkedplaces=[0|1]`
 
-Include a details of places that are linked with this one. Places get linked
-together when they are different forms of the same physical object. Nominatim
-links two kinds of objects together: place nodes get linked with the
-corresponding administrative boundaries. Waterway relations get linked together with their
-members.
-(Default: 1)
+Include details of places higher in the address hierarchy. E.g. for a street this is usually the city, state, postal code, country. (Default: 1)
 
 * `hierarchy=[0|1]`
 
-Include details of places lower in the address hierarchy. (Default: 0)
+Include details of places lower in the address hierarchy. E.g. for a city this usually a list of streets, suburbs, rivers. (Default for JSON: 0, for HTML: 1)
 
 * `group_hierarchy=[0|1]`
 
@@ -78,7 +72,7 @@ For JSON output will group the places by type. (Default: 0)
 
 * `polygon_geojson=[0|1]`
 
-Include geometry of result. (Default: 0)
+Include geometry of result. (Default for JSON: 0, for HTML: 1)
 
 ### Language of results
 
@@ -92,6 +86,10 @@ comma-separated list of language codes.
 
 ## Examples
 
+##### HTML
+
+[https://nominatim.openstreetmap.org/details.php?osmtype=W&osmid=38210407](https://nominatim.openstreetmap.org/details.php?osmtype=W&osmid=38210407)
+
 ##### JSON
 
 [https://nominatim.openstreetmap.org/details.php?osmtype=W&osmid=38210407&format=json](https://nominatim.openstreetmap.org/details.php?osmtype=W&osmid=38210407&format=json)

docs/api/Lookup.md

@@ -56,21 +56,6 @@ specified in the "Accept-Language" HTTP header.
 Either use a standard RFC2616 accept-language string or a simple
 comma-separated list of language codes.
 
-### Polygon output
-
-* `polygon_geojson=1`
-* `polygon_kml=1`
-* `polygon_svg=1`
-* `polygon_text=1`
-
-Output geometry of results as a GeoJSON, KML, SVG or WKT. Only one of these
-options can be used at a time. (Default: 0)
-
-* `polygon_threshold=0.0`
-
-Return a simplified version of the output geometry. The parameter is the
-tolerance in degrees with which the geometry may differ from the original
-geometry. Topology is preserved in the result. (Default: 0.0)
 
 ### Other
 

docs/api/Output.md

@@ -2,10 +2,12 @@
 
 The [/reverse](Reverse.md), [/search](Search.md) and [/lookup](Lookup.md)
 API calls produce very similar output which is explained in this section.
-There is one section for each format. The format correspond to what was
-selected via the `format` parameter.
+There is one section for each format which is selectable via the `format`
+parameter.
 
-## JSON
+## Formats
+
+### JSON
 
 The JSON format returns an array of places (for search and lookup) or
 a single place (for reverse) of the following format:
@@ -39,13 +41,13 @@ a single place (for reverse) of the following format:
       "wikipedia": "en:London",
       "population": "8416535"
     }
-  }
+  },
 ```
 
 The possible fields are:
 
  * `place_id` - reference to the Nominatim internal database ID ([see notes](#place_id-is-not-a-persistent-id))
- * `osm_type`, `osm_id` - reference to the OSM object ([see notes](#osm-reference))
+ * `osm_type`, `osm_id` - reference to the OSM object
  * `boundingbox` - area of corner coordinates ([see notes](#boundingbox))
  * `lat`, `lon` - latitude and longitude of the centroid of the object
  * `display_name` - full comma-separated address
@@ -60,22 +62,22 @@ The possible fields are:
  * `geojson`, `svg`, `geotext`, `geokml` - full geometry
    (only with the appropriate `polygon_*` parameter)
 
-## JSONv2
+### JSONv2
 
 This is the same as the JSON format with two changes:
 
  * `class` renamed to `category`
  * additional field `place_rank` with the search rank of the object
 
-## GeoJSON
+### GeoJSON
 
 This format follows the [RFC7946](https://geojson.org). Every feature includes
 a bounding box (`bbox`).
 
-The properties object has the following fields:
+The feature list has the following fields:
 
  * `place_id` - reference to the Nominatim internal database ID ([see notes](#place_id-is-not-a-persistent-id))
- * `osm_type`, `osm_id` - reference to the OSM object ([see notes](#osm-reference))
+ * `osm_type`, `osm_id` - reference to the OSM object
  * `category`, `type` - key and value of the main OSM tag
  * `display_name` - full comma-separated address
  * `place_rank` - class search rank
@@ -90,13 +92,13 @@ The properties object has the following fields:
 Use `polygon_geojson` to output the full geometry of the object instead
 of the centroid.
 
-## GeocodeJSON
+### GeocodeJSON
 
 The GeocodeJSON format follows the
 [GeocodeJSON spec 0.1.0](https://github.com/geocoders/geocodejson-spec).
 The following feature attributes are implemented:
 
- * `osm_type`, `osm_id` - reference to the OSM object (unofficial extension, [see notes](#osm-reference))
+ * `osm_type`, `osm_id` - reference to the OSM object (unofficial extension)
  * `type` - value of the main tag of the object (e.g. residential, restaurant, ...)
  * `label` - full comma-separated address
  * `name` - localised name of the place
@@ -108,18 +110,18 @@ The following feature attributes are implemented:
 Use `polygon_geojson` to output the full geometry of the object instead
 of the centroid.
 
-## XML
+### XML
 
 The XML response returns one or more place objects in slightly different
 formats depending on the API call.
 
-### Reverse
+#### Reverse
 
 ```
 <reversegeocode timestamp="Sat, 11 Aug 18 11:53:21 +0000"
                 attribution="Data © OpenStreetMap contributors, ODbL 1.0. https://www.openstreetmap.org/copyright"
                 querystring="lat=48.400381&lon=11.745876&zoom=5&format=xml">
-  <result place_id="179509537" osm_type="relation" osm_id="2145268" ref="BY" place_rank="15" address_rank="15"
+  <result place_id="179509537" osm_type="relation" osm_id="2145268" ref="BY"
           lat="48.9467562" lon="11.4038717"
           boundingbox="47.2701114,50.5647142,8.9763497,13.8396373">
        Bavaria, Germany
@@ -146,7 +148,7 @@ attribution to OSM and the original querystring.
 The place information can be found in the `result` element. The attributes of that element contain:
 
  * `place_id` - reference to the Nominatim internal database ID ([see notes](#place_id-is-not-a-persistent-id))
- * `osm_type`, `osm_id` - reference to the OSM object ([see notes](#osm-reference))
+ * `osm_type`, `osm_id` - reference to the OSM object
  * `ref` - content of `ref` tag if it exists
  * `lat`, `lon` - latitude and longitude of the centroid of the object
  * `boundingbox` - comma-separated list of corner coordinates ([see notes](#boundingbox))
@@ -157,14 +159,14 @@ The full address of the result can be found in the content of the
 Additional information requested with `addressdetails=1`, `extratags=1` and
 `namedetails=1` can be found in extra elements.
 
-### Search and Lookup
+#### Search and Lookup
 
 ```
 <searchresults timestamp="Sat, 11 Aug 18 11:55:35 +0000"
                attribution="Data © OpenStreetMap contributors, ODbL 1.0. https://www.openstreetmap.org/copyright"
                querystring="london" polygon="false" exclude_place_ids="100149"
                more_url="https://nominatim.openstreetmap.org/search.php?q=london&addressdetails=1&extratags=1&exclude_place_ids=100149&format=xml&accept-language=en-US%2Cen%3Bq%3D0.7%2Cde%3Bq%3D0.3">
-  <place place_id="100149" osm_type="node" osm_id="107775" place_rank="15" address_rank="15"
+  <place place_id="100149" osm_type="node" osm_id="107775" place_rank="15"
          boundingbox="51.3473219,51.6673219,-0.2876474,0.0323526" lat="51.5073219" lon="-0.1276474"
          display_name="London, Greater London, England, SW1A 2DU, United Kingdom"
          class="place" type="city" importance="0.9654895765402"
@@ -201,12 +203,11 @@ The place information can be found in the `place` elements, of which there may
 be more than one. The attributes of that element contain:
 
  * `place_id` - reference to the Nominatim internal database ID ([see notes](#place_id-is-not-a-persistent-id))
- * `osm_type`, `osm_id` - reference to the OSM object ([see notes](#osm-reference))
+ * `osm_type`, `osm_id` - reference to the OSM object
  * `ref` - content of `ref` tag if it exists
  * `lat`, `lon` - latitude and longitude of the centroid of the object
  * `boundingbox` - comma-separated list of corner coordinates ([see notes](#boundingbox))
- * `place_rank` - class [search rank](../develop/Ranking#search-rank)
- * `address_rank` - place [address rank](../develop/Ranking#address-rank)
+ * `place_rank` - class search rank
  * `display_name` - full comma-separated address
  * `class`, `type` - key and value of the main OSM tag
  * `importance` - computed importance rank
@@ -216,19 +217,17 @@ When `addressdetails=1` is requested, the localised address parts appear
 as subelements with the type of the address part.
 
 Additional information requested with `extratags=1` and `namedetails=1` can
-be found in extra elements as sub-element of `extratags` and `namedetails`
-respectively.
+be found in extra elements as sub-element of each place.
 
 
 ## Notes on field values
 
 ### place_id is not a persistent id
 
-The `place_id` is an internal identifier that is assigned data is imported
-into a Nominatim database. The same OSM object will have a different value
-on another server. It may even change its ID on the same server when it is
-removed and reimported while updating the database with fresh OSM data.
-It is thus not useful to treat it as permanent for later use.
+The `place_id` is created when a Nominatim database gets installed. A
+single place will have a different value on another server or even when
+the same data gets re-imported. It's thus not useful to treat it as
+permanent for later use.
 
 The combination `osm_type`+`osm_id` is slighly better but remember in
 OpenStreetMap mappers can delete, split, recreate places (and those
@@ -237,40 +236,20 @@ Places can also change their meaning without changing their `osm_id`,
 e.g. when a restaurant is retagged as supermarket. For a more in-depth
 discussion see [Permanent ID](https://wiki.openstreetmap.org/wiki/Permanent_ID).
 
-If you need an ID that is consistent over multiple installations of Nominatim,
-then you should use the combination of `osm_type`+`osm_id`+`class`.
-
-### OSM reference
-
-Nominatim may sometimes return special objects that do not correspond directly
-to an object in OpenStreetMap. These are:
-
-* **Postcodes**. Nominatim returns an postcode point created from all mapped
-  postcodes of the same name. The class and type of these object is `place=postcdode`.
-  No `osm_type` and `osm_id` are included in the result.
-* **Housenumber interpolations**. Nominatim returns a single interpolated
-  housenumber from the interpolation way. The class and type are `place=house`
-  and `osm_type` and `osm_id` correspond to the interpolation way in OSM.
-* **TIGER housenumber.** Nominatim returns a single interpolated housenumber
-  from the TIGER data. The class and type are `place=house`
-  and `osm_type` and `osm_id` correspond to the street mentioned in the result.
-
-Please note that the `osm_type` and `osm_id` returned may be changed in the
-future. You should not expect to only find `node`, `way` and `relation` for
-the type.
+Nominatim merges some places (e.g. center node of a city with the boundary
+relation) so `osm_type`+`osm_id`+`class_name` would be more unique.
 
 ### boundingbox
 
 Comma separated list of min latitude, max latitude, min longitude, max longitude.
 The whole planet would be `-90,90,-180,180`.
 
-Can be used to pan and center the map on the result, for example with leafletjs
+Can we used to pan and center the map on the result, for example with leafletjs
 mapping library
 `map.fitBounds([[bbox[0],bbox[2]],[bbox[1],bbox[3]]], {padding: [20, 20], maxzoom: 16});`
 
 Bounds crossing the antimeridian have a min latitude -180 and max latitude 180,
-essentially covering the entire planet
-(see [issue 184](https://github.com/openstreetmap/Nominatim/issues/184)).
+essentially covering the planet (See [issue 184](https://github.com/openstreetmap/Nominatim/issues/184)).
 
 ### addressdetails
 

docs/api/Reverse.md

@@ -1,48 +1,36 @@
 # Reverse Geocoding
 
-Reverse geocoding generates an address from a latitude and longitude.
-
-## How it works
-
-The reverse geocoding API does not exactly compute the address for the
-coordinate it receives. It works by finding the closest suitable OSM object
-and returning its address information. This may occasionally lead to
-unexpected results.
-
-First of all, Nominatim only includes OSM objects in
-its index that are suitable for searching. Small, unnamed paths for example
-are missing from the database and can therefore not be used for reverse
-geocoding either.
-
-The other issue to be aware of is that the closest OSM object may not always
-have a similar enough address to the coordinate you were requesting. For
-example, in dense city areas it may belong to a completely different street.
-
+Reverse geocoding generates an address from a latitude and longitude or from
+an OSM object.
 
 ## Parameters
 
 The main format of the reverse API is
 
 ```
-https://nominatim.openstreetmap.org/reverse?lat=<value>&lon=<value>&<params>
+https://nominatim.openstreetmap.org/reverse?<query>
 ```
 
-where `lat` and `lon` are latitude and longitutde of a coordinate in WGS84
-projection. The API returns exactly one result or an error when the coordinate
-is in an area with no OSM data coverage.
+There are two ways how the requested location can be specified:
 
-Additional paramters are accepted as listed below.
+* `lat=<value>` `lon=<value>`
 
-!!! warning "Deprecation warning"
-    The reverse API used to allow address lookup for a single OSM object by
-    its OSM id. This use is now deprecated. Use the [Address Lookup API](../Lookup)
-    instead.
+    A geographic location to generate an address for. The coordiantes must be
+    in WGS84 format.
+
+* `osm_type=[N|W|R]` `osm_id=<value>`
+
+    A specific OSM node(N), way(W) or relation(R) to return an address for.
+
+In both cases exactly one object is returned. The two input parameters cannot
+be used at the same time. Both accept the additional optional parameters listed
+below.
 
 ### Output format
 
 * `format=[xml|json|jsonv2|geojson|geocodejson]`
 
-See [Place Output Formats](Output.md) for details on each format. (Default: xml)
+See [Place Output Formats](Output.md) for details on each format. (Default: html)
 
 * `json_callback=<string>`
 
@@ -81,9 +69,8 @@ comma-separated list of language codes.
 
 * `zoom=[0-18]`
 
-Level of detail required for the address. Default: 18. This is a number that
-corresponds roughly to the zoom level used in XYZ tile sources in frameworks
-like Leaflet.js, Openlayers etc.
+Level of detail required for the address. Default: 18. This is a number that corresponds
+roughly to the zoom level used in map frameworks like Leaflet.js, Openlayers etc.
 In terms of address details the zoom levels are as follows:
 
  zoom | address detail
@@ -110,7 +97,7 @@ options can be used at a time. (Default: 0)
 
 * `polygon_threshold=0.0`
 
-Return a simplified version of the output geometry. The parameter is the
+Simplify the output geometry before returning. The parameter is the
 tolerance in degrees with which the geometry may differ from the original
 geometry. Topology is preserved in the result. (Default: 0.0)
 

docs/api/Search.md

@@ -1,27 +1,30 @@
 # Search queries
 
-The search API allows you to look up a location from a textual description
-or address. Nominatim supports structured and free-form search queries.
+The search API allows you to look up a location from a textual description.
+Nominatim supports structured as well as free-form search queries.
 
 The search query may also contain
 [special phrases](https://wiki.openstreetmap.org/wiki/Nominatim/Special_Phrases)
 which are translated into specific OpenStreetMap (OSM) tags (e.g. Pub => `amenity=pub`).
-This can be used to narrow down the kind of objects to be returned.
-
-!!! warning
-    Special phrases are not suitable to query all objects of a certain type in an
-    area. Nominatim will always just return a collection of the best matches. To
-    download OSM data by object type, use the [Overpass API](https://overpass-api.de/).
+Note that this only limits the items to be found, it's not suited to return complete
+lists of OSM objects of a specific type. For those use [Overpass API](https://overpass-api.de/).
 
 ## Parameters
 
-The search API has the following format:
+The search API has the following two formats:
+
+```
+   https://nominatim.openstreetmap.org/search/<query>?<params>
+```
+
+This format only accepts a free-form query string where the
+parts of the query are separated by slashes.
 
 ```
    https://nominatim.openstreetmap.org/search?<params>
 ```
 
-The search term may be specified with two different sets of parameters:
+In this form, the query may be given through two different sets of parameters:
 
 * `q=<query>`
 
@@ -43,13 +46,13 @@ The search term may be specified with two different sets of parameters:
     Structured requests are faster but are less robust against alternative
     OSM tagging schemas. **Do not combine with** `q=<query>` **parameter**.
 
-Both query forms accept the additional parameters listed below.
+All three query forms accept the additional parameters listed below.
 
 ### Output format
 
-* `format=[xml|json|jsonv2|geojson|geocodejson]`
+* `format=[html|xml|json|jsonv2|geojson|geocodejson]`
 
-See [Place Output Formats](Output.md) for details on each format. (Default: jsonv2)
+See [Place Output Formats](Output.md) for details on each format. (Default: html)
 
 * `json_callback=<string>`
 
@@ -93,16 +96,16 @@ Limit search results to one or more countries. `<countrycode>` must be the
 e.g. `gb` for the United Kingdom, `de` for Germany.
 
 Each place in Nominatim is assigned to one country code based
-on OSM country boundaries. In rare cases a place may not be in any country
-at all, for example, in international waters.
+on `admin_level=2` tags, in rare cases to none (for example in
+international waters outside any country).
 
 * `exclude_place_ids=<place_id,[place_id],[place_id]`
 
 If you do not want certain OSM objects to appear in the search
 result, give a comma separated list of the `place_id`s you want to skip.
-This can be used to retrieve additional search results. For example, if a
-previous query only returned a few results, then including those here would
-cause the search to return other, less accurate, matches (if possible).
+This can be used to broaden search results. For example, if a previous
+query only returned a few results, then including those here would cause
+the search to return other, less accurate, matches (if possible).
 
 
 * `limit=<integer>`
@@ -113,17 +116,16 @@ Limit the number of returned results. (Default: 10, Maximum: 50)
 * `viewbox=<x1>,<y1>,<x2>,<y2>`
 
 The preferred area to find search results. Any two corner points of the box
-are accepted as long as they span a real box. `x` is longitude,
+are accepted in any order as long as they span a real box. `x` is longitude,
 `y` is latitude.
 
 
 * `bounded=[0|1]`
 
-When a viewbox is given, restrict the result to items contained within that
+When a viewbox is given, restrict the result to items contained with that
 viewbox (see above). When `viewbox` and `bounded=1` are given, an amenity
-only search is allowed. Give the special keyword for the amenity in square
-brackets, e.g. `[pub]` and a selection of objects of this type is returned.
-There is no guarantee that the result is complete. (Default: 0)
+only search is allowed. In this case, give the special keyword for the
+amenity in square brackets, e.g. `[pub]`. (Default: 0)
 
 
 ### Polygon output
@@ -138,7 +140,7 @@ options can be used at a time. (Default: 0)
 
 * `polygon_threshold=0.0`
 
-Return a simplified version of the output geometry. The parameter is the
+Simplify the output geometry before returning. The parameter is the
 tolerance in degrees with which the geometry may differ from the original
 geometry. Topology is preserved in the result. (Default: 0.0)
 
@@ -152,11 +154,13 @@ address to identify your requests. See Nominatim's [Usage Policy](https://operat
 * `dedupe=[0|1]`
 
 Sometimes you have several objects in OSM identifying the same place or
-object in reality. The simplest case is a street being split into many
+object in reality. The simplest case is a street being split in many
 different OSM ways due to different characteristics. Nominatim will
 attempt to detect such duplicates and only return one match unless
 this parameter is set to 0. (Default: 1)
 
+
+
 * `debug=[0|1]`
 
 Output assorted developer debug information. Data on internals of Nominatim's

docs/data-sources/overview.md

@@ -0,0 +1,4 @@
+# Additional Data Sources
+
+This guide explains how data sources other than OpenStreetMap mentioned in
+the install instructions got obtained and converted.

docs/develop/Development-Environment.md

@@ -1,169 +0,0 @@
-# Setting up Nominatim for Development
-
-This chapter gives an overview how to set up Nominatim for developement
-and how to run tests.
-
-!!! Important
-    This guide assumes that you develop under the latest version of Ubuntu. You
-    can of course also use your favourite distribution. You just might have to
-    adapt the commands below slightly, in particular the commands for installing
-    additional software.
-
-## Installing Nominatim
-
-The first step is to install Nominatim itself. Please follow the installation
-instructions in the [Admin section](../admin/Installation.md). You don't need
-to set up a webserver for development, the webserver that is included with PHP
-is sufficient.
-
-If you want to run Nominatim in a VM via Vagrant, use the default `ubuntu` setup.
-Vagrant's libvirt provider runs out-of-the-box under Ubuntu. You also need to
-install an NFS daemon to enable directory sharing between host and guest. The
-following packages should get you started:
-
-    sudo apt install vagrant vagrant-libvirt libvirt-daemon nfs-kernel-server
-
-## Prerequisites for testing and documentation
-
-The Nominatim test suite consists of behavioural tests (using behave) and
-unit tests (using PHPUnit). It has the following additional requirements:
-
-* [behave test framework](https://behave.readthedocs.io) >= 1.2.5
-* [nose](https://nose.readthedocs.io)
-* [phpunit](https://phpunit.de) >= 7.3
-* [PHP CodeSniffer](https://github.com/squizlabs/PHP_CodeSniffer)
-
-The documentation is built with mkdocs:
-
-* [mkdocs](https://www.mkdocs.org/) >= 1.1.2
-
-### Installing prerequisites on Ubuntu/Debian
-
-Some of the Python packages require the newest version which is not yet
-available with the current distributions. Therefore it is recommended to
-install pip to get the newest versions.
-
-To install all necessary packages run:
-
-```sh
-sudo apt install php-cgi phpunit php-codesniffer \
-                 python3-pip python3-setuptools python3-dev
-
-pip3 install --user behave nose mkdocs
-```
-
-The `mkdocs` executable will be located in `.local/bin`. You may have to add
-this directory to your path, for example by running:
-
-```
-echo 'export PATH=~/.local/bin:$PATH' > ~/.profile
-```
-
-If your distribution does not have PHPUnit 7.3+, you can install it (as well
-as CodeSniffer) via composer:
-
-```
-sudo apt-get install composer
-composer global require "squizlabs/php_codesniffer=*"
-composer global require "phpunit/phpunit=8.*"
-```
-
-The binaries are found in `.config/composer/vendor/bin`. You need to add this
-to your PATH as well:
-
-```
-echo 'export PATH=~/.config/composer/vendor/bin:$PATH' > ~/.profile
-```
-
-
-## Executing Tests
-
-All tests are located in the `\test` directory.
-
-### Preparing the test database
-
-Some of the behavioural test expect a test database to be present. You need at
-least 2GB RAM and 10GB disk space to create the database.
-
-First create a separate directory for the test DB and fetch the test planet
-data and the Tiger data for South Dakota:
-
-```
-mkdir testdb
-cd testdb
-wget https://www.nominatim.org/data/test/nominatim-api-testdata.pbf
-wget -O - https://nominatim.org/data/tiger2018-nominatim-preprocessed.tar.gz | tar xz --wildcards --no-anchored '46*'
-```
-
-Configure and build Nominatim in the usual way:
-
-```
-cmake $USERNAME/Nominatim
-make
-```
-
-Copy the test settings:
-
-```
-cp $USERNAME/Nominatim/test/testdb/local.php settings/
-```
-
-Inspect the file to check that all settings are correct for your local setup.
-
-Now you can import the test database:
-
-```
-dropdb --if-exists test_api_nominatim
-./utils/setup.php --all --osm-file nominatim-api-testdb.pbf 2>&1 | tee import.log
-./utils/specialphrases.php --wiki-import | psql -d test_api_nominatim 2>&1 | tee -a import.log
-./utils/setup.php --import-tiger-data 2>&1 | tee -a import.log
-```
-
-### Running the tests
-
-To run all tests just go to the test directory and run make:
-
-```sh
-cd test
-make
-```
-
-To skip tests that require the test database, run `make no-test-db` instead.
-
-For more information about the structure of the tests and how to change and
-extend the test suite, see the [Testing chapter](Testing.md).
-
-## Documentation Pages
-
-The [Nominatim documentation](https://nominatim.org/release-docs/develop/) is
-built using the [MkDocs](https://www.mkdocs.org/) static site generation
-framework. The master branch is automatically deployed every night on
-[https://nominatim.org/release-docs/develop/](https://nominatim.org/release-docs/develop/)
-
-To build the documentation, go to the build directory and run
-
-```
-make doc
-INFO - Cleaning site directory
-INFO - Building documentation to directory: /home/vagrant/build/site-html
-```
-
-This runs `mkdocs build` plus extra transformation of some files and adds
-symlinks (see `CMakeLists.txt` for the exact steps).
-
-Now you can start webserver for local testing
-
-```
-build> mkdocs serve
-[server:296] Serving on http://127.0.0.1:8000
-[handlers:62] Start watching changes
-```
-
-If you develop inside a Vagrant virtual machine, use a port that is forwarded
-to your host:
-
-```
-build> mkdocs serve --dev-addr 0.0.0.0:8088
-[server:296] Serving on http://0.0.0.0:8088
-[handlers:62] Start watching changes
-```

docs/develop/Documentation.md

@@ -0,0 +1,39 @@
+# Documentation Pages
+
+The [Nominatim documentation](https://nominatim.org/release-docs/develop/) is built using the [MkDocs](https://www.mkdocs.org/) static site generation framework. The master branch is automatically deployed every night on under [https://nominatim.org/release-docs/develop/](https://nominatim.org/release-docs/develop/)
+
+To preview local changes, first install MkDocs
+
+```
+pip3 install --user mkdocs
+```
+
+If `mkdocs` can't be found after the installation, the $PATH might have not
+been set correctly yet. Try opening a new terminal session.
+
+
+Then go to the build directory and run
+
+```
+make doc
+INFO - Cleaning site directory
+INFO - Building documentation to directory: /home/vagrant/build/site-html
+```
+
+This runs `mkdocs build` plus extra transformation of some files and adds
+symlinks (see `CMakeLists.txt` for the exact steps).
+
+Now you can start webserver for local testing
+
+```
+build> mkdocs serve
+[server:296] Serving on http://127.0.0.1:8000
+[handlers:62] Start watching changes
+```
+
+If you develop inside a Vagrant virtual machine:
+
+ * add port forwarding to your Vagrantfile,
+   e.g. `config.vm.network "forwarded_port", guest: 8000, host: 8000`
+ * use `mkdocs serve --dev-addr 0.0.0.0:8000` because the default localhost
+   IP does not get forwarded.

docs/develop/Import.md

@@ -1,8 +1,8 @@
 # OSM Data Import
 
-OSM data is initially imported using [osm2pgsql](https://osm2pgsql.org).
-Nominatim uses its own data output style 'gazetteer', which differs from the
-output style created for map rendering.
+OSM data is initially imported using osm2pgsql. Nominatim uses its own data
+output style 'gazetteer', which differs from the output style created for
+map rendering.
 
 ## Database Layout
 

docs/develop/Ranking.md

@@ -7,74 +7,24 @@ different purposes, which are explained in this chapter.
 ## Search rank
 
 The search rank describes the extent and importance of a place. It is used
-when ranking search results. Simply put, if there are two results for a
+when ranking search result. Simply put, if there are two results for a
 search query which are otherwise equal, then the result with the _lower_
 search rank will be appear higher in the result list.
 
 Search ranks are not so important these days because many well-known
 places use the Wikipedia importance ranking instead.
 
-The following table gives an overview of the kind of features that Nominatim
-expects for each rank:
-
-rank   | typical place types             | extent
--------|---------------------------------|-------
-1-3    | oceans, continents              | -
-4      | countries                       | -
-5-9    | states, regions, provinces      | -
-10-12  | counties                        | -
-13-16  | cities, municipalities, islands | 15 km
-17-18  | towns, boroughs                 | 4 km
-19     | villages, suburbs               | 2 km
-20     | hamlets, farms, neighbourhoods  |  1 km
-21-25  | isolated dwellings, city blocks | 500 m
-
-The extent column describes how far a feature is assumed to reach when it
-is mapped only as a point. Larger features like countries and states are usually
-available with their exact area in the OpenStreetMap data. That is why no extent
-is given.
-
 ## Address rank
 
 The address rank describes where a place shows up in an address hierarchy.
 Usually only administrative boundaries and place nodes and areas are
-eligible to be part of an address. Places that should not appear in the
-address must have an address rank of 0.
+eligible to be part of an address. All other objects have an address rank
+of 0.
 
-The following table gives an overview how ranks are mapped to address parts:
-
- rank        | address part
--------------|-------------
- 1-3         | _unused_
- 4           | country
- 5-9         | state
- 10-12       | county
- 13-16       | city
- 17-21       | suburb
- 22-24       | neighbourhood
- 25          | squares, farms, localities
- 26-27       | street
- 28-30       | POI/house number
-
-The country rank 4 usually doesn't show up in the address parts of an object.
-The country is determined indirectly from the country code.
-
-Ranks 5-24 can be assigned more or less freely. They make up the major part
-of the address.
-
-Rank 25 is also an addressing rank but it is special because while it can be
-the parent to a POI with an addr:place of the same name, it cannot be a parent
-to streets. Use it for place features that are technically on the same level
-as a street (e.g. squares, city blocks) or for places that should not normally
-appear in an address unless explicitly tagged so (e.g place=locality which
-should be uninhabited and as such not addressable).
-
-The street ranks 26 and 27 are handled slightly differently. Only one object
-from these ranks shows up in an address.
-
-For POI level objects like shops, buildings or house numbers always use rank 30.
-Ranks 28 is reserved for house number interpolations. 29 is for internal use
-only.
+Note that the search rank of a place plays a role in the address computation
+as well. When collecting the places that should make up the address parts
+then only places are taken into account that have a lower address rank than
+the search rank of the base object.
 
 ## Rank configuration
 
@@ -134,7 +84,7 @@ Then the rank is used when no more specific value is found for the given
 key.
 
 Countries and key/value combination may appear in multiple definitions. Just
-make sure that each combination of country/key/value appears only once per
+make sure that each combination of counrty/key/value appears only once per
 file. Otherwise the import will fail with a UNIQUE INDEX constraint violation
 on import.
 

docs/develop/Setup.md

@@ -0,0 +1,46 @@
+# Setup Test Environment
+
+To test changes and contribute to Nominatim you should be able to run
+the test suite(s). For many usecases it's enough to create a Vagrant
+virtual machine (see `VAGRANT.md`), import one small country into the
+database.
+
+## Prerequisites
+
+Nominatim supports a range of PHP versions and PHPUnit versions also
+move fast. We try to test against the newest stable PHP release and
+PHPUnit version even though we expect many Nominatim users will install
+older version on their production servers.
+
+#### Ubuntu 20
+
+    sudo apt-get install -y phpunit php-codesniffer php-cgi
+    pip3 install --user behave nose
+
+#### Ubuntu 18
+
+    pip3 install --user behave nose
+
+    sudo apt-get install -y composer php-cgi php-cli php-mbstring php-xml zip unzip
+
+    composer global require "squizlabs/php_codesniffer=*"
+    sudo ln -s ~/.config/composer/vendor/bin/phpcs /usr/bin/
+
+    composer global require "phpunit/phpunit=8.*"
+    sudo ln -s ~/.config/composer/vendor/bin/phpunit /usr/bin/
+
+
+#### CentOS 7 or 8
+
+    sudo dnf install -y php-dom php-mbstring
+    pip3 install --user behave nose
+
+    composer global require "squizlabs/php_codesniffer=*"
+    sudo ln -s ~/.config/composer/vendor/bin/phpcs /usr/bin/
+
+    composer global require "phpunit/phpunit=^7"
+    sudo ln -s ~/.config/composer/vendor/bin/phpunit /usr/bin/
+
+## Run tests, code linter, code coverage
+
+See `README.md` in `test` subdirectory.

docs/develop/data-sources.md

@@ -1,34 +0,0 @@
-# Additional Data Sources
-
-This guide explains how data sources other than OpenStreetMap mentioned in
-the install instructions got obtained and converted.
-
-## Country grid
-
-Nominatim uses pre-generated country borders data. In case one imports only
-a subset of a country. And to assign each place a partition. Nominatim
-database tables are split into partitions for performance.
-
-More details in [osm-search/country-grid-data](https://github.com/osm-search/country-grid-data).
-
-## US Census TIGER
-
-For the United States you can choose to import additonal street-level data.
-The data isn't mixed into OSM data but queried as fallback when no OSM
-result can be found.
-
-More details in [osm-search/TIGER-data](https://github.com/osm-search/TIGER-data).
-
-## GB postcodes
-
-For Great Britain you can choose to import Royalmail postcode centroids.
-
-More details in [osm-search/gb-postcode-data](https://github.com/osm-search/gb-postcode-data).
-
-
-## Wikipedia & Wikidata rankings
-
-Nominatim can import "importance" data of place names. This greatly
-improves ranking of results.
-
-More details in [osm-search/wikipedia-wikidata](https://github.com/osm-search/wikipedia-wikidata).

docs/develop/overview.md

@@ -9,14 +9,14 @@ the address computation and the search frontend.
 The __data import__ stage reads the raw OSM data and extracts all information
 that is useful for geocoding. This part is done by osm2pgsql, the same tool
 that can also be used to import a rendering database. It uses the special
-gazetteer output plugin in `osm2pgsql/src/output-gazetter.[ch]pp`. The result of
+gazetteer output plugin in `osm2pgsql/output-gazetter.[ch]pp`. The result of
 the import can be found in the database table `place`.
 
 The __address computation__ or __indexing__ stage takes the data from `place`
 and adds additional information needed for geocoding. It ranks the places by
 importance, links objects that belong together and computes addresses and
 the search index. Most of this work is done in PL/pgSQL via database triggers
-and can be found in the files in the `sql/functions/` directory.
+and can be found in the file `sql/functions.sql`.
 
 The __search frontend__ implements the actual API. It takes search
 and reverse geocoding queries from the user, looks up the data and

docs/extra.css

@@ -1,15 +1,3 @@
 .toctree-l3 {
     display: none!important
 }
-
-table {
-    margin-bottom: 12pt
-}
-
-th, td {
-    padding: 1pt 12pt;
-}
-
-th {
-    background-color: #eee;
-}

docs/mkdocs.yml

@@ -1,4 +1,4 @@
-site_name: Nominatim Documentation
+site_name: Nominatim 3.5.2
 theme: readthedocs
 docs_dir: ${CMAKE_CURRENT_BINARY_DIR}
 site_url: https://nominatim.org
@@ -16,21 +16,24 @@ pages:
         - 'FAQ': 'api/Faq.md'
     - 'Administration Guide':
         - 'Basic Installation': 'admin/Installation.md'
-        - 'Import' : 'admin/Import.md'
-        - 'Update' : 'admin/Update.md'
-        - 'Deploy' : 'admin/Deployment.md'
-        - 'Nominatim UI'  : 'admin/Setup-Nominatim-UI.md'
+        - 'Importing' : 'admin/Import.md'
+        - 'Updating' : 'admin/Update.md'
         - 'Advanced Installations' : 'admin/Advanced-Installations.md'
         - 'Migration from older Versions' : 'admin/Migration.md'
         - 'Troubleshooting' : 'admin/Faq.md'
     - 'Developers Guide':
-        - 'Setup for Development' : 'develop/Development-Environment.md'
-        - 'Architecture Overview' : 'develop/overview.md'
+        - 'Overview' : 'develop/overview.md'
         - 'OSM Data Import' : 'develop/Import.md'
         - 'Place Ranking' : 'develop/Ranking.md'
         - 'Postcodes' : 'develop/Postcodes.md'
-        - 'Testing' : 'develop/Testing.md'
-        - 'External Data Sources': 'develop/data-sources.md'
+        - 'Setup Test Environment' : 'develop/Setup.md'
+        - 'Documentation' : 'develop/Documentation.md'
+    - 'External Data Sources':
+        - 'Overview' : 'data-sources/overview.md'
+        - 'US Census (Tiger)': 'data-sources/US-Tiger.md'
+        - 'GB Postcodes': 'data-sources/GB-Postcodes.md'
+        - 'Country Grid': 'data-sources/Country-Grid.md'
+        - 'Wikipedia & Wikidata': 'data-sources/Wikipedia-Wikidata.md'
     - 'Appendix':
         - 'Installation on CentOS 7' : 'appendix/Install-on-Centos-7.md'
         - 'Installation on CentOS 8' : 'appendix/Install-on-Centos-8.md'

lib/ClassTypes.php

@@ -18,8 +18,6 @@ function getLabelTag($aPlace, $sCountry = null)
         $sLabel = $aPlace['place_type'];
     } elseif ($aPlace['class'] == 'boundary' && $aPlace['type'] == 'administrative') {
         $sLabel = getBoundaryLabel($iRank/2, $sCountry);
-    } elseif ($aPlace['type'] == 'postal_code') {
-        $sLabel = 'postcode';
     } elseif ($iRank < 26) {
         $sLabel = $aPlace['type'];
     } elseif ($iRank < 28) {
@@ -86,8 +84,7 @@ function getBoundaryLabel($iAdminLevel, $sCountry, $sFallback = 'Administrative'
                                            8 => 'City',
                                            9 => 'City District',
                                            10 => 'Suburb',
-                                           11 => 'Neighbourhood',
-                                           12 => 'City Block'
+                                           11 => 'Neighbourhood'
                                           ),
                              'no' => array (
                                       3 => 'State',
@@ -252,17 +249,13 @@ function getIcon($aPlace)
  */
 function getIconFile($aPlace)
 {
-    if (CONST_MapIcon_URL === false) {
-        return null;
-    }
-
     $sIcon = getIcon($aPlace);
 
     if (!isset($sIcon)) {
         return null;
     }
 
-    return CONST_MapIcon_URL.'/'.$sIcon.'.p.20.png';
+    return CONST_Website_BaseURL.'images/mapicons/'.$sIcon.'.p.20.png';
 }
 
 /**
@@ -279,7 +272,6 @@ function getImportance($aPlace)
 
     if ($aWithImportance === null) {
         $aWithImportance = array_flip(array(
-                                           'boundary:administrative',
                                            'place:country',
                                            'place:state',
                                            'place:province',

lib/Geocode.php

@@ -642,6 +642,12 @@ class Geocode
             $oValidTokens = new TokenList();
 
             if (!empty($aTokens)) {
+                $sSQL = 'SELECT word_id, word_token, word, class, type, country_code, operator, search_name_count';
+                $sSQL .= ' FROM word ';
+                $sSQL .= ' WHERE word_token in ('.join(',', $this->oDB->getDBQuotedList($aTokens)).')';
+
+                Debug::printSQL($sSQL);
+
                 $oValidTokens->addTokensFromDB(
                     $this->oDB,
                     $aTokens,
@@ -650,8 +656,6 @@ class Geocode
                     $this->oNormalizer
                 );
 
-                $oCtx->setFullNameWords($oValidTokens->getFullWordIDs());
-
                 // Try more interpretations for Tokens that could not be matched.
                 foreach ($aTokens as $sToken) {
                     if ($sToken[0] == ' ' && !$oValidTokens->contains($sToken)) {
@@ -919,26 +923,6 @@ class Geocode
                     $aResult['lon'],
                     $aResult['lat']
                 );
-
-                // secondary ordering (for results with same importance (the smaller the better):
-                // - approximate importance of address parts
-                if (isset($aResult['addressimportance']) && $aResult['addressimportance']) {
-                    $aResult['foundorder'] = -$aResult['addressimportance']/10;
-                } else {
-                    $aResult['foundorder'] = -$aResult['importance'];
-                }
-                // - number of exact matches from the query
-                $aResult['foundorder'] -= $aResults[$aResult['place_id']]->iExactMatches;
-                // - importance of the class/type
-                $iClassImportance = ClassTypes\getImportance($aResult);
-                if (isset($iClassImportance)) {
-                    $aResult['foundorder'] += 0.0001 * $iClassImportance;
-                } else {
-                    $aResult['foundorder'] += 0.01;
-                }
-                // - rank
-                $aResult['foundorder'] -= 0.00001 * (30 - $aResult['rank_search']);
-
                 // Adjust importance for the number of exact string matches in the result
                 $iCountWords = 0;
                 $sAddress = $aResult['langaddress'];
@@ -949,8 +933,20 @@ class Geocode
                     }
                 }
 
-                // 0.1 is a completely arbitrary number but something in the range 0.1 to 0.5 would seem right
-                $aResult['importance'] = $aResult['importance'] + ($iCountWords*0.1);
+                $aResult['importance'] = $aResult['importance'] + ($iCountWords*0.1); // 0.1 is a completely arbitrary number but something in the range 0.1 to 0.5 would seem right
+
+                // secondary ordering (for results with same importance (the smaller the better):
+                // - approximate importance of address parts
+                $aResult['foundorder'] = -$aResult['addressimportance']/10;
+                // - number of exact matches from the query
+                $aResult['foundorder'] -= $aResults[$aResult['place_id']]->iExactMatches;
+                // - importance of the class/type
+                $iClassImportance = ClassTypes\getImportance($aResult);
+                if (isset($iClassImportance)) {
+                    $aResult['foundorder'] += 0.0001 * $iClassImportance;
+                } else {
+                    $aResult['foundorder'] += 0.01;
+                }
             }
             $aSearchResults[$iIdx] = $aResult;
         }

lib/PlaceLookup.php

@@ -452,20 +452,11 @@ class PlaceLookup
                 $aPlace,
                 $aPlace['country_code']
             );
-
-            $aResults[$aPlace['place_id']] = $aPlace;
         }
 
-        $aResults = array_filter(
-            $aResults,
-            function ($v) {
-                return !($v instanceof Result);
-            }
-        );
+        Debug::printVar('Places', $aPlaces);
 
-        Debug::printVar('Places', $aResults);
-
-        return $aResults;
+        return $aPlaces;
     }
 
     /* returns an array which will contain the keys

lib/ReverseGeocode.php

@@ -54,7 +54,6 @@ class ReverseGeocode
      */
     protected function lookupInterpolation($sPointSQL, $fSearchDiam)
     {
-        Debug::newFunction('lookupInterpolation');
         $sSQL = 'SELECT place_id, parent_place_id, 30 as rank_search,';
         $sSQL .= '  ST_LineLocatePoint(linegeo,'.$sPointSQL.') as fraction,';
         $sSQL .= '  startnumber, endnumber, interpolationtype,';
@@ -63,7 +62,6 @@ class ReverseGeocode
         $sSQL .= ' WHERE ST_DWithin('.$sPointSQL.', linegeo, '.$fSearchDiam.')';
         $sSQL .= ' and indexed_status = 0 and startnumber is not NULL ';
         $sSQL .= ' ORDER BY distance ASC limit 1';
-        Debug::printSQL($sSQL);
 
         return $this->oDB->getRow(
             $sSQL,
@@ -90,20 +88,16 @@ class ReverseGeocode
 
     protected function lookupInCountry($sPointSQL, $iMaxRank)
     {
-        Debug::newFunction('lookupInCountry');
         // searches for polygon in table country_osm_grid which contains the searchpoint
         // and searches for the nearest place node to the searchpoint in this polygon
         $sSQL = 'SELECT country_code FROM country_osm_grid';
         $sSQL .= ' WHERE ST_CONTAINS(geometry, '.$sPointSQL.') LIMIT 1';
-        Debug::printSQL($sSQL);
 
         $sCountryCode = $this->oDB->getOne(
             $sSQL,
             null,
             'Could not determine country polygon containing the point.'
         );
-        Debug::printVar('Country code', $sCountryCode);
-
         if ($sCountryCode) {
             if ($iMaxRank > 4) {
                 // look for place nodes with the given country code
@@ -121,11 +115,9 @@ class ReverseGeocode
                 $sSQL .= 'WHERE distance <= reverse_place_diameter(rank_search)';
                 $sSQL .= ' ORDER BY rank_search DESC, distance ASC';
                 $sSQL .= ' LIMIT 1';
-                Debug::printSQL($sSQL);
 
+                if (CONST_Debug) var_dump($sSQL);
                 $aPlace = $this->oDB->getRow($sSQL, null, 'Could not determine place node.');
-                Debug::printVar('Country node', $aPlace);
-
                 if ($aPlace) {
                     return new Result($aPlace['place_id']);
                 }
@@ -139,10 +131,9 @@ class ReverseGeocode
             $sSQL .= ' AND class in (\'boundary\',  \'place\')';
             $sSQL .= ' AND linked_place_id is null';
             $sSQL .= ' ORDER BY distance ASC';
-            Debug::printSQL($sSQL);
 
+            if (CONST_Debug) var_dump($sSQL);
             $aPlace = $this->oDB->getRow($sSQL, null, 'Could not determine place node.');
-            Debug::printVar('Country place', $aPlace);
             if ($aPlace) {
                 return new Result($aPlace['place_id']);
             }
@@ -165,7 +156,6 @@ class ReverseGeocode
      */
     protected function lookupPolygon($sPointSQL, $iMaxRank)
     {
-        Debug::newFunction('lookupPolygon');
         // polygon search begins at suburb-level
         if ($iMaxRank > 25) $iMaxRank = 25;
         // no polygon search over country-level
@@ -183,10 +173,8 @@ class ReverseGeocode
         $sSQL .= ' ORDER BY rank_address DESC LIMIT 50 ) as a';
         $sSQL .= ' WHERE ST_CONTAINS(geometry, '.$sPointSQL.' )';
         $sSQL .= ' ORDER BY rank_address DESC LIMIT 1';
-        Debug::printSQL($sSQL);
 
         $aPoly = $this->oDB->getRow($sSQL, null, 'Could not determine polygon containing the point.');
-        Debug::printVar('Polygon result', $aPoly);
 
         if ($aPoly) {
         // if a polygon is found, search for placenodes begins ...
@@ -205,7 +193,6 @@ class ReverseGeocode
                 // for place nodes at rank_address 16
                 $sSQL .= ' AND rank_search > '.$iRankSearch;
                 $sSQL .= ' AND rank_search <= '.$iMaxRank;
-                $sSQL .= ' AND rank_address > 0';
                 $sSQL .= ' AND class = \'place\'';
                 $sSQL .= ' AND type != \'postcode\'';
                 $sSQL .= ' AND name IS NOT NULL ';
@@ -218,12 +205,11 @@ class ReverseGeocode
                 $sSQL .= ' AND distance <= reverse_place_diameter(rank_search)';
                 $sSQL .= ' ORDER BY distance ASC, rank_search DESC';
                 $sSQL .= ' LIMIT 1';
-                Debug::printSQL($sSQL);
 
-                $aPlaceNode = $this->oDB->getRow($sSQL, null, 'Could not determine place node.');
-                Debug::printVar('Nearest place node', $aPlaceNode);
-                if ($aPlaceNode) {
-                    return $aPlaceNode;
+                if (CONST_Debug) var_dump($sSQL);
+                $aPlacNode = $this->oDB->getRow($sSQL, null, 'Could not determine place node.');
+                if ($aPlacNode) {
+                    return $aPlacNode;
                 }
             }
         }
@@ -241,7 +227,6 @@ class ReverseGeocode
 
     public function lookupPoint($sPointSQL, $bDoInterpolation = true)
     {
-        Debug::newFunction('lookupPoint');
         // starts if the search is on POI or street level,
         // searches for the nearest POI or street,
         // if a street is found and a POI is searched for,
@@ -271,11 +256,10 @@ class ReverseGeocode
             $sSQL .= ' and (ST_GeometryType(geometry) not in (\'ST_Polygon\',\'ST_MultiPolygon\') ';
             $sSQL .= ' OR ST_DWithin('.$sPointSQL.', centroid, '.$fSearchDiam.'))';
             $sSQL .= ' ORDER BY distance ASC limit 1';
-            Debug::printSQL($sSQL);
-
+            if (CONST_Debug) var_dump($sSQL);
             $aPlace = $this->oDB->getRow($sSQL, null, 'Could not determine closest place.');
 
-            Debug::printVar('POI/street level result', $aPlace);
+            if (CONST_Debug) var_dump($aPlace);
             if ($aPlace) {
                 $iPlaceID = $aPlace['place_id'];
                 $oResult = new Result($iPlaceID);
@@ -295,7 +279,6 @@ class ReverseGeocode
                 }
 
                 $aHouse = $this->lookupInterpolation($sPointSQL, $fDistance);
-                Debug::printVar('Interpolation result', $aPlace);
 
                 if ($aHouse) {
                     $oResult = new Result($aHouse['place_id'], Result::TABLE_OSMLINE);
@@ -322,12 +305,10 @@ class ReverseGeocode
                     $sSQL .= ' and class not in (\'boundary\')';
                     $sSQL .= ' and indexed_status = 0 and linked_place_id is null';
                     $sSQL .= ' ORDER BY distance ASC limit 1';
-                    Debug::printSQL($sSQL);
-
+                    if (CONST_Debug) var_dump($sSQL);
                     $aStreet = $this->oDB->getRow($sSQL, null, 'Could not determine closest place.');
-                    Debug::printVar('Closest POI result', $aStreet);
-
                     if ($aStreet) {
+                        if (CONST_Debug) var_dump($aStreet);
                         $oResult = new Result($aStreet['place_id']);
                     }
                 }
@@ -345,12 +326,10 @@ class ReverseGeocode
                     $sSQL .= ' FROM location_property_tiger WHERE parent_place_id = '.$oResult->iId;
                     $sSQL .= ' AND ST_DWithin('.$sPointSQL.', linegeo, 0.001)';
                     $sSQL .= ' ORDER BY distance ASC limit 1';
-                    Debug::printSQL($sSQL);
-
+                    if (CONST_Debug) var_dump($sSQL);
                     $aPlaceTiger = $this->oDB->getRow($sSQL, null, 'Could not determine closest Tiger place.');
-                    Debug::printVar('Tiger house number result', $aPlaceTiger);
-
                     if ($aPlaceTiger) {
+                        if (CONST_Debug) var_dump('found Tiger housenumber', $aPlaceTiger);
                         $oResult = new Result($aPlaceTiger['place_id'], Result::TABLE_TIGER);
                         $oResult->iHouseNumber = closestHouseNumber($aPlaceTiger);
                     }
@@ -363,8 +342,6 @@ class ReverseGeocode
             // lower than street level ($iMaxRank < 26 )
             $oResult = $this->lookupLargeArea($sPointSQL, $iMaxRank);
         }
-
-        Debug::printVar('Final result', $oResult);
         return $oResult;
     }
 }

lib/SearchContext.php

@@ -32,18 +32,7 @@ class SearchContext
     public $sqlCountryList = '';
     /// List of place IDs to exclude (as SQL).
     private $sqlExcludeList = '';
-    /// Subset of word ids of full words in the query.
-    private $aFullNameWords = array();
 
-    public function setFullNameWords($aWordList)
-    {
-        $this->aFullNameWords = $aWordList;
-    }
-
-    public function getFullNameTerms()
-    {
-        return $this->aFullNameWords;
-    }
 
     /**
      * Check if a reference point is defined.

lib/SearchDescription.php

@@ -21,6 +21,8 @@ class SearchDescription
     private $bRareName = false;
     /// List of word ids making up the address of the object.
     private $aAddress = array();
+    /// Subset of word ids of full words making up the address.
+    private $aFullNameAddress = array();
     /// List of word ids that appear in the name but should be ignored.
     private $aNameNonSearch = array();
     /// List of word ids that appear in the address but should be ignored.
@@ -197,10 +199,15 @@ class SearchDescription
         } elseif (($sPhraseType == '' || $sPhraseType == 'postalcode')
                   && is_a($oSearchTerm, '\Nominatim\Token\Postcode')
         ) {
+            // We need to try the case where the postal code is the primary element
+            // (i.e. no way to tell if it is (postalcode, city) OR (city, postalcode)
+            // so try both.
             if (!$this->sPostcode) {
                 // If we have structured search or this is the first term,
                 // make the postcode the primary search element.
-                if ($this->iOperator == Operator::NONE && $bFirstToken) {
+                if ($this->iOperator == Operator::NONE
+                    && ($sPhraseType == 'postalcode' || $bFirstToken)
+                ) {
                     $oSearch = clone $this;
                     $oSearch->iSearchRank++;
                     $oSearch->iOperator = Operator::POSTCODE;
@@ -217,9 +224,6 @@ class SearchDescription
                 ) {
                     $oSearch = clone $this;
                     $oSearch->iSearchRank++;
-                    if (strlen($oSearchTerm->sPostcode) < 4) {
-                        $oSearch->iSearchRank += 4 - strlen($oSearchTerm->sPostcode);
-                    }
                     $oSearch->sPostcode = $oSearchTerm->sPostcode;
                     $aNewSearches[] = $oSearch;
                 }
@@ -248,19 +252,6 @@ class SearchDescription
                     $oSearch->iSearchRank++;
                 }
                 $aNewSearches[] = $oSearch;
-                // Housenumbers may appear in the name when the place has its own
-                // address terms.
-                if ($oSearchTerm->iId !== null
-                    && ($this->iNamePhrase >= 0 || empty($this->aName))
-                    && empty($this->aAddress)
-                   ) {
-                    $oSearch = clone $this;
-                    $oSearch->iSearchRank++;
-                    $oSearch->aAddress = $this->aName;
-                    $oSearch->bRareName = false;
-                    $oSearch->aName = array($oSearchTerm->iId => $oSearchTerm->iId);
-                    $aNewSearches[] = $oSearch;
-                }
             }
         } elseif ($sPhraseType == ''
                   && is_a($oSearchTerm, '\Nominatim\Token\SpecialTerm')
@@ -297,9 +288,11 @@ class SearchDescription
             if (!empty($this->aName) || !($bFirstPhrase || $sPhraseType == '')) {
                 if (($sPhraseType == '' || !$bFirstPhrase) && !$bHasPartial) {
                     $oSearch = clone $this;
-                    $oSearch->iSearchRank += 3 * $oSearchTerm->iTermCount;
+                    $oSearch->iSearchRank += 2;
                     $oSearch->aAddress[$iWordID] = $iWordID;
                     $aNewSearches[] = $oSearch;
+                } else {
+                    $this->aFullNameAddress[$iWordID] = $iWordID;
                 }
             } else {
                 $oSearch = clone $this;
@@ -345,19 +338,16 @@ class SearchDescription
         ) {
             if ($oSearchTerm->iSearchNameCount < CONST_Max_Word_Frequency) {
                 $oSearch = clone $this;
-                $oSearch->iSearchRank += $oSearchTerm->iTermCount + 1;
-                if (empty($this->aName)) {
-                    $oSearch->iSearchRank++;
-                }
-                if (preg_match('#^[0-9]+$#', $sToken)) {
-                    $oSearch->iSearchRank++;
-                }
+                $oSearch->iSearchRank += 2;
                 $oSearch->aAddress[$iWordID] = $iWordID;
                 $aNewSearches[] = $oSearch;
             } else {
                 $oSearch = clone $this;
-                $oSearch->iSearchRank += $oSearchTerm->iTermCount + 1;
+                $oSearch->iSearchRank++;
                 $oSearch->aAddressNonSearch[$iWordID] = $iWordID;
+                if (preg_match('#^[0-9]+$#', $sToken)) {
+                    $oSearch->iSearchRank += 2;
+                }
                 if (!empty($aFullTokens)) {
                     $oSearch->iSearchRank++;
                 }
@@ -367,7 +357,7 @@ class SearchDescription
                 foreach ($aFullTokens as $oSearchTermToken) {
                     if (is_a($oSearchTermToken, '\Nominatim\Token\Word')) {
                         $oSearch = clone $this;
-                        $oSearch->iSearchRank += 3;
+                        $oSearch->iSearchRank++;
                         $oSearch->aAddress[$oSearchTermToken->iId]
                             = $oSearchTermToken->iId;
                         $aNewSearches[] = $oSearch;
@@ -667,7 +657,7 @@ class SearchDescription
         }
 
         if ($this->sHouseNumber) {
-            $aTerms[] = 'address_rank between 16 and 30';
+            $aTerms[] = 'address_rank between 16 and 27';
         } elseif (!$this->sClass || $this->iOperator == Operator::NAME) {
             if ($iMinAddressRank > 0) {
                 $aTerms[] = "((address_rank between $iMinAddressRank and $iMaxAddressRank) or (search_rank between $iMinAddressRank and $iMaxAddressRank))";
@@ -706,11 +696,10 @@ class SearchDescription
         $sImportanceSQL .= $this->oContext->viewboxImportanceSQL('centroid');
         $aOrder[] = "$sImportanceSQL DESC";
 
-        $aFullNameAddress = $this->oContext->getFullNameTerms();
-        if (!empty($aFullNameAddress)) {
+        if (!empty($this->aFullNameAddress)) {
             $sExactMatchSQL = ' ( ';
             $sExactMatchSQL .= ' SELECT count(*) FROM ( ';
-            $sExactMatchSQL .= '  SELECT unnest('.$oDB->getArraySQL($aFullNameAddress).')';
+            $sExactMatchSQL .= '  SELECT unnest('.$oDB->getArraySQL($this->aFullNameAddress).')';
             $sExactMatchSQL .= '    INTERSECT ';
             $sExactMatchSQL .= '  SELECT unnest(nameaddress_vector)';
             $sExactMatchSQL .= ' ) s';

lib/TokenList.php

@@ -80,21 +80,6 @@ class TokenList
         return isset($this->aTokens[$sWord]) ? $this->aTokens[$sWord] : array();
     }
 
-    public function getFullWordIDs()
-    {
-        $ids = array();
-
-        foreach ($this->aTokens as $aTokenList) {
-            foreach ($aTokenList as $oToken) {
-                if (is_a($oToken, '\Nominatim\Token\Word') && !$oToken->bPartial) {
-                    $ids[$oToken->iId] = $oToken->iId;
-                }
-            }
-        }
-
-        return $ids;
-    }
-
     /**
      * Add token information from the word table in the database.
      *
@@ -166,8 +151,7 @@ class TokenList
                 $oToken = new Token\Word(
                     $iId,
                     $aWord['word_token'][0] != ' ',
-                    (int) $aWord['count'],
-                    substr_count($aWord['word_token'], ' ')
+                    (int) $aWord['count']
                 );
             }
 

lib/TokenWord.php

@@ -13,15 +13,12 @@ class Word
     public $bPartial;
     /// Number of appearances in the database.
     public $iSearchNameCount;
-    /// Number of terms in the word.
-    public $iTermCount;
 
-    public function __construct($iId, $bPartial, $iSearchNameCount, $iTermCount)
+    public function __construct($iId, $bPartial, $iSearchNameCount)
     {
         $this->iId = $iId;
         $this->bPartial = $bPartial;
         $this->iSearchNameCount = $iSearchNameCount;
-        $this->iTermCount = $iTermCount;
     }
 
     public function debugInfo()

lib/init-website.php

@@ -16,6 +16,14 @@ function userError($sMsg)
 }
 
 
+function exception_handler_html($exception)
+{
+    http_response_code($exception->getCode());
+    header('Content-type: text/html; charset=UTF-8');
+    include(CONST_BasePath.'/lib/template/error-html.php');
+    exit();
+}
+
 function exception_handler_json($exception)
 {
     http_response_code($exception->getCode());
@@ -33,6 +41,14 @@ function exception_handler_xml($exception)
     exit();
 }
 
+function shutdown_exception_handler_html()
+{
+    $error = error_get_last();
+    if ($error !== null && $error['type'] === E_ERROR) {
+        exception_handler_html(new Exception($error['message'], 500));
+    }
+}
+
 function shutdown_exception_handler_xml()
 {
     $error = error_get_last();
@@ -57,7 +73,10 @@ function set_exception_handler_by_format($sFormat = null)
     // one by default without an explicit $sFormat set.
 
     if (!isset($sFormat)) {
-        set_exception_handler('exception_handler_json');
+        set_exception_handler('exception_handler_html');
+    } elseif ($sFormat == 'html') {
+        set_exception_handler('exception_handler_html');
+        register_shutdown_function('shutdown_exception_handler_html');
     } elseif ($sFormat == 'xml') {
         set_exception_handler('exception_handler_xml');
         register_shutdown_function('shutdown_exception_handler_xml');

lib/init.php

@@ -2,3 +2,8 @@
 
 require_once(CONST_BasePath.'/lib/lib.php');
 require_once(CONST_BasePath.'/lib/DB.php');
+
+if (get_magic_quotes_gpc()) {
+    echo "Please disable magic quotes in your php.ini configuration\n";
+    exit;
+}

lib/lib.php

@@ -55,7 +55,7 @@ function byImportance($a, $b)
     if ($a['importance'] != $b['importance'])
         return ($a['importance'] > $b['importance']?-1:1);
 
-    return $a['foundorder'] <=> $b['foundorder'];
+    return ($a['foundorder'] < $b['foundorder']?-1:1);
 }
 
 

lib/setup/SetupClass.php

@@ -108,11 +108,17 @@ class SetupFunctions
         if ($result != 0) fail('Error executing external command: '.$oCmd->escapedCmd());
     }
 
+    public function connect()
+    {
+        $this->oDB = new \Nominatim\DB();
+        $this->oDB->connect();
+    }
+
     public function setupDB()
     {
         info('Setup DB');
 
-        $fPostgresVersion = $this->db()->getPostgresVersion();
+        $fPostgresVersion = $this->oDB->getPostgresVersion();
         echo 'Postgres version found: '.$fPostgresVersion."\n";
 
         if ($fPostgresVersion < 9.03) {
@@ -122,7 +128,7 @@ class SetupFunctions
         $this->pgsqlRunScript('CREATE EXTENSION IF NOT EXISTS hstore');
         $this->pgsqlRunScript('CREATE EXTENSION IF NOT EXISTS postgis');
 
-        $fPostgisVersion = $this->db()->getPostgisVersion();
+        $fPostgisVersion = $this->oDB->getPostgisVersion();
         echo 'Postgis version found: '.$fPostgisVersion."\n";
 
         if ($fPostgisVersion < 2.2) {
@@ -130,7 +136,7 @@ class SetupFunctions
             exit(1);
         }
 
-        $i = $this->db()->getOne("select count(*) from pg_user where usename = '".CONST_Database_Web_User."'");
+        $i = $this->oDB->getOne("select count(*) from pg_user where usename = '".CONST_Database_Web_User."'");
         if ($i == 0) {
             echo "\nERROR: Web user '".CONST_Database_Web_User."' does not exist. Create it with:\n";
             echo "\n          createuser ".CONST_Database_Web_User."\n\n";
@@ -201,8 +207,6 @@ class SetupFunctions
         $oCmd->addParams('--output', 'gazetteer');
         $oCmd->addParams('--hstore');
         $oCmd->addParams('--number-processes', 1);
-        $oCmd->addParams('--with-forward-dependencies', 'false');
-        $oCmd->addParams('--log-progress', 'true');
         $oCmd->addParams('--cache', $this->iCacheMemory);
         $oCmd->addParams('--port', $this->aDSNInfo['port']);
 
@@ -219,7 +223,7 @@ class SetupFunctions
         $oCmd->addParams($sOSMFile);
         $oCmd->run();
 
-        if (!$this->sIgnoreErrors && !$this->db()->getRow('select * from place limit 1')) {
+        if (!$this->sIgnoreErrors && !$this->oDB->getRow('select * from place limit 1')) {
             fail('No Data');
         }
 
@@ -253,7 +257,7 @@ class SetupFunctions
         }
 
         $oAlParser = new AddressLevelParser(CONST_Address_Level_Config);
-        $oAlParser->createTable($this->db(), 'address_levels');
+        $oAlParser->createTable($this->oDB, 'address_levels');
     }
 
     public function createTableTriggers()
@@ -301,42 +305,40 @@ class SetupFunctions
     {
         info('Drop old Data');
 
-        $oDB = $this->db();
-
-        $oDB->exec('TRUNCATE word');
+        $this->oDB->exec('TRUNCATE word');
         echo '.';
-        $oDB->exec('TRUNCATE placex');
+        $this->oDB->exec('TRUNCATE placex');
         echo '.';
-        $oDB->exec('TRUNCATE location_property_osmline');
+        $this->oDB->exec('TRUNCATE location_property_osmline');
         echo '.';
-        $oDB->exec('TRUNCATE place_addressline');
+        $this->oDB->exec('TRUNCATE place_addressline');
         echo '.';
-        $oDB->exec('TRUNCATE location_area');
+        $this->oDB->exec('TRUNCATE location_area');
         echo '.';
         if (!$this->dbReverseOnly()) {
-            $oDB->exec('TRUNCATE search_name');
+            $this->oDB->exec('TRUNCATE search_name');
             echo '.';
         }
-        $oDB->exec('TRUNCATE search_name_blank');
+        $this->oDB->exec('TRUNCATE search_name_blank');
         echo '.';
-        $oDB->exec('DROP SEQUENCE seq_place');
+        $this->oDB->exec('DROP SEQUENCE seq_place');
         echo '.';
-        $oDB->exec('CREATE SEQUENCE seq_place start 100000');
+        $this->oDB->exec('CREATE SEQUENCE seq_place start 100000');
         echo '.';
 
         $sSQL = 'select distinct partition from country_name';
-        $aPartitions = $oDB->getCol($sSQL);
+        $aPartitions = $this->oDB->getCol($sSQL);
 
         if (!$this->bNoPartitions) $aPartitions[] = 0;
         foreach ($aPartitions as $sPartition) {
-            $oDB->exec('TRUNCATE location_road_'.$sPartition);
+            $this->oDB->exec('TRUNCATE location_road_'.$sPartition);
             echo '.';
         }
 
         // used by getorcreate_word_id to ignore frequent partial words
         $sSQL = 'CREATE OR REPLACE FUNCTION get_maxwordfreq() RETURNS integer AS ';
         $sSQL .= '$$ SELECT '.CONST_Max_Word_Frequency.' as maxwordfreq; $$ LANGUAGE SQL IMMUTABLE';
-        $oDB->exec($sSQL);
+        $this->oDB->exec($sSQL);
         echo ".\n";
 
         // pre-create the word list
@@ -413,13 +415,13 @@ class SetupFunctions
         info('Reanalysing database');
         $this->pgsqlRunScript('ANALYSE');
 
-        $sDatabaseDate = getDatabaseDate($oDB);
-        $oDB->exec('TRUNCATE import_status');
+        $sDatabaseDate = getDatabaseDate($this->oDB);
+        $this->oDB->exec('TRUNCATE import_status');
         if (!$sDatabaseDate) {
             warn('could not determine database date.');
         } else {
             $sSQL = "INSERT INTO import_status (lastimportdate) VALUES('".$sDatabaseDate."')";
-            $oDB->exec($sSQL);
+            $this->oDB->exec($sSQL);
             echo "Latest data imported from $sDatabaseDate.\n";
         }
     }
@@ -497,7 +499,7 @@ class SetupFunctions
     public function calculatePostcodes($bCMDResultAll)
     {
         info('Calculate Postcodes');
-        $this->db()->exec('TRUNCATE location_postcode');
+        $this->oDB->exec('TRUNCATE location_postcode');
 
         $sSQL  = 'INSERT INTO location_postcode';
         $sSQL .= ' (place_id, indexed_status, country_code, postcode, geometry) ';
@@ -508,7 +510,7 @@ class SetupFunctions
         $sSQL .= " WHERE address ? 'postcode' AND address->'postcode' NOT SIMILAR TO '%(,|;)%'";
         $sSQL .= '       AND geometry IS NOT null';
         $sSQL .= ' GROUP BY country_code, pc';
-        $this->db()->exec($sSQL);
+        $this->oDB->exec($sSQL);
 
         // only add postcodes that are not yet available in OSM
         $sSQL  = 'INSERT INTO location_postcode';
@@ -518,7 +520,7 @@ class SetupFunctions
         $sSQL .= '  FROM us_postcode WHERE postcode NOT IN';
         $sSQL .= '        (SELECT postcode FROM location_postcode';
         $sSQL .= "          WHERE country_code = 'us')";
-        $this->db()->exec($sSQL);
+        $this->oDB->exec($sSQL);
 
         // add missing postcodes for GB (if available)
         $sSQL  = 'INSERT INTO location_postcode';
@@ -527,23 +529,21 @@ class SetupFunctions
         $sSQL .= '  FROM gb_postcode WHERE postcode NOT IN';
         $sSQL .= '           (SELECT postcode FROM location_postcode';
         $sSQL .= "             WHERE country_code = 'gb')";
-        $this->db()->exec($sSQL);
+        $this->oDB->exec($sSQL);
 
         if (!$bCMDResultAll) {
             $sSQL = "DELETE FROM word WHERE class='place' and type='postcode'";
             $sSQL .= 'and word NOT IN (SELECT postcode FROM location_postcode)';
-            $this->db()->exec($sSQL);
+            $this->oDB->exec($sSQL);
         }
 
         $sSQL = 'SELECT count(getorcreate_postcode_id(v)) FROM ';
         $sSQL .= '(SELECT distinct(postcode) as v FROM location_postcode) p';
-        $this->db()->exec($sSQL);
+        $this->oDB->exec($sSQL);
     }
 
     public function index($bIndexNoanalyse)
     {
-        checkModulePresence(); // raises exception on failure
-
         $oBaseCmd = (new \Nominatim\Shell(CONST_BasePath.'/nominatim/nominatim.py'))
                     ->addParams('--database', $this->aDSNInfo['database'])
                     ->addParams('--port', $this->aDSNInfo['port'])
@@ -568,27 +568,19 @@ class SetupFunctions
         info('Index ranks 0 - 4');
         $oCmd = (clone $oBaseCmd)->addParams('--maxrank', 4);
         echo $oCmd->escapedCmd();
-
+        
         $iStatus = $oCmd->run();
         if ($iStatus != 0) {
             fail('error status ' . $iStatus . ' running nominatim!');
         }
         if (!$bIndexNoanalyse) $this->pgsqlRunScript('ANALYSE');
 
-        info('Index administrative boundaries');
-        $oCmd = (clone $oBaseCmd)->addParams('-b');
-        $iStatus = $oCmd->run();
-        if ($iStatus != 0) {
-            fail('error status ' . $iStatus . ' running nominatim!');
-        }
-
         info('Index ranks 5 - 25');
         $oCmd = (clone $oBaseCmd)->addParams('--minrank', 5, '--maxrank', 25);
         $iStatus = $oCmd->run();
         if ($iStatus != 0) {
             fail('error status ' . $iStatus . ' running nominatim!');
         }
-
         if (!$bIndexNoanalyse) $this->pgsqlRunScript('ANALYSE');
 
         info('Index ranks 26 - 30');
@@ -600,7 +592,7 @@ class SetupFunctions
 
         info('Index postcodes');
         $sSQL = 'UPDATE location_postcode SET indexed_status = 0';
-        $this->db()->exec($sSQL);
+        $this->oDB->exec($sSQL);
     }
 
     public function createSearchIndices()
@@ -609,11 +601,11 @@ class SetupFunctions
 
         $sSQL = 'SELECT relname FROM pg_class, pg_index ';
         $sSQL .= 'WHERE pg_index.indisvalid = false AND pg_index.indexrelid = pg_class.oid';
-        $aInvalidIndices = $this->db()->getCol($sSQL);
+        $aInvalidIndices = $this->oDB->getCol($sSQL);
 
         foreach ($aInvalidIndices as $sIndexName) {
             info("Cleaning up invalid index $sIndexName");
-            $this->db()->exec("DROP INDEX $sIndexName;");
+            $this->oDB->exec("DROP INDEX $sIndexName;");
         }
 
         $sTemplate = file_get_contents(CONST_BasePath.'/sql/indices.src.sql');
@@ -683,7 +675,7 @@ class SetupFunctions
                        );
 
         $aDropTables = array();
-        $aHaveTables = $this->db()->getListOfTables();
+        $aHaveTables = $this->oDB->getListOfTables();
 
         foreach ($aHaveTables as $sTable) {
             $bFound = false;
@@ -702,57 +694,6 @@ class SetupFunctions
         $this->removeFlatnodeFile();
     }
 
-    /**
-     * Setup settings-frontend.php in the build/website directory
-     *
-     * @return null
-     */
-    public function setupWebsite()
-    {
-        $rOutputFile = fopen(CONST_InstallPath.'/settings/settings-frontend.php', 'w');
-
-        fwrite($rOutputFile, "<?php
-@define('CONST_BasePath', '".CONST_BasePath."');
-if (file_exists(getenv('NOMINATIM_SETTINGS'))) require_once(getenv('NOMINATIM_SETTINGS'));
-
-@define('CONST_Database_DSN', '".CONST_Database_DSN."');
-@define('CONST_Default_Language', ".(CONST_Default_Language ? ("'".CONST_Default_Language."'") : 'false').");
-@define('CONST_Log_DB', ".(CONST_Log_DB ? 'true' : 'false').");
-@define('CONST_Log_File', ".(CONST_Log_File ? ("'".CONST_Log_File."'")  : 'false').");
-@define('CONST_Max_Word_Frequency', '".CONST_Max_Word_Frequency."');
-@define('CONST_NoAccessControl', ".CONST_NoAccessControl.");
-@define('CONST_Places_Max_ID_count', ".CONST_Places_Max_ID_count.");
-@define('CONST_PolygonOutput_MaximumTypes', ".CONST_PolygonOutput_MaximumTypes.");
-@define('CONST_Search_AreaPolygons', ".CONST_Search_AreaPolygons.");
-@define('CONST_Search_BatchMode', ".(CONST_Search_BatchMode ? 'true' : 'false').");
-@define('CONST_Search_NameOnlySearchFrequencyThreshold', ".CONST_Search_NameOnlySearchFrequencyThreshold.");
-@define('CONST_Search_ReversePlanForAll', ".CONST_Search_ReversePlanForAll.");
-@define('CONST_Term_Normalization_Rules', \"".CONST_Term_Normalization_Rules."\");
-@define('CONST_Use_Aux_Location_data', ".(CONST_Use_Aux_Location_data ? 'true' : 'false').");
-@define('CONST_Use_US_Tiger_Data', ".(CONST_Use_US_Tiger_Data ? 'true' : 'false').");
-@define('CONST_MapIcon_URL', ".(CONST_MapIcon_URL ? ("'".CONST_MapIcon_URL."'") : 'false').');
-');
-        info(CONST_InstallPath.'/settings/settings-frontend.php has been set up successfully');
-    }
-
-    /**
-     * Return the connection to the database.
-     *
-     * @return Database object.
-     *
-     * Creates a new connection if none exists yet. Otherwise reuses the
-     * already established connection.
-     */
-    private function db()
-    {
-        if (is_null($this->oDB)) {
-            $this->oDB = new \Nominatim\DB();
-            $this->oDB->connect();
-        }
-
-        return $this->oDB;
-    }
-
     private function removeFlatnodeFile()
     {
         if (!is_null(CONST_Osm2pgsql_Flatnode_File) && CONST_Osm2pgsql_Flatnode_File) {
@@ -782,13 +723,13 @@ if (file_exists(getenv('NOMINATIM_SETTINGS'))) require_once(getenv('NOMINATIM_SE
         $sTemplate .= file_get_contents($sBasePath.'importance.sql');
         $sTemplate .= file_get_contents($sBasePath.'address_lookup.sql');
         $sTemplate .= file_get_contents($sBasePath.'interpolation.sql');
-        if ($this->db()->tableExists('place')) {
+        if ($this->oDB->tableExists('place')) {
             $sTemplate .= file_get_contents($sBasePath.'place_triggers.sql');
         }
-        if ($this->db()->tableExists('placex')) {
+        if ($this->oDB->tableExists('placex')) {
             $sTemplate .= file_get_contents($sBasePath.'placex_triggers.sql');
         }
-        if ($this->db()->tableExists('location_postcode')) {
+        if ($this->oDB->tableExists('location_postcode')) {
             $sTemplate .= file_get_contents($sBasePath.'postcode_triggers.sql');
         }
         $sTemplate = str_replace('{modulepath}', $this->sModulePath, $sTemplate);
@@ -817,7 +758,7 @@ if (file_exists(getenv('NOMINATIM_SETTINGS'))) require_once(getenv('NOMINATIM_SE
     private function pgsqlRunPartitionScript($sTemplate)
     {
         $sSQL = 'select distinct partition from country_name';
-        $aPartitions = $this->db()->getCol($sSQL);
+        $aPartitions = $this->oDB->getCol($sSQL);
         if (!$this->bNoPartitions) $aPartitions[] = 0;
 
         preg_match_all('#^-- start(.*?)^-- end#ms', $sTemplate, $aMatches, PREG_SET_ORDER);
@@ -923,11 +864,13 @@ if (file_exists(getenv('NOMINATIM_SETTINGS'))) require_once(getenv('NOMINATIM_SE
      * @param string $sName Name of table to remove.
      *
      * @return null
+     *
+     * @pre connect() must have been called.
      */
     private function dropTable($sName)
     {
         if ($this->bVerbose) echo "Dropping table $sName\n";
-        $this->db()->deleteTable($sName);
+        $this->oDB->deleteTable($sName);
     }
 
     /**
@@ -937,6 +880,6 @@ if (file_exists(getenv('NOMINATIM_SETTINGS'))) require_once(getenv('NOMINATIM_SE
      */
     private function dbReverseOnly()
     {
-        return !($this->db()->tableExists('search_name'));
+        return !($this->oDB->tableExists('search_name'));
     }
 }

lib/template/address-html.php

@@ -0,0 +1,135 @@
+<?php
+    header("content-type: text/html; charset=UTF-8");
+?>
+<?php include(CONST_BasePath.'/lib/template/includes/html-header.php'); ?>
+    <link href="css/common.css" rel="stylesheet" type="text/css" />
+    <link href="css/search.css" rel="stylesheet" type="text/css" />
+</head>
+
+<body id="reverse-page">
+
+    <?php include(CONST_BasePath.'/lib/template/includes/html-top-navigation.php'); ?>
+    <div class="top-bar">
+    <form class="form-inline" role="search" accept-charset="UTF-8" action="<?php echo CONST_Website_BaseURL; ?>reverse.php">
+        <div class="form-group">
+            <input name="format" type="hidden" value="html">
+            lat
+            <input name="lat" type="text" class="form-control input-sm" placeholder="latitude" value="<?php echo $fLat; ?>" >
+            <a href="#" class="btn btn-default btn-xs" id="switch-coords" title="switch lat and lon">&lt;&gt;</a>
+            lon
+            <input name="lon" type="text" class="form-control input-sm" placeholder="longitude" value="<?php echo $fLon; ?>" >
+            max zoom
+
+            <select name="zoom" class="form-control input-sm">
+                <option value="" <?php if ($iZoom === false) echo 'selected="selected"' ?> >--</option>
+                <?php
+
+                    $aZoomLevels = array(
+                         0 => "Continent / Sea",
+                         1 => "",
+                         2 => "",
+                         3 => "Country",
+                         4 => "",
+                         5 => "State",
+                         6 => "Region",
+                         7 => "",
+                         8 => "County",
+                         9 => "",
+                        10 => "City",
+                        11 => "",
+                        12 => "Town / Village",
+                        13 => "",
+                        14 => "Suburb",
+                        15 => "",
+                        16 => "Street",
+                        17 => "",
+                        18 => "Building",
+                        19 => "",
+                        20 => "",
+                        21 => "",
+                    );
+
+                    foreach($aZoomLevels as $iZoomLevel => $sLabel)
+                    {
+                        $bSel = $iZoom === $iZoomLevel;
+                        echo '<option value="'.$iZoomLevel.'"'.($bSel?' selected="selected"':'').'>'.$iZoomLevel.' '.$sLabel.'</option>'."\n";
+                    }
+                ?>
+            </select>
+        </div>
+        <div class="form-group search-button-group">
+            <button type="submit" class="btn btn-primary btn-sm">Search</button>
+        </div>
+        <div class="search-type-link">
+            <a href="<?php echo CONST_Website_BaseURL; ?>search.php">forward search</a>
+        </div>
+    </form>
+</div>
+
+    <div id="content">
+
+<?php if (count($aPlace)>0) { ?>
+
+        <div id="searchresults" class="sidebar">
+        <?php
+            $aResult = $aPlace;
+
+            echo '<div class="result" data-position="0">';
+
+            echo (isset($aResult['icon'])?'<img alt="icon" src="'.$aResult['icon'].'"/>':'');
+            echo ' <span class="name">'.htmlspecialchars($aResult['langaddress']).'</span>';
+            if (isset($aResult['label']))
+                echo ' <span class="type">('.$aResult['label'].')</span>';
+            else if ($aResult['type'] == 'yes')
+                echo ' <span class="type">('.ucwords(str_replace('_',' ',$aResult['class'])).')</span>';
+            else
+                echo ' <span class="type">('.ucwords(str_replace('_',' ',$aResult['type'])).')</span>';
+            echo '<p>'.$aResult['lat'].','.$aResult['lon'].'</p>';
+            echo detailsPermaLink($aResult, 'details', 'class="btn btn-default btn-xs details"');
+            echo '</div>';
+        ?>
+        </div>
+
+<?php } else { ?>
+
+        <div id="intro" class="sidebar">
+            Search for coordinates or click anywhere on the map.
+        </div>
+
+<?php } ?>
+
+        <div id="map-wrapper">
+            <div id="map-position">
+                <div id="map-position-inner"></div>
+                <div id="map-position-close"><a href="#">hide</a></div>
+            </div>
+            <div id="map"></div>
+        </div>
+
+    </div> <!-- /content -->
+
+
+
+
+
+
+
+    <script type="text/javascript">
+    <?php
+
+        $aNominatimMapInit = array(
+            'zoom' => $iZoom !== false ? $iZoom : CONST_Default_Zoom,
+            'lat'  => $fLat !== false ? $fLat : CONST_Default_Lat,
+            'lon'  => $fLon !== false ? $fLon : CONST_Default_Lon,
+            'tile_url' => $sTileURL,
+            'tile_attribution' => $sTileAttribution
+        );
+        echo 'var nominatim_map_init = ' . json_encode($aNominatimMapInit, JSON_PRETTY_PRINT) . ';';
+
+        echo 'var nominatim_results = ' . json_encode([$aPlace], JSON_PRETTY_PRINT) . ';'; 
+    ?>
+    </script>
+    <?php include(CONST_BasePath.'/lib/template/includes/html-footer.php'); ?>
+
+</body>
+</html>

lib/template/address-xml.php

@@ -28,9 +28,6 @@ if (empty($aPlace)) {
         echo join(',', $aPlace['aBoundingBox']);
         echo '"';
     }
-    echo " place_rank='".$aPlace['rank_search']."'";
-    echo " address_rank='".$aPlace['rank_address']."'";
-
 
     if (isset($aPlace['asgeojson'])) {
         echo ' geojson=\'';

lib/template/deletable-html.php

@@ -0,0 +1,48 @@
+<?php
+    header("content-type: text/html; charset=UTF-8");
+    include(CONST_BasePath.'/lib/template/includes/html-header.php');
+?>
+    <title>Nominatim Deleted Data</title>    
+    <meta name="description" content="List of OSM data that has been deleted" lang="en-US" />
+</head>
+
+<body>
+<div class="container">
+    <h1>Deletable</h1>
+    <p>
+        <?php echo sizeof($aPolygons) ?> objects have been deleted in OSM but are still in the Nominatim database.
+        Also available in <a href="<?php echo CONST_Website_BaseURL; ?>deletable.php?format=json">JSON format</a>.
+    </p>
+
+    <table class="table table-striped table-hover">
+<?php
+
+if (!empty($aPolygons)) {
+    echo '<tr>';
+    foreach (array_keys($aPolygons[0]) as $sCol) {
+        echo '<th>'.$sCol.'</th>';
+    }
+    echo '</tr>';
+    foreach ($aPolygons as $aRow) {
+        echo '<tr>';
+        foreach ($aRow as $sCol => $sVal) {
+            switch ($sCol) {
+                case 'osm_id':
+                    echo '<td>'.osmLink($aRow).'</td>';
+                    break;
+                case 'place_id':
+                    echo '<td>'.detailsLink($aRow).'</td>';
+                    break;
+                default:
+                    echo '<td>'.($sVal?$sVal:'&nbsp;').'</td>';
+                    break;
+            }
+        }
+        echo '</tr>';
+    }
+}
+?>
+    </table>
+</div>
+</body>
+</html>

lib/template/details-error-html.php

@@ -0,0 +1,122 @@
+<?php
+    header("content-type: text/html; charset=UTF-8");
+?>
+<?php include(CONST_BasePath.'/lib/template/includes/html-header.php'); ?>
+    <link href="css/common.css" rel="stylesheet" type="text/css" />
+    <link href="css/details.css" rel="stylesheet" type="text/css" />
+</head>
+
+
+<?php
+
+    function osmMapUrl($aFeature)
+    {
+        if (isset($sFeature['error_x']) && isset($sFeature['error_y']))
+        {
+            $sBaseUrl = '//www.openstreetmap.org/';
+            $sOSMType = formatOSMType($aFeature['osm_type'], false);
+            if ($sOSMType)
+            {
+                $sBaseUrl += $sOSMType.'/'.$aFeature['osm_id'];
+            }
+
+            return '<a href="'.$sBaseUrl.'?mlat='.$aFeature['error_y'].'&mlon='.$aFeature['error_x'].'">view on osm.org</a>';
+        }
+        return '';
+    }
+
+    function josm_edit_url($aFeature)
+    {
+        $fWidth = 0.0002;
+        $sLon = $aFeature['error_x'];
+        $sLat = $aFeature['error_y'];
+
+        if (isset($sLat))
+        {
+            return "http://localhost:8111/load_and_zoom?left=".($sLon-$fWidth)."&right=".($sLon+$fWidth)."&top=".($sLat+$fWidth)."&bottom=".($sLat-$fWidth);
+        }
+
+        $sOSMType = formatOSMType($aFeature['osm_type'], false);
+        if ($sOSMType)
+        {
+            return 'http://localhost:8111/import?url=http://www.openstreetmap.org/api/0.6/'.$sOSMType.'/'.$aFeature['osm_id'].'/full';
+            // Should be better to load by object id - but this doesn't seem to zoom correctly
+            // return " <a href=\"http://localhost:8111/load_object?new_layer=true&objects=".strtolower($aFeature['osm_type']).$sOSMID."\" target=\"josm\">Remote Control (JOSM / Merkaartor)</a>";
+        }
+        return '';
+    }
+
+    function potlach_edit_url($aFeature)
+    {
+        $fWidth = 0.0002;
+        $sLat = $aFeature['error_y'];
+        $sLon = $aFeature['error_x'];
+
+        if (isset($sLat))
+        {
+            return "//www.openstreetmap.org/edit?editor=potlatch2&bbox=".($sLon-$fWidth).",".($sLat-$fWidth).",".($sLon+$fWidth).",".($sLat+$fWidth);
+        }
+        return '';
+    }
+
+
+
+?>
+
+<body id="details-page">
+    <div class="container">
+        <div class="row">
+            <div class="col-md-6">
+
+
+                <h1><?php echo $aPointDetails['localname'] ?></h1>
+                <div class="locationdetails">
+                    <h2 class="bg-danger">This object has an invalid geometry.</h2>
+
+                    <div>
+                        Type: <span class="type"><?php echo $aPointDetails['class'].':'.$aPointDetails['type'];?></span>
+                    </div>
+
+                    <div>
+                        OSM: <span class="label"><?php echo osmLink($aPointDetails); ?><span>
+                    </div>
+
+
+                    <h4>Error</h4>
+                    <p>
+                        <?php echo $aPointDetails['errormessage']?$aPointDetails['errormessage']:'unknown'; ?>
+                    </p>
+                    <?php echo osmMapUrl($aPointDetails); ?>
+
+                    <h4>Edit</h4>
+                    <ul>
+                    <?php if (josm_edit_url($aPointDetails)) { ?>
+                            <li><a href="<?php echo josm_edit_url($aPointDetails); ?>" target="josm">Remote Control (JOSM / Merkaartor)</a></li>
+                    <?php } ?>
+                    <?php if (potlach_edit_url($aPointDetails)) { ?>
+                            <li><a href="<?php echo potlach_edit_url($aPointDetails); ?>" target="potlatch2">Potlatch 2</a></li>
+                    <?php } ?>
+                    </ul>
+            </div>
+        </div>
+        <div class="col-md-6">
+            <div id="map"></div>
+        </div>
+
+    </div>
+
+
+    <script type="text/javascript">
+
+        var nominatim_result = {
+            outlinestring: '<?php echo $aPointDetails['outlinestring'];?>',
+            lon: <?php echo isset($aPointDetails['error_x']) ? $aPointDetails['error_x'] : 0; ?>,
+            lat: <?php echo isset($aPointDetails['error_y']) ? $aPointDetails['error_y'] : 0; ?>
+        };
+
+    </script>
+
+
+    <?php include(CONST_BasePath.'/lib/template/includes/html-footer.php'); ?>
+    </body>
+</html>

lib/template/details-html.php

@@ -0,0 +1,268 @@
+<?php
+    header("content-type: text/html; charset=UTF-8");
+?>
+<?php include(CONST_BasePath.'/lib/template/includes/html-header.php'); ?>
+    <link href="css/common.css" rel="stylesheet" type="text/css" />
+    <link href="css/details.css" rel="stylesheet" type="text/css" />
+</head>
+
+
+<?php
+
+    function headline($sTitle)
+    {
+        echo "<tr class='all-columns'><td colspan='6'><h2>".$sTitle."</h2></td></tr>\n";
+    }
+
+    function headline3($sTitle)
+    {
+        echo "<tr class='all-columns'><td colspan='6'><h3>".$sTitle."</h3></td></tr>\n";
+    }
+
+
+    function format_distance($fDistance, $bInMeters = false)
+    {
+        if ($bInMeters) {
+            // $fDistance is in meters
+            if ($fDistance < 1) {
+                return '0';
+            }
+            elseif ($fDistance < 1000) {
+                return '<abbr class="distance" title="'.$fDistance.' meters">~'.(round($fDistance,0)).' m</abbr>';
+            }
+            else {
+                return '<abbr class="distance" title="'.$fDistance.' meters">~'.(round($fDistance/1000,1)).' km</abbr>';
+            }
+        } else {
+            if ($fDistance == 0) {
+                return '0';
+            } else {
+                return '<abbr class="distance" title="spheric distance '.$fDistance.'">'.(round($fDistance,4)).'</abbr>';
+            }
+        }
+    }
+
+    function kv($sKey,$sValue)
+    {
+        echo ' <tr><td>' . $sKey . '</td><td>'.$sValue.'</td></tr>'. "\n";
+    }
+
+
+    function hash_to_subtable($aAssociatedList)
+    {
+        $sHTML = '';
+        foreach ($aAssociatedList as $sKey => $sValue) {
+            $sHTML = $sHTML.' <div class="line"><span class="name">'.$sValue.'</span> ('.$sKey.')</div>'."\n";
+        }
+        return $sHTML;
+    }
+
+    function map_icon($aPlace)
+    {
+        $sIcon = Nominatim\ClassTypes\getIconFile($aPlace);
+        if (isset($sIcon)) {
+            $sLabel = Nominatim\ClassTypes\getIcon($aPlace);
+            echo '<img id="mapicon" src="'.$sIcon.'" alt="'.$sLabel.'" />';
+        }
+    }
+
+
+    function _one_row($aAddressLine, $bDistanceInMeters = false){
+        $bNotUsed = isset($aAddressLine['isaddress']) && !$aAddressLine['isaddress'];
+
+        echo '<tr class="' . ($bNotUsed?'notused':'') . '">'."\n";
+        echo '  <td class="name">'.(trim($aAddressLine['localname'])!==null?$aAddressLine['localname']:'<span class="noname">No Name</span>')."</td>\n";
+        echo '  <td>' . $aAddressLine['class'].':'.$aAddressLine['type'];
+        if ($aAddressLine['type'] == 'administrative'
+            && isset($aAddressLine['place_type']))
+        {
+            echo '('.$aAddressLine['place_type'].')';
+        }
+        echo "</td>\n";
+        echo '  <td>' . osmLink($aAddressLine) . "</td>\n";
+        echo '  <td>' . (isset($aAddressLine['rank_address']) ? $aAddressLine['rank_address'] : '') . "</td>\n";
+        echo '  <td>' . ($aAddressLine['admin_level'] < 15 ? $aAddressLine['admin_level'] : '') . "</td>\n";
+        echo '  <td>' . format_distance($aAddressLine['distance'], $bDistanceInMeters)."</td>\n";
+        echo '  <td>' . detailsPermaLink($aAddressLine,'details &gt;') . "</td>\n";
+        echo "</tr>\n";
+    }
+
+    function _one_keyword_row($keyword_token,$word_id){
+        echo "<tr>\n";
+        echo '<td>';
+        // mark partial tokens (those starting with a space) with a star for readability
+        echo ($keyword_token[0]==' '?'*':'');
+        echo $keyword_token;
+        if (isset($word_id))
+        {
+            echo '</td><td>word id: '.$word_id;
+        }
+        echo "</td></tr>\n";
+    }
+
+?>
+
+
+
+<body id="details-page">
+    <?php include(CONST_BasePath.'/lib/template/includes/html-top-navigation.php'); ?>
+    <div class="container">
+        <div class="row">
+            <div class="col-sm-10">
+                <h1>
+                    <?php echo $aPointDetails['localname'] ?>
+                </h1>
+            </div>
+            <div class="col-sm-2 text-right">
+                <?php map_icon($aPointDetails) ?>
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-md-6">
+                <table id="locationdetails" class="table table-striped">
+
+                <?php
+
+                    kv('Name'            , hash_to_subtable($aPointDetails['aNames']) );
+                    kv('Type'            , $aPointDetails['class'].':'.$aPointDetails['type'] );
+                    kv('Last Updated'    , (new DateTime('@'.$aPointDetails['indexed_epoch']))->format(DateTime::RFC822) );
+                    kv('Admin Level'     , $aPointDetails['admin_level'] );
+                    kv('Rank'            , $aPointDetails['rank_search_label'] );
+                    if ($aPointDetails['calculated_importance']) {
+                        kv('Importance'    , $aPointDetails['calculated_importance'].($aPointDetails['importance']?'':' (estimated)') );
+                    }
+                    kv('Coverage'        , ($aPointDetails['isarea']?'Polygon':'Point') );
+                    kv('Centre Point'    , $aPointDetails['lat'].','.$aPointDetails['lon'] );
+                    kv('OSM'             , osmLink($aPointDetails) );
+                    kv('Place Id (<a href="https://nominatim.org/release-docs/develop/api/Output/#place_id-is-not-a-persistent-id">on this server</a>)'
+                                         , $aPointDetails['place_id'] );
+                    if ($aPointDetails['wikipedia'])
+                    {
+                        kv('Wikipedia Calculated' , wikipediaLink($aPointDetails) );
+                    }
+
+                    kv('Computed Postcode', $aPointDetails['postcode']);
+                    kv('Address Tags'    , hash_to_subtable($aPointDetails['aAddressTags']) );
+                    kv('Extra Tags'      , hash_to_subtable($aPointDetails['aExtraTags']) );
+
+                ?>
+
+                </table>
+            </div>
+
+            <div class="col-md-6">
+                <div id="map"></div>
+            </div>
+
+        </div>
+        <div class="row">
+            <div class="col-md-12">
+
+            <h2>Address</h2>
+
+            <table id="address" class="table table-striped table-responsive">
+                <thead>
+                    <tr>
+                      <td>Local name</td>
+                      <td>Type</td>
+                      <td>OSM</td>
+                      <td>Address rank</td>
+                      <td>Admin level</td>
+                      <td>Distance</td>
+                      <td></td>
+                    </tr>
+                </thead>
+                <tbody>
+
+                <?php
+                    foreach ($aAddressLines as $aAddressLine) {
+                        _one_row($aAddressLine);
+                    }
+                ?>
+
+
+<?php
+
+    if ($aLinkedLines)
+    {
+        headline('Linked Places');
+        foreach ($aLinkedLines as $aAddressLine) {
+            _one_row($aAddressLine, true);
+        }
+    }
+
+    if ($bIncludeKeywords)
+    {
+        headline('Name Keywords');
+        if ($aPlaceSearchNameKeywords) {
+            foreach ($aPlaceSearchNameKeywords as $aRow) {
+                _one_keyword_row($aRow['word_token'], $aRow['word_id']);
+            }
+        }
+
+        headline('Address Keywords');
+        if ($aPlaceSearchAddressKeywords) {
+            foreach ($aPlaceSearchAddressKeywords as $aRow) {
+                _one_keyword_row($aRow['word_token'], $aRow['word_id']);
+            }
+        }
+    }
+
+    if (!empty($aHierarchyLines))
+    {
+        headline('Parent Of');
+
+        $aGroupedAddressLines = array();
+        foreach ($aHierarchyLines as $aAddressLine) {
+            if ($aAddressLine['type'] == 'yes') $sType = $aAddressLine['class'];
+            else $sType = $aAddressLine['type'];
+
+            if (!isset($aGroupedAddressLines[$sType]))
+                $aGroupedAddressLines[$sType] = array();
+            $aGroupedAddressLines[$sType][] = $aAddressLine;
+        }
+        foreach ($aGroupedAddressLines as $sGroupHeading => $aHierarchyLines) {
+            $sGroupHeading = ucwords($sGroupHeading);
+            headline3($sGroupHeading);
+
+            foreach ($aHierarchyLines as $aAddressLine) {
+                _one_row($aAddressLine, true);
+            }
+        }
+        if (count($aHierarchyLines) >= 500) {
+            echo '<p>There are more child objects which are not shown.</p>';
+        }
+    }
+
+    echo "</table>\n";
+?>
+
+            </div>
+        </div>
+    </div>
+
+    <script type="text/javascript">
+    <?php
+
+        $aNominatimMapInit = array(
+          'tile_url' => $sTileURL,
+          'tile_attribution' => $sTileAttribution
+        );
+        echo 'var nominatim_map_init = ' . json_encode($aNominatimMapInit, JSON_PRETTY_PRINT) . ';';
+
+        $aPlace = array(
+                'asgeojson' => $aPointDetails['asgeojson'],
+                'lon' => $aPointDetails['lon'],
+                'lat' => $aPointDetails['lat'],
+        );
+        echo 'var nominatim_result = ' . json_encode($aPlace, JSON_PRETTY_PRINT) . ';';
+
+
+    ?>
+    </script>
+
+
+
+    <?php include(CONST_BasePath.'/lib/template/includes/html-footer.php'); ?>
+</body>
+</html>

lib/template/details-index-html.php

@@ -0,0 +1,55 @@
+<?php
+    header("content-type: text/html; charset=UTF-8");
+?>
+<?php include(CONST_BasePath.'/lib/template/includes/html-header.php'); ?>
+    <link href="css/common.css" rel="stylesheet" type="text/css" />
+    <link href="css/details.css" rel="stylesheet" type="text/css" />
+</head>
+
+
+<body id="details-index-page">
+    <div class="container">
+        <div class="row">
+            <div class="col-md-12">
+
+                <h1>Show details for place</h1>
+
+                <div class="search-form">
+                    <h4>Search by place id</h4>
+
+                    <form class="form-inline" action="details.php">
+                        <input type="edit" class="form-control input-sm" pattern="^[0-9]+$" name="place_id" placeholder="12345" />
+                        <input type="submit" class="btn btn-primary btn-sm" value="Show" />
+                    </form>
+                </div>
+
+                <div class="search-form">
+                    <h4>Search by OSM type and OSM id</h4>
+
+                    <form id="form-by-type-and-id" class="form-inline" action="details.php">
+                        <input type="edit" class="form-control input-sm" pattern="^[NWR][0-9]+$" placeholder="N123 or W123 or R123" />
+                        <input type="hidden" name="osmtype" />
+                        <input type="hidden" name="osmid" />
+                        <input type="submit" class="btn btn-primary btn-sm" value="Show" />
+                    </form>
+                </div>
+
+                <div class="search-form">
+                    <h4>Search by openstreetmap.org URL</h4>
+
+                    <form id="form-by-osm-url" class="form-inline" action="details.php">
+                        <input type="edit" class="form-control input-sm" pattern=".*openstreetmap.*" placeholder="https://www.openstreetmap.org/relation/123" />
+                        <input type="hidden" name="osmtype" />
+                        <input type="hidden" name="osmid" />
+                        <input type="submit" class="btn btn-primary btn-sm" value="Show" />
+                    </form>
+                </div>
+
+            </div>
+        </div>
+    </div>
+
+
+    <?php include(CONST_BasePath.'/lib/template/includes/html-footer.php'); ?>
+</body>
+</html>

lib/template/error-html.php

@@ -0,0 +1,60 @@
+<?php
+
+    $title = 'Internal Server Error';
+    if ( $exception->getCode() == 400 ) {
+        $title = 'Bad Request';
+    }
+?>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <style>
+        em { font-weight: bold; font-family: monospace; color: #e00404; background-color: #ffeaea; }
+    </style>
+</head>
+<body>
+    <h1><?php echo $title ?></h1>
+    
+    <?php if (get_class($exception) == 'Nominatim\DatabaseError') { ?>
+
+        <p>Nominatim has encountered an internal error while accessing the database.
+           This may happen because the database is broken or because of a bug in
+           the software.</p>
+
+    <?php } else { ?>
+
+        <p>Nominatim has encountered an error with your request.</p>
+
+    <?php } ?>
+
+
+    <h3>Details</h3>
+
+    <?php echo $exception->getMessage() ?>
+
+    <?php if (CONST_Debug) { ?>
+        <p>
+        Exception <em><?php echo get_class($exception) ?></em> thrown in <em><?php echo $exception->getFile() . '('. $exception->getLine() . ')' ?></em>.
+
+        <?php if (get_class($exception) == 'Nominatim\DatabaseError') { ?>
+
+            <h3>SQL Error</h3>
+            <em><?php echo $exception->getSqlError() ?></em>
+
+            <pre><?php echo $exception->getSqlDebugDump() ?></pre>
+
+        <?php } ?>
+
+        <h3>Stack trace</h3>
+        <pre><?php echo $exception->getTraceAsString() ?></pre>
+
+    <?php } ?>
+
+    <p>
+        If you feel this error is incorrect feel file an issue on
+        <a href="https://github.com/openstreetmap/Nominatim/issues">Github</a>.
+
+        Please include the error message above and the URL you used.
+    </p>
+</body>
+</html>

lib/template/includes/html-footer.php

@@ -0,0 +1,15 @@
+<footer>
+    <p class="disclaimer">
+        Addresses and postcodes are approximate
+    </p>
+    <p class="copyright">
+        &copy; <a href="https://osm.org/copyright">OpenStreetMap</a> contributors
+    </p>
+</footer>
+
+<script src="js/jquery.min.js"></script>
+<script src="js/bootstrap.min.js"></script>
+<script src="js/leaflet.min.js"></script>
+<script src="js/Control.Minimap.min.js"></script>
+<script src="js/url-search-params.js"></script>
+<script src="js/nominatim-ui.js"></script>

lib/template/includes/html-header.php

@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <title>OpenStreetMap Nominatim: Search</title>
+    <meta content="IE=edge" http-equiv="x-ua-compatible" />
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+
+    <base href="<?php echo CONST_Website_BaseURL;?>" />
+    <link href="css/leaflet.css" rel="stylesheet" />
+    <link href="css/Control.Minimap.min.css" rel="stylesheet" />
+    <link href="css/bootstrap-theme.min.css" rel="stylesheet" />
+    <link href="css/bootstrap.min.css" rel="stylesheet" />

lib/template/includes/html-top-navigation.php

@@ -0,0 +1,51 @@
+<header class="container-fluid">
+    <div class="row">
+        <div class="col-xs-4">
+            <div class="brand">
+                <a href="<?php echo CONST_Website_BaseURL;?>">
+                <img alt="logo" src="images/osm_logo.120px.png" width="30" height="30"/>
+                <h1>Nominatim</h1>
+                </a>
+            </div>
+        </div>
+        <div id="last-updated" class="col-xs-4 text-center">
+            <?php if (isset($sDataDate)){ ?>
+                Data last updated:
+                <br>
+                <?php echo $sDataDate; ?>
+            <?php } ?>
+        </div>
+        <div class="col-xs-4 text-right">
+            <div class="btn-group">
+                <button class="dropdown-toggle btn btn-sm btn-default" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
+                    About &amp; Help <span class="caret"></span>
+                </button>
+                <ul class="dropdown-menu dropdown-menu-right">
+                    <li><a href="https://nominatim.org/release-docs/develop/api/Overview/" target="_blank">API Reference</a></li>
+                    <li><a href="https://nominatim.org/release-docs/develop/api/Faq/" target="_blank">FAQ</a></li>
+                    <li><a href="https://help.openstreetmap.org/tags/nominatim/">OpenStreetMap Help</a></li>
+                    <li><a href="https://github.com/openstreetmap/Nominatim">Nominatim on Github</a></li>
+                    <li role="separator" class="divider"></li>
+                    <li><a href="#" class="" data-toggle="modal" data-target="#report-modal">Report problem with results</a></li>
+                </ul>
+            </div>
+        </div>
+    </div>
+</header>
+
+<div class="modal fade" id="report-modal">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                <h4 class="modal-title">Report a problem</h4>
+            </div>
+            <div class="modal-body">
+                <?php include(CONST_BasePath.'/lib/template/includes/report-errors.php'); ?>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-default" data-dismiss="modal">OK</button>
+            </div>
+        </div>
+    </div>
+</div>

lib/template/includes/introduction.php

@@ -0,0 +1,9 @@
+<h2>Welcome to Nominatim</h2>
+
+<p>Nominatim is a search engine for <a href="https://www.openstreetmap.org">OpenStreetMap</a>
+data. This is the debugging interface. You may search for a name or address (forward search) or
+look up data by its geographic coordinate (reverse search). Each result comes with a
+link to a details page where you can inspect what data about the object is saved in 
+the database and investigate how the address of the object has been computed.</p>
+
+For more information visit the <a href="https://nominatim.org">Nominatim home page</a>.

lib/template/includes/report-errors.php

@@ -0,0 +1,42 @@
+<p>
+    Before reporting problems please read the <a target="_blank" href="https://nominatim.org/release-docs/develop/api/Overview">user documentation</a>.
+
+    <h4>Finding the expected result</h4>
+
+    First of all, please make sure that the result that you expect is
+    available in the OpenStreetMap data.
+
+    To find the OpenStreetMap data, do the following:
+
+    <ul>
+     <li>Go to <a href="https://openstreetmap.org">https://openstreetmap.org</a>.</li>
+     <li>Go to the area of the map where you expect the result
+         and zoom in until you see the object you are looking for.</li>
+     <li>Click on the question mark on the right side of the map,
+         then with the question cursor on the map where your object is located.</li>
+     <li>Find the object of interest in the list that appears on the left side.</li>
+     <li>Click on the object and note down the URL that the browser shows.</li>
+    </ul>
+
+    If you cannot find the data you are looking for, there is a good chance
+    that it has not been entered yet. You should <a href="https://www.openstreetmap.org/fixthemap">report or fix the problem in OpenStreetMap</a> directly.
+
+    <h4>Reporting bad searches</h4>
+
+    Problems may be reported at the <a target="_blank" href="https://github.com/openstreetmap/nominatim/issues">issue tracker on github</a>. Please read through
+    the open tickets first and check if your problem has not already been
+    reported.
+
+    When reporting a problem, include the following:
+
+    <ul>
+      <li>A full description of the problem, including the exact term you
+          were searching for.</li>
+      <li>The result you get.</li>
+      <li>The OpenStreetMap object you expect to find (see above).</li>
+    </ul>
+
+    For general questions about installing and searching in Nominatim, please
+    use <a href="https://help.openstreetmap.org/tags/nominatim/">Help OpenStreetMap</a>.
+
+</p>

lib/template/polygons-html.php

@@ -0,0 +1,71 @@
+<?php
+    header("content-type: text/html; charset=UTF-8");
+    include(CONST_BasePath.'/lib/template/includes/html-header.php');
+?>
+    <title>Nominatim Broken Polygon Data</title>    
+    <meta name="description" content="List of broken OSM polygon data by date" lang="en-US" />
+</head>
+
+<body>
+
+<div class="container">
+    <h1>Broken polygons</h1>
+
+    <p>
+        Total number of broken polygons: <?php echo $iTotalBroken ?>.
+        Also available in <a href="<?php echo CONST_Website_BaseURL; ?>polygons.php?format=json">JSON format</a>.
+    </p>
+
+    <table class="table table-striped table-hover">
+
+<?php
+if (!empty($aPolygons)) {
+
+    echo '<tr>';
+    //var_dump($aPolygons[0]);
+    foreach (array_keys($aPolygons[0]) as $sCol) {
+        echo '<th>'.$sCol.'</th>';
+    }
+    echo '<th>&nbsp;</th>';
+    echo '</tr>';
+    $aSeen = array();
+    foreach ($aPolygons as $aRow) {
+        if (isset($aSeen[$aRow['osm_type'].$aRow['osm_id']])) continue;
+        $aSeen[$aRow['osm_type'].$aRow['osm_id']] = 1;
+
+        echo '<tr>';
+        $sOSMType = formatOSMType($aRow['osm_type']);
+        foreach ($aRow as $sCol => $sVal) {
+            switch ($sCol) {
+                case 'errormessage':
+                    if (preg_match('/Self-intersection\\[([0-9.\\-]+) ([0-9.\\-]+)\\]/', $sVal, $aMatch)) {
+                        $aRow['lat'] = $aMatch[2];
+                        $aRow['lon'] = $aMatch[1];
+                        $sUrl = sprintf('https://www.openstreetmap.org/?lat=%f&lon=%f&zoom=18&layers=M&%s=%d',
+                                $aRow['lat'],
+                                $aRow['lon'],
+                                $sOSMType,
+                                $aRow['osm_id']);
+                        echo '<td><a href="'.$sUrl.'">'.($sVal?$sVal:'&nbsp;').'</a></td>';
+                    } else {
+                        echo '<td>'.($sVal?$sVal:'&nbsp;').'</td>';
+                    }
+                    break;
+                case 'osm_id':
+                    echo '<td>'.osmLink(array('osm_type' => $aRow['osm_type'], 'osm_id' => $aRow['osm_id'])).'</td>';
+                    break;
+                default:
+                    echo '<td>'.($sVal?$sVal:'&nbsp;').'</td>';
+                    break;
+            }
+        }
+        $sJosmUrl = 'http://localhost:8111/import?url=https://www.openstreetmap.org/api/0.6/'.$sOSMType.'/'.$aRow['osm_id'].'/full';
+        echo '<td><a href="'.$sJosmUrl.'" target="josm">josm</a></td>';
+        echo '</tr>';
+    }
+    echo '</table>';
+}
+?>
+</div>
+</body>
+</html>

lib/template/search-html.php

@@ -0,0 +1,139 @@
+<?php
+    header("content-type: text/html; charset=UTF-8");
+?>
+<?php include(CONST_BasePath.'/lib/template/includes/html-header.php'); ?>
+    <link href="css/common.css" rel="stylesheet" type="text/css" />
+    <link href="css/search.css" rel="stylesheet" type="text/css" />
+</head>
+
+<body id="search-page">
+
+    <?php include(CONST_BasePath.'/lib/template/includes/html-top-navigation.php'); ?>
+
+        <div class="top-bar" id="structured-query-selector">
+            <div class="search-type-link">
+                <a id="switch-to-reverse" href="<?php echo CONST_Website_BaseURL; ?>reverse.php?format=html">reverse search</a>
+            </div>
+
+        <div class="radio-inline">
+          <input type="radio" name="query-selector" id="simple" value="simple">
+          <label for="simple">simple</label>
+        </div>
+        <div class="radio-inline">
+          <input type="radio" name="query-selector" id="structured" value="structured">
+          <label for="structured">structured</label>
+        </div>
+
+    <form role="search" accept-charset="UTF-8" action="<?php echo CONST_Website_BaseURL; ?>search.php">
+        <div class="form-group-simple">
+            <input id="q" name="q" type="text" class="form-control input-sm" placeholder="Search" value="<?php echo htmlspecialchars($aMoreParams['q'] ?? ''); ?>" >
+        </div>
+        <div class="form-group-structured">
+<div class="form-inline">
+            <input id="street" name="street" type="text" class="form-control input-sm" placeholder="House number/Street" value="<?php echo htmlspecialchars($aMoreParams['street'] ?? ''); ?>" >
+            <input id="city" name="city" type="text" class="form-control input-sm" placeholder="City" value="<?php echo htmlspecialchars($aMoreParams['city'] ?? ''); ?>" >
+            <input id="county" name="county" type="text" class="form-control input-sm" placeholder="County" value="<?php echo htmlspecialchars($aMoreParams['county'] ?? ''); ?>" >
+            <input id="state" name="state" type="text" class="form-control input-sm" placeholder="State" value="<?php echo htmlspecialchars($aMoreParams['state'] ?? ''); ?>" >
+            <input id="country" name="country" type="text" class="form-control input-sm" placeholder="Country" value="<?php echo htmlspecialchars($aMoreParams['country'] ?? ''); ?>" >
+            <input id="postalcode" name="postalcode" type="text" class="form-control input-sm" placeholder="Postal Code" value="<?php echo htmlspecialchars($aMoreParams['postalcode'] ?? ''); ?>" >
+        </div></div>
+        <div class="form-group search-button-group">
+            <button type="submit" class="btn btn-primary btn-sm">Search</button>
+            <?php if (CONST_Search_AreaPolygons) { ?>
+                <input type="hidden" value="1" name="polygon_geojson" />
+            <?php } ?>
+            <input type="hidden" name="viewbox" value="<?php echo htmlspecialchars($aMoreParams['viewbox'] ?? ''); ?>" />
+            <div class="checkbox-inline">
+                <input type="checkbox" id="use_viewbox" <?php if (!empty($aMoreParams['viewbox'])) echo "checked='checked'"; ?>>
+                <label for="use_viewbox">apply viewbox</label>
+            </div>
+        </div>
+    </form>
+</div>
+
+    <div id="content">
+
+<?php if ($sQuery) { ?>
+
+        <div id="searchresults" class="sidebar">
+        <?php
+            $i = 0;
+            foreach($aSearchResults as $iResNum => $aResult)
+            {
+
+                echo '<div class="result" data-position=' . $i . '>';
+
+                echo (isset($aResult['icon'])?'<img alt="icon" src="'.$aResult['icon'].'"/>':'');
+                echo ' <span class="name">'.htmlspecialchars($aResult['name']).'</span>';
+                // echo ' <span class="latlon">'.round($aResult['lat'],3).','.round($aResult['lon'],3).'</span>';
+                // echo ' <span class="place_id">'.$aResult['place_id'].'</span>';
+                if (isset($aResult['label']))
+                    echo ' <span class="type">('.$aResult['label'].')</span>';
+                else if ($aResult['type'] == 'yes')
+                    echo ' <span class="type">('.ucwords(str_replace('_',' ',$aResult['class'])).')</span>';
+                else
+                    echo ' <span class="type">('.ucwords(str_replace('_',' ',$aResult['type'])).')</span>';
+                echo detailsPermaLink($aResult, 'details', 'class="btn btn-default btn-xs details"');
+                echo '</div>';
+                $i = $i+1;
+            }
+            if (!empty($aSearchResults) && $sMoreURL)
+            {
+                echo '<div class="more"><a class="btn btn-primary" href="'.htmlentities($sMoreURL).'">Search for more results</a></div>';
+            }
+            else
+            {
+                echo '<div class="noresults">No search results found</div>';
+            }
+
+        ?>
+        </div>
+
+<?php } else { ?>
+
+        <div id="intro" class="sidebar">
+            <?php include(CONST_BasePath.'/lib/template/includes/introduction.php'); ?>
+        </div>
+
+<?php } ?>
+
+        <div id="map-wrapper">
+            <div id="map-position">
+                <div id="map-position-inner"></div>
+                <div id="map-position-close"><a href="#">hide</a></div>
+            </div>
+            <div id="map"></div>
+        </div>
+
+    </div> <!-- /content -->
+
+
+
+    <script type="text/javascript">
+    <?php
+
+        $aNominatimMapInit = array(
+            'zoom' => CONST_Default_Zoom,
+            'lat' => CONST_Default_Lat,
+            'lon' => CONST_Default_Lon,
+            'tile_url' => CONST_Map_Tile_URL,
+            'tile_attribution' => CONST_Map_Tile_Attribution
+        );
+        echo 'var nominatim_map_init = ' . json_encode($aNominatimMapInit, JSON_PRETTY_PRINT) . ';';
+
+        echo 'var nominatim_results = ' . json_encode($aSearchResults, JSON_PRETTY_PRINT) . ';';
+        $sStructuredQuery = (empty($aMoreParams['q'])
+                             && !(empty($aMoreParams['street'])
+                                  && empty($aMoreParams['city'])
+                                  && empty($aMoreParams['county'])
+                                  && empty($aMoreParams['state'])
+                                  && empty($aMoreParams['country'])
+                                  && empty($aMoreParams['postalcode'])))
+                            ? 'true' : 'false';
+        echo 'var nominatim_structured_query = '.$sStructuredQuery.';';
+    ?>
+    </script>
+    <?php include(CONST_BasePath.'/lib/template/includes/html-footer.php'); ?>
+
+</body>
+</html>

lib/template/search-xml.php

@@ -25,7 +25,6 @@ foreach ($aSearchResults as $iResNum => $aResult) {
         echo " osm_id='".$aResult['osm_id']."'";
     }
     echo " place_rank='".$aResult['rank_search']."'";
-    echo " address_rank='".$aResult['rank_address']."'";
 
     if (isset($aResult['aBoundingBox'])) {
         echo ' boundingbox="';

module/CMakeLists.txt

@@ -1,14 +1,5 @@
 # just use the pgxs makefile
-
-foreach(suffix ${PostgreSQL_ADDITIONAL_VERSIONS} "13" "12" "11" "10" "9.6" "9.5" "9.4" "9.3")
-    list(APPEND PG_CONFIG_HINTS
-         "/usr/pgsql-${suffix}/bin")
-endforeach()
-
-find_program(PG_CONFIG pg_config HINTS ${PG_CONFIG_HINTS})
-
-
-
+find_program(PG_CONFIG pg_config)
 execute_process(COMMAND ${PG_CONFIG} --pgxs
             OUTPUT_VARIABLE PGXS
             OUTPUT_STRIP_TRAILING_WHITESPACE)

nominatim/indexer/db.py

@@ -1,112 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-only
-#
-# This file is part of Nominatim.
-# Copyright (C) 2020 Sarah Hoffmann
-
-import logging
-import psycopg2
-from psycopg2.extras import wait_select
-
-log = logging.getLogger()
-
-def make_connection(options, asynchronous=False):
-    params = {'dbname' : options.dbname,
-              'user' : options.user,
-              'password' : options.password,
-              'host' : options.host,
-              'port' : options.port,
-              'async' : asynchronous}
-
-    return psycopg2.connect(**params)
-
-class DBConnection(object):
-    """ A single non-blocking database connection.
-    """
-
-    def __init__(self, options):
-        self.current_query = None
-        self.current_params = None
-        self.options = options
-
-        self.conn = None
-        self.connect()
-
-    def connect(self):
-        """ (Re)connect to the database. Creates an asynchronous connection
-            with JIT and parallel processing disabled. If a connection was
-            already open, it is closed and a new connection established.
-            The caller must ensure that no query is pending before reconnecting.
-        """
-        if self.conn is not None:
-            self.cursor.close()
-            self.conn.close()
-
-        self.conn = make_connection(self.options, asynchronous=True)
-        self.wait()
-
-        self.cursor = self.conn.cursor()
-        # Disable JIT and parallel workers as they are known to cause problems.
-        # Update pg_settings instead of using SET because it does not yield
-        # errors on older versions of Postgres where the settings are not
-        # implemented.
-        self.perform(
-            """ UPDATE pg_settings SET setting = -1 WHERE name = 'jit_above_cost';
-                UPDATE pg_settings SET setting = 0 
-                   WHERE name = 'max_parallel_workers_per_gather';""")
-        self.wait()
-
-    def wait(self):
-        """ Block until any pending operation is done.
-        """
-        while True:
-            try:
-                wait_select(self.conn)
-                self.current_query = None
-                return
-            except psycopg2.extensions.TransactionRollbackError as e:
-                if e.pgcode == '40P01':
-                    log.info("Deadlock detected (params = {}), retry."
-                              .format(self.current_params))
-                    self.cursor.execute(self.current_query, self.current_params)
-                else:
-                    raise
-            except psycopg2.errors.DeadlockDetected:
-                self.cursor.execute(self.current_query, self.current_params)
-
-    def perform(self, sql, args=None):
-        """ Send SQL query to the server. Returns immediately without
-            blocking.
-        """
-        self.current_query = sql
-        self.current_params = args
-        self.cursor.execute(sql, args)
-
-    def fileno(self):
-        """ File descriptor to wait for. (Makes this class select()able.)
-        """
-        return self.conn.fileno()
-
-    def is_done(self):
-        """ Check if the connection is available for a new query.
-
-            Also checks if the previous query has run into a deadlock.
-            If so, then the previous query is repeated.
-        """
-        if self.current_query is None:
-            return True
-
-        try:
-            if self.conn.poll() == psycopg2.extensions.POLL_OK:
-                self.current_query = None
-                return True
-        except psycopg2.extensions.TransactionRollbackError as e:
-            if e.pgcode == '40P01':
-                log.info("Deadlock detected (params = {}), retry.".format(self.current_params))
-                self.cursor.execute(self.current_query, self.current_params)
-            else:
-                raise
-        except psycopg2.errors.DeadlockDetected:
-            self.cursor.execute(self.current_query, self.current_params)
-
-        return False
-

nominatim/indexer/progress.py

@@ -1,64 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-only
-#
-# This file is part of Nominatim.
-# Copyright (C) 2020 Sarah Hoffmann
-"""
-Helpers for progress logging.
-"""
-import logging
-from datetime import datetime
-
-LOG = logging.getLogger()
-
-INITIAL_PROGRESS = 10
-
-class ProgressLogger:
-    """ Tracks and prints progress for the indexing process.
-        `name` is the name of the indexing step being tracked.
-        `total` sets up the total number of items that need processing.
-        `log_interval` denotes the interval in seconds at which progres
-        should be reported.
-    """
-
-    def __init__(self, name, total, log_interval=1):
-        self.name = name
-        self.total_places = total
-        self.done_places = 0
-        self.rank_start_time = datetime.now()
-        self.log_interval = log_interval
-        self.next_info = INITIAL_PROGRESS if LOG.isEnabledFor(logging.INFO) else total + 1
-
-    def add(self, num=1):
-        """ Mark `num` places as processed. Print a log message if the
-            logging is at least info and the log interval has passed.
-        """
-        self.done_places += num
-
-        if self.done_places < self.next_info:
-            return
-
-        now = datetime.now()
-        done_time = (now - self.rank_start_time).total_seconds()
-
-        if done_time < 2:
-            self.next_info = self.done_places + INITIAL_PROGRESS
-            return
-
-        places_per_sec = self.done_places / done_time
-        eta = (self.total_places - self.done_places) / places_per_sec
-
-        LOG.info("Done %d in %d @ %.3f per second - %s ETA (seconds): %.2f",
-                 self.done_places, int(done_time),
-                 places_per_sec, self.name, eta)
-
-        self.next_info += int(places_per_sec) * self.log_interval
-
-    def done(self):
-        """ Print final statistics about the progress.
-        """
-        rank_end_time = datetime.now()
-        diff_seconds = (rank_end_time-self.rank_start_time).total_seconds()
-
-        LOG.warning("Done %d/%d in %d @ %.3f per second - FINISHED %s\n",
-                    self.done_places, self.total_places, int(diff_seconds),
-                    self.done_places/diff_seconds, self.name)

nominatim/nominatim.py

@@ -28,13 +28,23 @@ import sys
 import re
 import getpass
 from datetime import datetime
+import psycopg2
+from psycopg2.extras import wait_select
 import select
 
-from indexer.progress import ProgressLogger
-from indexer.db import DBConnection, make_connection
-
 log = logging.getLogger()
 
+def make_connection(options, asynchronous=False):
+    params = {'dbname' : options.dbname,
+              'user' : options.user,
+              'password' : options.password,
+              'host' : options.host,
+              'port' : options.port,
+              'async' : asynchronous}
+
+    return psycopg2.connect(**params)
+
+
 class RankRunner(object):
     """ Returns SQL commands for indexing one rank within the placex table.
     """
@@ -45,19 +55,24 @@ class RankRunner(object):
     def name(self):
         return "rank {}".format(self.rank)
 
-    def sql_count_objects(self):
-        return """SELECT count(*) FROM placex
-                  WHERE rank_address = {} and indexed_status > 0
-               """.format(self.rank)
-
-    def sql_get_objects(self):
-        return """SELECT place_id FROM placex
-                  WHERE indexed_status > 0 and rank_address = {}
+    def sql_index_sectors(self):
+        return """SELECT geometry_sector, count(*) FROM placex
+                  WHERE rank_search = {} and indexed_status > 0
+                  GROUP BY geometry_sector
                   ORDER BY geometry_sector""".format(self.rank)
 
-    def sql_index_place(self, ids):
-        return "UPDATE placex SET indexed_status = 0 WHERE place_id IN ({})"\
-               .format(','.join((str(i) for i in ids)))
+    def sql_nosector_places(self):
+        return """SELECT place_id FROM placex
+                  WHERE indexed_status > 0 and rank_search = {}
+                  ORDER BY geometry_sector""".format(self.rank)
+
+    def sql_sector_places(self):
+        return """SELECT place_id FROM placex
+                  WHERE indexed_status > 0 and rank_search = {}
+                        and geometry_sector = %s""".format(self.rank)
+
+    def sql_index_place(self):
+        return "UPDATE placex SET indexed_status = 0 WHERE place_id = %s"
 
 
 class InterpolationRunner(object):
@@ -68,119 +83,210 @@ class InterpolationRunner(object):
     def name(self):
         return "interpolation lines (location_property_osmline)"
 
-    def sql_count_objects(self):
-        return """SELECT count(*) FROM location_property_osmline
-                  WHERE indexed_status > 0"""
+    def sql_index_sectors(self):
+        return """SELECT geometry_sector, count(*) FROM location_property_osmline
+                  WHERE indexed_status > 0
+                  GROUP BY geometry_sector
+                  ORDER BY geometry_sector"""
 
-    def sql_get_objects(self):
+    def sql_nosector_places(self):
         return """SELECT place_id FROM location_property_osmline
                   WHERE indexed_status > 0
                   ORDER BY geometry_sector"""
 
-    def sql_index_place(self, ids):
-        return """UPDATE location_property_osmline
-                  SET indexed_status = 0 WHERE place_id IN ({})"""\
-               .format(','.join((str(i) for i in ids)))
+    def sql_sector_places(self):
+        return """SELECT place_id FROM location_property_osmline
+                  WHERE indexed_status > 0 and geometry_sector = %s
+                  ORDER BY geometry_sector"""
 
-class BoundaryRunner(object):
-    """ Returns SQL commands for indexing the administrative boundaries
-        of a certain rank.
+    def sql_index_place(self):
+        return """UPDATE location_property_osmline
+                  SET indexed_status = 0 WHERE place_id = %s"""
+
+
+class DBConnection(object):
+    """ A single non-blocking database connection.
     """
 
-    def __init__(self, rank):
-        self.rank = rank
+    def __init__(self, options):
+        self.current_query = None
+        self.current_params = None
 
-    def name(self):
-        return "boundaries rank {}".format(self.rank)
+        self.conn = None
+        self.connect()
 
-    def sql_count_objects(self):
-        return """SELECT count(*) FROM placex
-                  WHERE indexed_status > 0
-                    AND rank_search = {}
-                    AND class = 'boundary' and type = 'administrative'""".format(self.rank)
+    def connect(self):
+        if self.conn is not None:
+            self.cursor.close()
+            self.conn.close()
 
-    def sql_get_objects(self):
-        return """SELECT place_id FROM placex
-                  WHERE indexed_status > 0 and rank_search = {}
-                        and class = 'boundary' and type = 'administrative'
-                  ORDER BY partition, admin_level""".format(self.rank)
+        self.conn = make_connection(options, asynchronous=True)
+        self.wait()
+
+        self.cursor = self.conn.cursor()
+        # Disable JIT and parallel workers as they are known to cause problems.
+        # Update pg_settings instead of using SET because it does not yield
+        # errors on older versions of Postgres where the settings are not
+        # implemented.
+        self.perform(
+            """ UPDATE pg_settings SET setting = -1 WHERE name = 'jit_above_cost';
+                UPDATE pg_settings SET setting = 0 
+                   WHERE name = 'max_parallel_workers_per_gather';""")
+        self.wait()
+
+    def wait(self):
+        """ Block until any pending operation is done.
+        """
+        while True:
+            try:
+                wait_select(self.conn)
+                self.current_query = None
+                return
+            except psycopg2.extensions.TransactionRollbackError as e:
+                if e.pgcode == '40P01':
+                    log.info("Deadlock detected (params = {}), retry."
+                              .format(self.current_params))
+                    self.cursor.execute(self.current_query, self.current_params)
+                else:
+                    raise
+            except psycopg2.errors.DeadlockDetected:
+                self.cursor.execute(self.current_query, self.current_params)
+
+    def perform(self, sql, args=None):
+        """ Send SQL query to the server. Returns immediately without
+            blocking.
+        """
+        self.current_query = sql
+        self.current_params = args
+        self.cursor.execute(sql, args)
+
+    def fileno(self):
+        """ File descriptor to wait for. (Makes this class select()able.)
+        """
+        return self.conn.fileno()
+
+    def is_done(self):
+        """ Check if the connection is available for a new query.
+
+            Also checks if the previous query has run into a deadlock.
+            If so, then the previous query is repeated.
+        """
+        if self.current_query is None:
+            return True
+
+        try:
+            if self.conn.poll() == psycopg2.extensions.POLL_OK:
+                self.current_query = None
+                return True
+        except psycopg2.extensions.TransactionRollbackError as e:
+            if e.pgcode == '40P01':
+                log.info("Deadlock detected (params = {}), retry.".format(self.current_params))
+                self.cursor.execute(self.current_query, self.current_params)
+            else:
+                raise
+        except psycopg2.errors.DeadlockDetected:
+            self.cursor.execute(self.current_query, self.current_params)
+
+        return False
 
-    def sql_index_place(self, ids):
-        return "UPDATE placex SET indexed_status = 0 WHERE place_id IN ({})"\
-               .format(','.join((str(i) for i in ids)))
 
 class Indexer(object):
     """ Main indexing routine.
     """
 
     def __init__(self, options):
-        self.minrank = max(1, options.minrank)
+        self.minrank = max(0, options.minrank)
         self.maxrank = min(30, options.maxrank)
         self.conn = make_connection(options)
         self.threads = [DBConnection(options) for i in range(options.threads)]
 
-    def index_boundaries(self):
-        log.warning("Starting indexing boundaries using {} threads".format(
-                      len(self.threads)))
-
-        for rank in range(max(self.minrank, 5), min(self.maxrank, 26)):
-            self.index(BoundaryRunner(rank))
-
-    def index_by_rank(self):
-        """ Run classic indexing by rank.
+    def run(self):
+        """ Run indexing over the entire database.
         """
         log.warning("Starting indexing rank ({} to {}) using {} threads".format(
                  self.minrank, self.maxrank, len(self.threads)))
 
-        for rank in range(max(1, self.minrank), self.maxrank):
+        for rank in range(self.minrank, self.maxrank):
             self.index(RankRunner(rank))
 
         if self.maxrank == 30:
-            self.index(RankRunner(0))
-            self.index(InterpolationRunner(), 20)
-            self.index(RankRunner(self.maxrank), 20)
-        else:
-            self.index(RankRunner(self.maxrank))
+            self.index(InterpolationRunner())
 
-    def index(self, obj, batch=1):
+        self.index(RankRunner(self.maxrank))
+
+    def index(self, obj):
         """ Index a single rank or table. `obj` describes the SQL to use
-            for indexing. `batch` describes the number of objects that
-            should be processed with a single SQL statement
+            for indexing.
         """
-        log.warning("Starting %s (using batch size %s)", obj.name(), batch)
+        log.warning("Starting {}".format(obj.name()))
 
-        cur = self.conn.cursor()
-        cur.execute(obj.sql_count_objects())
+        cur = self.conn.cursor(name='main')
+        cur.execute(obj.sql_index_sectors())
 
-        total_tuples = cur.fetchone()[0]
-        log.debug("Total number of rows: {}".format(total_tuples))
+        total_tuples = 0
+        for r in cur:
+            total_tuples += r[1]
+        log.debug("Total number of rows; {}".format(total_tuples))
+
+        cur.scroll(0, mode='absolute')
+
+        next_thread = self.find_free_thread()
+        done_tuples = 0
+        rank_start_time = datetime.now()
+
+        sector_sql = obj.sql_sector_places()
+        index_sql = obj.sql_index_place()
+        min_grouped_tuples = total_tuples - len(self.threads) * 1000
+
+        next_info = 100 if log.isEnabledFor(logging.INFO) else total_tuples + 1
+
+        for r in cur:
+            sector = r[0]
+
+            # Should we do the remaining ones together?
+            do_all = done_tuples > min_grouped_tuples
+
+            pcur = self.conn.cursor(name='places')
+
+            if do_all:
+                pcur.execute(obj.sql_nosector_places())
+            else:
+                pcur.execute(sector_sql, (sector, ))
+
+            for place in pcur:
+                place_id = place[0]
+                log.debug("Processing place {}".format(place_id))
+                thread = next(next_thread)
+
+                thread.perform(index_sql, (place_id,))
+                done_tuples += 1
+
+                if done_tuples >= next_info:
+                    now = datetime.now()
+                    done_time = (now - rank_start_time).total_seconds()
+                    tuples_per_sec = done_tuples / done_time
+                    log.info("Done {} in {} @ {:.3f} per second - {} ETA (seconds): {:.2f}"
+                           .format(done_tuples, int(done_time),
+                                   tuples_per_sec, obj.name(),
+                                   (total_tuples - done_tuples)/tuples_per_sec))
+                    next_info += int(tuples_per_sec)
+
+            pcur.close()
+
+            if do_all:
+                break
 
         cur.close()
 
-        progress = ProgressLogger(obj.name(), total_tuples)
+        for t in self.threads:
+            t.wait()
 
-        if total_tuples > 0:
-            cur = self.conn.cursor(name='places')
-            cur.execute(obj.sql_get_objects())
+        rank_end_time = datetime.now()
+        diff_seconds = (rank_end_time-rank_start_time).total_seconds()
 
-            next_thread = self.find_free_thread()
-            while True:
-                places = [p[0] for p in cur.fetchmany(batch)]
-                if len(places) == 0:
-                    break
-
-                log.debug("Processing places: {}".format(places))
-                thread = next(next_thread)
-
-                thread.perform(obj.sql_index_place(places))
-                progress.add(len(places))
-
-            cur.close()
-
-            for t in self.threads:
-                t.wait()
-
-        progress.done()
+        log.warning("Done {}/{} in {} @ {:.3f} per second - FINISHED {}\n".format(
+                 done_tuples, total_tuples, int(diff_seconds),
+                 done_tuples/diff_seconds, obj.name()))
 
     def find_free_thread(self):
         """ Generator that returns the next connection that is free for
@@ -234,9 +340,6 @@ def nominatim_arg_parser():
     p.add_argument('-P', '--port',
                    dest='port', action='store',
                    help='PostgreSQL server port')
-    p.add_argument('-b', '--boundary-only',
-                   dest='boundary_only', action='store_true',
-                   help='Only index administrative boundaries (ignores min/maxrank).')
     p.add_argument('-r', '--minrank',
                    dest='minrank', type=int, metavar='RANK', default=0,
                    help='Minimum/starting rank.')
@@ -264,7 +367,4 @@ if __name__ == '__main__':
         password = getpass.getpass("Database password: ")
         options.password = password
 
-    if options.boundary_only:
-        Indexer(options).index_boundaries()
-    else:
-        Indexer(options).index_by_rank()
+    Indexer(options).run()

settings/address-levels.json

@@ -2,36 +2,33 @@
 { "tags" : {
       "place" : {
           "sea" : [2, 0],
-          "island" : [17, 0],
-          "islet" : [20, 0],
           "continent" : [2, 0],
           "country" : [4, 0],
           "state" : [8, 0],
           "province" : [8, 0],
           "region" : [18, 0],
           "county" : 12,
-          "district" : 12,
-          "municipality" : 14,
+          "municipality" : [17, 14],
           "city" : 16,
+          "island" : [17, 0],
           "town" : [18, 16],
-          "borough" : 18,
           "village" : [19, 16],
-          "suburb" : [19, 20],
+          "district" : [19, 16],
+          "borough" : [19, 18],
           "hamlet" : 20,
+          "suburb" : 20,
           "croft" : 20,
-          "subdivision" : 22,
-          "allotments" : 22,
-          "neighbourhood" : [20, 22],
-          "quarter" : [20, 22],
-          "isolated_dwelling" : [22, 20],
-          "farm" : [22, 20],
-          "city_block" : 25,
-          "mountain_pass" : 25,
-          "square" : 25,
-          "locality" : 25,
-          "houses" : [28, 0],
-          "house" : 30,
-          "" : [22, 0]
+          "subdivision" : 20,
+          "isolated_dwelling" : 20,
+          "allotments" : 20,
+          "farm" : [20, 0],
+          "locality" : [20, 0],
+          "islet" : [20, 0],
+          "mountain_pass" : [20, 0],
+          "neighbourhood" : 22,
+          "quarter" : 22,
+          "city_block" : 22,
+          "houses" : [28, 0]
       },
       "boundary" : {
           "administrative2" : 4,
@@ -44,8 +41,7 @@
           "administrative9" : 18,
           "administrative10" : 20,
           "administrative11" : 22,
-          "administrative12" : 24,
-          "" : [25, 0]
+          "administrative12" : 24
       },
       "landuse" : {
           "residential" : 22,
@@ -64,15 +60,7 @@
           "peak" : [18, 0],
           "volcano" : [18, 0],
           "mountain_range" : [18, 0],
-          "sea" : [4, 0],
-          "tree" : 30,
-          "spring"  : 30,
-          "cave_entrance" : 30,
-          "geyser" : 30,
-          "hot_spring" : 30,
-          "rock" : 30,
-          "stone" : 30,
-          "" : [22, 0]
+          "sea" : [4, 0]
       },
       "waterway" : {
           "river" : [19, 0],
@@ -99,7 +87,7 @@
           "" : [20, 0]
       },
       "historic" : {
-          "neighbourhood" : [22, 0]
+          "neighbourhood" : [30, 0]
       }
   }
 },
@@ -117,14 +105,7 @@
 { "countries" : [ "be" ],
   "tags" : {
       "boundary" : {
-          "administrative3" : [5, 0],
-          "administrative4" : 6,
-          "administrative5" : [7, 0],
-          "administrative6" : 8,
-          "administrative7" : 12,
-          "administrative8" : 14,
-          "administrative9" : 16,
-          "administrative10" : 18
+          "administrative7" : [14, 0]
       }
   }
 },
@@ -137,43 +118,6 @@
           "administrative4" : 12
       }
   }
-},
-{ "countries" : ["id"],
-  "tags" : {
-      "place" : {
-          "municipality" : 18
-      },
-      "boundary" : {
-          "administrative5" : 12,
-          "administrative6" : 14,
-          "administrative7" : 16,
-          "administrative8" : 20,
-          "administrative9" : 22,
-          "administrative10" : 24
-      }
-  }
-},
-{ "countries" : ["ru"],
-  "tags" : {
-      "place" : {
-          "municipality" : 18
-      },
-      "boundary" : {
-          "administrative5" : [10, 0],
-          "administrative7" : [13, 0],
-          "administrative8" : 14
-      }
-  }
-},
-{ "countries" : [ "nl" ],
-  "tags" : {
-      "boundary" : {
-          "administrative7" : [13, 0],
-          "administrative8" : 14,
-          "administrative9" : [15, 0],
-          "administrative10" : 16
-      }
-  }
 }
 ]
 

settings/defaults.php

@@ -3,8 +3,10 @@
 @define('CONST_InstallPath', '@CMAKE_BINARY_DIR@');
 if (file_exists(getenv('NOMINATIM_SETTINGS'))) require_once(getenv('NOMINATIM_SETTINGS'));
 if (file_exists(CONST_InstallPath.'/settings/local.php')) require_once(CONST_InstallPath.'/settings/local.php');
+if (isset($_GET['debug']) && $_GET['debug']) @define('CONST_Debug', true);
 
 // General settings
+@define('CONST_Debug', false);
 @define('CONST_Database_DSN', 'pgsql:dbname=nominatim'); // or add ;host=...;port=...;user=...;password=...
 @define('CONST_Database_Web_User', 'www-data');
 @define('CONST_Database_Module_Path', CONST_InstallPath.'/module');
@@ -82,16 +84,20 @@ if (file_exists(CONST_InstallPath.'/settings/local.php')) require_once(CONST_Ins
 // How long to sleep when no update could be found
 @define('CONST_Replication_Recheck_Interval', '60');
 
-// If true, send CORS headers to allow access
+// Website settings
 @define('CONST_NoAccessControl', true);
 
-// Set this to the /mapicon directory of your nominatim-ui to enable returning
-// icon URLs with the results.
-@define('CONST_MapIcon_URL', false);
+@define('CONST_Website_BaseURL', 'http://'.php_uname('n').'/');
 // Language to assume when none is supplied with the query.
 // When set to false, the local language (i.e. the name tag without suffix)
 // will be used.
 @define('CONST_Default_Language', false);
+// Appearance of the map in the debug interface.
+@define('CONST_Default_Lat', 20.0);
+@define('CONST_Default_Lon', 0.0);
+@define('CONST_Default_Zoom', 2);
+@define('CONST_Map_Tile_URL', 'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png');
+@define('CONST_Map_Tile_Attribution', ''); // Set if tile source isn't osm.org
 
 @define('CONST_Search_AreaPolygons', true);
 
@@ -99,7 +105,7 @@ if (file_exists(CONST_InstallPath.'/settings/local.php')) require_once(CONST_Ins
 
 @define('CONST_Search_NameOnlySearchFrequencyThreshold', 500);
 // If set to true, then reverse order of queries will be tried by default.
-// When set to false only selected languages allow reverse search.
+// When set to false only selected languages alloow reverse search.
 @define('CONST_Search_ReversePlanForAll', true);
 
 // Maximum number of OSM ids that may be queried at once

settings/import-address.style

@@ -5,14 +5,8 @@
         "no" : "skip"
     }
 },
-{   "keys" : ["wikipedia", "wikipedia:*", "wikidata", "area"],
-    "values" : {
-        "" : "extra"
-    }
-},
 {
-    "keys" : ["name:prefix", "name:suffix", "name:prefix:*", "name:suffix:*",
-              "name:botanical", "*wikidata"],
+    "keys" : ["name:prefix", "name:suffix", "name:botanical", "*wikidata"],
     "values" : {
         "" : "skip"
     }
@@ -44,8 +38,7 @@
 {
     "keys" : ["boundary"],
     "values" : {
-        "administrative" : "main",
-        "postal_code" : "main"
+        "administrative" : "main"
     }
 },
 {

settings/import-admin.style

@@ -1,12 +1,6 @@
 [
-{   "keys" : ["wikipedia", "wikipedia:*", "wikidata"],
-    "values" : {
-        "" : "extra"
-    }
-},
 {
-    "keys" : ["name:prefix", "name:suffix", "name:prefix:*", "name:suffix:*",
-              "name:botanical", "*wikidata"],
+    "keys" : ["name:prefix", "name:suffix", "name:botanical", "*wikidata"],
     "values" : {
         "" : "skip"
     }

settings/import-extratags.style

@@ -6,8 +6,8 @@
     }
 },
 {
-    "keys" : ["name:prefix", "name:suffix", "name:prefix:*", "name:suffix:*",
-              "name:botanical", "wikidata", "*:wikidata"],
+    "keys" : ["name:prefix", "name:suffix", "name:botanical", "wikidata",
+              "*:wikidata"],
     "values" : {
         "" : "extra"
     }
@@ -76,9 +76,6 @@
         "mini_roundabout" : "skip",
         "noexit" : "skip",
         "crossing" : "skip",
-        "give_way" : "skip",
-        "stop" : "skip",
-        "street_lamp" : "main,with_name",
         "traffic_signals" : "main,with_name",
         "service" : "main,with_name",
         "cycleway" : "main,with_name",
@@ -124,8 +121,6 @@
 {
     "keys" : ["boundary"],
     "values" : {
-        "place" : "skip",
-        "postal_code" : "main",
         "" : "main,with_name"
     }
 },
@@ -211,7 +206,7 @@
     }
 },
 {
-    "keys" : ["addr:*", "is_in:*", "tiger:county"],
+    "keys" : ["addr:*", "is_in:*", "tiger:county", "is_in"],
     "values" : {
         "" : "address"
     }

settings/import-full.style

@@ -6,8 +6,8 @@
     }
 },
 {
-    "keys" : ["name:prefix", "name:suffix", "name:prefix:*", "name:suffix:*",
-              "name:botanical", "wikidata", "*:wikidata"],
+    "keys" : ["name:prefix", "name:suffix", "name:botanical", "wikidata",
+              "*:wikidata"],
     "values" : {
         "" : "extra"
     }
@@ -76,9 +76,6 @@
         "mini_roundabout" : "skip",
         "noexit" : "skip",
         "crossing" : "skip",
-        "give_way" : "skip",
-        "stop" : "skip",
-        "street_lamp" : "main,with_name",
         "traffic_signals" : "main,with_name",
         "service" : "main,with_name",
         "cycleway" : "main,with_name",
@@ -124,8 +121,6 @@
 {
     "keys" : ["boundary"],
     "values" : {
-        "place" : "skip",
-        "postal_code" : "main",
         "" : "main,with_name"
     }
 },
@@ -211,7 +206,7 @@
     }
 },
 {
-    "keys" : ["addr:*", "is_in:*", "tiger:county"],
+    "keys" : ["addr:*", "is_in:*", "tiger:county", "is_in"],
     "values" : {
         "" : "address"
     }
@@ -237,8 +232,7 @@
               "population", "description", "image", "attribution", "fax",
               "email", "url", "website", "phone", "real_ale", "smoking",
               "food", "camera", "brewery", "locality", "wikipedia",
-              "wikipedia:*", "access:*", "contact:*", "drink:*", "toll:*",
-              "area"],
+              "wikipedia:*", "access:*", "contact:*", "drink:*", "toll:*"],
     "values" : {
         "" : "extra"
     }

settings/import-street.style

@@ -1,12 +1,6 @@
 [
-{   "keys" : ["wikipedia", "wikipedia:*", "wikidata", "area"],
-    "values" : {
-        "" : "extra"
-    }
-},
 {
-    "keys" : ["name:prefix", "name:suffix", "name:prefix:*", "name:suffix:*",
-              "name:botanical", "*wikidata"],
+    "keys" : ["name:prefix", "name:suffix", "name:botanical", "*wikidata"],
     "values" : {
         "" : "skip"
     }

sql/functions/address_lookup.sql

@@ -79,18 +79,6 @@ END;
 $$
 LANGUAGE plpgsql STABLE;
 
-DROP TYPE IF EXISTS addressdata_place;
-CREATE TYPE addressdata_place AS (
-  place_id BIGINT,
-  country_code VARCHAR(2),
-  housenumber TEXT,
-  postcode TEXT,
-  class TEXT,
-  type TEXT,
-  name HSTORE,
-  address HSTORE,
-  centroid GEOMETRY
-);
 
 -- Compute the list of address parts for the given place.
 --
@@ -99,127 +87,124 @@ CREATE OR REPLACE FUNCTION get_addressdata(in_place_id BIGINT, in_housenumber IN
   RETURNS setof addressline
   AS $$
 DECLARE
-  place addressdata_place;
+  for_place_id BIGINT;
+  result TEXT[];
+  search TEXT[];
+  found INTEGER;
   location RECORD;
-  current_rank_address INTEGER;
-  location_isaddress BOOLEAN;
+  countrylocation RECORD;
+  searchcountrycode varchar(2);
+  searchhousenumber TEXT;
+  searchhousename HSTORE;
+  searchrankaddress INTEGER;
+  searchpostcode TEXT;
+  postcode_isexact BOOL;
+  searchclass TEXT;
+  searchtype TEXT;
+  countryname HSTORE;
 BEGIN
-  -- The place in question might not have a direct entry in place_addressline.
-  -- Look for the parent of such places then and save it in place.
+  -- The place ein question might not have a direct entry in place_addressline.
+  -- Look for the parent of such places then and save if in for_place_id.
+
+  postcode_isexact := false;
 
   -- first query osmline (interpolation lines)
   IF in_housenumber >= 0 THEN
-    SELECT parent_place_id as place_id, country_code,
-           in_housenumber as housenumber, postcode,
-           'place' as class, 'house' as type,
-           null as name, null as address,
-           ST_Centroid(linegeo) as centroid
-      INTO place
+    SELECT parent_place_id, country_code, in_housenumber::text, 30, postcode,
+           null, 'place', 'house'
       FROM location_property_osmline
-      WHERE place_id = in_place_id
-            AND in_housenumber between startnumber and endnumber;
+      WHERE place_id = in_place_id AND in_housenumber>=startnumber
+            AND in_housenumber <= endnumber
+      INTO for_place_id, searchcountrycode, searchhousenumber, searchrankaddress,
+           searchpostcode, searchhousename, searchclass, searchtype;
   END IF;
 
   --then query tiger data
   -- %NOTIGERDATA% IF 0 THEN
-  IF place IS NULL AND in_housenumber >= 0 THEN
-    SELECT parent_place_id as place_id, 'us' as country_code,
-           in_housenumber as housenumber, postcode,
-           'place' as class, 'house' as type,
-           null as name, null as address,
-           ST_Centroid(linegeo) as centroid
-      INTO place
+  IF for_place_id IS NULL AND in_housenumber >= 0 THEN
+    SELECT parent_place_id, 'us', in_housenumber::text, 30, postcode, null,
+           'place', 'house'
       FROM location_property_tiger
-      WHERE place_id = in_place_id
-            AND in_housenumber between startnumber and endnumber;
+      WHERE place_id = in_place_id AND in_housenumber >= startnumber
+            AND in_housenumber <= endnumber
+      INTO for_place_id, searchcountrycode, searchhousenumber, searchrankaddress,
+           searchpostcode, searchhousename, searchclass, searchtype;
   END IF;
   -- %NOTIGERDATA% END IF;
 
   -- %NOAUXDATA% IF 0 THEN
-  IF place IS NULL THEN
-    SELECT parent_place_id as place_id, 'us' as country_code,
-           housenumber, postcode,
-           'place' as class, 'house' as type,
-           null as name, null as address,
-           centroid
-      INTO place
+  IF for_place_id IS NULL THEN
+    SELECT parent_place_id, 'us', housenumber, 30, postcode, null, 'place', 'house'
       FROM location_property_aux
-      WHERE place_id = in_place_id;
+      WHERE place_id = in_place_id
+      INTO for_place_id,searchcountrycode, searchhousenumber, searchrankaddress,
+           searchpostcode, searchhousename, searchclass, searchtype;
   END IF;
   -- %NOAUXDATA% END IF;
 
   -- postcode table
-  IF place IS NULL THEN
-    SELECT parent_place_id as place_id, country_code,
-           null::text as housenumber, postcode,
-           'place' as class, 'postcode' as type,
-           null as name, null as address,
-           null as centroid
-      INTO place
+  IF for_place_id IS NULL THEN
+    SELECT parent_place_id, country_code, rank_search, postcode, 'place', 'postcode'
       FROM location_postcode
-      WHERE place_id = in_place_id;
+      WHERE place_id = in_place_id
+      INTO for_place_id, searchcountrycode, searchrankaddress, searchpostcode,
+           searchclass, searchtype;
   END IF;
 
   -- POI objects in the placex table
-  IF place IS NULL THEN
-    SELECT parent_place_id as place_id, country_code,
-           housenumber, postcode,
-           class, type,
-           name, address,
-           centroid
-      INTO place
+  IF for_place_id IS NULL THEN
+    SELECT parent_place_id, country_code, housenumber, rank_search,
+           postcode, address is not null and address ? 'postcode',
+           name, class, type
       FROM placex
-      WHERE place_id = in_place_id and rank_search > 27;
+      WHERE place_id = in_place_id and rank_search > 27
+      INTO for_place_id, searchcountrycode, searchhousenumber, searchrankaddress,
+           searchpostcode, postcode_isexact, searchhousename, searchclass, searchtype;
   END IF;
 
-  -- If place is still NULL at this point then the object has its own
+  -- If for_place_id is still NULL at this point then the object has its own
   -- entry in place_address line. However, still check if there is not linked
   -- place we should be using instead.
-  IF place IS NULL THEN
-    select coalesce(linked_place_id, place_id) as place_id,  country_code,
-           housenumber, postcode,
-           class, type,
-           null as name, address,
-           null as centroid
-      INTO place
-      FROM placex where place_id = in_place_id;
+  IF for_place_id IS NULL THEN
+    select coalesce(linked_place_id, place_id),  country_code,
+           housenumber, rank_search, postcode,
+           address is not null and address ? 'postcode', null
+      from placex where place_id = in_place_id
+      INTO for_place_id, searchcountrycode, searchhousenumber, searchrankaddress, searchpostcode, postcode_isexact, searchhousename;
   END IF;
 
---RAISE WARNING '% % % %',searchcountrycode, searchhousenumber, searchpostcode;
+--RAISE WARNING '% % % %',searchcountrycode, searchhousenumber, searchrankaddress, searchpostcode;
 
-  -- --- Return the record for the base entry.
+  found := 1000; -- the lowest rank_address included
 
+  -- Return the record for the base entry.
   FOR location IN
     SELECT placex.place_id, osm_type, osm_id, name,
-           coalesce(extratags->'linked_place', extratags->'place') as place_type,
            class, type, admin_level,
+           type not in ('postcode', 'postal_code') as isaddress,
            CASE WHEN rank_address = 0 THEN 100
                 WHEN rank_address = 11 THEN 5
                 ELSE rank_address END as rank_address,
-           country_code
+           0 as distance, country_code, postcode
       FROM placex
-      WHERE place_id = place.place_id
+      WHERE place_id = for_place_id
   LOOP
 --RAISE WARNING '%',location;
+    IF searchcountrycode IS NULL AND location.country_code IS NOT NULL THEN
+      searchcountrycode := location.country_code;
+    END IF;
     IF location.rank_address < 4 THEN
       -- no country locations for ranks higher than country
-      place.country_code := NULL::varchar(2);
-    ELSEIF place.country_code IS NULL AND location.country_code IS NOT NULL THEN
-      place.country_code := location.country_code;
+      searchcountrycode := NULL;
     END IF;
-
-    RETURN NEXT ROW(location.place_id, location.osm_type, location.osm_id,
-                    location.name, location.class, location.type,
-                    location.place_type,
-                    location.admin_level, true,
-                    location.type not in ('postcode', 'postal_code'),
-                    location.rank_address, 0)::addressline;
-
-    current_rank_address := location.rank_address;
+    countrylocation := ROW(location.place_id, location.osm_type, location.osm_id,
+                           location.name, location.class, location.type, NULL,
+                           location.admin_level, true, location.isaddress,
+                           location.rank_address, location.distance)::addressline;
+    RETURN NEXT countrylocation;
+    found := location.rank_address;
   END LOOP;
 
-  -- --- Return records for address parts.
-
   FOR location IN
     SELECT placex.place_id, osm_type, osm_id, name, class, type,
            coalesce(extratags->'linked_place', extratags->'place') as place_type,
@@ -227,86 +212,73 @@ BEGIN
            CASE WHEN rank_address = 11 THEN 5 ELSE rank_address END as rank_address,
            distance, country_code, postcode
       FROM place_addressline join placex on (address_place_id = placex.place_id)
-      WHERE place_addressline.place_id IN (place.place_id, in_place_id)
+      WHERE place_addressline.place_id = for_place_id
+            AND (cached_rank_address >= 4 AND cached_rank_address < searchrankaddress)
             AND linked_place_id is null
-            AND (placex.country_code IS NULL OR place.country_code IS NULL
-                 OR placex.country_code = place.country_code)
-      ORDER BY rank_address desc,
-               (place_addressline.place_id = in_place_id) desc,
-               (fromarea and place.centroid is not null and not isaddress
-                and (place.address is null or avals(name) && avals(place.address))
-                and ST_Contains(geometry, place.centroid)) desc,
-               isaddress desc, fromarea desc,
+            AND (placex.country_code IS NULL OR searchcountrycode IS NULL
+                 OR placex.country_code = searchcountrycode)
+      ORDER BY rank_address desc, isaddress desc, fromarea desc,
                distance asc, rank_search desc
   LOOP
-    -- RAISE WARNING '%',location;
-    location_isaddress := location.rank_address != current_rank_address;
-
-    IF place.country_code IS NULL AND location.country_code IS NOT NULL THEN
-      place.country_code := location.country_code;
+--RAISE WARNING '%',location;
+    IF searchcountrycode IS NULL AND location.country_code IS NOT NULL THEN
+      searchcountrycode := location.country_code;
     END IF;
     IF location.type in ('postcode', 'postal_code')
-       AND place.postcode is not null
+       AND searchpostcode is not null
     THEN
       -- If the place had a postcode assigned, take this one only
       -- into consideration when it is an area and the place does not have
       -- a postcode itself.
-      IF location.fromarea AND location.isaddress
-         AND (place.address is null or not place.address ? 'postcode')
-      THEN
-        place.postcode := null; -- remove the less exact postcode
+      IF location.fromarea AND not postcode_isexact AND location.isaddress THEN
+        searchpostcode := null; -- remove the less exact postcode
       ELSE
-        location_isaddress := false;
+        location.isaddress := false;
       END IF;
     END IF;
-    RETURN NEXT ROW(location.place_id, location.osm_type, location.osm_id,
-                    location.name, location.class, location.type,
-                    location.place_type,
-                    location.admin_level, location.fromarea,
-                    location_isaddress,
-                    location.rank_address,
-                    location.distance)::addressline;
-
-    current_rank_address := location.rank_address;
+    countrylocation := ROW(location.place_id, location.osm_type, location.osm_id,
+                           location.name, location.class, location.type,
+                           location.place_type,
+                           location.admin_level, location.fromarea,
+                           location.isaddress, location.rank_address,
+                           location.distance)::addressline;
+    RETURN NEXT countrylocation;
+    found := location.rank_address;
   END LOOP;
 
   -- If no country was included yet, add the name information from country_name.
-  IF current_rank_address > 4 THEN
-    FOR location IN
-      SELECT name FROM country_name WHERE country_code = place.country_code LIMIT 1
-    LOOP
---RAISE WARNING '% % %',current_rank_address,searchcountrycode,countryname;
-      RETURN NEXT ROW(null, null, null, location.name, 'place', 'country', NULL,
+  IF found > 4 THEN
+    SELECT name FROM country_name
+      WHERE country_code = searchcountrycode LIMIT 1 INTO countryname;
+--RAISE WARNING '% % %',found,searchcountrycode,countryname;
+    IF countryname IS NOT NULL THEN
+      location := ROW(null, null, null, countryname, 'place', 'country', NULL,
                       null, true, true, 4, 0)::addressline;
-    END LOOP;
+      RETURN NEXT location;
+    END IF;
   END IF;
 
   -- Finally add some artificial rows.
-  IF place.country_code IS NOT NULL THEN
-    location := ROW(null, null, null, hstore('ref', place.country_code),
+  IF searchcountrycode IS NOT NULL THEN
+    location := ROW(null, null, null, hstore('ref', searchcountrycode),
                     'place', 'country_code', null, null, true, false, 4, 0)::addressline;
     RETURN NEXT location;
   END IF;
 
-  IF place.name IS NOT NULL THEN
-    location := ROW(in_place_id, null, null, place.name, place.class,
-                    place.type, null, null, true, true, 29, 0)::addressline;
+  IF searchhousename IS NOT NULL THEN
+    location := ROW(in_place_id, null, null, searchhousename, searchclass,
+                    searchtype, null, null, true, true, 29, 0)::addressline;
     RETURN NEXT location;
   END IF;
 
-  IF place.housenumber IS NOT NULL THEN
-    location := ROW(null, null, null, hstore('ref', place.housenumber),
+  IF searchhousenumber IS NOT NULL THEN
+    location := ROW(in_place_id, null, null, hstore('ref', searchhousenumber),
                     'place', 'house_number', null, null, true, true, 28, 0)::addressline;
     RETURN NEXT location;
   END IF;
 
-  IF place.address is not null and place.address ? '_unlisted_place' THEN
-    RETURN NEXT ROW(null, null, null, hstore('name', place.address->'_unlisted_place'),
-                    'place', 'locality', null, null, true, true, 25, 0)::addressline;
-  END IF;
-
-  IF place.postcode is not null THEN
-    location := ROW(null, null, null, hstore('ref', place.postcode), 'place',
+  IF searchpostcode IS NOT NULL THEN
+    location := ROW(null, null, null, hstore('ref', searchpostcode), 'place',
                     'postcode', null, null, false, true, 5, 0)::addressline;
     RETURN NEXT location;
   END IF;

sql/functions/normalization.sql

@@ -81,8 +81,7 @@ BEGIN
   lookup_word := upper(trim(postcode));
   lookup_token := ' ' || make_standard_name(lookup_word);
   SELECT min(word_id) FROM word
-    WHERE word_token = lookup_token and word = lookup_word
-          and class='place' and type='postcode'
+    WHERE word_token = lookup_token and class='place' and type='postcode'
     INTO return_word_id;
   IF return_word_id IS NULL THEN
     return_word_id := nextval('seq_word');
@@ -207,35 +206,17 @@ CREATE OR REPLACE FUNCTION addr_ids_from_name(lookup_word TEXT)
   RETURNS INTEGER[]
   AS $$
 DECLARE
-  words TEXT[];
-  id INTEGER;
+  lookup_token TEXT;
   return_word_id INTEGER[];
-  word_ids INTEGER[];
-  j INTEGER;
 BEGIN
-  words := string_to_array(make_standard_name(lookup_word), ' ');
-  IF array_upper(words, 1) IS NOT NULL THEN
-    FOR j IN 1..array_upper(words, 1) LOOP
-      IF (words[j] != '') THEN
-        SELECT array_agg(word_id) INTO word_ids
-          FROM word
-         WHERE word_token = words[j] and class is null and type is null;
-
-        IF word_ids IS NULL THEN
-          id := nextval('seq_word');
-          INSERT INTO word VALUES (id, words[j], null, null, null, null, 0);
-          return_word_id := return_word_id || id;
-        ELSE
-          return_word_id := array_merge(return_word_id, word_ids);
-        END IF;
-      END IF;
-    END LOOP;
-  END IF;
-
+  lookup_token := make_standard_name(lookup_word);
+  SELECT array_agg(word_id) FROM word
+    WHERE word_token = lookup_token and class is null and type is null
+    INTO return_word_id;
   RETURN return_word_id;
 END;
 $$
-LANGUAGE plpgsql;
+LANGUAGE plpgsql STABLE;
 
 
 -- Normalize a string and look up its name ids (full words).
@@ -424,103 +405,3 @@ BEGIN
 END;
 $$
 LANGUAGE plpgsql;
-
-
-CREATE OR REPLACE FUNCTION create_poi_search_terms(obj_place_id BIGINT,
-                                                   in_partition SMALLINT,
-                                                   parent_place_id BIGINT,
-                                                   address HSTORE,
-                                                   country TEXT,
-                                                   housenumber TEXT,
-                                                   initial_name_vector INTEGER[],
-                                                   geometry GEOMETRY,
-                                                   OUT name_vector INTEGER[],
-                                                   OUT nameaddress_vector INTEGER[])
-  AS $$
-DECLARE
-  parent_name_vector INTEGER[];
-  parent_address_vector INTEGER[];
-  addr_place_ids INTEGER[];
-
-  addr_item RECORD;
-  parent_address_place_ids BIGINT[];
-  filtered_address HSTORE;
-BEGIN
-  nameaddress_vector := '{}'::INTEGER[];
-
-  SELECT s.name_vector, s.nameaddress_vector
-    INTO parent_name_vector, parent_address_vector
-    FROM search_name s
-    WHERE s.place_id = parent_place_id;
-
-  -- Find all address tags that don't appear in the parent search names.
-  SELECT hstore(array_agg(ARRAY[k, v])) INTO filtered_address
-    FROM (SELECT skeys(address) as k, svals(address) as v) a
-   WHERE not addr_ids_from_name(v) && parent_address_vector
-         AND k not in ('country', 'street', 'place', 'postcode',
-                       'housenumber', 'streetnumber', 'conscriptionnumber');
-
-  -- Compute all search terms from the addr: tags.
-  IF filtered_address IS NOT NULL THEN
-    FOR addr_item IN
-      SELECT * FROM
-        get_places_for_addr_tags(in_partition, geometry, filtered_address, country)
-    LOOP
-        IF addr_item.place_id is null THEN
-            nameaddress_vector := array_merge(nameaddress_vector,
-                                              addr_item.keywords);
-            CONTINUE;
-        END IF;
-
-        IF parent_address_place_ids is null THEN
-            SELECT array_agg(parent_place_id) INTO parent_address_place_ids
-              FROM place_addressline
-             WHERE place_id = parent_place_id;
-        END IF;
-
-        IF not parent_address_place_ids @> ARRAY[addr_item.place_id] THEN
-            nameaddress_vector := array_merge(nameaddress_vector,
-                                              addr_item.keywords);
-
-            INSERT INTO place_addressline (place_id, address_place_id, fromarea,
-                                           isaddress, distance, cached_rank_address)
-            VALUES (obj_place_id, addr_item.place_id, not addr_item.isguess,
-                    true, addr_item.distance, addr_item.rank_address);
-        END IF;
-    END LOOP;
-  END IF;
-
-  name_vector := initial_name_vector;
-
-  -- Check if the parent covers all address terms.
-  -- If not, create a search name entry with the house number as the name.
-  -- This is unusual for the search_name table but prevents that the place
-  -- is returned when we only search for the street/place.
-
-  IF housenumber is not null and not nameaddress_vector <@ parent_address_vector THEN
-    name_vector := array_merge(name_vector,
-                               ARRAY[getorcreate_housenumber_id(make_standard_name(housenumber))]);
-  END IF;
-
-  IF not address ? 'street' and address ? 'place' THEN
-    addr_place_ids := addr_ids_from_name(address->'place');
-    IF not addr_place_ids <@ parent_name_vector THEN
-      -- make sure addr:place terms are always searchable
-      nameaddress_vector := array_merge(nameaddress_vector, addr_place_ids);
-      -- If there is a housenumber, also add the place name as a name,
-      -- so we can search it by the usual housenumber+place algorithms.
-      IF housenumber is not null THEN
-        name_vector := array_merge(name_vector,
-                                   ARRAY[getorcreate_name_id(make_standard_name(address->'place'))]);
-      END IF;
-    END IF;
-  END IF;
-
-  -- Cheating here by not recomputing all terms but simply using the ones
-  -- from the parent object.
-  nameaddress_vector := array_merge(nameaddress_vector, parent_name_vector);
-  nameaddress_vector := array_merge(nameaddress_vector, parent_address_vector);
-
-END;
-$$
-LANGUAGE plpgsql;

sql/functions/place_triggers.sql

@@ -162,14 +162,14 @@ BEGIN
       IF st_area(NEW.geometry) < 0.000000001 AND st_area(existinggeometry) < 1 THEN
 
         -- re-index points that have moved in / out of the polygon, could be done as a single query but postgres gets the index usage wrong
-        update placex set indexed_status = 2 where indexed_status = 0
-            AND ST_Intersects(NEW.geometry, placex.geometry)
-            AND NOT ST_Intersects(existinggeometry, placex.geometry)
+        update placex set indexed_status = 2 where indexed_status = 0 and 
+            (st_covers(NEW.geometry, placex.geometry) OR ST_Intersects(NEW.geometry, placex.geometry))
+            AND NOT (st_covers(existinggeometry, placex.geometry) OR ST_Intersects(existinggeometry, placex.geometry))
             AND rank_search > existingplacex.rank_search AND (rank_search < 28 or name is not null);
 
-        update placex set indexed_status = 2 where indexed_status = 0
-            AND ST_Intersects(existinggeometry, placex.geometry)
-            AND NOT ST_Intersects(NEW.geometry, placex.geometry)
+        update placex set indexed_status = 2 where indexed_status = 0 and 
+            (st_covers(existinggeometry, placex.geometry) OR ST_Intersects(existinggeometry, placex.geometry))
+            AND NOT (st_covers(NEW.geometry, placex.geometry) OR ST_Intersects(NEW.geometry, placex.geometry))
             AND rank_search > existingplacex.rank_search AND (rank_search < 28 or name is not null);
 
       END IF;
@@ -262,7 +262,7 @@ BEGIN
 
   -- deleting large polygons can have a massive effect on the system - require manual intervention to let them through
   IF st_area(OLD.geometry) > 2 and st_isvalid(OLD.geometry) THEN
-    SELECT bool_or(not (rank_address = 0 or rank_address > 25)) as ranked FROM placex WHERE osm_type = OLD.osm_type and osm_id = OLD.osm_id and class = OLD.class and type = OLD.type INTO has_rank;
+    SELECT bool_or(not (rank_address = 0 or rank_address > 26)) as ranked FROM placex WHERE osm_type = OLD.osm_type and osm_id = OLD.osm_id and class = OLD.class and type = OLD.type INTO has_rank;
     IF has_rank THEN
       insert into import_polygon_delete (osm_type, osm_id, class, type) values (OLD.osm_type,OLD.osm_id,OLD.class,OLD.type);
       RETURN NULL;

sql/functions/placex_triggers.sql

@@ -31,6 +31,7 @@ BEGIN
     LOOP
       FOR i IN 1..array_upper(location.members, 1) BY 2 LOOP
         IF location.members[i+1] = 'street' THEN
+          --DEBUG: RAISE WARNING 'node in relation %',relation;
           FOR parent IN
             SELECT place_id from placex
              WHERE osm_type = 'W' and osm_id = substring(location.members[i],2)::bigint
@@ -92,18 +93,7 @@ BEGIN
     END IF;
 
     IF fallback THEN
-      IF addr_street is null and addr_place is not null THEN
-        -- The address is attached to a place we don't know.
-        -- Instead simply use the containing area with the largest rank.
-        FOR location IN
-          SELECT place_id FROM placex
-            WHERE bbox && geometry AND _ST_Covers(geometry, ST_Centroid(bbox))
-                  AND rank_address between 5 and 25
-            ORDER BY rank_address desc
-        LOOP
-            RETURN location.place_id;
-        END LOOP;
-      ELSEIF ST_Area(bbox) < 0.005 THEN
+      IF ST_Area(bbox) < 0.01 THEN
         -- for smaller features get the nearest road
         SELECT getNearestRoadPlaceId(poi_partition, bbox) INTO parent_place_id;
         --DEBUG: RAISE WARNING 'Checked for nearest way (%)', parent_place_id;
@@ -112,7 +102,7 @@ BEGIN
         -- contains the bbox, only use addressable features
         FOR location IN
           SELECT place_id FROM placex
-            WHERE bbox && geometry AND _ST_Covers(geometry, ST_Centroid(bbox))
+            WHERE bbox @ geometry AND _ST_Covers(geometry, ST_Centroid(bbox))
                   AND rank_address between 5 and 25
             ORDER BY rank_address desc
         LOOP
@@ -138,7 +128,6 @@ DECLARE
 BEGIN
   IF bnd.rank_search >= 26 or bnd.rank_address = 0
      or ST_GeometryType(bnd.geometry) NOT IN ('ST_Polygon','ST_MultiPolygon')
-     or bnd.type IN ('postcode', 'postal_code')
   THEN
     RETURN NULL;
   END IF;
@@ -183,7 +172,6 @@ BEGIN
       WHERE make_standard_name(name->'name') = bnd_name
         AND placex.class = 'place' AND placex.type = bnd.extratags->'place'
         AND placex.osm_type = 'N'
-        AND placex.linked_place_id is null
         AND placex.rank_search < 26 -- needed to select the right index
         AND _st_covers(bnd.geometry, placex.geometry)
     LOOP
@@ -198,7 +186,6 @@ BEGIN
       WHERE placex.class = 'place' AND placex.osm_type = 'N'
         AND placex.extratags ? 'wikidata' -- needed to select right index
         AND placex.extratags->'wikidata' = bnd.extratags->'wikidata'
-        AND placex.linked_place_id is null
         AND placex.rank_search < 26
         AND _st_covers(bnd.geometry, placex.geometry)
       ORDER BY make_standard_name(name->'name') = bnd_name desc
@@ -214,14 +201,9 @@ BEGIN
     FOR linked_placex IN
       SELECT placex.* from placex
       WHERE make_standard_name(name->'name') = bnd_name
-        AND ((bnd.rank_address > 0
-              and bnd.rank_address = (compute_place_rank(placex.country_code,
-                                                         'N', placex.class,
-                                                         placex.type, 15::SMALLINT,
-                                                         false, placex.postcode)).address_rank)
+        AND ((bnd.rank_address > 0 and placex.rank_address = bnd.rank_address)
              OR (bnd.rank_address = 0 and placex.rank_search = bnd.rank_search))
         AND placex.osm_type = 'N'
-        AND placex.linked_place_id is null
         AND placex.rank_search < 26 -- needed to select the right index
         AND _st_covers(bnd.geometry, placex.geometry)
     LOOP
@@ -243,7 +225,7 @@ LANGUAGE plpgsql STABLE;
 -- \param maxrank       Rank of the place. All address features must have
 --                      a search rank lower than the given rank.
 -- \param address       Address terms for the place.
--- \param geometry      Geometry to which the address objects should be close.
+-- \param geoemtry      Geometry to which the address objects should be close.
 --
 -- \retval parent_place_id  Place_id of the address object that is the direct
 --                          ancestor.
@@ -258,119 +240,142 @@ CREATE OR REPLACE FUNCTION insert_addresslines(obj_place_id BIGINT,
                                                maxrank SMALLINT,
                                                address HSTORE,
                                                geometry GEOMETRY,
-                                               country TEXT,
                                                OUT parent_place_id BIGINT,
                                                OUT postcode TEXT,
                                                OUT nameaddress_vector INT[])
   AS $$
 DECLARE
-  address_havelevel BOOLEAN[];
+  current_rank_address INTEGER := 0;
+  location_distance FLOAT := 0;
+  location_parent GEOMETRY := NULL;
+  parent_place_id_rank SMALLINT := 0;
 
   location_isaddress BOOLEAN;
-  current_boundary GEOMETRY := NULL;
-  current_node_area GEOMETRY := NULL;
 
-  parent_place_rank INT := 0;
-  addr_place_ids BIGINT[];
+  address_havelevel BOOLEAN[];
+  location_keywords INT[];
 
   location RECORD;
+  addr_item RECORD;
+
+  isin_tokens INT[];
+  isin TEXT[];
 BEGIN
   parent_place_id := 0;
   nameaddress_vector := '{}'::int[];
+  isin_tokens := '{}'::int[];
 
-  address_havelevel := array_fill(false, ARRAY[maxrank]);
+  ---- convert address store to array of tokenids
+  IF address IS NOT NULL THEN
+    FOR addr_item IN SELECT * FROM each(address)
+    LOOP
+      IF addr_item.key IN ('city', 'tiger:county', 'state', 'suburb', 'province',
+                           'district', 'region', 'county', 'municipality',
+                           'hamlet', 'village', 'subdistrict', 'town',
+                           'neighbourhood', 'quarter', 'parish')
+      THEN
+        isin_tokens := array_merge(isin_tokens,
+                                   word_ids_from_name(addr_item.value));
+        IF NOT %REVERSE-ONLY% THEN
+          nameaddress_vector := array_merge(nameaddress_vector,
+                                            addr_ids_from_name(addr_item.value));
+        END IF;
+      END IF;
+    END LOOP;
+
+    IF address ? 'is_in' THEN
+      -- is_in items need splitting
+      isin := regexp_split_to_array(address->'is_in', E'[;,]');
+      IF array_upper(isin, 1) IS NOT NULL THEN
+        FOR i IN 1..array_upper(isin, 1) LOOP
+          isin_tokens := array_merge(isin_tokens,
+                                     word_ids_from_name(isin[i]));
+
+          -- merge word into address vector
+          IF NOT %REVERSE-ONLY% THEN
+            nameaddress_vector := array_merge(nameaddress_vector,
+                                              addr_ids_from_name(isin[i]));
+          END IF;
+        END LOOP;
+      END IF;
+    END IF;
+  END IF;
+  IF NOT %REVERSE-ONLY% THEN
+    nameaddress_vector := array_merge(nameaddress_vector, isin_tokens);
+  END IF;
+
+  ---- now compute the address terms
+  FOR i IN 1..28 LOOP
+    address_havelevel[i] := false;
+  END LOOP;
 
   FOR location IN
-    SELECT * FROM get_places_for_addr_tags(partition, geometry,
-                                                   address, country)
-    ORDER BY rank_address, distance, isguess desc
+    SELECT * FROM getNearFeatures(partition, geometry, maxrank, isin_tokens)
   LOOP
-    IF NOT %REVERSE-ONLY% THEN
-      nameaddress_vector := array_merge(nameaddress_vector,
-                                        location.keywords::int[]);
+    IF location.rank_address != current_rank_address THEN
+      current_rank_address := location.rank_address;
+      IF location.isguess THEN
+        location_distance := location.distance * 1.5;
+      ELSE
+        IF location.rank_address <= 12 THEN
+          -- for county and above, if we have an area consider that exact
+          -- (It would be nice to relax the constraint for places close to
+          --  the boundary but we'd need the exact geometry for that. Too
+          --  expensive.)
+          location_distance = 0;
+        ELSE
+          -- Below county level remain slightly fuzzy.
+          location_distance := location.distance * 0.5;
+        END IF;
+      END IF;
+    ELSE
+      CONTINUE WHEN location.keywords <@ location_keywords;
     END IF;
 
-    IF location.place_id is not null THEN
-      location_isaddress := not address_havelevel[location.rank_address];
-      IF not address_havelevel[location.rank_address] THEN
-        address_havelevel[location.rank_address] := true;
-        IF parent_place_rank < location.rank_address THEN
-          parent_place_id := location.place_id;
-          parent_place_rank := location.rank_address;
-        END IF;
+    IF location.distance < location_distance OR NOT location.isguess THEN
+      location_keywords := location.keywords;
+
+      location_isaddress := NOT address_havelevel[location.rank_address];
+      --DEBUG: RAISE WARNING 'should be address: %, is guess: %, rank: %', location_isaddress, location.isguess, location.rank_address;
+      IF location_isaddress AND location.isguess AND location_parent IS NOT NULL THEN
+          location_isaddress := ST_Contains(location_parent, location.centroid);
+      END IF;
+
+      --DEBUG: RAISE WARNING '% isaddress: %', location.place_id, location_isaddress;
+      -- Add it to the list of search terms
+      IF NOT %REVERSE-ONLY% THEN
+          nameaddress_vector := array_merge(nameaddress_vector,
+                                            location.keywords::integer[]);
       END IF;
 
       INSERT INTO place_addressline (place_id, address_place_id, fromarea,
                                      isaddress, distance, cached_rank_address)
-        VALUES (obj_place_id, location.place_id, not location.isguess,
-                true, location.distance, location.rank_address);
+        VALUES (obj_place_id, location.place_id, true,
+                location_isaddress, location.distance, location.rank_address);
 
-      addr_place_ids := array_append(addr_place_ids, location.place_id);
-    END IF;
-  END LOOP;
+      IF location_isaddress THEN
+        -- add postcode if we have one
+        -- (If multiple postcodes are available, we end up with the highest ranking one.)
+        IF location.postcode is not null THEN
+            postcode = location.postcode;
+        END IF;
 
-  FOR location IN
-    SELECT * FROM getNearFeatures(partition, geometry, maxrank)
-    WHERE addr_place_ids is null or not addr_place_ids @> ARRAY[place_id]
-    ORDER BY rank_address, isguess asc,
-             distance *
-               CASE WHEN rank_address = 16 AND rank_search = 15 THEN 0.2
-                    WHEN rank_address = 16 AND rank_search = 16 THEN 0.25
-                    WHEN rank_address = 16 AND rank_search = 18 THEN 0.5
-                    ELSE 1 END ASC
-  LOOP
-    -- Ignore all place nodes that do not fit in a lower level boundary.
-    CONTINUE WHEN location.isguess
-                  and current_boundary is not NULL
-                  and not ST_Contains(current_boundary, location.centroid);
-
-    -- If this is the first item in the rank, then assume it is the address.
-    location_isaddress := not address_havelevel[location.rank_address];
-
-    -- Further sanity checks to ensure that the address forms a sane hierarchy.
-    IF location_isaddress THEN
-      IF location.isguess and current_node_area is not NULL THEN
-        location_isaddress := ST_Contains(current_node_area, location.centroid);
-      END IF;
-      IF not location.isguess and current_boundary is not NULL
-         and location.rank_address != 11 AND location.rank_address != 5 THEN
-        location_isaddress := ST_Contains(current_boundary, location.centroid);
-      END IF;
-    END IF;
-
-    IF location_isaddress THEN
-      address_havelevel[location.rank_address] := true;
-      parent_place_id := location.place_id;
-
-      -- Set postcode if we have one.
-      -- (Returned will be the highest ranking one.)
-      IF location.postcode is not NULL THEN
-        postcode = location.postcode;
-      END IF;
-
-      -- Recompute the areas we need for hierarchy sanity checks.
-      IF location.rank_address != 11 AND location.rank_address != 5 THEN
-        IF location.isguess THEN
-          current_node_area := place_node_fuzzy_area(location.centroid,
-                                                     location.rank_search);
-        ELSE
-          current_node_area := NULL;
+        address_havelevel[location.rank_address] := true;
+        -- add a hack against postcode ranks
+        IF NOT location.isguess
+           AND location.rank_address != 11 AND location.rank_address != 5
+        THEN
           SELECT p.geometry FROM placex p
-              WHERE p.place_id = location.place_id INTO current_boundary;
+            WHERE p.place_id = location.place_id INTO location_parent;
+        END IF;
+
+        IF location.rank_address > parent_place_id_rank THEN
+          parent_place_id = location.place_id;
+          parent_place_id_rank = location.rank_address;
         END IF;
       END IF;
     END IF;
 
-    -- Add it to the list of search terms
-    IF NOT %REVERSE-ONLY% THEN
-      nameaddress_vector := array_merge(nameaddress_vector,
-                                        location.keywords::integer[]);
-    END IF;
-
-    INSERT INTO place_addressline (place_id, address_place_id, fromarea,
-                                     isaddress, distance, cached_rank_address)
-        VALUES (obj_place_id, location.place_id, not location.isguess,
-                location_isaddress, location.distance, location.rank_address);
   END LOOP;
 END;
 $$
@@ -413,12 +418,7 @@ BEGIN
 
       NEW.name := hstore('ref', NEW.address->'postcode');
 
-    ELSEIF NEW.class = 'highway' AND is_area AND NEW.name is null
-           AND NEW.extratags ? 'area' AND NEW.extratags->'area' = 'yes'
-    THEN
-        RETURN NULL;
-    ELSEIF NEW.class = 'boundary' AND NOT is_area
-    THEN
+    ELSEIF NEW.class = 'boundary' AND NOT is_area THEN
         RETURN NULL;
     ELSEIF NEW.class = 'boundary' AND NEW.type = 'administrative'
            AND NEW.admin_level <= 4 AND NEW.osm_type = 'W'
@@ -454,16 +454,11 @@ BEGIN
         -- mark items within the geometry for re-indexing
   --    RAISE WARNING 'placex poly insert: % % % %',NEW.osm_type,NEW.osm_id,NEW.class,NEW.type;
 
-        UPDATE placex SET indexed_status = 2
-         WHERE ST_Intersects(NEW.geometry, placex.geometry)
-               and indexed_status = 0
-               and ((rank_address = 0 and rank_search > NEW.rank_address)
-                    or rank_address > NEW.rank_address
-                    or (class = 'place' and osm_type = 'N')
-                   )
-               and (rank_search < 28
-                    or name is not null
-                    or (NEW.rank_address >= 16 and address ? 'place'));
+        -- work around bug in postgis, this may have been fixed in 2.0.0 (see http://trac.osgeo.org/postgis/ticket/547)
+        update placex set indexed_status = 2 where (st_covers(NEW.geometry, placex.geometry) OR ST_Intersects(NEW.geometry, placex.geometry)) 
+         AND rank_search > NEW.rank_search and indexed_status = 0 and ST_geometrytype(placex.geometry) = 'ST_Point' and (rank_search < 28 or name is not null or (NEW.rank_search >= 16 and address ? 'place'));
+        update placex set indexed_status = 2 where (st_covers(NEW.geometry, placex.geometry) OR ST_Intersects(NEW.geometry, placex.geometry)) 
+         AND rank_search > NEW.rank_search and indexed_status = 0 and ST_geometrytype(placex.geometry) != 'ST_Point' and (rank_search < 28 or name is not null or (NEW.rank_search >= 16 and address ? 'place'));
       END IF;
     ELSE
       -- mark nearby items for re-indexing, where 'nearby' depends on the features rank_search and is a complete guess :(
@@ -503,6 +498,33 @@ END;
 $$
 LANGUAGE plpgsql;
 
+CREATE OR REPLACE FUNCTION get_parent_address_level(geom GEOMETRY, in_level SMALLINT)
+  RETURNS SMALLINT
+  AS $$
+DECLARE
+  address_rank SMALLINT;
+BEGIN
+  IF in_level <= 3 or in_level > 15 THEN
+    address_rank := 3;
+  ELSE
+    SELECT rank_address INTO address_rank
+      FROM placex
+      WHERE osm_type = 'R' and class = 'boundary' and type = 'administrative'
+            and admin_level < in_level
+            and geometry && geom and ST_Covers(geometry, geom)
+      ORDER BY admin_level desc LIMIT 1;
+  END IF;
+
+  IF address_rank is NULL or address_rank <= 3 THEN
+    RETURN 3;
+  END IF;
+
+  RETURN address_rank;
+END;
+$$
+LANGUAGE plpgsql;
+
+
 CREATE OR REPLACE FUNCTION placex_update()
   RETURNS TRIGGER
   AS $$
@@ -511,20 +533,14 @@ DECLARE
   location RECORD;
   relation_members TEXT[];
 
-  geom GEOMETRY;
+  centroid GEOMETRY;
   parent_address_level SMALLINT;
-  place_address_level SMALLINT;
 
   addr_street TEXT;
   addr_place TEXT;
 
-  max_rank SMALLINT;
-
   name_vector INTEGER[];
   nameaddress_vector INTEGER[];
-  addr_nameaddress_vector INTEGER[];
-
-  inherited_address HSTORE;
 
   linked_node_id BIGINT;
   linked_importance FLOAT;
@@ -558,28 +574,11 @@ BEGIN
          where linked_place_id = NEW.place_id;
   -- update not necessary for osmline, cause linked_place_id does not exist
 
-  NEW.extratags := NEW.extratags - 'linked_place'::TEXT;
-  NEW.address := NEW.address - '_unlisted_place'::TEXT;
-
   IF NEW.linked_place_id is not null THEN
     --DEBUG: RAISE WARNING 'place already linked to %', NEW.linked_place_id;
     RETURN NEW;
   END IF;
 
-  -- Postcodes are just here to compute the centroids. They are not searchable
-  -- unless they are a boundary=postal_code.
-  -- There was an error in the style so that boundary=postal_code used to be
-  -- imported as place=postcode. That's why relations are allowed to pass here.
-  -- This can go away in a couple of versions.
-  IF NEW.class = 'place'  and NEW.type = 'postcode' and NEW.osm_type != 'R' THEN
-    RETURN NEW;
-  END IF;
-
-  -- Speed up searches - just use the centroid of the feature
-  -- cheaper but less acurate
-  NEW.centroid := ST_PointOnSurface(NEW.geometry);
-  --DEBUG: RAISE WARNING 'Computing preliminary centroid at %',ST_AsText(NEW.centroid);
-
   -- recompute the ranks, they might change when linking changes
   SELECT * INTO NEW.rank_search, NEW.rank_address
     FROM compute_place_rank(NEW.country_code,
@@ -589,74 +588,7 @@ BEGIN
                             NEW.class, NEW.type, NEW.admin_level,
                             (NEW.extratags->'capital') = 'yes',
                             NEW.address->'postcode');
-  -- We must always increase the address level relative to the admin boundary.
-  IF NEW.class = 'boundary' and NEW.type = 'administrative'
-     and NEW.osm_type = 'R' and NEW.rank_address > 0
-  THEN
-    -- First, check that admin boundaries do not overtake each other rank-wise.
-    parent_address_level := 3;
-    FOR location IN
-      SELECT rank_address,
-             (CASE WHEN extratags ? 'wikidata' and NEW.extratags ? 'wikidata'
-                        and extratags->'wikidata' = NEW.extratags->'wikidata'
-                   THEN ST_Equals(geometry, NEW.geometry)
-                   ELSE false END) as is_same
-      FROM placex
-      WHERE osm_type = 'R' and class = 'boundary' and type = 'administrative'
-            and admin_level < NEW.admin_level and admin_level > 3
-            and rank_address > 0
-            and geometry && NEW.centroid and _ST_Covers(geometry, NEW.centroid)
-      ORDER BY admin_level desc LIMIT 1
-    LOOP
-      IF location.is_same THEN
-        -- Looks like the same boundary is replicated on multiple admin_levels.
-        -- Usual tagging in Poland. Remove our boundary from addresses.
-        NEW.rank_address := 0;
-      ELSE
-        parent_address_level := location.rank_address;
-        IF location.rank_address >= NEW.rank_address THEN
-          IF location.rank_address >= 24 THEN
-            NEW.rank_address := 25;
-          ELSE
-            NEW.rank_address := location.rank_address + 2;
-          END IF;
-        END IF;
-      END IF;
-    END LOOP;
 
-    IF NEW.rank_address > 9 THEN
-        -- Second check that the boundary is not completely contained in a
-        -- place area with a higher address rank
-        FOR location IN
-          SELECT rank_address FROM placex
-          WHERE class = 'place' and rank_address < 24
-                and rank_address > NEW.rank_address
-                and geometry && NEW.geometry
-                and geometry ~ NEW.geometry -- needed because ST_Relate does not do bbox cover test
-                and ST_Relate(geometry, NEW.geometry, 'T*T***FF*') -- contains but not equal
-          ORDER BY rank_address desc LIMIT 1
-        LOOP
-          NEW.rank_address := location.rank_address + 2;
-        END LOOP;
-    END IF;
-  ELSEIF NEW.class = 'place' and NEW.osm_type = 'N'
-     and NEW.rank_address between 16 and 23
-  THEN
-    -- If a place node is contained in a admin boundary with the same address level
-    -- and has not been linked, then make the node a subpart by increasing the
-    -- address rank (city level and above).
-    FOR location IN
-        SELECT rank_address FROM placex
-        WHERE osm_type = 'R' and class = 'boundary' and type = 'administrative'
-              and rank_address = NEW.rank_address
-              and geometry && NEW.centroid and _ST_Covers(geometry, NEW.centroid)
-        LIMIT 1
-    LOOP
-      NEW.rank_address = NEW.rank_address + 2;
-    END LOOP;
-  ELSE
-    parent_address_level := 3;
-  END IF;
 
   --DEBUG: RAISE WARNING 'Copy over address tags';
   -- housenumber is a computed field, so start with an empty value
@@ -681,11 +613,16 @@ BEGIN
       addr_street := NEW.address->'street';
       addr_place := NEW.address->'place';
 
-      IF NEW.address ? 'postcode' and NEW.address->'postcode' not similar to '%(:|,|;)%' THEN
+      IF NEW.address ? 'postcode' and NEW.address->'postcode' not similar to '%(,|;)%' THEN
         i := getorcreate_postcode_id(NEW.address->'postcode');
       END IF;
   END IF;
 
+  -- Speed up searches - just use the centroid of the feature
+  -- cheaper but less acurate
+  NEW.centroid := ST_PointOnSurface(NEW.geometry);
+  --DEBUG: RAISE WARNING 'Computing preliminary centroid at %',ST_AsText(NEW.centroid);
+
   NEW.postcode := null;
 
   -- recalculate country and partition
@@ -741,14 +678,13 @@ BEGIN
 
   -- ---------------------------------------------------------------------------
   -- For low level elements we inherit from our parent road
-  IF NEW.rank_search > 27 THEN
+  IF (NEW.rank_search > 27 OR (NEW.type = 'postcode' AND NEW.rank_search = 25)) THEN
 
     --DEBUG: RAISE WARNING 'finding street for % %', NEW.osm_type, NEW.osm_id;
     NEW.parent_place_id := null;
 
     -- if we have a POI and there is no address information,
     -- see if we can get it from a surrounding building
-    inherited_address := ''::HSTORE;
     IF NEW.osm_type = 'N' AND addr_street IS NULL AND addr_place IS NULL
        AND NEW.housenumber IS NULL THEN
       FOR location IN
@@ -763,7 +699,7 @@ BEGIN
         NEW.housenumber := location.address->'housenumber';
         addr_street := location.address->'street';
         addr_place := location.address->'place';
-        inherited_address := location.address;
+        --DEBUG: RAISE WARNING 'Found surrounding building % %', location.osm_type, location.osm_id;
       END LOOP;
     END IF;
 
@@ -778,18 +714,9 @@ BEGIN
     IF NEW.parent_place_id is not null THEN
 
       -- Get the details of the parent road
-      SELECT p.country_code, p.postcode, p.name FROM placex p
+      SELECT p.country_code, p.postcode FROM placex p
        WHERE p.place_id = NEW.parent_place_id INTO location;
 
-      IF addr_street is null and addr_place is not null THEN
-        -- Check if the addr:place tag is part of the parent name
-        SELECT count(*) INTO i
-          FROM svals(location.name) AS pname WHERE pname = addr_place;
-        IF i = 0 THEN
-          NEW.address = NEW.address || hstore('_unlisted_place', addr_place);
-        END IF;
-      END IF;
-
       NEW.country_code := location.country_code;
       --DEBUG: RAISE WARNING 'Got parent details from search name';
 
@@ -803,31 +730,33 @@ BEGIN
         NEW.postcode := get_nearest_postcode(NEW.country_code, NEW.geometry);
       END IF;
 
-      IF NEW.name is not NULL THEN
-          NEW.name := add_default_place_name(NEW.country_code, NEW.name);
-          name_vector := make_keywords(NEW.name);
-
-          IF NEW.rank_search <= 25 and NEW.rank_address > 0 THEN
-            result := add_location(NEW.place_id, NEW.country_code, NEW.partition,
-                                   name_vector, NEW.rank_search, NEW.rank_address,
-                                   upper(trim(NEW.address->'postcode')), NEW.geometry,
-                                   NEW.centroid);
-            --DEBUG: RAISE WARNING 'Place added to location table';
-          END IF;
-
+      -- If there is no name it isn't searchable, don't bother to create a search record
+      IF NEW.name is NULL THEN
+        --DEBUG: RAISE WARNING 'Not a searchable place % %', NEW.osm_type, NEW.osm_id;
+        return NEW;
       END IF;
 
-      IF not %REVERSE-ONLY% AND (array_length(name_vector, 1) is not NULL
-         OR inherited_address is not NULL OR NEW.address is not NULL)
-      THEN
-        SELECT * INTO name_vector, nameaddress_vector
-          FROM create_poi_search_terms(NEW.place_id,
-                                       NEW.partition, NEW.parent_place_id,
-                                       inherited_address || NEW.address,
-                                       NEW.country_code, NEW.housenumber,
-                                       name_vector, NEW.centroid);
+      NEW.name := add_default_place_name(NEW.country_code, NEW.name);
+      name_vector := make_keywords(NEW.name);
+
+      -- Performance, it would be more acurate to do all the rest of the import
+      -- process but it takes too long
+      -- Just be happy with inheriting from parent road only
+      IF NEW.rank_search <= 25 and NEW.rank_address > 0 THEN
+        result := add_location(NEW.place_id, NEW.country_code, NEW.partition, name_vector, NEW.rank_search, NEW.rank_address, upper(trim(NEW.address->'postcode')), NEW.geometry);
+        --DEBUG: RAISE WARNING 'Place added to location table';
+      END IF;
+
+      result := insertSearchName(NEW.partition, NEW.place_id, name_vector,
+                                 NEW.rank_search, NEW.rank_address, NEW.geometry);
+
+      IF NOT %REVERSE-ONLY% THEN
+          -- Merge address from parent
+          SELECT array_merge(s.name_vector, s.nameaddress_vector)
+            INTO nameaddress_vector
+            FROM search_name s
+            WHERE s.place_id = NEW.parent_place_id;
 
-        IF array_length(name_vector, 1) is not NULL THEN
           INSERT INTO search_name (place_id, search_rank, address_rank,
                                    importance, country_code, name_vector,
                                    nameaddress_vector, centroid)
@@ -836,9 +765,8 @@ BEGIN
                          nameaddress_vector, NEW.centroid);
           --DEBUG: RAISE WARNING 'Place added to search table';
         END IF;
-      END IF;
 
-      RETURN NEW;
+      return NEW;
     END IF;
 
   END IF;
@@ -852,11 +780,13 @@ BEGIN
 
     -- Use the linked point as the centre point of the geometry,
     -- but only if it is within the area of the boundary.
-    geom := coalesce(location.centroid, ST_Centroid(location.geometry));
-    IF geom is not NULL AND ST_Within(geom, NEW.geometry) THEN
-        NEW.centroid := geom;
+    centroid := coalesce(location.centroid, ST_Centroid(location.geometry));
+    IF centroid is not NULL AND ST_Within(centroid, NEW.geometry) THEN
+        NEW.centroid := centroid;
     END IF;
 
+    -- Use the address rank of the linked place, if it has one
+    parent_address_level := get_parent_address_level(NEW.geometry, NEW.admin_level);
     --DEBUG: RAISE WARNING 'parent address: % rank address: %', parent_address_level, location.rank_address;
     IF location.rank_address > parent_address_level
        and location.rank_address < 26
@@ -894,18 +824,6 @@ BEGIN
     THEN
       NEW.importance = linked_importance;
     END IF;
-  ELSE
-    -- No linked place? As a last resort check if the boundary is tagged with
-    -- a place type and adapt the rank address.
-    IF NEW.rank_address > 0 and NEW.extratags ? 'place' THEN
-      SELECT address_rank INTO place_address_level
-        FROM compute_place_rank(NEW.country_code, 'A', 'place',
-                                NEW.extratags->'place', 0::SMALLINT, False, null);
-      IF place_address_level > parent_address_level and
-         place_address_level < 26 THEN
-        NEW.rank_address := place_address_level;
-      END IF;
-    END IF;
   END IF;
 
   -- Initialise the name vector using our name
@@ -919,45 +837,13 @@ BEGIN
   THEN
     PERFORM create_country(NEW.name, lower(NEW.country_code));
     --DEBUG: RAISE WARNING 'Country names updated';
-
-    -- Also update the list of country names. Adding an additional sanity
-    -- check here: make sure the country does overlap with the area where
-    -- we expect it to be as per static country grid.
-    FOR location IN
-      SELECT country_code FROM country_osm_grid
-       WHERE ST_Covers(geometry, NEW.centroid) and country_code = NEW.country_code
-       LIMIT 1
-    LOOP
-      --DEBUG: RAISE WARNING 'Updating names for country '%' with: %', NEW.country_code, NEW.name;
-      UPDATE country_name SET name = name || NEW.name WHERE country_code = NEW.country_code;
-    END LOOP;
   END IF;
 
-  -- For linear features we need the full geometry for determining the address
-  -- because they may go through several administrative entities. Otherwise use
-  -- the centroid for performance reasons.
-  IF ST_GeometryType(NEW.geometry) in ('ST_LineString', 'ST_MultiLineString') THEN
-    geom := NEW.geometry;
-  ELSE
-    geom := NEW.centroid;
-  END IF;
-
-  IF NEW.rank_address = 0 THEN
-    max_rank := geometry_to_rank(NEW.rank_search, NEW.geometry, NEW.country_code);
-    -- Rank 0 features may also span multiple administrative areas (e.g. lakes)
-    -- so use the geometry here too. Just make sure the areas don't become too
-    -- large.
-    IF NEW.class = 'natural' or max_rank > 10 THEN
-      geom := NEW.geometry;
-    END IF;
-  ELSEIF NEW.rank_address > 25 THEN
-    max_rank := 25;
-  ELSE
-    max_rank = NEW.rank_address;
-  END IF;
-
-  SELECT * FROM insert_addresslines(NEW.place_id, NEW.partition, max_rank,
-                                    NEW.address, geom, NEW.country_code)
+  SELECT * FROM insert_addresslines(NEW.place_id, NEW.partition,
+                                    NEW.rank_search, NEW.address,
+                                    CASE WHEN NEW.rank_search >= 26
+                                             AND NEW.rank_search < 30
+                                      THEN NEW.geometry ELSE NEW.centroid END)
     INTO NEW.parent_place_id, NEW.postcode, nameaddress_vector;
 
   --DEBUG: RAISE WARNING 'RETURN insert_addresslines: %, %, %', NEW.parent_place_id, NEW.postcode, nameaddress_vector;
@@ -975,7 +861,7 @@ BEGIN
   IF NEW.name IS NOT NULL THEN
 
     IF NEW.rank_search <= 25 and NEW.rank_address > 0 THEN
-      result := add_location(NEW.place_id, NEW.country_code, NEW.partition, name_vector, NEW.rank_search, NEW.rank_address, upper(trim(NEW.address->'postcode')), NEW.geometry, NEW.centroid);
+      result := add_location(NEW.place_id, NEW.country_code, NEW.partition, name_vector, NEW.rank_search, NEW.rank_address, upper(trim(NEW.address->'postcode')), NEW.geometry);
       --DEBUG: RAISE WARNING 'added to location (full)';
     END IF;
 
@@ -1016,14 +902,10 @@ DECLARE
 BEGIN
   -- RAISE WARNING 'placex_delete % %',OLD.osm_type,OLD.osm_id;
 
-  IF OLD.linked_place_id is null THEN
-    update placex set linked_place_id = null, indexed_status = 2 where linked_place_id = OLD.place_id and indexed_status = 0;
-    --DEBUG: RAISE WARNING 'placex_delete:01 % %',OLD.osm_type,OLD.osm_id;
-    update placex set linked_place_id = null where linked_place_id = OLD.place_id;
-    --DEBUG: RAISE WARNING 'placex_delete:02 % %',OLD.osm_type,OLD.osm_id;
-  ELSE
-    update placex set indexed_status = 2 where place_id = OLD.linked_place_id and indexed_status = 0;
-  END IF;
+  update placex set linked_place_id = null, indexed_status = 2 where linked_place_id = OLD.place_id and indexed_status = 0;
+  --DEBUG: RAISE WARNING 'placex_delete:01 % %',OLD.osm_type,OLD.osm_id;
+  update placex set linked_place_id = null where linked_place_id = OLD.place_id;
+  --DEBUG: RAISE WARNING 'placex_delete:02 % %',OLD.osm_type,OLD.osm_id;
 
   IF OLD.rank_address < 30 THEN