]> git.openstreetmap.org Git - nominatim.git/commitdiff
support for partial matching of US ZIP+4 codes
authorSarah Hoffmann <lonvia@denofr.de>
Wed, 19 Jun 2013 20:58:46 +0000 (22:58 +0200)
committerSarah Hoffmann <lonvia@denofr.de>
Wed, 19 Jun 2013 20:58:46 +0000 (22:58 +0200)
website/search.php

index 92cad8a034c93fcce84c2fe66b3fdbabf8031ad3..18fcbafcc370657d86e499816df147750ae37967 100755 (executable)
                                                        $aValidTokens[$sToken] = $aGBPostcodeLocation;
                                                }
                                        }
+                                       // US ZIP+4 codes - if there is no token,
+                                       //      merge in the 5-digit ZIP code
+                                       else if (!isset($aValidTokens[$sToken]) && preg_match('/^([0-9]{5}) [0-9]{4}$/', $sToken, $aData))
+                                       {
+                                               if (isset($aValidTokens[$aData[1]]))
+                                               {
+                                                       foreach($aValidTokens[$aData[1]] as $aToken)
+                                                       {
+                                                               if (!$aToken['class'])
+                                                               {
+                                                                       if (isset($aValidTokens[$sToken]))
+                                                                       {
+                                                                               $aValidTokens[$sToken][] = $aToken;
+                                                                       }
+                                                                       else
+                                                                       {
+                                                                               $aValidTokens[$sToken] = array($aToken);
+                                                                       }
+                                                               }
+                                                       }
+                                               }
+                                       }
                                }
 
                                foreach($aTokens as $sToken)