Merge pull request #5 from phoops/geo-json

Added GeoJSON attribute to TestEntityMarshal test.

Author: tlinford

model/model.go

@@ -743,8 +743,6 @@ func (a *Attribute) GetAsGeoJSON() (*geojson.Geometry, error) {
 	if a.Type != GeoJSONType {
 		return nil, fmt.Errorf("Attribute is not geo:json, but '%s'", a.Type)
 	}
-	fmt.Println("type:", reflect.TypeOf(a.Value))
-	fmt.Println(a.Value)
 	g, ok := a.Value.(*geojson.Geometry)
 	if !ok {
 		return nil, fmt.Errorf("Attribute with geo:json type does not contain geo:json value")

model/model_test.go

@@ -2,6 +2,7 @@ package model_test
 
 import (
 	"encoding/json"
+	geojson "github.com/paulmach/go.geojson"
 	"testing"
 	"time"
 
@@ -323,6 +324,9 @@ func TestEntityMarshal(t *testing.T) {
 		t.Fatal("Expected an error for an invalid attribute")
 	}
 
+	geoJsonPoint := geojson.NewPointGeometry([]float64{4.1, 2.3})
+	office.SetAttributeAsGeoJSON("position", geoJsonPoint)
+
 	bytes, err := json.Marshal(office)
 	if err != nil {
 		t.Fatalf("Unexpected error: '%v'", err)
@@ -436,6 +440,22 @@ func TestEntityMarshal(t *testing.T) {
 			}
 		}
 	}
+
+	if positionAttr, err := unmarshaled.GetAttribute("position"); err != nil {
+		t.Fatalf("Unexpected error: '%v'", err)
+	} else {
+		if positionVal, err := positionAttr.GetAsGeoJSON(); err != nil {
+			t.Fatalf("Unexpected error: '%v'", err)
+		} else {
+			if !positionVal.IsPoint() {
+				t.Fatalf("Expected '%v' for position type == point, got '%v'", true, positionVal.IsPoint())
+			}
+
+			if positionVal.Point[0] != geoJsonPoint.Point[0] || positionVal.Point[1] != geoJsonPoint.Point[1] {
+				t.Fatalf("Expected '%v' for location value, got '%v'", geoJsonPoint.Point, positionVal.Point)
+			}
+		}
+	}
 }
 
 func TestDirectEntityAttributeAccess(t *testing.T) {
@@ -543,7 +563,7 @@ func TestDirectEntityAttributeAccess(t *testing.T) {
 
 	if lastUpdateAttrValue, err := office.GetAttributeAsDateTime("lastUpdate"); err != nil {
 		t.Fatalf("Unexpected error: '%v'", err)
-	} else if lastUpdateAttrValue.Day() != timeNow.Day() || lastUpdateAttrValue.Minute() != lastUpdateAttrValue.Minute() {
+	} else if lastUpdateAttrValue.Day() != timeNow.Day() || lastUpdateAttrValue.Minute() != timeNow.Minute() {
 		t.Fatalf("Expected '%v' for lastUpdate value, got '%v'", timeNow, lastUpdateAttrValue)
 	}