Return normalized name for toponyms

jjrom · May 3, 2016 · a015e96 · a015e96
1 parent eb67bdd
commit a015e96
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/include/iTag/Taggers/Tagger_Toponyms.php b/include/iTag/Taggers/Tagger_Toponyms.php
@@ -65,12 +65,13 @@ private function process($footprint, $options) {
         $codes = "('PPL', 'PPLC', 'PPLA', 'PPLA2', 'PPLA3', 'PPLA4', 'STLMT')";
 
         $prequery = 'WITH prequery AS (SELECT ' . $this->postgisGeomFromText($footprint) . ' AS corrected_geometry, ST_centroid(' . $this->postgisGeomFromText($footprint) . ') AS corrected_centroid)';
-        $query = $prequery . ' SELECT geonameid, name, country, countryname, longitude, latitude, fcode, population, ST_Distance(geom, corrected_centroid) as distance FROM prequery, gazetteer.geoname WHERE st_intersects(geom, corrected_geometry) AND fcode IN ' . $codes . ' ORDER BY distance ASC';
+        $query = $prequery . ' SELECT geonameid, name, normalize(name) as normalized, country, countryname, longitude, latitude, fcode, population, ST_Distance(geom, corrected_centroid) as distance FROM prequery, gazetteer.geoname WHERE st_intersects(geom, corrected_geometry) AND fcode IN ' . $codes . ' ORDER BY distance ASC';
         $results = $this->query($query);
         while ($result = pg_fetch_assoc($results)) {
             $toponyms[] = array(
                 'id' => (integer) $result['geonameid'],
                 'name' => $result['name'],
+                'normalized' => $result['normalized'],
                 'country' => $result['countryname'],
                 'ccode' => $result['country'],
                 'geo:lon' => (float) $result['longitude'],