feat(server): add tiles chiitiler handler

Author: rot1024

Diff for: server/config.go

@@ -94,6 +94,7 @@ type Config struct {
 	CityGML_PackerTimeout              uint     `pp:",omitempty"`
 	Flow_BaseURL                       string   `pp:",omitempty"`
 	Flow_Token                         string   `pp:",omitempty"`
+	CHIITILER_URL                      string   `pp:",omitempty"`
 }
 
 func NewConfig() (*Config, error) {
@@ -217,7 +218,9 @@ func (c *Config) DataCatalog() datacatalog.Config {
 
 func (c *Config) Tiles() tiles.Config {
 	return tiles.Config{
-		CMS: c.plateauCMS(),
+		CMS:          c.plateauCMS(),
+		Host:         c.Host + "/tiles",
+		ChiitilerURL: c.CHIITILER_URL,
 	}
 }
 

Diff for: server/service.go

@@ -187,7 +187,7 @@ func Tiles(conf *Config) (*Service, error) {
 				return err
 			}
 
-			h.Route(g.Group(""))
+			h.Route(g.Group("/tiles"))
 			h.Init(context.Background())
 			return nil
 		},

Diff for: server/tiles/chiitiler.go

@@ -0,0 +1,76 @@
+package tiles
+
+import (
+	_ "embed"
+	"fmt"
+	"net/http"
+
+	"github.com/labstack/echo/v4"
+	"github.com/reearth/reearthx/log"
+)
+
+// to generate style JSON files, see /tools/tile-style-json
+
+//go:embed darkStyle.json
+var DarkStyle []byte
+
+//go:embed lightStyle.json
+var LightStyle []byte
+
+var styles = map[string][]byte{
+	"dark-map":  DarkStyle,
+	"light-map": LightStyle,
+}
+
+// chiitilerHandler handles requests for chiitiler with style
+func (h *Handler) chiitilerHandler(c echo.Context) error {
+	if h.host == nil || h.chiitilerURL == nil {
+		return c.JSON(http.StatusNotFound, map[string]string{"error": "not found"})
+	}
+
+	ctx := c.Request().Context()
+	style := c.Param("id")
+	_, ok := styles[style]
+	if !ok {
+		return c.JSON(http.StatusNotFound, map[string]string{"error": "not found"})
+	}
+
+	z := c.Param("z")
+	x := c.Param("x")
+	y := c.Param("y")
+
+	styleURL := *h.host
+	styleURL.Path = fmt.Sprintf("/styles/%s.json", style)
+	u := *h.chiitilerURL
+	u.Path = fmt.Sprintf("/tiles/%s/%s/%s", z, x, y)
+	q := u.Query()
+	q.Add("url", styleURL.String())
+	u.RawQuery = q.Encode()
+	us := u.String()
+
+	log.Debugfc(ctx, "tiles: chiitiler: %s", us)
+	req, err := http.NewRequestWithContext(ctx, http.MethodGet, us, nil)
+	if err != nil {
+		log.Errorfc(ctx, "tiles: failed to create request: %v", err)
+		return c.JSON(http.StatusInternalServerError, map[string]string{"error": "internal server error"})
+	}
+
+	resp, err := h.http.Do(req)
+	if err != nil {
+		log.Errorfc(ctx, "tiles: failed to request chiitiler: %v", err)
+		return c.JSON(http.StatusInternalServerError, map[string]string{"error": "internal server error"})
+	}
+
+	defer resp.Body.Close()
+	return c.Stream(resp.StatusCode, resp.Header.Get("Content-Type"), resp.Body)
+}
+
+func styleHandler(c echo.Context) error {
+	style := c.Param("id")
+	s, ok := styles[style]
+	if !ok {
+		return c.JSON(http.StatusNotFound, map[string]string{"error": "not found"})
+	}
+
+	return c.Blob(http.StatusOK, "application/json", s)
+}

Diff for: server/tiles/darkStyle.json

@@ -21,14 +21,18 @@ const modelKey = "tiles"
 type Config struct {
 	CMS          plateaucms.Config
 	CacheControl string
+	Host         string
+	ChiitilerURL string
 }
 
 type Handler struct {
-	pcms  *plateaucms.CMS
-	http  *http.Client
-	lock  sync.RWMutex
-	tiles Tiles
-	conf  Config
+	pcms         *plateaucms.CMS
+	http         *http.Client
+	lock         sync.RWMutex
+	host         *url.URL
+	chiitilerURL *url.URL
+	tiles        Tiles
+	conf         Config
 }
 
 func New(conf Config) (*Handler, error) {
@@ -37,9 +41,27 @@ func New(conf Config) (*Handler, error) {
 		return nil, fmt.Errorf("failed to create plateau cms: %w", err)
 	}
 
+	var host, chiitilerURL *url.URL
+
+	if conf.Host != "" {
+		host, err = url.Parse(conf.Host)
+		if err != nil {
+			return nil, fmt.Errorf("failed to parse host: %w", err)
+		}
+	}
+
+	if conf.ChiitilerURL != "" {
+		chiitilerURL, err = url.Parse(conf.ChiitilerURL)
+		if err != nil {
+			return nil, fmt.Errorf("failed to parse chiitiler url: %w", err)
+		}
+	}
+
 	return &Handler{
-		pcms: pcms,
-		conf: conf,
+		pcms:         pcms,
+		conf:         conf,
+		host:         host,
+		chiitilerURL: chiitilerURL,
 		http: &http.Client{
 			Timeout: 10 * time.Second,
 		},
@@ -66,8 +88,9 @@ func (h *Handler) Init(ctx context.Context) {
 }
 
 func (h *Handler) Route(g *echo.Group) {
-	g.GET("/tiles/:id/:z/:x/:y", h.GetTile)
-	g.POST("/tiles/update", h.UpdateCache)
+	g.GET("/:id/:z/:x/:y", h.GetTile)
+	g.GET("/styles/:id.json", styleHandler)
+	g.POST("/update", h.UpdateCache)
 }
 
 func (h *Handler) UpdateCache(c echo.Context) error {
@@ -77,8 +100,12 @@ func (h *Handler) UpdateCache(c echo.Context) error {
 }
 
 func (h *Handler) GetTile(c echo.Context) error {
-	ctx := c.Request().Context()
 	id := c.Param("id")
+	if _, ok := styles[id]; ok {
+		return h.chiitilerHandler(c)
+	}
+
+	ctx := c.Request().Context()
 	z := c.Param("z")
 	x := c.Param("x")
 	y := c.Param("y")

Diff for: server/tiles/handler.go

@@ -3,6 +3,7 @@ package tiles
 import (
 	"net/http"
 	"net/http/httptest"
+	"net/url"
 	"testing"
 
 	"github.com/jarcoal/httpmock"
@@ -15,7 +16,12 @@ func TestHanlder_GetTile(t *testing.T) {
 	httpmock.Activate()
 	defer httpmock.DeactivateAndReset()
 
-	httpmock.RegisterResponder("GET", "https://example.com/1/2/3.png", httpmock.NewStringResponder(200, "image"))
+	httpmock.RegisterResponder("GET", "https://example.com/1/2/3.png",
+		httpmock.NewStringResponder(200, "image"))
+	httpmock.RegisterResponderWithQuery(
+		"GET", "https://ciitiler.example.com/tiles/1/2/3.png",
+		map[string]string{"url": "https://example.com/styles/light-map.json"},
+		httpmock.NewStringResponder(200, "ciitiler"))
 
 	h := &Handler{
 		tiles: Tiles{
@@ -26,28 +32,44 @@ func TestHanlder_GetTile(t *testing.T) {
 				},
 			},
 		},
-		http: http.DefaultClient,
+		host:         lo.Must(url.Parse("https://example.com")),
+		chiitilerURL: lo.Must(url.Parse("https://ciitiler.example.com")),
+		http:         http.DefaultClient,
 	}
 
-	// 200
-	req := httptest.NewRequest("GET", "/test/1/2/3.png", nil)
-	w := httptest.NewRecorder()
-	c := echo.New().NewContext(req, w)
-	c.SetParamNames("id", "z", "x", "y")
-	c.SetParamValues("test", "1", "2", "3.png")
-
-	assert.NoError(t, h.GetTile(c))
-	assert.Equal(t, 200, w.Code)
-	assert.Equal(t, "image", w.Body.String())
-
-	// 404
-	req = httptest.NewRequest("GET", "/test2/1/2/3.png", nil)
-	w = httptest.NewRecorder()
-	c = echo.New().NewContext(req, w)
-	c.SetParamNames("id", "z", "x", "y")
-	c.SetParamValues("test2", "1", "2", "3.png")
-
-	assert.NoError(t, h.GetTile(c))
-	assert.Equal(t, 404, w.Code)
-	assert.Equal(t, `{"error":"not found"}`+"\n", w.Body.String())
+	t.Run("200", func(t *testing.T) {
+		req := httptest.NewRequest("GET", "/test/1/2/3.png", nil)
+		w := httptest.NewRecorder()
+		c := echo.New().NewContext(req, w)
+		c.SetParamNames("id", "z", "x", "y")
+		c.SetParamValues("test", "1", "2", "3.png")
+
+		assert.NoError(t, h.GetTile(c))
+		assert.Equal(t, 200, w.Code)
+		assert.Equal(t, "image", w.Body.String())
+	})
+
+	t.Run("200 ciitiler", func(t *testing.T) {
+		req := httptest.NewRequest("GET", "/light-map/1/2/3.png", nil)
+		w := httptest.NewRecorder()
+		c := echo.New().NewContext(req, w)
+		c.SetParamNames("id", "z", "x", "y")
+		c.SetParamValues("light-map", "1", "2", "3.png")
+
+		assert.NoError(t, h.GetTile(c))
+		assert.Equal(t, 200, w.Code)
+		assert.Equal(t, "ciitiler", w.Body.String())
+	})
+
+	t.Run("404", func(t *testing.T) {
+		req := httptest.NewRequest("GET", "/test2/1/2/3.png", nil)
+		w := httptest.NewRecorder()
+		c := echo.New().NewContext(req, w)
+		c.SetParamNames("id", "z", "x", "y")
+		c.SetParamValues("test2", "1", "2", "3.png")
+
+		assert.NoError(t, h.GetTile(c))
+		assert.Equal(t, 404, w.Code)
+		assert.Equal(t, `{"error":"not found"}`+"\n", w.Body.String())
+	})
 }

Diff for: server/tiles/handler_test.go

@@ -0,0 +1,3 @@
+/*.json
+!package.json
+!package-lock.json

Diff for: server/tiles/lightStyle.json

@@ -0,0 +1,9 @@
+# tile-style-json
+
+A small Node.js script to write Mapbox style JSON for tiles.
+
+```sh
+npm i
+npm start
+# you will get lightStyle.json and darkStyle.json
+```

Diff for: tools/tile-style-json/.gitignore

@@ -0,0 +1,8 @@
+import * as styles from "./vector-map-style/styles";
+import { writeFileSync } from "fs";
+
+Object.keys(styles).forEach((key) => {
+  const style = styles[key];
+  writeFileSync(`${key}.json`, JSON.stringify(style));
+  console.log(`Wrote ${key}.json`);
+});