use new context, API_KEY env for tests

context.go

@@ -1,9 +1,8 @@
 package maps
 
 import (
+	"context"
 	"net/http"
-
-	"golang.org/x/net/context"
 )
 
 type contextKey int

directions.go

@@ -1,12 +1,11 @@
 package maps
 
 import (
+	"context"
 	"fmt"
 	"net/url"
 	"strings"
 	"time"
-
-	"golang.org/x/net/context"
 )
 
 const (

distance.go

@@ -1,11 +1,10 @@
 package maps
 
 import (
+	"context"
 	"fmt"
 	"net/url"
 	"time"
-
-	"golang.org/x/net/context"
 )
 
 // DistanceMatrix requests travel distance and time for a matrix of origins and destinations.

elevation.go

@@ -1,10 +1,9 @@
 package maps
 
 import (
+	"context"
 	"fmt"
 	"net/url"
-
-	"golang.org/x/net/context"
 )
 
 // Elevation requests elevation data for a series of locations.

geocode.go

@@ -1,11 +1,10 @@
 package maps
 
 import (
+	"context"
 	"fmt"
 	"net/url"
 	"strings"
-
-	"golang.org/x/net/context"
 )
 
 const (

maps.go

@@ -1,6 +1,7 @@
 package maps
 
 import (
+	"context"
 	"crypto/hmac"
 	"crypto/sha1"
 	"encoding/base64"
@@ -8,8 +9,6 @@ import (
 	"fmt"
 	"net/http"
 	"strings"
-
-	"golang.org/x/net/context"
 )
 
 const (

maps_test.go

@@ -1,22 +1,25 @@
 package maps
 
 import (
-	"flag"
 	"image/color"
+	"log"
 	"net/http"
+	"os"
 	"testing"
 	"time"
 )
 
 var (
-	apiKey = flag.String("apiKey", "", "Google Maps API key")
+	apiKey string
-
+	ctx    = NewContext("", &http.Client{})
-	ctx  = NewContext("", &http.Client{})
+	wctx   = NewWorkContext("clientID", "privKey", &http.Client{})
-	wctx = NewWorkContext("clientID", "privKey", &http.Client{})
 )
 
 func init() {
-	flag.Parse()
+	apiKey = os.Getenv("API_KEY")
+	if apiKey == "" {
+		log.Fatal("API_KEY must be provided")
+	}
 }
 
 func TestDirections(t *testing.T) {
@@ -200,7 +203,7 @@ func TestSnapToRoads(t *testing.T) {
 		t.Errorf("unexpected error, got %v, want %v", err, ErrNoAPIKey)
 	}
 
-	keyCtx := NewContext(*apiKey, &http.Client{})
+	keyCtx := NewContext(apiKey, &http.Client{})
 	r, err := SnapToRoads(keyCtx, path, opts)
 	if err != nil {
 		t.Errorf("unexpected error: %v", err)

roads.go

@@ -1,10 +1,9 @@
 package maps
 
 import (
+	"context"
 	"errors"
 	"net/url"
-
-	"code.google.com/p/go.net/context"
 )
 
 const roadsAPIBaseURL = "https://roads.googleapis.com/v1/"

static.go

@@ -1,14 +1,13 @@
 package maps
 
 import (
+	"context"
 	"fmt"
 	"image/color"
 	"io"
 	"net/http"
 	"net/url"
 	"strings"
-
-	"golang.org/x/net/context"
 )
 
 const (

streetview.go

@@ -1,12 +1,11 @@
 package maps
 
 import (
+	"context"
 	"fmt"
 	"io"
 	"net/http"
 	"net/url"
-
-	"golang.org/x/net/context"
 )
 
 // StreetView requests a static StreetView image of the requested size.

timezone.go

@@ -1,11 +1,10 @@
 package maps
 
 import (
+	"context"
 	"fmt"
 	"net/url"
 	"time"
-
-	"golang.org/x/net/context"
 )
 
 // TimeZone requests time zone information about a location.