better path handling

whosonfirst · Mar 26, 2021 · 22470f7 · 22470f7
1 parent a7eaf73
commit 22470f7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/flags/validate.go b/flags/validate.go
@@ -87,7 +87,7 @@ func ValidateWWWFlags(fs *flag.FlagSet) error {
 		if !geo.IsValidLongitude(minx) {
 			return errors.New("Invalid longitude, minx")
 		}
-		
+
 		miny, err := strconv.ParseFloat(bounds[1], 64)
 
 		if err != nil {
@@ -107,7 +107,7 @@ func ValidateWWWFlags(fs *flag.FlagSet) error {
 		if !geo.IsValidLongitude(maxx) {
 			return errors.New("Invalid longitude, maxx")
 		}
-		
+
 		maxy, err := strconv.ParseFloat(bounds[3], 64)
 
 		if err != nil {

diff --git a/server/app.go b/server/app.go
@@ -317,6 +317,11 @@ func (server_app *HTTPServerApplication) RunWithFlagSet(ctx context.Context, fs
 		logger.Info("Register %s handler", path_pip)
 		mux.Handle(path_pip, http_pip_handler)
 
+		if !strings.HasSuffix(path_pip, "/") {
+			path_pip_slash := fmt.Sprintf("%s/", path_pip)
+			mux.Handle(path_pip_slash, http_pip_handler)
+		}
+
 		index_opts := &http.IndexHandlerOptions{
 			Templates: t,
 		}
@@ -329,11 +334,7 @@ func (server_app *HTTPServerApplication) RunWithFlagSet(ctx context.Context, fs
 
 		index_handler = bootstrap.AppendResourcesHandlerWithPrefix(index_handler, bootstrap_opts, path_prefix)
 
-		path_index := path_prefix
-
-		if path_index == "" {
-			path_index = "/"
-		}
+		path_index := "/"
 
 		logger.Info("Register %s handler", path_index)
 		mux.Handle(path_index, index_handler)