Merge branch 'master-telenav' into feature/update-oasis-api

Telenav · Jan 21, 2020 · 2a5b2f8 · 2a5b2f8
2 parents 2bd0ada + 1fce7e5
commit 2a5b2f8
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/integration/cmd/search-adhoc-request/main.go b/integration/cmd/search-adhoc-request/main.go
@@ -8,6 +8,7 @@ import (
 
 	"github.com/Telenav/osrm-backend/integration/pkg/api/search/coordinate"
 	"github.com/Telenav/osrm-backend/integration/pkg/api/search/nearbychargestation"
+	"github.com/Telenav/osrm-backend/integration/pkg/backend"
 )
 
 func main() {
@@ -31,7 +32,7 @@ func main() {
 	req.APISignature = flags.apiSignature
 	req.Location = coordinate.Coordinate{Lat: 37.78509, Lon: -122.41988}
 
-	clt := http.Client{Timeout: 60000000000}
+	clt := http.Client{Timeout: backend.Timeout()}
 	requestURL := flags.entityEndpoint + req.RequestURI()
 	fmt.Println(requestURL)
 	resp, err := clt.Get(requestURL)

diff --git a/integration/pkg/api/search/coordinate/coordinate.go b/integration/pkg/api/search/coordinate/coordinate.go
@@ -8,6 +8,7 @@ import (
 	"github.com/Telenav/osrm-backend/integration/pkg/api"
 )
 
+// Coordinate represents lat/lon of a GPS point.
 type Coordinate struct {
 	Lat float64
 	Lon float64

diff --git a/integration/pkg/api/search/nearbychargestation/request.go b/integration/pkg/api/search/nearbychargestation/request.go
@@ -26,6 +26,10 @@ type Request struct {
 	Limit        int
 }
 
+<<<<<<< HEAD
+=======
+// NewRequest create an empty entity Request.
+>>>>>>> master-telenav
 func NewRequest() *Request {
 	return &Request{
 		// Path

diff --git a/integration/pkg/api/search/nearbychargestation/response.go b/integration/pkg/api/search/nearbychargestation/response.go
@@ -53,5 +53,5 @@ type EVConnector struct {
 // ConnectorCount contains charge level and related count
 type ConnectorCount struct {
 	Level int `json:"level"`
-	Total int `total:"total"`
+	Total int `json:"total"`
 }