restructured project

Author: ProbstenHias

src/datastructures/graph.go renamed to src/backend/datastructures/graph.go

@@ -1,7 +1,7 @@
 package helpers
 
 import (
-	"OSM/src/datastructures"
+	"OSM/src/backend/datastructures"
 	"log"
 	"math"
 	"time"

src/datastructures/priorityQueue.go renamed to src/backend/datastructures/priorityQueue.go

@@ -1,6 +1,8 @@
 package helpers
 
-import "OSM/src/datastructures"
+import (
+	"OSM/src/backend/datastructures"
+)
 
 func CreatePathFromPrev(start, end int32, prev []int32, graph datastructures.Graph) [][]float64 {
 	var path [][]float64

src/datastructures/priorityQueue_test.go renamed to src/backend/datastructures/priorityQueue_test.go

@@ -1,7 +1,7 @@
 package helpers
 
 import (
-	"OSM/src/datastructures"
+	"OSM/src/backend/datastructures"
 	"bufio"
 	"fmt"
 	"log"

src/helpers/closestNode.go renamed to src/backend/helpers/closestNode.go

@@ -1,14 +1,14 @@
 package helpers
 
 import (
-	"OSM/src/datastructures"
+	"OSM/src/backend/datastructures"
 	"fmt"
 	geojson "github.com/paulmach/go.geojson"
 	"log"
 	"os"
 )
 
-func NodesToLineString(nodes [][]float64, popupContent int32) []byte {
+func NodesToLineStringGeoJson(nodes [][]float64, popupContent int32) []byte {
 	lineNodes := make([][]float64, len(nodes))
 	for i, elem := range nodes {
 		lineNodes[i] = []float64{elem[1], elem[0]}
@@ -22,7 +22,7 @@ func NodesToLineString(nodes [][]float64, popupContent int32) []byte {
 	return rawJson
 }
 
-func NodeToPoint(node []float64, index int32) []byte {
+func NodeToPointGeoJson(node []float64, index int32) []byte {
 	fc := geojson.NewFeatureCollection()
 	feature := geojson.NewPointFeature([]float64{node[1], node[0]})
 	popupContent := fmt.Sprintf("Lat: %f\nLong: %f\nIndex: %d", node[0], node[1], index)
@@ -33,7 +33,7 @@ func NodeToPoint(node []float64, index int32) []byte {
 	return rawJson
 }
 
-func NodesToPoints(nodes [][]float64) []byte {
+func NodesToPointsGeoJson(nodes [][]float64) []byte {
 	fc := geojson.NewFeatureCollection()
 	for _, node := range nodes {
 		feature := geojson.NewPointFeature([]float64{node[1], node[0]})

src/helpers/createPath.go renamed to src/backend/helpers/createPath.go

@@ -1,4 +1,4 @@
-package coastlines
+package pre
 
 import (
 	"io"
@@ -7,7 +7,6 @@ import (
 	"runtime"
 	"time"
 
-	geojson "github.com/paulmach/go.geojson"
 	"github.com/qedus/osmpbf"
 )
 
@@ -31,7 +30,6 @@ func readPBF(path string) (map[int64][]float64, map[int64][]int64) {
 	}
 	nodes := make(map[int64][]float64)
 	ways := make(map[int64][]int64)
-	//var happenings int64 = 0
 	for {
 		if v, err := d.Decode(); err == io.EOF {
 			break
@@ -66,21 +64,6 @@ func readPBF(path string) (map[int64][]float64, map[int64][]int64) {
 	return nodes, ways
 }
 
-func CreateGeojson(nodes map[int64][]float64, ways map[int64][]int64) []byte {
-	fc := geojson.NewFeatureCollection()
-	for _, val := range ways {
-		var lineNodes [][]float64
-		for _, nodeId := range val {
-			lineNodes = append(lineNodes, []float64{nodes[nodeId][1], nodes[nodeId][0]})
-		}
-		feature := geojson.NewLineStringFeature(lineNodes)
-		feature.SetProperty("", 0)
-		fc.AddFeature(feature)
-	}
-	rawJson, _ := fc.MarshalJSON()
-	return rawJson
-}
-
 // merges ways where the end node of the way is the starting node of another way
 func mergeWays(ways map[int64][]int64) {
 	toDelete := make(map[int64]bool)
@@ -113,14 +96,6 @@ func mergeWays(ways map[int64][]int64) {
 func GenerateCoastlines(path string) [][][]float64 {
 	log.Printf("Starting to read pbf file.\n")
 	nodes, ways := readPBF(path)
-	//fmt.Printf("Ways before merging: %d\n", len(ways))
-	//mergeWays(ways)
-	//fmt.Printf("Ways after merging: %d\n", len(ways))
-	//mergeWays(ways)
-	//fmt.Printf("Ways after merging twice: %d\n", len(ways))
-	//mergeWays(ways)
-	//fmt.Printf("Ways after merging thrice %d\n", len(ways))
-
 	oldLength := len(ways)
 
 	startTimeMerge := time.Now()

src/helpers/distance.go renamed to src/backend/helpers/distance.go

@@ -1,14 +1,12 @@
-package spherePoints
+package pre
 
 import (
-	"OSM/src/datastructures"
-	"OSM/src/helpers"
+	"OSM/src/backend/datastructures"
+	"OSM/src/backend/helpers"
 	"log"
 	"math"
 	"sort"
 	"time"
-
-	geojson "github.com/paulmach/go.geojson"
 )
 
 const LowerBound = -80 // from -90 (South Pole) until around -80 Latitute, Antartica land so no points needed to be created

src/helpers/fmiFormat.go renamed to src/backend/helpers/fmiFormat.go

@@ -1,4 +1,4 @@
-package piptest
+package pre
 
 import (
 	"fmt"
@@ -238,7 +238,7 @@ func progressBar(counter int, max_len int) string { //Progress bar to show the p
 	return bar
 }
 
-// method to call when we want to do this
+// TopLevel method to call when we want to do this
 func TopLevel(wayNodes [][][]float64, spherePointsArr [][]float64) []bool {
 	start11 := time.Now()
 	boundBoxes := createBoundingBoxes(wayNodes)

src/helpers/geoJson.go renamed to src/backend/helpers/geoJson.go

@@ -1,7 +1,6 @@
-package piptest
+package pre
 
 import (
-	"OSM/src/coastlines"
 	"testing"
 )
 
@@ -18,7 +17,7 @@ func TestTopLevel(t *testing.T) {
 	}
 	var correctClassification = []bool{false, true, true, false, false, true, false, false}
 
-	wayNodes := coastlines.GenerateCoastlines("E:/Classes Infotech/4th Semster/Fachpraktika/Code/data/planet-coastlines.pbf")
+	wayNodes := GenerateCoastlines("E:/Classes Infotech/4th Semster/Fachpraktika/Code/data/planet-coastlines.pbf")
 	results := TopLevel(wayNodes, coordinates)
 
 	for i, elem := range results {

src/coastlines/coastlines.go renamed to src/backend/pre/coastlines.go

@@ -1,29 +1,29 @@
 package shortestPath
 
 import (
-	"OSM/src/datastructures"
+	datastructures2 "OSM/src/backend/datastructures"
 	"container/heap"
 	"log"
 	"math"
 	"time"
 )
 
-func Dijkstra(start int32, end int32, graph datastructures.Graph) (int32, []int32) {
+func Dijkstra(start int32, end int32, graph datastructures2.Graph) (int32, []int32) {
 	startTime := time.Now()
 	dist := make([]int32, len(graph.Nodes))
 	for i := 0; i < len(dist); i++ {
 		dist[i] = math.MaxInt32
 	}
 	prev := make([]int32, len(graph.Nodes))
-	pq := make(datastructures.PriorityQueue, 0)
+	pq := make(datastructures2.PriorityQueue, 0)
 
-	heap.Push(&pq, &datastructures.Item{
+	heap.Push(&pq, &datastructures2.Item{
 		Id:   start,
 		Dist: 0,
 		Prev: start,
 	})
 	for pq.Len() > 0 {
-		node := heap.Pop(&pq).(*datastructures.Item)
+		node := heap.Pop(&pq).(*datastructures2.Item)
 		if node.Dist >= dist[node.Id] {
 			continue
 		}
@@ -40,7 +40,7 @@ func Dijkstra(start int32, end int32, graph datastructures.Graph) (int32, []int3
 			if alt >= dist[graph.Edges[e]] {
 				continue
 			}
-			heap.Push(&pq, &datastructures.Item{
+			heap.Push(&pq, &datastructures2.Item{
 				Id:   graph.Edges[e],
 				Dist: alt,
 				Prev: node.Id,

src/spherePoints/spherePoints.go renamed to src/backend/pre/graphFactory.go

@@ -1,7 +1,7 @@
 package shortestPath
 
 import (
-	"OSM/src/helpers"
+	"OSM/src/backend/helpers"
 	"log"
 	"math/rand"
 	"testing"

src/piptest/piptest.go renamed to src/backend/pre/piptest.go

@@ -1,30 +1,20 @@
 package main
 
 import (
-	"OSM/src/coastlines"
-	"OSM/src/piptest"
-	"OSM/src/spherePoints"
+	"OSM/src/backend/helpers"
+	pre2 "OSM/src/backend/pre"
+	"os"
 )
 
-func main() {
-	//path := "E:/Classes Infotech/4th Semster/Fachpraktika/Code/data/planet-coastlines.pbf" //change to own path
-	//nodes, ways := coastlines.GenerateCoastlines(path)
-	//
-	//var no_of_nodes int64 = 10000
-	//
-	//tested_p_array := piptest.TopLevel(nodes, ways, no_of_nodes)
-	//fmt.Printf("Size of mapped points: %d", len(tested_p_array))
-	//
-	//json_file := spherePoints.PointsToGeoJson(tested_p_array)
-	//if err := os.WriteFile("../out/out_pip_test.json", json_file, 06666); err != nil {
-	//
-	//	log.Fatal(err)
-	//}
+const N = 1e6
 
-	//web.GenerateCoastlines("D:/OneDrive - stud.uni-stuttgart.de/Uni/10. Semester/FP-OSM/pbf files/oceanfmi.sec")
+func main() {
+	path := os.Getenv("PBF")
 
-	wayNodes := coastlines.GenerateCoastlines("E:/Classes Infotech/4th Semster/Fachpraktika/Code/data/planet-coastlines.pbf")
-	points := spherePoints.GenerateSpherePoints(1e4)
-	piptest.TopLevel(wayNodes, points)
+	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")
 
 }

src/piptest/piptest_test.go renamed to src/backend/pre/piptest_test.go

@@ -1,17 +1,17 @@
 package web
 
 import (
-	"OSM/src/datastructures"
-	"OSM/src/helpers"
-	"OSM/src/shortestPath"
+	"OSM/src/backend/datastructures"
+	helpers2 "OSM/src/backend/helpers"
+	"OSM/src/backend/shortestPath"
 	"log"
 	"math"
 	"net/http"
 	"strconv"
 )
 
 func Main(pathToFmiFile string) {
-	graph := helpers.CreateGraphFromFile(pathToFmiFile)
+	graph := helpers2.CreateGraphFromFile(pathToFmiFile)
 
 	fileServer := http.FileServer(http.Dir("web/static"))
 	http.Handle("/", fileServer)
@@ -38,8 +38,8 @@ func pointHandler(graph datastructures.Graph) http.HandlerFunc {
 		query := r.URL.Query()
 		lat, _ := strconv.ParseFloat(query["lat"][0], 64)
 		lng, _ := strconv.ParseFloat(query["lng"][0], 64)
-		idx, node := helpers.GetClosestNodeInGraph([]float64{lat, lng}, graph)
-		rawJson := helpers.NodeToPoint(node, idx)
+		idx, node := helpers2.GetClosestNodeInGraph([]float64{lat, lng}, graph)
+		rawJson := helpers2.NodeToPointGeoJson(node, idx)
 		w.WriteHeader(http.StatusOK)
 		w.Write(rawJson)
 	}
@@ -69,8 +69,8 @@ func routeHandler(graph datastructures.Graph) http.HandlerFunc {
 			return
 		}
 
-		lineNodes := helpers.CreatePathFromPrev(startIdx32, endIdx32, prev, graph)
-		rawJson := helpers.NodesToLineString(lineNodes, distance)
+		lineNodes := helpers2.CreatePathFromPrev(startIdx32, endIdx32, prev, graph)
+		rawJson := helpers2.NodesToLineStringGeoJson(lineNodes, distance)
 
 		w.WriteHeader(http.StatusOK)
 		w.Write(rawJson)