query the last updated timestamp only if output format is HTML

Avoids a number of warnings on PHP7.

.gitignore

@@ -1,11 +1,33 @@
 *.log
 *.pyc
 
-build
+nominatim/*.d
+nominatim/*.o
+nominatim/nominatim
+module/nominatim.so
+module/nominatim.o
+settings/configuration.txt
+settings/download.lock
+settings/state.txt
 settings/local.php
 
+.deps/
+autom4te.cache/
+config.*
+configure
+Makefile
+!tests/scenes/bin/Makefile
+Makefile.in
+stamp-h1
+missing
+INSTALL
+aclocal.m4
+depcomp
+install-sh
+compile
+
 data/wiki_import.sql
 data/wiki_specialphrases.sql
 data/osmosischange.osc
 
-.vagrant
+.vagrant

.travis.yml

@@ -1,31 +0,0 @@
----
-sudo: required
-dist: trusty
-language: python
-python:
-  - "3.6"
-addons:
-  postgresql: "9.6"
-git:
-  depth: 3
-env:
-  - TEST_SUITE=tests
-  - TEST_SUITE=monaco
-install:
-  - vagrant/install-on-travis-ci.sh
-before_script:
-  - psql -U postgres -c "create extension postgis"
-script:
-  - 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 ./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 ./utils/specialphrases.php --wiki-import | psql -d test_api_nominatim >/dev/null; fi
-  - cd $TRAVIS_BUILD_DIR/test/php
-  - if [[ $TEST_SUITE == "tests" ]]; then phpunit ./ ; fi
-  - if [[ $TEST_SUITE == "tests" ]]; then phpcs --report-width=120 */**.php ; fi
-  - cd $TRAVIS_BUILD_DIR/test/bdd
-  - # behave --format=progress3 api
-  - if [[ $TEST_SUITE == "tests" ]]; then behave --format=progress3 db ; fi
-  - if [[ $TEST_SUITE == "tests" ]]; then behave --format=progress3 osm2pgsql ; fi
-notifications:
-  email: false

AUTHORS

@@ -2,17 +2,18 @@ Nominatim was written by:
 
   Brian Quinion
   Sarah Hoffmann
-  Marc Tobias Metten
-  markigail
-  IrlJidel
   Frederik Ramm
   Michael Spreng
   Daniele Forsi
   mfn
   Grant Slater
   Andree Klattenhoff
+  IrlJidel
   appelflap
   b3nn0
   Spin0us
   Kurt Roeckx
   Rodolphe Quiédeville
+  Marc Tobias Metten
+
+Reverse geocoding using Tiger data feature made possible with support from Guru Labs

CMakeLists.txt

@@ -1,151 +0,0 @@
-#-----------------------------------------------------------------------------
-#
-#  CMake Config
-#
-#  Nominatim
-#
-#-----------------------------------------------------------------------------
-
-cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
-
-
-#-----------------------------------------------------------------------------
-#
-#  Project version
-#
-#-----------------------------------------------------------------------------
-
-project(nominatim)
-
-set(NOMINATIM_VERSION_MAJOR 3)
-set(NOMINATIM_VERSION_MINOR 1)
-set(NOMINATIM_VERSION_PATCH 0)
-
-set(NOMINATIM_VERSION "${NOMINATIM_VERSION_MAJOR}.${NOMINATIM_VERSION_MINOR}.${NOMINATIM_VERSION_PATCH}")
-
-add_definitions(-DNOMINATIM_VERSION="${NOMINATIM_VERSION}")
-
-
-#-----------------------------------------------------------------------------
-#
-#  Find external dependencies
-#
-#-----------------------------------------------------------------------------
-
-set(BUILD_TESTS off CACHE BOOL "Build test suite" FORCE)
-set(WITH_LUA off CACHE BOOL "Build with lua support" FORCE)
-
-if (NOT EXISTS "${CMAKE_SOURCE_DIR}/osm2pgsql/CMakeLists.txt")
-    message(FATAL_ERROR "The osm2pgsql directory is empty.\
-    Did you forget to check out Nominatim recursively?\
-    \nTry updating submodules with: git submodule update --init")
-endif()
-add_subdirectory(osm2pgsql)
-
-find_package(Threads REQUIRED)
-
-unset(PostgreSQL_TYPE_INCLUDE_DIR CACHE)
-set(PostgreSQL_TYPE_INCLUDE_DIR "/usr/include/")
-find_package(PostgreSQL REQUIRED)
-include_directories(${PostgreSQL_INCLUDE_DIRS})
-link_directories(${PostgreSQL_LIBRARY_DIRS})
-
-find_program(PYOSMIUM pyosmium-get-changes)
-if (NOT EXISTS "${PYOSMIUM}")
-    set(PYOSMIUM_PATH "/nonexistent")
-        message(WARNING "pyosmium-get-changes not found (required for updates)")
-else()
-    set(PYOSMIUM_PATH "${PYOSMIUM}")
-    message(STATUS "Using pyosmium-get-changes at ${PYOSMIUM_PATH}")
-endif()
-
-
-find_program(PG_CONFIG pg_config)
-execute_process(COMMAND ${PG_CONFIG} --pgxs
-                OUTPUT_VARIABLE PGXS
-                OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-if (NOT EXISTS "${PGXS}")
-    message(FATAL_ERROR "Postgresql server package not found.")
-endif()
-
-find_package(ZLIB REQUIRED)
-
-find_package(BZip2 REQUIRED)
-
-find_package(LibXml2 REQUIRED)
-include_directories(${LIBXML2_INCLUDE_DIR})
-
-#-----------------------------------------------------------------------------
-#
-# Setup settings and paths
-#
-#-----------------------------------------------------------------------------
-
-set(CUSTOMFILES
-    settings/phrase_settings.php
-    website/deletable.php
-    website/details.php
-    website/hierarchy.php
-    website/lookup.php
-    website/polygons.php
-    website/reverse.php
-    website/search.php
-    website/status.php
-    utils/blocks.php
-    utils/country_languages.php
-    utils/imports.php
-    utils/importWikipedia.php
-    utils/query.php
-    utils/server_compare.php
-    utils/setup.php
-    utils/specialphrases.php
-    utils/update.php
-    utils/warm.php
-   )
-
-foreach (cfile ${CUSTOMFILES})
-    configure_file(${PROJECT_SOURCE_DIR}/${cfile} ${PROJECT_BINARY_DIR}/${cfile})
-endforeach()
-
-configure_file(${PROJECT_SOURCE_DIR}/settings/defaults.php ${PROJECT_BINARY_DIR}/settings/settings.php)
-
-set(WEBPATHS css images js)
-
-foreach (wp ${WEBPATHS})
-    execute_process(
-        COMMAND ln -sf ${PROJECT_SOURCE_DIR}/website/${wp} ${PROJECT_BINARY_DIR}/website/
-    )
-endforeach()
-
-
-#-----------------------------------------------------------------------------
-#
-# Tests
-#
-#-----------------------------------------------------------------------------
-
-include(CTest)
-
-set(TEST_BDD db osm2pgsql api)
-
-foreach (test ${TEST_BDD})
-    add_test(NAME bdd_${test}
-             COMMAND lettuce features/${test}
-             WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/tests)
-    set_tests_properties(bdd_${test}
-        PROPERTIES ENVIRONMENT "NOMINATIM_DIR=${PROJECT_BINARY_DIR}")
-endforeach()
-
-add_test(NAME php
-         COMMAND phpunit ./
-         WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/tests-php)
-
-#-----------------------------------------------------------------------------
-
-add_subdirectory(module)
-add_subdirectory(nominatim)
-add_subdirectory(docs)
-
-#-----------------------------------------------------------------------------

CONTRIBUTING.md

@@ -1,100 +0,0 @@
-# Nominatim contribution guidelines
-
-## Reporting Bugs
-
-Bugs can be reported at https://github.com/openstreetmap/Nominatim/issues.
-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 Problems with your Installation...
-
-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
-
-
-## Workflow for Pull Requests
-
-We love to get pull reuqests from you. We operate the "Fork & Pull" model
-explained at
-
-https://help.github.com/articles/using-pull-requests
-
-You should fork the project into your own repo, create a topic branch
-there and then make one or more pull requests back to the openstreetmap repository.
-Your pull requests will then be reviewed and discussed. Please be aware
-that you are responsible for your pull requests. You should be prepared
-to get change requests because as the maintainers we have to make sure
-that your contribution fits well with the rest of the code. Please make
-sure that you have time to react to these comments and amend the code or
-engage in a conversion. Do not expect that others will pick up your code,
-it will almost never happen.
-
-Please open a separate pull request for each issue you want to address.
-Don't mix multiple changes. In particular, don't mix style cleanups with
-feature pull requests. If you plan to make larger changes, please open
-an issue first or comment on the appropriate issue already existing so
-that duplicate work can be avoided.
-
-## Coding style
-
-Nominatim historically hasn't followed a particular coding style but we
-are in process of consolodating the style. The following rules apply:
-
- * Python code uses the official Python style
- * indention
-   * SQL use 2 spaces
-   * all other file types use 4 spaces
-   * [BSD style](https://en.wikipedia.org/wiki/Indent_style#Allman_style) for braces
- * spaces
-   * spaces before and after equal signs and operators
-   * no trailing spaces
-   * no spaces after opening and before closing bracket
-   * leave out space between a function name and bracket
-     but add one between control statement(if, while, etc.) and bracket
-
-The coding style is enforced with PHPCS and can be tested with:
-
-```
-  phpcs --report-width=120 --colors */**.php
-```
-
-## Testing
-
-Before submitting a pull request make sure that the following tests pass:
-
-```
-  cd test/bdd
-  behave -DBUILDDIR=<builddir> db osm2pgsql
-```
-
-```
-  cd test/php
-  phpunit ./
-```

COPYING

@@ -1,12 +1,12 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 2, June 1991
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
-                            Preamble
+			    Preamble
 
   The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -56,7 +56,7 @@ patent must be licensed for everyone's free use or not licensed at all.
   The precise terms and conditions for copying, distribution and
 modification follow.
 
-                    GNU GENERAL PUBLIC LICENSE
+		    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License applies to any program or other work which contains
@@ -255,7 +255,7 @@ make exceptions for this.  Our decision will be guided by the two goals
 of preserving the free status of all derivatives of our free software and
 of promoting the sharing and reuse of software generally.
 
-                            NO WARRANTY
+			    NO WARRANTY
 
   11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
 FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
@@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
 PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
-                     END OF TERMS AND CONDITIONS
+		     END OF TERMS AND CONDITIONS
 
-            How to Apply These Terms to Your New Programs
+	    How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it

ChangeLog

@@ -1,58 +1,7 @@
-3.1.0
+2.5.1
 
- * rework postcode handling and introduce location_postcode table
- * make setup less verbose and print a summary in the end
- * setup: error out when web site user does not exist
- * add more API tests to complete code coverage
- * reinstate key-value amenity search (special term [key=value])
- * fix detection of coordinates in query
- * various smaller tweaks to ranking of search interpretations
- * complete overhaul of PHP frontend code using OOP
- * add address rank to details page
- * update Tiger scripts for 2017 data and clean up unused code
- * various bug fixes and improvements to UI
- * improve reverse geocoding performance close to coasts
- * more PHP style cleanup (quoting)
- * allow unnamed road in reverse geocoding to avoid too far off results
- * add function to recalculate counts for full-word search term
- * add function to check if new updates are available
- * update documentation and switch to mkdocs for generating HTML
-
-3.0.1
-
- * fix bug in geometry building algorithm in osm2pgsql
- * fix typos in build instructions
-
-3.0.0
-
- * move to cmake build system
- * various fixes to HTML output
- * reverse endpoint now can return geometries
- * add support for PHP7
- * move to on-the-fly computation of interpolations
- * improve handling of linked places (updating)
- * improve test framework:
-    * replace lettuce with behave
-    * use smaller database for API tests
- * drop support for postgres < 9.1, postgis < 2.0 and PHP < 5.4
- * make external data use optional (useful for imports without US)
- * detect postgres and postgis versions automatically
- * clean up query logging and remove unused tables
- * move installation documentation into this repo
- * add self-documenting vagrant scripts
- * remove --create-website, recommend to use website directory in build
- * add accessor functions for URL parameters and improve erro checking
- * remove IP blocking and rate-limiting code
- * enable CI via travis
- * reformatting for more consistent coding style
- * make country search term creation part of setup
- * update country names and country grid
- * handle roads that cross boundaries better
- * keep full information on address tags
- * update to refactored osm2pgsql which use libosmium based types
- * switch from osmosis to pyosmium for updates
- * be more strict when matching against special search terms
- * handle postcode entries with mutliple values correctly
+ * fix layout error in details page when keywords are displayed
+ * fix website check during setup
 
 2.5
 

Makefile.am

@@ -0,0 +1,27 @@
+ACLOCAL_AMFLAGS = -I osm2pgsql/m4
+AUTOMAKE_OPTIONS = -Wno-portability
+
+SUBDIRS = osm2pgsql module nominatim
+
+NOMINATIM_SERVER ?= $(shell echo a | php -F lib/init.php -E 'echo CONST_Website_BaseURL."\n";')
+NOMINATIM_DATABASE ?= $(shell echo a | php -F lib/init.php -E 'echo DB::parseDSN(CONST_Database_DSN)["database"];')
+
+install:
+	@echo Nominatim needs to be executed directly from this directory. No install necessary.
+
+test:
+	cd tests; NOMINATIM_SERVER=${NOMINATIM_SERVER} lettuce -t -Fail -t -poldi-only
+
+test-fast:
+	cd tests; NOMINATIM_SERVER=${NOMINATIM_SERVER} NOMINATIM_REUSE_TEMPLATE=1 lettuce -t -Fail -t -poldi-only
+
+test-db:
+	cd tests; NOMINATIM_SERVER=${NOMINATIM_SERVER} lettuce -t -Fail -t -poldi-only features/db
+
+test-db-fast:
+	cd tests; NOMINATIM_SERVER=${NOMINATIM_SERVER} NOMINATIM_REUSE_TEMPLATE=1 lettuce -t -Fail -t -poldi-only features/db
+
+test-api:
+	cd tests; NOMINATIM_SERVER=${NOMINATIM_SERVER} lettuce -t -Fail -t -poldi-only features/api
+
+.PHONY: test test-fast test-db test-db-fast test-api

README

@@ -0,0 +1,59 @@
+Nominatim
+=========
+
+Nominatim (from the Latin, 'by name') is a tool to search OpenStreetMap data
+by name and address (geocoding) and to generate synthetic addresses of
+OSM points (reverse geocoding). An instance with up-to-date data can be found
+at http://nominatim.openstreetmap.org. Nominatim is also used as one of the
+sources for the Search box on the OpenStreetMap home page and powers the search
+on the MapQuest Open Initiative websites.
+
+Documentation
+=============
+
+More information about Nominatim, including usage and installation instructions,
+can be found in the OSM wiki at:
+
+http://wiki.openstreetmap.org/wiki/Nominatim
+
+Installation
+============
+
+The following instructions is a quick guide to installation. A more detailed guide
+how to set up your own instance of Nominatim can be found in the wiki:
+
+http://wiki.openstreetmap.org/wiki/Nominatim/Installation
+
+Note that this repository contains a submodule called osm2pgsql. Make sure it
+is cloned as well by running `git submodule update --init`.
+
+Installation steps:
+
+0. If checking out from git run:
+
+     ./autogen.sh
+
+1. Compile Nominatim:
+
+     ./configure
+     make
+
+2. Get OSM data and import:
+
+     ./utils/setup.php --osm-file <your planet file> --all
+
+3. Point your webserver to the ./website directory.
+
+License
+=======
+
+The source code is available under a GPLv2 license.
+
+Contact and Bugreports
+======================
+
+For questions you can join the geocoding mailinglist, see
+http://lists.openstreetmap.org/listinfo/geocoding
+
+Bugs may be reported on the github project site:
+https://github.com/twain47/Nominatim

README.md

@@ -1,58 +0,0 @@
-[![Build Status](https://travis-ci.org/openstreetmap/Nominatim.svg?branch=master)](https://travis-ci.org/openstreetmap/Nominatim)
-
-Nominatim
-=========
-
-Nominatim (from the Latin, 'by name') is a tool to search OpenStreetMap data
-by name and address (geocoding) and to generate synthetic addresses of
-OSM points (reverse geocoding). An instance with up-to-date data can be found
-at https://nominatim.openstreetmap.org. Nominatim is also used as one of the
-sources for the Search box on the OpenStreetMap home page and powers the search
-on the MapQuest Open Initiative websites.
-
-Documentation
-=============
-
-More information about Nominatim, including usage and installation instructions,
-can be found in the docs/ subdirectory and in the OSM wiki at:
-
-https://nominatim.org
-
-Installation
-============
-
-The latest stable release can be downloaded from https://nominatim.org.
-There you can also find [installation instructions for the release](https://nominatim.org/release-docs/latest/Installation).
-
-Detailed installation instructions for the development version can be
-found in the `/docs` directory, see [docs/Installation.md](docs/Installation.md).
-
-A quick summary of the necessary steps:
-
-1. Compile Nominatim:
-
-        mkdir build
-        cd build
-        cmake ..
-        make
-
-2. Get OSM data and import:
-
-        ./build/utils/setup.php --osm-file <your planet file> --all
-
-3. Point your webserver to the ./build/website directory.
-
-
-License
-=======
-
-The source code is available under a GPLv2 license.
-
-Contact and Bug reports
-======================
-
-For questions you can join the geocoding mailinglist, see
-https://lists.openstreetmap.org/listinfo/geocoding
-
-Bugs may be reported on the github project site:
-https://github.com/openstreetmap/Nominatim

VAGRANT.md

@@ -17,7 +17,7 @@ is.
 
 3. Nominatim 
 
-        git clone --recursive https://github.com/openstreetmap/Nominatim.git
+        git clone --recursive https://github.com/twain47/Nominatim.git
 
     If you haven't used `--recursive`, then you can load the submodules using
     
@@ -43,17 +43,18 @@ is.
     
     See the FAQ how to skip this step and point Nominatim to an existing database.
 
-      ```
-      # inside the virtual machine:
-      mkdir data
-      cd build
-      wget --no-verbose --output-document=../data/monaco.osm.pbf http://download.geofabrik.de/europe/monaco-latest.osm.pbf
-      ./utils/setup.php --osm-file ../data/monaco.osm.pbf --osm2pgsql-cache 1000 --all 2>&1 | tee monaco.$$.log
-      ```
+  ```
+  # inside the virtual machine:
+  cd Nominatim
+    wget --no-verbose --output-document=data/monaco.osm.pbf http://download.geofabrik.de/europe/monaco-latest.osm.pbf
+    ./utils/setup.php --osm-file data/monaco.osm.pbf --osm2pgsql-cache 1000 --all 2>&1 | tee monaco.$$.log
+    ./utils/specialphrases.php --countries > data/specialphrases_countries.sql
+    psql -d nominatim -f data/specialphrases_countries.sql
+    ```
 
-    To repeat an import you'd need to delete the database first
+  To repeat an import you'd need to delete the database first
 
-        dropdb --if-exists nominatim
+        dropdb -if-exists nominatim
 
 
 
@@ -102,7 +103,7 @@ and then
 
 ## Running unit tests
 
-    cd ~/Nominatim/tests/php
+    cd ~/Nominatim/tests-php
     phpunit ./
 
 
@@ -128,7 +129,7 @@ No. Long running Nominatim installations will differ once new import features (o
 bug fixes) get added since those usually only get applied to new/changed data.
 
 Also this document skips the optional Wikipedia data import which affects ranking
-of search results. See [Nominatim installation](http://nominatim.org/release-docs/latest/Installation) for details.
+of search results. See [Nominatim installation](http://wiki.openstreetmap.org/wiki/Nominatim/Installation) for details.
 
 ##### Why Ubuntu and CentOS, can I test CentOS/CoreOS/FreeBSD?
 

Vagrantfile

@@ -3,42 +3,20 @@
 
 Vagrant.configure("2") do |config|
   # Apache webserver
-  config.vm.network "forwarded_port", guest: 80, host: 8089
+  config.vm.network "forwarded_port", guest: 8089, host: 8089
 
   # If true, then any SSH connections made will enable agent forwarding.
   config.ssh.forward_agent = true
 
-  checkout = "yes"
-  if ENV['CHECKOUT'] != 'y' then
-      config.vm.synced_folder ".", "/home/vagrant/Nominatim"
-      checkout = "no"
-  end
+  config.vm.synced_folder ".", "/home/vagrant/Nominatim"
 
-  config.vm.define "ubuntu", primary: true do |sub|
-      sub.vm.box = "bento/ubuntu-16.04"
-      sub.vm.provision :shell do |s|
-        s.path = "vagrant/Install-on-Ubuntu-16.sh"
-        s.privileged = false
-        s.args = [checkout]
-      end
+  config.vm.define "ubuntu" do |sub|
+      sub.vm.box = "ubuntu/trusty64"
+      sub.vm.provision :shell, :path => "vagrant/ubuntu-trusty-provision.sh"
   end
-
-  config.vm.define "travis" do |sub|
-      sub.vm.box = "bento/ubuntu-14.04"
-      sub.vm.provision :shell do |s|
-        s.path = "vagrant/install-on-travis-ci.sh"
-        s.privileged = false
-        s.args = [checkout]
-      end
-  end
-
-   config.vm.define "centos" do |sub|
+  config.vm.define "centos" do |sub|
       sub.vm.box = "bento/centos-7.2"
-      sub.vm.provision :shell do |s|
-        s.path = "vagrant/Install-on-Centos-7.sh"
-        s.privileged = false
-        s.args = [checkout]
-      end
+      sub.vm.provision :shell, :path => "vagrant/centos-7-provision.sh"
   end
 
   # configure shared package cache if possible

autogen.sh

@@ -0,0 +1,2 @@
+#!/bin/sh
+autoreconf -vfi

configure.ac

@@ -0,0 +1,67 @@
+AC_INIT(Nominatim,2.5.1)
+if git rev-parse HEAD 2>/dev/null >/dev/null; then
+    AC_SUBST([PACKAGE_VERSION], [$PACKAGE_VERSION-git-`git rev-parse --short HEAD`])
+fi
+
+dnl Required autoconf version
+AC_PREREQ(2.61)
+
+AM_INIT_AUTOMAKE([1.9.6 dist-bzip2 std-options check-news])
+
+dnl Additional macro definitions are in here
+m4_include([m4/ax_lib_postgresql_svr.m4])
+AC_CONFIG_MACRO_DIR([osm2pgsql/m4])
+
+dnl Generate configuration header file
+AC_CONFIG_HEADER(nominatim/config.h)
+
+
+dnl Find C compiler
+AC_PROG_CC
+
+dnl Find C++ compiler
+AC_PROG_CXX
+
+dnl pthread
+AX_PTHREAD([], [AC_MSG_ERROR([pthread library required])])
+
+dnl Check for Geos library
+AX_LIB_GEOS
+if test "x$GEOS_VERSION" = "x" 
+then
+  AC_MSG_ERROR([required library not found]);
+fi
+
+dnl Check for Proj library
+AX_LIB_PROJ
+if test "$HAVE_PROJ" = "no" 
+then
+  AC_MSG_ERROR([required library not found]);
+fi
+
+
+dnl Check for PostgresSQL client library
+AX_LIB_POSTGRESQL(9.0)
+if test "x$POSTGRESQL_VERSION" = "x"
+then
+    AC_MSG_ERROR([postgresql client library not found])
+fi
+AX_LIB_POSTGRESQL_SVR(9.0)
+if test ! -f "$POSTGRESQL_PGXS"
+then
+    AC_MSG_ERROR([postgresql server development library not found])
+fi
+
+dnl Check for bzip2 library
+AX_LIB_BZIP2
+if test "$HAVE_BZIP2" = "no" 
+then
+  AC_MSG_ERROR([required library not found]);
+fi
+
+dnl Check for libxml2 library
+AM_PATH_XML2
+
+AC_CONFIG_SUBDIRS([osm2pgsql])
+
+AC_OUTPUT(Makefile nominatim/Makefile module/Makefile)

contrib/openlayers.cfg

@@ -0,0 +1,36 @@
+# This file includes a small subset of OpenLayers code, designed to be
+# integrated into another application. It includes only the Layer types
+# neccesary to create tiled or untiled WMS, and does not include any Controls.
+# This is the result of what was at the time called "Webmap.js" at the FOSS4G
+# Web Mapping BOF.
+
+[first]
+
+[last]
+
+[include]
+OpenLayers/Map.js
+OpenLayers/Kinetic.js
+OpenLayers/Geometry/MultiLineString.js
+OpenLayers/Geometry/MultiPolygon.js
+OpenLayers/Format/WKT.js
+OpenLayers/Layer/OSM.js
+OpenLayers/Layer/Vector.js
+OpenLayers/Layer/SphericalMercator.js
+OpenLayers/Control/Attribution.js
+OpenLayers/Control/KeyboardDefaults.js
+OpenLayers/Control/Navigation.js
+OpenLayers/Control/MousePosition.js
+OpenLayers/Control/PanZoomBar.js
+OpenLayers/Control/Permalink.js
+OpenLayers/Control/TouchNavigation.js
+OpenLayers/Style.js
+OpenLayers/Protocol/HTTP.js
+OpenLayers/Projection.js
+OpenLayers/Renderer/SVG.js
+OpenLayers/Renderer/VML.js
+OpenLayers/Renderer/Canvas.js
+
+[exclude]
+
+

docs/CMakeLists.txt

@@ -1,17 +0,0 @@
-# Auto-generated vagrant install documentation
-
-
-# build the actual documentation
-
-configure_file(mkdocs.yml ../mkdocs.yml)
-file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/appendix)
-
-ADD_CUSTOM_TARGET(doc
-   COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_CURRENT_SOURCE_DIR}/admin ${CMAKE_CURRENT_BINARY_DIR}/admin
-   COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_CURRENT_SOURCE_DIR}/index.md ${CMAKE_CURRENT_BINARY_DIR}/index.md
-   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-Ubuntu-16.sh ${CMAKE_CURRENT_BINARY_DIR}/appendix/Install-on-Ubuntu-16.md
-   COMMAND mkdocs build -d ${CMAKE_CURRENT_BINARY_DIR}/../site-html -f ${CMAKE_CURRENT_BINARY_DIR}/../mkdocs.yml
-)
-
-

docs/admin/Faq.md

@@ -1,126 +0,0 @@
-# Running Your Own Instance
-
-### Can I import only a few countries and also keep them up to date?
-
-You should use the extracts and updates from https://download.geofabrik.de.
-For the intial import, download the countries you need and merge them.
-See [OSM Help](https://help.openstreetmap.org/questions/48843/merging-two-or-more-geographical-areas-to-import-two-or-more-osm-files-in-nominatim)
-for examples how to do that. Use the resulting single osm file when
-running `setup.php`.
-
-For updates you need to download the change files for each country
-once per day and apply them **separately** using
-
-    ./utils/update.php --import-diff <filename> --index
-    
-See [this issue](https://github.com/openstreetmap/Nominatim/issues/60#issuecomment-18679446)
-for a script that runs the updates using osmosis.
-
-### My website shows: `XML Parsing Error: XML or text declaration not at start of entity Location</code>.`
-
-Make sure there are no spaces at the beginning of your `settings/local.php` file.
-
-
-# Installation
-
-### I accidentally killed the import process after it has been running for many hours. Can it be resumed?
-
-It is possible if the import already got to the indexing stage.
-Check the last line of output that was logged before the process
-was killed. If it looks like this:
-
-
-    Done 844 in 13 @ 64.923080 per second - Rank 26 ETA (seconds): 7.886255
-
-then you can resume with the following command:
-
-```sh
-./utils/setup.php --index --create-search-indices --create-country-names
-```
-
-If the reported rank is 26 or higher, you can also safely add `--index-noanalyse`.
-
-
-### When running the setup.php script I get a warning:
-    `PHP Warning:  file_get_contents(): open_basedir restriction in effect.`
-
-You need to adjust the [open_basedir](http://www.php.net/manual/en/ini.core.php#ini.open-basedir) setting
-in your PHP configuration (php.ini file). By default this setting may look like this:
-
-    open_basedir = /srv/http/:/home/:/tmp/:/usr/share/pear/
-
-Either add reported directories to the list or disable this setting temporarily by 
-dding ";" at the beginning of the line. Don't forget to enable this setting again
-once you are done with the PHP command line operations.
-
-
-### The Apache log contains lots of PHP warnings like this:
-    `PHP Warning:  date_default_timezone_set() function.`
-
-You should set the default time zone as instructed in the warning in
-your `php.ini` file. Find the entry about timezone and set it to
-something like this:
-  
-    ; Defines the default timezone used by the date functions
-    ; http://php.net/date.timezone
-    date.timezone = 'America/Denver'
-
-Or
-
-```
-echo "date.timezone = 'America/Denver'" > /etc/php.d/timezone.ini
-```
-
-### When running the import I get a version mismatch:
-    `COPY_END for place failed: ERROR: incompatible library "/opt/Nominatim/module/nominatim.so": version mismatch`
-
-pg_config seems to use bad includes sometimes when multiple versions
-of PostgreSQL are available in the system. Make sure you remove the
-server development libraries (`postgresql-server-dev-9.1` on Ubuntu)
-and recompile (`cmake .. && make`).
-
-
-### I see the error: `function transliteration(text) does not exist`
-
-Reinstall the nominatim functions with `setup.php --create--functions`
-and check for any errors, e.g. a missing `nominatim.so` file.
-
-
-### The website shows: `Could not get word tokens`
-
-The server cannot access your database. Add `&debug=1` to your URL
-to get the full error message.
-
-
-### On CentOS the website shows `could not connect to server: No such file or directory`
-
-On CentOS v7 the PostgreSQL server is started with `systemd`.
-Check if `/usr/lib/systemd/system/httpd.service` contains a line `PrivateTmp=true`.
-If so then Apache cannot see the `/tmp/.s.PGSQL.5432` file. It's a good security feature,
-so use the [preferred solution](../appendix/Install-on-Centos-7/#adding-selinux-security-settings).
-
-However, you can solve this the quick and dirty way by commenting out that line and then run
-
-    sudo systemctl daemon-reload
-    sudo systemctl restart httpd
-
-
-### Setup.php fails with the message: `DB Error: extension not found`
-
-Make sure you have the Postgres extensions hstore and postgis installed.
-See the installation instruction for a full list of required packages.
-
-### When running the setup.php script I get a error:
-    `Cannot redeclare getDB() (previously declared in /your/path/Nominatim/lib/db.php:4)`
-
-The message is a bit misleading as PHP needs to load the file `DB.php` and
-instead re-loads Nominatim's `db.php`. To solve this make sure you
-have the [http://pear.php.net/package/DB/ Pear module 'DB'] installed.
-
-    sudo pear install DB
-
-### I forgot to delete the flatnodes file before starting an import.
-
-That's fine. For each import the flatnodes file get overwritten.
-See https://help.openstreetmap.org/questions/52419/nominatim-flatnode-storage
-for more information.

docs/admin/Import-and-Update.md

@@ -1,214 +0,0 @@
-The following instructions explain how to create a Nominatim database
-from an OSM planet file and how to keep the database up to date. It
-is assumed that you have already successfully installed the Nominatim
-software itself, if not return to the [installation page](Installation.md).
-
-# Configuration setup in settings/local.php
-
-The Nominatim server can be customized via the file `settings/local.php`
-in the build directory. Note that this is a PHP file, so it must always
-start like this:
-
-    <?php
-
-without any leading spaces.
-
-There are lots of configuration settings you can tweak. Have a look
-at `settings/default.php` for a full list. Most should have a sensible default.
-
-### Flatnode files
-
-If you plan to import a large dataset (e.g. Europe, North America, planet),
-you should also enable flatnode storage of node locations. With this
-setting enabled, node coordinates are stored in a simple file instead
-of the database. This will save you import time and disk storage.
-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 40GB of free space.
-
-# Downloading additional data
-
-## Wikipedia rankings
-
-Wikipedia can be used as an optional auxiliary data source to help indicate
-the importance of osm features. Nominatim will work without this information
-but it will improve the quality of the results if this is installed.
-This data is available as a binary download:
-
-    cd $NOMINATIM_SOURCE_DIR/data
-    wget https://www.nominatim.org/data/wikipedia_article.sql.bin
-    wget https://www.nominatim.org/data/wikipedia_redirect.sql.bin
-
-Combined the 2 files are around 1.5GB and add around 30GB to the install
-size of nominatim. They also increase the install time by an hour or so.
-
-*NOTE:* you'll need to download the Wikipedia rankings before performing
-the initial import of the data if you want the rankings applied to the
-loaded data.
-
-## UK postcodes
-
-Nominatim can use postcodes from an external source to improve searches that involve a UK postcode. This data can be optionally downloaded: 
-
-    cd $NOMINATIM_SOURCE_DIR/data
-    wget https://www.nominatim.org/data/gb_postcode_data.sql.gz
-
-
-# Initial import of the data
-
-**Important:** first try the import with a small excerpt, for example from
-[Geofabrik](https://download.geofabrik.de).
-
-Download the data to import and load the data with the following command:
-
-```sh
-./utils/setup.php --osm-file <data file> --all [--osm2pgsql-cache 28000] 2>&1 | tee setup.log
-```
-
-The `--osm2pgsql-cache` parameter is optional but strongly recommended for
-planet imports. It sets the node cache size for the osm2pgsql import part
-(see `-C` parameter in osm2pgsql help). As a rule of thumb, this should be
-about the same size as the file you are importing but never more than
-2/3 of RAM available. If your machine starts swapping reduce the size.
-
-Computing word frequency for search terms can improve the performance of
-forward geocoding in particular under high load as it helps Postgres' query
-planner to make the right decisions. To recompute word counts run:
-
-```sh
-./utils/update.php --recompute-word-counts
-```
-
-This will take a couple of hours for a full planet installation. You can
-also defer that step to a later point in time when you realise that
-performance becomes an issue. Just make sure that updates are stopped before
-running this function.
-
-If you want to be able to search for places by their type through
-[special key phrases](https://wiki.openstreetmap.org/wiki/Nominatim/Special_Phrases)
-you also need to enable these key phrases like this:
-
-    ./utils/specialphrases.php --wiki-import > specialphrases.sql
-    psql -d nominatim -f specialphrases.sql
-
-Note that this command downloads the phrases from the wiki link above.
-
-
-# Installing Tiger housenumber data for the US
-
-Nominatim is able to use the official TIGER address set to complement the
-OSM house number data in the US. You can add TIGER data to your own Nominatim
-instance by following these steps:
-
-  1. Install the GDAL library and python bindings and the unzip tool
-
-       * Ubuntu: `sudo apt-get install python-gdal unzip`
-       * CentOS: `sudo yum install gdal-python unzip`
-
-  2. Get preprocessed TIGER 2015 data and unpack it into the
-     data directory in your Nominatim sources:
-
-        cd Nominatim/data
-        wget https://nominatim.org/data/tiger2017-nominatim-preprocessed.tar.gz
-        tar xf tiger2017-nominatim-preprocessed.tar.gz
-
-  3. Import the data into your Nominatim database: 
-
-        ./utils/setup.php --import-tiger-data
-
-  4. Enable use of the Tiger data in your `settings/local.php` by adding:
-
-         @define('CONST_Use_US_Tiger_Data', true);
-
-  5. Apply the new settings:
-
-```sh
-    ./utils/setup.php --create-functions --enable-diff-updates --create-partition-functions
-```
-
-The entire US adds about 10GB to your database.
-
-You can also process the data from the original TIGER data to create the
-SQL files, Nominatim needs for the import:
-
-  1. Get the TIGER 2017 data. You will need the EDGES files
-     (3,234 zip files, 11GB total). Choose one of the two sources:
-
-         wget -r ftp://ftp2.census.gov/geo/tiger/TIGER2017/EDGES/
-         wget -r ftp://mirror1.shellbot.com/census/geo/tiger/TIGER2017/EDGES/
-
-     The first one is the original source, the second a considerably faster
-     mirror.
-
-  2. Convert the data into SQL statements: 
-
-         ./utils/imports.php --parse-tiger <tiger edge data directory>
-
-Be warned that this can take quite a long time. After this process is finished,
-the same preprocessed files as above are available in `data/tiger`.
-
-# Updates
-
-There are many different possibilities 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`.
-
-### Installing the newest version of Pyosmium
-
-It is recommended to install Pyosmium via pip. Run (as the same user who
-will later run the updates):
-
-```sh
-pip install --user osmium
-```
-
-Nominatim needs a tool called `pyosmium-get-updates` that comes with
-Pyosmium. You need to tell Nominatim where to find it. Add the
-following line to your `settings/local.php`:
-
-    @define('CONST_Pyosmium_Binary', '/home/user/.local/bin/pyosmium-get-changes');
-
-The path above is fine if you used the `--user` parameter with pip.
-Replace `user` with your user name.
-
-### Setting up the update process
-
-Next the update needs to be initialised. By default Nominatim is configured
-to update using the global minutely diffs.
-
-If you want a different update source you will need to add some settings
-to `settings/local.php`. For example, to use the daily country extracts
-diffs for Ireland from geofabrik add the following:
-
-    // base URL of the replication service
-    @define('CONST_Replication_Url', 'https://download.geofabrik.de/europe/ireland-and-northern-ireland-updates');
-    // How often upstream publishes diffs
-    @define('CONST_Replication_Update_Interval', '86400');
-    // How long to sleep if no update found yet
-    @define('CONST_Replication_Recheck_Interval', '900');
-
-To set up the update process now run the following command:
-
-    ./utils/update.php --init-updates
-
-It outputs the date where updates will start. Recheck that this date is
-what you expect.
-
-The --init-updates command needs to be rerun whenever the replication service
-is changed.
-
-### Updating Nominatim
-
-The following command will keep your database constantly up to date:
-
-    ./utils/update.php --import-osmosis-all
-
-(Note that even though the old name "import-osmosis-all" has been kept for compatibility reasons, Osmosis is not required to run this - it uses pyosmium behind the scenes.)
-
-If you have imported multiple country extracts and want to keep them
-up-to-date, have a look at the script in
-[issue #60](https://github.com/openstreetmap/Nominatim/issues/60).
-

docs/admin/Installation.md

@@ -1,148 +0,0 @@
-This page contains generic installation instructions for Nominatim and its
-prerequisites. There are also step-by-step instructions available for
-the following operating systems:
-
-  * [Ubuntu 16.04](../appendix/Install-on-Ubuntu-16.md)
-  * [CentOS 7.2](../appendix/Install-on-Centos-7.md)
-
-These OS-specific instructions can also be found in executable form
-in the `vagrant/` directory.
-
-# Prerequisites
-
-## Software
-
-For compiling:
-
-  * [cmake](https://cmake.org/)
-  * [libxml2](http://xmlsoft.org/)
-  * a recent C++ compiler
-
-Nominatim comes with its own version of osm2pgsql. See the
-osm2pgsql README for additional dependencies required for compiling osm2pgsql.
-
-For running tests:
-
-  * [behave](http://pythonhosted.org/behave/)
-  * [Psycopg2](http://initd.org/psycopg)
-  * [nose](https://nose.readthedocs.io)
-  * [phpunit](https://phpunit.de)
-
-For running Nominatim:
-
-  * [PostgreSQL](http://www.postgresql.org) (9.1 or later)
-  * [PostGIS](http://postgis.refractions.net) (2.0 or later)
-  * [PHP](http://php.net) (5.4 or later)
-  * PHP-pgsql
-  * PHP-intl (bundled with PHP)
-  * [PEAR::DB](http://pear.php.net/package/DB)
-  * a webserver (apache or nginx are recommended)
-
-For running continuous updates:
-
-  * [pyosmium](http://osmcode.org/pyosmium/)
-
-## Hardware
-
-A minimum of 2GB of RAM is required or installation will fail. For a full
-planet import 32GB of RAM or more strongly are recommended.
-
-For a full planet install you will need about 600GB of hard disk space (as of
-January 2017, take into account that the OSM database is growing fast). SSD disks
-will help considerably to speed up import and queries.
-
-On a 6-core machine with 32GB RAM and SSDs the import of a full planet takes
-a bit more than 2 days. Without SSDs 7-8 days are more realistic.
-
-
-# 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
-your `postgresql.conf` file.
-
-    shared_buffers (2GB)
-    maintenance_work_mem (10GB)
-    work_mem (50MB)
-    effective_cache_size (24GB)
-    synchronous_commit = off
-    checkpoint_segments = 100 # only for postgresql <= 9.4
-    checkpoint_timeout = 10min
-    checkpoint_completion_target = 0.9
-
-The numbers in brackets behind some parameters seem to work fine for
-32GB RAM machine. Adjust to your setup.
-
-For the initial import, you should also set:
-
-    fsync = off
-    full_page_writes = off
-
-Don't forget to reenable them after the initial import or you risk database
-corruption. Autovacuum must not be switched off because it ensures that the
-tables are frequently analysed.
-
-## Webserver setup
-
-The `website/` directory in the build directory contains the configured
-website. Include the directory into your webbrowser to serve php files
-from there.
-
-### Configure for use with Apache
-
-Make sure your Apache configuration contains the required permissions for the
-directory and create an alias:
-
-    <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
-
-`/srv/nominatim/build` should be replaced with the location of your
-build directory.
-
-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.
-
-    root /srv/nominatim/build/website;
-    index search.php index.html;
-    location ~ [^/]\.php(/|$) {
-        fastcgi_split_path_info ^(.+?\.php)(/.*)$;
-        if (!-f $document_root$fastcgi_script_name) {
-            return 404;
-        }
-        fastcgi_pass unix:/var/run/php5-fpm.sock;
-        fastcgi_index search.php;
-        include fastcgi.conf;
-    }
-
-Restart the nginx and php5-fpm services and the website should now be available
-at `http://localhost/`.
-
-
-Now continue with [importing the database](Import-and-Update.md).

docs/admin/Migration.md

@@ -1,66 +0,0 @@
-Database Migrations
-===================
-
-This page describes database migrations necessary to update existing databases
-to newer versions of Nominatim.
-
-SQL statements should be executed from the postgres commandline. Execute
-`psql nominiatim` to enter command line mode.
-
-# 3.0.0 -> 3.1.0
-
-### Postcode Table
-
-A new separate table for artificially computed postcode centroids was introduced.
-Migration to the new format is possible but **not recommended**.
-
-Create postcode table and indexes, running the following SQL statements:
-
-```sql
-CREATE TABLE location_postcode
-  (place_id BIGINT, parent_place_id BIGINT, rank_search SMALLINT,
-   rank_address SMALLINT, indexed_status SMALLINT, indexed_date TIMESTAMP,
-   country_code varchar(2), postcode TEXT,
-   geometry GEOMETRY(Geometry, 4326));
-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";
-```
-
-Add postcode column to `location_area` tables with SQL statement:
-
-```sql
-ALTER TABLE location_area ADD COLUMN postcode TEXT;
-```
-
-Then reimport the functions:
-
-```sh
-./utils/setup.php --create-functions --enable-diff-updates --create-partition-functions
-```
-
-Create appropriate triggers with SQL:
-
-```sql
-CREATE TRIGGER location_postcode_before_update BEFORE UPDATE ON location_postcode
-    FOR EACH ROW EXECUTE PROCEDURE postcode_update();
-```
-
-Finally populate the postcode table (will take a while):
-
-```sh
-./utils/setup.php --calculate-postcodes --index --index-noanalyse
-```
-
-This will create a working database. You may also delete the old artificial
-postcodes now. Note that this may be expensive and is not absolutely necessary.
-The following SQL statement will remove them:
-
-```sql
-DELETE FROM place_addressline a USING placex p
- WHERE a.address_place_id = p.place_id and p.osm_type = 'P';
-ALTER TABLE placex DISABLE TRIGGER USER;
-DELETE FROM placex WHERE osm_type = 'P';
-ALTER TABLE placex ENABLE TRIGGER USER;
-```

docs/bash2md.sh

@@ -1,7 +0,0 @@
-#!/bin/sh
-#
-# Extract markdown-formatted documentation from a source file
-#
-# Usage: bash2md.sh <infile> <outfile>
-
-sed '/^#!/d;s:^#\( \|$\)::;s/.*#DOCS://' $1 > $2

docs/index.md

@@ -1 +0,0 @@
-Nominatim (from the Latin, 'by name') is a tool to search OSM data by name and address and to generate synthetic addresses of OSM points (reverse geocoding).

docs/mkdocs.yml

@@ -1,18 +0,0 @@
-site_name: Nominatim Documentation
-theme: readthedocs
-docs_dir: ${CMAKE_CURRENT_BINARY_DIR}
-site_url: http://nominatim.org
-repo_url: https://github.com/openstreetmap/Nominatim
-pages:
-    - 'Introduction' : 'index.md'
-    - 'Administration Guide':
-        - 'Basic Installation': 'admin/Installation.md'
-        - 'Importing and Updating' : 'admin/Import-and-Update.md'
-        - 'Migration from older Versions' : 'admin/Migration.md'
-        - 'Troubleshooting' : 'admin/Faq.md'
-    - 'Appendix':
-        - 'Installation on CentOS 7' : 'appendix/Install-on-Centos-7.md'
-        - 'Installation on Ubuntu 16' : 'appendix/Install-on-Ubuntu-16.md'
-markdown_extensions:
-    - codehilite:
-        use_pygments: False

lib/ParameterParser.php

@@ -1,120 +0,0 @@
-<?php
-
-namespace Nominatim;
-
-class ParameterParser
-{
-    private $aParams;
-
-
-    public function __construct($aParams = null)
-    {
-        $this->aParams = ($aParams === null) ? $_GET : $aParams;
-    }
-
-    public function getBool($sName, $bDefault = false)
-    {
-        if (!isset($this->aParams[$sName]) || strlen($this->aParams[$sName]) == 0) {
-            return $bDefault;
-        }
-
-        return (bool) $this->aParams[$sName];
-    }
-
-    public function getInt($sName, $bDefault = false)
-    {
-        if (!isset($this->aParams[$sName]) || strlen($this->aParams[$sName]) == 0) {
-            return $bDefault;
-        }
-
-        if (!preg_match('/^[+-]?[0-9]+$/', $this->aParams[$sName])) {
-            userError("Integer number expected for parameter '$sName'");
-        }
-
-        return (int) $this->aParams[$sName];
-    }
-
-    public function getFloat($sName, $bDefault = false)
-    {
-        if (!isset($this->aParams[$sName]) || strlen($this->aParams[$sName]) == 0) {
-            return $bDefault;
-        }
-
-        if (!preg_match('/^[+-]?[0-9]*\.?[0-9]+$/', $this->aParams[$sName])) {
-            userError("Floating-point number expected for parameter '$sName'");
-        }
-
-        return (float) $this->aParams[$sName];
-    }
-
-    public function getString($sName, $bDefault = false)
-    {
-        if (!isset($this->aParams[$sName]) || strlen($this->aParams[$sName]) == 0) {
-            return $bDefault;
-        }
-
-        return $this->aParams[$sName];
-    }
-
-    public function getSet($sName, $aValues, $sDefault = false)
-    {
-        if (!isset($this->aParams[$sName]) || strlen($this->aParams[$sName]) == 0) {
-            return $sDefault;
-        }
-
-        if (!in_array($this->aParams[$sName], $aValues)) {
-            userError("Parameter '$sName' must be one of: ".join(', ', $aValues));
-        }
-
-        return $this->aParams[$sName];
-    }
-
-    public function getStringList($sName, $aDefault = false)
-    {
-        $sValue = $this->getString($sName);
-
-        if ($sValue) {
-            return explode(',', $sValue);
-        }
-
-        return $aDefault;
-    }
-
-    public function getPreferredLanguages($sFallback = null)
-    {
-        if ($sFallback === null && isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
-            $sFallback = $_SERVER['HTTP_ACCEPT_LANGUAGE'];
-        }
-
-        $aLanguages = array();
-        $sLangString = $this->getString('accept-language', $sFallback);
-
-        if ($sLangString) {
-            if (preg_match_all('/(([a-z]{1,8})(-[a-z]{1,8})?)\s*(;\s*q\s*=\s*(1|0\.[0-9]+))?/i', $sLangString, $aLanguagesParse, PREG_SET_ORDER)) {
-                foreach ($aLanguagesParse as $iLang => $aLanguage) {
-                    $aLanguages[$aLanguage[1]] = isset($aLanguage[5])?(float)$aLanguage[5]:1 - ($iLang/100);
-                    if (!isset($aLanguages[$aLanguage[2]])) $aLanguages[$aLanguage[2]] = $aLanguages[$aLanguage[1]]/10;
-                }
-                arsort($aLanguages);
-            }
-        }
-        if (!sizeof($aLanguages) && CONST_Default_Language) {
-            $aLanguages[CONST_Default_Language] = 1;
-        }
-
-        foreach ($aLanguages as $sLanguage => $fLanguagePref) {
-            $aLangPrefOrder['short_name:'.$sLanguage] = 'short_name:'.$sLanguage;
-            $aLangPrefOrder['name:'.$sLanguage] = 'name:'.$sLanguage;
-        }
-        $aLangPrefOrder['short_name'] = 'short_name';
-        $aLangPrefOrder['name'] = 'name';
-        $aLangPrefOrder['brand'] = 'brand';
-        foreach ($aLanguages as $sLanguage => $fLanguagePref) {
-            $aLangPrefOrder['official_name:'.$sLanguage] = 'official_name:'.$sLanguage;
-        }
-        $aLangPrefOrder['official_name'] = 'official_name';
-        $aLangPrefOrder['ref'] = 'ref';
-        $aLangPrefOrder['type'] = 'type';
-        return $aLangPrefOrder;
-    }
-}

lib/Phrase.php

@@ -1,116 +0,0 @@
-<?php
-
-namespace Nominatim;
-
-/**
- * Segment of a query string.
- *
- * The parts of a query strings are usually separated by commas.
- */
-class Phrase
-{
-    const MAX_DEPTH = 7;
-
-    // Complete phrase as a string.
-    private $sPhrase;
-    // Element type for structured searches.
-    private $sPhraseType;
-    // Space-separated words of the phrase.
-    private $aWords;
-    // Possible segmentations of the phrase.
-    private $aWordSets;
-
-
-    public function __construct($sPhrase, $sPhraseType)
-    {
-        $this->sPhrase = trim($sPhrase);
-        $this->sPhraseType = $sPhraseType;
-        $this->aWords = explode(' ', $this->sPhrase);
-        $this->aWordSets = $this->createWordSets($this->aWords, 0);
-    }
-
-    /**
-     * Return the element type of the phrase.
-     *
-     * @return string Pharse type if the phrase comes from a structured query
-     *                or empty string otherwise.
-     */
-    public function getPhraseType()
-    {
-        return $this->sPhraseType;
-    }
-
-    /**
-     * Return the array of possible segmentations of the phrase.
-     *
-     * @return string[][] Array of segmentations, each consisting of an
-     *                    array of terms.
-     */
-    public function getWordSets()
-    {
-        return $this->aWordSets;
-    }
-
-    /**
-     * Add the tokens from this phrase to the given list of tokens.
-     *
-     * @param string[] $aTokens List of tokens to append.
-     *
-     * @return void
-     */
-    public function addTokens(&$aTokens)
-    {
-        foreach ($this->aWordSets as $aSet) {
-            foreach ($aSet as $sWord) {
-                $aTokens[' '.$sWord] = ' '.$sWord;
-                $aTokens[$sWord] = $sWord;
-            }
-        }
-    }
-
-    /**
-     * Invert the set of possible segmentations.
-     *
-     * @return void
-     */
-    public function invertWordSets()
-    {
-        $this->aWordSets = $this->createInverseWordSets($this->aWords, 0);
-    }
-
-    private function createWordSets($aWords, $iDepth)
-    {
-        $aResult = array(array(join(' ', $aWords)));
-        $sFirstToken = '';
-        if ($iDepth < Phrase::MAX_DEPTH) {
-            while (sizeof($aWords) > 1) {
-                $sWord = array_shift($aWords);
-                $sFirstToken .= ($sFirstToken?' ':'').$sWord;
-                $aRest = $this->createWordSets($aWords, $iDepth + 1);
-                foreach ($aRest as $aSet) {
-                    $aResult[] = array_merge(array($sFirstToken), $aSet);
-                }
-            }
-        }
-
-        return $aResult;
-    }
-
-    private function createInverseWordSets($aWords, $iDepth)
-    {
-        $aResult = array(array(join(' ', $aWords)));
-        $sFirstToken = '';
-        if ($iDepth < Phrase::MAX_DEPTH) {
-            while (sizeof($aWords) > 1) {
-                $sWord = array_pop($aWords);
-                $sFirstToken = $sWord.($sFirstToken?' ':'').$sFirstToken;
-                $aRest = $this->createInverseWordSets($aWords, $iDepth + 1);
-                foreach ($aRest as $aSet) {
-                    $aResult[] = array_merge(array($sFirstToken), $aSet);
-                }
-            }
-        }
-
-        return $aResult;
-    }
-}

lib/PlaceLookup.php

@@ -1,609 +1,223 @@
 <?php
-
-namespace Nominatim;
-
-require_once(CONST_BasePath.'/lib/Result.php');
-
-class PlaceLookup
-{
-    protected $oDB;
-
-    protected $aLangPrefOrderSql = "''";
-
-    protected $bAddressDetails = false;
-    protected $bExtraTags = false;
-    protected $bNameDetails = false;
-
-    protected $bIncludePolygonAsPoints = false;
-    protected $bIncludePolygonAsText = false;
-    protected $bIncludePolygonAsGeoJSON = false;
-    protected $bIncludePolygonAsKML = false;
-    protected $bIncludePolygonAsSVG = false;
-    protected $fPolygonSimplificationThreshold = 0.0;
-
-    protected $sAnchorSql = null;
-    protected $sAddressRankListSql = null;
-    protected $sAllowedTypesSQLList = null;
-    protected $bDeDupe = true;
-
-
-    public function __construct(&$oDB)
-    {
-        $this->oDB =& $oDB;
-    }
-
-    public function doDeDupe()
-    {
-        return $this->bDeDupe;
-    }
-
-    public function setIncludePolygonAsPoints($b = true)
-    {
-        $this->bIncludePolygonAsPoints = $b;
-    }
-
-    public function loadParamArray($oParams, $sGeomType = null)
-    {
-        $aLangs = $oParams->getPreferredLanguages();
-        $this->aLangPrefOrderSql =
-            'ARRAY['.join(',', array_map('getDBQuoted', $aLangs)).']';
-
-        $this->bAddressDetails = $oParams->getBool('addressdetails', true);
-        $this->bExtraTags = $oParams->getBool('extratags', false);
-        $this->bNameDetails = $oParams->getBool('namedetails', false);
-
-        $this->bDeDupe = $oParams->getBool('dedupe', $this->bDeDupe);
-
-        if ($sGeomType === null || $sGeomType == 'text') {
-            $this->bIncludePolygonAsText = $oParams->getBool('polygon_text');
-        }
-        if ($sGeomType === null || $sGeomType == 'geojson') {
-            $this->bIncludePolygonAsGeoJSON = $oParams->getBool('polygon_geojson');
-        }
-        if ($sGeomType === null || $sGeomType == 'kml') {
-            $this->bIncludePolygonAsKML = $oParams->getBool('polygon_kml');
-        }
-        if ($sGeomType === null || $sGeomType == 'svg') {
-            $this->bIncludePolygonAsSVG = $oParams->getBool('polygon_svg');
-        }
-        $this->fPolygonSimplificationThreshold
-            = $oParams->getFloat('polygon_threshold', 0.0);
-
-        $iWantedTypes =
-            ($this->bIncludePolygonAsText ? 1 : 0) +
-            ($this->bIncludePolygonAsGeoJSON ? 1 : 0) +
-            ($this->bIncludePolygonAsKML ? 1 : 0) +
-            ($this->bIncludePolygonAsSVG ? 1 : 0);
-        if ($iWantedTypes > CONST_PolygonOutput_MaximumTypes) {
-            if (CONST_PolygonOutput_MaximumTypes) {
-                userError('Select only '.CONST_PolygonOutput_MaximumTypes.' polgyon output option');
-            } else {
-                userError('Polygon output is disabled');
-            }
-        }
-    }
-
-    public function getMoreUrlParams()
-    {
-        $aParams = array();
-
-        if ($this->bAddressDetails) $aParams['addressdetails'] = '1';
-        if ($this->bExtraTags) $aParams['extratags'] = '1';
-        if ($this->bNameDetails) $aParams['namedetails'] = '1';
-
-        if ($this->bIncludePolygonAsPoints) $aParams['polygon'] = '1';
-        if ($this->bIncludePolygonAsText) $aParams['polygon_text'] = '1';
-        if ($this->bIncludePolygonAsGeoJSON) $aParams['polygon_geojson'] = '1';
-        if ($this->bIncludePolygonAsKML) $aParams['polygon_kml'] = '1';
-        if ($this->bIncludePolygonAsSVG) $aParams['polygon_svg'] = '1';
-
-        if ($this->fPolygonSimplificationThreshold > 0.0) {
-            $aParams['polygon_threshold'] = $this->fPolygonSimplificationThreshold;
-        }
-
-        if (!$this->bDeDupe) $aParams['dedupe'] = '0';
-
-        return $aParams;
-    }
-
-    public function setAnchorSql($sPoint)
-    {
-        $this->sAnchorSql = $sPoint;
-    }
-
-    public function setAddressRankList($aList)
-    {
-        $this->sAddressRankListSql = '('.join(',', $aList).')';
-    }
-
-    public function setAllowedTypesSQLList($sSql)
-    {
-        $this->sAllowedTypesSQLList = $sSql;
-    }
-
-    public function setLanguagePreference($aLangPrefOrder)
-    {
-        $this->aLangPrefOrderSql =
-            'ARRAY['.join(',', array_map('getDBQuoted', $aLangPrefOrder)).']';
-    }
-
-    public function setIncludeAddressDetails($bAddressDetails = true)
-    {
-        $this->bAddressDetails = $bAddressDetails;
-    }
-
-    private function addressImportanceSql($sGeometry, $sPlaceId)
-    {
-        if ($this->sAnchorSql) {
-            $sSQL = 'ST_Distance('.$this->sAnchorSql.','.$sGeometry.')';
-        } else {
-            $sSQL = '(SELECT max(ai_p.importance * (ai_p.rank_address + 2))';
-            $sSQL .= '   FROM place_addressline ai_s, placex ai_p';
-            $sSQL .= '   WHERE ai_s.place_id = '.$sPlaceId;
-            $sSQL .= '     AND ai_p.place_id = ai_s.address_place_id ';
-            $sSQL .= '     AND ai_s.isaddress ';
-            $sSQL .= '     AND ai_p.importance is not null)';
-        }
-
-        return $sSQL.' AS addressimportance,';
-    }
-
-    private function langAddressSql($sHousenumber)
-    {
-        return 'get_address_by_language(place_id,'.$sHousenumber.','.$this->aLangPrefOrderSql.') AS langaddress,';
-    }
-
-    public function lookupOSMID($sType, $iID)
-    {
-        $sSQL = "select place_id from placex where osm_type = '".$sType."' and osm_id = ".$iID;
-        $iPlaceID = chksql($this->oDB->getOne($sSQL));
-
-        if (!$iPlaceID) {
-            return null;
-        }
-
-        $aResults = $this->lookup(array($iPlaceID => new Result($iPlaceID)));
-
-        return sizeof($aResults) ? reset($aResults) : null;
-    }
-
-    public function lookup($aResults, $iMinRank = 0, $iMaxRank = 30)
-    {
-        if (!sizeof($aResults)) {
-            return array();
-        }
-        $aSubSelects = array();
-
-        $sPlaceIDs = Result::joinIdsByTable($aResults, Result::TABLE_PLACEX);
-        if (CONST_Debug) var_dump('PLACEX', $sPlaceIDs);
-        if ($sPlaceIDs) {
-            $sSQL  = 'SELECT ';
-            $sSQL .= '    osm_type,';
-            $sSQL .= '    osm_id,';
-            $sSQL .= '    class,';
-            $sSQL .= '    type,';
-            $sSQL .= '    admin_level,';
-            $sSQL .= '    rank_search,';
-            $sSQL .= '    rank_address,';
-            $sSQL .= '    min(place_id) AS place_id,';
-            $sSQL .= '    min(parent_place_id) AS parent_place_id,';
-            $sSQL .= '    -1 as housenumber,';
-            $sSQL .= '    country_code,';
-            $sSQL .= $this->langAddressSql('-1');
-            $sSQL .= '    get_name_by_language(name,'.$this->aLangPrefOrderSql.') AS placename,';
-            $sSQL .= "    get_name_by_language(name, ARRAY['ref']) AS ref,";
-            if ($this->bExtraTags) {
-                $sSQL .= 'hstore_to_json(extratags)::text AS extra,';
-            }
-            if ($this->bNameDetails) {
-                $sSQL .= 'hstore_to_json(name)::text AS names,';
-            }
-            $sSQL .= '    avg(ST_X(centroid)) AS lon, ';
-            $sSQL .= '    avg(ST_Y(centroid)) AS lat, ';
-            $sSQL .= '    COALESCE(importance,0.75-(rank_search::float/40)) AS importance, ';
-            $sSQL .= $this->addressImportanceSql(
-                'ST_Collect(centroid)',
-                'min(CASE WHEN placex.rank_search < 28 THEN placex.place_id ELSE placex.parent_place_id END)'
-            );
-            $sSQL .= "    (extratags->'place') AS extra_place ";
-            $sSQL .= ' FROM placex';
-            $sSQL .= " WHERE place_id in ($sPlaceIDs) ";
-            $sSQL .= '   AND (';
-            $sSQL .= "        placex.rank_address between $iMinRank and $iMaxRank ";
-            if (14 >= $iMinRank && 14 <= $iMaxRank) {
-                $sSQL .= "    OR (extratags->'place') = 'city'";
-            }
-            if ($this->sAddressRankListSql) {
-                $sSQL .= '    OR placex.rank_address in '.$this->sAddressRankListSql;
-            }
-            $sSQL .= '       ) ';
-            if ($this->sAllowedTypesSQLList) {
-                $sSQL .= 'AND placex.class in '.$this->sAllowedTypesSQLList;
-            }
-            $sSQL .= '    AND linked_place_id is null ';
-            $sSQL .= ' GROUP BY ';
-            $sSQL .= '     osm_type, ';
-            $sSQL .= '     osm_id, ';
-            $sSQL .= '     class, ';
-            $sSQL .= '     type, ';
-            $sSQL .= '     admin_level, ';
-            $sSQL .= '     rank_search, ';
-            $sSQL .= '     rank_address, ';
-            $sSQL .= '     housenumber,';
-            $sSQL .= '     country_code, ';
-            $sSQL .= '     importance, ';
-            if (!$this->bDeDupe) $sSQL .= 'place_id,';
-            $sSQL .= '     langaddress, ';
-            $sSQL .= '     placename, ';
-            $sSQL .= '     ref, ';
-            if ($this->bExtraTags) $sSQL .= 'extratags, ';
-            if ($this->bNameDetails) $sSQL .= 'name, ';
-            $sSQL .= "     extratags->'place' ";
-
-            $aSubSelects[] = $sSQL;
-        }
-
-        // postcode table
-        $sPlaceIDs = Result::joinIdsByTable($aResults, Result::TABLE_POSTCODE);
-        if ($sPlaceIDs) {
-            $sSQL = 'SELECT';
-            $sSQL .= "  'P' as osm_type,";
-            $sSQL .= '  (SELECT osm_id from placex p WHERE p.place_id = lp.parent_place_id) as osm_id,';
-            $sSQL .= "  'place' as class, 'postcode' as type,";
-            $sSQL .= '  null as admin_level, rank_search, rank_address,';
-            $sSQL .= '  place_id, parent_place_id,';
-            $sSQL .= '  null as housenumber,';
-            $sSQL .= '  country_code,';
-            $sSQL .= $this->langAddressSql('-1');
-            $sSQL .= '  postcode as placename,';
-            $sSQL .= '  postcode as ref,';
-            if ($this->bExtraTags) $sSQL .= 'null AS extra,';
-            if ($this->bNameDetails) $sSQL .= 'null AS names,';
-            $sSQL .= '  ST_x(geometry) AS lon, ST_y(geometry) AS lat,';
-            $sSQL .= '  (0.75-(rank_search::float/40)) AS importance, ';
-            $sSQL .= $this->addressImportanceSql('geometry', 'lp.parent_place_id');
-            $sSQL .= '  null AS extra_place ';
-            $sSQL .= 'FROM location_postcode lp';
-            $sSQL .= " WHERE place_id in ($sPlaceIDs) ";
-            $sSQL .= "   AND lp.rank_address between $iMinRank and $iMaxRank";
-
-            $aSubSelects[] = $sSQL;
-        }
-
-        // All other tables are rank 30 only.
-        if ($iMaxRank == 30) {
-            // TIGER table
-            if (CONST_Use_US_Tiger_Data) {
-                $sPlaceIDs = Result::joinIdsByTable($aResults, Result::TABLE_TIGER);
-                if ($sPlaceIDs) {
-                    $sHousenumbers = Result::sqlHouseNumberTable($aResults, Result::TABLE_TIGER);
-                    // Tiger search only if a housenumber was searched and if it was found
-                    // (realized through a join)
-                    $sSQL = ' SELECT ';
-                    $sSQL .= "     'T' AS osm_type, ";
-                    $sSQL .= '     (SELECT osm_id from placex p WHERE p.place_id=blub.parent_place_id) as osm_id, ';
-                    $sSQL .= "     'place' AS class, ";
-                    $sSQL .= "     'house' AS type, ";
-                    $sSQL .= '     null AS admin_level, ';
-                    $sSQL .= '     30 AS rank_search, ';
-                    $sSQL .= '     30 AS rank_address, ';
-                    $sSQL .= '     place_id, ';
-                    $sSQL .= '     parent_place_id, ';
-                    $sSQL .= '     housenumber_for_place as housenumber,';
-                    $sSQL .= "     'us' AS country_code, ";
-                    $sSQL .= $this->langAddressSql('housenumber_for_place');
-                    $sSQL .= '     null AS placename, ';
-                    $sSQL .= '     null AS ref, ';
-                    if ($this->bExtraTags) $sSQL .= 'null AS extra,';
-                    if ($this->bNameDetails) $sSQL .= 'null AS names,';
-                    $sSQL .= '     st_x(centroid) AS lon, ';
-                    $sSQL .= '     st_y(centroid) AS lat,';
-                    $sSQL .= '     -1.15 AS importance, ';
-                    $sSQL .= $this->addressImportanceSql('centroid', 'blub.parent_place_id');
-                    $sSQL .= '     null AS extra_place ';
-                    $sSQL .= ' FROM (';
-                    $sSQL .= '     SELECT place_id, ';    // interpolate the Tiger housenumbers here
-                    $sSQL .= '         ST_LineInterpolatePoint(linegeo, (housenumber_for_place-startnumber::float)/(endnumber-startnumber)::float) AS centroid, ';
-                    $sSQL .= '         parent_place_id, ';
-                    $sSQL .= '         housenumber_for_place';
-                    $sSQL .= '     FROM (';
-                    $sSQL .= '            location_property_tiger ';
-                    $sSQL .= '            JOIN (values '.$sHousenumbers.') AS housenumbers(place_id, housenumber_for_place) USING(place_id)) ';
-                    $sSQL .= '     WHERE ';
-                    $sSQL .= '         housenumber_for_place >= startnumber';
-                    $sSQL .= '         AND housenumber_for_place <= endnumber';
-                    $sSQL .= ' ) AS blub'; //postgres wants an alias here
-
-                    $aSubSelects[] = $sSQL;
-                }
-            }
-
-            // osmline - interpolated housenumbers
-            $sPlaceIDs = Result::joinIdsByTable($aResults, Result::TABLE_OSMLINE);
-            if ($sPlaceIDs) {
-                $sHousenumbers = Result::sqlHouseNumberTable($aResults, Result::TABLE_OSMLINE);
-                // interpolation line search only if a housenumber was searched
-                // (realized through a join)
-                $sSQL = 'SELECT ';
-                $sSQL .= "  'W' AS osm_type, ";
-                $sSQL .= '  osm_id, ';
-                $sSQL .= "  'place' AS class, ";
-                $sSQL .= "  'house' AS type, ";
-                $sSQL .= '  15 AS admin_level, ';
-                $sSQL .= '  30 AS rank_search, ';
-                $sSQL .= '  30 AS rank_address, ';
-                $sSQL .= '  place_id, ';
-                $sSQL .= '  parent_place_id, ';
-                $sSQL .= '  housenumber_for_place as housenumber,';
-                $sSQL .= '  country_code, ';
-                $sSQL .= $this->langAddressSql('housenumber_for_place');
-                $sSQL .= '  null AS placename, ';
-                $sSQL .= '  null AS ref, ';
-                if ($this->bExtraTags) $sSQL .= 'null AS extra, ';
-                if ($this->bNameDetails) $sSQL .= 'null AS names, ';
-                $sSQL .= '  st_x(centroid) AS lon, ';
-                $sSQL .= '  st_y(centroid) AS lat, ';
-                // slightly smaller than the importance for normal houses
-                $sSQL .= '  -0.1 AS importance, ';
-                $sSQL .= $this->addressImportanceSql('centroid', 'blub.parent_place_id');
-                $sSQL .= '  null AS extra_place ';
-                $sSQL .= '  FROM (';
-                $sSQL .= '     SELECT ';
-                $sSQL .= '         osm_id, ';
-                $sSQL .= '         place_id, ';
-                $sSQL .= '         country_code, ';
-                $sSQL .= '         CASE ';             // interpolate the housenumbers here
-                $sSQL .= '           WHEN startnumber != endnumber ';
-                $sSQL .= '           THEN ST_LineInterpolatePoint(linegeo, (housenumber_for_place-startnumber::float)/(endnumber-startnumber)::float) ';
-                $sSQL .= '           ELSE ST_LineInterpolatePoint(linegeo, 0.5) ';
-                $sSQL .= '         END as centroid, ';
-                $sSQL .= '         parent_place_id, ';
-                $sSQL .= '         housenumber_for_place ';
-                $sSQL .= '     FROM (';
-                $sSQL .= '            location_property_osmline ';
-                $sSQL .= '            JOIN (values '.$sHousenumbers.') AS housenumbers(place_id, housenumber_for_place) USING(place_id)';
-                $sSQL .= '          ) ';
-                $sSQL .= '     WHERE housenumber_for_place >= 0 ';
-                $sSQL .= '  ) as blub'; //postgres wants an alias here
-
-                $aSubSelects[] = $sSQL;
-            }
-
-            if (CONST_Use_Aux_Location_data) {
-                $sPlaceIDs = Result::joinIdsByTable($aResults, Result::TABLE_AUX);
-                if ($sPlaceIDs) {
-                    $sHousenumbers = Result::sqlHouseNumberTable($aResults, Result::TABLE_AUX);
-                    $sSQL = '  SELECT ';
-                    $sSQL .= "     'L' AS osm_type, ";
-                    $sSQL .= '     place_id AS osm_id, ';
-                    $sSQL .= "     'place' AS class,";
-                    $sSQL .= "     'house' AS type, ";
-                    $sSQL .= '     null AS admin_level, ';
-                    $sSQL .= '     30 AS rank_search,';
-                    $sSQL .= '     30 AS rank_address, ';
-                    $sSQL .= '     place_id,';
-                    $sSQL .= '     parent_place_id, ';
-                    $sSQL .= '     housenumber,';
-                    $sSQL .= "     'us' AS country_code, ";
-                    $sSQL .= $this->langAddressSql('-1');
-                    $sSQL .= '     null AS placename, ';
-                    $sSQL .= '     null AS ref, ';
-                    if ($this->bExtraTags) $sSQL .= 'null AS extra, ';
-                    if ($this->bNameDetails) $sSQL .= 'null AS names, ';
-                    $sSQL .= '     ST_X(centroid) AS lon, ';
-                    $sSQL .= '     ST_Y(centroid) AS lat, ';
-                    $sSQL .= '     -1.10 AS importance, ';
-                    $sSQL .= $this->addressImportanceSql(
-                        'centroid',
-                        'location_property_aux.parent_place_id'
-                    );
-                    $sSQL .= '     null AS extra_place ';
-                    $sSQL .= '  FROM location_property_aux ';
-                    $sSQL .= "  WHERE place_id in ($sPlaceIDs) ";
-
-                    $aSubSelects[] = $sSQL;
-                }
-            }
-        }
-
-        if (CONST_Debug) var_dump($aSubSelects);
-
-        if (!sizeof($aSubSelects)) {
-            return array();
-        }
-
-        $aPlaces = chksql(
-            $this->oDB->getAll(join(' UNION ', $aSubSelects)),
-            'Could not lookup place'
-        );
-
-        $aClassType = getClassTypes();
-        foreach ($aPlaces as &$aPlace) {
-            if ($this->bAddressDetails) {
-                // to get addressdetails for tiger data, the housenumber is needed
-                $aPlace['aAddress'] = $this->getAddressNames(
-                    $aPlace['place_id'],
-                    $aPlace['housenumber']
-                );
-            }
-
-            if ($this->bExtraTags) {
-                if ($aPlace['extra']) {
-                    $aPlace['sExtraTags'] = json_decode($aPlace['extra']);
-                } else {
-                    $aPlace['sExtraTags'] = (object) array();
-                }
-            }
-
-            if ($this->bNameDetails) {
-                if ($aPlace['names']) {
-                    $aPlace['sNameDetails'] = json_decode($aPlace['names']);
-                } else {
-                    $aPlace['sNameDetails'] = (object) array();
-                }
-            }
-
-            $sAddressType = '';
-            $sClassType = $aPlace['class'].':'.$aPlace['type'].':'.$aPlace['admin_level'];
-            if (isset($aClassType[$sClassType]) && isset($aClassType[$sClassType]['simplelabel'])) {
-                $sAddressType = $aClassType[$aClassType]['simplelabel'];
-            } else {
-                $sClassType = $aPlace['class'].':'.$aPlace['type'];
-                if (isset($aClassType[$sClassType]) && isset($aClassType[$sClassType]['simplelabel']))
-                    $sAddressType = $aClassType[$sClassType]['simplelabel'];
-                else $sAddressType = $aPlace['class'];
-            }
-
-            $aPlace['addresstype'] = $sAddressType;
-        }
-
-        if (CONST_Debug) var_dump($aPlaces);
-
-        return $aPlaces;
-    }
-
-    private function getAddressDetails($iPlaceID, $bAll, $sHousenumber)
-    {
-        $sSQL = 'SELECT *,';
-        $sSQL .= '  get_name_by_language(name,'.$this->aLangPrefOrderSql.') as localname';
-        $sSQL .= ' FROM get_addressdata('.$iPlaceID.','.$sHousenumber.')';
-        if (!$bAll) {
-            $sSQL .= " WHERE isaddress OR type = 'country_code'";
-        }
-        $sSQL .= ' ORDER BY rank_address desc,isaddress DESC';
-
-        return chksql($this->oDB->getAll($sSQL));
-    }
-
-    public function getAddressNames($iPlaceID, $sHousenumber = null)
-    {
-        $aAddressLines = $this->getAddressDetails(
-            $iPlaceID,
-            false,
-            $sHousenumber === null ? -1 : $sHousenumber
-        );
-
-        $aAddress = array();
-        $aFallback = array();
-        $aClassType = getClassTypes();
-        foreach ($aAddressLines as $aLine) {
-            $bFallback = false;
-            $aTypeLabel = false;
-            if (isset($aClassType[$aLine['class'].':'.$aLine['type'].':'.$aLine['admin_level']])) {
-                $aTypeLabel = $aClassType[$aLine['class'].':'.$aLine['type'].':'.$aLine['admin_level']];
-            } elseif (isset($aClassType[$aLine['class'].':'.$aLine['type']])) {
-                $aTypeLabel = $aClassType[$aLine['class'].':'.$aLine['type']];
-            } elseif (isset($aClassType['boundary:administrative:'.((int)($aLine['rank_address']/2))])) {
-                $aTypeLabel = $aClassType['boundary:administrative:'.((int)($aLine['rank_address']/2))];
-                $bFallback = true;
-            } else {
-                $aTypeLabel = array('simplelabel' => 'address'.$aLine['rank_address']);
-                $bFallback = true;
-            }
-            if ($aTypeLabel && ((isset($aLine['localname']) && $aLine['localname']) || (isset($aLine['housenumber']) && $aLine['housenumber']))) {
-                $sTypeLabel = strtolower(isset($aTypeLabel['simplelabel'])?$aTypeLabel['simplelabel']:$aTypeLabel['label']);
-                $sTypeLabel = str_replace(' ', '_', $sTypeLabel);
-                if (!isset($aAddress[$sTypeLabel]) || (isset($aFallback[$sTypeLabel]) && $aFallback[$sTypeLabel]) || $aLine['class'] == 'place') {
-                    $aAddress[$sTypeLabel] = $aLine['localname']?$aLine['localname']:$aLine['housenumber'];
-                }
-                $aFallback[$sTypeLabel] = $bFallback;
-            }
-        }
-        return $aAddress;
-    }
-
-
-
-    /* returns an array which will contain the keys
-     *   aBoundingBox
-     * and may also contain one or more of the keys
-     *   asgeojson
-     *   askml
-     *   assvg
-     *   astext
-     *   lat
-     *   lon
-     */
-
-
-    public function getOutlines($iPlaceID, $fLon = null, $fLat = null, $fRadius = null)
-    {
-
-        $aOutlineResult = array();
-        if (!$iPlaceID) return $aOutlineResult;
-
-        if (CONST_Search_AreaPolygons) {
-            // Get the bounding box and outline polygon
-            $sSQL  = 'select place_id,0 as numfeatures,st_area(geometry) as area,';
-            $sSQL .= 'ST_Y(centroid) as centrelat,ST_X(centroid) as centrelon,';
-            $sSQL .= 'ST_YMin(geometry) as minlat,ST_YMax(geometry) as maxlat,';
-            $sSQL .= 'ST_XMin(geometry) as minlon,ST_XMax(geometry) as maxlon';
-            if ($this->bIncludePolygonAsGeoJSON) $sSQL .= ',ST_AsGeoJSON(geometry) as asgeojson';
-            if ($this->bIncludePolygonAsKML) $sSQL .= ',ST_AsKML(geometry) as askml';
-            if ($this->bIncludePolygonAsSVG) $sSQL .= ',ST_AsSVG(geometry) as assvg';
-            if ($this->bIncludePolygonAsText || $this->bIncludePolygonAsPoints) $sSQL .= ',ST_AsText(geometry) as astext';
-            $sFrom = ' from placex where place_id = '.$iPlaceID;
-            if ($this->fPolygonSimplificationThreshold > 0) {
-                $sSQL .= ' from (select place_id,centroid,ST_SimplifyPreserveTopology(geometry,'.$this->fPolygonSimplificationThreshold.') as geometry'.$sFrom.') as plx';
-            } else {
-                $sSQL .= $sFrom;
-            }
-
-            $aPointPolygon = chksql($this->oDB->getRow($sSQL), 'Could not get outline');
-
-            if ($aPointPolygon['place_id']) {
-                if ($aPointPolygon['centrelon'] !== null && $aPointPolygon['centrelat'] !== null) {
-                    $aOutlineResult['lat'] = $aPointPolygon['centrelat'];
-                    $aOutlineResult['lon'] = $aPointPolygon['centrelon'];
-                }
-
-                if ($this->bIncludePolygonAsGeoJSON) $aOutlineResult['asgeojson'] = $aPointPolygon['asgeojson'];
-                if ($this->bIncludePolygonAsKML) $aOutlineResult['askml'] = $aPointPolygon['askml'];
-                if ($this->bIncludePolygonAsSVG) $aOutlineResult['assvg'] = $aPointPolygon['assvg'];
-                if ($this->bIncludePolygonAsText) $aOutlineResult['astext'] = $aPointPolygon['astext'];
-                if ($this->bIncludePolygonAsPoints) $aOutlineResult['aPolyPoints'] = geometryText2Points($aPointPolygon['astext'], $fRadius);
-
-
-                if (abs($aPointPolygon['minlat'] - $aPointPolygon['maxlat']) < 0.0000001) {
-                    $aPointPolygon['minlat'] = $aPointPolygon['minlat'] - $fRadius;
-                    $aPointPolygon['maxlat'] = $aPointPolygon['maxlat'] + $fRadius;
-                }
-
-                if (abs($aPointPolygon['minlon'] - $aPointPolygon['maxlon']) < 0.0000001) {
-                    $aPointPolygon['minlon'] = $aPointPolygon['minlon'] - $fRadius;
-                    $aPointPolygon['maxlon'] = $aPointPolygon['maxlon'] + $fRadius;
-                }
-
-                $aOutlineResult['aBoundingBox'] = array(
-                                                   (string)$aPointPolygon['minlat'],
-                                                   (string)$aPointPolygon['maxlat'],
-                                                   (string)$aPointPolygon['minlon'],
-                                                   (string)$aPointPolygon['maxlon']
-                                                  );
-            }
-        }
-
-        // as a fallback we generate a bounding box without knowing the size of the geometry
-        if ((!isset($aOutlineResult['aBoundingBox'])) && isset($fLon)) {
-            //
-            if ($this->bIncludePolygonAsPoints) {
-                $sGeometryText = 'POINT('.$fLon.','.$fLat.')';
-                $aOutlineResult['aPolyPoints'] = geometryText2Points($sGeometryText, $fRadius);
-            }
-
-            $aBounds = array();
-            $aBounds['minlat'] = $fLat - $fRadius;
-            $aBounds['maxlat'] = $fLat + $fRadius;
-            $aBounds['minlon'] = $fLon - $fRadius;
-            $aBounds['maxlon'] = $fLon + $fRadius;
-
-            $aOutlineResult['aBoundingBox'] = array(
-                                               (string)$aBounds['minlat'],
-                                               (string)$aBounds['maxlat'],
-                                               (string)$aBounds['minlon'],
-                                               (string)$aBounds['maxlon']
-                                              );
-        }
-        return $aOutlineResult;
-    }
-}
+	class PlaceLookup
+	{
+		protected $oDB;
+
+		protected $iPlaceID;
+
+		protected $sType = false;
+
+		protected $aLangPrefOrder = array();
+
+		protected $bAddressDetails = false;
+
+		protected $bExtraTags = false;
+
+		protected $bNameDetails = false;
+
+		function PlaceLookup(&$oDB)
+		{
+			$this->oDB =& $oDB;
+		}
+
+		function setLanguagePreference($aLangPrefOrder)
+		{
+			$this->aLangPrefOrder = $aLangPrefOrder;
+		}
+
+		function setIncludeAddressDetails($bAddressDetails = true)
+		{
+			$this->bAddressDetails = $bAddressDetails;
+		}
+
+		function setIncludeExtraTags($bExtraTags = false)
+		{
+			if ((float) CONST_Postgresql_Version > 9.2)
+			{
+				$this->bExtraTags = $bExtraTags;
+			}
+		}
+
+		function setIncludeNameDetails($bNameDetails = false)
+		{
+			if ((float) CONST_Postgresql_Version > 9.2)
+			{
+				$this->bNameDetails = $bNameDetails;
+			}
+		}
+
+		function setPlaceID($iPlaceID)
+		{
+			$this->iPlaceID = $iPlaceID;
+		}
+
+		function setOSMID($sType, $iID)
+		{
+			$sSQL = "select place_id from placex where osm_type = '".pg_escape_string($sType)."' and osm_id = ".(int)$iID." order by type = 'postcode' asc";
+			$this->iPlaceID = $this->oDB->getOne($sSQL);
+		}
+
+		function lookupPlace($details)
+		{
+			if (isset($details['place_id'])) $this->iPlaceID = $details['place_id'];
+			if (isset($details['type'])) $this->sType = $details['type'];
+			if (isset($details['osm_type']) && isset($details['osm_id']))
+			{
+				$this->setOSMID($details['osm_type'], $details['osm_id']);
+			}
+
+			return $this->lookup();
+		}
+
+		function lookup()
+		{
+			if (!$this->iPlaceID) return null;
+
+			$sLanguagePrefArraySQL = "ARRAY[".join(',',array_map("getDBQuoted", $this->aLangPrefOrder))."]";
+
+			if ($this->sType == 'tiger')
+			{
+				$sSQL = "select place_id,partition, 'T' as osm_type, place_id as osm_id, 'place' as class, 'house' as type, null as admin_level, housenumber, null as street, null as isin, postcode,";
+				$sSQL .= " 'us' as country_code, parent_place_id, null as linked_place_id, 30 as rank_address, 30 as rank_search,";
+				$sSQL .= " coalesce(null,0.75-(30::float/40)) as importance, null as indexed_status, null as indexed_date, null as wikipedia, 'us' as calculated_country_code, ";
+				$sSQL .= " get_address_by_language(place_id, $sLanguagePrefArraySQL) as langaddress,";
+				$sSQL .= " null as placename,";
+				$sSQL .= " null as ref,";
+				if ($this->bExtraTags) $sSQL .= " null as extra,";
+				if ($this->bNameDetails) $sSQL .= " null as names,";
+				$sSQL .= " st_y(centroid) as lat,";
+				$sSQL .= " st_x(centroid) as lon";
+				$sSQL .= " from location_property_tiger where place_id = ".(int)$this->iPlaceID;
+			}
+			else
+			{
+				$sSQL = "select placex.place_id, partition, osm_type, osm_id, class, type, admin_level, housenumber, street, isin, postcode, country_code, parent_place_id, linked_place_id, rank_address, rank_search, ";
+				$sSQL .= " coalesce(importance,0.75-(rank_search::float/40)) as importance, indexed_status, indexed_date, wikipedia, calculated_country_code, ";
+				$sSQL .= " get_address_by_language(place_id, $sLanguagePrefArraySQL) as langaddress,";
+				$sSQL .= " get_name_by_language(name, $sLanguagePrefArraySQL) as placename,";
+				$sSQL .= " get_name_by_language(name, ARRAY['ref']) as ref,";
+				if ($this->bExtraTags) $sSQL .= " hstore_to_json(extratags) as extra,";
+				if ($this->bNameDetails) $sSQL .= " hstore_to_json(name) as names,";
+				$sSQL .= " (case when centroid is null then st_y(st_centroid(geometry)) else st_y(centroid) end) as lat,";
+				$sSQL .= " (case when centroid is null then st_x(st_centroid(geometry)) else st_x(centroid) end) as lon";
+				$sSQL .= " from placex where place_id = ".(int)$this->iPlaceID;
+			}
+
+			$aPlace = $this->oDB->getRow($sSQL);
+
+
+			if (PEAR::IsError($aPlace))
+			{
+				failInternalError("Could not lookup place.", $sSQL, $aPlace);
+			}
+
+			if (!$aPlace['place_id']) return null;
+
+			if ($this->bAddressDetails)
+			{
+				$aAddress = $this->getAddressNames();
+				$aPlace['aAddress'] = $aAddress;
+			}
+
+			if ($this->bExtraTags)
+			{
+				if ($aPlace['extra'])
+				{
+					$aPlace['sExtraTags'] = json_decode($aPlace['extra']);
+				}
+				else
+				{
+					$aPlace['sExtraTags'] = (object) array();
+				}
+			}
+
+			if ($this->bNameDetails)
+			{
+				if ($aPlace['names'])
+				{
+					$aPlace['sNameDetails'] = json_decode($aPlace['names']);
+				}
+				else
+				{
+					$aPlace['sNameDetails'] = (object) array();
+				}
+			}
+
+			$aClassType = getClassTypes();
+			$sAddressType = '';
+			$sClassType = $aPlace['class'].':'.$aPlace['type'].':'.$aPlace['admin_level'];
+			if (isset($aClassType[$sClassType]) && isset($aClassType[$sClassType]['simplelabel']))
+			{
+				$sAddressType = $aClassType[$aClassType]['simplelabel'];
+			}
+			else
+			{
+				$sClassType = $aPlace['class'].':'.$aPlace['type'];
+				if (isset($aClassType[$sClassType]) && isset($aClassType[$sClassType]['simplelabel']))
+					$sAddressType = $aClassType[$sClassType]['simplelabel'];
+				else $sAddressType = $aPlace['class'];
+			}
+
+			$aPlace['addresstype'] = $sAddressType;
+
+			return $aPlace;
+		}
+
+		function getAddressDetails($bAll = false)
+		{
+			if (!$this->iPlaceID) return null;
+
+			$sLanguagePrefArraySQL = "ARRAY[".join(',',array_map("getDBQuoted", $this->aLangPrefOrder))."]";
+
+			$sSQL = "select *,get_name_by_language(name,$sLanguagePrefArraySQL) as localname from get_addressdata(".$this->iPlaceID.")";
+			if (!$bAll) $sSQL .= " WHERE isaddress OR type = 'country_code'";
+			$sSQL .= " order by rank_address desc,isaddress desc";
+
+			$aAddressLines = $this->oDB->getAll($sSQL);
+			if (PEAR::IsError($aAddressLines))
+			{
+				var_dump($aAddressLines);
+				exit;
+			}
+			return $aAddressLines;
+		}
+
+		function getAddressNames()
+		{
+			$aAddressLines = $this->getAddressDetails(false);
+
+			$aAddress = array();
+			$aFallback = array();
+			$aClassType = getClassTypes();
+			foreach($aAddressLines as $aLine)
+			{
+				$bFallback = false;
+				$aTypeLabel = false;
+				if (isset($aClassType[$aLine['class'].':'.$aLine['type'].':'.$aLine['admin_level']])) $aTypeLabel = $aClassType[$aLine['class'].':'.$aLine['type'].':'.$aLine['admin_level']];
+				elseif (isset($aClassType[$aLine['class'].':'.$aLine['type']])) $aTypeLabel = $aClassType[$aLine['class'].':'.$aLine['type']];
+				elseif (isset($aClassType['boundary:administrative:'.((int)($aLine['rank_address']/2))]))
+				{
+					$aTypeLabel = $aClassType['boundary:administrative:'.((int)($aLine['rank_address']/2))];
+					$bFallback = true;
+				}
+				else
+				{
+					$aTypeLabel = array('simplelabel'=>'address'.$aLine['rank_address']);
+					$bFallback = true;
+				}
+				if ($aTypeLabel && ((isset($aLine['localname']) && $aLine['localname']) || (isset($aLine['housenumber']) && $aLine['housenumber'])))
+				{
+					$sTypeLabel = strtolower(isset($aTypeLabel['simplelabel'])?$aTypeLabel['simplelabel']:$aTypeLabel['label']);
+					$sTypeLabel = str_replace(' ','_',$sTypeLabel);
+					if (!isset($aAddress[$sTypeLabel]) || (isset($aFallback[$sTypeLabel]) && $aFallback[$sTypeLabel]) || $aLine['class'] == 'place')
+					{
+						$aAddress[$sTypeLabel] = $aLine['localname']?$aLine['localname']:$aLine['housenumber'];
+					}
+					$aFallback[$sTypeLabel] = $bFallback;
+				}
+			}
+			return $aAddress;
+		}
+
+	}
+?>

lib/Result.php

@@ -1,60 +0,0 @@
-<?php
-
-namespace Nominatim;
-
-/**
- * A single result of a search operation or a reverse lookup.
- *
- * This object only contains the id of the result. It does not yet
- * have any details needed to format the output document.
- */
-class Result
-{
-    const TABLE_PLACEX = 0;
-    const TABLE_POSTCODE = 1;
-    const TABLE_OSMLINE = 2;
-    const TABLE_AUX = 3;
-    const TABLE_TIGER = 4;
-
-    /// Database table that contains the result.
-    public $iTable;
-    /// Id of the result.
-    public $iId;
-    /// House number (only for interpolation results).
-    public $iHouseNumber = -1;
-    /// Number of exact matches in address (address searches only).
-    public $iExactMatches = 0;
-    /// Subranking within the results (the higher the worse).
-    public $iResultRank = 0;
-
-
-    public function __construct($sId, $iTable = Result::TABLE_PLACEX)
-    {
-        $this->iTable = $iTable;
-        $this->iId = (int) $sId;
-    }
-
-    public static function joinIdsByTable($aResults, $iTable)
-    {
-        return join(',', array_keys(array_filter(
-            $aResults,
-            function ($aValue) use ($iTable) {
-                return $aValue->iTable == $iTable;
-            }
-        )));
-    }
-    public static function sqlHouseNumberTable($aResults, $iTable)
-    {
-        $sHousenumbers = '';
-        $sSep = '';
-        foreach ($aResults as $oResult) {
-            if ($oResult->iTable == $iTable) {
-                $sHousenumbers .= $sSep.'('.$oResult->iId.',';
-                $sHousenumbers .= $oResult->iHouseNumber.')';
-                $sSep = ',';
-            }
-        }
-
-        return $sHousenumbers;
-    }
-}

lib/ReverseGeocode.php

@@ -1,223 +1,171 @@
 <?php
+	class ReverseGeocode
+	{
+		protected $oDB;
 
-namespace Nominatim;
+		protected $fLat;
+		protected $fLon;
+		protected $iMaxRank = 28;
 
-require_once(CONST_BasePath.'/lib/Result.php');
+		protected $aLangPrefOrder = array();
 
-class ReverseGeocode
-{
-    protected $oDB;
-    protected $iMaxRank = 28;
+		function ReverseGeocode(&$oDB)
+		{
+			$this->oDB =& $oDB;
+		}
+
+		function setLanguagePreference($aLangPref)
+		{
+			$this->aLangPrefOrder = $aLangPref;
+		}
+
+		function setLatLon($fLat, $fLon)
+		{
+			$this->fLat = (float)$fLat;
+			$this->fLon = (float)$fLon;
+		}
+
+		function setRank($iRank)
+		{
+			$this->iMaxRank = $iRank;
+		}
+
+		function setZoom($iZoom)
+		{
+			// Zoom to rank, this could probably be calculated but a lookup gives fine control
+			$aZoomRank = array(
+				0 => 2, // Continent / Sea
+				1 => 2,
+				2 => 2,
+				3 => 4, // Country
+				4 => 4,
+				5 => 8, // State
+				6 => 10, // Region
+				7 => 10,
+				8 => 12, // County
+				9 => 12,
+				10 => 17, // City
+				11 => 17,
+				12 => 18, // Town / Village
+				13 => 18,
+				14 => 22, // Suburb
+				15 => 22,
+				16 => 26, // Street, TODO: major street?
+				17 => 26,
+				18 => 30, // or >, Building
+				19 => 30, // or >, Building
+				);
+			$this->iMaxRank = (isset($iZoom) && isset($aZoomRank[$iZoom]))?$aZoomRank[$iZoom]:28;
+		}
+
+		function lookup()
+		{
+			$sPointSQL = 'ST_SetSRID(ST_Point('.$this->fLon.','.$this->fLat.'),4326)';
+			$iMaxRank = $this->iMaxRank;
+			$iMaxRank_orig = $this->iMaxRank;
+
+			// Find the nearest point
+			$fSearchDiam = 0.0004;
+			$iPlaceID = null;
+			$aArea = false;
+			$fMaxAreaDistance = 1;
+			$bIsInUnitedStates = false;
+			$bPlaceIsTiger = false;
+			while(!$iPlaceID && $fSearchDiam < $fMaxAreaDistance)
+			{
+				$fSearchDiam = $fSearchDiam * 2;
+
+				// If we have to expand the search area by a large amount then we need a larger feature
+				// then there is a limit to how small the feature should be
+				if ($fSearchDiam > 2 && $iMaxRank > 4) $iMaxRank = 4;
+				if ($fSearchDiam > 1 && $iMaxRank > 9) $iMaxRank = 8;
+				if ($fSearchDiam > 0.8 && $iMaxRank > 10) $iMaxRank = 10;
+				if ($fSearchDiam > 0.6 && $iMaxRank > 12) $iMaxRank = 12;
+				if ($fSearchDiam > 0.2 && $iMaxRank > 17) $iMaxRank = 17;
+				if ($fSearchDiam > 0.1 && $iMaxRank > 18) $iMaxRank = 18;
+				if ($fSearchDiam > 0.008 && $iMaxRank > 22) $iMaxRank = 22;
+				if ($fSearchDiam > 0.001 && $iMaxRank > 26) $iMaxRank = 26;
+
+				$sSQL = 'select place_id,parent_place_id,rank_search,calculated_country_code from placex';
+				$sSQL .= ' WHERE ST_DWithin('.$sPointSQL.', geometry, '.$fSearchDiam.')';
+				$sSQL .= ' and rank_search != 28 and rank_search >= '.$iMaxRank;
+				$sSQL .= ' and (name is not null or housenumber is not null)';
+				$sSQL .= ' and class not in (\'waterway\',\'railway\',\'tunnel\',\'bridge\',\'man_made\')';
+				$sSQL .= ' and indexed_status = 0 ';
+				$sSQL .= ' and (ST_GeometryType(geometry) not in (\'ST_Polygon\',\'ST_MultiPolygon\') ';
+				$sSQL .= ' OR ST_DWithin('.$sPointSQL.', centroid, '.$fSearchDiam.'))';
+				$sSQL .= ' ORDER BY ST_distance('.$sPointSQL.', geometry) ASC limit 1';
+				if (CONST_Debug) var_dump($sSQL);
+				$aPlace = $this->oDB->getRow($sSQL);
+				if (PEAR::IsError($aPlace))
+				{
+					failInternalError("Could not determine closest place.", $sSQL, $aPlace);
+				}
+				$iPlaceID = $aPlace['place_id'];
+				$iParentPlaceID = $aPlace['parent_place_id'];
+				$bIsInUnitedStates = ($aPlace['calculated_country_code'] == 'us');
+			}
+
+			// Only street found? If it's in the US we can check TIGER data for nearest housenumber
+			if ($bIsInUnitedStates && $iMaxRank_orig >= 28 && $iPlaceID && ($aPlace['rank_search'] == 26 || $aPlace['rank_search'] == 27 )) 
+			{
+				$fSearchDiam = 0.001;
+				$sSQL = 'SELECT place_id,parent_place_id,30 as rank_search ';
+				if (CONST_Debug) { $sSQL .= ', housenumber, ST_distance('.$sPointSQL.', centroid) as distance, st_y(centroid) as lat, st_x(centroid) as lon'; }
+				$sSQL .= ' FROM location_property_tiger WHERE parent_place_id = '.$iPlaceID;
+				$sSQL .= ' AND ST_DWithin('.$sPointSQL.', centroid, '.$fSearchDiam.')';
+				$sSQL .= ' ORDER BY ST_distance('.$sPointSQL.', centroid) ASC limit 1';
 
 
-    public function __construct(&$oDB)
-    {
-        $this->oDB =& $oDB;
-    }
+				// print all house numbers in the parent (street)
+				if (CONST_Debug)
+				{
+					$sSQL = preg_replace('/limit 1/', 'limit 100', $sSQL);
+					var_dump($sSQL);
 
+					$aAllHouses = $this->oDB->getAll($sSQL);
+					foreach($aAllHouses as $i)
+					{
+						echo $i['housenumber'] . ' | ' . $i['distance'] * 1000 . ' | ' . $i['lat'] . ' | ' . $i['lon']. ' | '. "<br>\n";
+					}
+				}
 
-    public function setZoom($iZoom)
-    {
-        // Zoom to rank, this could probably be calculated but a lookup gives fine control
-        $aZoomRank = array(
-                      0 => 2, // Continent / Sea
-                      1 => 2,
-                      2 => 2,
-                      3 => 4, // Country
-                      4 => 4,
-                      5 => 8, // State
-                      6 => 10, // Region
-                      7 => 10,
-                      8 => 12, // County
-                      9 => 12,
-                      10 => 17, // City
-                      11 => 17,
-                      12 => 18, // Town / Village
-                      13 => 18,
-                      14 => 22, // Suburb
-                      15 => 22,
-                      16 => 26, // Street, TODO: major street?
-                      17 => 26,
-                      18 => 30, // or >, Building
-                      19 => 30, // or >, Building
-                     );
-        $this->iMaxRank = (isset($iZoom) && isset($aZoomRank[$iZoom]))?$aZoomRank[$iZoom]:28;
-    }
+				$aPlaceTiger = $this->oDB->getRow($sSQL);
+				if (PEAR::IsError($aPlace))
+				{
+					failInternalError("Could not determine closest Tiger place.", $sSQL, $aPlaceTiger);
+				}
+				if ($aPlaceTiger)
+				{
+					if (CONST_Debug) var_dump('found Tiger place', $aPlaceTiger);
+					$bPlaceIsTiger = true;
+					$aPlace = $aPlaceTiger;
+					$iPlaceID = $aPlaceTiger['place_id'];
+					$iParentPlaceID = $aPlaceTiger['parent_place_id']; // the street
+				}
+			}
 
-    /**
-     * Find the closest interpolation with the given search diameter.
-     *
-     * @param string $sPointSQL   Reverse geocoding point as SQL
-     * @param float  $fSearchDiam Search diameter
-     *
-     * @return Record of the interpolation or null.
-     */
-    protected function lookupInterpolation($sPointSQL, $fSearchDiam)
-    {
-        $sSQL = 'SELECT place_id, parent_place_id, 30 as rank_search,';
-        $sSQL .= '  ST_LineLocatePoint(linegeo,'.$sPointSQL.') as fraction,';
-        $sSQL .= '  startnumber, endnumber, interpolationtype,';
-        $sSQL .= '  ST_Distance(linegeo,'.$sPointSQL.') as distance';
-        $sSQL .= ' FROM location_property_osmline';
-        $sSQL .= ' WHERE ST_DWithin('.$sPointSQL.', linegeo, '.$fSearchDiam.')';
-        $sSQL .= ' and indexed_status = 0 and startnumber is not NULL ';
-        $sSQL .= ' ORDER BY distance ASC limit 1';
+			// The point we found might be too small - use the address to find what it is a child of
+			if ($iPlaceID && $iMaxRank < 28)
+			{
+				if ($aPlace['rank_search'] > 28 && $iParentPlaceID && !$bPlaceIsTiger)
+				{
+					$iPlaceID = $iParentPlaceID;
+				}
+				$sSQL = "select address_place_id from place_addressline where place_id = $iPlaceID order by abs(cached_rank_address - $iMaxRank) asc,cached_rank_address desc,isaddress desc,distance desc limit 1";
+				$iPlaceID = $this->oDB->getOne($sSQL);
+				if (PEAR::IsError($iPlaceID))
+				{
+					failInternalError("Could not get parent for place.", $sSQL, $iPlaceID);
+				}
+				if (!$iPlaceID)
+				{
+					$iPlaceID = $aPlace['place_id'];
+				}
+			}
 
-        return chksql(
-            $this->oDB->getRow($sSQL),
-            'Could not determine closest housenumber on an osm interpolation line.'
-        );
-    }
-
-    public function lookup($fLat, $fLon, $bDoInterpolation = true)
-    {
-        return $this->lookupPoint(
-            'ST_SetSRID(ST_Point('.$fLon.','.$fLat.'),4326)',
-            $bDoInterpolation
-        );
-    }
-
-    public function lookupPoint($sPointSQL, $bDoInterpolation = true)
-    {
-        $iMaxRank = $this->iMaxRank;
-
-        // Find the nearest point
-        $fSearchDiam = 0.0004;
-        $oResult = null;
-        $aPlace = null;
-        $fMaxAreaDistance = 1;
-        $bIsTigerStreet = false;
-        while ($oResult === null && $fSearchDiam < $fMaxAreaDistance) {
-            $fSearchDiam = $fSearchDiam * 2;
-
-            // If we have to expand the search area by a large amount then we need a larger feature
-            // then there is a limit to how small the feature should be
-            if ($fSearchDiam > 2 && $iMaxRank > 4) $iMaxRank = 4;
-            if ($fSearchDiam > 1 && $iMaxRank > 9) $iMaxRank = 8;
-            if ($fSearchDiam > 0.8 && $iMaxRank > 10) $iMaxRank = 10;
-            if ($fSearchDiam > 0.6 && $iMaxRank > 12) $iMaxRank = 12;
-            if ($fSearchDiam > 0.2 && $iMaxRank > 17) $iMaxRank = 17;
-            if ($fSearchDiam > 0.1 && $iMaxRank > 18) $iMaxRank = 18;
-            if ($fSearchDiam > 0.008 && $iMaxRank > 22) $iMaxRank = 22;
-            if ($fSearchDiam > 0.001 && $iMaxRank > 26) {
-                // try with interpolations before continuing
-                if ($bDoInterpolation) {
-                    $aHouse = $this->lookupInterpolation($sPointSQL, $fSearchDiam/2);
-
-                    if ($aHouse) {
-                        $oResult = new Result($aHouse['place_id'], Result::TABLE_OSMLINE);
-                        $oResult->iHouseNumber = closestHouseNumber($aHouse);
-
-                        $aPlace = $aHouse;
-                        $iParentPlaceID = $aHouse['parent_place_id']; // the street
-                        $iMaxRank = 30;
-
-                        break;
-                    }
-                }
-                // no interpolation found, continue search
-                $iMaxRank = 26;
-            }
-
-            $sSQL = 'select place_id,parent_place_id,rank_search,country_code,';
-            $sSQL .= '  ST_distance('.$sPointSQL.', geometry) as distance';
-            $sSQL .= ' FROM ';
-            if ($fSearchDiam < 0.01) {
-                $sSQL .= ' placex';
-                $sSQL .= '   WHERE ST_DWithin('.$sPointSQL.', geometry, '.$fSearchDiam.')';
-                $sSQL .= '   AND';
-            } else {
-                $sSQL .= ' (SELECT * FROM placex ';
-                $sSQL .= '   WHERE ST_DWithin('.$sPointSQL.', geometry, '.$fSearchDiam.')';
-                $sSQL .= '   LIMIT 1000) as p WHERE';
-            }
-            $sSQL .= ' rank_search != 28 and rank_search >= '.$iMaxRank;
-            $sSQL .= ' and (name is not null or housenumber is not null';
-            $sSQL .= '      or rank_search between 26 and 27)';
-            $sSQL .= ' and class not in (\'waterway\',\'railway\',\'tunnel\',\'bridge\',\'man_made\')';
-            $sSQL .= ' and indexed_status = 0 and linked_place_id is null';
-            $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';
-            if (CONST_Debug) var_dump($sSQL);
-            $aPlace = chksql(
-                $this->oDB->getRow($sSQL),
-                'Could not determine closest place.'
-            );
-            if ($aPlace) {
-                $oResult = new Result($aPlace['place_id']);
-                $iParentPlaceID = $aPlace['parent_place_id'];
-                if ($bDoInterpolation) {
-                    if ($aPlace['rank_search'] == 26 || $aPlace['rank_search'] == 27) {
-                        $bIsTigerStreet = ($aPlace['country_code'] == 'us');
-                    } elseif ($aPlace['rank_search'] == 30) {
-                        // If a house was found, make sure there isn't an
-                        // interpolation line that is closer.
-                        $aHouse = $this->lookupInterpolation(
-                            $sPointSQL,
-                            $aPlace['distance']
-                        );
-                        if ($aHouse && $aPlace['distance'] < $aHouse['distance']) {
-                            $oResult = new Result(
-                                $aHouse['place_id'],
-                                Result::TABLE_OSMLINE
-                            );
-                            $oResult->iHouseNumber = closestHouseNumber($aHouse);
-
-                            $aPlace = $aHouse;
-                            $iParentPlaceID = $aHouse['parent_place_id'];
-                        }
-                    }
-                }
-            }
-        }
-
-        // Only street found? In the US we can check TIGER data for nearest housenumber
-        if (CONST_Use_US_Tiger_Data && $bIsTigerStreet && $this->iMaxRank >= 28) {
-            $fSearchDiam = $aPlace['rank_search'] > 28 ? $aPlace['distance'] : 0.001;
-            $sSQL = 'SELECT place_id,parent_place_id,30 as rank_search,';
-            $sSQL .= 'ST_LineLocatePoint(linegeo,'.$sPointSQL.') as fraction,';
-            $sSQL .= 'ST_distance('.$sPointSQL.', linegeo) as distance,';
-            $sSQL .= 'startnumber,endnumber,interpolationtype';
-            $sSQL .= ' FROM location_property_tiger WHERE parent_place_id = '.$oResult->iId;
-            $sSQL .= ' AND ST_DWithin('.$sPointSQL.', linegeo, '.$fSearchDiam.')';
-            $sSQL .= ' ORDER BY distance ASC limit 1';
-
-            if (CONST_Debug) var_dump($sSQL);
-
-            $aPlaceTiger = chksql(
-                $this->oDB->getRow($sSQL),
-                'Could not determine closest Tiger place.'
-            );
-            if ($aPlaceTiger) {
-                if (CONST_Debug) var_dump('found Tiger housenumber', $aPlaceTiger);
-                $aPlace = $aPlaceTiger;
-                $oResult = new Result($aPlace['place_id'], Result::TABLE_TIGER);
-                $oResult->iHouseNumber = closestHouseNumber($aPlaceTiger);
-                $iParentPlaceID = $aPlace['parent_place_id'];
-                $iMaxRank = 30;
-            }
-        }
-
-        // The point we found might be too small - use the address to find what it is a child of
-        if ($oResult !== null && $iMaxRank < 28) {
-            if ($aPlace['rank_search'] > 28 && $iParentPlaceID) {
-                $iPlaceID = $iParentPlaceID;
-            } else {
-                $iPlaceID = $oResult->iId;
-            }
-            $sSQL  = 'select a.address_place_id';
-            $sSQL .= ' FROM place_addressline a, placex p';
-            $sSQL .= " WHERE a.place_id = $iPlaceID and a.address_place_id = p.place_id";
-            $sSQL .= '   AND p.linked_place_id is null';
-            $sSQL .= " ORDER BY abs(cached_rank_address - $iMaxRank) asc,cached_rank_address desc,isaddress desc,distance desc";
-            $sSQL .= ' LIMIT 1';
-            $iPlaceID = chksql($this->oDB->getOne($sSQL), 'Could not get parent for place.');
-            if ($iPlaceID) {
-                $oResult = new Result($iPlaceID);
-            }
-        }
-
-        return $oResult;
-    }
-}
+			return array('place_id' => $iPlaceID,
+					     'type' => $bPlaceIsTiger ? 'tiger' : 'osm');
+		}
+	}
+?>

lib/SearchContext.php

@@ -1,270 +0,0 @@
-<?php
-
-namespace Nominatim;
-
-require_once(CONST_BasePath.'/lib/lib.php');
-
-
-/**
- * Collection of search constraints that are independent of the
- * actual interpretation of the search query.
- *
- * The search context is shared between all SearchDescriptions. This
- * object mainly serves as context provider for the database queries.
- * Therefore most data is directly cached as SQL statements.
- */
-class SearchContext
-{
-    /// Search radius around a given Near reference point.
-    private $fNearRadius = false;
-    /// True if search must be restricted to viewbox only.
-    public $bViewboxBounded = false;
-
-    /// Reference point for search (as SQL).
-    public $sqlNear = '';
-    /// Viewbox selected for search (as SQL).
-    public $sqlViewboxSmall = '';
-    /// Viewbox with a larger buffer around (as SQL).
-    public $sqlViewboxLarge = '';
-    /// Reference along a route (as SQL).
-    public $sqlViewboxCentre = '';
-    /// List of countries to restrict search to (as SQL).
-    public $sqlCountryList = '';
-    /// List of place IDs to exclude (as SQL).
-    private $sqlExcludeList = '';
-
-
-    /**
-     * Check if a reference point is defined.
-     *
-     * @return bool True if a reference point is defined.
-     */
-    public function hasNearPoint()
-    {
-        return $this->fNearRadius !== false;
-    }
-
-    /**
-     * Get radius around reference point.
-     *
-     * @return float Search radius around refernce point.
-     */
-    public function nearRadius()
-    {
-        return $this->fNearRadius;
-    }
-
-    /**
-     * Set search reference point in WGS84.
-     *
-     * If set, then only places around this point will be taken into account.
-     *
-     * @param float $fLat    Latitude of point.
-     * @param float $fLon    Longitude of point.
-     * @param float $fRadius Search radius around point.
-     *
-     * @return void
-     */
-    public function setNearPoint($fLat, $fLon, $fRadius = 0.1)
-    {
-        $this->fNearRadius = $fRadius;
-        $this->sqlNear = 'ST_SetSRID(ST_Point('.$fLon.','.$fLat.'),4326)';
-    }
-
-    /**
-     * Check if the search is geographically restricted.
-     *
-     * Searches are restricted if a reference point is given or if
-     * a bounded viewbox is set.
-     *
-     * @return bool True, if the search is geographically bounded.
-     */
-    public function isBoundedSearch()
-    {
-        return $this->hasNearPoint() || ($this->sqlViewboxSmall && $this->bViewboxBounded);
-    }
-
-    /**
-     * Set rectangular viewbox.
-     *
-     * The viewbox may be bounded which means that no search results
-     * must be outside the viewbox.
-     *
-     * @param float[4] $aViewBox Coordinates of the viewbox.
-     * @param bool     $bBounded True if the viewbox is bounded.
-     *
-     * @return void
-     */
-    public function setViewboxFromBox(&$aViewBox, $bBounded)
-    {
-        $this->bViewboxBounded = $bBounded;
-        $this->sqlViewboxCentre = '';
-
-        $this->sqlViewboxSmall = sprintf(
-            'ST_SetSRID(ST_MakeBox2D(ST_Point(%F,%F),ST_Point(%F,%F)),4326)',
-            $aViewBox[0],
-            $aViewBox[1],
-            $aViewBox[2],
-            $aViewBox[3]
-        );
-
-        $fHeight = $aViewBox[0] - $aViewBox[2];
-        $fWidth = $aViewBox[1] - $aViewBox[3];
-
-        $this->sqlViewboxLarge = sprintf(
-            'ST_SetSRID(ST_MakeBox2D(ST_Point(%F,%F),ST_Point(%F,%F)),4326)',
-            max($aViewBox[0], $aViewBox[2]) + $fHeight,
-            max($aViewBox[1], $aViewBox[3]) + $fWidth,
-            min($aViewBox[0], $aViewBox[2]) - $fHeight,
-            min($aViewBox[1], $aViewBox[3]) - $fWidth
-        );
-    }
-
-    /**
-     * Set viewbox along a route.
-     *
-     * The viewbox may be bounded which means that no search results
-     * must be outside the viewbox.
-     *
-     * @param object   $oDB          DB connection to use for computing the box.
-     * @param string[] $aRoutePoints List of x,y coordinates along a route.
-     * @param float    $fRouteWidth  Buffer around the route to use.
-     * @param bool     $bBounded     True if the viewbox bounded.
-     *
-     * @return void
-     */
-    public function setViewboxFromRoute(&$oDB, $aRoutePoints, $fRouteWidth, $bBounded)
-    {
-        $this->bViewboxBounded = $bBounded;
-        $this->sqlViewboxCentre = "ST_SetSRID('LINESTRING(";
-        $sSep = '';
-        foreach ($aRoutePoints as $aPoint) {
-            $fPoint = (float)$aPoint;
-            $this->sqlViewboxCentre .= $sSep.$fPoint;
-            $sSep = ($sSep == ' ') ? ',' : ' ';
-        }
-        $this->sqlViewboxCentre .= ")'::geometry,4326)";
-
-        $sSQL = 'ST_BUFFER('.$this->sqlViewboxCentre.','.($fRouteWidth/69).')';
-        $sGeom = chksql($oDB->getOne('select '.$sSQL), 'Could not get small viewbox');
-        $this->sqlViewboxSmall = "'".$sGeom."'::geometry";
-
-        $sSQL = 'ST_BUFFER('.$this->sqlViewboxCentre.','.($fRouteWidth/30).')';
-        $sGeom = chksql($oDB->getOne('select '.$sSQL), 'Could not get large viewbox');
-        $this->sqlViewboxLarge = "'".$sGeom."'::geometry";
-    }
-
-    /**
-     * Set list of excluded place IDs.
-     *
-     * @param integer[] $aExcluded List of IDs.
-     *
-     * @return void
-     */
-    public function setExcludeList($aExcluded)
-    {
-        $this->sqlExcludeList = ' not in ('.join(',', $aExcluded).')';
-    }
-
-    /**
-     * Set list of countries to restrict search to.
-     *
-     * @param string[] $aCountries List of two-letter lower-case country codes.
-     *
-     * @return void
-     */
-    public function setCountryList($aCountries)
-    {
-        $this->sqlCountryList = '('.join(',', array_map('addQuotes', $aCountries)).')';
-    }
-
-    /**
-     * Extract a reference point from a query string.
-     *
-     * @param string $sQuery Query to scan.
-     *
-     * @return string The remaining query string.
-     */
-    public function setNearPointFromQuery($sQuery)
-    {
-        $aResult = parseLatLon($sQuery);
-
-        if ($aResult !== false
-            && $aResult[1] <= 90.1
-            && $aResult[1] >= -90.1
-            && $aResult[2] <= 180.1
-            && $aResult[2] >= -180.1
-        ) {
-            $this->setNearPoint($aResult[1], $aResult[2]);
-            $sQuery = trim(str_replace($aResult[0], ' ', $sQuery));
-        }
-
-        return $sQuery;
-    }
-
-    /**
-     * Get an SQL snipped for computing the distance from the reference point.
-     *
-     * @param string $sObj SQL variable name to compute the distance from.
-     *
-     * @return string An SQL string.
-     */
-    public function distanceSQL($sObj)
-    {
-        return 'ST_Distance('.$this->sqlNear.", $sObj)";
-    }
-
-    /**
-     * Get an SQL snipped for checking if something is within range of the
-     * reference point.
-     *
-     * @param string $sObj SQL variable name to compute if it is within range.
-     *
-     * @return string An SQL string.
-     */
-    public function withinSQL($sObj)
-    {
-        return sprintf('ST_DWithin(%s, %s, %F)', $sObj, $this->sqlNear, $this->fNearRadius);
-    }
-
-    /**
-     * Get an SQL snipped of the importance factor of the viewbox.
-     *
-     * The importance factor is computed by checking if an object is within
-     * the viewbox and/or the extended version of the viewbox.
-     *
-     * @param string $sObj SQL variable name of object to weight the importance
-     *
-     * @return string SQL snipped of the factor with a leading multiply sign.
-     */
-    public function viewboxImportanceSQL($sObj)
-    {
-        $sSQL = '';
-
-        if ($this->sqlViewboxSmall) {
-            $sSQL = " * CASE WHEN ST_Contains($this->sqlViewboxSmall, $sObj) THEN 1 ELSE 0.5 END";
-        }
-        if ($this->sqlViewboxLarge) {
-            $sSQL = " * CASE WHEN ST_Contains($this->sqlViewboxLarge, $sObj) THEN 1 ELSE 0.5 END";
-        }
-
-        return $sSQL;
-    }
-
-    /**
-     * SQL snipped checking if a place ID should be excluded.
-     *
-     * @param string $sVariable SQL variable name of place ID to check,
-     *                          potentially prefixed with more SQL.
-     *
-     * @return string SQL snippet.
-     */
-    public function excludeSQL($sVariable)
-    {
-        if ($this->sqlExcludeList) {
-            return $sVariable.$this->sqlExcludeList;
-        }
-
-        return '';
-    }
-}

lib/SpecialSearchOperator.php

@@ -1,44 +0,0 @@
-<?php
-
-namespace Nominatim;
-
-/**
- * Operators describing special searches.
- */
-abstract class Operator
-{
-    /// No operator selected.
-    const NONE = 0;
-    /// Search for POI of the given type.
-    const TYPE = 1;
-    /// Search for POIs near the given place.
-    const NEAR = 2;
-    /// Search for POIS in the given place.
-    const IN = 3;
-    /// Search for POIS named as given.
-    const NAME = 4;
-    /// Search for postcodes.
-    const POSTCODE = 5;
-
-    private static $aConstantNames = null;
-
-
-    public static function toString($iOperator)
-    {
-        if ($iOperator == Operator::NONE) {
-            return '';
-        }
-
-        if (Operator::$aConstantNames === null) {
-            $oReflector = new \ReflectionClass('Nominatim\Operator');
-            $aConstants = $oReflector->getConstants();
-
-            Operator::$aConstantNames = array();
-            foreach ($aConstants as $sName => $iValue) {
-                Operator::$aConstantNames[$iValue] = $sName;
-            }
-        }
-
-        return Operator::$aConstantNames[$iOperator];
-    }
-}

lib/cmd.php

@@ -1,188 +1,145 @@
 <?php
 
+	function getCmdOpt($aArg, $aSpec, &$aResult, $bExitOnError = false, $bExitOnUnknown = false)
+	{
+		$aQuick = array();
+		$aCounts = array();
 
-function getCmdOpt($aArg, $aSpec, &$aResult, $bExitOnError = false, $bExitOnUnknown = false)
-{
-    $aQuick = array();
-    $aCounts = array();
+		foreach($aSpec as $aLine)
+		{
+			if (is_array($aLine))
+			{
+				if ($aLine[0]) $aQuick['--'.$aLine[0]] = $aLine;
+				if ($aLine[1]) $aQuick['-'.$aLine[1]] = $aLine;
+				$aCounts[$aLine[0]] = 0;
+			}
+		}
 
-    foreach ($aSpec as $aLine) {
-        if (is_array($aLine)) {
-            if ($aLine[0]) $aQuick['--'.$aLine[0]] = $aLine;
-            if ($aLine[1]) $aQuick['-'.$aLine[1]] = $aLine;
-            $aCounts[$aLine[0]] = 0;
-        }
-    }
+		$aResult = array();
+		$bUnknown = false;
+		$iSize = sizeof($aArg);
+		for ($i = 1; $i < $iSize; $i++)
+		{
+			if (isset($aQuick[$aArg[$i]]))
+			{
+				$aLine = $aQuick[$aArg[$i]];
+				$aCounts[$aLine[0]]++;
+				$xVal = null;
+				if ($aLine[4] == $aLine[5])
+				{
+					if ($aLine[4])
+					{
+						$xVal = array();
+						for($n = $aLine[4]; $i < $iSize && $n; $n--)
+						{
+							$i++;
+							if ($i >= $iSize || $aArg[$i][0] == '-') showUsage($aSpec, $bExitOnError, 'Parameter of  \''.$aLine[0].'\' is missing');
 
-    $aResult = array();
-    $bUnknown = false;
-    $iSize = sizeof($aArg);
-    for ($i = 1; $i < $iSize; $i++) {
-        if (isset($aQuick[$aArg[$i]])) {
-            $aLine = $aQuick[$aArg[$i]];
-            $aCounts[$aLine[0]]++;
-            $xVal = null;
-            if ($aLine[4] == $aLine[5]) {
-                if ($aLine[4]) {
-                    $xVal = array();
-                    for ($n = $aLine[4]; $i < $iSize && $n; $n--) {
-                        $i++;
-                        if ($i >= $iSize || $aArg[$i][0] == '-') showUsage($aSpec, $bExitOnError, 'Parameter of  \''.$aLine[0].'\' is missing');
+							switch ($aLine[6])
+							{
+							case 'realpath':
+								$xVal[] = realpath($aArg[$i]);
+								break;
+							case 'realdir':
+								$sPath = realpath(dirname($aArg[$i]));
+								if ($sPath)
+									$xVal[] = $sPath . '/' . basename($aArg[$i]);
+								else
+									$xVal[] = $sPath;
+								break;
+							case 'bool':
+								$xVal[] = (bool)$aArg[$i];
+								break;
+							case 'int':
+								$xVal[] = (int)$aArg[$i];
+								break;
+							case 'float':
+								$xVal[] = (float)$aArg[$i];
+								break;
+							default:
+								$xVal[] = $aArg[$i];
+								break;
+							}
+						}
+						if ($aLine[4] == 1) $xVal = $xVal[0];
+					}
+					else
+					{
+						$xVal = true;
+					}
+				}
+				else
+				{
+					fail('Variable numbers of params not yet supported');
+				}
 
-                        switch ($aLine[6]) {
-                            case 'realpath':
-                                $xVal[] = realpath($aArg[$i]);
-                                break;
-                            case 'realdir':
-                                $sPath = realpath(dirname($aArg[$i]));
-                                if ($sPath) {
-                                    $xVal[] = $sPath . '/' . basename($aArg[$i]);
-                                } else {
-                                    $xVal[] = $sPath;
-                                }
-                                break;
-                            case 'bool':
-                                $xVal[] = (bool)$aArg[$i];
-                                break;
-                            case 'int':
-                                $xVal[] = (int)$aArg[$i];
-                                break;
-                            case 'float':
-                                $xVal[] = (float)$aArg[$i];
-                                break;
-                            default:
-                                $xVal[] = $aArg[$i];
-                                break;
-                        }
-                    }
-                    if ($aLine[4] == 1) $xVal = $xVal[0];
-                } else {
-                    $xVal = true;
-                }
-            } else {
-                fail('Variable numbers of params not yet supported');
-            }
+				if ($aLine[3] > 1)
+				{
+					if (!array_key_exists($aLine[0], $aResult)) $aResult[$aLine[0]] = array();
+					$aResult[$aLine[0]][] = $xVal;
+				}
+				else
+				{
+					$aResult[$aLine[0]] = $xVal;
+				}
+			}
+			else
+			{
+				$bUnknown = $aArg[$i];
+			}
+		}
 
-            if ($aLine[3] > 1) {
-                if (!array_key_exists($aLine[0], $aResult)) $aResult[$aLine[0]] = array();
-                $aResult[$aLine[0]][] = $xVal;
-            } else {
-                $aResult[$aLine[0]] = $xVal;
-            }
-        } else {
-            $bUnknown = $aArg[$i];
-        }
-    }
+		if (array_key_exists('help', $aResult)) showUsage($aSpec);
+		if ($bUnknown && $bExitOnUnknown) showUsage($aSpec, $bExitOnError, 'Unknown option \''.$bUnknown.'\'');
 
-    if (array_key_exists('help', $aResult)) showUsage($aSpec);
-    if ($bUnknown && $bExitOnUnknown) showUsage($aSpec, $bExitOnError, 'Unknown option \''.$bUnknown.'\'');
+		foreach($aSpec as $aLine)
+		{
+			if (is_array($aLine))
+			{
+				if ($aCounts[$aLine[0]] < $aLine[2]) showUsage($aSpec, $bExitOnError, 'Option \''.$aLine[0].'\' is missing');
+				if ($aCounts[$aLine[0]] > $aLine[3]) showUsage($aSpec, $bExitOnError, 'Option \''.$aLine[0].'\' is pressent too many times');
+				switch ($aLine[6])
+				{
+				case 'bool':
+					if (!array_key_exists($aLine[0], $aResult))
+						$aResult[$aLine[0]] = false;
+					break;
+				}
+			}
+		}
+		return $bUnknown;
+	}
 
-    foreach ($aSpec as $aLine) {
-        if (is_array($aLine)) {
-            if ($aCounts[$aLine[0]] < $aLine[2]) showUsage($aSpec, $bExitOnError, 'Option \''.$aLine[0].'\' is missing');
-            if ($aCounts[$aLine[0]] > $aLine[3]) showUsage($aSpec, $bExitOnError, 'Option \''.$aLine[0].'\' is pressent too many times');
-            switch ($aLine[6]) {
-                case 'bool':
-                    if (!array_key_exists($aLine[0], $aResult))
-                        $aResult[$aLine[0]] = false;
-                    break;
-            }
-        }
-    }
-    return $bUnknown;
-}
-
-function showUsage($aSpec, $bExit = false, $sError = false)
-{
-    if ($sError) {
-        echo basename($_SERVER['argv'][0]).': '.$sError."\n";
-        echo 'Try `'.basename($_SERVER['argv'][0]).' --help` for more information.'."\n";
-        exit;
-    }
-    echo 'Usage: '.basename($_SERVER['argv'][0])."\n";
-    $bFirst = true;
-    foreach ($aSpec as $aLine) {
-        if (is_array($aLine)) {
-            if ($bFirst) {
-                $bFirst = false;
-                echo "\n";
-            }
-            $aNames = array();
-            if ($aLine[1]) $aNames[] = '-'.$aLine[1];
-            if ($aLine[0]) $aNames[] = '--'.$aLine[0];
-            $sName = join(', ', $aNames);
-            echo '  '.$sName.str_repeat(' ', 30-strlen($sName)).$aLine[7]."\n";
-        } else {
-            echo $aLine."\n";
-        }
-    }
-    echo "\n";
-    exit;
-}
-
-function chksql($oSql, $sMsg = false)
-{
-    if (PEAR::isError($oSql)) {
-        fail($sMsg || $oSql->getMessage(), $oSql->userinfo);
-    }
-
-    return $oSql;
-}
-
-function info($sMsg)
-{
-    echo date('Y-m-d H:i:s == ').$sMsg."\n";
-}
-
-$aWarnings = [];
-
-
-function warn($sMsg)
-{
-    $GLOBALS['aWarnings'][] = $sMsg;
-    echo date('Y-m-d H:i:s == ').'WARNING: '.$sMsg."\n";
-}
-
-
-function repeatWarnings()
-{
-    foreach ($GLOBALS['aWarnings'] as $sMsg) {
-        echo '  * ',$sMsg."\n";
-    }
-}
-
-
-function runSQLScript($sScript, $bfatal = true, $bVerbose = false, $bIgnoreErrors = false)
-{
-    // Convert database DSN to psql parameters
-    $aDSNInfo = DB::parseDSN(CONST_Database_DSN);
-    if (!isset($aDSNInfo['port']) || !$aDSNInfo['port']) $aDSNInfo['port'] = 5432;
-    $sCMD = 'psql -p '.$aDSNInfo['port'].' -d '.$aDSNInfo['database'];
-    if (!$bVerbose) {
-        $sCMD .= ' -q';
-    }
-    if ($bfatal && !$bIgnoreErrors) {
-        $sCMD .= ' -v ON_ERROR_STOP=1';
-    }
-    $aDescriptors = array(
-                     0 => array('pipe', 'r'),
-                     1 => STDOUT,
-                     2 => STDERR
-                    );
-    $ahPipes = null;
-    $hProcess = @proc_open($sCMD, $aDescriptors, $ahPipes);
-    if (!is_resource($hProcess)) {
-        fail('unable to start pgsql');
-    }
-
-    while (strlen($sScript)) {
-        $written = fwrite($ahPipes[0], $sScript);
-        if ($written <= 0) break;
-        $sScript = substr($sScript, $written);
-    }
-    fclose($ahPipes[0]);
-    $iReturn = proc_close($hProcess);
-    if ($bfatal && $iReturn > 0) {
-        fail("pgsql returned with error code ($iReturn)");
-    }
-}
+	function showUsage($aSpec, $bExit = false, $sError = false)
+	{
+		if ($sError)
+		{
+			echo basename($_SERVER['argv'][0]).': '.$sError."\n";
+			echo 'Try `'.basename($_SERVER['argv'][0]).' --help` for more information.'."\n";
+			exit;
+		}
+		echo "Usage: ".basename($_SERVER['argv'][0])."\n";
+		$bFirst = true;
+		foreach($aSpec as $aLine)
+		{
+			if (is_array($aLine))
+			{
+				if ($bFirst)
+				{
+					$bFirst = false;
+					echo "\n";
+				}
+				$aNames = array();
+				if ($aLine[1]) $aNames[] = '-'.$aLine[1];
+				if ($aLine[0]) $aNames[] = '--'.$aLine[0];
+				$sName = join(', ',$aNames);
+				echo '  '.$sName.str_repeat(' ',30-strlen($sName)).$aLine[7]."\n";
+			}
+			else
+			{
+				echo $aLine."\n";
+			}
+		}
+		echo "\n";
+		exit;
+	}

lib/db.php

@@ -1,43 +1,26 @@
 <?php
+	require_once('DB.php');
 
-require_once('DB.php');
+	function &getDB($bNew = false, $bPersistent = false)
+	{
+		// Get the database object
+		$oDB = DB::connect(CONST_Database_DSN.($bNew?'?new_link=true':''), $bPersistent);
+		if (PEAR::IsError($oDB))
+		{
+			var_dump(CONST_Database_DSN);
+			var_Dump($oDB);
+			fail($oDB->getMessage());
+		}
+		$oDB->setFetchMode(DB_FETCHMODE_ASSOC);
+		$oDB->query("SET DateStyle TO 'sql,european'");
+		$oDB->query("SET client_encoding TO 'utf-8'");
+		$iMaxExecution = ini_get('max_execution_time') * 1000;
+		if ($iMaxExecution > 0) $oDB->query("SET statement_timeout TO $iMaxExecution");
+		return $oDB;
+	}
 
+	function getDBQuoted($s)
+	{
+		return "'".pg_escape_string($s)."'";
+	}
 
-function &getDB($bNew = false, $bPersistent = false)
-{
-    // Get the database object
-    $oDB = chksql(
-        DB::connect(CONST_Database_DSN.($bNew?'?new_link=true':''), $bPersistent),
-        'Failed to establish database connection'
-    );
-    $oDB->setFetchMode(DB_FETCHMODE_ASSOC);
-    $oDB->query("SET DateStyle TO 'sql,european'");
-    $oDB->query("SET client_encoding TO 'utf-8'");
-    $iMaxExecution = ini_get('max_execution_time') * 1000;
-    if ($iMaxExecution > 0) $oDB->query("SET statement_timeout TO $iMaxExecution");
-    return $oDB;
-}
-
-function getDBQuoted($s)
-{
-    return "'".pg_escape_string($s)."'";
-}
-
-function getArraySQL($a)
-{
-    return 'ARRAY['.join(',', $a).']';
-}
-
-function getPostgresVersion(&$oDB)
-{
-    $sVersionString = $oDB->getOne('select version()');
-    preg_match('#PostgreSQL ([0-9]+)[.]([0-9]+)[^0-9]#', $sVersionString, $aMatches);
-    return (float) ($aMatches[1].'.'.$aMatches[2]);
-}
-
-function getPostgisVersion(&$oDB)
-{
-    $sVersionString = $oDB->getOne('select postgis_full_version()');
-    preg_match('#POSTGIS="([0-9]+)[.]([0-9]+)[.]([0-9]+)( r([0-9]+))?"#', $sVersionString, $aMatches);
-    return (float) ($aMatches[1].'.'.$aMatches[2]);
-}

lib/init-cmd.php

@@ -1,27 +1,31 @@
 <?php
+	if (file_exists(getenv('NOMINATIM_SETTINGS')))
+	{
+		require_once(getenv('NOMINATIM_SETTINGS'));
+	}
 
-require_once('init.php');
-require_once('cmd.php');
+	require_once('init.php');
+	require_once('cmd.php');
 
-// handle http proxy when using file_get_contents
-if (CONST_HTTP_Proxy) {
-    $proxy = 'tcp://' . CONST_HTTP_Proxy_Host . ':' . CONST_HTTP_Proxy_Port;
-    $aHeaders = array();
-    if (CONST_HTTP_Proxy_Login != null && CONST_HTTP_Proxy_Login != '' && CONST_HTTP_Proxy_Password != null && CONST_HTTP_Proxy_Password != '') {
-        $auth = base64_encode(CONST_HTTP_Proxy_Login . ':' . CONST_HTTP_Proxy_Password);
-        $aHeaders = array("Proxy-Authorization: Basic $auth");
-    }
-    $aContext = array(
-                 'http' => array(
-                            'proxy' => $proxy,
-                            'request_fulluri' => true,
-                            'header' => $aHeaders
-                           ),
-                 'https' => array(
-                             'proxy' => $proxy,
-                             'request_fulluri' => true,
-                             'header' => $aHeaders
-                            )
-                );
-    stream_context_set_default($aContext);
-}
+	// handle http proxy when using file_get_contents
+	if (CONST_HTTP_Proxy) {
+	  $proxy = 'tcp://' . CONST_HTTP_Proxy_Host . ':' . CONST_HTTP_Proxy_Port;
+	  $aHeaders = array();
+	  if(CONST_HTTP_Proxy_Login != null && CONST_HTTP_Proxy_Login != '' && CONST_HTTP_Proxy_Password != null && CONST_HTTP_Proxy_Password != '') {
+	    $auth = base64_encode(CONST_HTTP_Proxy_Login . ':' . CONST_HTTP_Proxy_Password);
+	    $aHeaders = array("Proxy-Authorization: Basic $auth");
+	  }
+	  $aContext = array(
+	    'http' => array(
+	      'proxy' => $proxy,
+	      'request_fulluri' => true,
+	      'header' => $aHeaders
+	    ),
+	    'https' => array(
+	      'proxy' => $proxy,
+	      'request_fulluri' => true,
+	      'header' => $aHeaders
+	    )
+	  );
+	  stream_context_set_default($aContext);
+	}

lib/init-website.php

@@ -1,100 +1,64 @@
 <?php
+	require_once('init.php');
 
-require_once('init.php');
-require_once('ParameterParser.php');
+	if (CONST_NoAccessControl)
+	{
+		header("Access-Control-Allow-Origin: *");
+		header("Access-Control-Allow-Methods: OPTIONS,GET");
+		if (!empty($_SERVER['HTTP_ACCESS_CONTROL_REQUEST_HEADERS']))
+		{
+			header("Access-Control-Allow-Headers: ".$_SERVER['HTTP_ACCESS_CONTROL_REQUEST_HEADERS']);
+		}
+	}
+	if ($_SERVER['REQUEST_METHOD'] == 'OPTIONS') exit;
 
-/***************************************************************************
- *
- * Error handling functions
- *
- */
+	if (CONST_ClosedForIndexing && strpos(CONST_ClosedForIndexingExceptionIPs, ','.$_SERVER["REMOTE_ADDR"].',') === false)
+ 	{
+		echo "Closed for re-indexing...";
+		exit;
+	}
 
+	$aBucketKeys = array();
 
-function chksql($oSql, $sMsg = 'Database request failed')
-{
-    if (!PEAR::isError($oSql)) return $oSql;
+	if (isset($_SERVER["HTTP_REFERER"])) $aBucketKeys[] = str_replace('www.','',strtolower(parse_url($_SERVER["HTTP_REFERER"], PHP_URL_HOST)));
+	if (isset($_SERVER["REMOTE_ADDR"])) $aBucketKeys[] = $_SERVER["REMOTE_ADDR"];
+	if (isset($_GET["email"])) $aBucketKeys[] = $_GET["email"];
 
-    header('HTTP/1.0 500 Internal Server Error');
-    header('Content-type: text/html; charset=utf-8');
+	$fBucketVal = doBucket($aBucketKeys, 
+			(defined('CONST_ConnectionBucket_PageType')?constant('CONST_ConnectionBucket_Cost_'.CONST_ConnectionBucket_PageType):1) + user_busy_cost(),
+			CONST_ConnectionBucket_LeakRate, CONST_ConnectionBucket_BlockLimit);
 
-    $sSqlError = $oSql->getMessage();
+	if ($fBucketVal > CONST_ConnectionBucket_WaitLimit && $fBucketVal < CONST_ConnectionBucket_BlockLimit)
+	{
+		$m = getBucketMemcache();
+		$iCurrentSleeping = $m->increment('sleepCounter');
+		if (false === $iCurrentSleeping)
+		{
+			$m->add('sleepCounter', 0);
+			$iCurrentSleeping = $m->increment('sleepCounter');
+		}
+		if ($iCurrentSleeping >= CONST_ConnectionBucket_MaxSleeping || isBucketSleeping($aBucketKeys))
+		{
+			// Too many threads sleeping already.  This becomes a hard block.
+			$fBucketVal = doBucket($aBucketKeys, CONST_ConnectionBucket_BlockLimit, CONST_ConnectionBucket_LeakRate, CONST_ConnectionBucket_BlockLimit);
+		}
+		else
+		{
+			setBucketSleeping($aBucketKeys, true);
+			sleep(($fBucketVal - CONST_ConnectionBucket_WaitLimit)/CONST_ConnectionBucket_LeakRate);
+			$fBucketVal = doBucket($aBucketKeys, CONST_ConnectionBucket_LeakRate, CONST_ConnectionBucket_LeakRate, CONST_ConnectionBucket_BlockLimit);
+			setBucketSleeping($aBucketKeys, false);
+		}
+		$m->decrement('sleepCounter');
+	}
 
-    echo <<<INTERNALFAIL
-<html>
-  <head><title>Internal Server Error</title></head>
-  <body>
-    <h1>Internal Server Error</h1>
-    <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. If you think it is a bug, feel free to report
-       it over on <a href="https://github.com/openstreetmap/Nominatim/issues">
-       Github</a>. Please include the URL that caused the problem and the
-       complete error details below.</p>
-    <p><b>Message:</b> $sMsg</p>
-    <p><b>SQL Error:</b> $sSqlError</p>
-    <p><b>Details:</b> <pre>
-INTERNALFAIL;
+	if (strpos(CONST_BlockedIPs, ','.$_SERVER["REMOTE_ADDR"].',') !== false || $fBucketVal >= CONST_ConnectionBucket_BlockLimit)
+	{
+		header("HTTP/1.0 429 Too Many Requests");
+		echo "Your IP has been blocked. \n";
+		echo CONST_BlockMessage;
+		exit;
+	}
 
-    if (CONST_Debug) {
-        var_dump($oSql);
-    } else {
-        echo "<pre>\n".$oSql->getUserInfo().'</pre>';
-    }
+	header('Content-type: text/html; charset=utf-8');
 
-    echo '</pre></p></body></html>';
-    exit;
-}
-
-function failInternalError($sError, $sSQL = false, $vDumpVar = false)
-{
-    header('HTTP/1.0 500 Internal Server Error');
-    header('Content-type: text/html; charset=utf-8');
-    echo '<html><body><h1>Internal Server Error</h1>';
-    echo '<p>Nominatim has encountered an internal error while processing your request. This is most likely because of a bug in the software.</p>';
-    echo '<p><b>Details:</b> '.$sError,'</p>';
-    echo '<p>Feel free to file an issue on <a href="https://github.com/openstreetmap/Nominatim/issues">Github</a>. ';
-    echo 'Please include the error message above and the URL you used.</p>';
-    if (CONST_Debug) {
-        echo '<hr><h2>Debugging Information</h2><br>';
-        if ($sSQL) {
-            echo '<h3>SQL query</h3><code>'.$sSQL.'</code>';
-        }
-        if ($vDumpVar) {
-            echo '<h3>Result</h3> <code>';
-            var_dump($vDumpVar);
-            echo '</code>';
-        }
-    }
-    echo "\n</body></html>\n";
-    exit;
-}
-
-
-function userError($sError)
-{
-    header('HTTP/1.0 400 Bad Request');
-    header('Content-type: text/html; charset=utf-8');
-    echo '<html><body><h1>Bad Request</h1>';
-    echo '<p>Nominatim has encountered an error with your request.</p>';
-    echo '<p><b>Details:</b> '.$sError.'</p>';
-    echo '<p>If you feel this error is incorrect feel file an issue on <a href="https://github.com/openstreetmap/Nominatim/issues">Github</a>. ';
-    echo 'Please include the error message above and the URL you used.</p>';
-    echo "\n</body></html>\n";
-    exit;
-}
-
-
-/***************************************************************************
- * HTTP Reply header setup
- */
-
-if (CONST_NoAccessControl) {
-    header('Access-Control-Allow-Origin: *');
-    header('Access-Control-Allow-Methods: OPTIONS,GET');
-    if (!empty($_SERVER['HTTP_ACCESS_CONTROL_REQUEST_HEADERS'])) {
-        header('Access-Control-Allow-Headers: '.$_SERVER['HTTP_ACCESS_CONTROL_REQUEST_HEADERS']);
-    }
-}
-if ($_SERVER['REQUEST_METHOD'] == 'OPTIONS') exit;
-
-if (CONST_Debug) header('Content-type: text/html; charset=utf-8');

lib/init.php

@@ -1,9 +1,14 @@
 <?php
 
-require_once(CONST_BasePath.'/lib/lib.php');
-require_once(CONST_BasePath.'/lib/db.php');
+	@define('CONST_BasePath', dirname(dirname(__FILE__)));
 
-if (get_magic_quotes_gpc()) {
-    echo "Please disable magic quotes in your php.ini configuration\n";
-    exit;
-}
+	require_once(CONST_BasePath.'/settings/settings.php');
+	require_once(CONST_BasePath.'/lib/lib.php');
+	require_once(CONST_BasePath.'/lib/leakybucket.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/leakybucket.php

@@ -0,0 +1,168 @@
+<?php
+
+	function getBucketMemcache()
+	{
+		static $m;
+
+		if (!CONST_ConnectionBucket_MemcacheServerAddress) return null;
+		if (!isset($m))
+		{
+		        $m = new Memcached();
+        		$m->addServer(CONST_ConnectionBucket_MemcacheServerAddress, CONST_ConnectionBucket_MemcacheServerPort);
+		}
+		return $m;
+	}
+
+	function doBucket($asKey, $iRequestCost, $iLeakPerSecond, $iThreshold)
+	{
+	        $m = getBucketMemcache();
+		if (!$m) return 0;
+
+		$iMaxVal = 0;
+	        $t = time();
+
+		foreach($asKey as $sKey)
+		{
+		        $aCurrentBlock = $m->get($sKey);
+	        	if (!$aCurrentBlock)
+			{
+		                $aCurrentBlock = array($iRequestCost, $t, false);
+        		}
+			else
+			{
+				// add RequestCost
+				// remove leak * the time since the last request 
+	        		$aCurrentBlock[0] += $iRequestCost - ($t - $aCurrentBlock[1])*$iLeakPerSecond;
+		        	$aCurrentBlock[1] = $t;
+			}
+
+	        	if ($aCurrentBlock[0] <= 0)
+			{
+                		$m->delete($sKey);
+		        }
+			else
+			{
+				// If we have hit the threshold stop and record this to the block list
+				if ($aCurrentBlock[0] >= $iThreshold)
+				{
+					$aCurrentBlock[0] = $iThreshold;
+
+					// Make up to 10 attempts to record this to memcache (with locking to prevent conflicts)
+					$i = 10;
+					for($i = 0; $i < 10; $i++)
+					{
+						$aBlockedList = $m->get('blockedList', null, $hCasToken);
+						if (!$aBlockedList)
+						{
+							$aBlockedList = array();
+							$m->add('blockedList', $aBlockedList);
+							$aBlockedList = $m->get('blockedList', null, $hCasToken);
+						}
+						if (!isset($aBlockedList[$sKey]))
+						{
+							$aBlockedList[$sKey] = array(1, $t);
+						}
+						else
+						{
+							$aBlockedList[$sKey][0]++;
+							$aBlockedList[$sKey][1] = $t;
+						}
+						if (sizeof($aBlockedList) > CONST_ConnectionBucket_MaxBlockList)
+						{
+							uasort($aBlockedList, 'byValue1');
+							$aBlockedList = array_slice($aBlockedList, 0, CONST_ConnectionBucket_MaxBlockList);
+						}
+						$x = $m->cas($hCasToken, 'blockedList', $aBlockedList);
+						if ($x) break;
+					}
+				}
+				// Only keep in memcache until the time it would have expired (to avoid clutering memcache)
+	                	$m->set($sKey, $aCurrentBlock, $t + 1 + $aCurrentBlock[0]/$iLeakPerSecond);
+			}
+
+			// Bucket result in the largest bucket we find
+			$iMaxVal = max($iMaxVal, $aCurrentBlock[0]);
+		}
+
+		return $iMaxVal;
+        }
+
+	function isBucketSleeping($asKey)
+	{
+	        $m = getBucketMemcache();
+		if (!$m) return false;
+
+		foreach($asKey as $sKey)
+		{
+		        $aCurrentBlock = $m->get($sKey);
+			if ($aCurrentBlock[2]) return true;
+		}
+		return false;
+	}
+
+	function setBucketSleeping($asKey, $bVal)
+	{
+	        $m = getBucketMemcache();
+		if (!$m) return false;
+
+		$iMaxVal = 0;
+	        $t = time();
+
+		foreach($asKey as $sKey)
+		{
+		        $aCurrentBlock = $m->get($sKey);
+			$aCurrentBlock[2] = $bVal;
+			$m->set($sKey, $aCurrentBlock, $t + 1 + $aCurrentBlock[0]/CONST_ConnectionBucket_LeakRate);
+		}
+		return true;
+	}
+
+	function byValue1($a, $b)
+	{
+		if ($a[1] == $b[1])
+		{
+			return 0;
+		}
+		return ($a[1] > $b[1]) ? -1 : 1;
+	}
+
+	function byLastBlockTime($a, $b)
+	{
+		if ($a['lastBlockTimestamp'] == $b['lastBlockTimestamp'])
+		{
+			return 0;
+		}
+		return ($a['lastBlockTimestamp'] > $b['lastBlockTimestamp']) ? -1 : 1;
+	}
+
+	function getBucketBlocks()
+	{
+	        $m = getBucketMemcache();
+		if (!$m) return null;
+	        $t = time();
+		$aBlockedList = $m->get('blockedList', null, $hCasToken);
+		if (!$aBlockedList) $aBlockedList = array();
+		foreach($aBlockedList as $sKey => $aDetails)
+		{
+			$aCurrentBlock = $m->get($sKey);
+			if (!$aCurrentBlock) $aCurrentBlock = array(0, $t);
+			$iCurrentBucketSize = max(0, $aCurrentBlock[0] - ($t - $aCurrentBlock[1])*CONST_ConnectionBucket_LeakRate);
+			$aBlockedList[$sKey] = array(
+				'totalBlocks' => $aDetails[0],
+				'lastBlockTimestamp' => $aDetails[1],
+				'isSleeping' => (isset($aCurrentBlock[2])?$aCurrentBlock[2]:false),
+				'currentBucketSize' => $iCurrentBucketSize,
+				'currentlyBlocked' => $iCurrentBucketSize + (CONST_ConnectionBucket_Cost_Reverse) >= CONST_ConnectionBucket_BlockLimit,
+				);
+		}
+		uasort($aBlockedList, 'byLastBlockTime');
+		return $aBlockedList;
+	}
+
+	function clearBucketBlocks()
+	{
+	        $m = getBucketMemcache();
+		if (!$m) return false;
+		$m->delete('blockedList');
+		return true;
+	}

lib/log.php

@@ -1,74 +1,90 @@
 <?php
 
+	function logStart(&$oDB, $sType = '', $sQuery = '', $aLanguageList = array())
+	{
+		$aStartTime = explode('.',microtime(true));
+		if (!isset($aStartTime[1])) $aStartTime[1] = '0';
 
-function logStart(&$oDB, $sType = '', $sQuery = '', $aLanguageList = array())
-{
-    $fStartTime = microtime(true);
-    $aStartTime = explode('.', $fStartTime);
-    if (!isset($aStartTime[1])) $aStartTime[1] = '0';
+		$sOutputFormat = '';
+		if (isset($_GET['format'])) $sOutputFormat = $_GET['format'];
 
-    $sOutputFormat = '';
-    if (isset($_GET['format'])) $sOutputFormat = $_GET['format'];
+		$hLog = array(
+				date('Y-m-d H:i:s',$aStartTime[0]).'.'.$aStartTime[1],
+				$_SERVER["REMOTE_ADDR"],
+				$_SERVER['QUERY_STRING'],
+				$sQuery
+				);
 
-    if ($sType == 'reverse') {
-        $sOutQuery = (isset($_GET['lat'])?$_GET['lat']:'').'/';
-        if (isset($_GET['lon'])) $sOutQuery .= $_GET['lon'];
-        if (isset($_GET['zoom'])) $sOutQuery .= '/'.$_GET['zoom'];
-    } else {
-        $sOutQuery = $sQuery;
-    }
+		if (CONST_Log_DB)
+		{
+			// Log
+			if ($sType == 'search')
+			{
+				$oDB->query('insert into query_log values ('.getDBQuoted($hLog[0]).','.getDBQuoted($hLog[3]).','.getDBQuoted($hLog[1]).')');
+			}
 
-    $hLog = array(
-             date('Y-m-d H:i:s', $aStartTime[0]).'.'.$aStartTime[1],
-             $_SERVER['REMOTE_ADDR'],
-             $_SERVER['QUERY_STRING'],
-             $sOutQuery,
-             $sType,
-             $fStartTime
-            );
+			$sSQL = 'insert into new_query_log (type,starttime,query,ipaddress,useragent,language,format)';
+			$sSQL .= ' values ('.getDBQuoted($sType).','.getDBQuoted($hLog[0]).','.getDBQuoted($hLog[2]);
+			$sSQL .= ','.getDBQuoted($hLog[1]).','.getDBQuoted($_SERVER['HTTP_USER_AGENT']).','.getDBQuoted(join(',',$aLanguageList)).','.getDBQuoted($sOutputFormat).')';
+			$oDB->query($sSQL);
+		}
 
-    if (CONST_Log_DB) {
-        if (isset($_GET['email']))
-            $sUserAgent = $_GET['email'];
-        elseif (isset($_SERVER['HTTP_REFERER']))
-            $sUserAgent = $_SERVER['HTTP_REFERER'];
-        elseif (isset($_SERVER['HTTP_USER_AGENT']))
-            $sUserAgent = $_SERVER['HTTP_USER_AGENT'];
-        else $sUserAgent = '';
-        $sSQL = 'insert into new_query_log (type,starttime,query,ipaddress,useragent,language,format,searchterm)';
-        $sSQL .= ' values ('.getDBQuoted($sType).','.getDBQuoted($hLog[0]).','.getDBQuoted($hLog[2]);
-        $sSQL .= ','.getDBQuoted($hLog[1]).','.getDBQuoted($sUserAgent).','.getDBQuoted(join(',', $aLanguageList)).','.getDBQuoted($sOutputFormat).','.getDBQuoted($hLog[3]).')';
-        $oDB->query($sSQL);
-    }
+		if (CONST_Log_File && CONST_Log_File_ReverseLog != '')
+		{
+			if ($sType == 'reverse')
+			{
+				$aStartTime = explode('.',$hLog[0]);
+				file_put_contents(CONST_Log_File_ReverseLog,
+								$aStartTime[0].','.$aStartTime[1].','.
+								php_uname('n').','.
+								'"'.addslashes(isset($_SERVER['HTTP_REFERER'])?$_SERVER['HTTP_REFERER']:'').'",'.
+								'"'.addslashes($hLog[1]).'",'.
+								$_GET['lat'].','.
+								$_GET['lon'].','.
+								$_GET['zoom'].','.
+								'"'.addslashes($_SERVER['HTTP_USER_AGENT']).'",'.
+								'"'.addslashes($sOutputFormat).'"'."\n",
+								FILE_APPEND);
+			}
+		}
 
-    return $hLog;
-}
+		return $hLog;
+	}
 
-function logEnd(&$oDB, $hLog, $iNumResults)
-{
-    $fEndTime = microtime(true);
+	function logEnd(&$oDB, $hLog, $iNumResults)
+	{
+		$aEndTime = explode('.',microtime(true));
+		if (!$aEndTime[1]) $aEndTime[1] = '0';
+		$sEndTime = date('Y-m-d H:i:s',$aEndTime[0]).'.'.$aEndTime[1];
 
-    if (CONST_Log_DB) {
-        $aEndTime = explode('.', $fEndTime);
-        if (!$aEndTime[1]) $aEndTime[1] = '0';
-        $sEndTime = date('Y-m-d H:i:s', $aEndTime[0]).'.'.$aEndTime[1];
+		if (CONST_Log_DB)
+		{
+			$sSQL = 'update query_log set endtime = '.getDBQuoted($sEndTime).', results = '.$iNumResults;
+			$sSQL .= ' where starttime = '.getDBQuoted($hLog[0]);
+			$sSQL .= ' and ipaddress = '.getDBQuoted($hLog[1]);
+			$sSQL .= ' and query = '.getDBQuoted($hLog[3]);
+			$oDB->query($sSQL);
 
-        $sSQL = 'update new_query_log set endtime = '.getDBQuoted($sEndTime).', results = '.$iNumResults;
-        $sSQL .= ' where starttime = '.getDBQuoted($hLog[0]);
-        $sSQL .= ' and ipaddress = '.getDBQuoted($hLog[1]);
-        $sSQL .= ' and query = '.getDBQuoted($hLog[2]);
-        $oDB->query($sSQL);
-    }
+			$sSQL = 'update new_query_log set endtime = '.getDBQuoted($sEndTime).', results = '.$iNumResults;
+			$sSQL .= ' where starttime = '.getDBQuoted($hLog[0]);
+			$sSQL .= ' and ipaddress = '.getDBQuoted($hLog[1]);
+			$sSQL .= ' and query = '.getDBQuoted($hLog[2]);
+			$oDB->query($sSQL);
+		}
 
-    if (CONST_Log_File) {
-        $aOutdata = sprintf(
-            "[%s] %.4f %d %s \"%s\"\n",
-            $hLog[0],
-            $fEndTime-$hLog[5],
-            $iNumResults,
-            $hLog[4],
-            $hLog[2]
-        );
-        file_put_contents(CONST_Log_File, $aOutdata, FILE_APPEND | LOCK_EX);
-    }
-}
+		if (CONST_Log_File && CONST_Log_File_SearchLog != '')
+		{
+			$aStartTime = explode('.',$hLog[0]);
+			file_put_contents(CONST_Log_File_SearchLog,
+					$aStartTime[0].','.$aStartTime[1].','.
+					php_uname('n').','.
+					'"'.addslashes(isset($_SERVER['HTTP_REFERER'])?$_SERVER['HTTP_REFERER']:'').'",'.
+					'"'.addslashes($hLog[1]).'",'.
+					'"'.addslashes($hLog[3]).'",'.
+					'"'.addslashes($_SERVER['HTTP_USER_AGENT']).'",'.
+					'"'.addslashes((isset($_GET['format']))?$_GET['format']:'').'",'.
+					$iNumResults."\n",
+					FILE_APPEND);
+		}
+
+	}

lib/output.php

@@ -1,41 +0,0 @@
-<?php
-
-
-function formatOSMType($sType, $bIncludeExternal = true)
-{
-    if ($sType == 'N') return 'node';
-    if ($sType == 'W') return 'way';
-    if ($sType == 'R') return 'relation';
-
-    if (!$bIncludeExternal) return '';
-
-    if ($sType == 'T') return 'way';
-    if ($sType == 'I') return 'way';
-
-    return '';
-}
-
-function osmLink($aFeature, $sRefText = false)
-{
-    $sOSMType = formatOSMType($aFeature['osm_type'], false);
-    if ($sOSMType) {
-        return '<a href="//www.openstreetmap.org/'.$sOSMType.'/'.$aFeature['osm_id'].'">'.$sOSMType.' '.($sRefText?$sRefText:$aFeature['osm_id']).'</a>';
-    }
-    return '';
-}
-
-function wikipediaLink($aFeature)
-{
-    if ($aFeature['wikipedia']) {
-        list($sLanguage, $sArticle) = explode(':', $aFeature['wikipedia']);
-        return '<a href="https://'.$sLanguage.'.wikipedia.org/wiki/'.urlencode($sArticle).'" target="_blank">'.$aFeature['wikipedia'].'</a>';
-    }
-    return '';
-}
-
-function detailsLink($aFeature, $sTitle = false)
-{
-    if (!$aFeature['place_id']) return '';
-
-    return '<a href="details.php?place_id='.$aFeature['place_id'].'">'.($sTitle?$sTitle:$aFeature['place_id']).'</a>';
-}

lib/template/address-html.php

@@ -1,112 +1,106 @@
 <?php
-    header("content-type: text/html; charset=UTF-8");
+  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" />
+  <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'); ?>
+  <?php include(CONST_BasePath.'/lib/template/includes/html-top-navigation.php'); ?>
 
-    <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
+  <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">
+      <input name="lat" type="text" class="form-control input-sm" placeholder="latitude"  value="<?php echo htmlspecialchars($_GET['lat']); ?>" >
+      <input name="lon" type="text" class="form-control input-sm" placeholder="longitude" value="<?php echo htmlspecialchars($_GET['lon']); ?>" >
+      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 id="content">
-
-<?php if (count($aPlace)>0) { ?>
-
-        <div id="searchresults" class="sidebar">
+      <select name="zoom" class="form-control input-sm" value="<?php echo htmlspecialchars($_GET['zoom']); ?>">
+        <option value="" <?php echo $_GET['zoom']==''?'selected':'' ?> >--</option>
         <?php
-            $aResult = $aPlace;
 
-            echo '<div class="result" data-position="0">';
+          $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 => "",
+          );
 
-            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 ' <a class="btn btn-default btn-xs details" href="details.php?place_id='.$aResult['place_id'].'">details</a>';
-            echo '</div>';
+          foreach($aZoomLevels as $iZoomLevel => $sLabel)
+          {
+            $bSel = isset($_GET['zoom']) && ($_GET['zoom'] == (string)$iZoomLevel);
+            echo '<option value="'.$iZoomLevel.'"'.($bSel?'selected':'').'>'.$iZoomLevel.' '.$sLabel.'</option>'."\n";
+          }
         ?>
-        </div>
+      </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 id="content">
+
+<?php if ($aPlace) { ?>
+
+    <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 ' <a class="btn btn-default btn-xs details" href="details.php?place_id='.$aResult['place_id'].'">details</a>';
+      echo '</div>';
+    ?>
+    </div>
 
 <?php } else { ?>
 
-        <div id="intro" class="sidebar">
-            Search for coordinates or click anywhere on the map.
-        </div>
+    <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 id="map-wrapper">
+      <div id="map-position"></div>
+      <div id="map"></div>
+    </div>
 
-    </div> <!-- /content -->
+  </div> <!-- /content -->
 
 
 
@@ -114,22 +108,22 @@
 
 
 
-    <script type="text/javascript">
-    <?php
+  <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) . ';';
+    $aNominatimMapInit = array(
+      'zoom' => isset($_GET['zoom']) ? htmlspecialchars($_GET['zoom']) : CONST_Default_Zoom,
+      'lat'  => isset($_GET['lat'] ) ? htmlspecialchars($_GET['lat'] ) : CONST_Default_Lat,
+      'lon'  => isset($_GET['lon'] ) ? htmlspecialchars($_GET['lon'] ) : 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'); ?>
+    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-json.php

@@ -1,56 +1,30 @@
 <?php
+	$aFilteredPlaces = array();
 
-$aFilteredPlaces = array();
+	if (!sizeof($aPlace))
+	{
+		if (isset($sError))
+			$aFilteredPlaces['error'] = $sError;
+		else
+			$aFilteredPlaces['error'] = 'Unable to geocode';
+	}
+	else
+	{
+		if (isset($aPlace['place_id'])) $aFilteredPlaces['place_id'] = $aPlace['place_id'];
+		$aFilteredPlaces['licence'] = "Data © OpenStreetMap contributors, ODbL 1.0. http://www.openstreetmap.org/copyright";
+		$sOSMType = ($aPlace['osm_type'] == 'N'?'node':($aPlace['osm_type'] == 'W'?'way':($aPlace['osm_type'] == 'R'?'relation':'')));
+                if ($sOSMType)
+                {
+                        $aFilteredPlaces['osm_type'] = $sOSMType;
+                        $aFilteredPlaces['osm_id'] = $aPlace['osm_id'];
+                }
+                if (isset($aPlace['lat'])) $aFilteredPlaces['lat'] = $aPlace['lat'];
+                if (isset($aPlace['lon'])) $aFilteredPlaces['lon'] = $aPlace['lon'];
+		$aFilteredPlaces['display_name'] = $aPlace['langaddress'];
+		if (isset($aPlace['aAddress'])) $aFilteredPlaces['address'] = $aPlace['aAddress'];
+		if (isset($aPlace['sExtraTags'])) $aFilteredPlaces['extratags'] = $aPlace['sExtraTags'];
+		if (isset($aPlace['sNameDetails'])) $aFilteredPlaces['namedetails'] = $aPlace['sNameDetails'];
+	}
 
-if (!sizeof($aPlace))
-{
-    if (isset($sError))
-        $aFilteredPlaces['error'] = $sError;
-    else
-        $aFilteredPlaces['error'] = 'Unable to geocode';
-}
-else
-{
-    if (isset($aPlace['place_id'])) $aFilteredPlaces['place_id'] = $aPlace['place_id'];
-    $aFilteredPlaces['licence'] = "Data © OpenStreetMap contributors, ODbL 1.0. https://osm.org/copyright";
-    $sOSMType = formatOSMType($aPlace['osm_type']);
-    if ($sOSMType)
-    {
-        $aFilteredPlaces['osm_type'] = $sOSMType;
-        $aFilteredPlaces['osm_id'] = $aPlace['osm_id'];
-    }
-    if (isset($aPlace['lat'])) $aFilteredPlaces['lat'] = $aPlace['lat'];
-    if (isset($aPlace['lon'])) $aFilteredPlaces['lon'] = $aPlace['lon'];
-    $aFilteredPlaces['display_name'] = $aPlace['langaddress'];
-    if (isset($aPlace['aAddress'])) $aFilteredPlaces['address'] = $aPlace['aAddress'];
-    if (isset($aPlace['sExtraTags'])) $aFilteredPlaces['extratags'] = $aPlace['sExtraTags'];
-    if (isset($aPlace['sNameDetails'])) $aFilteredPlaces['namedetails'] = $aPlace['sNameDetails'];
-
-    if (isset($aPlace['aBoundingBox']))
-    {
-        $aFilteredPlaces['boundingbox'] = $aPlace['aBoundingBox'];
-    }
-
-    if (isset($aPlace['asgeojson']))
-    {
-        $aFilteredPlaces['geojson'] = json_decode($aPlace['asgeojson']);
-    }
-
-    if (isset($aPlace['assvg']))
-    {
-        $aFilteredPlaces['svg'] = $aPlace['assvg'];
-    }
-
-    if (isset($aPlace['astext']))
-    {
-        $aFilteredPlaces['geotext'] = $aPlace['astext'];
-    }
-
-    if (isset($aPlace['askml']))
-    {
-        $aFilteredPlaces['geokml'] = $aPlace['askml'];
-    }
-}
-
-javascript_renderData($aFilteredPlaces);
+	javascript_renderData($aFilteredPlaces);
 

lib/template/address-jsonv2.php

@@ -1,68 +1,41 @@
 <?php
+	$aFilteredPlaces = array();
 
-$aFilteredPlaces = array();
+	if (!sizeof($aPlace))
+	{
+		if (isset($sError))
+			$aFilteredPlaces['error'] = $sError;
+		else
+			$aFilteredPlaces['error'] = 'Unable to geocode';
+	}
+	else
+	{
+		if ($aPlace['place_id']) $aFilteredPlaces['place_id'] = $aPlace['place_id'];
+		$aFilteredPlaces['licence'] = "Data © OpenStreetMap contributors, ODbL 1.0. http://www.openstreetmap.org/copyright";
+		$sOSMType = ($aPlace['osm_type'] == 'N'?'node':($aPlace['osm_type'] == 'W'?'way':($aPlace['osm_type'] == 'R'?'relation':'')));
+                if ($sOSMType)
+                {
+                        $aFilteredPlaces['osm_type'] = $sOSMType;
+                        $aFilteredPlaces['osm_id'] = $aPlace['osm_id'];
+                }
+		if (isset($aPlace['lat'])) $aFilteredPlaces['lat'] = $aPlace['lat'];
+		if (isset($aPlace['lon'])) $aFilteredPlaces['lon'] = $aPlace['lon'];
 
-if (!sizeof($aPlace))
-{
-    if (isset($sError))
-        $aFilteredPlaces['error'] = $sError;
-    else
-        $aFilteredPlaces['error'] = 'Unable to geocode';
-}
-else
-{
-    if ($aPlace['place_id']) $aFilteredPlaces['place_id'] = $aPlace['place_id'];
-    $aFilteredPlaces['licence'] = "Data © OpenStreetMap contributors, ODbL 1.0. https://osm.org/copyright";
-    $sOSMType = formatOSMType($aPlace['osm_type']);
-    if ($sOSMType)
-    {
-        $aFilteredPlaces['osm_type'] = $sOSMType;
-        $aFilteredPlaces['osm_id'] = $aPlace['osm_id'];
-    }
-    if (isset($aPlace['lat'])) $aFilteredPlaces['lat'] = $aPlace['lat'];
-    if (isset($aPlace['lon'])) $aFilteredPlaces['lon'] = $aPlace['lon'];
+		$aFilteredPlaces['place_rank'] = $aPlace['rank_search'];
 
-    $aFilteredPlaces['place_rank'] = $aPlace['rank_search'];
+		$aFilteredPlaces['category'] = $aPlace['class'];
+		$aFilteredPlaces['type'] = $aPlace['type'];
 
-    $aFilteredPlaces['category'] = $aPlace['class'];
-    $aFilteredPlaces['type'] = $aPlace['type'];
+		$aFilteredPlaces['importance'] = $aPlace['importance'];
 
-    $aFilteredPlaces['importance'] = $aPlace['importance'];
+		$aFilteredPlaces['addresstype'] = strtolower($aPlace['addresstype']);
 
-    $aFilteredPlaces['addresstype'] = strtolower($aPlace['addresstype']);
+		$aFilteredPlaces['display_name'] = $aPlace['langaddress'];
+		$aFilteredPlaces['name'] = $aPlace['placename'];
 
-    $aFilteredPlaces['display_name'] = $aPlace['langaddress'];
-    $aFilteredPlaces['name'] = $aPlace['placename'];
+		if (isset($aPlace['aAddress'])) $aFilteredPlaces['address'] = $aPlace['aAddress'];
+		if (isset($aPlace['sExtraTags'])) $aFilteredPlaces['extratags'] = $aPlace['sExtraTags'];
+		if (isset($aPlace['sNameDetails'])) $aFilteredPlaces['namedetails'] = $aPlace['sNameDetails'];
+	}
 
-    if (isset($aPlace['aAddress'])) $aFilteredPlaces['address'] = $aPlace['aAddress'];
-    if (isset($aPlace['sExtraTags'])) $aFilteredPlaces['extratags'] = $aPlace['sExtraTags'];
-    if (isset($aPlace['sNameDetails'])) $aFilteredPlaces['namedetails'] = $aPlace['sNameDetails'];
-
-    if (isset($aPlace['aBoundingBox']))
-    {
-        $aFilteredPlaces['boundingbox'] = $aPlace['aBoundingBox'];
-    }
-
-    if (isset($aPlace['asgeojson']))
-    {
-        $aFilteredPlaces['geojson'] = json_decode($aPlace['asgeojson']);
-    }
-
-    if (isset($aPlace['assvg']))
-    {
-        $aFilteredPlaces['svg'] = $aPlace['assvg'];
-    }
-
-    if (isset($aPlace['astext']))
-    {
-        $aFilteredPlaces['geotext'] = $aPlace['astext'];
-    }
-
-    if (isset($aPlace['askml']))
-    {
-        $aFilteredPlaces['geokml'] = $aPlace['askml'];
-    }
-
-}
-
-javascript_renderData($aFilteredPlaces);
+	javascript_renderData($aFilteredPlaces);

lib/template/address-xml.php

@@ -1,103 +1,68 @@
 <?php
-header("content-type: text/xml; charset=UTF-8");
+	header("content-type: text/xml; charset=UTF-8");
 
-echo "<";
-echo "?xml version=\"1.0\" encoding=\"UTF-8\" ?";
-echo ">\n";
+	echo "<";
+	echo "?xml version=\"1.0\" encoding=\"UTF-8\" ?";
+	echo ">\n";
 
-echo "<reversegeocode";
-echo " timestamp='".date(DATE_RFC822)."'";
-echo " attribution='Data © OpenStreetMap contributors, ODbL 1.0. http://www.openstreetmap.org/copyright'";
-echo " querystring='".htmlspecialchars($_SERVER['QUERY_STRING'], ENT_QUOTES)."'";
-echo ">\n";
+	echo "<reversegeocode";
+	echo " timestamp='".date(DATE_RFC822)."'";
+	echo " attribution='Data © OpenStreetMap contributors, ODbL 1.0. http://www.openstreetmap.org/copyright'";
+	echo " querystring='".htmlspecialchars($_SERVER['QUERY_STRING'], ENT_QUOTES)."'";
+	echo ">\n";
 
-if (!sizeof($aPlace))
-{
-    if (isset($sError))
-        echo "<error>$sError</error>";
-    else
-        echo "<error>Unable to geocode</error>";
-}
-else
-{
-    echo "<result";
-    if ($aPlace['place_id']) echo ' place_id="'.$aPlace['place_id'].'"';
-    $sOSMType = formatOSMType($aPlace['osm_type']);
-    if ($sOSMType) echo ' osm_type="'.$sOSMType.'"'.' osm_id="'.$aPlace['osm_id'].'"';
-    if ($aPlace['ref']) echo ' ref="'.htmlspecialchars($aPlace['ref']).'"';
-    if (isset($aPlace['lat'])) echo ' lat="'.htmlspecialchars($aPlace['lat']).'"';
-    if (isset($aPlace['lon'])) echo ' lon="'.htmlspecialchars($aPlace['lon']).'"';
-    if (isset($aPlace['aBoundingBox']))
-    {
-        echo ' boundingbox="';
-        echo join(',', $aPlace['aBoundingBox']);
-        echo '"';
-    }
+	if (!sizeof($aPlace))
+	{
+		if (isset($sError))
+			echo "<error>$sError</error>";
+		else
+			echo "<error>Unable to geocode</error>";
+	}
+	else
+	{
+		echo "<result";
+		if ($aPlace['place_id']) echo ' place_id="'.$aPlace['place_id'].'"';
+		$sOSMType = ($aPlace['osm_type'] == 'N'?'node':($aPlace['osm_type'] == 'W'?'way':($aPlace['osm_type'] == 'R'?'relation':'')));
+		if ($sOSMType) echo ' osm_type="'.$sOSMType.'"'.' osm_id="'.$aPlace['osm_id'].'"';
+		if ($aPlace['ref']) echo ' ref="'.htmlspecialchars($aPlace['ref']).'"';
+		if (isset($aPlace['lat'])) echo ' lat="'.htmlspecialchars($aPlace['lat']).'"';
+		if (isset($aPlace['lon'])) echo ' lon="'.htmlspecialchars($aPlace['lon']).'"';
+		echo ">".htmlspecialchars($aPlace['langaddress'])."</result>";
 
-    if (isset($aPlace['asgeojson']))
-    {
-        echo ' geojson=\'';
-        echo $aPlace['asgeojson'];
-        echo '\'';
-    }
+		if (isset($aPlace['aAddress']))
+		{
+			echo "<addressparts>";
+			foreach($aPlace['aAddress'] as $sKey => $sValue)
+			{
+				$sKey = str_replace(' ','_',$sKey);
+				echo "<$sKey>";
+				echo htmlspecialchars($sValue);
+				echo "</$sKey>";
+			}
+			echo "</addressparts>";
+		}
 
-    if (isset($aPlace['assvg']))
-    {
-        echo ' geosvg=\'';
-        echo $aPlace['assvg'];
-        echo '\'';
-    }
+		if (isset($aPlace['sExtraTags']))
+		{
+			echo "<extratags>";
+			foreach ($aPlace['sExtraTags'] as $sKey => $sValue)
+			{
+				echo '<tag key="'.htmlspecialchars($sKey).'" value="'.htmlspecialchars($sValue).'"/>';
+			}
+			echo "</extratags>";
+		}
 
-    if (isset($aPlace['astext']))
-    {
-        echo ' geotext=\'';
-        echo $aPlace['astext'];
-        echo '\'';
-    }
-    echo ">".htmlspecialchars($aPlace['langaddress'])."</result>";
+		if (isset($aPlace['sNameDetails']))
+		{
+			echo "<namedetails>";
+			foreach ($aPlace['sNameDetails'] as $sKey => $sValue)
+			{
+				echo '<name desc="'.htmlspecialchars($sKey).'">';
+				echo htmlspecialchars($sValue);
+				echo "</name>";
+			}
+			echo "</namedetails>";
+		}
+	}
 
-    if (isset($aPlace['aAddress']))
-    {
-        echo "<addressparts>";
-        foreach($aPlace['aAddress'] as $sKey => $sValue)
-        {
-            $sKey = str_replace(' ','_',$sKey);
-            echo "<$sKey>";
-            echo htmlspecialchars($sValue);
-            echo "</$sKey>";
-        }
-        echo "</addressparts>";
-    }
-
-    if (isset($aPlace['sExtraTags']))
-    {
-        echo "<extratags>";
-        foreach ($aPlace['sExtraTags'] as $sKey => $sValue)
-        {
-            echo '<tag key="'.htmlspecialchars($sKey).'" value="'.htmlspecialchars($sValue).'"/>';
-        }
-        echo "</extratags>";
-    }
-
-    if (isset($aPlace['sNameDetails']))
-    {
-        echo "<namedetails>";
-        foreach ($aPlace['sNameDetails'] as $sKey => $sValue)
-        {
-            echo '<name desc="'.htmlspecialchars($sKey).'">';
-            echo htmlspecialchars($sValue);
-            echo "</name>";
-        }
-        echo "</namedetails>";
-    }
-
-    if (isset($aPlace['askml']))
-    {
-        echo "\n<geokml>";
-        echo $aPlace['askml'];
-        echo "</geokml>";
-    }
-
-}
-
-echo "</reversegeocode>";
+	echo "</reversegeocode>";

lib/template/details-error-html.php

@@ -1,122 +1,133 @@
 <?php
-    header("content-type: text/html; charset=UTF-8");
+	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" />
+	<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'];
-            }
+	function osm_link($aFeature)
+	{
+		$sOSMType = ($aFeature['osm_type'] == 'N'?'node':($aFeature['osm_type'] == 'W'?'way':($aFeature['osm_type'] == 'R'?'relation':'')));
+		if ($sOSMType) {
+			return '<a href="http://www.openstreetmap.org/browse/'.$sOSMType.'/'.$aFeature['osm_id'].'">'.$sOSMType.' '.$aFeature['osm_id'].'</a>';
+		}
+		return '';
+	}
 
-            return '<a href="'.$sBaseUrl.'?mlat='.$aFeature['error_y'].'&mlon='.$aFeature['error_x'].'">view on osm.org</a>';
-        }
-        return '';
-    }
+	function osm_map_url($aFeature)
+	{
+		$sLon = $aFeature['error_x'];
+		$sLat = $aFeature['error_y'];
 
-    function josm_edit_url($aFeature)
-    {
-        $fWidth = 0.0002;
-        $sLon = $aFeature['error_x'];
-        $sLat = $aFeature['error_y'];
+		if (isset($sLat))
+		{
+			$sOSMType = ($aFeature['osm_type'] == 'N'?'node':($aFeature['osm_type'] == 'W'?'way':($aFeature['osm_type'] == 'R'?'relation':'')));
+			if ($sOSMType)
+			{
+				return "http://www.openstreetmap.org/?lat=".$sLat."&lon=".$sLon."&zoom=18&layers=M&".$sOSMType."=".$aFeature['osm_id'];
+			}
+		}
+		return '';
+	}
 
-        if (isset($sLat))
-        {
-            return "http://localhost:8111/load_and_zoom?left=".($sLon-$fWidth)."&right=".($sLon+$fWidth)."&top=".($sLat+$fWidth)."&bottom=".($sLat-$fWidth);
-        }
+	function josm_edit_url($aFeature)
+	{
+		$fWidth = 0.0002;
+		$sLon = $aFeature['error_x'];
+		$sLat = $aFeature['error_y'];
 
-        $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 '';
-    }
+		if (isset($sLat))
+		{
+			return "http://localhost:8111/load_and_zoom?left=".($sLon-$fWidth)."&right=".($sLon+$fWidth)."&top=".($sLat+$fWidth)."&bottom=".($sLat-$fWidth);
+		}
 
-    function potlach_edit_url($aFeature)
-    {
-        $fWidth = 0.0002;
-        $sLat = $aFeature['error_y'];
-        $sLon = $aFeature['error_x'];
+		$sOSMType = ($aFeature['osm_type'] == 'N'?'node':($aFeature['osm_type'] == 'W'?'way':($aFeature['osm_type'] == 'R'?'relation':'')));
+		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 '';
+	}
 
-        if (isset($sLat))
-        {
-            return "//www.openstreetmap.org/edit?editor=potlatch2&bbox=".($sLon-$fWidth).",".($sLat-$fWidth).",".($sLon+$fWidth).",".($sLat+$fWidth);
-        }
-        return '';
-    }
+	function potlach_edit_url($aFeature)
+	{
+		$fWidth = 0.0002;
+		$sLat = $aFeature['error_y'];
+		$sLon = $aFeature['error_x'];
+
+		if (isset($sLat))
+		{
+			return "http://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">
+	<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>
+				<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>
+						Type: <span class="type"><?php echo $aPointDetails['class'].':'.$aPointDetails['type'];?></span>
+					</div>
 
-                    <div>
-                        OSM: <span class="label"><?php echo osmLink($aPointDetails); ?><span>
-                    </div>
+					<div>
+						OSM: <span class="label"><?php echo osm_link($aPointDetails); ?><span>
+					</div>
 
 
-                    <h4>Error</h4>
-                    <p>
-                        <?php echo $aPointDetails['errormessage']?$aPointDetails['errormessage']:'unknown'; ?>
-                    </p>
-                    <?php echo osmMapUrl($aPointDetails); ?>
+					<h4>Error</h4>
+					<p>
+						<?php echo $aPointDetails['errormessage']?$aPointDetails['errormessage']:'unknown'; ?>
+					</p>
+					<?php if (osm_map_url($aPointDetails)) { ?>
+						<a href="<?php echo osm_map_url($aPointDetails); ?>">view on osm.org</a>
+					<?php } ?>
 
-                    <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>
+					<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>
+	</div>
 
 
-    <script type="text/javascript">
+	<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; ?>
-        };
+		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>
+	</script>
 
 
-    <?php include(CONST_BasePath.'/lib/template/includes/html-footer.php'); ?>
-    </body>
-</html>
+	<?php include(CONST_BasePath.'/lib/template/includes/html-footer.php'); ?>
+	</body>
+</html>

lib/template/details-html.php

@@ -1,262 +1,301 @@
 <?php
-    header("content-type: text/html; charset=UTF-8");
+	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" />
+	<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 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 headline3($sTitle)
+	{
+		echo "<tr class='all-columns'><td colspan='6'><h3>".$sTitle."</h3></td></tr>\n";
+	}
+
+	function osm_link($aFeature)
+	{
+		$sOSMType = ($aFeature['osm_type'] == 'N'?'node':($aFeature['osm_type'] == 'W'?'way':($aFeature['osm_type'] == 'R'?'relation':'')));
+		if ($sOSMType)
+		{
+			return '<a href="http://www.openstreetmap.org/browse/'.$sOSMType.'/'.$aFeature['osm_id'].'">'.$sOSMType.' '.$aFeature['osm_id'].'</a>';
+		}
+		return '';
+	}
+
+	function wikipedia_link($aFeature)
+	{
+		if ($aFeature['wikipedia'])
+		{
+			list($sWikipediaLanguage,$sWikipediaArticle) = explode(':',$aFeature['wikipedia']);
+			return '<a href="https://'.$sWikipediaLanguage.'.wikipedia.org/wiki/'.urlencode($sWikipediaArticle).'" target="_blank">'.$aFeature['wikipedia'].'</a>';
+		}
+		return '';
+	}
+
+	function nominatim_link($aFeature, $sTitle)
+	{
+		return '<a href="details.php?place_id='.$aFeature['place_id'].'">'.$sTitle.'</a>';
+	}
+
+	function format_distance($fDistance)
+	{
+		// $fDistance is in meters
+		if ($fDistance < 1)
+		{
+			return '0';
+		}
+		elseif ($fDistance < 1000)
+		{
+			return'<abbr class="distance" title="'.$fDistance.'">~'.(round($fDistance,0)).' m</abbr>';
+		}
+		else
+		{
+			return'<abbr class="distance" title="'.$fDistance.'">~'.(round($fDistance/1000,1)).' km</abbr>';
+		}
+	}
+
+	function kv($sKey,$sValue)
+	{
+		echo ' <tr><td>' . $sKey . '</td><td>'.$sValue.'</td></tr>'. "\n";
+	}
 
 
-    function format_distance($fDistance)
-    {
-        // $fDistance is in meters
-        if ($fDistance < 1)
-        {
-            return '0';
-        }
-        elseif ($fDistance < 1000)
-        {
-            return'<abbr class="distance" title="'.$fDistance.'">~'.(round($fDistance,0)).' m</abbr>';
-        }
-        else
-        {
-            return'<abbr class="distance" title="'.$fDistance.'">~'.(round($fDistance/1000,1)).' km</abbr>';
-        }
-    }
+	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 kv($sKey,$sValue)
-    {
-        echo ' <tr><td>' . $sKey . '</td><td>'.$sValue.'</td></tr>'. "\n";
-    }
+	// function hash_to_subtable($aAssociatedList)
+	// {
+	// 	$sHTML = '<table class="table">';
+	// 	foreach($aAssociatedList as $sKey => $sValue)
+	// 	{
+	// 		$sHTML = $sHTML . '<tr><td>'.$sKey.'</td><td class="name">'.$sValue.'</td></tr>'."\n";
+	// 	}
+	// 	$sHTML = $sHTML . '</table>';
+	// 	return $sHTML;
+	// }
 
 
-    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($sIcon)
-    {
-        if ($sIcon){
-            echo '<img id="mapicon" src="'.CONST_Website_BaseURL.'images/mapicons/'.$sIcon.'.n.32.png'.'" alt="'.$sIcon.'" />';
-        }
-    }
+	function map_icon($sIcon)
+	{
+		if ($sIcon){
+			echo '<img id="mapicon" src="'.CONST_Website_BaseURL.'images/mapicons/'.$sIcon.'.n.32.png'.'" alt="'.$sIcon.'" />';
+		}
+	}
 
 
-    function _one_row($aAddressLine){
-        $bNotUsed = (isset($aAddressLine['isaddress']) && $aAddressLine['isaddress'] == 'f');
+	function _one_row($aAddressLine){
+		$bNotUsed = (isset($aAddressLine['isaddress']) && $aAddressLine['isaddress'] == 'f');
 
-        echo '<tr class="' . ($bNotUsed?'notused':'') . '">'."\n";
-        echo '  <td class="name">'.(trim($aAddressLine['localname'])?$aAddressLine['localname']:'<span class="noname">No Name</span>')."</td>\n";
-        echo '  <td>' . $aAddressLine['class'].':'.$aAddressLine['type'] . "</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'])."</td>\n";
-        echo '  <td>' . detailsLink($aAddressLine,'details &gt;') . "</td>\n";
-        echo "</tr>\n";
-    }
+		echo '<tr class="' . ($bNotUsed?'notused':'') . '">'."\n";
+		echo '  <td class="name">'.(trim($aAddressLine['localname'])?$aAddressLine['localname']:'<span class="noname">No Name</span>')."</td>\n";
+		echo '  <td>' . $aAddressLine['class'].':'.$aAddressLine['type'] . "</td>\n";
+		echo '  <td>' . osm_link($aAddressLine) . "</td>\n";
+		echo '  <td>' . (isset($aAddressLine['admin_level']) ? $aAddressLine['admin_level'] : '') . "</td>\n";
+		// echo '<td>' . (isset($aAddressLine['rank_search_label']) ? $aAddressLine['rank_search_label'] : '') ."</td>\n";
+		// echo ', <span class="area">'.($aAddressLine['fromarea']=='t'?'Polygon':'Point').'</span>';
+		echo '  <td>' . format_distance($aAddressLine['distance'])."</td>\n";
+		echo '  <td>' . nominatim_link($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";
-    }
+	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['icon']) ?>
-            </div>
-        </div>
-        <div class="row">
-            <div class="col-md-6">
-                <table id="locationdetails" class="table table-striped">
+	<?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['icon']) ?>
+			</div>
+		</div>
+		<div class="row">
+			<div class="col-md-6">
+				<table id="locationdetails" class="table table-striped">
 
-                <?php
+				<?php
 
-                    kv('Name'            , hash_to_subtable($aPointDetails['aNames']) );
-                    kv('Type'            , $aPointDetails['class'].':'.$aPointDetails['type'] );
-                    kv('Last Updated'    , $aPointDetails['indexed_date'] );
-                    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']=='t'?'Polygon':'Point') );
-                    kv('Centre Point'    , $aPointDetails['lat'].','.$aPointDetails['lon'] );
-                    kv('OSM'             , osmLink($aPointDetails) );
-                    if ($aPointDetails['wikipedia'])
-                    {
-                        kv('Wikipedia Calculated' , wikipediaLink($aPointDetails) );
-                    }
+					kv('Name'            , hash_to_subtable($aPointDetails['aNames']) );
+					kv('Type'            , $aPointDetails['class'].':'.$aPointDetails['type'] );
+					kv('Last Updated'    , $aPointDetails['indexed_date'] );
+					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']=='t'?'Polygon':'Point') );
+					kv('Centre Point'    , $aPointDetails['lat'].','.$aPointDetails['lon'] );
+					kv('OSM'             , osm_link($aPointDetails) );
+					if ($aPointDetails['wikipedia'])
+					{
+						kv('Wikipedia Calculated' , wikipedia_link($aPointDetails) );
+					}
 
-                    kv('Computed Postcode', $aPointDetails['postcode']);
-                    kv('Address Tags'    , hash_to_subtable($aPointDetails['aAddressTags']) );
-                    kv('Extra Tags'      , hash_to_subtable($aPointDetails['aExtraTags']) );
+					kv('Extra Tags'      , hash_to_subtable($aPointDetails['aExtraTags']) );
 
-                ?>
+				?>
 
-                </table>
-            </div>
+				</table>
+			</div>
 
-            <div class="col-md-6">
-                <div id="map"></div>
-            </div>
+			<div class="col-md-6">
+				<div id="map"></div>
+			</div>
 
-        </div>
-        <div class="row">
-            <div class="col-md-12">
+		</div>
+		<div class="row">
+			<div class="col-md-12">
 
-            <h2>Address</h2>
+			<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>
+			<table id="address" class="table table-striped table-responsive">
+				<thead>
+					<tr>
+					  <td>Local name</td>
+					  <td>Type</td>
+					  <td>OSM</td>
+					  <td>Admin level</td>
+					  <!-- <td>Search rank</td> -->
+					  <td>Distance</td>
+					  <td></td>
+					</tr>
+				</thead>
+				<tbody>
 
-                <?php
+				<?php
 
-                    foreach($aAddressLines as $aAddressLine)
-                    {   
-                        _one_row($aAddressLine);
-                    }
-                ?>
-    
+					foreach($aAddressLines as $aAddressLine)
+					{	
+						_one_row($aAddressLine);
+					}
+				?>
+	
 
 
 <?php
 
-    if ($aLinkedLines)
-    {
-        headline('Linked Places');
-        foreach($aLinkedLines as $aAddressLine)
-        {   
-            _one_row($aAddressLine);
-        }
-    }
+	if ($aLinkedLines)
+	{
+		headline('Linked Places');
+		foreach($aLinkedLines as $aAddressLine)
+		{	
+			_one_row($aAddressLine);
+		}
+	}
 
 
 
-    if ($aPlaceSearchNameKeywords)
-    {
-        headline('Name Keywords');
-        foreach($aPlaceSearchNameKeywords as $aRow)
-        {
-            _one_keyword_row($aRow['word_token'], $aRow['word_id']);
-        }
-    }
+	if ($aPlaceSearchNameKeywords)
+	{
+		headline('Name Keywords');
+		foreach($aPlaceSearchNameKeywords as $aRow)
+		{
+			_one_keyword_row($aRow['word_token'], $aRow['word_id']);
+		}
+	}
 
-    if ($aPlaceSearchAddressKeywords)
-    {
-        headline('Address Keywords');
-        foreach($aPlaceSearchAddressKeywords as $aRow)
-        {
-            _one_keyword_row($aRow['word_token'], $aRow['word_id']);
-        }
-    }
-    
-    if (sizeof($aParentOfLines))
-    {
-        headline('Parent Of');
+	if ($aPlaceSearchAddressKeywords)
+	{
+		headline('Address Keywords');
+		foreach($aPlaceSearchAddressKeywords as $aRow)
+		{
+			_one_keyword_row($aRow['word_token'], $aRow['word_id']);
+		}
+	}
+	
+	if (sizeof($aParentOfLines))
+	{
+		headline('Parent Of');
 
-        $aGroupedAddressLines = array();
-        foreach($aParentOfLines as $aAddressLine)
-        {
-            if ($aAddressLine['type'] == 'yes') $sType = $aAddressLine['class'];
-            else $sType = $aAddressLine['type'];
+		$aGroupedAddressLines = array();
+		foreach($aParentOfLines 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 => $aParentOfLines)
-        {
-            $sGroupHeading = ucwords($sGroupHeading);
-            headline3($sGroupHeading);
+			if (!isset($aGroupedAddressLines[$sType]))
+				$aGroupedAddressLines[$sType] = array();
+			$aGroupedAddressLines[$sType][] = $aAddressLine;
+		}
+		foreach($aGroupedAddressLines as $sGroupHeading => $aParentOfLines)
+		{
+			$sGroupHeading = ucwords($sGroupHeading);
+			headline3($sGroupHeading);
 
-            foreach($aParentOfLines as $aAddressLine)
-            {
-                _one_row($aAddressLine);
-            }
-        }
-        if (sizeof($aParentOfLines) >= 500) {
-            echo '<p>There are more child objects which are not shown.</p>';
-        }
-    }
+			foreach($aParentOfLines as $aAddressLine)
+			{
+				_one_row($aAddressLine);
+			}
+		}
+		if (sizeof($aParentOfLines) >= 500) {
+			echo '<p>There are more child objects which are not shown.</p>';
+		}
+	}
 
-    echo "</table>\n";
+	// headline('Other Parts');
+	// headline('Linked To');
+
+	echo "</table>\n";
 ?>
 
-            </div>
-        </div>
-    </div>
+			</div>
+		</div>
+	</div>
 
-    <script type="text/javascript">
-    <?php
+	<script type="text/javascript">
+	<?php
 
-        $aNominatimMapInit = array(
-          'tile_url' => $sTileURL,
-          'tile_attribution' => $sTileAttribution
-        );
-        echo 'var nominatim_map_init = ' . json_encode($aNominatimMapInit, JSON_PRETTY_PRINT) . ';';
+    $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) . ';'; 
+    $aPlace = array(
+			'outlinestring' => $aPointDetails['outlinestring'],
+			'lon' => $aPointDetails['lon'],
+			'lat' => $aPointDetails['lat'],
+	);
+	  echo 'var nominatim_result = ' . json_encode($aPlace, JSON_PRETTY_PRINT) . ';'; 
 
 
-    ?>
-    </script>
+  ?>
+	</script>
 
 
 
-    <?php include(CONST_BasePath.'/lib/template/includes/html-footer.php'); ?>
+	<?php include(CONST_BasePath.'/lib/template/includes/html-footer.php'); ?>
 </body>
 </html>

lib/template/includes/html-footer.php

@@ -1,14 +1,14 @@
 <footer>
-    <p class="disclaimer">
-        Addresses and postcodes are approximate
-    </p>
-    <p class="copyright">
-        &copy; <a href="https://osm.org/copyright">OpenStreetMap</a> contributors
-    </p>
+  <p class="disclaimer">
+    Addresses and postcodes are approximate
+  </p>
+  <p class="copyright">
+    &copy; <a href="http://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/leaflet-omnivore.min.js"></script>
 <script src="js/nominatim-ui.js"></script>

lib/template/includes/html-header.php

@@ -1,13 +1,11 @@
 <!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">
+	<title>OpenStreetMap Nominatim: Search</title>
+	<meta name="viewport" content="width=device-width, initial-scale=1">
 
-    <base href="<?php echo CONST_Website_BaseURL;?>" />
-    <link href="nominatim.xml" rel="search" title="Nominatim Search" type="application/opensearchdescription+xml" />
-    <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" />
+	<base href="<?php echo CONST_Website_BaseURL;?>" />
+	<link href="nominatim.xml" rel="search" title="Nominatim Search" type="application/opensearchdescription+xml" />
+	<link href="css/leaflet.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

@@ -1,49 +1,49 @@
-<header class="container-fluid">
+  <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 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 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://wiki.openstreetmap.org/wiki/Nominatim" target="_blank">Documentation</a></li>
-                    <li><a href="https://wiki.openstreetmap.org/wiki/Nominatim/FAQ" target="_blank">FAQ</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 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="http://wiki.openstreetmap.org/wiki/Nominatim" target="_blank">Documentation</a></li>
+            <li><a href="http://wiki.openstreetmap.org/wiki/Nominatim/FAQ" target="_blank">FAQ</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>
+  </header>
 
-<div class="modal fade" id="report-modal">
+  <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 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>
+  </div>

lib/template/includes/introduction.php

@@ -1,9 +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
+<p>Nominatim is a search engine for <a href="http://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://wiki.openstreetmap.org/wiki/Nominatim">Nominatim wiki page</a>.
+For more information visit the <a href="http://wiki.openstreetmap.org/wiki/Nominatim">Nominatim wiki page</a>.

lib/template/includes/report-errors.php

@@ -1,24 +1,24 @@
 <p>
-    Before reporting problems please read the <a target="_blank" href="https://wiki.openstreetmap.org/wiki/Nominatim">user documentation</a>
-    and
-    <a target="_blank" href="https://wiki.openstreetmap.org/wiki/Nominatim/FAQ">FAQ</a>.
+	Before reporting problems please read the <a target="_blank" href="http://wiki.openstreetmap.org/wiki/Nominatim">user documentation</a>
+	and
+	<a target="_blank" href="http://wiki.openstreetmap.org/wiki/Nominatim/FAQ">FAQ</a>.
 
-    If your problem relates to the address of a particular search result please use the 'details' link 
-    to check how the address was generated before reporting a problem.
+	If your problem relates to the address of a particular search result please use the 'details' link 
+	to check how the address was generated before reporting a problem.
 </p>
 <p>
-    Use <a target="_blank" href="https://github.com/openstreetmap/nominatim/issues">Nominatim issues on github</a>
-    to report problems.
-<!-- You can search for existing bug reports
-    <a href="https://trac.openstreetmap.org/query?status=new&amp;status=assigned&amp;status=reopened&amp;component=nominatim&amp;order=priority">here</a>.</p>
+	Use <a target="_blank" href="https://github.com/twain47/nominatim/issues">Nominatim issues on github</a>
+	to report problems.
+<!-- 	You can search for existing bug reports
+	<a href="http://trac.openstreetmap.org/query?status=new&amp;status=assigned&amp;status=reopened&amp;component=nominatim&amp;order=priority">here</a>.</p>
  -->
 </p>
 <p>
-    Please ensure that you include a full description of the problem, including the search
-    query that you used, the problem with the result and, if the problem relates to missing data,
-    the osm type (node, way, relation) and id of the item that is missing.
+	Please ensure that you include a full description of the problem, including the search
+	query that you used, the problem with the result and, if the problem relates to missing data,
+	the osm type (node, way, relation) and id of the item that is missing.
 </p>
 <p>
-    Problems that contain enough detail are likely to get looked at before ones that require
-    significant research.
+	Problems that contain enough detail are likely to get looked at before ones that require
+	significant research.
 </p>

lib/template/search-batch-json.php

@@ -1,88 +1,88 @@
 <?php
 
-$aOutput = array();
-$aOutput['licence'] = "Data © OpenStreetMap contributors, ODbL 1.0. https://osm.org/copyright";
-$aOutput['batch'] = array();
+	$aOutput = array();
+	$aOutput['licence'] = "Data © OpenStreetMap contributors, ODbL 1.0. http://www.openstreetmap.org/copyright";
+	$aOutput['batch'] = array();
 
-foreach($aBatchResults as $aSearchResults)
-{
-    if (!$aSearchResults) $aSearchResults = array();
-    $aFilteredPlaces = array();
-    foreach($aSearchResults as $iResNum => $aPointDetails)
-    {
-        $aPlace = array(
-                    'place_id'=>$aPointDetails['place_id'],
-                );
+	foreach($aBatchResults as $aSearchResults)
+	{
+		if (!$aSearchResults) $aSearchResults = array();
+		$aFilteredPlaces = array();
+		foreach($aSearchResults as $iResNum => $aPointDetails)
+		{
+			$aPlace = array(
+					'place_id'=>$aPointDetails['place_id'],
+				  );
 
-        $sOSMType = formatOSMType($aPointDetails['osm_type']);
-        if ($sOSMType)
-        {
-            $aPlace['osm_type'] = $sOSMType;
-            $aPlace['osm_id'] = $aPointDetails['osm_id'];
-        }
+			$sOSMType = ($aPointDetails['osm_type'] == 'N'?'node':($aPointDetails['osm_type'] == 'W'?'way':($aPointDetails['osm_type'] == 'R'?'relation':'')));
+			if ($sOSMType)
+			{
+				$aPlace['osm_type'] = $sOSMType;
+				$aPlace['osm_id'] = $aPointDetails['osm_id'];
+			}
 
-        if (isset($aPointDetails['aBoundingBox']))
-        {
-            $aPlace['boundingbox'] = array(
-                $aPointDetails['aBoundingBox'][0],
-                $aPointDetails['aBoundingBox'][1],
-                $aPointDetails['aBoundingBox'][2],
-                $aPointDetails['aBoundingBox'][3]);
+        	        if (isset($aPointDetails['aBoundingBox']))
+                	{
+				$aPlace['boundingbox'] = array(
+					$aPointDetails['aBoundingBox'][0],
+					$aPointDetails['aBoundingBox'][1],
+					$aPointDetails['aBoundingBox'][2],
+					$aPointDetails['aBoundingBox'][3]);
 
-            if (isset($aPointDetails['aPolyPoints']) && $bShowPolygons)
-            {
-                $aPlace['polygonpoints'] = $aPointDetails['aPolyPoints'];
-            }
-        }
+				if (isset($aPointDetails['aPolyPoints']) && $bShowPolygons)
+				{
+					$aPlace['polygonpoints'] = $aPointDetails['aPolyPoints'];
+				}
+	                }
 
-        if (isset($aPointDetails['zoom']))
-        {
-            $aPlace['zoom'] = $aPointDetails['zoom'];
-        }
+			if (isset($aPointDetails['zoom']))
+			{
+				$aPlace['zoom'] = $aPointDetails['zoom'];
+			}
 
-        $aPlace['lat'] = $aPointDetails['lat'];
-        $aPlace['lon'] = $aPointDetails['lon'];
-        $aPlace['display_name'] = $aPointDetails['name'];
-        $aPlace['place_rank'] = $aPointDetails['rank_search'];
+			$aPlace['lat'] = $aPointDetails['lat'];
+			$aPlace['lon'] = $aPointDetails['lon'];
+			$aPlace['display_name'] = $aPointDetails['name'];
+			$aPlace['place_rank'] = $aPointDetails['rank_search'];
 
-        $aPlace['category'] = $aPointDetails['class'];
-        $aPlace['type'] = $aPointDetails['type'];
+			$aPlace['category'] = $aPointDetails['class'];
+			$aPlace['type'] = $aPointDetails['type'];
 
-        $aPlace['importance'] = $aPointDetails['importance'];
+			$aPlace['importance'] = $aPointDetails['importance'];
 
-        if (isset($aPointDetails['icon']))
-        {
-            $aPlace['icon'] = $aPointDetails['icon'];
-        }
+			if (isset($aPointDetails['icon']))
+			{
+				$aPlace['icon'] = $aPointDetails['icon'];
+			}
 
-        if (isset($aPointDetails['address']) && sizeof($aPointDetails['address'])>0)
-        {
-            $aPlace['address'] = $aPointDetails['address'];
-        }
+			if (isset($aPointDetails['address']) && sizeof($aPointDetails['address'])>0)
+			{
+				$aPlace['address'] = $aPointDetails['address'];
+        	        }
 
-        if (isset($aPointDetails['asgeojson']))
-        {
-            $aPlace['geojson'] = json_decode($aPointDetails['asgeojson']);
-        }
+	                if (isset($aPointDetails['asgeojson']))
+        	        {
+				$aPlace['geojson'] = json_decode($aPointDetails['asgeojson']);
+        	        }
 
-        if (isset($aPointDetails['assvg']))
-        {
-            $aPlace['svg'] = $aPointDetails['assvg'];
-        }
+	                if (isset($aPointDetails['assvg']))
+        	        {
+				$aPlace['svg'] = $aPointDetails['assvg'];
+	                }
 
-        if (isset($aPointDetails['astext']))
-        {
-            $aPlace['geotext'] = $aPointDetails['astext'];
-        }
+	                if (isset($aPointDetails['astext']))
+        	        {
+                	        $aPlace['geotext'] = $aPointDetails['astext'];
+	                }
 
-        if (isset($aPointDetails['askml']))
-        {
-            $aPlace['geokml'] = $aPointDetails['askml'];
-        }
+        	        if (isset($aPointDetails['askml']))
+                	{
+                        	$aPlace['geokml'] = $aPointDetails['askml'];
+	                }
 
-        $aFilteredPlaces[] = $aPlace;
-    }
-    $aOutput['batch'][] = $aFilteredPlaces;
-}
+			$aFilteredPlaces[] = $aPlace;
+		}
+		$aOutput['batch'][] = $aFilteredPlaces;
+	}
 
-javascript_renderData($aOutput, array('geojson'));
+	javascript_renderData($aOutput, array('geojson'));

lib/template/search-html.php

@@ -1,91 +1,91 @@
 <?php
-    header("content-type: text/html; charset=UTF-8");
+	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" />
+	<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'); ?>
+	<?php include(CONST_BasePath.'/lib/template/includes/html-top-navigation.php'); ?>
 
-    <form class="form-inline" role="search" accept-charset="UTF-8" action="<?php echo CONST_Website_BaseURL; ?>search.php">
-        <div class="form-group">
-            <input id="q" name="q" type="text" class="form-control input-sm" placeholder="Search" value="<?php echo htmlspecialchars($sQuery); ?>" >
-        </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 if (isset($aMoreParams['viewbox'])) echo ($aMoreParams['viewbox']); ?>" />
-            <div class="checkbox-inline">
-                <input type="checkbox" id="use_viewbox" <?php if (isset($aMoreParams['viewbox'])) echo "checked='checked'"; ?>>
-                <label for="use_viewbox">apply viewbox</label>
-            </div>
-        </div>
-        <div class="search-type-link">
-            <a id="switch-to-reverse" href="<?php echo CONST_Website_BaseURL; ?>reverse.php?format=html">reverse search</a>
-        </div>
-    </form>
+	<form class="form-inline" role="search" accept-charset="UTF-8" action="<?php echo CONST_Website_BaseURL; ?>search.php">
+		<div class="form-group">
+			<input id="q" name="q" type="text" class="form-control input-sm" placeholder="Search" value="<?php echo htmlspecialchars($sQuery); ?>" >
+		</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="checkbox" value="1" name="polygon" <?php if ($bAsText) echo "checked='checked'"; ?>/> Highlight -->
+				<input type="hidden" value="1" name="polygon" />
+			<?php } ?>
+			<input type="hidden" name="viewbox" value="<?php echo $sViewBox; ?>" />
+			<div class="checkbox-inline">
+				<label>
+					<input type="checkbox" id="use_viewbox" <?php if ($sViewBox) echo "checked='checked'"; ?>>
+					apply viewbox
+				</label>
+			</div>
+		</div>
+		<div class="search-type-link">
+			<a href="<?php echo CONST_Website_BaseURL; ?>reverse.php?format=html">reverse search</a>
+		</div>
+	</form>
 
 
-    <div id="content">
+	<div id="content">
 
 <?php if ($sQuery) { ?>
 
-        <div id="searchresults" class="sidebar">
-        <?php
-            $i = 0;
-            foreach($aSearchResults as $iResNum => $aResult)
-            {
+		<div id="searchresults" class="sidebar">
+		<?php
+			$i = 0;
+			foreach($aSearchResults as $iResNum => $aResult)
+			{
 
-                echo '<div class="result" data-position=' . $i . '>';
+				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 ' <a class="btn btn-default btn-xs details" href="details.php?place_id='.$aResult['place_id'].'">details</a>';
-                echo '</div>';
-                $i = $i+1;
-            }
-            if (sizeof($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>';
-            }
+				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 ' <a class="btn btn-default btn-xs details" href="details.php?place_id='.$aResult['place_id'].'">details</a>';
+				echo '</div>';
+				$i = $i+1;
+			}
+			if (sizeof($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>
+		?>
+		</div>
 
 <?php } else { ?>
 
-        <div id="intro" class="sidebar">
-            <?php include(CONST_BasePath.'/lib/template/includes/introduction.php'); ?>
-        </div>
+		<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 id="map-wrapper">
+			<div id="map-position"></div>
+			<div id="map"></div>
+		</div>
 
-    </div> <!-- /content -->
+	</div> <!-- /content -->
 
 
 
@@ -93,22 +93,22 @@
 
 
 
-    <script type="text/javascript">
-    <?php
+	<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) . ';';
+		$aNominatimMapInit = array(
+			'zoom' => $iZoom,
+			'lat' => $fLat,
+			'lon' => $fLon,
+			'tile_url' => $sTileURL,
+			'tile_attribution' => $sTileAttribution
+		);
+		echo 'var nominatim_map_init = ' . json_encode($aNominatimMapInit, JSON_PRETTY_PRINT) . ';';
 
-        echo 'var nominatim_results = ' . json_encode($aSearchResults, JSON_PRETTY_PRINT) . ';'; 
-    ?>
-    </script>
-    <?php include(CONST_BasePath.'/lib/template/includes/html-footer.php'); ?>
+		echo 'var nominatim_results = ' . json_encode($aSearchResults, JSON_PRETTY_PRINT) . ';'; 
+	?>
+	</script>
+	<?php include(CONST_BasePath.'/lib/template/includes/html-footer.php'); ?>
 
 </body>
 </html>

lib/template/search-json.php

@@ -1,79 +1,83 @@
 <?php
-header("content-type: application/json; charset=UTF-8");
+	header("content-type: application/json; charset=UTF-8");
 
-$aFilteredPlaces = array();
-foreach($aSearchResults as $iResNum => $aPointDetails)
-{
-    $aPlace = array(
-            'place_id'=>$aPointDetails['place_id'],
-            'licence'=>"Data © OpenStreetMap contributors, ODbL 1.0. https://www.openstreetmap.org/copyright",
-        );
-    
-    $sOSMType = formatOSMType($aPointDetails['osm_type']);
-    if ($sOSMType)
-    {
-        $aPlace['osm_type'] = $sOSMType;
-        $aPlace['osm_id'] = $aPointDetails['osm_id'];
-    }
+	$aFilteredPlaces = array();
+	foreach($aSearchResults as $iResNum => $aPointDetails)
+	{
+		$aPlace = array(
+				'place_id'=>$aPointDetails['place_id'],
+				'licence'=>"Data © OpenStreetMap contributors, ODbL 1.0. http://www.openstreetmap.org/copyright",
+			);
 
-    if (isset($aPointDetails['aBoundingBox']))
-    {
-        $aPlace['boundingbox'] = $aPointDetails['aBoundingBox'];
+		$sOSMType = ($aPointDetails['osm_type'] == 'N'?'node':($aPointDetails['osm_type'] == 'W'?'way':($aPointDetails['osm_type'] == 'R'?'relation':'')));
+		if ($sOSMType)
+		{
+			$aPlace['osm_type'] = $sOSMType;
+			$aPlace['osm_id'] = $aPointDetails['osm_id'];
+		}
 
-        if (isset($aPointDetails['aPolyPoints']))
-        {
-            $aPlace['polygonpoints'] = $aPointDetails['aPolyPoints'];
-        }
-    }
+                if (isset($aPointDetails['aBoundingBox']))
+                {
+			$aPlace['boundingbox'] = array(
+				$aPointDetails['aBoundingBox'][0],
+				$aPointDetails['aBoundingBox'][1],
+				$aPointDetails['aBoundingBox'][2],
+				$aPointDetails['aBoundingBox'][3]);
 
-    if (isset($aPointDetails['zoom']))
-    {
-        $aPlace['zoom'] = $aPointDetails['zoom'];
-    }
+			if (isset($aPointDetails['aPolyPoints']) && $bShowPolygons)
+			{
+				$aPlace['polygonpoints'] = $aPointDetails['aPolyPoints'];
+			}
+                }
 
-    $aPlace['lat'] = $aPointDetails['lat'];
-    $aPlace['lon'] = $aPointDetails['lon'];
-    $aPlace['display_name'] = $aPointDetails['name'];
+		if (isset($aPointDetails['zoom']))
+		{
+			$aPlace['zoom'] = $aPointDetails['zoom'];
+		}
 
-    $aPlace['class'] = $aPointDetails['class'];
-    $aPlace['type'] = $aPointDetails['type'];
+		$aPlace['lat'] = $aPointDetails['lat'];
+		$aPlace['lon'] = $aPointDetails['lon'];
+		$aPlace['display_name'] = $aPointDetails['name'];
 
-    $aPlace['importance'] = $aPointDetails['importance'];
+		$aPlace['class'] = $aPointDetails['class'];
+		$aPlace['type'] = $aPointDetails['type'];
 
-    if (isset($aPointDetails['icon']) && $aPointDetails['icon'])
-    {
-        $aPlace['icon'] = $aPointDetails['icon'];
-    }
+		$aPlace['importance'] = $aPointDetails['importance'];
 
-    if (isset($aPointDetails['address']))
-    {
-        $aPlace['address'] = $aPointDetails['address'];
-    }
+		if (isset($aPointDetails['icon']) && $aPointDetails['icon'])
+		{
+			$aPlace['icon'] = $aPointDetails['icon'];
+		}
 
-    if (isset($aPointDetails['asgeojson']))
-    {
-        $aPlace['geojson'] = json_decode($aPointDetails['asgeojson']);
-    }
+		if (isset($aPointDetails['address']))
+		{
+			$aPlace['address'] = $aPointDetails['address'];
+                }
 
-    if (isset($aPointDetails['assvg']))
-    {
-        $aPlace['svg'] = $aPointDetails['assvg'];
-    }
+                if (isset($aPointDetails['asgeojson']))
+                {
+                        $aPlace['geojson'] = json_decode($aPointDetails['asgeojson']);
+                }
 
-    if (isset($aPointDetails['astext']))
-    {
-        $aPlace['geotext'] = $aPointDetails['astext'];
-    }
+                if (isset($aPointDetails['assvg']))
+                {
+                        $aPlace['svg'] = $aPointDetails['assvg'];
+                }
 
-    if (isset($aPointDetails['askml']))
-    {
-        $aPlace['geokml'] = $aPointDetails['askml'];
-    }
+                if (isset($aPointDetails['astext']))
+                {
+                        $aPlace['geotext'] = $aPointDetails['astext'];
+                }
 
-    if (isset($aPointDetails['sExtraTags'])) $aPlace['extratags'] = $aPointDetails['sExtraTags'];
-    if (isset($aPointDetails['sNameDetails'])) $aPlace['namedetails'] = $aPointDetails['sNameDetails'];
+		if (isset($aPointDetails['askml']))
+		{
+			$aPlace['geokml'] = $aPointDetails['askml'];
+		}
 
-    $aFilteredPlaces[] = $aPlace;
-}
+		if (isset($aPointDetails['sExtraTags'])) $aPlace['extratags'] = $aPointDetails['sExtraTags'];
+		if (isset($aPointDetails['sNameDetails'])) $aPlace['namedetails'] = $aPointDetails['sNameDetails'];
 
-javascript_renderData($aFilteredPlaces);
+		$aFilteredPlaces[] = $aPlace;
+	}
+
+	javascript_renderData($aFilteredPlaces);

lib/template/search-jsonv2.php

@@ -1,79 +1,82 @@
 <?php
+	$aFilteredPlaces = array();
+	foreach($aSearchResults as $iResNum => $aPointDetails)
+	{
+		$aPlace = array(
+				'place_id'=>$aPointDetails['place_id'],
+				'licence'=>"Data © OpenStreetMap contributors, ODbL 1.0. http://www.openstreetmap.org/copyright",
+			);
 
-$aFilteredPlaces = array();
-foreach($aSearchResults as $iResNum => $aPointDetails)
-{
-    $aPlace = array(
-            'place_id'=>$aPointDetails['place_id'],
-            'licence'=>"Data © OpenStreetMap contributors, ODbL 1.0. https://osm.org/copyright",
-        );
+		$sOSMType = ($aPointDetails['osm_type'] == 'N'?'node':($aPointDetails['osm_type'] == 'W'?'way':($aPointDetails['osm_type'] == 'R'?'relation':'')));
+		if ($sOSMType)
+		{
+			$aPlace['osm_type'] = $sOSMType;
+			$aPlace['osm_id'] = $aPointDetails['osm_id'];
+		}
 
-    $sOSMType = formatOSMType($aPointDetails['osm_type']);
-    if ($sOSMType)
-    {
-        $aPlace['osm_type'] = $sOSMType;
-        $aPlace['osm_id'] = $aPointDetails['osm_id'];
-    }
+                if (isset($aPointDetails['aBoundingBox']))
+                {
+			$aPlace['boundingbox'] = array(
+				$aPointDetails['aBoundingBox'][0],
+				$aPointDetails['aBoundingBox'][1],
+				$aPointDetails['aBoundingBox'][2],
+				$aPointDetails['aBoundingBox'][3]);
 
-    if (isset($aPointDetails['aBoundingBox']))
-    {
-        $aPlace['boundingbox'] = $aPointDetails['aBoundingBox'];
+			if (isset($aPointDetails['aPolyPoints']) && $bShowPolygons)
+			{
+				$aPlace['polygonpoints'] = $aPointDetails['aPolyPoints'];
+			}
+                }
 
-        if (isset($aPointDetails['aPolyPoints']))
-        {
-            $aPlace['polygonpoints'] = $aPointDetails['aPolyPoints'];
-        }
-    }
+		if (isset($aPointDetails['zoom']))
+		{
+			$aPlace['zoom'] = $aPointDetails['zoom'];
+		}
 
-    if (isset($aPointDetails['zoom']))
-    {
-        $aPlace['zoom'] = $aPointDetails['zoom'];
-    }
+		$aPlace['lat'] = $aPointDetails['lat'];
+		$aPlace['lon'] = $aPointDetails['lon'];
+		$aPlace['display_name'] = $aPointDetails['name'];
+		$aPlace['place_rank'] = $aPointDetails['rank_search'];
 
-    $aPlace['lat'] = $aPointDetails['lat'];
-    $aPlace['lon'] = $aPointDetails['lon'];
-    $aPlace['display_name'] = $aPointDetails['name'];
-    $aPlace['place_rank'] = $aPointDetails['rank_search'];
+		$aPlace['category'] = $aPointDetails['class'];
+		$aPlace['type'] = $aPointDetails['type'];
 
-    $aPlace['category'] = $aPointDetails['class'];
-    $aPlace['type'] = $aPointDetails['type'];
+		$aPlace['importance'] = $aPointDetails['importance'];
 
-    $aPlace['importance'] = $aPointDetails['importance'];
+		if (isset($aPointDetails['icon']))
+		{
+			$aPlace['icon'] = $aPointDetails['icon'];
+		}
 
-    if (isset($aPointDetails['icon']))
-    {
-        $aPlace['icon'] = $aPointDetails['icon'];
-    }
+		if (isset($aPointDetails['address']) && sizeof($aPointDetails['address'])>0)
+		{
+			$aPlace['address'] = $aPointDetails['address'];
+                }
 
-    if (isset($aPointDetails['address']) && sizeof($aPointDetails['address'])>0)
-    {
-        $aPlace['address'] = $aPointDetails['address'];
-    }
+                if (isset($aPointDetails['asgeojson']))
+                {
+			$aPlace['geojson'] = json_decode($aPointDetails['asgeojson']);
+                }
 
-    if (isset($aPointDetails['asgeojson']))
-    {
-        $aPlace['geojson'] = json_decode($aPointDetails['asgeojson']);
-    }
+                if (isset($aPointDetails['assvg']))
+                {
+			$aPlace['svg'] = $aPointDetails['assvg'];
+                }
 
-    if (isset($aPointDetails['assvg']))
-    {
-        $aPlace['svg'] = $aPointDetails['assvg'];
-    }
+                if (isset($aPointDetails['astext']))
+                {
+                        $aPlace['geotext'] = $aPointDetails['astext'];
+                }
 
-    if (isset($aPointDetails['astext']))
-    {
-        $aPlace['geotext'] = $aPointDetails['astext'];
-    }
+                if (isset($aPointDetails['askml']))
+                {
+                        $aPlace['geokml'] = $aPointDetails['askml'];
+                }
 
-    if (isset($aPointDetails['askml']))
-    {
-        $aPlace['geokml'] = $aPointDetails['askml'];
-    }
+		if (isset($aPointDetails['sExtraTags'])) $aPlace['extratags'] = $aPointDetails['sExtraTags'];
+		if (isset($aPointDetails['sNameDetails'])) $aPlace['namedetails'] = $aPointDetails['sNameDetails'];
 
-    if (isset($aPointDetails['sExtraTags'])) $aPlace['extratags'] = $aPointDetails['sExtraTags'];
-    if (isset($aPointDetails['sNameDetails'])) $aPlace['namedetails'] = $aPointDetails['sNameDetails'];
+		$aFilteredPlaces[] = $aPlace;
+	}
 
-    $aFilteredPlaces[] = $aPlace;
-}
-
-javascript_renderData($aFilteredPlaces);
+	javascript_renderData($aFilteredPlaces);

lib/template/search-xml.php

@@ -1,158 +1,164 @@
 <?php
-header("content-type: text/xml; charset=UTF-8");
+	header("content-type: text/xml; charset=UTF-8");
 
-echo "<";
-echo "?xml version=\"1.0\" encoding=\"UTF-8\" ?";
-echo ">\n";
+	echo "<";
+	echo "?xml version=\"1.0\" encoding=\"UTF-8\" ?";
+	echo ">\n";
 
-echo "<";
-echo (isset($sXmlRootTag)?$sXmlRootTag:'searchresults');
-echo " timestamp='".date(DATE_RFC822)."'";
-echo " attribution='Data © OpenStreetMap contributors, ODbL 1.0. http://www.openstreetmap.org/copyright'";
-echo " querystring='".htmlspecialchars($sQuery, ENT_QUOTES)."'";
-if (isset($aMoreParams['viewbox'])) echo " viewbox='".htmlspecialchars($aMoreParams['viewbox'], ENT_QUOTES)."'";
-echo " polygon='".(isset($aMoreParams['polygon'])?'true':'false')."'";
-if (isset($aMoreParams['exclude_place_ids']))
-{
-    echo " exclude_place_ids='".htmlspecialchars($aMoreParams['exclude_place_ids'])."'";
-}
-echo " more_url='".htmlspecialchars($sMoreURL)."'";
-echo ">\n";
+	echo "<";
+	echo (isset($sXmlRootTag)?$sXmlRootTag:'searchresults');
+	echo " timestamp='".date(DATE_RFC822)."'";
+	echo " attribution='Data © OpenStreetMap contributors, ODbL 1.0. http://www.openstreetmap.org/copyright'";
+	echo " querystring='".htmlspecialchars($sQuery, ENT_QUOTES)."'";
+	if ($sViewBox) echo " viewbox='".htmlspecialchars($sViewBox, ENT_QUOTES)."'";
+	echo " polygon='".($bShowPolygons?'true':'false')."'";
+	if (sizeof($aExcludePlaceIDs))
+	{
+		echo " exclude_place_ids='".htmlspecialchars(join(',',$aExcludePlaceIDs))."'";
+	}
+	if ($sMoreURL)
+	{
+		echo " more_url='".htmlspecialchars($sMoreURL)."'";
+	}
+	echo ">\n";
 
-foreach($aSearchResults as $iResNum => $aResult)
-{
-    echo "<place place_id='".$aResult['place_id']."'";
-    $sOSMType = formatOSMType($aResult['osm_type']);
-    if ($sOSMType)
-    {
-        echo " osm_type='$sOSMType'";
-        echo " osm_id='".$aResult['osm_id']."'";
-    }
-    echo " place_rank='".$aResult['rank_search']."'";
+	foreach($aSearchResults as $iResNum => $aResult)
+	{
+		echo "<place place_id='".$aResult['place_id']."'";
+		$sOSMType = ($aResult['osm_type'] == 'N'?'node':($aResult['osm_type'] == 'W'?'way':($aResult['osm_type'] == 'R'?'relation':'')));
+		if ($sOSMType)
+		{
+			echo " osm_type='$sOSMType'";
+			echo " osm_id='".$aResult['osm_id']."'";
+		}
+		echo " place_rank='".$aResult['rank_search']."'";
 
-    if (isset($aResult['aBoundingBox']))
-    {
-        echo ' boundingbox="';
-        echo join(',',$aResult['aBoundingBox']);
-        echo '"';
+		if (isset($aResult['aBoundingBox']))
+		{
+			echo ' boundingbox="';
+			echo $aResult['aBoundingBox'][0];
+			echo ','.$aResult['aBoundingBox'][1];
+			echo ','.$aResult['aBoundingBox'][2];
+			echo ','.$aResult['aBoundingBox'][3];
+			echo '"';
 
-        if (isset($aResult['aPolyPoints']))
-        {
-            echo ' polygonpoints=\'';
-            echo json_encode($aResult['aPolyPoints']);
-            echo '\'';
-        }
-    }
+			if ($bShowPolygons && isset($aResult['aPolyPoints']))
+			{
+				echo ' polygonpoints=\'';
+				echo json_encode($aResult['aPolyPoints']);
+				echo '\'';
+			}
+		}
 
-    if (isset($aResult['asgeojson']))
-    {
-        echo ' geojson=\'';
-        echo $aResult['asgeojson'];
-        echo '\'';
-    }
+		if (isset($aResult['asgeojson']))
+		{
+			echo ' geojson=\'';
+			echo $aResult['asgeojson'];
+			echo '\'';
+		}
 
-    if (isset($aResult['assvg']))
-    {
-        echo ' geosvg=\'';
-        echo $aResult['assvg'];
-        echo '\'';
-    }
+		if (isset($aResult['assvg']))
+		{
+			echo ' geosvg=\'';
+			echo $aResult['assvg'];
+			echo '\'';
+		}
 
-    if (isset($aResult['astext']))
-    {
-        echo ' geotext=\'';
-        echo $aResult['astext'];
-        echo '\'';
-    }
+		if (isset($aResult['astext']))
+		{
+			echo ' geotext=\'';
+			echo $aResult['astext'];
+			echo '\'';
+		}
 
-    if (isset($aResult['zoom']))
-    {
-        echo " zoom='".$aResult['zoom']."'";
-    }
+		if (isset($aResult['zoom']))
+		{
+			echo " zoom='".$aResult['zoom']."'";
+		}
 
-    echo " lat='".$aResult['lat']."'";
-    echo " lon='".$aResult['lon']."'";
-    echo " display_name='".htmlspecialchars($aResult['name'], ENT_QUOTES)."'";
+		echo " lat='".$aResult['lat']."'";
+		echo " lon='".$aResult['lon']."'";
+		echo " display_name='".htmlspecialchars($aResult['name'], ENT_QUOTES)."'";
 
-    echo " class='".htmlspecialchars($aResult['class'])."'";
-    echo " type='".htmlspecialchars($aResult['type'], ENT_QUOTES)."'";
-    echo " importance='".htmlspecialchars($aResult['importance'])."'";
-    if (isset($aResult['icon']) && $aResult['icon'])
-    {
-        echo " icon='".htmlspecialchars($aResult['icon'], ENT_QUOTES)."'";
-    }
+		echo " class='".htmlspecialchars($aResult['class'])."'";
+		echo " type='".htmlspecialchars($aResult['type'], ENT_QUOTES)."'";
+		echo " importance='".htmlspecialchars($aResult['importance'])."'";
+		if (isset($aResult['icon']) && $aResult['icon'])
+		{
+			echo " icon='".htmlspecialchars($aResult['icon'], ENT_QUOTES)."'";
+		}
 
-    $bHasDelim = false;
+		$bHasDelim = false;
 
-    if (isset($aResult['askml']))
-    {
-        if (!$bHasDelim)
-        {
-            $bHasDelim = true;
-            echo ">";
-        }
-        echo "\n<geokml>";
-        echo $aResult['askml'];
-        echo "</geokml>";
-    }
+		if (isset($aResult['askml']))
+		{
+			if (!$bHasDelim)
+			{
+				$bHasDelim = true;
+				echo ">";
+			}
+			echo "\n<geokml>";
+			echo $aResult['askml'];
+			echo "</geokml>";
+		}
 
-    if (isset($aResult['sExtraTags']))
-    {
-        if (!$bHasDelim)
-        {
-            $bHasDelim = true;
-            echo ">";
-        }
-        echo "\n<extratags>";
-        foreach ($aResult['sExtraTags'] as $sKey => $sValue)
-        {
-            echo '<tag key="'.htmlspecialchars($sKey).'" value="'.htmlspecialchars($sValue).'"/>';
-        }
-        echo "</extratags>";
-    }
+		if (isset($aResult['sExtraTags']))
+		{
+			if (!$bHasDelim)
+			{
+				$bHasDelim = true;
+				echo ">";
+			}
+			echo "\n<extratags>";
+			foreach ($aResult['sExtraTags'] as $sKey => $sValue)
+			{
+				echo '<tag key="'.htmlspecialchars($sKey).'" value="'.htmlspecialchars($sValue).'"/>';
+			}
+			echo "</extratags>";
+		}
 
-    if (isset($aResult['sNameDetails']))
-    {
-        if (!$bHasDelim)
-        {
-            $bHasDelim = true;
-            echo ">";
-        }
-        echo "\n<namedetails>";
-        foreach ($aResult['sNameDetails'] as $sKey => $sValue)
-        {
-            echo '<name desc="'.htmlspecialchars($sKey).'">';
-            echo htmlspecialchars($sValue);
-            echo "</name>";
-        }
-        echo "</namedetails>";
-    }
+		if (isset($aResult['sNameDetails']))
+		{
+			if (!$bHasDelim)
+			{
+				$bHasDelim = true;
+				echo ">";
+			}
+			echo "\n<namedetails>";
+			foreach ($aResult['sNameDetails'] as $sKey => $sValue)
+			{
+				echo '<name desc="'.htmlspecialchars($sKey).'">';
+				echo htmlspecialchars($sValue);
+				echo "</name>";
+			}
+			echo "</namedetails>";
+		}
 
-    if (isset($aResult['address']))
-    {
-        if (!$bHasDelim)
-        {
-            $bHasDelim = true;
-            echo ">";
-        }
-        echo "\n";
-        foreach($aResult['address'] as $sKey => $sValue)
-        {
-            $sKey = str_replace(' ','_',$sKey);
-            echo "<$sKey>";
-            echo htmlspecialchars($sValue);
-            echo "</$sKey>";
-        }
-    }
+		if (isset($aResult['address']))
+		{
+			if (!$bHasDelim)
+			{
+				$bHasDelim = true;
+				echo ">";
+			}
+			echo "\n";
+			foreach($aResult['address'] as $sKey => $sValue)
+			{
+				$sKey = str_replace(' ','_',$sKey);
+				echo "<$sKey>";
+				echo htmlspecialchars($sValue);
+				echo "</$sKey>";
+			}
+		}
 
-    if ($bHasDelim)
-    {
-        echo "</place>";
-    }
-    else
-    {
-        echo "/>";
-    }
-}
-
-echo "</" . (isset($sXmlRootTag)?$sXmlRootTag:'searchresults') . ">";
+		if ($bHasDelim)
+		{
+			echo "</place>";
+		}
+		else
+		{
+			echo "/>";
+		}
+	}
+	
+	echo "</" . (isset($sXmlRootTag)?$sXmlRootTag:'searchresults') . ">";

m4/ax_lib_postgresql_svr.m4

@@ -0,0 +1,125 @@
+# SYNOPSIS
+#
+#   AX_LIB_POSTGRESQL_SVR([MINIMUM-VERSION])
+#
+# DESCRIPTION
+#
+#   This macro provides tests of availability of PostgreSQL server library
+#
+#   This macro calls:
+#
+#     AC_SUBST(POSTGRESQL_PGXS)
+#     AC_SUBST(POSTGRESQL_SERVER_CFLAGS)
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Mateusz Loskot <mateusz@loskot.net>
+#   Copyright (c) 2015 Sarah Hoffmann <lonia@denofr.de>
+#
+#   Copying and distribution of this file, with or without modification, are
+#   permitted in any medium without royalty provided the copyright notice
+#   and this notice are preserved.
+
+AC_DEFUN([AX_LIB_POSTGRESQL_SVR],
+[
+    AC_ARG_WITH([postgresql],
+        AC_HELP_STRING([--with-postgresql-svr=@<:@ARG@:>@],
+            [use PostgreSQL server library @<:@default=yes@:>@, optionally specify path to pg_config]
+        ),
+        [
+        if test "$withval" = "no"; then
+            want_postgresql="no"
+        elif test "$withval" = "yes"; then
+            want_postgresql="yes"
+        else
+            want_postgresql="yes"
+            PG_CONFIG="$withval"
+        fi
+        ],
+        [want_postgresql="yes"]
+    )
+
+    dnl
+    dnl Check PostgreSQL server libraries
+    dnl
+
+    if test "$want_postgresql" = "yes"; then
+
+        if test -z "$PG_CONFIG" -o test; then
+            AC_PATH_PROG([PG_CONFIG], [pg_config], [])
+        fi
+
+        if test ! -x "$PG_CONFIG"; then
+            AC_MSG_ERROR([$PG_CONFIG does not exist or it is not an exectuable file])
+            PG_CONFIG="no"
+            found_postgresql="no"
+        fi
+
+        if test "$PG_CONFIG" != "no"; then
+            AC_MSG_CHECKING([for PostgreSQL server libraries])
+
+            POSTGRESQL_SERVER_CFLAGS="-I`$PG_CONFIG --includedir-server`"
+
+            POSTGRESQL_VERSION=`$PG_CONFIG --version | sed -e 's#PostgreSQL ##'`
+
+            POSTGRESQL_PGXS=`$PG_CONFIG --pgxs`
+        if test -f "$POSTGRESQL_PGXS"
+        then
+          found_postgresql="yes"
+              AC_MSG_RESULT([yes])
+        fi
+        else
+            found_postgresql="no"
+            AC_MSG_RESULT([no])
+        fi
+    fi
+
+    dnl
+    dnl Check if required version of PostgreSQL is available
+    dnl
+
+
+    postgresql_version_req=ifelse([$1], [], [], [$1])
+
+    if test "$found_postgresql" = "yes" -a -n "$postgresql_version_req"; then
+
+        AC_MSG_CHECKING([if PostgreSQL version is >= $postgresql_version_req])
+
+        dnl Decompose required version string of PostgreSQL
+        dnl and calculate its number representation
+        postgresql_version_req_major=`expr $postgresql_version_req : '\([[0-9]]*\)'`
+        postgresql_version_req_minor=`expr $postgresql_version_req : '[[0-9]]*\.\([[0-9]]*\)'`
+        postgresql_version_req_micro=`expr $postgresql_version_req : '[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\)'`
+        if test "x$postgresql_version_req_micro" = "x"; then
+            postgresql_version_req_micro="0"
+        fi
+
+        postgresql_version_req_number=`expr $postgresql_version_req_major \* 1000000 \
+                                   \+ $postgresql_version_req_minor \* 1000 \
+                                   \+ $postgresql_version_req_micro`
+
+        dnl Decompose version string of installed PostgreSQL
+        dnl and calculate its number representation
+        postgresql_version_major=`expr $POSTGRESQL_VERSION : '\([[0-9]]*\)'`
+        postgresql_version_minor=`expr $POSTGRESQL_VERSION : '[[0-9]]*\.\([[0-9]]*\)'`
+        postgresql_version_micro=`expr $POSTGRESQL_VERSION : '[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\)'`
+        if test "x$postgresql_version_micro" = "x"; then
+            postgresql_version_micro="0"
+        fi
+
+        postgresql_version_number=`expr $postgresql_version_major \* 1000000 \
+                                   \+ $postgresql_version_minor \* 1000 \
+                                   \+ $postgresql_version_micro`
+
+        postgresql_version_check=`expr $postgresql_version_number \>\= $postgresql_version_req_number`
+        if test "$postgresql_version_check" = "1"; then
+            AC_MSG_RESULT([yes])
+        else
+            AC_MSG_RESULT([no])
+        fi
+    fi
+
+    AC_SUBST([POSTGRESQL_PGXS])
+    AC_SUBST([POSTGRESQL_SERVER_CFLAGS])
+])
+

m4/ax_lib_xml2.m4

@@ -0,0 +1,150 @@
+# SYNOPSIS
+#
+#   AX_LIB_XML2([MINIMUM-VERSION])
+#
+# DESCRIPTION
+#
+#   This macro provides tests of availability of xml2 'libxml2' library
+#   of particular version or newer.
+#
+#   AX_LIB_LIBXML2 macro takes only one argument which is optional. If
+#   there is no required version passed, then macro does not run version
+#   test.
+#
+#   The --with-libxml2 option takes one of three possible values:
+#
+#   no - do not check for xml2 library
+#
+#   yes - do check for xml2 library in standard locations (xml2-config
+#   should be in the PATH)
+#
+#   path - complete path to xml2-config utility, use this option if xml2-config
+#   can't be found in the PATH
+#
+#   This macro calls:
+#
+#     AC_SUBST(XML2_CFLAGS)
+#     AC_SUBST(XML2_LDFLAGS)
+#     AC_SUBST(XML2_VERSION)
+#
+#   And sets:
+#
+#     HAVE_XML2
+#
+# LICENSE
+#
+#   Copyright (c) 2009 Hartmut Holzgraefe <hartmut@php.net>
+#
+#   Copying and distribution of this file, with or without modification, are
+#   permitted in any medium without royalty provided the copyright notice
+#   and this notice are preserved.
+
+AC_DEFUN([AX_LIB_XML2],
+[
+    AC_ARG_WITH([libxml2],
+        AC_HELP_STRING([--with-libxml2=@<:@ARG@:>@],
+            [use libxml2 library @<:@default=yes@:>@, optionally specify path to xml2-config]
+        ),
+        [
+        if test "$withval" = "no"; then
+            want_libxml2="no"
+        elif test "$withval" = "yes"; then
+            want_libxml2="yes"
+        else
+            want_libxml2="yes"
+            XML2_CONFIG="$withval"
+        fi
+        ],
+        [want_libxml2="yes"]
+    )
+
+    XML2_CFLAGS=""
+    XML2_LDFLAGS=""
+    XML2_VERSION=""
+
+    dnl
+    dnl Check xml2 libraries (libxml2)
+    dnl
+
+    if test "$want_libxml2" = "yes"; then
+
+        if test -z "$XML2_CONFIG" -o test; then
+            AC_PATH_PROG([XML2_CONFIG], [xml2-config], [])
+        fi
+
+        if test ! -x "$XML2_CONFIG"; then
+            AC_MSG_ERROR([$XML2_CONFIG does not exist or it is not an exectuable file])
+            XML2_CONFIG="no"
+            found_libxml2="no"
+        fi
+
+        if test "$XML2_CONFIG" != "no"; then
+            AC_MSG_CHECKING([for xml2 libraries])
+
+            XML2_CFLAGS="`$XML2_CONFIG --cflags`"
+            XML2_LDFLAGS="`$XML2_CONFIG --libs`"
+
+            XML2_VERSION=`$XML2_CONFIG --version`
+
+            AC_DEFINE([HAVE_XML2], [1],
+                [Define to 1 if xml2 libraries are available])
+
+            found_libxml2="yes"
+            AC_MSG_RESULT([yes])
+        else
+            found_libxml2="no"
+            AC_MSG_RESULT([no])
+        fi
+    fi
+
+    dnl
+    dnl Check if required version of xml2 is available
+    dnl
+
+
+    libxml2_version_req=ifelse([$1], [], [], [$1])
+
+
+    if test "$found_libxml2" = "yes" -a -n "$libxml2_version_req"; then
+
+        AC_MSG_CHECKING([if libxml2 version is >= $libxml2_version_req])
+
+        dnl Decompose required version string of libxml2
+        dnl and calculate its number representation
+        libxml2_version_req_major=`expr $libxml2_version_req : '\([[0-9]]*\)'`
+        libxml2_version_req_minor=`expr $libxml2_version_req : '[[0-9]]*\.\([[0-9]]*\)'`
+        libxml2_version_req_micro=`expr $libxml2_version_req : '[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\)'`
+        if test "x$libxml2_version_req_micro" = "x"; then
+            libxml2_version_req_micro="0"
+        fi
+
+        libxml2_version_req_number=`expr $libxml2_version_req_major \* 1000000 \
+                                   \+ $libxml2_version_req_minor \* 1000 \
+                                   \+ $libxml2_version_req_micro`
+
+        dnl Decompose version string of installed PostgreSQL
+        dnl and calculate its number representation
+        libxml2_version_major=`expr $XML2_VERSION : '\([[0-9]]*\)'`
+        libxml2_version_minor=`expr $XML2_VERSION : '[[0-9]]*\.\([[0-9]]*\)'`
+        libxml2_version_micro=`expr $XML2_VERSION : '[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\)'`
+        if test "x$libxml2_version_micro" = "x"; then
+            libxml2_version_micro="0"
+        fi
+
+        libxml2_version_number=`expr $libxml2_version_major \* 1000000 \
+                                   \+ $libxml2_version_minor \* 1000 \
+                                   \+ $libxml2_version_micro`
+
+        libxml2_version_check=`expr $libxml2_version_number \>\= $libxml2_version_req_number`
+        if test "$libxml2_version_check" = "1"; then
+            AC_MSG_RESULT([yes])
+        else
+            AC_MSG_RESULT([no])
+        fi
+    fi
+
+    AC_SUBST([XML2_VERSION])
+    AC_SUBST([XML2_CFLAGS])
+    AC_SUBST([XML2_LDFLAGS])
+])
+

module/CMakeLists.txt

@@ -1,10 +0,0 @@
-# just use the pgxs makefile
-ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/dummy
-        COMMAND PGXS=${PGXS} PG_CONFIG=${PG_CONFIG} MODSRCDIR=${CMAKE_CURRENT_SOURCE_DIR} $(MAKE) -f ${CMAKE_CURRENT_SOURCE_DIR}/Makefile
-        COMMENT "Running external makefile ${PGXS}"
-        )
-
-ADD_CUSTOM_TARGET( nominatim_lib ALL
-        DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/dummy
-        )
-

module/Makefile.in

@@ -1,9 +1,8 @@
 MODULES = nominatim
-PG_CPPFLAGS = -I$(MODSRCDIR)
+PGXS := @POSTGRESQL_PGXS@
+PG_CONFIG := @PG_CONFIG@
 include $(PGXS)
 
-VPATH = $(MODSRCDIR)
-
 all:
 	chmod 755 nominatim.so
 

nominatim/CMakeLists.txt

@@ -1,12 +0,0 @@
-add_executable(nominatim export.c geometry.cpp import.c index.c input.c nominatim.c postgresql.c sprompt.c)
-include(CheckIncludeFile)
-CHECK_INCLUDE_FILE(byteswap.h HAVE_BYTESWAP_H)
-CHECK_INCLUDE_FILE(sys/endian.h HAVE_SYS_ENDIAN_H)
-if(HAVE_BYTESWAP_H)
-  target_compile_definitions(nominatim PRIVATE HAVE_BYTESWAP_H)
-endif(HAVE_BYTESWAP_H)
-if(HAVE_SYS_ENDIAN_H)
-  target_compile_definitions(nominatim PRIVATE HAVE_SYS_ENDIAN_H)
-endif(HAVE_SYS_ENDIAN_H)
-target_link_libraries(nominatim ${LIBXML2_LIBRARIES} ${ZLIB_LIBRARIES} ${BZIP2_LIBRARIES} ${PostgreSQL_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
-

nominatim/Makefile.am

@@ -0,0 +1,9 @@
+bin_PROGRAMS = nominatim
+
+nominatim_SOURCES = export.c geometry.cpp import.c index.c input.c nominatim.c postgresql.c sprompt.c
+
+AM_CFLAGS = @PTHREAD_CFLAGS@ @POSTGRESQL_CPPFLAGS@ @XML_CPPFLAGS@ @BZIP2_CFLAGS@  @GEOS_CFLAGS@ @PROJ_CFLAGS@ -DVERSION='"@PACKAGE_VERSION@"'
+AM_CPPFLAGS = @PTHREAD_CFLAGS@ @POSTGRESQL_CPPFLAGS@ @XML_CPPFLAGS@ @BZIP2_CFLAGS@  @GEOS_CFLAGS@ @PROJ_CFLAGS@
+
+nominatim_LDADD = @PTHREAD_CFLAGS@ @POSTGRESQL_LDFLAGS@ @POSTGRESQL_LIBS@ @XML_LIBS@ @BZIP2_LDFLAGS@ @BZIP2_LIBS@ @GEOS_LDFLAGS@ @GEOS_LIBS@ @PROJ_LDFLAGS@ @PROJ_LIBS@ -lz
+

nominatim/export.c

@@ -152,7 +152,7 @@ void nominatim_exportCreatePreparedQueries(PGconn * conn)
 
     pg_prepare_params[0] = PG_OID_INT8;
     res = PQprepare(conn, "placex_details",
-                    "select placex.osm_type, placex.osm_id, placex.class, placex.type, placex.name, placex.housenumber, placex.country_code, ST_AsText(placex.geometry), placex.admin_level, placex.rank_address, placex.rank_search, placex.parent_place_id, parent.osm_type, parent.osm_id, placex.indexed_status, placex.linked_place_id from placex left outer join placex as parent on (placex.parent_place_id = parent.place_id) where placex.place_id = $1",
+                    "select placex.osm_type, placex.osm_id, placex.class, placex.type, placex.name, placex.housenumber, placex.country_code, ST_AsText(placex.geometry), placex.admin_level, placex.rank_address, placex.rank_search, placex.parent_place_id, parent.osm_type, parent.osm_id, placex.indexed_status from placex left outer join placex as parent on (placex.parent_place_id = parent.place_id) where placex.place_id = $1",
                     1, pg_prepare_params);
     if (PQresultStatus(res) != PGRES_COMMAND_OK)
     {
@@ -355,7 +355,7 @@ void nominatim_exportFreeQueries(struct export_data * querySet)
 /*
  * Requirements: the prepared queries must exist
  */
-void nominatim_exportPlace(uint64_t place_id, PGconn * conn,
+void nominatim_exportPlace(uint64_t place_id, PGconn * conn, 
   xmlTextWriterPtr writer, pthread_mutex_t * writer_mutex, struct export_data * prevQuerySet)
 {
     struct export_data		querySet;
@@ -387,7 +387,7 @@ void nominatim_exportPlace(uint64_t place_id, PGconn * conn,
         {
             // Add
             if (writer_mutex) pthread_mutex_lock( writer_mutex );
-            nominatim_exportStartMode(writer, 1);
+            nominatim_exportStartMode(writer, 1);  
         }
         else
         {
@@ -396,14 +396,14 @@ void nominatim_exportPlace(uint64_t place_id, PGconn * conn,
             // TODO: detect changes
 
             if (writer_mutex) pthread_mutex_lock( writer_mutex );
-            nominatim_exportStartMode(writer, 2);
+            nominatim_exportStartMode(writer, 2);  
         }
     }
     else
     {
        // Add
        if (writer_mutex) pthread_mutex_lock( writer_mutex );
-       nominatim_exportStartMode(writer, 1);
+       nominatim_exportStartMode(writer, 1);  
     }
 
     xmlTextWriterStartElement(writer, BAD_CAST "feature");
@@ -417,7 +417,6 @@ void nominatim_exportPlace(uint64_t place_id, PGconn * conn,
     xmlTextWriterWriteAttribute(writer, BAD_CAST "parent_place_id", BAD_CAST PQgetvalue(querySet.res, 0, 11));
     xmlTextWriterWriteAttribute(writer, BAD_CAST "parent_type", BAD_CAST PQgetvalue(querySet.res, 0, 12));
     xmlTextWriterWriteAttribute(writer, BAD_CAST "parent_id", BAD_CAST PQgetvalue(querySet.res, 0, 13));
-    xmlTextWriterWriteAttribute(writer, BAD_CAST "linked_place_id", BAD_CAST PQgetvalue(querySet.res, 0, 15));
 
     if (PQntuples(querySet.resNames))
     {

nominatim/import.c

@@ -486,7 +486,7 @@ void EndElement(xmlTextReaderPtr reader, const xmlChar *name)
             }
             paramValues[7] = (const char *)featureExtraTagString;
 
-            if (xmlStrlen(feature.parentPlaceID) == 0)
+            if (strlen(feature.parentPlaceID) == 0)
                 paramValues[8] = "0";
             else
                 paramValues[8] = (const char *)feature.parentPlaceID;
@@ -541,10 +541,10 @@ void EndElement(xmlTextReaderPtr reader, const xmlChar *name)
 
             if (featureNameLines)
             {
-                if (xmlStrlen(feature.parentPlaceID) > 0 && featureAddressLines == 0)
+                if (strlen(feature.parentPlaceID) > 0 && featureAddressLines == 0)
 		{
                     paramValues[0] = (const char *)place_id;
-                    paramValues[1] = (const char *)feature.parentPlaceID;
+                    paramValues[1] = feature.parentPlaceID;
                     if (verbose) fprintf(stderr, "search_name_from_parent_insert: INSERT %s %s\n", paramValues[0], paramValues[1]);
                     res = PQexecPrepared(conn, "search_name_from_parent_insert", 2, paramValues, NULL, NULL, 0);
                     if (PQresultStatus(res) != PGRES_COMMAND_OK)

nominatim/index.c

@@ -1,6 +1,4 @@
 /*
- * triggers indexing (reparenting etc.) through setting resetting indexed_status: update placex/osmline set indexed_status = 0 where indexed_status > 0
- * triggers placex_update and osmline_update
 */
 
 #include <stdio.h>
@@ -21,255 +19,34 @@
 
 extern int verbose;
 
-void run_indexing(int rank, int interpolation, PGconn *conn, int num_threads, 
-struct index_thread_data * thread_data, const char *structuredoutputfile)
+void nominatim_index(int rank_min, int rank_max, int num_threads, const char *conninfo, const char *structuredoutputfile)
 {
-    int tuples, count, sleepcount;
+    struct index_thread_data * thread_data;
     pthread_mutex_t count_mutex = PTHREAD_MUTEX_INITIALIZER;
-    
+    int tuples, count, sleepcount;
+
     time_t rankStartTime;
     int rankTotalTuples;
     int rankCountTuples;
     float rankPerSecond;
-    
+
+    PGconn *conn;
+    PGresult * res;
     PGresult * resSectors;
     PGresult * resPlaces;
     PGresult * resNULL;
-    
+
+    int rank;
     int i;
     int iSector;
     int iResult;
-    
+
     const char *paramValues[2];
     int         paramLengths[2];
     int         paramFormats[2];
     uint32_t    paramRank;
     uint32_t    paramSector;
     uint32_t    sector;
-    
-    xmlTextWriterPtr writer;
-    pthread_mutex_t writer_mutex = PTHREAD_MUTEX_INITIALIZER;
-    
-    // Create the output file
-    writer = NULL;
-    if (structuredoutputfile)
-    {
-        writer = nominatim_exportXMLStart(structuredoutputfile);
-    }
-    
-    if (interpolation)
-    {
-        fprintf(stderr, "Starting interpolation lines (location_property_osmline)\n");
-    }
-    else
-    {
-        fprintf(stderr, "Starting rank %d\n", rank);
-    }
-    
-    rankCountTuples = 0;
-    rankPerSecond = 0;
-
-    paramRank = PGint32(rank);
-    paramValues[0] = (char *)&paramRank;
-    paramLengths[0] = sizeof(paramRank);
-    paramFormats[0] = 1;
-    
-    if (interpolation)
-    {
-        resSectors = PQexecPrepared(conn, "index_sectors_osmline", 0, NULL, 0, NULL, 1);
-    }
-    else
-    {
-        resSectors = PQexecPrepared(conn, "index_sectors", 1, paramValues, paramLengths, paramFormats, 1);
-    }
-    if (PQresultStatus(resSectors) != PGRES_TUPLES_OK)
-    {
-        fprintf(stderr, "index_sectors: SELECT failed: %s", PQerrorMessage(conn));
-        PQclear(resSectors);
-        exit(EXIT_FAILURE);
-    }
-    if (PQftype(resSectors, 0) != PG_OID_INT4)
-    {
-        fprintf(stderr, "Sector value has unexpected type\n");
-        PQclear(resSectors);
-        exit(EXIT_FAILURE);
-    }
-    if (PQftype(resSectors, 1) != PG_OID_INT8)
-    {
-        fprintf(stderr, "Sector value has unexpected type\n");
-        PQclear(resSectors);
-        exit(EXIT_FAILURE);
-    }
-    
-    rankTotalTuples = 0;
-    for (iSector = 0; iSector < PQntuples(resSectors); iSector++)
-    {
-        rankTotalTuples += PGint64(*((uint64_t *)PQgetvalue(resSectors, iSector, 1)));
-    }
-
-    rankStartTime = time(0);
-    for (iSector = 0; iSector <= PQntuples(resSectors); iSector++)
-    {
-        if (iSector > 0)
-        {
-            resPlaces = PQgetResult(conn);
-            if (PQresultStatus(resPlaces) != PGRES_TUPLES_OK)
-            {
-                fprintf(stderr, "index_sector_places: SELECT failed: %s", PQerrorMessage(conn));
-                PQclear(resPlaces);
-                exit(EXIT_FAILURE);
-            }
-            if (PQftype(resPlaces, 0) != PG_OID_INT8)
-            {
-                fprintf(stderr, "Place_id value has unexpected type\n");
-                PQclear(resPlaces);
-                exit(EXIT_FAILURE);
-            }
-            resNULL = PQgetResult(conn);
-            if (resNULL != NULL)
-            {
-                fprintf(stderr, "Unexpected non-null response\n");
-                exit(EXIT_FAILURE);
-            }
-        }
-
-        if (iSector < PQntuples(resSectors))
-        {
-            sector = PGint32(*((uint32_t *)PQgetvalue(resSectors, iSector, 0)));
-//                fprintf(stderr, "\n Starting sector %d size %ld\n", sector, PGint64(*((uint64_t *)PQgetvalue(resSectors, iSector, 1))));
-
-            // Get all the place_id's for this sector
-            paramRank = PGint32(rank);
-            paramSector = PGint32(sector);
-            if (rankTotalTuples-rankCountTuples < num_threads*1000)
-            {
-                // no sectors
-                if (interpolation)
-                {
-                    iResult = PQsendQueryPrepared(conn, "index_nosector_places_osmline", 0, NULL, 0, NULL, 1);
-                }
-                else
-                {
-                    paramValues[0] = (char *)&paramRank;
-                    paramLengths[0] = sizeof(paramRank);
-                    paramFormats[0] = 1;
-                    iResult = PQsendQueryPrepared(conn, "index_nosector_places", 1, paramValues, paramLengths, paramFormats, 1);
-                }
-            }
-            else
-            {
-                if (interpolation)
-                {
-                    iResult = PQsendQueryPrepared(conn, "index_sector_places_osmline", 1, paramValues, paramLengths, paramFormats, 1);
-                    paramValues[0] = (char *)&paramSector;
-                    paramLengths[0] = sizeof(paramSector);
-                    paramFormats[0] = 1;
-                }
-                else
-                {
-                    paramValues[0] = (char *)&paramRank;
-                    paramLengths[0] = sizeof(paramRank);
-                    paramFormats[0] = 1;
-                    paramValues[1] = (char *)&paramSector;
-                    paramLengths[1] = sizeof(paramSector);
-                    paramFormats[1] = 1;
-                    iResult = PQsendQueryPrepared(conn, "index_sector_places", 2, paramValues, paramLengths, paramFormats, 1);
-                }
-            }
-            if (!iResult)
-            {
-                fprintf(stderr, "index_sector_places: SELECT failed: %s", PQerrorMessage(conn));
-                PQclear(resPlaces);
-                exit(EXIT_FAILURE);
-            }
-        }
-        if (iSector > 0)
-        {
-            count = 0;
-            rankPerSecond = 0;
-            tuples = PQntuples(resPlaces);
-
-            if (tuples > 0)
-            {
-                // Spawn threads
-                for (i = 0; i < num_threads; i++)
-                {
-                    thread_data[i].res = resPlaces;
-                    thread_data[i].tuples = tuples;
-                    thread_data[i].count = &count;
-                    thread_data[i].count_mutex = &count_mutex;
-                    thread_data[i].writer = writer;
-                    thread_data[i].writer_mutex = &writer_mutex;
-                    if (interpolation)
-                    {
-                        thread_data[i].table = 0;  // use interpolations table
-                    }
-                    else
-                    {
-                        thread_data[i].table = 1;  // use placex table
-                    }
-                    pthread_create(&thread_data[i].thread, NULL, &nominatim_indexThread, (void *)&thread_data[i]);
-                }
-
-                // Monitor threads to give user feedback
-                sleepcount = 0;
-                while (count < tuples)
-                {
-                    usleep(1000);
-
-                    // Aim for one update per second
-                    if (sleepcount++ > 1000)
-                    {
-                        rankPerSecond = ((float)rankCountTuples + (float)count) / MAX(difftime(time(0), rankStartTime),1);
-                        if(interpolation)
-                        {
-                            fprintf(stderr, "  Done %i in %i @ %f per second - Interpolation lines ETA (seconds): %f\n", (rankCountTuples + count), (int)(difftime(time(0), rankStartTime)), rankPerSecond, ((float)(rankTotalTuples - (rankCountTuples + count)))/rankPerSecond);
-                        }
-                        else
-                        {
-                            fprintf(stderr, "  Done %i in %i @ %f per second - Rank %i ETA (seconds): %f\n", (rankCountTuples + count), (int)(difftime(time(0), rankStartTime)), rankPerSecond, rank, ((float)(rankTotalTuples - (rankCountTuples + count)))/rankPerSecond);
-                        }
-                        
-                        sleepcount = 0;
-                    }
-                }
-
-                // Wait for everything to finish
-                for (i = 0; i < num_threads; i++)
-                {
-                    pthread_join(thread_data[i].thread, NULL);
-                }
-
-                rankCountTuples += tuples;
-            }
-
-            // Finished sector
-            rankPerSecond = (float)rankCountTuples / MAX(difftime(time(0), rankStartTime),1);
-            fprintf(stderr, "  Done %i in %i @ %f per second - ETA (seconds): %f\n", rankCountTuples, (int)(difftime(time(0), rankStartTime)), rankPerSecond, ((float)(rankTotalTuples - rankCountTuples))/rankPerSecond);
-
-            PQclear(resPlaces);
-        }
-        if (rankTotalTuples-rankCountTuples < num_threads*20 && iSector < PQntuples(resSectors))
-        {
-            iSector = PQntuples(resSectors) - 1;
-        }
-    }
-    // Finished rank
-    fprintf(stderr, "\r  Done %i in %i @ %f per second - FINISHED\n\n", rankCountTuples, (int)(difftime(time(0), rankStartTime)), rankPerSecond);
-
-    PQclear(resSectors);
-}
-
-void nominatim_index(int rank_min, int rank_max, int num_threads, const char *conninfo, const char *structuredoutputfile)
-{
-    struct index_thread_data * thread_data;
-
-    PGconn *conn;
-    PGresult * res;
-
-    int rank;
-    
-    int i;
 
     xmlTextWriterPtr writer;
     pthread_mutex_t writer_mutex = PTHREAD_MUTEX_INITIALIZER;
@@ -293,16 +70,6 @@ void nominatim_index(int rank_min, int rank_max, int num_threads, const char *co
         exit(EXIT_FAILURE);
     }
     PQclear(res);
-    
-    res = PQprepare(conn, "index_sectors_osmline",
-                    "select geometry_sector,count(*) from location_property_osmline where indexed_status > 0 group by geometry_sector order by geometry_sector",
-                    0, NULL);
-    if (PQresultStatus(res) != PGRES_COMMAND_OK)
-    {
-        fprintf(stderr, "Failed preparing index_sectors: %s\n", PQerrorMessage(conn));
-        exit(EXIT_FAILURE);
-    }
-    PQclear(res);
 
     pg_prepare_params[0] = PG_OID_INT4;
     res = PQprepare(conn, "index_nosectors",
@@ -337,28 +104,7 @@ void nominatim_index(int rank_min, int rank_max, int num_threads, const char *co
         exit(EXIT_FAILURE);
     }
     PQclear(res);
-    
-    pg_prepare_params[0] = PG_OID_INT4;
-    res = PQprepare(conn, "index_sector_places_osmline",
-                    "select place_id from location_property_osmline where geometry_sector = $1 and indexed_status > 0",
-                    1, pg_prepare_params);
-    if (PQresultStatus(res) != PGRES_COMMAND_OK)
-    {
-        fprintf(stderr, "Failed preparing index_sector_places: %s\n", PQerrorMessage(conn));
-        exit(EXIT_FAILURE);
-    }
-    PQclear(res);
-    
-    res = PQprepare(conn, "index_nosector_places_osmline",
-                    "select place_id from location_property_osmline where indexed_status > 0 order by geometry_sector",
-                    0, NULL);
-    if (PQresultStatus(res) != PGRES_COMMAND_OK)
-    {
-        fprintf(stderr, "Failed preparing index_nosector_places: %s\n", PQerrorMessage(conn));
-        exit(EXIT_FAILURE);
-    }
-    PQclear(res);
-    
+
     // Build the data for each thread
     thread_data = (struct index_thread_data *)malloc(sizeof(struct index_thread_data)*num_threads);
     for (i = 0; i < num_threads; i++)
@@ -376,53 +122,199 @@ void nominatim_index(int rank_min, int rank_max, int num_threads, const char *co
                         1, pg_prepare_params);
         if (PQresultStatus(res) != PGRES_COMMAND_OK)
         {
-            fprintf(stderr, "Failed preparing index_placex: %s\n", PQerrorMessage(thread_data[i].conn));
-            exit(EXIT_FAILURE);
-        }
-        PQclear(res);
-        
-        pg_prepare_params[0] = PG_OID_INT8;
-        res = PQprepare(thread_data[i].conn, "index_osmline",
-                        "update location_property_osmline set indexed_status = 0 where place_id = $1",
-                        1, pg_prepare_params);
-        if (PQresultStatus(res) != PGRES_COMMAND_OK)
-        {
-            fprintf(stderr, "Failed preparing index_osmline: %s\n", PQerrorMessage(thread_data[i].conn));
+            fprintf(stderr, "Failed preparing index_placex: %s\n", PQerrorMessage(conn));
             exit(EXIT_FAILURE);
         }
         PQclear(res);
 
-        // Make sure the error message is not localized as we parse it later.
-        res = PQexec(thread_data[i].conn, "SET lc_messages TO 'C'");
+        /*res = PQexec(thread_data[i].conn, "set enable_seqscan = false");
         if (PQresultStatus(res) != PGRES_COMMAND_OK)
         {
-            fprintf(stderr, "Failed to set langauge: %s\n", PQerrorMessage(thread_data[i].conn));
+            fprintf(stderr, "Failed disabling sequential scan: %s\n", PQerrorMessage(conn));
             exit(EXIT_FAILURE);
         }
-        PQclear(res);
+        PQclear(res);*/
 
         nominatim_exportCreatePreparedQueries(thread_data[i].conn);
     }
 
+    // Create the output file
+    writer = NULL;
+    if (structuredoutputfile)
+    {
+        writer = nominatim_exportXMLStart(structuredoutputfile);
+    }
 
     fprintf(stderr, "Starting indexing rank (%i to %i) using %i threads\n", rank_min, rank_max, num_threads);
 
     for (rank = rank_min; rank <= rank_max; rank++)
     {
-        // OSMLINE: do reindexing (=> reparenting) for interpolation lines at rank 30, but before all other objects of rank 30
-        // reason: houses (rank 30) depend on the updated interpolation line, when reparenting (see placex_update in functions.sql)
-        if (rank == 30)
+        fprintf(stderr, "Starting rank %d\n", rank);
+        rankCountTuples = 0;
+        rankPerSecond = 0;
+
+        paramRank = PGint32(rank);
+        paramValues[0] = (char *)&paramRank;
+        paramLengths[0] = sizeof(paramRank);
+        paramFormats[0] = 1;
+//        if (rank < 16)
+//            resSectors = PQexecPrepared(conn, "index_nosectors", 1, paramValues, paramLengths, paramFormats, 1);
+//        else
+        resSectors = PQexecPrepared(conn, "index_sectors", 1, paramValues, paramLengths, paramFormats, 1);
+
+        if (PQresultStatus(resSectors) != PGRES_TUPLES_OK)
         {
-            run_indexing(rank, 1, conn, num_threads, thread_data, structuredoutputfile);
+            fprintf(stderr, "index_sectors: SELECT failed: %s", PQerrorMessage(conn));
+            PQclear(resSectors);
+            exit(EXIT_FAILURE);
         }
-        run_indexing(rank, 0, conn, num_threads, thread_data, structuredoutputfile);
+        if (PQftype(resSectors, 0) != PG_OID_INT4)
+        {
+            fprintf(stderr, "Sector value has unexpected type\n");
+            PQclear(resSectors);
+            exit(EXIT_FAILURE);
+        }
+        if (PQftype(resSectors, 1) != PG_OID_INT8)
+        {
+            fprintf(stderr, "Sector value has unexpected type\n");
+            PQclear(resSectors);
+            exit(EXIT_FAILURE);
+        }
+
+        rankTotalTuples = 0;
+        for (iSector = 0; iSector < PQntuples(resSectors); iSector++)
+        {
+            rankTotalTuples += PGint64(*((uint64_t *)PQgetvalue(resSectors, iSector, 1)));
+        }
+
+        rankStartTime = time(0);
+        for (iSector = 0; iSector <= PQntuples(resSectors); iSector++)
+        {
+            if (iSector > 0)
+            {
+                resPlaces = PQgetResult(conn);
+                if (PQresultStatus(resPlaces) != PGRES_TUPLES_OK)
+                {
+                    fprintf(stderr, "index_sector_places: SELECT failed: %s", PQerrorMessage(conn));
+                    PQclear(resPlaces);
+                    exit(EXIT_FAILURE);
+                }
+                if (PQftype(resPlaces, 0) != PG_OID_INT8)
+                {
+                    fprintf(stderr, "Place_id value has unexpected type\n");
+                    PQclear(resPlaces);
+                    exit(EXIT_FAILURE);
+                }
+                resNULL = PQgetResult(conn);
+                if (resNULL != NULL)
+                {
+                    fprintf(stderr, "Unexpected non-null response\n");
+                    exit(EXIT_FAILURE);
+                }
+            }
+
+            if (iSector < PQntuples(resSectors))
+            {
+                sector = PGint32(*((uint32_t *)PQgetvalue(resSectors, iSector, 0)));
+//                fprintf(stderr, "\n Starting sector %d size %ld\n", sector, PGint64(*((uint64_t *)PQgetvalue(resSectors, iSector, 1))));
+
+                // Get all the place_id's for this sector
+                paramRank = PGint32(rank);
+                paramValues[0] = (char *)&paramRank;
+                paramLengths[0] = sizeof(paramRank);
+                paramFormats[0] = 1;
+                paramSector = PGint32(sector);
+                paramValues[1] = (char *)&paramSector;
+                paramLengths[1] = sizeof(paramSector);
+                paramFormats[1] = 1;
+                if (rankTotalTuples-rankCountTuples < num_threads*1000)
+		{
+                    iResult = PQsendQueryPrepared(conn, "index_nosector_places", 1, paramValues, paramLengths, paramFormats, 1);
+		}
+                else
+		{
+                    iResult = PQsendQueryPrepared(conn, "index_sector_places", 2, paramValues, paramLengths, paramFormats, 1);
+		}
+                if (!iResult)
+                {
+                    fprintf(stderr, "index_sector_places: SELECT failed: %s", PQerrorMessage(conn));
+                    PQclear(resPlaces);
+                    exit(EXIT_FAILURE);
+                }
+            }
+
+            if (iSector > 0)
+            {
+                count = 0;
+                rankPerSecond = 0;
+                tuples = PQntuples(resPlaces);
+
+                if (tuples > 0)
+                {
+                    // Spawn threads
+                    for (i = 0; i < num_threads; i++)
+                    {
+                        thread_data[i].res = resPlaces;
+                        thread_data[i].tuples = tuples;
+                        thread_data[i].count = &count;
+                        thread_data[i].count_mutex = &count_mutex;
+                        thread_data[i].writer = writer;
+                        thread_data[i].writer_mutex = &writer_mutex;
+                        pthread_create(&thread_data[i].thread, NULL, &nominatim_indexThread, (void *)&thread_data[i]);
+                    }
+
+                    // Monitor threads to give user feedback
+                    sleepcount = 0;
+                    while (count < tuples)
+                    {
+                        usleep(1000);
+
+                        // Aim for one update per second
+                        if (sleepcount++ > 500)
+                        {
+                            rankPerSecond = ((float)rankCountTuples + (float)count) / MAX(difftime(time(0), rankStartTime),1);
+                            fprintf(stderr, "  Done %i in %i @ %f per second - Rank %i ETA (seconds): %f\n", (rankCountTuples + count), (int)(difftime(time(0), rankStartTime)), rankPerSecond, rank, ((float)(rankTotalTuples - (rankCountTuples + count)))/rankPerSecond);
+                            sleepcount = 0;
+                        }
+                    }
+
+                    // Wait for everything to finish
+                    for (i = 0; i < num_threads; i++)
+                    {
+                        pthread_join(thread_data[i].thread, NULL);
+                    }
+
+                    rankCountTuples += tuples;
+                }
+
+                // Finished sector
+                rankPerSecond = (float)rankCountTuples / MAX(difftime(time(0), rankStartTime),1);
+                fprintf(stderr, "  Done %i in %i @ %f per second - ETA (seconds): %f\n", rankCountTuples, (int)(difftime(time(0), rankStartTime)), rankPerSecond, ((float)(rankTotalTuples - rankCountTuples))/rankPerSecond);
+
+                PQclear(resPlaces);
+            }
+            if (rankTotalTuples-rankCountTuples < num_threads*20 && iSector < PQntuples(resSectors))
+            {
+                iSector = PQntuples(resSectors) - 1;
+            }
+        }
+        // Finished rank
+        fprintf(stderr, "\r  Done %i in %i @ %f per second - FINISHED                      \n\n", rankCountTuples, (int)(difftime(time(0), rankStartTime)), rankPerSecond);
+
+        PQclear(resSectors);
     }
-	// Close all connections
-	for (i = 0; i < num_threads; i++)
-	{
-		PQfinish(thread_data[i].conn);
-	}
-	PQfinish(conn);
+
+    if (writer)
+    {
+        nominatim_exportXMLEnd(writer);
+    }
+
+    // Close all connections
+    for (i = 0; i < num_threads; i++)
+    {
+        PQfinish(thread_data[i].conn);
+    }
+    PQfinish(conn);
 }
 
 void *nominatim_indexThread(void * thread_data_in)
@@ -432,15 +324,12 @@ void *nominatim_indexThread(void * thread_data_in)
 
     PGresult   *res;
 
-    const char  *paramValues[1];
+    const char *paramValues[1];
     int         paramLengths[1];
     int         paramFormats[1];
     uint64_t    paramPlaceID;
-    uint64_t    place_id;
-    time_t      updateStartTime;
-    unsigned    table;
-    
-    table = thread_data->table;
+    uint64_t 	place_id;
+    time_t 		updateStartTime;
 
     while (1)
     {
@@ -459,58 +348,37 @@ void *nominatim_indexThread(void * thread_data_in)
         if (verbose) fprintf(stderr, "  Processing place_id %ld\n", place_id);
 
         updateStartTime = time(0);
-        int done = 0;
+	int done = 0;
 
         if (thread_data->writer)
         {
              nominatim_exportPlaceQueries(place_id, thread_data->conn, &querySet);
         }
 
-        while(!done)
-        {
-            paramPlaceID = PGint64(place_id);
-            paramValues[0] = (char *)&paramPlaceID;
-            paramLengths[0] = sizeof(paramPlaceID);
-            paramFormats[0] = 1;
-            if (table == 1) // table=1 for placex
-            {
-                res = PQexecPrepared(thread_data->conn, "index_placex", 1, paramValues, paramLengths, paramFormats, 1);
-            }
-            else // table=0 for osmline
-            {
-                res = PQexecPrepared(thread_data->conn, "index_osmline", 1, paramValues, paramLengths, paramFormats, 1);
-            }
-            if (PQresultStatus(res) == PGRES_COMMAND_OK)
-                done = 1;
-            else
-            {
-                if (!strncmp(PQerrorMessage(thread_data->conn), "ERROR:  deadlock detected", 25))
-                {
-                    if (table == 1)
-                    {
-                        fprintf(stderr, "index_placex: UPDATE failed - deadlock, retrying (%ld)\n", place_id);
-                    }
-                    else
-                    {
-                        fprintf(stderr, "index_osmline: UPDATE failed - deadlock, retrying (%ld)\n", place_id);
-                    }
-                    PQclear(res);
-                    sleep(rand() % 10);
-                }
-                else
-                {
-                    if (table == 1)
-                    {
-                        fprintf(stderr, "index_placex: UPDATE failed: %s", PQerrorMessage(thread_data->conn));
-                    }
-                    else
-                    {
-                        fprintf(stderr, "index_osmline: UPDATE failed: %s", PQerrorMessage(thread_data->conn));
-                    }
-                    PQclear(res);
-                    exit(EXIT_FAILURE);
-                }
-            }
+	while(!done)
+	{
+	        paramPlaceID = PGint64(place_id);
+        	paramValues[0] = (char *)&paramPlaceID;
+	        paramLengths[0] = sizeof(paramPlaceID);
+        	paramFormats[0] = 1;
+	        res = PQexecPrepared(thread_data->conn, "index_placex", 1, paramValues, paramLengths, paramFormats, 1);
+        	if (PQresultStatus(res) == PGRES_COMMAND_OK)
+			done = 1;
+		else
+	        {
+			if (!strncmp(PQerrorMessage(thread_data->conn), "ERROR:  deadlock detected", 25))
+			{
+		            fprintf(stderr, "index_placex: UPDATE failed - deadlock, retrying (%ld)\n", place_id);
+		            PQclear(res);
+                            sleep(rand() % 10);
+			}
+			else
+			{
+		            fprintf(stderr, "index_placex: UPDATE failed: %s", PQerrorMessage(thread_data->conn));
+		            PQclear(res);
+		            exit(EXIT_FAILURE);
+			}
+		}
         }
         PQclear(res);
         if (difftime(time(0), updateStartTime) > 1) fprintf(stderr, "  Slow place_id %ld\n", place_id);

nominatim/index.h

@@ -14,7 +14,6 @@ struct index_thread_data
     pthread_mutex_t * count_mutex;
     xmlTextWriterPtr writer;
     pthread_mutex_t * writer_mutex;
-    unsigned table;
 };
 void nominatim_index(int rank_min, int rank_max, int num_threads, const char *conninfo, const char *structuredoutputfile);
 void *nominatim_indexThread(void * thread_data_in);

nominatim/nominatim.c

@@ -115,7 +115,7 @@ int main(int argc, char *argv[])
 
     PGconn *conn;
 
-    fprintf(stderr, "nominatim version %s\n\n", NOMINATIM_VERSION);
+    fprintf(stderr, "nominatim version %s\n\n", VERSION);
 
     while (1)
     {

nominatim/nominatim.h

@@ -20,7 +20,7 @@ struct output_options
     int expire_tiles_zoom_min;    /* Minimum zoom level for tile expiry list */
     const char *expire_tiles_filename;    /* File name to output expired tiles list to */
     int enable_hstore; /* add an additional hstore column with objects key/value pairs */
-    int enable_multi; /* Output multi-geometries instead of several simple geometries */
+    int enable_multi; /* Output multi-geometries intead of several simple geometries */
     char** hstore_columns; /* list of columns that should be written into their own hstore column */
     int n_hstore_columns; /* number of hstore columns */
 };

nominatim/postgresql.h

@@ -7,11 +7,7 @@
 #define PG_OID_INT8			20
 #define PG_OID_INT4			23
 
-#if defined(HAVE_BYTESWAP_H)
 #include <byteswap.h>
-#elif defined(HAVE_SYS_ENDIAN_H)
-#include <sys/endian.h>
-#endif
 
 #if __BYTE_ORDER == __BIG_ENDIAN
 #define PGint16(x)	(x)

phpcs.xml

@@ -1,169 +0,0 @@
-<?xml version="1.0"?>
-<ruleset name="Nominatim Standard">
-
-  <description>Nominatim coding standard</description>
-
-  <!-- based on another standard, you can find it here -->
-  <!-- /usr/share/php/PHP/CodeSniffer/Standards/PSR2/ruleset.xml -->
-  <!-- https://github.com/squizlabs/PHP_CodeSniffer/blob/master/CodeSniffer/Standards/PSR2/ruleset.xml -->
-  <rule ref="PSR2"/>
-
-  <rule ref="Generic.Files.LineLength">
-    <properties>
-     <property name="lineLimit" value="194"/>
-     <property name="absoluteLineLimit" value="194"/>
-    </properties>
-  </rule>
-
-
-  <!-- "A file should declare new symbols (classes, functions, constants, etc.) and cause no
-    other side effects, or it should execute logic with side effects, but should not do both."
-    ... we have too many script and includes to be able to enforce that.
-     -->
-  <rule ref="PSR1.Files.SideEffects.FoundWithSymbols">
-    <severity>0</severity>
-  </rule>
-
-
-
-  <!-- **************************************************************
-       DOCUMENTATION
-       ************************************************************** -->
-
-  <rule ref="PEAR.Commenting.FunctionComment.Missing">
-    <severity>0</severity>
-  </rule>
-
-
-
-
-  <!-- **************************************************************
-       COMMENTS
-       ************************************************************** -->
-
-  <!-- any comments in the lines before function() are better than forcing
-       a PHPdoc style right now -->
-  <rule ref="PEAR.Commenting.FunctionComment.WrongStyle">
-    <severity>0</severity>
-  </rule>
-
-  <!-- We allow comments after statements -->
-  <rule ref="Squiz.Commenting.PostStatementComment.Found">
-    <severity>0</severity>
-  </rule>
-  <!-- ... even without space e.g. //some words -->
-  <rule ref="Squiz.Commenting.InlineComment.NoSpaceBefore">
-    <severity>0</severity>
-  </rule>
-  <!-- blank lines after inline comments are fine -->
-  <rule ref="Squiz.Commenting.InlineComment.SpacingAfter">
-    <severity>0</severity>
-  </rule>
-
-  <!-- Comments don't have to start uppercase -->
-  <rule ref="Squiz.Commenting.InlineComment.NotCapital">
-    <severity>0</severity>
-  </rule>
-  <!-- Comments don't have to end with one of .!? -->
-  <rule ref="Squiz.Commenting.InlineComment.InvalidEndChar">
-    <severity>0</severity>
-  </rule>
-  <!-- Empty comments are fine -->
-  <rule ref="Squiz.Commenting.InlineComment.Empty">
-    <severity>0</severity>
-  </rule>
-
-
-
-
-  <!-- **************************************************************
-       INDENTATION, SPACING
-       ************************************************************** -->
-
-  <!-- We don't need 2 blank lines after function -->
-  <rule ref="Squiz.WhiteSpace.FunctionSpacing.After">
-    <severity>0</severity>
-  </rule>
-
-  <!-- Aligned looks nicer, but causes too many warnings currently -->
-  <rule ref="Generic.Formatting.MultipleStatementAlignment.NotSame">
-    <severity>0</severity>
-  </rule>
-  <rule ref="Generic.Formatting.MultipleStatementAlignment.NotSameWarning">
-    <severity>0</severity>
-  </rule>
-
-  <!-- Aligned looks nicer, but causes too many warnings currently -->
-  <rule ref="Squiz.Arrays.ArrayDeclaration.DoubleArrowNotAligned">
-    <severity>0</severity>
-  </rule>
-
-
-
-
-
-
-
-  <!-- **************************************************************
-       VARIABLES
-       ************************************************************** -->
-
-  <!-- CONST_this_var is fine, we don't need ConstThisVar -->
-  <rule ref="Generic.NamingConventions.UpperCaseConstantName.ConstantNotUpperCase">
-    <severity>0</severity>
-  </rule>
-
-  <!-- simply disagree with "Each line in an array declaration must end in a comma" -->
-  <rule ref="Squiz.Arrays.ArrayDeclaration.NoCommaAfterLast">
-    <severity>0</severity>
-  </rule>
-  <rule ref="Squiz.Arrays.ArrayDeclaration.NoComma">
-    <severity>0</severity>
-  </rule>
-
-  <!-- We allow "$abc = array($aPoint[1], $aPoint[2])" -->
-  <rule ref="Squiz.Arrays.ArrayDeclaration.SingleLineNotAllowed">
-    <severity>0</severity>
-  </rule>
-
-
-
-
-
-  <!-- **************************************************************
-       STRING QUOTING
-       ************************************************************** -->
-
-  <!-- Prefer single quoted strings -->
-  <rule ref="Squiz.Strings.DoubleQuoteUsage" />
-
-  <!-- We allow variabled inside double-quoted strings "abc $somevar" -->
-  <rule ref="Squiz.Strings.DoubleQuoteUsage.ContainsVar">
-    <severity>0</severity>
-  </rule>
-
-
-
-
-
-  <!-- **************************************************************
-       CONTROL STRUCTURES
-       ************************************************************** -->
-
-  <!-- we allow "if (a) echo 'b'" without brackets -->
-  <rule ref="Generic.ControlStructures.InlineControlStructure.NotAllowed">
-    <severity>0</severity>
-  </rule>
-
-  <!-- We allow "if (a)". No need for "if (a === TRUE)" -->
-  <rule ref="Squiz.Operators.ComparisonOperatorUsage.ImplicitTrue">
-    <severity>0</severity>
-  </rule>
-  <!-- ... same for "if (!a)" -->
-  <rule ref="Squiz.Operators.ComparisonOperatorUsage.NotAllowed">
-    <severity>0</severity>
-  </rule>
-
-
-
-</ruleset>

phpunit.xml

@@ -8,13 +8,13 @@
     processIsolation="false"
     stopOnFailure="false"
     syntaxCheck="true"
-    bootstrap="test/php/bootstrap.php"
+    bootstrap="tests-php/bootstrap.php"
     >
     <php>
     </php>
     <testsuites>
         <testsuite name="Nominatim PHP Test Suite">
-            <directory>./test/php/Nominatim</directory>
+            <directory>./tests-php/Nominatim</directory>
         </testsuite>
     </testsuites>
     <filter>

settings/defaults.php

@@ -1,122 +0,0 @@
-<?php
-@define('CONST_BasePath', '@CMAKE_SOURCE_DIR@');
-@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://@/nominatim'); // <driver>://<username>:<password>@<host>:<port>/<database>
-@define('CONST_Database_Web_User', 'www-data');
-@define('CONST_Max_Word_Frequency', '50000');
-@define('CONST_Limit_Reindexing', true);
-// Restrict search languages.
-// Normally Nominatim will include all language variants of name:XX
-// in the search index. Set this to a comma separated list of language
-// codes, to restrict import to a subset of languages.
-// Currently only affects the import of country names and special phrases.
-@define('CONST_Languages', false);
-// Rules for normalizing terms for comparison before doing comparisons.
-// The default is to remove accents and punctuation and to lower-case the
-// term. Spaces are kept but collapsed to one standard space.
-@define('CONST_Term_Normalization_Rules', ":: NFD (); [:Nonspacing Mark:] >;  :: lower (); [[:Punctuation:][:Space:]]+ > ' '; :: NFC ();");
-
-// Set to false to avoid importing extra postcodes for the US.
-@define('CONST_Use_Extra_US_Postcodes', true);
-/* Set to true after importing Tiger house number data for the US.
-   Note: The tables must already exist or queries will throw errors.
-         After changing this setting run ./utils/setup --create-functions
-         again. */
-@define('CONST_Use_US_Tiger_Data', false);
-/* Set to true after importing other external house number data.
-   Note: the aux tables must already exist or queries will throw errors.
-        After changing this setting run ./utils/setup --create-functions
-        again. */
-@define('CONST_Use_Aux_Location_data', false);
-
-// Proxy settings
-@define('CONST_HTTP_Proxy', false);
-@define('CONST_HTTP_Proxy_Host', 'proxy.mydomain.com');
-@define('CONST_HTTP_Proxy_Port', '3128');
-@define('CONST_HTTP_Proxy_Login', '');
-@define('CONST_HTTP_Proxy_Password', '');
-
-// Paths
-@define('CONST_ExtraDataPath', CONST_BasePath.'/data');
-@define('CONST_Osm2pgsql_Binary', CONST_InstallPath.'/osm2pgsql/osm2pgsql');
-@define('CONST_Pyosmium_Binary', '@PYOSMIUM_PATH@');
-@define('CONST_Tiger_Data_Path', CONST_ExtraDataPath.'/tiger');
-@define('CONST_Wikipedia_Data_Path', CONST_ExtraDataPath);
-
-// osm2pgsql settings
-@define('CONST_Osm2pgsql_Flatnode_File', null);
-
-// tablespace settings
-// osm2pgsql caching tables (aka slim mode tables) - update only
-@define('CONST_Tablespace_Osm2pgsql_Data', false);
-@define('CONST_Tablespace_Osm2pgsql_Index', false);
-// osm2pgsql output tables (aka main table) - update only
-@define('CONST_Tablespace_Place_Data', false);
-@define('CONST_Tablespace_Place_Index', false);
-// address computation tables - update only
-@define('CONST_Tablespace_Address_Data', false);
-@define('CONST_Tablespace_Address_Index', false);
-// search tables - needed for lookups
-@define('CONST_Tablespace_Search_Data', false);
-@define('CONST_Tablespace_Search_Index', false);
-// additional data, e.g. TIGER data, type searches - needed for lookups
-@define('CONST_Tablespace_Aux_Data', false);
-@define('CONST_Tablespace_Aux_Index', false);
-
-//// Replication settings
-
-// Base URL of replication service
-@define('CONST_Replication_Url', 'https://planet.openstreetmap.org/replication/minute');
-
-// Maximum size in MB of data to download per batch
-@define('CONST_Replication_Max_Diff_size', '30');
-// How long until the service publishes the next diff
-// (relative to the age of data in the diff).
-@define('CONST_Replication_Update_Interval', '75');
-// How long to sleep when no update could be found
-@define('CONST_Replication_Recheck_Interval', '60');
-
-// Website settings
-@define('CONST_NoAccessControl', true);
-
-@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);
-
-@define('CONST_Search_BatchMode', false);
-
-@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 alloow reverse search.
-@define('CONST_Search_ReversePlanForAll', true);
-
-// Maximum number of OSM ids that may be queried at once
-// for the places endpoint.
-@define('CONST_Places_Max_ID_count', 50);
-
-// Number of different geometry formats that may be queried in parallel.
-// Set to zero to disable polygon output.
-@define('CONST_PolygonOutput_MaximumTypes', 1);
-
-// Log settings
-// Set to true to log into new_query_log table.
-// You should set up a cron job that regularly clears out this table.
-@define('CONST_Log_DB', false);
-// Set to a file name to enable logging to a file.
-@define('CONST_Log_File', false);

settings/partitionedtags.def

@@ -0,0 +1,165 @@
+amenity airport
+amenity arts_centre
+amenity atm
+amenity auditorium
+amenity bank
+amenity bar
+amenity bench
+amenity bicycle_parking
+amenity bicycle_rental
+amenity brothel
+amenity bureau_de_change
+amenity bus_station
+amenity cafe
+amenity car_rental
+amenity car_wash
+amenity casino
+amenity cinema
+amenity clinic
+amenity club
+amenity college
+amenity community_centre
+amenity courthouse
+amenity crematorium
+amenity dentist
+amenity doctors
+amenity dormitory
+amenity drinking_water
+amenity driving_school
+amenity embassy
+amenity emergency_phone
+amenity fast_food
+amenity ferry_terminal
+amenity fire_hydrant
+amenity fire_station
+amenity fountain
+amenity fuel
+amenity grave_yard
+amenity hall
+amenity health_centre
+amenity hospital
+amenity hotel
+amenity hunting_stand
+amenity ice_cream
+amenity kindergarten
+amenity library
+amenity market
+amenity marketplace
+amenity nightclub
+amenity nursery
+amenity nursing_home
+amenity office
+amenity park
+amenity parking
+amenity pharmacy
+amenity place_of_worship
+amenity police
+amenity post_box
+amenity post_office
+amenity preschool
+amenity prison
+amenity pub
+amenity public_building
+amenity public_market
+amenity reception_area
+amenity restaurant
+amenity retirement_home
+amenity sauna
+amenity school
+amenity shelter
+amenity shop
+amenity shopping
+amenity social_club
+amenity studio
+amenity supermarket
+amenity taxi
+amenity telephone
+amenity theatre
+amenity toilets
+amenity townhall
+amenity university
+amenity veterinary
+amenity waste_basket
+amenity wifi
+amenity youth_centre
+boundary administrative
+building apartments
+building block
+building bunker
+building chapel
+building church
+building commercial
+building dormitory
+building entrance
+building faculty
+building farm
+building flats
+building garage
+building hospital
+building hotel
+building house
+building industrial
+building office
+building public
+building residential
+building retail
+building school
+building shop
+building stadium
+building store
+building terrace
+building tower
+building train_station
+building university
+highway bridleway
+highway bus_stop
+highway construction
+highway cycleway
+highway distance_marker
+highway emergency_access_point
+highway footway
+highway gate
+highway motorway_junction
+highway path
+highway pedestrian
+highway platform
+highway primary
+highway primary_link
+highway raceway
+highway road
+highway secondary
+highway secondary_link
+highway services
+highway steps
+highway tertiary
+highway track
+highway trail
+highway trunk
+highway trunk_link
+highway unsurfaced
+historic archaeological_site
+historic battlefield
+historic building
+historic castle
+historic church
+historic house
+historic icon
+historic manor
+historic memorial
+historic mine
+historic monument
+historic museum
+historic ruins
+historic tower
+historic wayside_cross
+historic wayside_shrine
+historic wreck
+landuse cemetery
+landuse commercial
+landuse construction
+landuse farm
+landuse farmland
+landuse farmyard
+landuse forest
+landuse grass
+landuse industrial

settings/phrase_settings.php

@@ -1,20 +1,51 @@
 <?php
+# These settings control the import of special phrases from the wiki.
 
-// These settings control the import of special phrases from the wiki.
+# Languages to download the special phrases for.
+$aLanguageIn = array(
+			'af',
+			'ar',
+			'br',
+			'ca',
+			'cs',
+			'de',
+			'en',
+			'es',
+			'et',
+			'eu',
+			'fa',
+			'fi',
+			'fr',
+			'gl',
+			'hr',
+			'hu',
+			'ia',
+			'is',
+			'it',
+			'ja',
+			'mk',
+			'nl',
+			'no',
+			'pl',
+			'ps',
+			'pt',
+			'ru',
+			'sk',
+			'sv',
+			'uk',
+			'vi',
+		);
 
-// class/type combinations to exclude
-$aTagsBlacklist
- = array(
-    'boundary' => array('administrative'),
-    'place' => array('house', 'houses'),
-   );
-
-// If a class is in the white list then all types will 
-// be ignored except the ones given in the list.
-// Also use this list to exclude an entire class from
-// special phrases.
-$aTagsWhitelist
- = array(
-    'highway' => array('bus_stop', 'rest_area', 'raceway'),
-    'building' => array(),
-   );
+# class/type combinations to exclude
+$aTagsBlacklist = array(
+  'boundary' => array('administrative'),
+  'place' => array('house', 'houses'),
+);
+# If a class is in the white list then all types will 
+# be ignored except the ones given in the list.
+# Also use this list to exclude an entire class from
+# special phrases.
+$aTagsWhitelist = array(
+  'highway' => array('bus_stop', 'rest_area', 'raceway'),
+  'building' => array(),
+);

settings/settings.php

@@ -1,4 +1,120 @@
 <?php
+	if (file_exists(CONST_BasePath.'/settings/local.php')) require_once(CONST_BasePath.'/settings/local.php');
+	if (isset($_GET['debug']) && $_GET['debug']) @define('CONST_Debug', true);
+
+	// General settings
+	@define('CONST_Debug', false);
+	@define('CONST_Database_DSN', 'pgsql://@/nominatim'); // <driver>://<username>:<password>@<host>:<port>/<database>
+	@define('CONST_Database_Web_User', 'www-data');
+	@define('CONST_Max_Word_Frequency', '50000');
+	@define('CONST_Limit_Reindexing', true);
+
+	// Proxy settings
+	@define('CONST_HTTP_Proxy', false);
+	@define('CONST_HTTP_Proxy_Host', 'proxy.mydomain.com');
+	@define('CONST_HTTP_Proxy_Port', '3128');
+	@define('CONST_HTTP_Proxy_Login', '');
+	@define('CONST_HTTP_Proxy_Password', '');
+
+	// Software versions
+	@define('CONST_Postgresql_Version', '9.3'); // values: 9.0, ... , 9.4
+	@define('CONST_Postgis_Version', '2.1'); // values: 1.5, 2.0, 2.1
+
+	// Paths
+	@define('CONST_Path_Postgresql_Contrib', '/usr/share/postgresql/'.CONST_Postgresql_Version.'/contrib');
+	@define('CONST_Path_Postgresql_Postgis', CONST_Path_Postgresql_Contrib.'/postgis-'.CONST_Postgis_Version);
+	@define('CONST_Osm2pgsql_Binary', CONST_BasePath.'/osm2pgsql/osm2pgsql');
+	@define('CONST_Osmosis_Binary', '/usr/bin/osmosis');
+	@define('CONST_Tiger_Data_Path', CONST_BasePath.'/data/tiger');
+
+	// osm2pgsql settings
+	@define('CONST_Osm2pgsql_Flatnode_File', null);
+
+	// tablespace settings
+	// osm2pgsql caching tables (aka slim mode tables) - update only
+	@define('CONST_Tablespace_Osm2pgsql_Data', false);
+	@define('CONST_Tablespace_Osm2pgsql_Index', false);
+	// osm2pgsql output tables (aka main table) - update only
+	@define('CONST_Tablespace_Place_Data', false);
+	@define('CONST_Tablespace_Place_Index', false);
+	// address computation tables - update only
+	@define('CONST_Tablespace_Address_Data', false);
+	@define('CONST_Tablespace_Address_Index', false);
+	// search tables - needed for lookups
+	@define('CONST_Tablespace_Search_Data', false);
+	@define('CONST_Tablespace_Search_Index', false);
+	// additional data, e.g. TIGER data, type searches - needed for lookups
+	@define('CONST_Tablespace_Aux_Data', false);
+	@define('CONST_Tablespace_Aux_Index', false);
+
+	// Replication settings
+	@define('CONST_Replication_Url', 'http://planet.openstreetmap.org/replication/minute');
+	@define('CONST_Replication_MaxInterval', '3600');
+	@define('CONST_Replication_Update_Interval', '60');  // How often upstream publishes diffs
+	@define('CONST_Replication_Recheck_Interval', '60'); // How long to sleep if no update found yet
+
+	// Connection buckets to rate limit people being nasty
+	@define('CONST_ConnectionBucket_MemcacheServerAddress', false);
+	@define('CONST_ConnectionBucket_MemcacheServerPort', 11211);
+	@define('CONST_ConnectionBucket_MaxBlockList', 100);
+	@define('CONST_ConnectionBucket_LeakRate', 1);
+	@define('CONST_ConnectionBucket_BlockLimit', 10);
+	@define('CONST_ConnectionBucket_WaitLimit', 6);
+	@define('CONST_ConnectionBucket_MaxSleeping', 10);
+	@define('CONST_ConnectionBucket_Cost_Reverse', 1);
+	@define('CONST_ConnectionBucket_Cost_Search', 2);
+	@define('CONST_ConnectionBucket_Cost_Details', 3);
+	@define('CONST_ConnectionBucket_Cost_Status', 1);
+
+	// Override this function to add an adjustment factor to the cost
+	// based on server load. e.g. getBlockingProcesses
+	if (!function_exists('user_busy_cost'))
+	{
+		function user_busy_cost()
+		{
+			return 0;
+		}
+	}
+
+	// Website settings
+	@define('CONST_NoAccessControl', true);
+	@define('CONST_ClosedForIndexing', false);
+	@define('CONST_ClosedForIndexingExceptionIPs', '');
+	@define('CONST_BlockedIPs', '');
+	@define('CONST_BulkUserIPs', '');
+	@define('CONST_BlockMessage', ''); // additional info to show for blocked IPs
+
+	@define('CONST_Website_BaseURL', 'http://'.php_uname('n').'/');
+	@define('CONST_Tile_Default', 'Mapnik');
+
+	@define('CONST_Default_Language', false);
+	@define('CONST_Default_Lat', 20.0);
+	@define('CONST_Default_Lon', 0.0);
+	@define('CONST_Default_Zoom', 2);
+	@define('CONST_Map_Tile_URL', 'http://{s}.tile.osm.org/{z}/{x}/{y}.png');
+	@define('CONST_Map_Tile_Attribution', ''); // Set if tile source isn't osm.org
+
+	@define('CONST_Search_AreaPolygons_Enabled', true);
+	@define('CONST_Search_AreaPolygons', true);
+
+	@define('CONST_Search_BatchMode', false);
+
+	@define('CONST_Search_TryDroppedAddressTerms', false);
+	@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 alloow reverse search.
+	@define('CONST_Search_ReversePlanForAll', true);
+
+	@define('CONST_Places_Max_ID_count', 50); 
+
+	// Set to zero to disable polygon output
+	@define('CONST_PolygonOutput_MaximumTypes', 1);
+
+	// Log settings
+	@define('CONST_Log_DB', true);
+	@define('CONST_Log_File', false);
+	@define('CONST_Log_File_Format', 'TODO'); // Currently hard coded
+	@define('CONST_Log_File_SearchLog', '');
+	@define('CONST_Log_File_ReverseLog', '');
+
 
-echo "ERROR: Scripts must be run from build directory.\n";
-exit;

sql/aux_tables.sql

@@ -1,6 +0,0 @@
-CREATE TABLE location_property_aux () INHERITS (location_property);
-CREATE INDEX idx_location_property_aux_place_id ON location_property_aux USING BTREE (place_id);
-CREATE INDEX idx_location_property_aux_parent_place_id ON location_property_aux USING BTREE (parent_place_id);
-CREATE INDEX idx_location_property_aux_housenumber_parent_place_id ON location_property_aux USING BTREE (parent_place_id, housenumber);
-GRANT SELECT ON location_property_aux TO "{www-user}";
-

sql/indices.src.sql

@@ -17,13 +17,14 @@ CREATE INDEX idx_placex_parent_place_id ON placex USING BTREE (parent_place_id)
 CREATE INDEX idx_placex_reverse_geometry ON placex USING gist (geometry) {ts:search-index} where rank_search != 28 and (name is not null or housenumber is not null) and class not in ('waterway','railway','tunnel','bridge','man_made');
 CREATE INDEX idx_location_area_country_place_id ON location_area_country USING BTREE (place_id) {ts:address-index};
 
-CREATE INDEX idx_osmline_parent_place_id ON location_property_osmline USING BTREE (parent_place_id) {ts:search-index};
-
 CREATE INDEX idx_search_name_country_centroid ON search_name_country USING GIST (centroid) {ts:address-index};
 
+-- start
+CREATE INDEX idx_location_property_-partition-_centroid ON location_property_-partition- USING GIST (centroid) {ts:address-index};
+-- end
+
 DROP INDEX IF EXISTS place_id_idx;
 CREATE UNIQUE INDEX idx_place_osm_unique on place using btree(osm_id,osm_type,class,type) {ts:address-index};
 
 
-CREATE UNIQUE INDEX idx_postcode_id ON location_postcode USING BTREE (place_id) {ts:search-index};
-CREATE INDEX idx_postcode_postcode ON location_postcode USING BTREE (postcode) {ts:search-index};
+CREATE INDEX idx_gb_postcode_postcode ON gb_postcode USING BTREE (postcode) {ts:search-index};

sql/loaddata.sql

@@ -0,0 +1,13 @@
+TRUNCATE placex;
+TRUNCATE search_name;
+TRUNCATE place_addressline;
+TRUNCATE location_area;
+
+DROP SEQUENCE seq_place;
+CREATE SEQUENCE seq_place start 100000;
+
+insert into placex (osm_type, osm_id, class, type, name, admin_level, housenumber, street, isin, postcode, country_code, extratags, geometry) select * from place where osm_type = 'N';
+insert into placex (osm_type, osm_id, class, type, name, admin_level, housenumber, street, isin, postcode, country_code, extratags, geometry) select * from place where osm_type = 'W';
+insert into placex (osm_type, osm_id, class, type, name, admin_level, housenumber, street, isin, postcode, country_code, extratags, geometry) select * from place where osm_type = 'R';
+
+--select count(*) from (select create_interpolation(osm_id, housenumber) from placex where indexed=false and class='place' and type='houses') as x;

sql/partition-functions.src.sql

@@ -1,4 +1,4 @@
-create or replace function getNearFeatures(in_partition INTEGER, feature GEOMETRY, maxrank INTEGER, isin_tokens INT[]) RETURNS setof nearfeaturecentr AS $$
+create or replace function getNearFeatures(in_partition INTEGER, point GEOMETRY, maxrank INTEGER, isin_tokens INT[]) RETURNS setof nearfeaturecentr AS $$
 DECLARE
   r nearfeaturecentr%rowtype;
 BEGIN
@@ -6,14 +6,14 @@ BEGIN
 -- start
   IF in_partition = -partition- THEN
     FOR r IN 
-      SELECT place_id, keywords, rank_address, rank_search, min(ST_Distance(feature, centroid)) as distance, isguess, postcode, centroid FROM (
-        SELECT * FROM location_area_large_-partition- WHERE ST_Intersects(geometry, feature) and rank_search < maxrank
+      SELECT place_id, keywords, rank_address, rank_search, min(ST_Distance(point, centroid)) as distance, isguess, centroid FROM (
+        SELECT * FROM location_area_large_-partition- WHERE ST_Contains(geometry, point) and rank_search < maxrank
         UNION ALL
-        SELECT * FROM location_area_country WHERE ST_Intersects(geometry, feature) and rank_search < maxrank
+        SELECT * FROM location_area_country WHERE ST_Contains(geometry, point) and rank_search < maxrank
       ) as location_area
-      GROUP BY place_id, keywords, rank_address, rank_search, isguess, postcode, centroid
+      GROUP BY place_id, keywords, rank_address, rank_search, isguess, centroid
       ORDER BY rank_address, isin_tokens && keywords desc, isguess asc,
-        ST_Distance(feature, centroid) *
+        ST_Distance(point, centroid) * 
           CASE 
                WHEN rank_address = 16 AND rank_search = 15 THEN 0.2 -- capital city
                WHEN rank_address = 16 AND rank_search = 16 THEN 0.25 -- city
@@ -55,8 +55,8 @@ $$
 LANGUAGE plpgsql;
 
 create or replace function insertLocationAreaLarge(
-  in_partition INTEGER, in_place_id BIGINT, in_country_code VARCHAR(2), in_keywords INTEGER[],
-  in_rank_search INTEGER, in_rank_address INTEGER, in_estimate BOOLEAN, postcode TEXT,
+  in_partition INTEGER, in_place_id BIGINT, in_country_code VARCHAR(2), in_keywords INTEGER[], 
+  in_rank_search INTEGER, in_rank_address INTEGER, in_estimate BOOLEAN, 
   in_centroid GEOMETRY, in_geometry GEOMETRY) RETURNS BOOLEAN AS $$
 DECLARE
 BEGIN
@@ -65,15 +65,13 @@ BEGIN
   END IF;
 
   IF in_rank_search <= 4 THEN
-    INSERT INTO location_area_country (partition, place_id, country_code, keywords, rank_search, rank_address, isguess, centroid, geometry)
-      values (in_partition, in_place_id, in_country_code, in_keywords, in_rank_search, in_rank_address, in_estimate, in_centroid, in_geometry);
+    INSERT INTO location_area_country values (in_partition, in_place_id, in_country_code, in_keywords, in_rank_search, in_rank_address, in_estimate, in_centroid, in_geometry);
     RETURN TRUE;
   END IF;
 
 -- start
   IF in_partition = -partition- THEN
-    INSERT INTO location_area_large_-partition- (partition, place_id, country_code, keywords, rank_search, rank_address, isguess, postcode, centroid, geometry)
-      values (in_partition, in_place_id, in_country_code, in_keywords, in_rank_search, in_rank_address, in_estimate, postcode, in_centroid, in_geometry);
+    INSERT INTO location_area_large_-partition- values (in_partition, in_place_id, in_country_code, in_keywords, in_rank_search, in_rank_address, in_estimate, in_centroid, in_geometry);
     RETURN TRUE;
   END IF;
 -- end
@@ -173,6 +171,29 @@ $$
 LANGUAGE plpgsql;
 
 
+create or replace function getNearestPostcode(in_partition INTEGER, point GEOMETRY) 
+  RETURNS TEXT AS $$
+DECLARE
+  out_postcode TEXT;
+BEGIN
+
+-- start
+  IF in_partition = -partition- THEN
+    SELECT postcode
+        FROM location_area_large_-partition- join placex using (place_id)
+        WHERE st_contains(location_area_large_-partition-.geometry, point)
+        AND class = 'place' and type = 'postcode' 
+      ORDER BY st_distance(location_area_large_-partition-.centroid, point) ASC limit 1
+      INTO out_postcode;
+    RETURN out_postcode;
+  END IF;
+-- end
+
+  RAISE EXCEPTION 'Unknown partition %', in_partition;
+END
+$$
+LANGUAGE plpgsql;
+
 create or replace function insertSearchName(
   in_partition INTEGER, in_place_id BIGINT, in_country_code VARCHAR(2), 
   in_name_vector INTEGER[], in_nameaddress_vector INTEGER[],
@@ -182,14 +203,14 @@ DECLARE
 BEGIN
 
   DELETE FROM search_name WHERE place_id = in_place_id;
-  INSERT INTO search_name (place_id, search_rank, address_rank, importance, country_code, name_vector, nameaddress_vector, centroid)
-    values (in_place_id, in_rank_search, in_rank_address, in_importance, in_country_code, in_name_vector, in_nameaddress_vector, in_centroid);
+  INSERT INTO search_name values (in_place_id, in_rank_search, in_rank_address, in_importance, in_country_code, 
+    in_name_vector, in_nameaddress_vector, in_centroid);
 
   IF in_rank_search <= 4 THEN
     DELETE FROM search_name_country WHERE place_id = in_place_id;
     IF in_rank_address > 0 THEN
-      INSERT INTO search_name_country (place_id, search_rank, address_rank, name_vector, centroid)
-        values (in_place_id, in_rank_search, in_rank_address, in_name_vector, in_geometry);
+      INSERT INTO search_name_country values (in_place_id, in_rank_search, in_rank_address,
+        in_name_vector, in_geometry);
     END IF;
     RETURN TRUE;
   END IF;
@@ -198,8 +219,8 @@ BEGIN
   IF in_partition = -partition- THEN
     DELETE FROM search_name_-partition- values WHERE place_id = in_place_id;
     IF in_rank_address > 0 THEN
-      INSERT INTO search_name_-partition- (place_id, search_rank, address_rank, name_vector, centroid)
-        values (in_place_id, in_rank_search, in_rank_address, in_name_vector, in_geometry);
+      INSERT INTO search_name_-partition- values (in_place_id, in_rank_search, in_rank_address,
+        in_name_vector, in_geometry);
     END IF;
     RETURN TRUE;
   END IF;
@@ -240,8 +261,7 @@ BEGIN
 -- start
   IF in_partition = -partition- THEN
     DELETE FROM location_road_-partition- where place_id = in_place_id;
-    INSERT INTO location_road_-partition- (partition, place_id, country_code, geometry)
-      values (in_partition, in_place_id, in_country_code, in_geometry);
+    INSERT INTO location_road_-partition- values (in_partition, in_place_id, in_country_code, in_geometry);
     RETURN TRUE;
   END IF;
 -- end

sql/partition-tables.src.sql

@@ -7,8 +7,8 @@ drop type if exists nearfeature cascade;
 create type nearfeature as (
   place_id BIGINT,
   keywords int[],
-  rank_address smallint,
-  rank_search smallint,
+  rank_address integer,
+  rank_search integer,
   distance float,
   isguess boolean
 );
@@ -17,22 +17,21 @@ drop type if exists nearfeaturecentr cascade;
 create type nearfeaturecentr as (
   place_id BIGINT,
   keywords int[],
-  rank_address smallint,
-  rank_search smallint,
+  rank_address integer,
+  rank_search integer,
   distance float,
   isguess boolean,
-  postcode TEXT,
   centroid GEOMETRY
 );
 
 drop table IF EXISTS search_name_blank CASCADE;
 CREATE TABLE search_name_blank (
   place_id BIGINT,
-  search_rank smallint,
-  address_rank smallint,
-  name_vector integer[],
-  centroid GEOMETRY(Geometry, 4326)
+  search_rank integer,
+  address_rank integer,
+  name_vector integer[]
   );
+SELECT AddGeometryColumn('search_name_blank', 'centroid', 4326, 'GEOMETRY', 2);
 
 
 CREATE TABLE location_area_country () INHERITS (location_area_large) {ts:address-data};
@@ -52,12 +51,17 @@ CREATE INDEX idx_search_name_-partition-_place_id ON search_name_-partition- USI
 CREATE INDEX idx_search_name_-partition-_centroid ON search_name_-partition- USING GIST (centroid) {ts:address-index};
 CREATE INDEX idx_search_name_-partition-_name_vector ON search_name_-partition- USING GIN (name_vector) WITH (fastupdate = off) {ts:address-index};
 
+CREATE TABLE location_property_-partition- () INHERITS (location_property) {ts:aux-data};
+CREATE INDEX idx_location_property_-partition-_place_id ON location_property_-partition- USING BTREE (place_id) {ts:aux-index};
+CREATE INDEX idx_location_property_-partition-_parent_place_id ON location_property_-partition- USING BTREE (parent_place_id) {ts:aux-index};
+CREATE INDEX idx_location_property_-partition-_housenumber_parent_place_id ON location_property_-partition- USING BTREE (parent_place_id, housenumber) {ts:aux-index};
+
 CREATE TABLE location_road_-partition- (
+  partition integer,
   place_id BIGINT,
-  partition SMALLINT,
-  country_code VARCHAR(2),
-  geometry GEOMETRY(Geometry, 4326)
+  country_code VARCHAR(2)
   ) {ts:address-data};
+SELECT AddGeometryColumn('location_road_-partition-', 'geometry', 4326, 'GEOMETRY', 2);
 CREATE INDEX idx_location_road_-partition-_geometry ON location_road_-partition- USING GIST (geometry) {ts:address-index};
 CREATE INDEX idx_location_road_-partition-_place_id ON location_road_-partition- USING BTREE (place_id) {ts:address-index};
 

sql/postgis_15_aux.sql

@@ -0,0 +1,14 @@
+-- Splits the line at the given point and returns the two parts
+-- in a multilinestring.
+CREATE OR REPLACE FUNCTION split_line_on_node(line GEOMETRY, point GEOMETRY)
+RETURNS GEOMETRY
+  AS $$
+DECLARE
+  frac FLOAT;
+BEGIN
+  frac := ST_Line_Locate_Point(line, point);
+  RETURN ST_Collect(ST_Line_Substring(line, 0, frac),
+         ST_Line_Substring(line, frac, 1));
+END
+$$
+LANGUAGE plpgsql;

sql/postgis_20_aux.sql

@@ -0,0 +1,10 @@
+-- Splits the line at the given point and returns the two parts
+-- in a multilinestring.
+CREATE OR REPLACE FUNCTION split_line_on_node(line GEOMETRY, point GEOMETRY)
+RETURNS GEOMETRY
+  AS $$
+BEGIN
+  RETURN ST_Split(ST_Snap(line, point, 0.0005), point);
+END;
+$$
+LANGUAGE plpgsql;

sql/tables-minimal.sql

@@ -0,0 +1,155 @@
+drop table import_npi_log;
+CREATE TABLE import_npi_log (
+  npiid integer,
+  batchend timestamp,
+  batchsize integer,
+  starttime timestamp,
+  endtime timestamp,
+  event text
+  );
+
+drop table IF EXISTS word;
+CREATE TABLE word (
+  word_id INTEGER,
+  word_token text,
+  word_trigram text,
+  word text,
+  class text,
+  type text,
+  country_code varchar(2),
+  search_name_count INTEGER,
+  operator TEXT
+  );
+SELECT AddGeometryColumn('word', 'location', 4326, 'GEOMETRY', 2);
+CREATE INDEX idx_word_word_id on word USING BTREE (word_id);
+CREATE INDEX idx_word_word_token on word USING BTREE (word_token);
+GRANT SELECT ON word TO "www-data" ;
+DROP SEQUENCE seq_word;
+CREATE SEQUENCE seq_word start 1;
+
+drop table IF EXISTS location_property CASCADE;
+CREATE TABLE location_property (
+  place_id BIGINT,
+  partition integer,
+  parent_place_id BIGINT,
+  housenumber TEXT,
+  postcode TEXT
+  );
+SELECT AddGeometryColumn('location_property', 'centroid', 4326, 'POINT', 2);
+
+CREATE TABLE location_property_aux () INHERITS (location_property);
+CREATE INDEX idx_location_property_aux_place_id ON location_property_aux USING BTREE (place_id);
+CREATE INDEX idx_location_property_aux_parent_place_id ON location_property_aux USING BTREE (parent_place_id);
+CREATE INDEX idx_location_property_aux_housenumber_parent_place_id ON location_property_aux USING BTREE (parent_place_id, housenumber);
+
+CREATE TABLE location_property_tiger () INHERITS (location_property);
+CREATE INDEX idx_location_property_tiger_place_id ON location_property_tiger USING BTREE (place_id);
+CREATE INDEX idx_location_property_tiger_parent_place_id ON location_property_tiger USING BTREE (parent_place_id);
+CREATE INDEX idx_location_property_tiger_housenumber_parent_place_id ON location_property_tiger USING BTREE (parent_place_id, housenumber);
+
+drop table IF EXISTS search_name_blank CASCADE;
+CREATE TABLE search_name_blank (
+  place_id BIGINT,
+  search_rank integer,
+  address_rank integer,
+  importance FLOAT,
+  country_code varchar(2),
+  name_vector integer[],
+  nameaddress_vector integer[]
+  );
+SELECT AddGeometryColumn('search_name_blank', 'centroid', 4326, 'GEOMETRY', 2);
+
+drop table IF EXISTS search_name;
+CREATE TABLE search_name () INHERITS (search_name_blank);
+CREATE INDEX search_name_name_vector_idx ON search_name USING GIN (name_vector gin__int_ops) WITH (fastupdate = off);
+CREATE INDEX searchnameplacesearch_search_nameaddress_vector_idx ON search_name USING GIN (nameaddress_vector gin__int_ops) WITH (fastupdate = off);
+CREATE INDEX idx_search_name_centroid ON search_name USING GIST (centroid);
+CREATE INDEX idx_search_name_place_id ON search_name USING BTREE (place_id);
+
+drop table IF EXISTS place_addressline;
+CREATE TABLE place_addressline (
+  place_id BIGINT,
+  address_place_id BIGINT,
+  fromarea boolean,
+  isaddress boolean,
+  distance float,
+  cached_rank_address integer
+  );
+CREATE INDEX idx_place_addressline_place_id on place_addressline USING BTREE (place_id);
+CREATE INDEX idx_place_addressline_address_place_id on place_addressline USING BTREE (address_place_id);
+
+drop table IF EXISTS place_boundingbox CASCADE;
+CREATE TABLE place_boundingbox (
+  place_id BIGINT,
+  minlat float,
+  maxlat float,
+  minlon float,
+  maxlon float,
+  numfeatures integer,
+  area float
+  );
+CREATE INDEX idx_place_boundingbox_place_id on place_boundingbox USING BTREE (place_id);
+SELECT AddGeometryColumn('place_boundingbox', 'outline', 4326, 'GEOMETRY', 2);
+CREATE INDEX idx_place_boundingbox_outline ON place_boundingbox USING GIST (outline);
+GRANT SELECT on place_boundingbox to "www-data" ;
+GRANT INSERT on place_boundingbox to "www-data" ;
+
+drop table country;
+CREATE TABLE country (
+  country_code varchar(2),
+  country_name hstore,
+  country_default_language_code varchar(2)
+  );
+SELECT AddGeometryColumn('country', 'geometry', 4326, 'POLYGON', 2);
+insert into country select iso3166::varchar(2), 'name:en'->cntry_name, null, 
+  ST_Transform(geometryn(the_geom, generate_series(1, numgeometries(the_geom))), 4326) from worldboundaries;
+CREATE INDEX idx_country_country_code ON country USING BTREE (country_code);
+CREATE INDEX idx_country_geometry ON country USING GIST (geometry);
+
+drop table placex;
+CREATE TABLE placex (
+  place_id BIGINT NOT NULL,
+  partition integer,
+  osm_type char(1),
+  osm_id INTEGER,
+  class TEXT NOT NULL,
+  type TEXT NOT NULL,
+  name HSTORE,
+  admin_level INTEGER,
+  housenumber TEXT,
+  street TEXT,
+  isin TEXT,
+  postcode TEXT,
+  country_code varchar(2),
+  extratags HSTORE,
+  parent_place_id BIGINT,
+  linked_place_id BIGINT,
+  rank_address INTEGER,
+  rank_search INTEGER,
+  importance FLOAT,
+  indexed_status INTEGER,
+  indexed_date TIMESTAMP,
+  geometry_sector INTEGER
+  );
+SELECT AddGeometryColumn('placex', 'geometry', 4326, 'GEOMETRY', 2);
+CREATE UNIQUE INDEX idx_place_id ON placex USING BTREE (place_id);
+CREATE INDEX idx_placex_osmid ON placex USING BTREE (osm_type, osm_id);
+CREATE INDEX idx_placex_rank_search ON placex USING BTREE (rank_search);
+CREATE INDEX idx_placex_rank_address ON placex USING BTREE (rank_address);
+CREATE INDEX idx_placex_geometry ON placex USING GIST (geometry);
+CREATE INDEX idx_placex_parent_place_id ON placex USING BTREE (parent_place_id) where parent_place_id IS NOT NULL;
+
+DROP SEQUENCE seq_place;
+CREATE SEQUENCE seq_place start 1;
+GRANT SELECT on placex to "www-data" ;
+GRANT UPDATE ON placex to "www-data" ;
+GRANT SELECT ON search_name to "www-data" ;
+GRANT DELETE on search_name to "www-data" ;
+GRANT INSERT on search_name to "www-data" ;
+GRANT SELECT on place_addressline to "www-data" ;
+GRANT INSERT ON place_addressline to "www-data" ;
+GRANT DELETE on place_addressline to "www-data" ;
+GRANT SELECT ON seq_word to "www-data" ;
+GRANT UPDATE ON seq_word to "www-data" ;
+GRANT INSERT ON word to "www-data" ;
+GRANT SELECT on country to "www-data" ;

sql/tables.sql

@@ -1,21 +1,41 @@
 drop table if exists import_status;
 CREATE TABLE import_status (
-  lastimportdate timestamp NOT NULL,
-  sequence_id integer,
-  indexed boolean
+  lastimportdate timestamp NOT NULL
   );
 GRANT SELECT ON import_status TO "{www-user}" ;
 
 drop table if exists import_osmosis_log;
 CREATE TABLE import_osmosis_log (
   batchend timestamp,
-  batchseq integer,
   batchsize integer,
   starttime timestamp,
   endtime timestamp,
   event text
   );
 
+drop table if exists import_npi_log;
+CREATE TABLE import_npi_log (
+  npiid integer,
+  batchend timestamp,
+  batchsize integer,
+  starttime timestamp,
+  endtime timestamp,
+  event text
+  );
+
+--drop table IF EXISTS query_log;
+CREATE TABLE query_log (
+  starttime timestamp,
+  query text,
+  ipaddress text,
+  endtime timestamp,
+  results integer
+  );
+CREATE INDEX idx_query_log ON query_log USING BTREE (starttime);
+GRANT SELECT ON query_log TO "{www-user}" ;
+GRANT INSERT ON query_log TO "{www-user}" ;
+GRANT UPDATE ON query_log TO "{www-user}" ;
+
 CREATE TABLE new_query_log (
   type text,
   starttime timestamp,
@@ -23,7 +43,6 @@ CREATE TABLE new_query_log (
   useragent text,
   language text,
   query text,
-  searchterm text,
   endtime timestamp,
   results integer,
   format text,
@@ -37,6 +56,9 @@ GRANT SELECT ON new_query_log TO "{www-user}" ;
 GRANT SELECT ON TABLE country_name TO "{www-user}";
 GRANT SELECT ON TABLE gb_postcode TO "{www-user}";
 
+create view vw_search_query_log as SELECT substr(query, 1, 50) AS query, starttime, endtime - starttime AS duration, substr(useragent, 1, 20) as 
+useragent, language, results, ipaddress FROM new_query_log WHERE type = 'search' ORDER BY starttime DESC;
+
 drop table IF EXISTS word;
 CREATE TABLE word (
   word_id INTEGER,
@@ -55,29 +77,28 @@ CREATE SEQUENCE seq_word start 1;
 
 drop table IF EXISTS location_area CASCADE;
 CREATE TABLE location_area (
+  partition integer,
   place_id BIGINT,
-  keywords INTEGER[],
-  partition SMALLINT,
-  rank_search SMALLINT NOT NULL,
-  rank_address SMALLINT NOT NULL,
   country_code VARCHAR(2),
-  isguess BOOL,
-  postcode TEXT,
-  centroid GEOMETRY(Point, 4326),
-  geometry GEOMETRY(Geometry, 4326)
+  keywords INTEGER[],
+  rank_search INTEGER NOT NULL,
+  rank_address INTEGER NOT NULL,
+  isguess BOOL
   );
+SELECT AddGeometryColumn('location_area', 'centroid', 4326, 'POINT', 2);
+SELECT AddGeometryColumn('location_area', 'geometry', 4326, 'GEOMETRY', 2);
 
 CREATE TABLE location_area_large () INHERITS (location_area);
 
 drop table IF EXISTS location_property CASCADE;
 CREATE TABLE location_property (
   place_id BIGINT,
+  partition integer,
   parent_place_id BIGINT,
-  partition SMALLINT,
   housenumber TEXT,
-  postcode TEXT,
-  centroid GEOMETRY(Point, 4326)
+  postcode TEXT
   );
+SELECT AddGeometryColumn('location_property', 'centroid', 4326, 'POINT', 2);
 
 CREATE TABLE location_property_aux () INHERITS (location_property);
 CREATE INDEX idx_location_property_aux_place_id ON location_property_aux USING BTREE (place_id);
@@ -85,85 +106,56 @@ CREATE INDEX idx_location_property_aux_parent_place_id ON location_property_aux
 CREATE INDEX idx_location_property_aux_housenumber_parent_place_id ON location_property_aux USING BTREE (parent_place_id, housenumber);
 GRANT SELECT ON location_property_aux TO "{www-user}";
 
-CREATE TABLE location_property_tiger (
-  place_id BIGINT,
-  parent_place_id BIGINT,
-  startnumber INTEGER,
-  endnumber INTEGER,
-  partition SMALLINT,
-  linegeo GEOMETRY,
-  interpolationtype TEXT,
-  postcode TEXT);
+CREATE TABLE location_property_tiger () INHERITS (location_property) {ts:aux-data};
+CREATE INDEX idx_location_property_tiger_place_id ON location_property_tiger USING BTREE (place_id) {ts:aux-index};
+CREATE INDEX idx_location_property_tiger_parent_place_id ON location_property_tiger USING BTREE (parent_place_id) {ts:aux-index};
+CREATE INDEX idx_location_property_tiger_housenumber_parent_place_id ON location_property_tiger USING BTREE (parent_place_id, housenumber) {ts:aux-index};
 GRANT SELECT ON location_property_tiger TO "{www-user}";
 
-drop table if exists location_property_osmline;
-CREATE TABLE location_property_osmline (
-    place_id BIGINT NOT NULL,
-    osm_id BIGINT,
-    parent_place_id BIGINT,
-    geometry_sector INTEGER,
-    indexed_date TIMESTAMP,
-    startnumber INTEGER,
-    endnumber INTEGER,
-    partition SMALLINT,
-    indexed_status SMALLINT,
-    linegeo GEOMETRY,
-    interpolationtype TEXT,
-    address HSTORE,
-    postcode TEXT,
-    country_code VARCHAR(2)
-  ){ts:search-data};
-CREATE UNIQUE INDEX idx_osmline_place_id ON location_property_osmline USING BTREE (place_id) {ts:search-index};
-CREATE INDEX idx_osmline_geometry_sector ON location_property_osmline USING BTREE (geometry_sector) {ts:address-index};
-CREATE INDEX idx_osmline_linegeo ON location_property_osmline USING GIST (linegeo) {ts:search-index};
-GRANT SELECT ON location_property_osmline TO "{www-user}";
-
 drop table IF EXISTS search_name;
 CREATE TABLE search_name (
   place_id BIGINT,
+  search_rank integer,
+  address_rank integer,
   importance FLOAT,
-  search_rank SMALLINT,
-  address_rank SMALLINT,
-  name_vector integer[],
-  nameaddress_vector integer[],
   country_code varchar(2),
-  centroid GEOMETRY(Geometry, 4326)
+  name_vector integer[],
+  nameaddress_vector integer[]
   ) {ts:search-data};
+SELECT AddGeometryColumn('search_name', 'centroid', 4326, 'GEOMETRY', 2);
 CREATE INDEX idx_search_name_place_id ON search_name USING BTREE (place_id) {ts:search-index};
 
 drop table IF EXISTS place_addressline;
 CREATE TABLE place_addressline (
   place_id BIGINT,
   address_place_id BIGINT,
-  distance FLOAT,
-  cached_rank_address SMALLINT,
   fromarea boolean,
-  isaddress boolean
+  isaddress boolean,
+  distance float,
+  cached_rank_address integer
   ) {ts:search-data};
 CREATE INDEX idx_place_addressline_place_id on place_addressline USING BTREE (place_id) {ts:search-index};
 
 drop table if exists placex;
 CREATE TABLE placex (
   place_id BIGINT NOT NULL,
+  partition integer,
+  LIKE place INCLUDING CONSTRAINTS,
   parent_place_id BIGINT,
   linked_place_id BIGINT,
+  rank_address INTEGER,
+  rank_search INTEGER,
   importance FLOAT,
+  indexed_status INTEGER,
   indexed_date TIMESTAMP,
-  geometry_sector INTEGER,
-  rank_address SMALLINT,
-  rank_search SMALLINT,
-  partition SMALLINT,
-  indexed_status SMALLINT,
-  LIKE place INCLUDING CONSTRAINTS,
   wikipedia TEXT, -- calculated wikipedia article name (language:title)
-  country_code varchar(2),
-  housenumber TEXT,
-  postcode TEXT,
-  centroid GEOMETRY(Geometry, 4326)
+  geometry_sector INTEGER,
+  calculated_country_code varchar(2)
   ) {ts:search-data};
+SELECT AddGeometryColumn('placex', 'centroid', 4326, 'GEOMETRY', 2);
 CREATE UNIQUE INDEX idx_place_id ON placex USING BTREE (place_id) {ts:search-index};
 CREATE INDEX idx_placex_osmid ON placex USING BTREE (osm_type, osm_id) {ts:search-index};
-CREATE INDEX idx_placex_linked_place_id ON placex USING BTREE (linked_place_id) {ts:address-index} WHERE linked_place_id IS NOT NULL;
+CREATE INDEX idx_placex_linked_place_id ON placex USING BTREE (linked_place_id) {ts:address-index};
 CREATE INDEX idx_placex_rank_search ON placex USING BTREE (rank_search, geometry_sector) {ts:address-index};
 CREATE INDEX idx_placex_geometry ON placex USING GIST (geometry) {ts:search-index};
 CREATE INDEX idx_placex_adminname on placex USING BTREE (make_standard_name(name->'name'),rank_search) {ts:address-index} WHERE osm_type='N' and rank_search < 26;
@@ -178,17 +170,13 @@ GRANT SELECT ON planet_osm_ways to "{www-user}" ;
 GRANT SELECT ON planet_osm_rels to "{www-user}" ;
 GRANT SELECT on location_area to "{www-user}" ;
 
--- insert creates the location tables, creates location indexes if indexed == true
+-- insert creates the location tagbles, creates location indexes if indexed == true
 CREATE TRIGGER placex_before_insert BEFORE INSERT ON placex
     FOR EACH ROW EXECUTE PROCEDURE placex_insert();
-CREATE TRIGGER osmline_before_insert BEFORE INSERT ON location_property_osmline
-    FOR EACH ROW EXECUTE PROCEDURE osmline_insert();
 
 -- update insert creates the location tables
 CREATE TRIGGER placex_before_update BEFORE UPDATE ON placex
     FOR EACH ROW EXECUTE PROCEDURE placex_update();
-CREATE TRIGGER osmline_before_update BEFORE UPDATE ON location_property_osmline
-    FOR EACH ROW EXECUTE PROCEDURE osmline_update();
 
 -- diff update triggers
 CREATE TRIGGER placex_before_delete AFTER DELETE ON placex
@@ -198,52 +186,36 @@ CREATE TRIGGER place_before_delete BEFORE DELETE ON place
 CREATE TRIGGER place_before_insert BEFORE INSERT ON place
     FOR EACH ROW EXECUTE PROCEDURE place_insert();
 
--- Table for synthetic postcodes.
-DROP TABLE IF EXISTS location_postcode;
-CREATE TABLE location_postcode (
-  place_id BIGINT,
-  parent_place_id BIGINT,
-  rank_search SMALLINT,
-  rank_address SMALLINT,
-  indexed_status SMALLINT,
-  indexed_date TIMESTAMP,
-  country_code varchar(2),
-  postcode TEXT,
-  geometry GEOMETRY(Geometry, 4326)
-  );
-CREATE INDEX idx_postcode_geometry ON location_postcode USING GIST (geometry) {ts:address-index};
-GRANT SELECT ON location_postcode TO "{www-user}" ;
+DROP SEQUENCE seq_postcodes;
+CREATE SEQUENCE seq_postcodes start 1;
 
-CREATE TRIGGER location_postcode_before_update BEFORE UPDATE ON location_postcode
-    FOR EACH ROW EXECUTE PROCEDURE postcode_update();
-
-DROP TABLE IF EXISTS import_polygon_error;
+drop table import_polygon_error;
 CREATE TABLE import_polygon_error (
-  osm_id BIGINT,
-  osm_type CHAR(1),
+  osm_type char(1),
+  osm_id INTEGER,
   class TEXT NOT NULL,
   type TEXT NOT NULL,
   name HSTORE,
   country_code varchar(2),
   updated timestamp,
-  errormessage text,
-  prevgeometry GEOMETRY(Geometry, 4326),
-  newgeometry GEOMETRY(Geometry, 4326)
+  errormessage text
   );
+SELECT AddGeometryColumn('import_polygon_error', 'prevgeometry', 4326, 'GEOMETRY', 2);
+SELECT AddGeometryColumn('import_polygon_error', 'newgeometry', 4326, 'GEOMETRY', 2);
 CREATE INDEX idx_import_polygon_error_osmid ON import_polygon_error USING BTREE (osm_type, osm_id);
 GRANT SELECT ON import_polygon_error TO "{www-user}";
 
-DROP TABLE IF EXISTS import_polygon_delete;
+drop table import_polygon_delete;
 CREATE TABLE import_polygon_delete (
-  osm_id BIGINT,
-  osm_type CHAR(1),
+  osm_type char(1),
+  osm_id INTEGER,
   class TEXT NOT NULL,
   type TEXT NOT NULL
   );
 CREATE INDEX idx_import_polygon_delete_osmid ON import_polygon_delete USING BTREE (osm_type, osm_id);
 GRANT SELECT ON import_polygon_delete TO "{www-user}";
 
-DROP SEQUENCE IF EXISTS file;
+drop sequence file;
 CREATE SEQUENCE file start 1;
 
 -- null table so it won't error

sql/tiger_import_finish.sql

@@ -1,5 +1,4 @@
---index only on parent_place_id
-CREATE INDEX idx_location_property_tiger_parent_place_id_imp ON location_property_tiger_import (parent_place_id) {ts:aux-index};
+CREATE INDEX idx_location_property_tiger_housenumber_parent_place_id_imp ON location_property_tiger_import (parent_place_id, housenumber) {ts:aux-index};
 CREATE UNIQUE INDEX idx_location_property_tiger_place_id_imp ON location_property_tiger_import (place_id) {ts:aux-index};
 
 GRANT SELECT ON location_property_tiger_import TO "{www-user}";
@@ -7,7 +6,7 @@ GRANT SELECT ON location_property_tiger_import TO "{www-user}";
 DROP TABLE IF EXISTS location_property_tiger;
 ALTER TABLE location_property_tiger_import RENAME TO location_property_tiger;
 
-ALTER INDEX idx_location_property_tiger_parent_place_id_imp RENAME TO idx_location_property_tiger_housenumber_parent_place_id;
+ALTER INDEX idx_location_property_tiger_housenumber_parent_place_id_imp RENAME TO idx_location_property_tiger_housenumber_parent_place_id;
 ALTER INDEX idx_location_property_tiger_place_id_imp RENAME TO idx_location_property_tiger_place_id;
 
-DROP FUNCTION tiger_line_import (linegeo geometry, in_startnumber integer, in_endnumber integer, interpolationtype text, in_street text, in_isin text, in_postcode text);
+DROP FUNCTION tigger_create_interpolation (linegeo geometry, in_startnumber integer, in_endnumber integer, interpolationtype text, in_street text, in_isin text, in_postcode text);

sql/tiger_import_start.sql

@@ -1,15 +1,19 @@
 DROP TABLE IF EXISTS location_property_tiger_import;
-CREATE TABLE location_property_tiger_import (linegeo GEOMETRY, place_id BIGINT, partition INTEGER, parent_place_id BIGINT, startnumber INTEGER, endnumber INTEGER, interpolationtype TEXT, postcode TEXT);
+CREATE TABLE location_property_tiger_import () INHERITS (location_property) {ts:aux-data};
 
-CREATE OR REPLACE FUNCTION tiger_line_import(linegeo GEOMETRY, in_startnumber INTEGER, 
+CREATE OR REPLACE FUNCTION tigger_create_interpolation(linegeo GEOMETRY, in_startnumber INTEGER, 
   in_endnumber INTEGER, interpolationtype TEXT, 
   in_street TEXT, in_isin TEXT, in_postcode TEXT) RETURNS INTEGER
   AS $$
 DECLARE
+  
   startnumber INTEGER;
   endnumber INTEGER;
   stepsize INTEGER;
+  housenum INTEGER;
+  newpoints INTEGER;
   numberrange INTEGER;
+  rangestartnumber INTEGER;
   place_centroid GEOMETRY;
   out_partition INTEGER;
   out_parent_place_id BIGINT;
@@ -27,6 +31,7 @@ BEGIN
   END IF;
 
   numberrange := endnumber - startnumber;
+  rangestartnumber := startnumber;
 
   IF (interpolationtype = 'odd' AND startnumber%2 = 0) OR (interpolationtype = 'even' AND startnumber%2 = 1) THEN
     startnumber := startnumber + 1;
@@ -70,11 +75,15 @@ BEGIN
     END LOOP;    
   END IF;
 
---insert street(line) into import table
-insert into location_property_tiger_import (linegeo, place_id, partition, parent_place_id, startnumber, endnumber, interpolationtype, postcode)
-values (linegeo, nextval('seq_place'), out_partition, out_parent_place_id, startnumber, endnumber, interpolationtype, in_postcode);
+  newpoints := 0;
+  FOR housenum IN startnumber..endnumber BY stepsize LOOP
+    insert into location_property_tiger_import (place_id, partition, parent_place_id, housenumber, postcode, centroid)
+    values (nextval('seq_place'), out_partition, out_parent_place_id, housenum, in_postcode,
+      ST_LineInterpolatePoint(linegeo, (housenum::float-rangestartnumber::float)/numberrange::float));
+    newpoints := newpoints + 1;
+  END LOOP;
 
-  RETURN 1;
+  RETURN newpoints;
 END;
 $$
 LANGUAGE plpgsql;

sql/update-postcodes.sql

@@ -1,52 +0,0 @@
--- Create a temporary table with postcodes from placex.
-
-CREATE TEMP TABLE tmp_new_postcode_locations AS
-SELECT country_code,
-       upper(trim (both ' ' from address->'postcode')) as pc,
-       ST_Centroid(ST_Collect(ST_Centroid(geometry))) as centroid
-  FROM placex
- WHERE address ? 'postcode'
-       AND address->'postcode' NOT SIMILAR TO '%(,|;)%'
-       AND geometry IS NOT null
-GROUP BY country_code, pc;
-
-CREATE INDEX idx_tmp_new_postcode_locations
-          ON tmp_new_postcode_locations (pc, country_code);
-
--- add extra US postcodes
-INSERT INTO tmp_new_postcode_locations (country_code, pc, centroid)
-    SELECT 'us', postcode, ST_SetSRID(ST_Point(x,y),4326)
-      FROM us_postcode u
-      WHERE NOT EXISTS (SELECT 0 FROM tmp_new_postcode_locations new
-                         WHERE new.country_code = 'us' AND new.pc = u.postcode);
--- add extra UK postcodes
-INSERT INTO tmp_new_postcode_locations (country_code, pc, centroid)
-    SELECT 'gb', postcode, geometry FROM gb_postcode g
-     WHERE NOT EXISTS (SELECT 0 FROM tmp_new_postcode_locations new
-                             WHERE new.country_code = 'gb' and new.pc = g.postcode);
-
--- Remove all postcodes that are no longer valid
-DELETE FROM location_postcode old
-  WHERE NOT EXISTS(SELECT 0 FROM tmp_new_postcode_locations new
-                   WHERE old.postcode = new.pc
-                         AND old.country_code = new.country_code);
-
--- Update geometries where necessary
-UPDATE location_postcode old SET geometry = new.centroid, indexed_status = 1
-  FROM tmp_new_postcode_locations new
- WHERE old.postcode = new.pc AND old.country_code = new.country_code
-       AND ST_AsText(old.geometry) != ST_AsText(new.centroid);
-
--- Remove all postcodes that already exist from the temporary table
-DELETE FROM tmp_new_postcode_locations new
-    WHERE EXISTS(SELECT 0 FROM location_postcode old
-                 WHERE old.postcode = new.pc AND old.country_code = new.country_code);
-
--- Add newly added postcode
-INSERT INTO location_postcode
-  (place_id, indexed_status, country_code, postcode, geometry)
-  SELECT nextval('seq_place'), 1, country_code, pc, centroid
-    FROM tmp_new_postcode_locations new;
-
--- Finally index the newly inserted postcodes
-UPDATE location_postcode SET indexed_status = 0 WHERE indexed_status > 0;

sql/update_bigint.sql

@@ -0,0 +1,9 @@
+\a
+\t
+\o /tmp/bigintupdate.sql
+select 'alter table "'||relname||'" alter '||attname||' type bigint;' from pg_attribute join pg_class on 
+(attrelid = oid) where attname like '%place_id%' and attnum > 0 and relkind = 'r'::"char" and atttypid = 23 
+and not relname::text ~ '^.*_[0-9]+$' order by 'alter table "'||relname||'" alter '||attname||' type 
+bigint;';
+\o
+\i /tmp/bigintupdate.sql

sql/words.sql

@@ -4,8 +4,8 @@ CREATE TABLE word_frequencies AS
     WHERE v is not null
  GROUP BY id);
 
-select count(getorcreate_postcode_id(v)) from (select distinct address->'postcode' as v from place where address ? 'postcode') as w where v is not null;
-select count(getorcreate_housenumber_id(make_standard_name(v))) from (select distinct address->'housenumber' as v from place where address ? 'housenumber') as w;
+select count(make_keywords(v)) from (select distinct postcode as v from place) as w where v is not null;
+select count(getorcreate_housenumber_id(make_standard_name(v))) from (select distinct housenumber as v from place where housenumber is not null) as w;
 
 -- copy the word frequencies
 update word set search_name_count = count from word_frequencies wf where wf.id = word.word_id;