fly/terragear
1
0
Fork 0
Code Activity

- fix airport hole contour gaps when crossing tile boundary

Browse source 
- disable FindSlivers (in genapt) - it creates more errors than it fixes
This commit is contained in:
Peter Sadrozinski 2012-11-20 21:33:17 -05:00
parent 3f072c42f8
commit 0fa30fdcab
7 changed files with 116 additions and 106 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/Airports/GenAirports850/airport.cxx
View file

@ -238,18 +238,6 @@ static std::vector<SGGeod> calc_elevations( TGAptSurface &surf, const std::vecto
return result;
}
#if 1 // unused
static point_list calc_elevations( TGAptSurface &surf, const point_list& geod_nodes, double offset )
{
point_list result = geod_nodes;
for ( unsigned int i = 0; i < result.size(); ++i ) {
double elev = surf.query( SGGeod::fromDeg( result[i].x(), result[i].y() ) );
result[i].setelev( elev + offset );
}
return result;
}
#endif
static tgContour calc_elevations( TGAptSurface &surf,
const tgContour& geod_nodes,

2
src/Airports/GenAirports850/taxiway.cxx
View file

@ -58,7 +58,7 @@ void Taxiway::GenLights(tglightcontour_list& rwy_lights)
// Spacing is 10m
// Vector calculation
SGVec3d vec = normalize(SGVec3d::fromGeod(taxi_contour.GetNode(0)));
SGVec3f vec = normalize(SGVec3f::fromGeod(taxi_contour.GetNode(0)));
tgLightContour blue;
blue.SetType( "RWY_BLUE_TAXIWAY_LIGHTS" );

5
src/BuildTiles/Main/default_priorities.txt
View file

@ -13,6 +13,10 @@ Road-Residential road
Road-Primary road
Road-Secondary road
Road-Tertiary road
Road-Service road
Road-Pedestrian road
Road-Steps road
Road-Unclassified road
Railroad road
Asphalt road
@ -22,6 +26,7 @@ DryLake lake
Reservoir lake
IntermittentLake lake
Stream stream
River stream
IntermittentStream stream
Watercourse stream
Canal stream

16
src/BuildTiles/Main/tgconstruct_output.cxx
View file

@ -135,10 +135,8 @@ void TGConstruct::WriteBtgFile( void )
int_list tri_tc, strip_tc;
for (unsigned int area = 0; area < TG_MAX_AREA_TYPES; area++) {
unsigned int area_tris;
// only tesselate non holes
if ( !is_hole_area( area ) ) {
area_tris = 0;
for (unsigned int shape = 0; shape < polys_clipped.area_size(area); shape++ ) {
for ( unsigned int segment = 0; segment < polys_clipped.shape_size(area, shape); segment++ ) {
SG_LOG( SG_CLIPPER, SG_INFO, "Ouput nodes for " << get_area_name( (AreaType)area ) << ":" <<
@ -167,21 +165,9 @@ void TGConstruct::WriteBtgFile( void )
tris_v.push_back( tri_v );
tris_n.push_back( tri_n );
tris_tc.push_back( tri_tc );
switch ( area_tris / 32768 ) {
case 0:
material = polys_clipped.get_material(area, shape, segment);
break;
default:
{
char mat_name[64];
sprintf(mat_name, "%s_%d", polys_clipped.get_material(area, shape, segment).c_str(), area_tris / 32768 );
material = mat_name;
break;
}
}
material = polys_clipped.get_material(area, shape, segment);
tri_materials.push_back( material );
area_tris++;
}
}
}

120
src/Lib/Polygon/polygon.cxx
View file

@ -33,6 +33,7 @@
#include <Geometry/trinodes.hxx>
#include "polygon.hxx"
#include "tg_unique_geod.hxx"
#ifdef _MSC_VER
# define LONG_LONG_MAX LLONG_MAX
@ -1951,6 +1952,43 @@ tgContour tgContour::AddColinearNodes( const tgContour& subject, std::vector<SGG
return result;
}
// this is the opposite of FindColinearNodes - it takes a single SGGeode,
// and tries to find the line segment the point is colinear with
bool tgContour::FindColinearLine( const tgContour& subject, const SGGeod& node, SGGeod& start, SGGeod& end )
{
SGGeod p0, p1;
SGGeod new_pt;
std::vector<SGGeod> tmp_nodes;
tmp_nodes.push_back( node );
for ( unsigned int n = 0; n < subject.GetSize()-1; n++ ) {
p0 = subject.GetNode( n );
p1 = subject.GetNode( n+1 );
// add intermediate points
bool found_extra = FindIntermediateNode( p0, p1, tmp_nodes, new_pt, SG_EPSILON*10, SG_EPSILON*4 );
if ( found_extra ) {
start = p0;
end = p1;
return true;
}
}
// check last segment
p0 = subject.GetNode( subject.GetSize() - 1 );
p1 = subject.GetNode( 0 );
// add intermediate points
bool found_extra = FindIntermediateNode( p0, p1, tmp_nodes, new_pt, SG_EPSILON*10, SG_EPSILON*4 );
if ( found_extra ) {
start = p0;
end = p1;
return true;
}
return false;
}
std::ostream& operator<< ( std::ostream& output, const tgContour& subject )
{
// Save the data
@ -2405,6 +2443,7 @@ void tgPolygon::AddToAccumulator( const tgPolygon& subject )
// Move slivers from in polygon to out polygon.
void tgPolygon::RemoveSlivers( tgPolygon& subject, tgcontour_list& slivers )
{
#if 0
// traverse each contour of the polygon and attempt to identify
// likely slivers
SG_LOG(SG_GENERAL, SG_DEBUG, "tgPolygon::RemoveSlivers()");
@ -2456,6 +2495,7 @@ void tgPolygon::RemoveSlivers( tgPolygon& subject, tgcontour_list& slivers )
}
}
}
#endif
}
void tgPolygon::MergeSlivers( tgpolygon_list& polys, tgcontour_list& sliver_list ) {
@ -2523,16 +2563,39 @@ tgPolygon tgPolygon::AddColinearNodes( const tgPolygon& subject, std::vector<SGG
return result;
}
// this is the opposite of FindColinearNodes - it takes a single SGGeode,
// and tries to find the line segment the point is colinear with
bool tgPolygon::FindColinearLine( const tgPolygon& subject, SGGeod& node, SGGeod& start, SGGeod& end )
{
bool found = false;
for ( unsigned int c = 0; c < subject.Contours() && !found; c++ ) {
found = tgContour::FindColinearLine( subject.GetContour(c), node, start, end );
}
return found;
}
SGGeod InterpolateElevation( const SGGeod& dst_node, const SGGeod& start, const SGGeod& end )
{
double total_dist = SGGeodesy::distanceM( start, end );
double inter_dist = SGGeodesy::distanceM( start, dst_node );
double delta = inter_dist/total_dist;
double dest_elevation = start.getElevationM() + (delta * ( end.getElevationM() - start.getElevationM() ));
return SGGeod::fromDegM( dst_node.getLongitudeDeg(), dst_node.getLatitudeDeg(), dest_elevation );
}
void tgPolygon::InheritElevations( const tgPolygon& source )
{
TGTriNodes nodes;
nodes.clear();
UniqueSGGeodSet src_nodes;
// build a list of points from the source and dest polygons
// build a list of points from the source polygon
for ( unsigned int i = 0; i < source.Contours(); ++i ) {
for ( unsigned int j = 0; j < source.ContourSize(i); ++j ) {
Point3D p = Point3D::fromSGGeod( source.GetNode( i, j ) );
nodes.unique_add( p );
src_nodes.add( source.GetNode( i, j ) );
}
}
@ -2540,42 +2603,16 @@ void tgPolygon::InheritElevations( const tgPolygon& source )
// elevations from the source polygon
for ( unsigned int i = 0; i < contours.size(); ++i ) {
for ( unsigned int j = 0; j < contours[i].GetSize(); ++j ) {
Point3D p = Point3D::fromSGGeod( GetNode(i,j) );
int index = nodes.find( p );
SGGeod dst_node = GetNode(i,j);
int index = src_nodes.find( dst_node );
if ( index >= 0 ) {
Point3D ref = nodes.get_node( index );
SetNode( i, j, SGGeod::fromDegM( p.x(), p.y(), ref.z() ) );
}
}
}
// now post process result to catch any nodes that weren't updated
// (because the clipping process may have added points which
// weren't in the original.)
double last = -9999.0;
for ( unsigned int i = 0; i < contours.size(); ++i ) {
// go front ways
last = -9999.0;
for ( unsigned int j = 0; j < contours[i].GetSize(); ++j ) {
Point3D p = Point3D::fromSGGeod( GetNode(i,j) );
if ( p.z() > -9000 ) {
last = p.z();
SetNode( i, j, src_nodes.get_list()[index] );
} else {
if ( last > -9000 ) {
GetContour(i).SetNode( j, SGGeod::fromDegM( p.x(), p.y(), last ) );
}
}
}
// go back ways
last = -9999.0;
for ( unsigned int j = contours[i].GetSize()-1; j > 0; --j ) {
Point3D p = Point3D::fromSGGeod( GetNode(i,j) );
if ( p.z() > -9000 ) {
last = p.z();
} else {
if ( last > -9000 ) {
GetContour(i).SetNode( j, SGGeod::fromDegM( p.x(), p.y(), last ) );
/* node not is source - we need to find the two points to interpolate from */
SGGeod start, end, result;
if ( FindColinearLine( source, dst_node, start, end ) ) {
dst_node = InterpolateElevation( dst_node, start, end );
SetNode( i, j, dst_node );
}
}
}
@ -2817,12 +2854,7 @@ static void ClipToFile( const tgPolygon& subject, std::string root,
}
if ( preserve3d ) {
SG_LOG(SG_GENERAL, SG_DEBUG, "preserve3d" );
result.InheritElevations( subject );
SG_LOG(SG_GENERAL, SG_DEBUG, "preserve3d - done" );
SG_LOG(SG_GENERAL, SG_DEBUG, subject );
SG_LOG(SG_GENERAL, SG_DEBUG, result );
}
tgTexParams tp = subject.GetTexParams();

2
src/Lib/Polygon/polygon.hxx
View file

@ -380,6 +380,7 @@ public:
static tgContour AddColinearNodes( const tgContour& subject, TGTriNodes nodes );
static tgContour AddColinearNodes( const tgContour& subject, std::vector<SGGeod>& nodes );
static bool FindColinearLine( const tgContour& subject, const SGGeod& node, SGGeod& start, SGGeod& end );
// conversions
static ClipperLib::Polygon ToClipper( const tgContour& subject );
@ -624,6 +625,7 @@ public:
static tgPolygon AddColinearNodes( const tgPolygon& subject, TGTriNodes& nodes );
static tgPolygon AddColinearNodes( const tgPolygon& subject, std::vector<SGGeod>& nodes );
static bool FindColinearLine( const tgPolygon& subject, SGGeod& node, SGGeod& start, SGGeod& end );
static void RemoveSlivers( tgPolygon& subject, tgcontour_list& slivers );
static void MergeSlivers( tgpolygon_list& subjects, tgcontour_list& slivers );

65
src/Lib/Polygon/tg_unique_geod.hxx
View file

@ -86,43 +86,40 @@ class UniqueSGGeodSet {
public:
UniqueSGGeodSet() {}
unsigned int add( const SGGeod& g );
int find( const SGGeod& g ) const;
unsigned int add( const SGGeod& g ) {
unique_geod_set_iterator it;
SGGeodIndex lookup( g );
it = index_list.find( lookup );
if ( it == index_list.end() ) {
lookup.SetOrderedIndex( geod_list.size() );
index_list.insert( lookup );
geod_list.push_back(g);
} else {
lookup = *it;
}
return lookup.GetOrderedIndex();
}
int find( const SGGeod& g ) const {
unique_geod_set_iterator it;
SGGeodIndex lookup( g );
int index = -1;
it = index_list.find( lookup );
if ( it != index_list.end() ) {
index = it->GetOrderedIndex();
}
return index;
}
std::vector<SGGeod>& get_list( void ) { return geod_list; }
void get_node_list();
private:
unique_geod_set index_list;
std::vector<SGGeod> geod_list;
};
unsigned int UniqueSGGeodSet::add( const SGGeod& g ) {
unique_geod_set_iterator it;
SGGeodIndex lookup( g );
it = index_list.find( lookup );
if ( it == index_list.end() ) {
lookup.SetOrderedIndex( geod_list.size() );
index_list.insert( lookup );
geod_list.push_back(g);
} else {
lookup = *it;
}
return lookup.GetOrderedIndex();
}
int UniqueSGGeodSet::find( const SGGeod& g ) const {
unique_geod_set_iterator it;
SGGeodIndex lookup( g );
int index = -1;
it = index_list.find( lookup );
if ( it != index_list.end() ) {
index = it->GetOrderedIndex();
}
return index;
}
};