Skip to content

Commit

Permalink
refactor: move oasis and related components to integration/service/oa…
Browse files Browse the repository at this point in the history 
…sis (#269)

issue: #254
  • Loading branch information
@CodeBear801
CodeBear801 authored Apr 9, 2020
1 parent f38ac32 commit f6be7b0
Show file tree
Hide file tree
Showing 90 changed files with 67 additions and 67 deletions.
2 changes: 1 addition & 1 deletion integration/cmd/oasis/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"net/http"
"strconv"

"github.com/Telenav/osrm-backend/integration/oasis"
"github.com/Telenav/osrm-backend/integration/service/oasis"
"github.com/golang/glog"
)

Expand Down
10 changes: 5 additions & 5 deletions integration/cmd/place-connectivity-gen/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ import (
"os"
"time"

"github.com/Telenav/osrm-backend/integration/oasis/osrmconnector"
"github.com/Telenav/osrm-backend/integration/service/connectivitymap"
"github.com/Telenav/osrm-backend/integration/service/spatialindexer"
"github.com/Telenav/osrm-backend/integration/service/spatialindexer/ranker"
"github.com/Telenav/osrm-backend/integration/service/spatialindexer/s2indexer"
"github.com/Telenav/osrm-backend/integration/service/oasis/connectivitymap"
"github.com/Telenav/osrm-backend/integration/service/oasis/osrmconnector"
"github.com/Telenav/osrm-backend/integration/service/oasis/spatialindexer"
"github.com/Telenav/osrm-backend/integration/service/oasis/spatialindexer/ranker"
"github.com/Telenav/osrm-backend/integration/service/oasis/spatialindexer/s2indexer"
"github.com/golang/glog"
)

Expand Down
0 integration/oasis/chargingstrategy/doc.go → ...ion/service/oasis/chargingstrategy/doc.go
View file
File renamed without changes.
0 .../chargingstrategy/fake_charge_strategy.go → .../chargingstrategy/fake_charge_strategy.go
View file
File renamed without changes.
0 ...gingstrategy/fake_charge_strategy_test.go → ...gingstrategy/fake_charge_strategy_test.go
View file
File renamed without changes.
0 .../chargingstrategy/null_charge_strategy.go → .../chargingstrategy/null_charge_strategy.go
View file
File renamed without changes.
0 ...is/chargingstrategy/strategy_interface.go → ...is/chargingstrategy/strategy_interface.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ration/service/connectivitymap/builder.go → .../service/oasis/connectivitymap/builder.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package connectivitymap
import (
"sync"

"github.com/Telenav/osrm-backend/integration/service/spatialindexer"
"github.com/Telenav/osrm-backend/integration/service/oasis/spatialindexer"
"github.com/golang/glog"
)

Expand Down
4 changes: 2 additions & 2 deletions ...n/service/connectivitymap/builder_test.go → ...ice/oasis/connectivitymap/builder_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"runtime"
"testing"

"github.com/Telenav/osrm-backend/integration/service/spatialindexer"
"github.com/Telenav/osrm-backend/integration/service/spatialindexer/ranker"
"github.com/Telenav/osrm-backend/integration/service/oasis/spatialindexer"
"github.com/Telenav/osrm-backend/integration/service/oasis/spatialindexer/ranker"
)

// Mock env:
Expand Down
2 changes: 1 addition & 1 deletion ...rvice/connectivitymap/connectivity_map.go → ...oasis/connectivitymap/connectivity_map.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package connectivitymap

import (
"github.com/Telenav/osrm-backend/integration/service/spatialindexer"
"github.com/Telenav/osrm-backend/integration/service/oasis/spatialindexer"
"github.com/golang/glog"
)

