From 813912d0858deca610cdbb3960ad386ba1ee5f3e Mon Sep 17 00:00:00 2001 From: Eldon Koyle Date: Fri, 18 Mar 2016 16:55:34 -0600 Subject: [PATCH 1/2] Add more info on geolocation resolution in docs --- doc/Extensions/Globe-Frontpage.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/doc/Extensions/Globe-Frontpage.md b/doc/Extensions/Globe-Frontpage.md index 6e2d31662a..4b3575419d 100644 --- a/doc/Extensions/Globe-Frontpage.md +++ b/doc/Extensions/Globe-Frontpage.md @@ -12,6 +12,12 @@ $config['geoloc']['latlng'] = true; $config['geoloc']['engine'] = "google";//Only one available at present ``` +Location resolution happens as follows (iff `$config['geoloc']['latlng'] == true;`): + 1. if `device['location']` contains `[lat, lng]` (note the square brackets), that is used + 1. if there is a location overide in the `locations` table where `locations.location == device['location']`, that is used + * currently, no web UI + 1. attempt to resolve lat, lng using `$config['geoloc']['engine']` + We have two current mapping engines available: - Leaflet (default) From c4bf2086e40862f7c5c49337bcdae23c27fb2fa5 Mon Sep 17 00:00:00 2001 From: Eldon Koyle Date: Mon, 21 Mar 2016 11:00:31 -0600 Subject: [PATCH 2/2] drop the iff --- doc/Extensions/Globe-Frontpage.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/Extensions/Globe-Frontpage.md b/doc/Extensions/Globe-Frontpage.md index 4b3575419d..2594eb8e32 100644 --- a/doc/Extensions/Globe-Frontpage.md +++ b/doc/Extensions/Globe-Frontpage.md @@ -12,7 +12,7 @@ $config['geoloc']['latlng'] = true; $config['geoloc']['engine'] = "google";//Only one available at present ``` -Location resolution happens as follows (iff `$config['geoloc']['latlng'] == true;`): +Location resolution happens as follows (when `$config['geoloc']['latlng'] == true;`): 1. if `device['location']` contains `[lat, lng]` (note the square brackets), that is used 1. if there is a location overide in the `locations` table where `locations.location == device['location']`, that is used * currently, no web UI