Merge pull request #119 from slofurno/polygon-holes

fix parsing polygons with multiple holes

Author: hamiltop

lib/rethinkdb/pseudotypes.ex

@@ -23,7 +23,7 @@ defmodule RethinkDB.Pseudotypes do
 
     defmodule Polygon do
       @moduledoc false
-      defstruct outer_coordinates: [], inner_coordinates: []
+      defstruct coordinates: []
     end
 
     def parse(%{"$reql_type$" => "GEOMETRY", "coordinates" => [x,y], "type" => "Point"}) do
@@ -33,11 +33,7 @@ defmodule RethinkDB.Pseudotypes do
       %Line{coordinates: Enum.map(coords, &List.to_tuple/1)}
     end
     def parse(%{"$reql_type$" => "GEOMETRY", "coordinates" => coords, "type" => "Polygon"}) do
-      {outer, inner} = case coords do
-        [outer, inner] -> {Enum.map(outer, &List.to_tuple/1), Enum.map(inner, &List.to_tuple/1)}
-        [outer | []] -> {Enum.map(outer, &List.to_tuple/1), []}
-      end
-      %Polygon{outer_coordinates: outer, inner_coordinates: inner}
+      %Polygon{coordinates: (for points <- coords, do: Enum.map points, &List.to_tuple/1)}
     end
   end
 

test/query/geospatial_test.exs

@@ -15,29 +15,38 @@ defmodule GeospatialTest do
 
   test "circle" do
     {:ok, %Record{data: data}} = circle({1,1}, 5) |> run
-    assert %Polygon{outer_coordinates: [_h | _t], inner_coordinates: []} = data
+    assert %Polygon{coordinates: [_h | []]} = data
   end
 
   test "circle with opts" do
     {:ok, %Record{data: data}} = circle({1,1}, 5, num_vertices: 100, fill: true) |> run
-    assert %Polygon{outer_coordinates: [_h | _t], inner_coordinates: []} = data
+    assert %Polygon{coordinates: [_h |[]]} = data
   end
-
   test "distance" do
     {:ok, %Record{data: data}} = distance(point({1,1}), point({2,2})) |> run
     assert data == 156876.14940188665
   end
- 
+
   test "fill" do
     {:ok, %Record{data: data}} = fill(line([{1,1}, {4,5}, {2,2}, {1,1}])) |> run
-    assert data == %Polygon{outer_coordinates: [{1,1}, {4,5}, {2,2}, {1,1}]}
+    assert data == %Polygon{coordinates: [[{1,1}, {4,5}, {2,2}, {1,1}]]}
   end
 
   test "geojson" do
     {:ok, %Record{data: data}} = geojson(%{coordinates: [1,1], type: "Point"}) |> run
     assert data == %Point{coordinates: {1,1}}
   end
 
+  test "geojson with holes" do
+    coords = [ square(0,0,10), square(1,1,1), square(4,4,1) ]
+    {:ok, %Record{data: data}} = geojson(%{type: "Polygon", coordinates: coords}) |> run
+    assert data == %Polygon{coordinates: coords}
+  end
+
+  defp square(x,y,s) do
+    [{x,y}, {x+s,y}, {x+s,y+s}, {x,y+s}, {x,y}]
+  end
+
   test "to_geojson" do
     {:ok, %Record{data: data}} = point({1,1}) |> to_geojson |> run
     assert data == %{"type" => "Point", "coordinates" => [1,1]}
@@ -82,14 +91,13 @@ defmodule GeospatialTest do
 
   test "polygon" do
     {:ok, %Record{data: data}} = polygon([{0,0}, {0,1}, {1,1}, {1,0}]) |> run
-    assert data.outer_coordinates == [{0,0}, {0,1}, {1,1}, {1,0}, {0,0}]
+    assert data.coordinates == [[{0,0}, {0,1}, {1,1}, {1,0}, {0,0}]]
   end
 
   test "polygon_sub" do
     p1 = polygon([{0,0}, {0,1}, {1,1}, {1,0}])
     p2 = polygon([{0.25,0.25}, {0.25,0.5}, {0.5,0.5}, {0.5,0.25}])
     {:ok, %Record{data: data}} = p1 |> polygon_sub(p2) |> run
-    assert data.outer_coordinates == [{0,0}, {0,1}, {1,1}, {1,0}, {0,0}]
-    assert data.inner_coordinates == [{0.25,0.25}, {0.25,0.5}, {0.5,0.5}, {0.5,0.25}, {0.25,0.25}]
+    assert data.coordinates == [[{0,0}, {0,1}, {1,1}, {1,0}, {0,0}], [{0.25,0.25}, {0.25,0.5}, {0.5,0.5}, {0.5,0.25}, {0.25,0.25}]]
   end
 end