finalized project

Author: ProbstenHias

src/backend/helpers/fmiFormat.go

@@ -85,6 +85,7 @@ func CreateFileFromGraph(graph datastructures.Graph, pathToFile string) {
 	if err != nil {
 		log.Fatalf("Got error while flushing a filewriter. Err: %s", err.Error())
 	}
+	log.Printf("Writing graph.fmi file to %s\n", pathToFile)
 }
 
 func createNodesFromFile(nodeCount int, graph datastructures.Graph, idToIdx map[int]int, fileScanner *bufio.Scanner) {

src/main.go

@@ -2,19 +2,22 @@ package main
 
 import (
 	"OSM/src/backend/helpers"
-	pre2 "OSM/src/backend/pre"
+	"OSM/src/backend/pre"
+	"log"
 	"os"
+	"path"
 )
 
-const N = 1e6
+const N = 1e3
 
 func main() {
-	path := os.Getenv("PBF")
-
-	wayNodes := pre2.GenerateCoastlines(path)
-	points := pre2.GenerateSpherePoints(N)
-	classification := pre2.TopLevel(wayNodes, points)
-	graph := pre2.GenerateGraphFromPoints(N, points, classification)
-	helpers.CreateFileFromGraph(graph, "./out/graph.fmi")
-
+	pathToPBF := os.Args[1]
+	pathToFmi := path.Dir(pathToPBF)
+	pathToFmi = pathToFmi + "/graph.fmi"
+	log.Println(pathToFmi)
+	wayNodes := pre.GenerateCoastlines(pathToPBF)
+	points := pre.GenerateSpherePoints(N)
+	classification := pre.TopLevel(wayNodes, points)
+	graph := pre.GenerateGraphFromPoints(N, points, classification)
+	helpers.CreateFileFromGraph(graph, pathToFmi)
 }

src/mainWeb.go

@@ -0,0 +1,12 @@
+package main
+
+import (
+	"OSM/src/web"
+	"os"
+)
+
+func main() {
+	pathToFmi := os.Args[1]
+	port := os.Args[2]
+	web.Main(pathToFmi, port)
+}

src/web/server.go

@@ -4,22 +4,23 @@ import (
 	"OSM/src/backend/datastructures"
 	helpers2 "OSM/src/backend/helpers"
 	"OSM/src/backend/shortestPath"
+	"fmt"
 	"log"
 	"math"
 	"net/http"
 	"strconv"
 )
 
-func Main(pathToFmiFile string) {
+func Main(pathToFmiFile string, port string) {
 	graph := helpers2.CreateGraphFromFile(pathToFmiFile)
 
 	fileServer := http.FileServer(http.Dir("web/static"))
 	http.Handle("/", fileServer)
 	http.HandleFunc("/route", routeHandler(graph))
 	http.HandleFunc("/point", pointHandler(graph))
 
-	log.Printf("Starting server at port 8080\n")
-	if err := http.ListenAndServe(":8080", nil); err != nil {
+	log.Printf("Starting server at port %s\n", port)
+	if err := http.ListenAndServe(fmt.Sprintf(":%s", port), nil); err != nil {
 		log.Fatal(err)
 	}
 }