From 0cbbe80488769adc7734ae0d1811c34aa55a84dc Mon Sep 17 00:00:00 2001 From: curt Date: Wed, 19 Mar 2003 22:52:04 +0000 Subject: [PATCH] Changes to track libArray api tweaks. --- src/Airports/GenAirports/apt_surface.cxx | 4 ++-- src/BuildTiles/Main/main.cxx | 4 ++-- src/Prep/Photo/photo.cxx | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Airports/GenAirports/apt_surface.cxx b/src/Airports/GenAirports/apt_surface.cxx index 6ed56840..ad3246fd 100644 --- a/src/Airports/GenAirports/apt_surface.cxx +++ b/src/Airports/GenAirports/apt_surface.cxx @@ -106,8 +106,8 @@ static void calc_elevations( const string &root, Matrix_Point3Df &Pts ) { Point3Df p = Pts(i,j); if ( p.z() < -9000.0 ) { done = false; - elev = array.interpolate_altitude( p.x() * 3600.0, - p.y() * 3600.0 ); + elev = array.altitude_from_grid( p.x() * 3600.0, + p.y() * 3600.0 ); if ( elev > -9000 ) { p.z() = elev; Pts(i,j) = p; diff --git a/src/BuildTiles/Main/main.cxx b/src/BuildTiles/Main/main.cxx index eec33d34..08663710 100644 --- a/src/BuildTiles/Main/main.cxx +++ b/src/BuildTiles/Main/main.cxx @@ -505,8 +505,8 @@ static void fix_point_heights( TGConstruct& c, const TGArray& array ) cout << " forced = " << z << endl; } else { // interpolate point from DEM data. - z = array.interpolate_altitude( raw_nodes[i].x() * 3600.0, - raw_nodes[i].y() * 3600.0 ); + z = array.altitude_from_grid( raw_nodes[i].x() * 3600.0, + raw_nodes[i].y() * 3600.0 ); cout << " interpolated = " << z << endl; } raw_nodes[i].setz( z ); diff --git a/src/Prep/Photo/photo.cxx b/src/Prep/Photo/photo.cxx index 5e55ff60..93d43caa 100644 --- a/src/Prep/Photo/photo.cxx +++ b/src/Prep/Photo/photo.cxx @@ -99,8 +99,8 @@ point_list calc_elevations( const string& root, const point_list& geod_nodes ) { if ( result[j].z() < -9000 ) { done = false; cout << "interpolating for " << result[j] << endl; - elev = array.interpolate_altitude( result[j].x() * 3600.0, - result[j].y() * 3600.0 ); + elev = array.altitude_from_grid( result[j].x() * 3600.0, + result[j].y() * 3600.0 ); if ( elev > -9000 ) { result[j].setz( elev ); }