diff --git a/lib/teslamate/application.ex b/lib/teslamate/application.ex index 55ae7bf5..a721485c 100644 --- a/lib/teslamate/application.ex +++ b/lib/teslamate/application.ex @@ -9,7 +9,7 @@ defmodule TeslaMate.Application do TeslaMate.Api, TeslaMate.Locations, TeslaMateWeb.Endpoint, - TeslaMate.Mapping, + TeslaMate.Terrain, TeslaMate.Vehicles, if(mqtt_enabled?(), do: TeslaMate.Mqtt), TeslaMate.Repair diff --git a/lib/teslamate/log.ex b/lib/teslamate/log.ex index 7fcfc185..8765298e 100644 --- a/lib/teslamate/log.ex +++ b/lib/teslamate/log.ex @@ -9,7 +9,7 @@ defmodule TeslaMate.Log do import Ecto.Query, warn: false alias __MODULE__.{Car, Drive, Update, ChargingProcess, Charge, Position, State} - alias TeslaMate.{Repo, Locations, Mapping, Settings} + alias TeslaMate.{Repo, Locations, Terrain, Settings} alias TeslaMate.Locations.GeoFence alias TeslaMate.Settings.{CarSettings, GlobalSettings} @@ -90,13 +90,13 @@ defmodule TeslaMate.Log do ## Position - @mapping (case Mix.env() do - :test -> MappingMock - _____ -> Mapping + @terrain (case Mix.env() do + :test -> TerrainMock + _____ -> Terrain end) def insert_position(%Drive{id: id, car_id: car_id}, attrs) do - elevation = @mapping.get_elevation({attrs.latitude, attrs.longitude}) + elevation = @terrain.get_elevation({attrs.latitude, attrs.longitude}) attrs = Map.put(attrs, :elevation, elevation) %Position{car_id: car_id, drive_id: id} @@ -105,7 +105,7 @@ defmodule TeslaMate.Log do end def insert_position(%Car{id: id}, attrs) do - elevation = @mapping.get_elevation({attrs.latitude, attrs.longitude}) + elevation = @terrain.get_elevation({attrs.latitude, attrs.longitude}) attrs = Map.put(attrs, :elevation, elevation) %Position{car_id: id} diff --git a/lib/teslamate/mapping.ex b/lib/teslamate/terrain.ex similarity index 99% rename from lib/teslamate/mapping.ex rename to lib/teslamate/terrain.ex index c9d86012..515eac51 100644 --- a/lib/teslamate/mapping.ex +++ b/lib/teslamate/terrain.ex @@ -1,4 +1,4 @@ -defmodule TeslaMate.Mapping do +defmodule TeslaMate.Terrain do use GenStateMachine require Logger diff --git a/test/support/mocks/mapping.ex b/test/support/mocks/mapping.ex index bd4ded37..9b7c375e 100644 --- a/test/support/mocks/mapping.ex +++ b/test/support/mocks/mapping.ex @@ -1,4 +1,4 @@ -defmodule MappingMock do +defmodule TerrainMock do def get_elevation({_lat, _lng}) do nil end diff --git a/test/teslamate/mapping/update_positions_test.exs b/test/teslamate/mapping/update_positions_test.exs index 5ca927b9..c07316a6 100644 --- a/test/teslamate/mapping/update_positions_test.exs +++ b/test/teslamate/mapping/update_positions_test.exs @@ -1,7 +1,7 @@ -defmodule TeslaMate.Mapping.UpdatePositionsTest do +defmodule TeslaMate.Terrain.UpdatePositionsTest do use TeslaMate.DataCase - alias TeslaMate.{Log, Mapping} + alias TeslaMate.{Log, Terrain} alias TeslaMate.Log.Position defp start_mapping(name, responses) do @@ -10,7 +10,7 @@ defmodule TeslaMate.Mapping.UpdatePositionsTest do {:ok, _pid} = start_supervised({SRTMMock, name: srtm_name, pid: self(), responses: responses}) {:ok, _} = - start_supervised({Mapping, name: name, timeout: 100, deps_srtm: {SRTMMock, srtm_name}}) + start_supervised({Terrain, name: name, timeout: 100, deps_srtm: {SRTMMock, srtm_name}}) :ok end @@ -38,9 +38,9 @@ defmodule TeslaMate.Mapping.UpdatePositionsTest do }) # blocked - assert Mapping.get_elevation(name, {0, 0}) == nil - assert Mapping.get_elevation(name, {0, 0}) == nil - assert Mapping.get_elevation(name, {0, 0}) == nil + assert Terrain.get_elevation(name, {0, 0}) == nil + assert Terrain.get_elevation(name, {0, 0}) == nil + assert Terrain.get_elevation(name, {0, 0}) == nil for {_, i} <- Enum.with_index(positions) do if i in [50, 150] do diff --git a/test/teslamate/mapping_test.exs b/test/teslamate/mapping_test.exs index e6fbacb5..3c57b152 100644 --- a/test/teslamate/mapping_test.exs +++ b/test/teslamate/mapping_test.exs @@ -1,7 +1,7 @@ -defmodule TeslaMate.MappingTest do +defmodule TeslaMate.TerrainTest do use TeslaMate.DataCase, async: true - alias TeslaMate.Mapping + alias TeslaMate.Terrain def start_mapping(name, responses \\ %{}) do log_name = :"log_#{name}" @@ -17,7 +17,7 @@ defmodule TeslaMate.MappingTest do deps_srtm: {SRTMMock, srtm_name} ] - {:ok, _} = start_supervised({Mapping, opts}) + {:ok, _} = start_supervised({Terrain, opts}) assert_receive {:get_positions_without_elevation, 0} :ok @@ -27,7 +27,7 @@ defmodule TeslaMate.MappingTest do test "return the elevation", %{test: name} do :ok = start_mapping(name, %{{0, 0} => fn -> {:ok, 42} end}) - assert 42 == Mapping.get_elevation(name, {0, 0}) + assert 42 == Terrain.get_elevation(name, {0, 0}) assert_received {SRTM, {:get_elevation, %SRTM.Client{}, 0, 0}} refute_receive _ @@ -37,7 +37,7 @@ defmodule TeslaMate.MappingTest do test "return nil if an error occured", %{test: name} do :ok = start_mapping(name, %{{0, 0} => fn -> {:error, :kaputt} end}) - assert Mapping.get_elevation(name, {0, 0}) == nil + assert Terrain.get_elevation(name, {0, 0}) == nil TestHelper.eventually(fn -> assert_received {SRTM, {:get_elevation, %SRTM.Client{}, 0, 0}} @@ -55,12 +55,12 @@ defmodule TeslaMate.MappingTest do end }) - assert Mapping.get_elevation(name, {0, 0}) == nil + assert Terrain.get_elevation(name, {0, 0}) == nil Process.sleep(100) assert_received {SRTM, {:get_elevation, %SRTM.Client{}, 0, 0}} # still blocked - assert Mapping.get_elevation(name, {0, 0}) == nil + assert Terrain.get_elevation(name, {0, 0}) == nil refute_receive _, 300 end @@ -75,7 +75,7 @@ defmodule TeslaMate.MappingTest do end }) - assert Mapping.get_elevation(name, {1, 1}) == nil + assert Terrain.get_elevation(name, {1, 1}) == nil Process.sleep(100) assert_received {SRTM, {:get_elevation, %SRTM.Client{}, 1, 1}} @@ -89,11 +89,11 @@ defmodule TeslaMate.MappingTest do {0, 0} => fn -> {:error, :kaputt} end }) - assert Mapping.get_elevation(name, {0, 0}) == nil - assert Mapping.get_elevation(name, {0, 0}) == nil - assert Mapping.get_elevation(name, {0, 0}) == nil - assert Mapping.get_elevation(name, {0, 0}) == nil - assert Mapping.get_elevation(name, {0, 0}) == nil + assert Terrain.get_elevation(name, {0, 0}) == nil + assert Terrain.get_elevation(name, {0, 0}) == nil + assert Terrain.get_elevation(name, {0, 0}) == nil + assert Terrain.get_elevation(name, {0, 0}) == nil + assert Terrain.get_elevation(name, {0, 0}) == nil # circuit broke after 3 attempts TestHelper.eventually(