From: Sarah Hoffmann <lonvia@denofr.de>
Date: Fri, 16 Mar 2018 22:39:12 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~336
X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/ab54a4b8d7ba75f7a1ecd18de34bbce5af291b5b?hp=-c

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

ab54a4b8d7ba75f7a1ecd18de34bbce5af291b5b
diff --combined website/reverse.php
index d997088a,2f1e31ee..9660f36d
--- a/website/reverse.php
+++ b/website/reverse.php
@@@ -65,7 -65,6 +65,7 @@@ if (isset($aPlace)) 
      $aPlace = [];
  }
  
 +logEnd($oDB, $hLog, sizeof($aPlace)?1:0);
  
  if (CONST_Debug) {
      var_dump($aPlace);
@@@ -73,8 -72,10 +73,10 @@@
  }
  
  if ($sOutputFormat == 'html') {
-     $sDataDate = chksql($oDB->getOne("select TO_CHAR(lastimportdate - '2 minutes'::interval,'YYYY/MM/DD HH24:MI')||' GMT' from import_status limit 1"));
+     $sDataDate = chksql($oDB->getOne("select TO_CHAR(lastimportdate,'YYYY/MM/DD HH24:MI')||' GMT' from import_status limit 1"));
      $sTileURL = CONST_Map_Tile_URL;
      $sTileAttribution = CONST_Map_Tile_Attribution;
  }
- include(CONST_BasePath.'/lib/template/address-'.$sOutputFormat.'.php');
+ 
+ $sOutputTemplate = ($sOutputFormat=='jsonv2' ? 'json' : $sOutputFormat);
+ include(CONST_BasePath.'/lib/template/address-'.$sOutputTemplate.'.php');