Merge branch 'fix-geocoding' into 'master'

Fix geocoding

See merge request framasoft/mobilizon!454
This commit is contained in:
Thomas Citharel 2020-06-09 15:51:51 +02:00
commit 4ff936ad7a
4 changed files with 5 additions and 7 deletions

View File

@ -42,7 +42,7 @@ export const CONFIG = gql`
location {
latitude
longitude
accuracyRadius
# accuracyRadius
}
maps {
tiles {

View File

@ -12,7 +12,7 @@ export interface IConfig {
location: {
latitude: number;
longitude: number;
accuracyRadius: number;
// accuracyRadius: number;
};
anonymous: {
participation: {

View File

@ -3,8 +3,6 @@ defmodule Mobilizon.GraphQL.Resolvers.Config do
Handles the config-related GraphQL calls.
"""
alias Geolix.Adapter.MMDB2.Record.{Country, Location}
alias Mobilizon.Config
@doc """
@ -15,13 +13,13 @@ defmodule Mobilizon.GraphQL.Resolvers.Config do
country_code =
case Map.get(geolix, :city) do
%{country: %Country{iso_code: country_code}} -> String.downcase(country_code)
%{country: %{iso_code: country_code}} -> String.downcase(country_code)
_ -> nil
end
location =
case Map.get(geolix, :city) do
%{location: %Location{} = location} -> Map.from_struct(location)
%{location: %{} = location} -> location
_ -> nil
end

View File

@ -39,7 +39,7 @@ defmodule Mobilizon.GraphQL.Schema.ConfigType do
object :lonlat do
field(:longitude, :float)
field(:latitude, :float)
field(:accuracy_radius, :integer)
# field(:accuracy_radius, :integer)
end
object :geocoding do