feat! Added Address Descriptors to Geocoding response. Refactored Geo…

…coding response to allow fields outside the geocoding result to be exposed through the client.

addressdescriptor.go

@@ -14,6 +14,10 @@
 
 package maps
 
+import (
+	"fmt"
+)
+
 /**
 * An enum representing the relationship in space between the landmark and the target.
 */
@@ -22,23 +26,23 @@ type SpatialRelationship string
 const (
 	 // This is the default relationship when nothing more specific below
     // applies.
-    NEAR                   SpatialRelationship = "NEAR"
+    SPATIAL_RELATIONSHIP_NEAR                   SpatialRelationship = "NEAR"
 	// The landmark has a spatial geometry and the target is within its
 	// bounds.
-    WITHIN                 SpatialRelationship = "WITHIN"
+    SPATIAL_RELATIONSHIP_WITHIN                 SpatialRelationship = "WITHIN"
 	// The target is directly adjacent to the landmark or landmark's access
 	// point.
-    BESIDE                 SpatialRelationship = "BESIDE"
+    SPATIAL_RELATIONSHIP_BESIDE                 SpatialRelationship = "BESIDE"
 	// The target is directly opposite the landmark on the other side of the
 	// road.
-    ACROSS_THE_ROAD        SpatialRelationship = "ACROSS_THE_ROAD"
+    SPATIAL_RELATIONSHIP_ACROSS_THE_ROAD        SpatialRelationship = "ACROSS_THE_ROAD"
 	// On the same route as the landmark but not besides or across.
-    DOWN_THE_ROAD          SpatialRelationship = "DOWN_THE_ROAD"
+    SPATIAL_RELATIONSHIP_DOWN_THE_ROAD          SpatialRelationship = "DOWN_THE_ROAD"
 	// Not on the same route as the landmark but a single 'turn' away.
-    AROUND_THE_CORNER      SpatialRelationship = "AROUND_THE_CORNER"
+    SPATIAL_RELATIONSHIP_AROUND_THE_CORNER      SpatialRelationship = "AROUND_THE_CORNER"
 	// Close to the landmark's structure but further away from its access
 	// point.
-    BEHIND                 SpatialRelationship = "BEHIND"
+    SPATIAL_RELATIONSHIP_BEHIND                 SpatialRelationship = "BEHIND"
 )
 
 // String method for formatted output
@@ -57,11 +61,11 @@ const (
 	*/
     CONTAINMENT_UNSPECIFIED Containment = "CONTAINMENT_UNSPECIFIED"
 	/** The target location is within the area region, close to the center. */
-    WITHIN                  Containment = "WITHIN"
+    CONTAINMENT_WITHIN                  Containment = "WITHIN"
 	/** The target location is within the area region, close to the edge. */
-    OUTSKIRTS               Containment = "OUTSKIRTS"
+    CONTAINMENT_OUTSKIRTS               Containment = "OUTSKIRTS"
 	/** The target location is outside the area region, but close by. */
-    NEAR                    Containment = "NEAR"
+    CONTAINMENT_NEAR                    Containment = "NEAR"
 )
 
 // String method for formatted output
