Take more care on preserving and honoring spaces and caps in object n…

…ames. Closes #105

layer.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 
 	"net/http"
+	"net/url"
 )
 
 // LayerType is the table/function type of a layer
@@ -103,7 +104,7 @@ func getJSONLayers(r *http.Request) map[string]layerJSON {
 			Name:        v.GetName(),
 			Schema:      v.GetSchema(),
 			Description: v.GetDescription(),
-			DetailURL:   fmt.Sprintf("%s/%s.json", urlBase, v.GetID()),
+			DetailURL:   fmt.Sprintf("%s/%s.json", urlBase, url.PathEscape(v.GetID())),
 		}
 	}
 	return json

layer_proc.go

@@ -152,7 +152,7 @@ func (lyr *LayerFunction) getFunctionDetailJSON(req *http.Request) (FunctionDeta
 		MaxZoom:     viper.GetInt("DefaultMaxZoom"),
 	}
 	// TileURL is relative to server base
-	td.TileURL = fmt.Sprintf("%s/%s/{z}/{x}/{y}.pbf", serverURLBase(req), lyr.ID)
+	td.TileURL = fmt.Sprintf("%s/%s/{z}/{x}/{y}.pbf", serverURLBase(req), url.PathEscape(lyr.ID))
 
 	tmpMap := make(map[int]FunctionArgument)
 	tmpKeys := make([]int, 0, len(lyr.Arguments))
@@ -174,8 +174,8 @@ func getFunctionLayers() ([]LayerFunction, error) {
 	layerSQL := `
 		SELECT
 			Format('%s.%s', n.nspname, p.proname) AS id,
-			n.nspname,
-			p.proname,
+			n.nspname AS nspname,
+			p.proname AS proname,
 			coalesce(d.description, '') AS description,
 			coalesce(p.proargnames, ARRAY[]::text[]) AS argnames,
 			coalesce(string_to_array(oidvectortypes(p.proargtypes),', '), ARRAY[]::text[]) AS argtypes,
@@ -187,7 +187,7 @@ func getFunctionLayers() ([]LayerFunction, error) {
 		AND p.proargnames[1:3] = ARRAY['z'::text, 'x'::text, 'y'::text]
 		AND prorettype = 17
 		AND has_schema_privilege(n.oid, 'usage')
-		AND has_function_privilege(Format('%s.%s(%s)', n.nspname, p.proname, oidvectortypes(proargtypes)), 'execute')
+		AND has_function_privilege(Format('%s.%s(%s)', quote_ident(n.nspname), quote_ident(p.proname), oidvectortypes(proargtypes)), 'execute')
 		ORDER BY 1
 		`
 

layer_table.go

@@ -216,7 +216,7 @@ func (lyr *LayerTable) getTableDetailJSON(req *http.Request) (TableDetailJSON, e
 		MaxZoom:      viper.GetInt("DefaultMaxZoom"),
 	}
 	// TileURL is relative to server base
-	td.TileURL = fmt.Sprintf("%s/%s/{z}/{x}/{y}.pbf", serverURLBase(req), lyr.ID)
+	td.TileURL = fmt.Sprintf("%s/%s/{z}/{x}/{y}.pbf", serverURLBase(req), url.PathEscape(lyr.ID))
 
 	// Want to add the properties to the Json representation
 	// in table order, which is fiddly

main.go

@@ -279,7 +279,7 @@ func requestListJSON(w http.ResponseWriter, r *http.Request) error {
 	log.WithFields(log.Fields{
 		"event": "request",
 		"topic": "layerlist",
-	}).Trace("requestListJson")
+	}).Trace("requestListJSON")
 	// Update the global in-memory list from
 	// the database
 	if err := loadLayers(); err != nil {
@@ -296,7 +296,7 @@ func requestDetailJSON(w http.ResponseWriter, r *http.Request) error {
 	log.WithFields(log.Fields{
 		"event": "request",
 		"topic": "layerdetail",
-	}).Tracef("requestDetailJson(%s)", lyrID)
+	}).Tracef("requestDetailJSON(%s)", lyrID)
 
 	// Refresh the layers list
 	if err := loadLayers(); err != nil {