Trygve/contour-creator
1
0
Fork 0
mirror of https://gitlab.com/Trygve/contour-creator.git synced 2024-11-21 23:00:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changed file wrriting to use list of points

Browse Source
This commit is contained in:
Trygve 2024-04-30 15:11:44 +02:00
parent 228945a767
commit b800ceaf98
1 changed files with 42 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/main.cpp
View File

@ -123,7 +123,7 @@ constexpr std::tuple<double, double, double, double> marching_squares_lookup(int
case 14: return {0, 0.5, 0.5, 0}; case 14: return {0, 0.5, 0.5, 0};
}; };
} }
void write_output_file(std::vector<CellMap> cellmaps, const char *filepath) void write_output_file(std::vector<std::vector<Point>> all_points, const char *filepath, HeightMap* heightmap)
{ {
const char *pszDriverName = "GeoJSON"; const char *pszDriverName = "GeoJSON";
@ -149,7 +149,7 @@ void write_output_file(std::vector<CellMap> cellmaps, const char *filepath)
OGRLayer *poLayer; OGRLayer *poLayer;
poLayer = poDS->CreateLayer( "contours", &(cellmaps[0]).reference_system, wkbLineString, NULL ); poLayer = poDS->CreateLayer( "contours", /*&(cellmaps[0]).reference_system*/ NULL, wkbLineString, NULL );
if( poLayer == NULL ) if( poLayer == NULL )
{ {
printf( "Layer creation failed.\n" ); printf( "Layer creation failed.\n" );
@ -165,27 +165,39 @@ void write_output_file(std::vector<CellMap> cellmaps, const char *filepath)
printf( "Creating Name field failed.\n" ); printf( "Creating Name field failed.\n" );
exit( 1 ); exit( 1 );
} }
for (int j = 0; j < cellmaps.size(); j++) int width = heightmap->width -1;
{ int height = heightmap->height -1;
CellMap* cellmap = &cellmaps[j]; int size = width * height;
for (int i = 0; i < cellmap->height*cellmap->width; i++) for (int j = 0; j < all_points.size(); j++)
{
if (*(cellmap->cells + i) != 0 && *(cellmap->cells + i) != 15)
{ {
OGRFeature *feature; OGRFeature *feature;
OGRLineString *geometry = new OGRLineString(); OGRLineString *geometry = new OGRLineString();
feature = OGRFeature::CreateFeature( poLayer->GetLayerDefn() ); feature = OGRFeature::CreateFeature( poLayer->GetLayerDefn() );
feature->SetField( "Name", j ); feature->SetField( "Name", j );
int x_raw = i%cellmap->width;
int y_raw = i/cellmap->width;
auto [x, y] = local_to_projected(cellmap->geotransform, x_raw, y_raw);
auto [x_bl, y_bl, x_tr, y_tr] = marching_squares_lookup(*(cellmap->cells + i) );
//std::cout << x << ", " << y << " ";
geometry->setPoint( geometry->getNumPoints(), x+x_tr*0.25, y+y_tr*0.25 );
geometry->setPoint( geometry->getNumPoints(), x+x_bl*0.25, y+y_bl*0.25 );
std::vector<Point> points = all_points[j];
for (int i = 0; i < points.size(); i++)
{
//int x_raw = i%width;
//int y_raw = i/height;
int x_raw = points[i].x;
int y_raw = points[i].y;
auto [x, y] = local_to_projected(heightmap->geotransform, x_raw, y_raw);
//auto [x_bl, y_bl, x_tr, y_tr] = marching_squares_lookup(*(cellmap->cells + i) );
//std::cout << x << ", " << y << " ";
//geometry->setPoint( geometry->getNumPoints(), x+x_tr*0.25, y+y_tr*0.25 );
//geometry->setPoint( geometry->getNumPoints(), x+x_bl*0.25, y+y_bl*0.25 );
geometry->setPoint(geometry->getNumPoints(),x ,y );
}
if ( feature->SetGeometry(geometry) != OGRERR_NONE) if ( feature->SetGeometry(geometry) != OGRERR_NONE)
{ {
printf( "Failed to set geometry.\n" ); printf( "Failed to set geometry.\n" );
@ -198,9 +210,6 @@ void write_output_file(std::vector<CellMap> cellmaps, const char *filepath)
exit( 1 ); exit( 1 );
} }
OGRFeature::DestroyFeature( feature ); OGRFeature::DestroyFeature( feature );
}
}
} }
@ -221,5 +230,5 @@ int main(int argc, const char* argv[])
auto cellmap = produce_cellmap(&map, 40); auto cellmap = produce_cellmap(&map, 40);
auto cellmaps = vector_cellmap(&map, 5); auto cellmaps = vector_cellmap(&map, 5);
write_output_file(cellmaps, "out.geojson"); write_output_file(cellmaps, "out.geojson", &map);
} }