Tiger: set osmtype=way and correct osm_id

diff --git a/lib/Geocode.php b/lib/Geocode.php
index a8e4083b2c4883238e9d55cf7de0026c23619a17..7ea39e4954b4aa9e84a3da84060fdf02766c70b1 100644 (file)
--- a/lib/Geocode.php
+++ b/lib/Geocode.php
@@ -477,12 +477,13 @@ class Geocode
                 $sHousenumbers .= "(".$placeID.", ".$housenumber.")";
                 if ($i<$length) $sHousenumbers .= ", ";
             }
                 $sHousenumbers .= "(".$placeID.", ".$housenumber.")";
                 if ($i<$length) $sHousenumbers .= ", ";
             }

+

             if (CONST_Use_US_Tiger_Data) {
                 // Tiger search only if a housenumber was searched and if it was found (i.e. aPlaceIDs[placeID] = housenumber != -1) (realized through a join)
                 $sSQL .= " union";
                 $sSQL .= " SELECT ";
                 $sSQL .= "     'T' AS osm_type, ";
             if (CONST_Use_US_Tiger_Data) {
                 // Tiger search only if a housenumber was searched and if it was found (i.e. aPlaceIDs[placeID] = housenumber != -1) (realized through a join)
                 $sSQL .= " union";
                 $sSQL .= " SELECT ";
                 $sSQL .= "     'T' AS osm_type, ";

-                $sSQL .= "     place_id AS osm_id, ";
+                $sSQL .= "     (SELECT osm_id from placex p WHERE p.place_id=min(blub.parent_place_id)) as osm_id, ";

                 $sSQL .= "     'place' AS class, ";
                 $sSQL .= "     'house' AS type, ";
                 $sSQL .= "     null AS admin_level, ";
                 $sSQL .= "     'place' AS class, ";
                 $sSQL .= "     'house' AS type, ";
                 $sSQL .= "     null AS admin_level, ";

diff --git a/lib/output.php b/lib/output.php
index 58f00091707ffbce13cc85c9ad1ed3192d701726..fd6226bc503b08d9bd2f6d1c6aa742a37a8c8b83 100644 (file)
--- a/lib/output.php
+++ b/lib/output.php
@@ -9,7 +9,7 @@ function formatOSMType($sType, $bIncludeExternal = true)
 
     if (!$bIncludeExternal) return '';
 
 
     if (!$bIncludeExternal) return '';
 

-    if ($sType == 'T') return 'tiger';
+    if ($sType == 'T') return 'way';

     if ($sType == 'I') return 'way';
 
     return '';
     if ($sType == 'I') return 'way';
 
     return '';

diff --git a/tests/features/api/search.feature b/tests/features/api/search.feature
index 08b2653c7784c389679a253b0c281edb39a125ef..91050dafe21d6f045e247e241f0e53eb1244ad91 100644 (file)
--- a/tests/features/api/search.feature
+++ b/tests/features/api/search.feature
@@ -61,7 +61,7 @@ Feature: Search queries
         When sending json search query "3 West Victory Way, Craig"
         Then results contain
          | osm_type
         When sending json search query "3 West Victory Way, Craig"
         Then results contain
          | osm_type

-         | tiger
+         | way

 
     @Tiger
     Scenario: TIGER house number (road fallback)
 
     @Tiger
     Scenario: TIGER house number (road fallback)