Merge remote-tracking branch 'upstream/master'

diff --cc lib/Geocode.php
index 306255b59079968104e5665d5f4b255f2527a609,496a3c6be48274154b796d2da99a251aac77acd2..97fc6371a0faec22eadb00a53dcbd646c4bbaa21
--- 1/lib/Geocode.php
--- 2/lib/Geocode.php
+++ b/lib/Geocode.php
@@@ -15,19 -17,9 +17,9 @@@ class Geocod
      protected $aLangPrefOrder = array();
  
      protected $bIncludeAddressDetails = false;
-     protected $bIncludeExtraTags = false;
-     protected $bIncludeNameDetails = false;
- 
-     protected $bIncludePolygonAsPoints = false;
-     protected $bIncludePolygonAsText = false;
-     protected $bIncludePolygonAsGeoJSON = false;
-     protected $bIncludePolygonAsKML = false;
-     protected $bIncludePolygonAsSVG = false;
-     protected $fPolygonSimplificationThreshold = 0.0;
  
      protected $aExcludePlaceIDs = array();
-     protected $bDeDupe = true;
 -    protected $bReverseInPlan = false;
 +    protected $bReverseInPlan = true;
  
      protected $iLimit = 20;
      protected $iFinalLimit = 10;

diff --cc lib/lib.php
Simple merge

diff --cc lib/template/includes/introduction.php
index d1b69764f01198a1ac9e8f8da8af17f41b9b4e57,7413581833b8f0061101345a652bffb3b2d92382..8bfce8ef588d3fd1c2cd3c14de604e87f02c75c8
--- 1/lib/template/includes/introduction.php
--- 2/lib/template/includes/introduction.php
+++ b/lib/template/includes/introduction.php
@@@ -6,6 -6,4 +6,6 @@@ look up data by its geographic coordina
  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>
  
- <p>For more information visit the <a href="http://wiki.openstreetmap.org/wiki/Nominatim">Nominatim wiki page</a>.</p>
 -For more information visit the <a href="https://wiki.openstreetmap.org/wiki/Nominatim">Nominatim wiki page</a>.
++<p>For more information visit the <a href="https://wiki.openstreetmap.org/wiki/Nominatim">Nominatim wiki page</a>.</p>
 +
 +<p>All usage of nominatim.openstreetmap.org must follow the <a href="https://operations.osmfoundation.org/policies/nominatim/">Nominatim Usage Policy</a>.</p>

diff --cc website/reverse.php
Simple merge