Fixed bug preventing decoding of geometrycollections with one element

Author: bryanjos

CHANGELOG.md

@@ -1,3 +1,7 @@
+# v1.1.2
+* Bug Fixes
+  * WKBs that are GeometryCollections with one element should now properly decode
+
 # v1.1.1
 * Enhancements
   * Added `Geo.JSON.EncodeError` and `Geo.JSON.DecodeError` thrown whenever `Geo.JSON.encode` or `Geo.JSON.decode` are given invalid data

lib/geo/wkb.ex

@@ -14,7 +14,7 @@ defmodule Geo.WKB do
 
   @moduledoc """
   Converts to and from WKB and EWKB
-  
+
       point = Geo.WKB.decode("0101000000000000000000F03F000000000000F03F")
       Geo.Point[coordinates: {1, 1}, srid: nil]
 
@@ -168,7 +168,9 @@ defmodule Geo.WKB do
     geometries =
       case type do
         %Geo.GeometryCollection{} ->
-          coordinates = Enum.map(coordinates, fn(x) -> %{ x | srid: srid } end)
+          coordinates = coordinates
+          |> Enum.map(fn(x) -> %{ x | srid: srid } end)
+
           %{ type | geometries: coordinates, srid: srid  }
         _ ->
           geometries ++ [ %{ type | coordinates: coordinates, srid: srid  }]
@@ -224,7 +226,8 @@ defmodule Geo.WKB do
 
   defp decode_coordinates(%GeometryCollection{}, wkb_reader) do
     {_number_of_items, wkb_reader} = Reader.read(wkb_reader, 8)
-    { decode(Reader.get_wkb(wkb_reader)), Reader.start("00") }
+    geometries = decode(Reader.get_wkb(wkb_reader))
+    { List.wrap(geometries), Reader.start("00") }
   end
 
   defp decode_coordinates(_geom, wkb_reader) do

mix.exs

@@ -3,7 +3,7 @@ defmodule Geo.Mixfile do
 
   def project do
     [ app: :geo,
-      version: "1.1.1",
+      version: "1.1.2",
       elixir: "~> 1.0",
       deps: deps,
       description: description,

test/geo/wkb_test.exs

@@ -156,4 +156,22 @@ defmodule Geo.WKB.Test do
     {-8.91605728674111, 37.014786050505705}]]])
   end
 
+  test "Decoding of GeometryCollection with one geometry" do
+    geom = %Geo.GeometryCollection{geometries: [%Geo.Point{ coordinates: {54.1745659, 15.5398456}, srid: 4326 }], srid: 4326 }
+    wkb = Geo.WKB.encode(geom)
+    geodata = Geo.WKB.decode(wkb)
+
+    assert wkb == "0020000007000010E6000000010000000001404B16582CE7BF97402F1466A479C76C"
+    assert geom == geodata
+  end
+
+  test "Decoding of GeometryCollection with two geometries" do
+    geom = %Geo.GeometryCollection{geometries: [%Geo.Point{ coordinates: {54.1745659, 15.5398456}, srid: 4326 },
+                                                %Geo.Point{ coordinates: {54.1745659, 15.5398456}, srid: 4326 }], srid: 4326 }
+    wkb = Geo.WKB.encode(geom)
+    geodata = Geo.WKB.decode(wkb)
+
+    assert geom == geodata
+  end
+
 end