From d75cc5235d08c1467f7baf17ecfce6da1cf8e620 Mon Sep 17 00:00:00 2001 From: Tony Murray Date: Mon, 29 Jun 2020 14:03:03 -0500 Subject: [PATCH] Settings geocode lookup (#11875) * Add setting to enable geocoding to ui * rename settings * rename settings * capitalization * Open streetmaps does not support geocoding --- html/mix-manifest.json | 13 +++++++------ misc/config_definitions.json | 16 ++++++++++++++++ resources/lang/en/settings.php | 8 ++++++-- 3 files changed, 29 insertions(+), 8 deletions(-) diff --git a/html/mix-manifest.json b/html/mix-manifest.json index 7503e1df76..ee1c9a8e7d 100644 --- a/html/mix-manifest.json +++ b/html/mix-manifest.json @@ -3,10 +3,11 @@ "/css/app.css": "/css/app.css?id=ffec4165a9c98d892a32", "/js/manifest.js": "/js/manifest.js?id=3c768977c2574a34506e", "/js/vendor.js": "/js/vendor.js?id=c0e0ebbfd027a8baefb4", - "/js/lang/de.js": "/js/lang/de.js?id=b1a653a8eba34fe0c83d", - "/js/lang/en.js": "/js/lang/en.js?id=490ad0c0f47c3e20fad8", - "/js/lang/fr.js": "/js/lang/fr.js?id=f9aba2c115d3716739b5", - "/js/lang/ru.js": "/js/lang/ru.js?id=f376f9bbe31e66bae4fc", - "/js/lang/uk.js": "/js/lang/uk.js?id=483225c7042242ce65a7", - "/js/lang/zh-TW.js": "/js/lang/zh-TW.js?id=038212d88344bec41406" + "/js/lang/de.js": "/js/lang/de.js?id=73ed23dde31af205f171", + "/js/lang/en.js": "/js/lang/en.js?id=ea1dccb09f2e53fc7c14", + "/js/lang/fr.js": "/js/lang/fr.js?id=91daac2f7383c820457b", + "/js/lang/it.js": "/js/lang/it.js?id=c202a58a7f5bca08801b", + "/js/lang/ru.js": "/js/lang/ru.js?id=aaab82593592e9368a08", + "/js/lang/uk.js": "/js/lang/uk.js?id=9b0b074259847e7aaff3", + "/js/lang/zh-TW.js": "/js/lang/zh-TW.js?id=21cdd68dc06a428e7260" } diff --git a/misc/config_definitions.json b/misc/config_definitions.json index 750416fce3..902aae4b01 100644 --- a/misc/config_definitions.json +++ b/misc/config_definitions.json @@ -1577,6 +1577,22 @@ "bing": "Bing Maps" } }, + "geoloc.latlng": { + "default": false, + "group": "external", + "section": "location", + "order": 2, + "type": "boolean", + "when": { + "setting": "geoloc.engine", + "operator": "in", + "value": [ + "google", + "mapquest", + "bing" + ] + } + }, "github_api": { "default": "https://api.github.com/repos/librenms/librenms/", "type": "text" diff --git a/resources/lang/en/settings.php b/resources/lang/en/settings.php index 77710c39a8..f93ccba6b2 100644 --- a/resources/lang/en/settings.php +++ b/resources/lang/en/settings.php @@ -609,17 +609,21 @@ return [ ], 'geoloc' => [ 'api_key' => [ - 'description' => 'Geocoding API Key', + 'description' => 'Mapping Engine API Key', 'help' => 'Geocoding API Key (Required to function)' ], 'engine' => [ - 'description' => 'Geocoding Engine', + 'description' => 'Mapping Engine', 'options' => [ 'google' => 'Google Maps', 'openstreetmap' => 'OpenStreetMap', 'mapquest' => 'MapQuest', 'bing' => 'Bing Maps' ] + ], + 'latlng' => [ + 'description' => 'Attempt to Geocode Locations', + 'help' => 'Try to lookup latitude and longitude via geocoding API during polling' ] ], 'graphite' => [