From b156f5786098c75645b582c6db28e37b4610c628 Mon Sep 17 00:00:00 2001 From: "Panagiotis \"Ivory\" Vasilopoulos" Date: Wed, 2 Aug 2023 17:18:34 +0200 Subject: [PATCH] [FEAT] Use OpenStreetMap in USER_LOCATION_MAP_URL by default Follow-up to d58c5425799335ea57f27461f99ddd1078e9b2de for Forgejo. By default, Gitea does not select any map service that can be used to introduce a 'Show this place on a map' button in the location field of a user profile. Before I tried upstreaming this change to Gitea, this was the case in Forgejo. This patch essentially recovers this functionality, which is nice for public-facing instances and communities. Links to original PRs: - https://codeberg.org/forgejo/forgejo/pulls/1076 - https://github.com/go-gitea/gitea/pull/26214 (cherry picked from commit bb187d5f617f8efceb41810d6ff9adcaa60450bb) (cherry picked from commit ce02ef9078a8731921caa4f7b0c1b0ac3b59a784) (cherry picked from commit 6b75c40e2575e23810880ee8e368dc1781e2b4e4) (cherry picked from commit 6bc8e9f5737f5721ddcd1ef5926a778a7f66a4a3) (cherry picked from commit 063f8afdf7c2cca014c60dcc3d78d270fd236f8f) (cherry picked from commit c5cc736b72e1ba980519e9258686f41e4eb78b42) (cherry picked from commit 7b1bb4bedc6196fb6e8516d9a34092b16d7fab05) (cherry picked from commit 2a022dceb4b391e2fc25b077193ae22a71380eee) (cherry picked from commit a946c142d2448cb92daaea11851cf7f00921f062) (cherry picked from commit 8a4ea0c7ab8960f41a67442fa2f485fe0a901a96) (cherry picked from commit 37bfb05b34e61194afe407acac5778258315b756) (cherry picked from commit 28fdcd95a5b6266af4e92f20a79b835b6b31417f) (cherry picked from commit 65743be85df740f6b9275e36a25e216b82dc89e1) (cherry picked from commit a3d81d07288eeb0f65afd99e14b76af47977ca87) (cherry picked from commit 4068219ac6eae39be08c1434dd3856a80ccda186) --- custom/conf/app.example.ini | 4 ++-- modules/setting/service.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/custom/conf/app.example.ini b/custom/conf/app.example.ini index 2064f37a0..4a1cf7325 100644 --- a/custom/conf/app.example.ini +++ b/custom/conf/app.example.ini @@ -836,12 +836,12 @@ LEVEL = Info ;; ;; Default map service. No external API support has been included. A service has to allow ;; searching using URL parameters, the location will be appended to the URL as escaped query parameter. -;; Disabled by default, some example values are: +;; Some example values are: ;; - OpenStreetMap: https://www.openstreetmap.org/search?query= ;; - Google Maps: https://www.google.com/maps/place/ ;; - MapQuest: https://www.mapquest.com/search/ ;; - Bing Maps: https://www.bing.com/maps?where1= -; USER_LOCATION_MAP_URL = +; USER_LOCATION_MAP_URL = https://www.openstreetmap.org/search?query= ;; ;; Enable heatmap on users profiles. ;ENABLE_USER_HEATMAP = true diff --git a/modules/setting/service.go b/modules/setting/service.go index 3ea150123..befb94b61 100644 --- a/modules/setting/service.go +++ b/modules/setting/service.go @@ -188,7 +188,7 @@ func loadServiceFrom(rootCfg ConfigProvider) { Service.AllowCrossRepositoryDependencies = sec.Key("ALLOW_CROSS_REPOSITORY_DEPENDENCIES").MustBool(true) Service.DefaultAllowOnlyContributorsToTrackTime = sec.Key("DEFAULT_ALLOW_ONLY_CONTRIBUTORS_TO_TRACK_TIME").MustBool(true) Service.NoReplyAddress = sec.Key("NO_REPLY_ADDRESS").MustString("noreply." + Domain) - Service.UserLocationMapURL = sec.Key("USER_LOCATION_MAP_URL").String() + Service.UserLocationMapURL = sec.Key("USER_LOCATION_MAP_URL").MustString("https://www.openstreetmap.org/search?query=") Service.EnableUserHeatmap = sec.Key("ENABLE_USER_HEATMAP").MustBool(true) Service.AutoWatchNewRepos = sec.Key("AUTO_WATCH_NEW_REPOS").MustBool(true) Service.AutoWatchOnChanges = sec.Key("AUTO_WATCH_ON_CHANGES").MustBool(false)