add osm_type='tiger' to json, jsonv2 and xml output

diff --git a/lib/template/search-json.php b/lib/template/search-json.php
index fc50ee0e09b2554916271e00f11cac6082418ba3..0bfbc90496e8bfd99346e9491b52db015b75994b 100644 (file)
--- a/lib/template/search-json.php
+++ b/lib/template/search-json.php
@@ -8,8 +8,8 @@
                                'place_id'=>$aPointDetails['place_id'],
                                'licence'=>"Data © OpenStreetMap contributors, ODbL 1.0. http://www.openstreetmap.org/copyright",
                        );
-
-               $sOSMType = ($aPointDetails['osm_type'] == 'N'?'node':($aPointDetails['osm_type'] == 'W'?'way':($aPointDetails['osm_type'] == 'R'?'relation':'')));
+        
+               $sOSMType = ($aPointDetails['osm_type'] == 'N'?'node':($aPointDetails['osm_type'] == 'W'?'way':($aPointDetails['osm_type'] == 'R'?'relation':($aPointDetails['osm_type'] == 'T'?'tiger':''))));
                if ($sOSMType)
                {
                        $aPlace['osm_type'] = $sOSMType;

diff --git a/lib/template/search-jsonv2.php b/lib/template/search-jsonv2.php
index 773cfd96679dd7b27d88f368930a599753485033..6f23ae26b431e601ca242a8e0256a24a316a069b 100644 (file)
--- a/lib/template/search-jsonv2.php
+++ b/lib/template/search-jsonv2.php
@@ -7,7 +7,7 @@
                                'licence'=>"Data © OpenStreetMap contributors, ODbL 1.0. http://www.openstreetmap.org/copyright",
                        );
 
-               $sOSMType = ($aPointDetails['osm_type'] == 'N'?'node':($aPointDetails['osm_type'] == 'W'?'way':($aPointDetails['osm_type'] == 'R'?'relation':'')));
+               $sOSMType = ($aPointDetails['osm_type'] == 'N'?'node':($aPointDetails['osm_type'] == 'W'?'way':($aPointDetails['osm_type'] == 'R'?'relation':($aPointDetails['osm_type'] == 'T'?'tiger':''))));
                if ($sOSMType)
                {
                        $aPlace['osm_type'] = $sOSMType;

diff --git a/lib/template/search-xml.php b/lib/template/search-xml.php
index 6a382ebf7bcb4bde0c83783e05211f9ba8241ccb..54217933ef7d8962a5e3934b3186b6ae9cb8d57d 100644 (file)
--- a/lib/template/search-xml.php
+++ b/lib/template/search-xml.php
@@ -25,7 +25,7 @@
        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':'')));
+               $sOSMType = ($aResult['osm_type'] == 'N'?'node':($aResult['osm_type'] == 'W'?'way':($aResult['osm_type'] == 'R'?'relation':($aResult['osm_type'] == 'T'?'tiger':''))));
                if ($sOSMType)
                {
                        echo " osm_type='$sOSMType'";

diff --git a/settings/settings.php~ b/settings/settings.php~
deleted file mode 100644 (file)
index a054eb2..0000000
--- a/settings/settings.php~
+++ /dev/null
@@ -1,120 +0,0 @@
-<?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_lines'); // <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://localhost/nominatim/');
-       @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', '');
-
-