refactor: change edgeIDAndData to edge and replace location defin…

…ition with nav.Location issue: #282
Telenav · Apr 24, 2020 · a4c429d · a4c429d
1 parent 0e05d7a
commit a4c429d
Show file tree

Hide file tree

Showing 12 changed files with 451 additions and 433 deletions.
diff --git a/CHANGELOG-FORK.md b/CHANGELOG-FORK.md
@@ -4,6 +4,7 @@ Changes from v10.2.0
 - Feature:    
   - ADDED **HTTP API** `annotation/ways` in OSRM route response after `osrm-ranking` process(retrieve `annotation/ways` from `annotation/nodes`) [#296](https://github.com/Telenav/osrm-backend/pull/296)    
   - CHANGED for internal refactoring, moved `unidbpatch` and `mapsource` packages into `integration/util` folder [#300](https://github.com/Telenav/osrm-backend/pull/300)
+  - CHANGED for internal refactoring, refactor staiongraph to isolate algorithm, data structure and topological [#302]
 - Bugfix:    
   - CHANGED `osrm-ranking` parsing of OSRM route response to compatible with `string` array `annotation/nodes` [#296](https://github.com/Telenav/osrm-backend/pull/296)     
 - Performance:    

diff --git a/integration/service/oasis/stationfinder/stationfinderalg/stations_iterator_alg.go b/integration/service/oasis/stationfinder/stationfinderalg/stations_iterator_alg.go
@@ -32,7 +32,7 @@ func FindOverlapBetweenStations(iterF stationfindertype.NearbyStationsIterator,
 
 // CalcWeightBetweenChargeStationsPair accepts two iterators and calculates weights between each pair of iterators
 func CalcWeightBetweenChargeStationsPair(from stationfindertype.NearbyStationsIterator, to stationfindertype.NearbyStationsIterator, table osrmconnector.TableRequster) ([]stationfindertype.NeighborInfo, error) {
-	// collect (lat,lon)&ID for current location's nearby charge stations
+	// collect (Lat,Lon)&ID for current location's nearby charge stations
 	var startPoints coordinate.Coordinates
 	var startIDs []string
 	for v := range from.IterateNearbyStations() {
@@ -48,7 +48,7 @@ func CalcWeightBetweenChargeStationsPair(from stationfindertype.NearbyStationsIt
 		return nil, err
 	}
 
-	// collect (lat,lon)&ID for target location's nearby charge stations
+	// collect (Lat,Lon)&ID for target location's nearby charge stations
 	var targetPoints coordinate.Coordinates
 	var targetIDs []string
 	for v := range to.IterateNearbyStations() {

diff --git a/integration/service/oasis/stationgraph/edge.go b/integration/service/oasis/stationgraph/edge.go
@@ -5,12 +5,12 @@ type edgeID struct {
 	toNodeID   nodeID
 }
 
-type edge struct {
+type edgeMetric struct {
 	distance float64
 	duration float64
 }
 
-type edgeIDAndData struct {
+type edge struct {
 	edgeId   edgeID
-	edgeData *edge
+	edgeData *edgeMetric
 }
diff --git a/integration/service/oasis/stationgraph/graph_interface.go b/integration/service/oasis/stationgraph/graph_interface.go
@@ -1,10 +1,13 @@
 package stationgraph
 
-import "github.com/Telenav/osrm-backend/integration/service/oasis/chargingstrategy"
+import (
+	"github.com/Telenav/osrm-backend/integration/pkg/api/nav"
+	"github.com/Telenav/osrm-backend/integration/service/oasis/chargingstrategy"
+)
 
 // Graph defines interface used for Graph
 type Graph interface {
-	
+
 	// Node returns node object by its nodeID
 	Node(id nodeID) *node
 
@@ -13,13 +16,13 @@ type Graph interface {
 	AdjacentNodes(id nodeID) []nodeID
 
 	// Edge returns edge information between given two nodes
-	Edge(from, to nodeID) *edge
+	Edge(from, to nodeID) *edgeMetric
 
 	// SetStart generates start node for the graph
-	SetStart(stationID string, targetState chargingstrategy.State, location locationInfo) Graph
+	SetStart(stationID string, targetState chargingstrategy.State, location nav.Location) Graph
 
 	// SetEnd generates end node for the graph
-	SetEnd(stationID string, targetState chargingstrategy.State, location locationInfo) Graph
+	SetEnd(stationID string, targetState chargingstrategy.State, location nav.Location) Graph
 
 	// StartNodeID returns start node's ID for given graph
 	StartNodeID() nodeID