Merge branch 'main' into HEAD

src/main.cpp

@@ -36,6 +36,8 @@ std::vector<Point> produce_cellmap(HeightMap* heightmap, float z)
 
 }
 
+
+
 std::vector<std::vector<Point>> vector_cellmap(HeightMap* heightmap, int interval)
 {
     int num_contours = (heightmap->max - heightmap->min)/interval;
@@ -48,9 +50,44 @@ std::vector<std::vector<Point>> vector_cellmap(HeightMap* heightmap, int interva
         #pragma omp for
         for (int i = 1; i <= num_contours; i++) 
         {
-            vec_private.push_back(produce_cellmap(heightmap, heightmap->min + interval*i));
+            auto points = produce_cellmap(heightmap, heightmap->min + interval*i) ;
+            std::vector<Point> line;
+            line.push_back(points.back());
+            points.pop_back();
+
+            while (points.size() != 0){
+                Point current_point = points.back();
+                for (int j=0; j < points.size(); j++){
+                    Point next = points[j];
+                    if (&next != &points.back()) {
+                        if (next.x +1 == current_point.x) {
+                            line.push_back(next);
+                            points.erase(points.begin()+j);
+                        }
+                        else if (next.x -1 == current_point.x) {
+                            line.push_back(next);
+                            points.erase(points.begin()+j);
+                        }
+                        else if (next.y +1 == current_point.y) {
+                            line.push_back(next);
+                            points.erase(points.begin()+j);
+                        }
+                        else if (next.y -1 == current_point.y) {
+                            line.push_back(next);
+                            points.erase(points.begin()+j);
+                        }
+                        else {
+                            vec_private.push_back(line);
+                            std::vector<Point> line;
+                            line.push_back(points.back());
+                            points.pop_back();
+                        }
+                    }
+                }
+            }
         }
         #pragma omp critical
+
         vector_contours.insert(vector_contours.end(), vec_private.begin(), vec_private.end());
 
     }
@@ -86,7 +123,7 @@ constexpr std::tuple<double, double, double, double> marching_squares_lookup(int
         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";
@@ -112,7 +149,7 @@ void write_output_file(std::vector<CellMap> cellmaps, const char *filepath)
 
     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 )
     {
         printf( "Layer creation failed.\n" );
@@ -128,42 +165,51 @@ void write_output_file(std::vector<CellMap> cellmaps, const char *filepath)
         printf( "Creating Name field failed.\n" );
         exit( 1 );
     }
-    for (int j = 0; j < cellmaps.size(); j++)
+    int width = heightmap->width -1;
+    int height = heightmap->height -1;
+    int size = width * height;
+
+    for (int j = 0; j < all_points.size(); j++)
     {
-        CellMap* cellmap = &cellmaps[j];
+            OGRFeature *feature;
+            OGRLineString *geometry = new OGRLineString();
+            feature = OGRFeature::CreateFeature( poLayer->GetLayerDefn() );
+            feature->SetField( "Name", j );
 
-        for (int i = 0; i < cellmap->height*cellmap->width; i++) 
+
+        std::vector<Point> points = all_points[j];
+
+        for (int i = 0; i < points.size(); i++) 
         {
-            if (*(cellmap->cells + i) != 0 && *(cellmap->cells + i) != 15)
-            {
-                OGRFeature *feature;
-                OGRLineString *geometry = new OGRLineString();
-                feature = OGRFeature::CreateFeature( poLayer->GetLayerDefn() );
-                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 ); 
-                
 
-                if ( feature->SetGeometry(geometry) != OGRERR_NONE)
+            //int x_raw = i%width;
-                {
+            //int y_raw = i/height;
-                    printf( "Failed to set geometry.\n" );
+            int x_raw = points[i].x;
-                    exit( 1 );
+            int y_raw = points[i].y;
-                }
+            auto [x, y] = local_to_projected(heightmap->geotransform, x_raw, y_raw);
-                OGRGeometryFactory::destroyGeometry(geometry);
+            //auto [x_bl, y_bl, x_tr, y_tr] = marching_squares_lookup(*(cellmap->cells + i) );
-                if( poLayer->CreateFeature( feature ) != OGRERR_NONE )
+            //std::cout << x << ", " << y << "  ";
-                {
+            //geometry->setPoint( geometry->getNumPoints(), x+x_tr*0.25, y+y_tr*0.25 ); 
-                    printf( "Failed to create feature in shapefile.\n" );
+            //geometry->setPoint( geometry->getNumPoints(), x+x_bl*0.25, y+y_bl*0.25 ); 
-                    exit( 1 );
+            geometry->setPoint(geometry->getNumPoints(),x ,y );
-                }
+
-                OGRFeature::DestroyFeature( feature );  
+
-                    }
+                
             
         }
+
+                    if ( feature->SetGeometry(geometry) != OGRERR_NONE)
+            {
+                printf( "Failed to set geometry.\n" );
+                exit( 1 );
+            }
+            OGRGeometryFactory::destroyGeometry(geometry);
+            if( poLayer->CreateFeature( feature ) != OGRERR_NONE )
+            {
+                printf( "Failed to create feature in shapefile.\n" );
+                exit( 1 );
+            }
+            OGRFeature::DestroyFeature( feature );  
         
 
     }
@@ -184,5 +230,5 @@ int main(int argc, const char* argv[])
     auto cellmap = produce_cellmap(&map, 40);
     
     auto cellmaps = vector_cellmap(&map, 5);
-    //write_output_file(cellmaps, "out.geojson");
+    write_output_file(cellmaps, "out.geojson", &map);
 }