remove dead code

diff --git a/website/hierarchy.php b/website/hierarchy.php
index 6a281aa871dc01415130c69d87545536aafeb1de..9b9d778cebd3de3f62519adab5a3aea45d956860 100755 (executable)
--- a/website/hierarchy.php
+++ b/website/hierarchy.php
@@ -149,74 +149,3 @@
                        }
                        echo '</div>';
                }
-exit;
-
-
-       $hLog = logStart($oDB, 'details', $_SERVER['QUERY_STRING'], $aLangPrefOrder);
-
-       // Make sure the point we are reporting on is fully indexed
-       //$sSQL = "UPDATE placex set indexed = true where indexed = false and place_id = $iPlaceID";
-       //$oDB->query($sSQL);
-
-       // Get the details for this point
-       $sSQL = "select place_id, osm_type, osm_id, class, type, name, admin_level, housenumber, street, isin, postcode, calculated_country_code as country_code, importance, wikipedia,";
-       $sSQL .= " to_char(indexed_date, 'YYYY-MM-DD HH24:MI') as indexed_date, parent_place_id, rank_address, rank_search, get_searchrank_label(rank_search) as rank_search_label, get_name_by_language(name,$sLanguagePrefArraySQL) as localname, ";
-       $sSQL .= " ST_GeometryType(geometry) in ('ST_Polygon','ST_MultiPolygon') as isarea, ";
-       //$sSQL .= " ST_Area(geometry::geography) as area, ";
-       $sSQL .= " ST_y(centroid) as lat, ST_x(centroid) as lon,";
-       $sSQL .= " case when importance = 0 OR importance IS NULL then 0.75-(rank_search::float/40) else importance end as calculated_importance, ";
-       $sSQL .= " ST_AsText(CASE WHEN ST_NPoints(geometry) > 5000 THEN ST_SimplifyPreserveTopology(geometry, 0.0001) ELSE geometry END) as outlinestring";
-       $sSQL .= " from placex where place_id = $iPlaceID";
-       $aPointDetails = $oDB->getRow($sSQL);
-       if (PEAR::IsError($aPointDetails))
-       {
-               failInternalError("Could not get details of place object.", $sSQL, $aPointDetails);
-       }
-       $aPointDetails['localname'] = $aPointDetails['localname']?$aPointDetails['localname']:$aPointDetails['housenumber'];
-
-       $aClassType = getClassTypesWithImportance();
-       $aPointDetails['icon'] = $aClassType[$aPointDetails['class'].':'.$aPointDetails['type']]['icon'];
-
-       // Get all alternative names (languages, etc)
-       $sSQL = "select (each(name)).key,(each(name)).value from placex where place_id = $iPlaceID order by (each(name)).key";
-       $aPointDetails['aNames'] = $oDB->getAssoc($sSQL);
-
-       // Extra tags
-       $sSQL = "select (each(extratags)).key,(each(extratags)).value from placex where place_id = $iPlaceID order by (each(extratags)).key";
-       $aPointDetails['aExtraTags'] = $oDB->getAssoc($sSQL);
-
-       // Address
-       $aAddressLines = getAddressDetails($oDB, $sLanguagePrefArraySQL, $iPlaceID, $aPointDetails['country_code'], true);
-
-       // Linked places
-       $sSQL = "select placex.place_id, osm_type, osm_id, class, type, housenumber, admin_level, rank_address, ST_GeometryType(geometry) in ('ST_Polygon','ST_MultiPolygon') as isarea, st_distance(geometry, placegeometry) as distance, ";
-       $sSQL .= " get_name_by_language(name,$sLanguagePrefArraySQL) as localname, length(name::text) as namelength ";
-       $sSQL .= " from placex, (select geometry as placegeometry from placex where place_id = $iPlaceID) as x";
-       $sSQL .= " where linked_place_id = $iPlaceID";
-       $sSQL .= " order by rank_address asc,rank_search asc,get_name_by_language(name,$sLanguagePrefArraySQL),housenumber";
-       $aLinkedLines = $oDB->getAll($sSQL);
-
-       // All places this is an imediate parent of
-       $sSQL = "select obj.place_id, osm_type, osm_id, class, type, housenumber, admin_level, rank_address, ST_GeometryType(geometry) in ('ST_Polygon','ST_MultiPolygon') as isarea, st_distance(geometry, placegeometry) as distance, ";
-       $sSQL .= " get_name_by_language(name,$sLanguagePrefArraySQL) as localname, length(name::text) as namelength ";
-       $sSQL .= " from (select placex.place_id, osm_type, osm_id, class, type, housenumber, admin_level, rank_address, rank_search, geometry, name from placex ";
-       $sSQL .= " where parent_place_id = $iPlaceID order by rank_address asc,rank_search asc limit 500) as obj,";
-       $sSQL .= " (select geometry as placegeometry from placex where place_id = $iPlaceID) as x";
-       $sSQL .= " order by rank_address asc,rank_search asc,localname,housenumber";
-       $aParentOfLines = $oDB->getAll($sSQL);
-
-       $aPlaceSearchNameKeywords = false;
-       $aPlaceSearchAddressKeywords = false;
-       if (isset($_GET['keywords']) && $_GET['keywords'])
-       {
-               $sSQL = "select * from search_name where place_id = $iPlaceID";
-               $aPlaceSearchName = $oDB->getRow($sSQL);
-               $sSQL = "select * from word where word_id in (".substr($aPlaceSearchName['name_vector'],1,-1).")";
-               $aPlaceSearchNameKeywords = $oDB->getAll($sSQL);
-               $sSQL = "select * from word where word_id in (".substr($aPlaceSearchName['nameaddress_vector'],1,-1).")";
-               $aPlaceSearchAddressKeywords = $oDB->getAll($sSQL);
-       }
-
-       logEnd($oDB, $hLog, 1);
-
-       include(CONST_BasePath.'/lib/template/details-'.$sOutputFormat.'.php');