Adds driver filters

lib/xuber/cell.ex

@@ -46,7 +46,7 @@ defmodule XUber.Cell do
  results =
  state.pids
  |> Enum.into([])
- |> Enum.filter(fn {_pid, %{traits: traits}} -> filters -- traits == [] end)
+ |> Enum.filter(fn {_pid, %{traits: traits}} -> subset?(traits, filters) end)
  |> Enum.map(fn {pid, %{position: to}} -> {pid, to, Geometry.distance(from, to)} end)
  |> Enum.filter(fn {_pid, _position, distance} -> distance < radius end)
 
@@ -62,4 +62,11 @@ defmodule XUber.Cell do
 
  %{state | pids: Map.delete(state.pids, pid)}
  end
+
+ defp subset?(traits, filters) do
+ traits = MapSet.new(traits)
+ filters = MapSet.new(filters)
+
+ MapSet.subset?(traits, filters)
+ end
 end

lib/xuber/dispatcher.ex

@@ -52,12 +52,11 @@ defmodule XUber.Dispatcher do
  end
 
  defp find_driver(passenger, coordinates) do
- nearest = Grid.nearby(coordinates, @search_radius)
+ nearest = Grid.nearby(coordinates, @search_radius, [:driver])
 
  {driver, _position, _distance} =
  nearest
  |> Enum.filter(fn {pid, _position, _distance} -> pid !== passenger end)
- # TODO: ensure it's an available driver
  |> List.first()
 
  {:ok, driver}

lib/xuber/grid.ex

@@ -27,10 +27,10 @@ defmodule XUber.Grid do
  def update(pid, last_position, new_position),
  do: call(last_position, {:update, pid, new_position})
 
- def nearby(coordinates, radius, options \\ []) do
+ def nearby(coordinates, radius, filters \\ []) do
  coordinates
  |> surrounding(radius)
- |> Enum.map(&call(&1, {:nearby, coordinates, radius, options}))
+ |> Enum.map(&call(&1, {:nearby, coordinates, radius, filters}))
  |> Enum.map(fn {:ok, response} -> response end)
  |> List.flatten()
  |> Enum.sort(fn {_, _, a}, {_, _, b} -> a >= b end)