map provider supports CartoDB

pkg/api/map_image_proxies.go

@@ -11,12 +11,13 @@ import (
 	"github.com/mayswind/ezbookkeeping/pkg/settings"
 )
 
-const openStreetMapTileImageUrlFormat = "https://tile.openstreetmap.org/{z}/{x}/{y}.png"                       // https://tile.openstreetmap.org/{z}/{x}/{y}.png
-const openStreetMapHumanitarianStyleTileImageUrlFormat = "https://a.tile.openstreetmap.fr/hot/{z}/{x}/{y}.png" // https://{s}.tile.openstreetmap.fr/hot/{z}/{x}/{y}.png
-const openTopoMapTileImageUrlFormat = "https://tile.opentopomap.org/{z}/{x}/{y}.png"                           // https://tile.opentopomap.org/{z}/{x}/{y}.png
-const opnvKarteMapTileImageUrlFormat = "https://tileserver.memomaps.de/tilegen/{z}/{x}/{y}.png"                // https://tileserver.memomaps.de/tilegen/{z}/{x}/{y}.png
-const cyclOSMMapTileImageUrlFormat = "https://a.tile-cyclosm.openstreetmap.fr/cyclosm/{z}/{x}/{y}.png"         // https://{s}.tile-cyclosm.openstreetmap.fr/cyclosm/{z}/{x}/{y}.png
-const tomtomMapTileImageUrlFormat = "https://api.tomtom.com/map/1/tile/basic/main/{z}/{x}/{y}.png"             // https://api.tomtom.com/map/{versionNumber}/tile/{layer}/{style}/{z}/{x}/{y}.png?key={key}&language={language}
+const openStreetMapTileImageUrlFormat = "https://tile.openstreetmap.org/{z}/{x}/{y}.png"                          // https://tile.openstreetmap.org/{z}/{x}/{y}.png
+const openStreetMapHumanitarianStyleTileImageUrlFormat = "https://a.tile.openstreetmap.fr/hot/{z}/{x}/{y}.png"    // https://{s}.tile.openstreetmap.fr/hot/{z}/{x}/{y}.png
+const openTopoMapTileImageUrlFormat = "https://tile.opentopomap.org/{z}/{x}/{y}.png"                              // https://tile.opentopomap.org/{z}/{x}/{y}.png
+const opnvKarteMapTileImageUrlFormat = "https://tileserver.memomaps.de/tilegen/{z}/{x}/{y}.png"                   // https://tileserver.memomaps.de/tilegen/{z}/{x}/{y}.png
+const cyclOSMMapTileImageUrlFormat = "https://a.tile-cyclosm.openstreetmap.fr/cyclosm/{z}/{x}/{y}.png"            // https://{s}.tile-cyclosm.openstreetmap.fr/cyclosm/{z}/{x}/{y}.png
+const cartoDBMapTileImageUrlFormat = "https://a.basemaps.cartocdn.com/rastertiles/voyager/{z}/{x}/{y}{scale}.png" // https://{s}.basemaps.cartocdn.com/{style}/{z}/{x}/{y}{scale}.png
+const tomtomMapTileImageUrlFormat = "https://api.tomtom.com/map/1/tile/basic/main/{z}/{x}/{y}.png"                // https://api.tomtom.com/map/{versionNumber}/tile/{layer}/{style}/{z}/{x}/{y}.png?key={key}&language={language}
 
 // MapImageProxy represents map image proxy
 type MapImageProxy struct {
@@ -41,6 +42,7 @@ func (p *MapImageProxy) MapTileImageProxyHandler(c *core.Context) (*httputil.Rev
 	fileName := c.Param("fileName")
 	fileNameParts := strings.Split(fileName, ".")
 	coordinateY := fileNameParts[0]
+	scale := c.Query("scale")
 
 	if len(fileNameParts) != 2 || fileNameParts[len(fileNameParts)-1] != "png" {
 		return nil, errs.ErrImageExtensionNotSupported
@@ -56,6 +58,8 @@ func (p *MapImageProxy) MapTileImageProxyHandler(c *core.Context) (*httputil.Rev
 		targetUrl = opnvKarteMapTileImageUrlFormat
 	} else if mapProvider == settings.CyclOSMMapProvider {
 		targetUrl = cyclOSMMapTileImageUrlFormat
+	} else if mapProvider == settings.CartoDBMapProvider {
+		targetUrl = cartoDBMapTileImageUrlFormat
 	} else if mapProvider == settings.TomTomMapProvider {
 		targetUrl = tomtomMapTileImageUrlFormat + "?key=" + settings.Container.Current.TomTomMapAPIKey
 		language := c.Query("language")
@@ -74,6 +78,7 @@ func (p *MapImageProxy) MapTileImageProxyHandler(c *core.Context) (*httputil.Rev
 		imageRawUrl = strings.Replace(imageRawUrl, "{z}", zoomLevel, -1)
 		imageRawUrl = strings.Replace(imageRawUrl, "{x}", coordinateX, -1)
 		imageRawUrl = strings.Replace(imageRawUrl, "{y}", coordinateY, -1)
+		imageRawUrl = strings.Replace(imageRawUrl, "{scale}", scale, -1)
 		imageUrl, _ := url.Parse(imageRawUrl)
 
 		req.URL = imageUrl

pkg/middlewares/server_settings_cookie.go

@@ -29,6 +29,7 @@ func ServerSettingsCookie(config *settings.Config) core.MiddlewareHandlerFunc {
 				config.MapProvider == settings.OpenTopoMapProvider ||
 				config.MapProvider == settings.OPNVKarteMapProvider ||
 				config.MapProvider == settings.CyclOSMMapProvider ||
+				config.MapProvider == settings.CartoDBMapProvider ||
 				config.MapProvider == settings.TomTomMapProvider ||
 				config.MapProvider == settings.CustomProvider) {
 			settingsArr = append(settingsArr, buildBooleanSetting("mp", config.EnableMapDataFetchProxy))

pkg/settings/setting.go

@@ -74,8 +74,9 @@ const (
 	OpenTopoMapProvider                    string = "opentopomap"
 	OPNVKarteMapProvider                   string = "opnvkarte"
 	CyclOSMMapProvider                     string = "cyclosm"
-	GoogleMapProvider                      string = "googlemap"
+	CartoDBMapProvider                     string = "cartodb"
 	TomTomMapProvider                      string = "tomtom"
+	GoogleMapProvider                      string = "googlemap"
 	BaiduMapProvider                       string = "baidumap"
 	AmapProvider                           string = "amap"
 	CustomProvider                         string = "custom"
@@ -541,10 +542,12 @@ func loadMapConfiguration(config *Config, configFile *ini.File, sectionName stri
 		config.MapProvider = OPNVKarteMapProvider
 	} else if mapProvider == CyclOSMMapProvider {
 		config.MapProvider = CyclOSMMapProvider
-	} else if mapProvider == GoogleMapProvider {
-		config.MapProvider = GoogleMapProvider
+	} else if mapProvider == CartoDBMapProvider {
+		config.MapProvider = CartoDBMapProvider
 	} else if mapProvider == TomTomMapProvider {
 		config.MapProvider = TomTomMapProvider
+	} else if mapProvider == GoogleMapProvider {
+		config.MapProvider = GoogleMapProvider
 	} else if mapProvider == BaiduMapProvider {
 		config.MapProvider = BaiduMapProvider
 	} else if mapProvider == AmapProvider {