Expand Down
0 .../connectivitymap/connectivity_map_mock.go → .../connectivitymap/connectivity_map_mock.go
View file
File renamed without changes.
0 integration/service/connectivitymap/doc.go → ...tion/service/oasis/connectivitymap/doc.go
View file
File renamed without changes.
0 ...gration/service/connectivitymap/dumper.go → ...n/service/oasis/connectivitymap/dumper.go
View file
File renamed without changes.
0 ...on/service/connectivitymap/dumper_test.go → ...vice/oasis/connectivitymap/dumper_test.go
View file
File renamed without changes.
0 ...tion/service/connectivitymap/statistic.go → ...ervice/oasis/connectivitymap/statistic.go
View file
File renamed without changes.
0 ...service/connectivitymap/statistic_test.go → ...e/oasis/connectivitymap/statistic_test.go
View file
File renamed without changes.
6 changes: 3 additions & 3 deletions integration/oasis/handler.go → integration/service/oasis/handler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import (
"fmt"
"net/http"

"github.com/Telenav/osrm-backend/integration/oasis/osrmconnector"
"github.com/Telenav/osrm-backend/integration/oasis/osrmhelper"
"github.com/Telenav/osrm-backend/integration/oasis/searchconnector"
"github.com/Telenav/osrm-backend/integration/pkg/api/oasis"
"github.com/Telenav/osrm-backend/integration/service/oasis/osrmconnector"
"github.com/Telenav/osrm-backend/integration/service/oasis/osrmhelper"
"github.com/Telenav/osrm-backend/integration/service/oasis/searchconnector"
"github.com/golang/glog"
)

Expand Down
0 integration/oasis/has_enough_energy.go → ...ration/service/oasis/has_enough_energy.go
View file
File renamed without changes.
0 integration/oasis/has_enough_energy_test.go → ...n/service/oasis/has_enough_energy_test.go
View file
File renamed without changes.
0 integration/oasis/haversine/distance.go → ...ation/service/oasis/haversine/distance.go
View file
File renamed without changes.
0 integration/oasis/haversine/distance_test.go → .../service/oasis/haversine/distance_test.go
View file
File renamed without changes.
0 integration/oasis/osrmconnector/connector.go → .../service/oasis/osrmconnector/connector.go
View file
File renamed without changes.
0 integration/oasis/osrmconnector/doc.go → ...ration/service/oasis/osrmconnector/doc.go
View file
File renamed without changes.
0 ...ion/oasis/osrmconnector/osrmhttpclient.go → ...ice/oasis/osrmconnector/osrmhttpclient.go
View file
File renamed without changes.
0 ...asis/osrmconnector/osrmhttpclient_test.go → ...asis/osrmconnector/osrmhttpclient_test.go
View file
File renamed without changes.
0 ...ration/oasis/osrmconnector/osrmrequest.go → ...ervice/oasis/osrmconnector/osrmrequest.go
View file
File renamed without changes.
0 ...on/oasis/osrmconnector/route_requester.go → ...ce/oasis/osrmconnector/route_requester.go
View file
File renamed without changes.
0 ...on/oasis/osrmconnector/table_requester.go → ...ce/oasis/osrmconnector/table_requester.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion integration/oasis/osrmhelper/helper.go → ...ration/service/oasis/osrmhelper/helper.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ import (
"fmt"
"strconv"

"github.com/Telenav/osrm-backend/integration/oasis/osrmconnector"
"github.com/Telenav/osrm-backend/integration/pkg/api"
"github.com/Telenav/osrm-backend/integration/pkg/api/oasis"
"github.com/Telenav/osrm-backend/integration/pkg/api/osrm/coordinate"
"github.com/Telenav/osrm-backend/integration/pkg/api/osrm/route"
"github.com/Telenav/osrm-backend/integration/pkg/api/osrm/route/options"
"github.com/Telenav/osrm-backend/integration/pkg/api/osrm/table"
"github.com/Telenav/osrm-backend/integration/service/oasis/osrmconnector"
)

