From cc197d763898fe8857ff2b9e345145472858be06 Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Mon, 6 Sep 2021 12:46:29 +0200
Subject: [PATCH] Fix federating geo coordinates

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
---
 .../activity_stream/converter/address.ex      | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/lib/federation/activity_stream/converter/address.ex b/lib/federation/activity_stream/converter/address.ex
index 9b52dfcaf..7466d42a8 100644
--- a/lib/federation/activity_stream/converter/address.ex
+++ b/lib/federation/activity_stream/converter/address.ex
@@ -36,15 +36,16 @@ defmodule Mobilizon.Federation.ActivityStream.Converter.Address do
         })
       end
 
-    if is_nil(object["latitude"]) or is_nil(object["longitude"]) do
-      res
-    else
-      geo = %Geo.Point{
-        coordinates: {object["longitude"], object["latitude"]},
-        srid: 4326
-      }
+    latitude = Map.get(object, "latitude")
+    longitude = Map.get(object, "longitude")
 
-      Map.put(res, "geom", geo)
+    if is_float(latitude) and is_float(longitude) do
+      Map.put(res, "geom", %Geo.Point{
+        coordinates: {longitude, latitude},
+        srid: 4326
+      })
+    else
+      res
     end
   end
 
@@ -72,8 +73,8 @@ defmodule Mobilizon.Federation.ActivityStream.Converter.Address do
       res
     else
       res
-      |> Map.put("longitude", address.geom.coordinates |> elem(1))
-      |> Map.put("latitude", address.geom.coordinates |> elem(0))
+      |> Map.put("longitude", address.geom.coordinates |> elem(0))
+      |> Map.put("latitude", address.geom.coordinates |> elem(1))
     end
   end
 end