consbio/mbtileserver
1
1
Fork 0
mirror of https://github.com/consbio/mbtileserver.git synced 2024-09-11 07:15:24 +03:00
Code Issues Packages Projects Releases Wiki Activity

make sure all tilejson / preview errors are handled

Browse Source
This commit is contained in:
Brendan C. Ward 2021-12-30 11:51:47 -08:00
parent 01830c1e87
commit f8a2d74446
No known key found for this signature in database
GPG Key ID: 37A8A7A2D61DFE13
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
handlers/tileset.go
View File

@ -182,6 +182,12 @@ func (ts *Tileset) tileJSONHandler(w http.ResponseWriter, r *http.Request) {
tilesetURL := fmt.Sprintf("%s://%s%s", scheme(r), r.Host, r.URL.Path)
tileJSON, err := ts.TileJSON(tilesetURL, query)
if err != nil {
http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
ts.svc.logError("could not create tileJSON content for %v: %v", r.URL.Path, err)
return
}
if ts.svc.enablePreview {
tileJSON["map"] = fmt.Sprintf("%s/map", tilesetURL)
}
@ -283,6 +289,12 @@ func (ts *Tileset) previewHandler(w http.ResponseWriter, r *http.Request) {
tilesetURL := fmt.Sprintf("%s://%s%s", scheme(r), r.Host, strings.TrimSuffix(r.URL.Path, "/map"))
tileJSON, err := ts.TileJSON(tilesetURL, query)
if err != nil {
http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
ts.svc.logError("could not create tileJSON content for %v: %v", r.URL.Path, err)
return
}
bytes, err := json.Marshal(tileJSON)
if err != nil {
http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)