// GenerateTableReq4Points accept two group of points and generate osrm table request
Expand Down
12 changes: 6 additions & 6 deletions ...ion/oasis/reachable_by_multiple_charge.go → ...ice/oasis/reachable_by_multiple_charge.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ import (
"encoding/json"
"net/http"

"github.com/Telenav/osrm-backend/integration/oasis/chargingstrategy"
"github.com/Telenav/osrm-backend/integration/oasis/haversine"
"github.com/Telenav/osrm-backend/integration/oasis/osrmconnector"
"github.com/Telenav/osrm-backend/integration/oasis/searchconnector"
"github.com/Telenav/osrm-backend/integration/oasis/stationfinder"
"github.com/Telenav/osrm-backend/integration/oasis/stationgraph"
"github.com/Telenav/osrm-backend/integration/pkg/api/nav"
"github.com/Telenav/osrm-backend/integration/pkg/api/oasis"
"github.com/Telenav/osrm-backend/integration/pkg/api/osrm/route"
"github.com/Telenav/osrm-backend/integration/service/oasis/chargingstrategy"
"github.com/Telenav/osrm-backend/integration/service/oasis/haversine"
"github.com/Telenav/osrm-backend/integration/service/oasis/osrmconnector"
"github.com/Telenav/osrm-backend/integration/service/oasis/searchconnector"
"github.com/Telenav/osrm-backend/integration/service/oasis/stationfinder"
"github.com/Telenav/osrm-backend/integration/service/oasis/stationgraph"
"github.com/golang/glog"

"github.com/twpayne/go-polyline"
Expand Down
0 ...asis/reachable_by_multiple_charge_test.go → ...asis/reachable_by_multiple_charge_test.go
View file
File renamed without changes.
8 changes: 4 additions & 4 deletions ...ation/oasis/reachable_by_single_charge.go → ...rvice/oasis/reachable_by_single_charge.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ import (
"net/http"
"sort"

"github.com/Telenav/osrm-backend/integration/oasis/osrmconnector"
"github.com/Telenav/osrm-backend/integration/oasis/osrmhelper"
"github.com/Telenav/osrm-backend/integration/oasis/searchconnector"
"github.com/Telenav/osrm-backend/integration/oasis/stationfinder"
"github.com/Telenav/osrm-backend/integration/pkg/api/oasis"
"github.com/Telenav/osrm-backend/integration/pkg/api/osrm/coordinate"
"github.com/Telenav/osrm-backend/integration/pkg/api/osrm/table"
"github.com/Telenav/osrm-backend/integration/pkg/api/search/nearbychargestation"
"github.com/Telenav/osrm-backend/integration/service/oasis/osrmconnector"
"github.com/Telenav/osrm-backend/integration/service/oasis/osrmhelper"
"github.com/Telenav/osrm-backend/integration/service/oasis/searchconnector"
"github.com/Telenav/osrm-backend/integration/service/oasis/stationfinder"
"github.com/golang/glog"
)

Expand Down
0 .../oasis/reachable_by_single_charge_test.go → .../oasis/reachable_by_single_charge_test.go
View file
File renamed without changes.
0 ...earchconnector/charge_station_searcher.go → ...earchconnector/charge_station_searcher.go
View file
File renamed without changes.
0 ...ration/oasis/searchconnector/connector.go → ...ervice/oasis/searchconnector/connector.go
View file
File renamed without changes.
0 integration/oasis/searchconnector/doc.go → ...tion/service/oasis/searchconnector/doc.go
View file
File renamed without changes.
0 ...oasis/searchconnector/searchhttpclient.go → ...oasis/searchconnector/searchhttpclient.go
View file
File renamed without changes.
0 ...on/oasis/searchconnector/searchrequest.go → ...ce/oasis/searchconnector/searchrequest.go
View file
File renamed without changes.
0 integration/oasis/searchhelper/helper.go → ...tion/service/oasis/searchhelper/helper.go
View file
File renamed without changes.
0 integration/oasis/solution/doc.go → integration/service/oasis/solution/doc.go
View file
File renamed without changes.
0 integration/oasis/solution/solution.go → ...ration/service/oasis/solution/solution.go
View file
File renamed without changes.
0 integration/service/spatialindexer/doc.go → ...ation/service/oasis/spatialindexer/doc.go
View file
File renamed without changes.
0 ...ation/service/spatialindexer/interface.go → ...service/oasis/spatialindexer/interface.go
View file
File renamed without changes.
0 .../service/spatialindexer/interface_mock.go → ...ce/oasis/spatialindexer/interface_mock.go
View file
File renamed without changes.
0 ...ervice/spatialindexer/poiloader/loader.go → .../oasis/spatialindexer/poiloader/loader.go
View file
File renamed without changes.
0 ...ce/spatialindexer/poiloader/poi_format.go → ...is/spatialindexer/poiloader/poi_format.go
View file
File renamed without changes.
0 ...patialindexer/poiloader/sample_input.json → ...patialindexer/poiloader/sample_input.json
View file
File renamed without changes.
0 ...tion/service/spatialindexer/ranker/doc.go → ...ervice/oasis/spatialindexer/ranker/doc.go
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions ...vice/spatialindexer/ranker/osrm_ranker.go → ...asis/spatialindexer/ranker/osrm_ranker.go
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package ranker

import (
"github.com/Telenav/osrm-backend/integration/oasis/osrmconnector"
"github.com/Telenav/osrm-backend/integration/service/spatialindexer"
"github.com/Telenav/osrm-backend/integration/service/oasis/osrmconnector"
"github.com/Telenav/osrm-backend/integration/service/oasis/spatialindexer"
)

type osrmRanker struct {
Expand Down
4 changes: 2 additions & 2 deletions ...spatialindexer/ranker/osrm_ranker_test.go → ...spatialindexer/ranker/osrm_ranker_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import (
"strings"
"testing"

"github.com/Telenav/osrm-backend/integration/oasis/osrmconnector"
"github.com/Telenav/osrm-backend/integration/pkg/api/osrm/code"
"github.com/Telenav/osrm-backend/integration/pkg/api/osrm/table"
"github.com/Telenav/osrm-backend/integration/service/spatialindexer"
"github.com/Telenav/osrm-backend/integration/service/oasis/osrmconnector"
"github.com/Telenav/osrm-backend/integration/service/oasis/spatialindexer"
)

func TestRankerInterfaceViaOSRMRanker(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion ...rvice/spatialindexer/ranker/rank_agent.go → ...oasis/spatialindexer/ranker/rank_agent.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package ranker
import (
"sort"

"github.com/Telenav/osrm-backend/integration/service/spatialindexer"
"github.com/Telenav/osrm-backend/integration/service/oasis/spatialindexer"
)

// rankAgent accepts items to be ranked then returns ranking result
Expand Down
2 changes: 1 addition & 1 deletion .../spatialindexer/ranker/rank_agent_test.go → .../spatialindexer/ranker/rank_agent_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"sync"
"testing"

"github.com/Telenav/osrm-backend/integration/service/spatialindexer"
"github.com/Telenav/osrm-backend/integration/service/oasis/spatialindexer"
)

func TestRankAgent(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion ...ker/rank_by_great_circle_distance_impl.go → ...ker/rank_by_great_circle_distance_impl.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package ranker

import (
"github.com/Telenav/osrm-backend/integration/service/spatialindexer"
"github.com/Telenav/osrm-backend/integration/service/oasis/spatialindexer"
"github.com/blevesearch/bleve/geo"
"github.com/golang/glog"
)
Expand Down
4 changes: 2 additions & 2 deletions ...ranker/rank_by_osrm_shortest_path_impl.go → ...ranker/rank_by_osrm_shortest_path_impl.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ import (
"strconv"
"sync"

"github.com/Telenav/osrm-backend/integration/oasis/osrmconnector"
"github.com/Telenav/osrm-backend/integration/pkg/api"
"github.com/Telenav/osrm-backend/integration/pkg/api/osrm/code"
"github.com/Telenav/osrm-backend/integration/pkg/api/osrm/coordinate"
"github.com/Telenav/osrm-backend/integration/pkg/api/osrm/route/options"
"github.com/Telenav/osrm-backend/integration/pkg/api/osrm/table"
"github.com/Telenav/osrm-backend/integration/service/spatialindexer"
"github.com/Telenav/osrm-backend/integration/service/oasis/osrmconnector"
"github.com/Telenav/osrm-backend/integration/service/oasis/spatialindexer"
"github.com/golang/glog"
)

Expand Down
4 changes: 2 additions & 2 deletions ...r/rank_by_osrm_shortest_path_impl_test.go → ...r/rank_by_osrm_shortest_path_impl_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ import (
"strings"
"testing"

"github.com/Telenav/osrm-backend/integration/oasis/osrmconnector"
"github.com/Telenav/osrm-backend/integration/pkg/api/osrm/coordinate"
"github.com/Telenav/osrm-backend/integration/pkg/api/osrm/genericoptions"
"github.com/Telenav/osrm-backend/integration/pkg/api/osrm/table"
"github.com/Telenav/osrm-backend/integration/service/spatialindexer"
"github.com/Telenav/osrm-backend/integration/service/oasis/osrmconnector"
"github.com/Telenav/osrm-backend/integration/service/oasis/spatialindexer"
)

func TestGenerateTableRequest(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions ...e/spatialindexer/ranker/ranker_factory.go → ...s/spatialindexer/ranker/ranker_factory.go
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package ranker

import (
"github.com/Telenav/osrm-backend/integration/oasis/osrmconnector"
"github.com/Telenav/osrm-backend/integration/service/spatialindexer"
"github.com/Telenav/osrm-backend/integration/service/oasis/osrmconnector"
"github.com/Telenav/osrm-backend/integration/service/oasis/spatialindexer"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion ...ce/spatialindexer/ranker/simple_ranker.go → ...is/spatialindexer/ranker/simple_ranker.go
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package ranker

import "github.com/Telenav/osrm-backend/integration/service/spatialindexer"
import "github.com/Telenav/osrm-backend/integration/service/oasis/spatialindexer"

type simpleRanker struct {
}
Expand Down
2 changes: 1 addition & 1 deletion ...atialindexer/ranker/simple_ranker_test.go → ...atialindexer/ranker/simple_ranker_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"reflect"
"testing"

"github.com/Telenav/osrm-backend/integration/service/spatialindexer"
"github.com/Telenav/osrm-backend/integration/service/oasis/spatialindexer"
)

func TestRankerInterfaceViaSimpleRanker(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion ...rvice/spatialindexer/s2indexer/builder.go → ...oasis/spatialindexer/s2indexer/builder.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package s2indexer

import (
"github.com/Telenav/osrm-backend/integration/service/spatialindexer"
"github.com/Telenav/osrm-backend/integration/service/oasis/spatialindexer"
"github.com/golang/geo/s2"
)

Expand Down
2 changes: 1 addition & 1 deletion .../spatialindexer/s2indexer/builder_test.go → .../spatialindexer/s2indexer/builder_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"sort"
"testing"

"github.com/Telenav/osrm-backend/integration/service/spatialindexer"
"github.com/Telenav/osrm-backend/integration/service/oasis/spatialindexer"
"github.com/golang/geo/s2"
"github.com/golang/glog"
)
Expand Down
0 ...ervice/spatialindexer/s2indexer/dumper.go → .../oasis/spatialindexer/s2indexer/dumper.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...e/spatialindexer/s2indexer/dumper_test.go → ...s/spatialindexer/s2indexer/dumper_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"reflect"
"testing"

"github.com/Telenav/osrm-backend/integration/service/spatialindexer"
"github.com/Telenav/osrm-backend/integration/service/oasis/spatialindexer"
"github.com/golang/geo/s2"
)

Expand Down
4 changes: 2 additions & 2 deletions ...rvice/spatialindexer/s2indexer/indexer.go → ...oasis/spatialindexer/s2indexer/indexer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package s2indexer
import (
"time"

"github.com/Telenav/osrm-backend/integration/service/spatialindexer"
"github.com/Telenav/osrm-backend/integration/service/spatialindexer/poiloader"
"github.com/Telenav/osrm-backend/integration/service/oasis/spatialindexer"
"github.com/Telenav/osrm-backend/integration/service/oasis/spatialindexer/poiloader"
"github.com/golang/geo/s2"
"github.com/golang/glog"
)
Expand Down
2 changes: 1 addition & 1 deletion ...spatialindexer/s2indexer/spatial_query.go → ...spatialindexer/s2indexer/spatial_query.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package s2indexer

import (
"github.com/Telenav/osrm-backend/integration/service/spatialindexer"
"github.com/Telenav/osrm-backend/integration/service/oasis/spatialindexer"
"github.com/golang/geo/s1"
"github.com/golang/geo/s2"
"github.com/golang/glog"
Expand Down
2 changes: 1 addition & 1 deletion ...alindexer/s2indexer/spatial_query_test.go → ...alindexer/s2indexer/spatial_query_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"reflect"
"testing"

"github.com/Telenav/osrm-backend/integration/service/spatialindexer"
"github.com/Telenav/osrm-backend/integration/service/oasis/spatialindexer"
"github.com/golang/geo/s2"
"github.com/golang/glog"
)
Expand Down
2 changes: 1 addition & 1 deletion ...ation/oasis/stationfinder/basic_finder.go → ...rvice/oasis/stationfinder/basic_finder.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package stationfinder
import (
"sync"

"github.com/Telenav/osrm-backend/integration/oasis/searchconnector"
"github.com/Telenav/osrm-backend/integration/pkg/api/nav"
"github.com/Telenav/osrm-backend/integration/pkg/api/search/nearbychargestation"
"github.com/Telenav/osrm-backend/integration/service/oasis/searchconnector"
"github.com/golang/glog"
)

Expand Down
0 .../oasis/stationfinder/basic_finder_test.go → .../oasis/stationfinder/basic_finder_test.go
View file
File renamed without changes.
0 ...tion/oasis/stationfinder/dest_iterator.go → ...vice/oasis/stationfinder/dest_iterator.go
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions ...asis/stationfinder/dest_station_finder.go → ...asis/stationfinder/dest_station_finder.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ package stationfinder
import (
"sync"

"github.com/Telenav/osrm-backend/integration/oasis/searchconnector"
"github.com/Telenav/osrm-backend/integration/oasis/searchhelper"
"github.com/Telenav/osrm-backend/integration/pkg/api/oasis"
"github.com/Telenav/osrm-backend/integration/pkg/api/search/nearbychargestation"
"github.com/Telenav/osrm-backend/integration/pkg/api/search/searchcoordinate"
"github.com/Telenav/osrm-backend/integration/service/oasis/searchconnector"
"github.com/Telenav/osrm-backend/integration/service/oasis/searchhelper"
)

//@todo: This number need to be adjusted based on charge station profile
Expand Down
0 ...stationfinder/dest_station_finder_test.go → ...stationfinder/dest_station_finder_test.go
View file
File renamed without changes.
0 integration/oasis/stationfinder/doc.go → ...ration/service/oasis/stationfinder/doc.go
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions ...der/low_energy_location_station_finder.go → ...der/low_energy_location_station_finder.go
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package stationfinder

import (
"github.com/Telenav/osrm-backend/integration/oasis/searchconnector"
"github.com/Telenav/osrm-backend/integration/oasis/searchhelper"
"github.com/Telenav/osrm-backend/integration/pkg/api/nav"
"github.com/Telenav/osrm-backend/integration/pkg/api/search/searchcoordinate"
"github.com/Telenav/osrm-backend/integration/service/oasis/searchconnector"
"github.com/Telenav/osrm-backend/integration/service/oasis/searchhelper"
)

const lowEnergyLocationCandidateNumber = 20
Expand Down
0 ...ow_energy_location_station_finder_test.go → ...ow_energy_location_station_finder_test.go
View file
File renamed without changes.
0 ...tion/oasis/stationfinder/orig_iterator.go → ...vice/oasis/stationfinder/orig_iterator.go
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions ...asis/stationfinder/orig_station_finder.go → ...asis/stationfinder/orig_station_finder.go
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package stationfinder

import (
"github.com/Telenav/osrm-backend/integration/oasis/searchconnector"
"github.com/Telenav/osrm-backend/integration/oasis/searchhelper"
"github.com/Telenav/osrm-backend/integration/pkg/api/oasis"
"github.com/Telenav/osrm-backend/integration/pkg/api/search/searchcoordinate"
"github.com/Telenav/osrm-backend/integration/service/oasis/searchconnector"
"github.com/Telenav/osrm-backend/integration/service/oasis/searchhelper"
)

//@todo: This number need to be adjusted based on charge station profile
Expand Down
0 ...stationfinder/orig_station_finder_test.go → ...stationfinder/orig_station_finder_test.go
View file
File renamed without changes.
0 .../oasis/stationfinder/stations_iterator.go → .../oasis/stationfinder/stations_iterator.go
View file
File renamed without changes.
6 changes: 3 additions & 3 deletions ...is/stationfinder/stations_iterator_alg.go → ...is/stationfinder/stations_iterator_alg.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ import (
"fmt"
"sync"

"github.com/Telenav/osrm-backend/integration/oasis/osrmconnector"
"github.com/Telenav/osrm-backend/integration/oasis/osrmhelper"
"github.com/Telenav/osrm-backend/integration/oasis/searchconnector"
"github.com/Telenav/osrm-backend/integration/pkg/api/nav"
"github.com/Telenav/osrm-backend/integration/pkg/api/osrm/coordinate"
"github.com/Telenav/osrm-backend/integration/service/oasis/osrmconnector"
"github.com/Telenav/osrm-backend/integration/service/oasis/osrmhelper"
"github.com/Telenav/osrm-backend/integration/service/oasis/searchconnector"
"github.com/golang/glog"
)

Expand Down
4 changes: 2 additions & 2 deletions ...ationfinder/stations_iterator_alg_test.go → ...ationfinder/stations_iterator_alg_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ import (
"strings"
"testing"

"github.com/Telenav/osrm-backend/integration/oasis/osrmconnector"
"github.com/Telenav/osrm-backend/integration/oasis/searchconnector"
"github.com/Telenav/osrm-backend/integration/pkg/api/nav"
"github.com/Telenav/osrm-backend/integration/pkg/api/osrm/table"
"github.com/Telenav/osrm-backend/integration/pkg/api/search/nearbychargestation"
"github.com/Telenav/osrm-backend/integration/service/oasis/osrmconnector"
"github.com/Telenav/osrm-backend/integration/service/oasis/searchconnector"
"github.com/Telenav/osrm-backend/integration/util"
)

Expand Down
0 integration/oasis/stationgraph/doc.go → ...gration/service/oasis/stationgraph/doc.go
View file
File renamed without changes.
0 integration/oasis/stationgraph/edge.go → ...ration/service/oasis/stationgraph/edge.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion integration/oasis/stationgraph/graph.go → ...ation/service/oasis/stationgraph/graph.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package stationgraph

import (
"github.com/Telenav/osrm-backend/integration/oasis/chargingstrategy"
"github.com/Telenav/osrm-backend/integration/service/oasis/chargingstrategy"
"github.com/golang/glog"
)

Expand Down
2 changes: 1 addition & 1 deletion integration/oasis/stationgraph/graph_test.go → .../service/oasis/stationgraph/graph_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"reflect"
"testing"

"github.com/Telenav/osrm-backend/integration/oasis/chargingstrategy"
"github.com/Telenav/osrm-backend/integration/service/oasis/chargingstrategy"
)

func TestGraphGeneral(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion integration/oasis/stationgraph/node.go → ...ration/service/oasis/stationgraph/node.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package stationgraph
import (
"math"

"github.com/Telenav/osrm-backend/integration/oasis/chargingstrategy"
"github.com/Telenav/osrm-backend/integration/service/oasis/chargingstrategy"
"github.com/golang/glog"
)

Expand Down
0 ...tion/oasis/stationgraph/priority_queue.go → ...vice/oasis/stationgraph/priority_queue.go
View file
File renamed without changes.
0 ...oasis/stationgraph/priority_queue_test.go → ...oasis/stationgraph/priority_queue_test.go
View file
File renamed without changes.
0 integration/oasis/stationgraph/query_heap.go → .../service/oasis/stationgraph/query_heap.go
View file
File renamed without changes.
0 ...ion/oasis/stationgraph/query_heap_test.go → ...ice/oasis/stationgraph/query_heap_test.go
View file
File renamed without changes.
Loading

0 comments on commit f6be7b0

Please sign in to comment.