Change Primitive to Polygon

circle.go

@@ -159,8 +159,8 @@ func (g *Circle) Spatial() Spatial {
 	return g.getObject().Spatial()
 }
 
-// Primative returns a primative GeoJSON object. Either a Polygon or Point.
-func (g *Circle) Primative() Object {
+// Polygon returns the circle as a GeoJSON Polygon.
+func (g *Circle) Polygon() Object {
 	return g.getObject()
 }
 
@@ -173,7 +173,13 @@ func (g *Circle) getObject() Object {
 
 func makeCircleObject(center geometry.Point, meters float64, steps int) Object {
 	if meters <= 0 {
-		return NewPoint(center)
+		// Use a zero area rectangle
+		gPoly := new(Polygon)
+		gPoly.base.Exterior = geometry.Rect{
+			Min: center,
+			Max: center,
+		}
+		return gPoly
 	}
 	meters = geo.NormalizeDistance(meters)
 	points := make([]geometry.Point, 0, steps+1)

rect.go

@@ -36,20 +36,15 @@ func (g *Rect) Center() geometry.Point {
 	return g.base.Center()
 }
 
-// Primative returns a primative GeoJSON object. Either a Polygon or Point.
-func (g *Rect) Primative() Object {
-	if g.base.Min == g.base.Max {
-		gPoint := new(Point)
-		gPoint.base = g.base.Min
-		return gPoint
-	}
+// Polygon returns the Rect as a GeoJSON Polygon.
+func (g *Rect) Polygon() Object {
 	gPoly := new(Polygon)
 	gPoly.base.Exterior = g.base
 	return gPoly
 }
 
 func (g *Rect) AppendJSON(dst []byte) []byte {
-	return g.Primative().AppendJSON(dst)
+	return g.Polygon().AppendJSON(dst)
 }
 
 func (g *Rect) JSON() string {