Compare commits

...

3 Commits

Author SHA1 Message Date
Sarah Hoffmann
567d81d10d remove more JSON_PRETTY_PRINT parameters 2016-10-17 23:03:21 +02:00
Sarah Hoffmann
6d77c08269 remove JSON_PRETTY_PRINT (requires php >= 5.4) 2016-10-17 21:49:12 +02:00
Sarah Hoffmann
f42ae6b2f6 replace more new-style array constructs 2016-10-17 21:37:13 +02:00
4 changed files with 13 additions and 13 deletions

View File

@@ -118,9 +118,9 @@
'tile_url' => $sTileURL, 'tile_url' => $sTileURL,
'tile_attribution' => $sTileAttribution 'tile_attribution' => $sTileAttribution
); );
echo 'var nominatim_map_init = ' . json_encode($aNominatimMapInit, JSON_PRETTY_PRINT) . ';'; echo 'var nominatim_map_init = ' . json_encode($aNominatimMapInit) . ';';
echo 'var nominatim_results = ' . json_encode([$aPlace], JSON_PRETTY_PRINT) . ';'; echo 'var nominatim_results = ' . json_encode([$aPlace]) . ';';
?> ?>
</script> </script>
<?php include(CONST_BasePath.'/lib/template/includes/html-footer.php'); ?> <?php include(CONST_BasePath.'/lib/template/includes/html-footer.php'); ?>

View File

@@ -281,14 +281,14 @@
'tile_url' => $sTileURL, 'tile_url' => $sTileURL,
'tile_attribution' => $sTileAttribution 'tile_attribution' => $sTileAttribution
); );
echo 'var nominatim_map_init = ' . json_encode($aNominatimMapInit, JSON_PRETTY_PRINT) . ';'; echo 'var nominatim_map_init = ' . json_encode($aNominatimMapInit) . ';';
$aPlace = array( $aPlace = array(
'outlinestring' => $aPointDetails['outlinestring'], 'outlinestring' => $aPointDetails['outlinestring'],
'lon' => $aPointDetails['lon'], 'lon' => $aPointDetails['lon'],
'lat' => $aPointDetails['lat'], 'lat' => $aPointDetails['lat'],
); );
echo 'var nominatim_result = ' . json_encode($aPlace, JSON_PRETTY_PRINT) . ';'; echo 'var nominatim_result = ' . json_encode($aPlace) . ';';
?> ?>

View File

@@ -103,9 +103,9 @@
'tile_url' => $sTileURL, 'tile_url' => $sTileURL,
'tile_attribution' => $sTileAttribution 'tile_attribution' => $sTileAttribution
); );
echo 'var nominatim_map_init = ' . json_encode($aNominatimMapInit, JSON_PRETTY_PRINT) . ';'; echo 'var nominatim_map_init = ' . json_encode($aNominatimMapInit) . ';';
echo 'var nominatim_results = ' . json_encode($aSearchResults, JSON_PRETTY_PRINT) . ';'; echo 'var nominatim_results = ' . json_encode($aSearchResults) . ';';
?> ?>
</script> </script>
<?php include(CONST_BasePath.'/lib/template/includes/html-footer.php'); ?> <?php include(CONST_BasePath.'/lib/template/includes/html-footer.php'); ?>

View File

@@ -90,7 +90,7 @@
$aPointDetails['aNames'] = $oDB->getAssoc($sSQL); $aPointDetails['aNames'] = $oDB->getAssoc($sSQL);
if (PEAR::isError($aPointDetails['aNames'])) // possible timeout if (PEAR::isError($aPointDetails['aNames'])) // possible timeout
{ {
$aPointDetails['aNames'] = []; $aPointDetails['aNames'] = array();
} }
// Extra tags // Extra tags
@@ -98,7 +98,7 @@
$aPointDetails['aExtraTags'] = $oDB->getAssoc($sSQL); $aPointDetails['aExtraTags'] = $oDB->getAssoc($sSQL);
if (PEAR::isError($aPointDetails['aExtraTags'])) // possible timeout if (PEAR::isError($aPointDetails['aExtraTags'])) // possible timeout
{ {
$aPointDetails['aExtraTags'] = []; $aPointDetails['aExtraTags'] = array();
} }
// Address // Address
@@ -113,7 +113,7 @@
$aLinkedLines = $oDB->getAll($sSQL); $aLinkedLines = $oDB->getAll($sSQL);
if (PEAR::isError($aLinkedLines)) // possible timeout if (PEAR::isError($aLinkedLines)) // possible timeout
{ {
$aLinkedLines = []; $aLinkedLines = array();
} }
// All places this is an imediate parent of // All places this is an imediate parent of
@@ -126,7 +126,7 @@
$aParentOfLines = $oDB->getAll($sSQL); $aParentOfLines = $oDB->getAll($sSQL);
if (PEAR::isError($aParentOfLines)) // possible timeout if (PEAR::isError($aParentOfLines)) // possible timeout
{ {
$aParentOfLines = []; $aParentOfLines = array();
} }
$aPlaceSearchNameKeywords = false; $aPlaceSearchNameKeywords = false;
@@ -137,14 +137,14 @@
$aPlaceSearchName = $oDB->getRow($sSQL); $aPlaceSearchName = $oDB->getRow($sSQL);
if (PEAR::isError($aPlaceSearchName)) // possible timeout if (PEAR::isError($aPlaceSearchName)) // possible timeout
{ {
$aPlaceSearchName = []; $aPlaceSearchName = array();
} }
$sSQL = "select * from word where word_id in (".substr($aPlaceSearchName['name_vector'],1,-1).")"; $sSQL = "select * from word where word_id in (".substr($aPlaceSearchName['name_vector'],1,-1).")";
$aPlaceSearchNameKeywords = $oDB->getAll($sSQL); $aPlaceSearchNameKeywords = $oDB->getAll($sSQL);
if (PEAR::isError($aPlaceSearchNameKeywords)) // possible timeout if (PEAR::isError($aPlaceSearchNameKeywords)) // possible timeout
{ {
$aPlaceSearchNameKeywords = []; $aPlaceSearchNameKeywords = array();
} }
@@ -152,7 +152,7 @@
$aPlaceSearchAddressKeywords = $oDB->getAll($sSQL); $aPlaceSearchAddressKeywords = $oDB->getAll($sSQL);
if (PEAR::isError($aPlaceSearchAddressKeywords)) // possible timeout if (PEAR::isError($aPlaceSearchAddressKeywords)) // possible timeout
{ {
$aPlaceSearchAddressKeywords = []; $aPlaceSearchAddressKeywords = array();
} }
} }