adapt Tiger reverse test to new output format

[nominatim.git] / lib / ReverseGeocode.php

diff --git a/lib/ReverseGeocode.php b/lib/ReverseGeocode.php
index 4eeb5cc4851e4d647614597a03660cd64de09966..d2902a59485a68a4f5d84afc2329ed30562d4d58 100644 (file)
--- a/lib/ReverseGeocode.php
+++ b/lib/ReverseGeocode.php
@@ -203,6 +203,7 @@
                                                        $iPlaceID = $aPlaceLine['place_id'];
                                                        $iParentPlaceID = $aPlaceLine['parent_place_id']; // the street
                                                        $fFraction = $aPlaceLine['fraction'];
                                                        $iPlaceID = $aPlaceLine['place_id'];
                                                        $iParentPlaceID = $aPlaceLine['parent_place_id']; // the street
                                                        $fFraction = $aPlaceLine['fraction'];

+                                                       $iMaxRank = 30;

                                                }
                                                // else: nothing to do, take placex house from above
                                        }
                                                }
                                                // else: nothing to do, take placex house from above
                                        }


@@ -213,6 +214,7 @@
                                                $iPlaceID = $aPlaceLine['place_id'];
                                                $iParentPlaceID = $aPlaceLine['parent_place_id']; // the street
                                                $fFraction = $aPlaceLine['fraction'];
                                                $iPlaceID = $aPlaceLine['place_id'];
                                                $iParentPlaceID = $aPlaceLine['parent_place_id']; // the street
                                                $fFraction = $aPlaceLine['fraction'];

+                                               $iMaxRank = 30;

                                        }
                                }
                        }
                                        }
                                }
                        }


@@ -249,6 +251,7 @@
                                        $iPlaceID = $aPlaceTiger['place_id'];
                                        $iParentPlaceID = $aPlaceTiger['parent_place_id']; // the street
                                        $fFraction = $aPlaceTiger['fraction'];
                                        $iPlaceID = $aPlaceTiger['place_id'];
                                        $iParentPlaceID = $aPlaceTiger['parent_place_id']; // the street
                                        $fFraction = $aPlaceTiger['fraction'];

+                                       $iMaxRank = 30;

                                }
                        }
 
                                }
                        }
 


@@ -272,7 +275,7 @@
                                }
                        }
                        return array('place_id' => $iPlaceID,
                                }
                        }
                        return array('place_id' => $iPlaceID,

-                                               'type' => $bPlaceIsTiger ? 'tiger' : $bPlaceIsLine ? 'interpolation' : 'osm',
+                                               'type' => $bPlaceIsTiger ? 'tiger' : ($bPlaceIsLine ? 'interpolation' : 'osm'),

                                                'fraction' => ($bPlaceIsTiger || $bPlaceIsLine) ? $fFraction : -1);
                }
                
                                                'fraction' => ($bPlaceIsTiger || $bPlaceIsLine) ? $fFraction : -1);
                }