diff --git a/integration/cmd/oasis/main.go b/integration/cmd/oasis/main.go index abae4fa057a..2a31d8bc480 100644 --- a/integration/cmd/oasis/main.go +++ b/integration/cmd/oasis/main.go @@ -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" ) diff --git a/integration/cmd/place-connectivity-gen/main.go b/integration/cmd/place-connectivity-gen/main.go index 65f5e879173..b7feac9ddab 100644 --- a/integration/cmd/place-connectivity-gen/main.go +++ b/integration/cmd/place-connectivity-gen/main.go @@ -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" ) diff --git a/integration/oasis/chargingstrategy/doc.go b/integration/service/oasis/chargingstrategy/doc.go similarity index 100% rename from integration/oasis/chargingstrategy/doc.go rename to integration/service/oasis/chargingstrategy/doc.go diff --git a/integration/oasis/chargingstrategy/fake_charge_strategy.go b/integration/service/oasis/chargingstrategy/fake_charge_strategy.go similarity index 100% rename from integration/oasis/chargingstrategy/fake_charge_strategy.go rename to integration/service/oasis/chargingstrategy/fake_charge_strategy.go diff --git a/integration/oasis/chargingstrategy/fake_charge_strategy_test.go b/integration/service/oasis/chargingstrategy/fake_charge_strategy_test.go similarity index 100% rename from integration/oasis/chargingstrategy/fake_charge_strategy_test.go rename to integration/service/oasis/chargingstrategy/fake_charge_strategy_test.go diff --git a/integration/oasis/chargingstrategy/null_charge_strategy.go b/integration/service/oasis/chargingstrategy/null_charge_strategy.go similarity index 100% rename from integration/oasis/chargingstrategy/null_charge_strategy.go rename to integration/service/oasis/chargingstrategy/null_charge_strategy.go diff --git a/integration/oasis/chargingstrategy/strategy_interface.go b/integration/service/oasis/chargingstrategy/strategy_interface.go similarity index 100% rename from integration/oasis/chargingstrategy/strategy_interface.go rename to integration/service/oasis/chargingstrategy/strategy_interface.go diff --git a/integration/service/connectivitymap/builder.go b/integration/service/oasis/connectivitymap/builder.go similarity index 98% rename from integration/service/connectivitymap/builder.go rename to integration/service/oasis/connectivitymap/builder.go index 77159f540ae..2d494b0c9d5 100644 --- a/integration/service/connectivitymap/builder.go +++ b/integration/service/oasis/connectivitymap/builder.go @@ -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" ) diff --git a/integration/service/connectivitymap/builder_test.go b/integration/service/oasis/connectivitymap/builder_test.go similarity index 93% rename from integration/service/connectivitymap/builder_test.go rename to integration/service/oasis/connectivitymap/builder_test.go index 35c55b8619c..cf490a8f859 100644 --- a/integration/service/connectivitymap/builder_test.go +++ b/integration/service/oasis/connectivitymap/builder_test.go @@ -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: diff --git a/integration/service/connectivitymap/connectivity_map.go b/integration/service/oasis/connectivitymap/connectivity_map.go similarity index 97% rename from integration/service/connectivitymap/connectivity_map.go rename to integration/service/oasis/connectivitymap/connectivity_map.go index d36f1d87f68..8e2d0d37cde 100644 --- a/integration/service/connectivitymap/connectivity_map.go +++ b/integration/service/oasis/connectivitymap/connectivity_map.go @@ -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" ) diff --git a/integration/service/connectivitymap/connectivity_map_mock.go b/integration/service/oasis/connectivitymap/connectivity_map_mock.go similarity index 100% rename from integration/service/connectivitymap/connectivity_map_mock.go rename to integration/service/oasis/connectivitymap/connectivity_map_mock.go diff --git a/integration/service/connectivitymap/doc.go b/integration/service/oasis/connectivitymap/doc.go similarity index 100% rename from integration/service/connectivitymap/doc.go rename to integration/service/oasis/connectivitymap/doc.go diff --git a/integration/service/connectivitymap/dumper.go b/integration/service/oasis/connectivitymap/dumper.go similarity index 100% rename from integration/service/connectivitymap/dumper.go rename to integration/service/oasis/connectivitymap/dumper.go diff --git a/integration/service/connectivitymap/dumper_test.go b/integration/service/oasis/connectivitymap/dumper_test.go similarity index 100% rename from integration/service/connectivitymap/dumper_test.go rename to integration/service/oasis/connectivitymap/dumper_test.go diff --git a/integration/service/connectivitymap/statistic.go b/integration/service/oasis/connectivitymap/statistic.go similarity index 100% rename from integration/service/connectivitymap/statistic.go rename to integration/service/oasis/connectivitymap/statistic.go diff --git a/integration/service/connectivitymap/statistic_test.go b/integration/service/oasis/connectivitymap/statistic_test.go similarity index 100% rename from integration/service/connectivitymap/statistic_test.go rename to integration/service/oasis/connectivitymap/statistic_test.go diff --git a/integration/oasis/handler.go b/integration/service/oasis/handler.go similarity index 91% rename from integration/oasis/handler.go rename to integration/service/oasis/handler.go index 3d6fb5b9335..b4e6c232ad6 100644 --- a/integration/oasis/handler.go +++ b/integration/service/oasis/handler.go @@ -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" ) diff --git a/integration/oasis/has_enough_energy.go b/integration/service/oasis/has_enough_energy.go similarity index 100% rename from integration/oasis/has_enough_energy.go rename to integration/service/oasis/has_enough_energy.go diff --git a/integration/oasis/has_enough_energy_test.go b/integration/service/oasis/has_enough_energy_test.go similarity index 100% rename from integration/oasis/has_enough_energy_test.go rename to integration/service/oasis/has_enough_energy_test.go diff --git a/integration/oasis/haversine/distance.go b/integration/service/oasis/haversine/distance.go similarity index 100% rename from integration/oasis/haversine/distance.go rename to integration/service/oasis/haversine/distance.go diff --git a/integration/oasis/haversine/distance_test.go b/integration/service/oasis/haversine/distance_test.go similarity index 100% rename from integration/oasis/haversine/distance_test.go rename to integration/service/oasis/haversine/distance_test.go diff --git a/integration/oasis/osrmconnector/connector.go b/integration/service/oasis/osrmconnector/connector.go similarity index 100% rename from integration/oasis/osrmconnector/connector.go rename to integration/service/oasis/osrmconnector/connector.go diff --git a/integration/oasis/osrmconnector/doc.go b/integration/service/oasis/osrmconnector/doc.go similarity index 100% rename from integration/oasis/osrmconnector/doc.go rename to integration/service/oasis/osrmconnector/doc.go diff --git a/integration/oasis/osrmconnector/osrmhttpclient.go b/integration/service/oasis/osrmconnector/osrmhttpclient.go similarity index 100% rename from integration/oasis/osrmconnector/osrmhttpclient.go rename to integration/service/oasis/osrmconnector/osrmhttpclient.go diff --git a/integration/oasis/osrmconnector/osrmhttpclient_test.go b/integration/service/oasis/osrmconnector/osrmhttpclient_test.go similarity index 100% rename from integration/oasis/osrmconnector/osrmhttpclient_test.go rename to integration/service/oasis/osrmconnector/osrmhttpclient_test.go diff --git a/integration/oasis/osrmconnector/osrmrequest.go b/integration/service/oasis/osrmconnector/osrmrequest.go similarity index 100% rename from integration/oasis/osrmconnector/osrmrequest.go rename to integration/service/oasis/osrmconnector/osrmrequest.go diff --git a/integration/oasis/osrmconnector/route_requester.go b/integration/service/oasis/osrmconnector/route_requester.go similarity index 100% rename from integration/oasis/osrmconnector/route_requester.go rename to integration/service/oasis/osrmconnector/route_requester.go diff --git a/integration/oasis/osrmconnector/table_requester.go b/integration/service/oasis/osrmconnector/table_requester.go similarity index 100% rename from integration/oasis/osrmconnector/table_requester.go rename to integration/service/oasis/osrmconnector/table_requester.go diff --git a/integration/oasis/osrmhelper/helper.go b/integration/service/oasis/osrmhelper/helper.go similarity index 95% rename from integration/oasis/osrmhelper/helper.go rename to integration/service/oasis/osrmhelper/helper.go index bb85ab033bb..e8414759d9e 100644 --- a/integration/oasis/osrmhelper/helper.go +++ b/integration/service/oasis/osrmhelper/helper.go @@ -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 diff --git a/integration/oasis/reachable_by_multiple_charge.go b/integration/service/oasis/reachable_by_multiple_charge.go similarity index 89% rename from integration/oasis/reachable_by_multiple_charge.go rename to integration/service/oasis/reachable_by_multiple_charge.go index e7e64c04b60..89880c4a97f 100644 --- a/integration/oasis/reachable_by_multiple_charge.go +++ b/integration/service/oasis/reachable_by_multiple_charge.go @@ -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" diff --git a/integration/oasis/reachable_by_multiple_charge_test.go b/integration/service/oasis/reachable_by_multiple_charge_test.go similarity index 100% rename from integration/oasis/reachable_by_multiple_charge_test.go rename to integration/service/oasis/reachable_by_multiple_charge_test.go diff --git a/integration/oasis/reachable_by_single_charge.go b/integration/service/oasis/reachable_by_single_charge.go similarity index 95% rename from integration/oasis/reachable_by_single_charge.go rename to integration/service/oasis/reachable_by_single_charge.go index e406c96a562..f7eebdf018b 100644 --- a/integration/oasis/reachable_by_single_charge.go +++ b/integration/service/oasis/reachable_by_single_charge.go @@ -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" ) diff --git a/integration/oasis/reachable_by_single_charge_test.go b/integration/service/oasis/reachable_by_single_charge_test.go similarity index 100% rename from integration/oasis/reachable_by_single_charge_test.go rename to integration/service/oasis/reachable_by_single_charge_test.go diff --git a/integration/oasis/searchconnector/charge_station_searcher.go b/integration/service/oasis/searchconnector/charge_station_searcher.go similarity index 100% rename from integration/oasis/searchconnector/charge_station_searcher.go rename to integration/service/oasis/searchconnector/charge_station_searcher.go diff --git a/integration/oasis/searchconnector/connector.go b/integration/service/oasis/searchconnector/connector.go similarity index 100% rename from integration/oasis/searchconnector/connector.go rename to integration/service/oasis/searchconnector/connector.go diff --git a/integration/oasis/searchconnector/doc.go b/integration/service/oasis/searchconnector/doc.go similarity index 100% rename from integration/oasis/searchconnector/doc.go rename to integration/service/oasis/searchconnector/doc.go diff --git a/integration/oasis/searchconnector/searchhttpclient.go b/integration/service/oasis/searchconnector/searchhttpclient.go similarity index 100% rename from integration/oasis/searchconnector/searchhttpclient.go rename to integration/service/oasis/searchconnector/searchhttpclient.go diff --git a/integration/oasis/searchconnector/searchrequest.go b/integration/service/oasis/searchconnector/searchrequest.go similarity index 100% rename from integration/oasis/searchconnector/searchrequest.go rename to integration/service/oasis/searchconnector/searchrequest.go diff --git a/integration/oasis/searchhelper/helper.go b/integration/service/oasis/searchhelper/helper.go similarity index 100% rename from integration/oasis/searchhelper/helper.go rename to integration/service/oasis/searchhelper/helper.go diff --git a/integration/oasis/solution/doc.go b/integration/service/oasis/solution/doc.go similarity index 100% rename from integration/oasis/solution/doc.go rename to integration/service/oasis/solution/doc.go diff --git a/integration/oasis/solution/solution.go b/integration/service/oasis/solution/solution.go similarity index 100% rename from integration/oasis/solution/solution.go rename to integration/service/oasis/solution/solution.go diff --git a/integration/service/spatialindexer/doc.go b/integration/service/oasis/spatialindexer/doc.go similarity index 100% rename from integration/service/spatialindexer/doc.go rename to integration/service/oasis/spatialindexer/doc.go diff --git a/integration/service/spatialindexer/interface.go b/integration/service/oasis/spatialindexer/interface.go similarity index 100% rename from integration/service/spatialindexer/interface.go rename to integration/service/oasis/spatialindexer/interface.go diff --git a/integration/service/spatialindexer/interface_mock.go b/integration/service/oasis/spatialindexer/interface_mock.go similarity index 100% rename from integration/service/spatialindexer/interface_mock.go rename to integration/service/oasis/spatialindexer/interface_mock.go diff --git a/integration/service/spatialindexer/poiloader/loader.go b/integration/service/oasis/spatialindexer/poiloader/loader.go similarity index 100% rename from integration/service/spatialindexer/poiloader/loader.go rename to integration/service/oasis/spatialindexer/poiloader/loader.go diff --git a/integration/service/spatialindexer/poiloader/poi_format.go b/integration/service/oasis/spatialindexer/poiloader/poi_format.go similarity index 100% rename from integration/service/spatialindexer/poiloader/poi_format.go rename to integration/service/oasis/spatialindexer/poiloader/poi_format.go diff --git a/integration/service/spatialindexer/poiloader/sample_input.json b/integration/service/oasis/spatialindexer/poiloader/sample_input.json similarity index 100% rename from integration/service/spatialindexer/poiloader/sample_input.json rename to integration/service/oasis/spatialindexer/poiloader/sample_input.json diff --git a/integration/service/spatialindexer/ranker/doc.go b/integration/service/oasis/spatialindexer/ranker/doc.go similarity index 100% rename from integration/service/spatialindexer/ranker/doc.go rename to integration/service/oasis/spatialindexer/ranker/doc.go diff --git a/integration/service/spatialindexer/ranker/osrm_ranker.go b/integration/service/oasis/spatialindexer/ranker/osrm_ranker.go similarity index 81% rename from integration/service/spatialindexer/ranker/osrm_ranker.go rename to integration/service/oasis/spatialindexer/ranker/osrm_ranker.go index 72184fe64d6..3665b58ee39 100644 --- a/integration/service/spatialindexer/ranker/osrm_ranker.go +++ b/integration/service/oasis/spatialindexer/ranker/osrm_ranker.go @@ -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 { diff --git a/integration/service/spatialindexer/ranker/osrm_ranker_test.go b/integration/service/oasis/spatialindexer/ranker/osrm_ranker_test.go similarity index 97% rename from integration/service/spatialindexer/ranker/osrm_ranker_test.go rename to integration/service/oasis/spatialindexer/ranker/osrm_ranker_test.go index db51ef61b0d..18d3e5f3b00 100644 --- a/integration/service/spatialindexer/ranker/osrm_ranker_test.go +++ b/integration/service/oasis/spatialindexer/ranker/osrm_ranker_test.go @@ -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) { diff --git a/integration/service/spatialindexer/ranker/rank_agent.go b/integration/service/oasis/spatialindexer/ranker/rank_agent.go similarity index 91% rename from integration/service/spatialindexer/ranker/rank_agent.go rename to integration/service/oasis/spatialindexer/ranker/rank_agent.go index ef8c7ec647b..ef72a897a98 100644 --- a/integration/service/spatialindexer/ranker/rank_agent.go +++ b/integration/service/oasis/spatialindexer/ranker/rank_agent.go @@ -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 diff --git a/integration/service/spatialindexer/ranker/rank_agent_test.go b/integration/service/oasis/spatialindexer/ranker/rank_agent_test.go similarity index 97% rename from integration/service/spatialindexer/ranker/rank_agent_test.go rename to integration/service/oasis/spatialindexer/ranker/rank_agent_test.go index ee1ac9fa4a1..7ef7ae660bf 100644 --- a/integration/service/spatialindexer/ranker/rank_agent_test.go +++ b/integration/service/oasis/spatialindexer/ranker/rank_agent_test.go @@ -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) { diff --git a/integration/service/spatialindexer/ranker/rank_by_great_circle_distance_impl.go b/integration/service/oasis/spatialindexer/ranker/rank_by_great_circle_distance_impl.go similarity index 92% rename from integration/service/spatialindexer/ranker/rank_by_great_circle_distance_impl.go rename to integration/service/oasis/spatialindexer/ranker/rank_by_great_circle_distance_impl.go index ba34692a109..f41316e6edd 100644 --- a/integration/service/spatialindexer/ranker/rank_by_great_circle_distance_impl.go +++ b/integration/service/oasis/spatialindexer/ranker/rank_by_great_circle_distance_impl.go @@ -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" ) diff --git a/integration/service/spatialindexer/ranker/rank_by_osrm_shortest_path_impl.go b/integration/service/oasis/spatialindexer/ranker/rank_by_osrm_shortest_path_impl.go similarity index 97% rename from integration/service/spatialindexer/ranker/rank_by_osrm_shortest_path_impl.go rename to integration/service/oasis/spatialindexer/ranker/rank_by_osrm_shortest_path_impl.go index dcc3bf78e27..9281c286b27 100644 --- a/integration/service/spatialindexer/ranker/rank_by_osrm_shortest_path_impl.go +++ b/integration/service/oasis/spatialindexer/ranker/rank_by_osrm_shortest_path_impl.go @@ -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" ) diff --git a/integration/service/spatialindexer/ranker/rank_by_osrm_shortest_path_impl_test.go b/integration/service/oasis/spatialindexer/ranker/rank_by_osrm_shortest_path_impl_test.go similarity index 98% rename from integration/service/spatialindexer/ranker/rank_by_osrm_shortest_path_impl_test.go rename to integration/service/oasis/spatialindexer/ranker/rank_by_osrm_shortest_path_impl_test.go index efc3931387a..7cfca0c4bbd 100644 --- a/integration/service/spatialindexer/ranker/rank_by_osrm_shortest_path_impl_test.go +++ b/integration/service/oasis/spatialindexer/ranker/rank_by_osrm_shortest_path_impl_test.go @@ -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) { diff --git a/integration/service/spatialindexer/ranker/ranker_factory.go b/integration/service/oasis/spatialindexer/ranker/ranker_factory.go similarity index 78% rename from integration/service/spatialindexer/ranker/ranker_factory.go rename to integration/service/oasis/spatialindexer/ranker/ranker_factory.go index 4ae51344b98..4e93b73e4c3 100644 --- a/integration/service/spatialindexer/ranker/ranker_factory.go +++ b/integration/service/oasis/spatialindexer/ranker/ranker_factory.go @@ -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 ( diff --git a/integration/service/spatialindexer/ranker/simple_ranker.go b/integration/service/oasis/spatialindexer/ranker/simple_ranker.go similarity index 87% rename from integration/service/spatialindexer/ranker/simple_ranker.go rename to integration/service/oasis/spatialindexer/ranker/simple_ranker.go index 09c8e9c5211..36ae91be213 100644 --- a/integration/service/spatialindexer/ranker/simple_ranker.go +++ b/integration/service/oasis/spatialindexer/ranker/simple_ranker.go @@ -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 { } diff --git a/integration/service/spatialindexer/ranker/simple_ranker_test.go b/integration/service/oasis/spatialindexer/ranker/simple_ranker_test.go similarity index 96% rename from integration/service/spatialindexer/ranker/simple_ranker_test.go rename to integration/service/oasis/spatialindexer/ranker/simple_ranker_test.go index a54d1b07882..02e951c6274 100644 --- a/integration/service/spatialindexer/ranker/simple_ranker_test.go +++ b/integration/service/oasis/spatialindexer/ranker/simple_ranker_test.go @@ -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) { diff --git a/integration/service/spatialindexer/s2indexer/builder.go b/integration/service/oasis/spatialindexer/s2indexer/builder.go similarity index 94% rename from integration/service/spatialindexer/s2indexer/builder.go rename to integration/service/oasis/spatialindexer/s2indexer/builder.go index b9954d881ea..5c32bafc0be 100644 --- a/integration/service/spatialindexer/s2indexer/builder.go +++ b/integration/service/oasis/spatialindexer/s2indexer/builder.go @@ -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" ) diff --git a/integration/service/spatialindexer/s2indexer/builder_test.go b/integration/service/oasis/spatialindexer/s2indexer/builder_test.go similarity index 99% rename from integration/service/spatialindexer/s2indexer/builder_test.go rename to integration/service/oasis/spatialindexer/s2indexer/builder_test.go index 2b221f47d56..c8ebf29c1b8 100644 --- a/integration/service/spatialindexer/s2indexer/builder_test.go +++ b/integration/service/oasis/spatialindexer/s2indexer/builder_test.go @@ -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" ) diff --git a/integration/service/spatialindexer/s2indexer/dumper.go b/integration/service/oasis/spatialindexer/s2indexer/dumper.go similarity index 100% rename from integration/service/spatialindexer/s2indexer/dumper.go rename to integration/service/oasis/spatialindexer/s2indexer/dumper.go diff --git a/integration/service/spatialindexer/s2indexer/dumper_test.go b/integration/service/oasis/spatialindexer/s2indexer/dumper_test.go similarity index 94% rename from integration/service/spatialindexer/s2indexer/dumper_test.go rename to integration/service/oasis/spatialindexer/s2indexer/dumper_test.go index 6ac69d16df7..f0009665dd7 100644 --- a/integration/service/spatialindexer/s2indexer/dumper_test.go +++ b/integration/service/oasis/spatialindexer/s2indexer/dumper_test.go @@ -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" ) diff --git a/integration/service/spatialindexer/s2indexer/indexer.go b/integration/service/oasis/spatialindexer/s2indexer/indexer.go similarity index 96% rename from integration/service/spatialindexer/s2indexer/indexer.go rename to integration/service/oasis/spatialindexer/s2indexer/indexer.go index 053adbf2276..a3e3563d275 100644 --- a/integration/service/spatialindexer/s2indexer/indexer.go +++ b/integration/service/oasis/spatialindexer/s2indexer/indexer.go @@ -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" ) diff --git a/integration/service/spatialindexer/s2indexer/spatial_query.go b/integration/service/oasis/spatialindexer/s2indexer/spatial_query.go similarity index 96% rename from integration/service/spatialindexer/s2indexer/spatial_query.go rename to integration/service/oasis/spatialindexer/s2indexer/spatial_query.go index ed5942f7a9a..1104a946218 100644 --- a/integration/service/spatialindexer/s2indexer/spatial_query.go +++ b/integration/service/oasis/spatialindexer/s2indexer/spatial_query.go @@ -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" diff --git a/integration/service/spatialindexer/s2indexer/spatial_query_test.go b/integration/service/oasis/spatialindexer/s2indexer/spatial_query_test.go similarity index 99% rename from integration/service/spatialindexer/s2indexer/spatial_query_test.go rename to integration/service/oasis/spatialindexer/s2indexer/spatial_query_test.go index 191fa503b9f..851bd40d057 100644 --- a/integration/service/spatialindexer/s2indexer/spatial_query_test.go +++ b/integration/service/oasis/spatialindexer/s2indexer/spatial_query_test.go @@ -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" ) diff --git a/integration/oasis/stationfinder/basic_finder.go b/integration/service/oasis/stationfinder/basic_finder.go similarity index 95% rename from integration/oasis/stationfinder/basic_finder.go rename to integration/service/oasis/stationfinder/basic_finder.go index 96ac30200e3..e0cc3325841 100644 --- a/integration/oasis/stationfinder/basic_finder.go +++ b/integration/service/oasis/stationfinder/basic_finder.go @@ -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" ) diff --git a/integration/oasis/stationfinder/basic_finder_test.go b/integration/service/oasis/stationfinder/basic_finder_test.go similarity index 100% rename from integration/oasis/stationfinder/basic_finder_test.go rename to integration/service/oasis/stationfinder/basic_finder_test.go diff --git a/integration/oasis/stationfinder/dest_iterator.go b/integration/service/oasis/stationfinder/dest_iterator.go similarity index 100% rename from integration/oasis/stationfinder/dest_iterator.go rename to integration/service/oasis/stationfinder/dest_iterator.go diff --git a/integration/oasis/stationfinder/dest_station_finder.go b/integration/service/oasis/stationfinder/dest_station_finder.go similarity index 89% rename from integration/oasis/stationfinder/dest_station_finder.go rename to integration/service/oasis/stationfinder/dest_station_finder.go index 1812c00d38d..2674bffaa10 100644 --- a/integration/oasis/stationfinder/dest_station_finder.go +++ b/integration/service/oasis/stationfinder/dest_station_finder.go @@ -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 diff --git a/integration/oasis/stationfinder/dest_station_finder_test.go b/integration/service/oasis/stationfinder/dest_station_finder_test.go similarity index 100% rename from integration/oasis/stationfinder/dest_station_finder_test.go rename to integration/service/oasis/stationfinder/dest_station_finder_test.go diff --git a/integration/oasis/stationfinder/doc.go b/integration/service/oasis/stationfinder/doc.go similarity index 100% rename from integration/oasis/stationfinder/doc.go rename to integration/service/oasis/stationfinder/doc.go diff --git a/integration/oasis/stationfinder/low_energy_location_station_finder.go b/integration/service/oasis/stationfinder/low_energy_location_station_finder.go similarity index 86% rename from integration/oasis/stationfinder/low_energy_location_station_finder.go rename to integration/service/oasis/stationfinder/low_energy_location_station_finder.go index 7148652bce6..66c91ffa3a7 100644 --- a/integration/oasis/stationfinder/low_energy_location_station_finder.go +++ b/integration/service/oasis/stationfinder/low_energy_location_station_finder.go @@ -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 diff --git a/integration/oasis/stationfinder/low_energy_location_station_finder_test.go b/integration/service/oasis/stationfinder/low_energy_location_station_finder_test.go similarity index 100% rename from integration/oasis/stationfinder/low_energy_location_station_finder_test.go rename to integration/service/oasis/stationfinder/low_energy_location_station_finder_test.go diff --git a/integration/oasis/stationfinder/orig_iterator.go b/integration/service/oasis/stationfinder/orig_iterator.go similarity index 100% rename from integration/oasis/stationfinder/orig_iterator.go rename to integration/service/oasis/stationfinder/orig_iterator.go diff --git a/integration/oasis/stationfinder/orig_station_finder.go b/integration/service/oasis/stationfinder/orig_station_finder.go similarity index 87% rename from integration/oasis/stationfinder/orig_station_finder.go rename to integration/service/oasis/stationfinder/orig_station_finder.go index 51196a3bb70..5b8d0ee0ef6 100644 --- a/integration/oasis/stationfinder/orig_station_finder.go +++ b/integration/service/oasis/stationfinder/orig_station_finder.go @@ -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 diff --git a/integration/oasis/stationfinder/orig_station_finder_test.go b/integration/service/oasis/stationfinder/orig_station_finder_test.go similarity index 100% rename from integration/oasis/stationfinder/orig_station_finder_test.go rename to integration/service/oasis/stationfinder/orig_station_finder_test.go diff --git a/integration/oasis/stationfinder/stations_iterator.go b/integration/service/oasis/stationfinder/stations_iterator.go similarity index 100% rename from integration/oasis/stationfinder/stations_iterator.go rename to integration/service/oasis/stationfinder/stations_iterator.go diff --git a/integration/oasis/stationfinder/stations_iterator_alg.go b/integration/service/oasis/stationfinder/stations_iterator_alg.go similarity index 97% rename from integration/oasis/stationfinder/stations_iterator_alg.go rename to integration/service/oasis/stationfinder/stations_iterator_alg.go index f596485dafb..384ec166294 100644 --- a/integration/oasis/stationfinder/stations_iterator_alg.go +++ b/integration/service/oasis/stationfinder/stations_iterator_alg.go @@ -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" ) diff --git a/integration/oasis/stationfinder/stations_iterator_alg_test.go b/integration/service/oasis/stationfinder/stations_iterator_alg_test.go similarity index 98% rename from integration/oasis/stationfinder/stations_iterator_alg_test.go rename to integration/service/oasis/stationfinder/stations_iterator_alg_test.go index 58a4036c741..a0d489d067b 100644 --- a/integration/oasis/stationfinder/stations_iterator_alg_test.go +++ b/integration/service/oasis/stationfinder/stations_iterator_alg_test.go @@ -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" ) diff --git a/integration/oasis/stationgraph/doc.go b/integration/service/oasis/stationgraph/doc.go similarity index 100% rename from integration/oasis/stationgraph/doc.go rename to integration/service/oasis/stationgraph/doc.go diff --git a/integration/oasis/stationgraph/edge.go b/integration/service/oasis/stationgraph/edge.go similarity index 100% rename from integration/oasis/stationgraph/edge.go rename to integration/service/oasis/stationgraph/edge.go diff --git a/integration/oasis/stationgraph/graph.go b/integration/service/oasis/stationgraph/graph.go similarity index 96% rename from integration/oasis/stationgraph/graph.go rename to integration/service/oasis/stationgraph/graph.go index 39cd8794e42..4843884ef24 100644 --- a/integration/oasis/stationgraph/graph.go +++ b/integration/service/oasis/stationgraph/graph.go @@ -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" ) diff --git a/integration/oasis/stationgraph/graph_test.go b/integration/service/oasis/stationgraph/graph_test.go similarity index 99% rename from integration/oasis/stationgraph/graph_test.go rename to integration/service/oasis/stationgraph/graph_test.go index c82f62de7ff..54cb15d9bbc 100644 --- a/integration/oasis/stationgraph/graph_test.go +++ b/integration/service/oasis/stationgraph/graph_test.go @@ -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) { diff --git a/integration/oasis/stationgraph/node.go b/integration/service/oasis/stationgraph/node.go similarity index 95% rename from integration/oasis/stationgraph/node.go rename to integration/service/oasis/stationgraph/node.go index 67101683dff..7045b0c77ea 100644 --- a/integration/oasis/stationgraph/node.go +++ b/integration/service/oasis/stationgraph/node.go @@ -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" ) diff --git a/integration/oasis/stationgraph/priority_queue.go b/integration/service/oasis/stationgraph/priority_queue.go similarity index 100% rename from integration/oasis/stationgraph/priority_queue.go rename to integration/service/oasis/stationgraph/priority_queue.go diff --git a/integration/oasis/stationgraph/priority_queue_test.go b/integration/service/oasis/stationgraph/priority_queue_test.go similarity index 100% rename from integration/oasis/stationgraph/priority_queue_test.go rename to integration/service/oasis/stationgraph/priority_queue_test.go diff --git a/integration/oasis/stationgraph/query_heap.go b/integration/service/oasis/stationgraph/query_heap.go similarity index 100% rename from integration/oasis/stationgraph/query_heap.go rename to integration/service/oasis/stationgraph/query_heap.go diff --git a/integration/oasis/stationgraph/query_heap_test.go b/integration/service/oasis/stationgraph/query_heap_test.go similarity index 100% rename from integration/oasis/stationgraph/query_heap_test.go rename to integration/service/oasis/stationgraph/query_heap_test.go diff --git a/integration/oasis/stationgraph/station_graph.go b/integration/service/oasis/stationgraph/station_graph.go similarity index 96% rename from integration/oasis/stationgraph/station_graph.go rename to integration/service/oasis/stationgraph/station_graph.go index c42aa2736bb..50f5218263a 100644 --- a/integration/oasis/stationgraph/station_graph.go +++ b/integration/service/oasis/stationgraph/station_graph.go @@ -1,10 +1,10 @@ package stationgraph import ( - "github.com/Telenav/osrm-backend/integration/oasis/chargingstrategy" - "github.com/Telenav/osrm-backend/integration/oasis/solution" - "github.com/Telenav/osrm-backend/integration/oasis/stationfinder" "github.com/Telenav/osrm-backend/integration/pkg/api/nav" + "github.com/Telenav/osrm-backend/integration/service/oasis/chargingstrategy" + "github.com/Telenav/osrm-backend/integration/service/oasis/solution" + "github.com/Telenav/osrm-backend/integration/service/oasis/stationfinder" "github.com/golang/glog" ) diff --git a/integration/oasis/stationgraph/station_graph_test.go b/integration/service/oasis/stationgraph/station_graph_test.go similarity index 98% rename from integration/oasis/stationgraph/station_graph_test.go rename to integration/service/oasis/stationgraph/station_graph_test.go index 996f6d9c6e9..b7a4072b4bc 100644 --- a/integration/oasis/stationgraph/station_graph_test.go +++ b/integration/service/oasis/stationgraph/station_graph_test.go @@ -6,10 +6,10 @@ import ( "reflect" "testing" - "github.com/Telenav/osrm-backend/integration/oasis/chargingstrategy" - "github.com/Telenav/osrm-backend/integration/oasis/solution" - "github.com/Telenav/osrm-backend/integration/oasis/stationfinder" "github.com/Telenav/osrm-backend/integration/pkg/api/nav" + "github.com/Telenav/osrm-backend/integration/service/oasis/chargingstrategy" + "github.com/Telenav/osrm-backend/integration/service/oasis/solution" + "github.com/Telenav/osrm-backend/integration/service/oasis/stationfinder" "github.com/Telenav/osrm-backend/integration/util" )