feat: combined map widget

feat: migrate all static to cdn
feat: use 560p thumbnails for multitone backgrounds

4 files changed, 137 insertions, 83 deletions

diff --git a/internal/router/handlers/api-v1-map-get.go b/internal/router/handlers/api-v1-map-get.go
new file mode 100644
index 0000000..e19c54a
--- /dev/null
+++ b/internal/router/handlers/api-v1-map-get.go
@@ -0,0 +1,116 @@
+package handlers
+
+import (
+	"fmt"
+	"log/slog"
+	"slices"
+	"strconv"
+	"strings"
+
+	"github.com/SayaAndy/saya-today-web/internal/blog"
+	"github.com/SayaAndy/saya-today-web/internal/router"
+	"github.com/gofiber/fiber/v2"
+)
+
+type GetMapHandler struct {
+	router.BasicHandler
+}
+
+func init() {
+	router.Routes = append(router.Routes, &GetMapHandler{})
+}
+
+func (r *GetMapHandler) Filter() (method string, path string) {
+	return "GET", "/api/v1/map"
+}
+
+func (r *GetMapHandler) IsTemplated() bool {
+	return false
+}
+
+func (r *GetMapHandler) TemplatesToInject() []string {
+	return []string{"views/partials/global-map-widget.html"}
+}
+
+func (r *GetMapHandler) ToCache() router.CacheSetting {
+	return router.ByUrlAndQuery
+}
+
+func (r *GetMapHandler) ToValidateLang() router.LangSetting {
+	return router.InReferer
+}
+
+func (r *GetMapHandler) Render(c *fiber.Ctx, supplements *router.Supplements, lang string, templateMap fiber.Map) (statusCode int, err error) {
+	codename := c.Query("codename")
+	zoom := c.QueryInt("zoom", 4)
+	zoomPosition := c.Query("zoomPosition")
+
+	pages, err := supplements.BlogClient.Scan(lang + "/")
+	status := fiber.StatusOK
+	if err != nil {
+		slog.Error("received an error while scanning blog pages",
+			slog.String("error", err.Error()),
+			slog.String("lang", lang),
+		)
+		status = fiber.StatusPartialContent
+		pages = []*blog.Page{}
+	}
+	slices.SortFunc(pages, func(a *blog.Page, b *blog.Page) int {
+		return a.Metadata.PublishedTime.Compare(b.Metadata.PublishedTime)
+	})
+
+	type MapMarker struct {
+		Index          int     `json:"Index"`
+		Title          string  `json:"Title"`
+		PageLink       string  `json:"PageLink"`
+		Lat            float64 `json:"Lat"`
+		Long           float64 `json:"Long"`
+		AccuracyMeters int64   `json:"AccuracyMeters"`
+		Thumbnail      string  `json:"Thumbnail"`
+		ToHighlight    bool    `json:"ToHighlight"`
+	}
+
+	templateMap["MapLocationLat"] = 45.4507
+	templateMap["MapLocationLong"] = 68.8319
+	templateMap["MapLocationZoom"] = zoom
+	templateMap["ZoomPosition"] = zoomPosition
+
+	mapMarkers := make([]*MapMarker, 0, len(pages))
+	for i, page := range pages {
+		geolocationParts := strings.Split(page.Metadata.Geolocation, " ")
+		if len(geolocationParts) < 2 {
+			continue
+		}
+
+		var x, y float64
+		var areaError int64
+		if len(geolocationParts) >= 2 {
+			x, _ = strconv.ParseFloat(geolocationParts[0], 64)
+			y, _ = strconv.ParseFloat(geolocationParts[1], 64)
+		}
+		if len(geolocationParts) >= 3 {
+			areaError, _ = strconv.ParseInt(geolocationParts[2], 10, 64)
+		}
+
+		toHighlight := page.FileName == codename
+		if toHighlight {
+			templateMap["MapLocationLat"] = x
+			templateMap["MapLocationLong"] = y
+		}
+
+		mapMarkers = append(mapMarkers, &MapMarker{
+			Index:          i,
+			Title:          page.Metadata.Title,
+			PageLink:       fmt.Sprintf("/%s/blog/%s", lang, page.FileName),
+			Lat:            x,
+			Long:           y,
+			AccuracyMeters: areaError,
+			Thumbnail:      page.Metadata.Thumbnail,
+			ToHighlight:    toHighlight,
+		})
+	}
+
+	templateMap["MapMarkers"] = mapMarkers
+
+	return status, nil
+}
diff --git a/internal/router/handlers/lang-map.go b/internal/router/handlers/lang-map.go
index d452bc7..32ab35e 100644
--- a/internal/router/handlers/lang-map.go
+++ b/internal/router/handlers/lang-map.go
@@ -1,13 +1,6 @@
 package handlers
 
 import (
-	"fmt"
-	"log/slog"
-	"slices"
-	"strconv"
-	"strings"
-
-	"github.com/SayaAndy/saya-today-web/internal/blog"
 	"github.com/SayaAndy/saya-today-web/internal/router"
 	"github.com/gofiber/fiber/v2"
 )
