Finish swapping around lat and lng

server/lib/orcasite/radio/calculations/longitude_latitude.ex → server/lib/orcasite/radio/calculations/lat_lng.ex

@@ -1,4 +1,4 @@
-defmodule Orcasite.Radio.Calculations.LongitudeLatitude do
+defmodule Orcasite.Radio.Calculations.LatLng do
   use Ash.Calculation
 
   @impl true
@@ -9,7 +9,7 @@ defmodule Orcasite.Radio.Calculations.LongitudeLatitude do
   @impl true
   def calculate(records, _opts, _arguments) do
     Enum.map(records, fn %{location_point: %{coordinates: {lng, lat}}} ->
-      "#{lng},#{lat}"
+      "#{lat},#{lng}"
     end)
   end
 end

server/lib/orcasite/radio/feed.ex

@@ -72,17 +72,17 @@ defmodule Orcasite.Radio.Feed do
   calculations do
     calculate :lat_lng,
               :string,
-              {Orcasite.Radio.Calculations.LongitudeLatitude,
+              {Orcasite.Radio.Calculations.LatLng,
                keys: [:location_point], select: [:location_point]}
   end
 
   defp change_lat_lng(changeset, _context) do
-    with {:is_string, lng_lat} when is_binary(lng_lat) <-
+    with {:is_string, lat_lng} when is_binary(lat_lng) <-
            {:is_string, Ash.Changeset.get_argument(changeset, :lat_lng)},
-         {:two_els, [lng, lat]} <-
-           {:two_els, lng_lat |> String.split(",") |> Enum.map(&String.trim/1)},
-         {:two_floats, [{longitude, _}, {latitude, _}]} <-
-           {:two_floats, [lng, lat] |> Enum.map(&Float.parse/1)} do
+         {:two_els, [lat, lng]} <-
+           {:two_els, lat_lng |> String.split(",") |> Enum.map(&String.trim/1)},
+         {:two_floats, [{latitude, _}, {longitude, _}]} <-
+           {:two_floats, [lat, lng] |> Enum.map(&Float.parse/1)} do
       changeset
       |> Ash.Changeset.change_attribute(:location_point, %Geo.Point{
         coordinates: {longitude, latitude},

server/lib/orcasite_web/graphql/types/feed.ex

@@ -13,7 +13,7 @@ defmodule OrcasiteWeb.Types.Feed do
     field :lat_lng, non_null(:json) do
       resolve(fn
         %{location_point: %{coordinates: {lng, lat}}}, _, _ ->
-          {:ok, %{lng: lng, lat: lat}}
+          {:ok, %{lat: lat, lng: lng}}
 
         _, _, _ ->
           {:ok, %{}}