From: Sarah Hoffmann <lonvia@denofr.de>
Date: Tue, 24 Oct 2017 21:33:35 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~357
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/08f77067cb4b32c91f991924ff718a0508f0fbef

Merge remote-tracking branch 'upstream/master'
---

08f77067cb4b32c91f991924ff718a0508f0fbef
diff --cc lib/Geocode.php
index 306255b5,496a3c6b..97fc6371
--- a/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/template/includes/introduction.php
index d1b69764,74135818..8bfce8ef
--- a/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>