@@ -137,7 +141,7 @@ type Area struct {
 type AddressDescriptor struct {
 	// A ranked list of nearby landmarks. The most useful (recognizable and
   	// nearby) landmarks are ranked first.
-	Landmarks    []Landmark   `json:"landmarks"
+	Landmarks    []Landmark   `json:"landmarks"`
 	// A ranked list of containing or adjacent areas. The most useful
   // (recognizable and precise) areas are ranked first.
 	Areas        []Area       `json:"areas"`

geocoding.go

@@ -34,7 +34,7 @@ var geocodingAPI = &apiConfig{
 // Geocode makes a Geocoding API request
 func (c *Client) Geocode(ctx context.Context, r *GeocodingRequest) (GeocodingResponse, error) {
 	if r.Address == "" && len(r.Components) == 0 && r.LatLng == nil {
-		return nil, errors.New("maps: address, components and LatLng are all missing")
+		return GeocodingResponse{}, errors.New("maps: address, components and LatLng are all missing")
 	}
 
 	var response struct {
@@ -50,14 +50,14 @@ func (c *Client) Geocode(ctx context.Context, r *GeocodingRequest) (GeocodingRes
 		return GeocodingResponse{}, err
 	}
 
-	return GeocodingResponse{response.Results},, nil
+	return GeocodingResponse{response.Results, nil}, nil
 }
 
 // ReverseGeocode makes a Reverse Geocoding API request
 func (c *Client) ReverseGeocode(ctx context.Context, r *GeocodingRequest) (GeocodingResponse, error) {
 	// Since Geocode() does not allow a nil LatLng, whereas it is allowed here
 	if r.LatLng == nil && r.PlaceID == "" {
-		return nil, errors.New("maps: LatLng and PlaceID are both missing")
+		return GeocodingResponse{}, errors.New("maps: LatLng and PlaceID are both missing")
 	}
 
 	var response struct {

geocoding_test.go

@@ -701,48 +701,48 @@ func TestReverseGeocodingPlaceID(t *testing.T) {
 					PlaceID:                     "ChIJvUbrwCCoAWARX2QiHCsn5A4",
 					DisplayName:                 LocalizedText{Text: "Kinkaku-ji", LanguageCode: "en"},
 					Types:                       []string{"establishment", "place_of_worship", "point_of_interest", "tourist_attraction"},
-					SpatialRelationship:         NEAR,
+					SpatialRelationship:         SPATIAL_RELATIONSHIP_NEAR,
 					StraightLineDistanceMeters:  0.009104185,
 				},
 				{
 					PlaceID:                     "ChIJf2s61SCoAWARVtK8cnSu6zw",
 					DisplayName:                 LocalizedText{Text: "Shariden Kinkaku", LanguageCode: "en"},
 					Types:                       []string{"establishment", "place_of_worship", "point_of_interest", "tourist_attraction"},
-					SpatialRelationship:         WITHIN,
+					SpatialRelationship:         SPATIAL_RELATIONSHIP_WITHIN,
 					StraightLineDistanceMeters:  73.58092,
 				},
 				{
 					PlaceID:                     "ChIJXZeF2jipAWARNbF8pJDRjFc",
 					DisplayName:                 LocalizedText{Text: "Kyōko-chi Pond", LanguageCode: "en"},
 					Types:                       []string{"establishment", "park", "point_of_interest"},
-					SpatialRelationship:         BEHIND,
+					SpatialRelationship:         SPATIAL_RELATIONSHIP_BEHIND,
 					StraightLineDistanceMeters:  57.99922,
 				},
 				{
 					PlaceID:                     "ChIJj69vLCapAWAR0FBBPEfPeAQ",
 					DisplayName:                 LocalizedText{Text: "鹿苑寺（金閣寺）", LanguageCode: "ja"},
 					Types:                       []string{"establishment", "place_of_worship", "point_of_interest"},
-					SpatialRelationship:         WITHIN,
+					SpatialRelationship:         SPATIAL_RELATIONSHIP_WITHIN,
 					StraightLineDistanceMeters:  32.30453,
 				},
 				{
 					PlaceID:                     "ChIJ482HblCpAWARoLBXDZpv7aI",
 					DisplayName:                 LocalizedText{Text: "Kinkaku-ji Fence", LanguageCode: "en"},
 					Types:                       []string{"establishment", "point_of_interest"},
-					SpatialRelationship:         WITHIN,
+					SpatialRelationship:         SPATIAL_RELATIONSHIP_WITHIN,
 					StraightLineDistanceMeters:  99.38629,
 				},
 			},
 			Areas: []Area{
 				{
 					PlaceID:                     "ChIJe9XMwiCoAWARVrQpOsYqdBE",
 					DisplayName:                 LocalizedText{Text: "Kinkakujicho", LanguageCode: "en"},
-					Containment:                 WITHIN,
+					Containment:                 CONTAINMENT_WITHIN,
 				},
 				{
 					PlaceID:                     "ChIJk-6T5COoAWARa-KMWGWzrwQ",
 					DisplayName:                 LocalizedText{Text: "Kinkaku-ji", LanguageCode: "en"},
-					Containment:                 OUTSKIRTS,
+					Containment:                 CONTAINMENT_OUTSKIRTS,
 				},
 			},
 		},