@@ -49,61 +42,5 @@ func (r *MapHandler) SitemapInfo(supplements *router.Supplements) []router.Sitem
 }
 
 func (r *MapHandler) Render(c *fiber.Ctx, supplements *router.Supplements, lang string, templateMap fiber.Map) (statusCode int, err error) {
-	pages, err := supplements.BlogClient.Scan(lang + "/")
-	slices.SortFunc(pages, func(a *blog.Page, b *blog.Page) int {
-		return a.Metadata.PublishedTime.Compare(b.Metadata.PublishedTime)
-	})
-	status := fiber.StatusOK
-	if err != nil {
-		slog.Error("received an error while scanning b2 pages",
-			slog.String("error", err.Error()),
-			slog.String("lang", lang),
-		)
-		status = fiber.StatusPartialContent
-		pages = []*blog.Page{}
-	}
-
-	type MapMarker struct {
-		Index          int     `json:"Index"`
-		Title          string  `json:"Title"`
-		PageLink       string  `json:"PageLink"`
-		Lat            float64 `json:"Lat"`
-		Long           float64 `json:"Long"`
-		AccuracyMeters int64   `json:"AccuracyMeters"`
-		Thumbnail      string  `json:"Thumbnail"`
-	}
-
-	mapMarkers := make([]*MapMarker, 0, len(pages))
-	for i, page := range pages {
-		geolocationParts := strings.Split(page.Metadata.Geolocation, " ")
-		if len(geolocationParts) < 2 {
-			continue
-		}
-
-		var x, y float64
-		var areaError int64
-		if len(geolocationParts) >= 2 {
-			x, _ = strconv.ParseFloat(geolocationParts[0], 64)
-			y, _ = strconv.ParseFloat(geolocationParts[1], 64)
-		}
-		if len(geolocationParts) >= 3 {
-			areaError, _ = strconv.ParseInt(geolocationParts[2], 10, 64)
-		}
-
-		mapMarkers = append(mapMarkers, &MapMarker{
-			Index:          i,
-			Title:          page.Metadata.Title,
-			PageLink:       fmt.Sprintf("/%s/blog/%s", lang, page.FileName),
-			Lat:            x,
-			Long:           y,
-			AccuracyMeters: areaError,
-			Thumbnail:      page.Metadata.Thumbnail,
-		})
-	}
-
-	templateMap["MapMarkers"] = mapMarkers
-	templateMap["MapLocationLat"] = 45.4507
-	templateMap["MapLocationLong"] = 68.8319
-
-	return status, nil
+	return fiber.StatusOK, nil
 }
diff --git a/internal/router/router.go b/internal/router/router.go
index 43d6138..c8b5686 100644
--- a/internal/router/router.go
+++ b/internal/router/router.go
@@ -104,7 +104,7 @@ type Supplements struct {
 	MarkdownRenderer   goldmark.Markdown
 	Meta               config.MetaConfig
 	PhotoStorage       config.PhotoStorageConfig
-	StaticStorage      config.PhotoTypeConfig
+	StaticStorage      config.StaticStorageConfig
 }
 
 type Router struct {
@@ -303,12 +303,12 @@ func (r *Router) InitRoutes() (err error) {
 				}
 
 				defaultMap := fiber.Map{
-					"Lang":                 lang,
-					"Path":                 trimmedPath,
-					"QueryString":          queryString,
-					"CanonicalEndpoint":    r.canonicalEndpoint,
-					"StaticStorageBaseUrl": r.supplements.StaticStorage.BaseUrl,
-					"ThumbnailBaseUrl":     r.supplements.PhotoStorage.Thumbnail320p.BaseUrl,
+					"Lang":              lang,
+					"Path":              trimmedPath,
+					"QueryString":       queryString,
+					"CanonicalEndpoint": r.canonicalEndpoint,
+					"StaticStorage":     r.supplements.StaticStorage,
+					"PhotoStorage":      r.supplements.PhotoStorage,
 				}
 
 				statusCode, err := currentRoute.Render(c, r.supplements, lang, defaultMap)
@@ -455,12 +455,12 @@ func (r *Router) generalPage(c *fiber.Ctx, route Route, lang string) error {
 	}
 
 	valueMap := fiber.Map{
-		"Lang":                 lang,
-		"Path":                 trimmedPath,
-		"QueryString":          queryString,
-		"CanonicalEndpoint":    r.canonicalEndpoint,
-		"StaticStorageBaseUrl": r.supplements.StaticStorage.BaseUrl,
-		"ThumbnailBaseUrl":     r.supplements.PhotoStorage.Thumbnail320p.BaseUrl,
+		"Lang":              lang,
+		"Path":              trimmedPath,
+		"QueryString":       queryString,
+		"CanonicalEndpoint": r.canonicalEndpoint,
+		"StaticStorage":     r.supplements.StaticStorage,
+		"PhotoStorage":      r.supplements.PhotoStorage,
 	}
 
 	var err error
@@ -580,12 +580,12 @@ func (r *Router) generalPageSegment(c *fiber.Ctx, part string) error {
 
 	var statusCode int
 	defaultMap := fiber.Map{
-		"Lang":                 lang,
-		"Path":                 strings.Trim(path, "/"),
-		"QueryString":          queryString,
-		"CanonicalEndpoint":    r.canonicalEndpoint,
-		"StaticStorageBaseUrl": r.supplements.StaticStorage.BaseUrl,
-		"ThumbnailBaseUrl":     r.supplements.PhotoStorage.Thumbnail320p.BaseUrl,
+		"Lang":              lang,
+		"Path":              strings.Trim(path, "/"),
+		"QueryString":       queryString,
+		"CanonicalEndpoint": r.canonicalEndpoint,
+		"StaticStorage":     r.supplements.StaticStorage,
+		"PhotoStorage":      r.supplements.PhotoStorage,
 	}
 
 	switch part {
diff --git a/internal/templatemanager/templatemanager.go b/internal/templatemanager/templatemanager.go
index 5c84418..ff1214a 100644
--- a/internal/templatemanager/templatemanager.go
+++ b/internal/templatemanager/templatemanager.go
@@ -43,6 +43,7 @@ var templateFuncMap = template.FuncMap{
 	"l": func(path ...any) any {
 		return l10n.T.GetPath(path...)
 	},
+	"join": strings.Join,
 }
 
 func NewTemplateManager(templates ...TemplateManagerTemplates) (*TemplateManager, error) {