Disable json escape

.github/workflows/tidy.yml

@@ -0,0 +1,18 @@
+name: tidy
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+permissions:
+  contents: read
+jobs:
+  tidy:
+    name: tidy
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/setup-go@v4
+        with:
+          go-version: '1.20'
+      - uses: actions/checkout@v3
+      - uses: katexochen/go-tidy-check@v2

assets/i18n/active.nl.toml

@@ -52,7 +52,7 @@ pagina's om te zien welke zoomniveaus door deze API worden ondersteund."""
 
 # Conformance page
 ConformanceAbstract = """
-Hieronder staan verwijzingen naar de OGC API conformiteitsklassen waaraan deze service voldoet. <br/>De statuskolom geeft aan of de betreffende specificatie reeds tot officiele standaard is verklaard door het OGC."""
+Hieronder staan verwijzingen naar de OGC API conformiteitsklassen waaraan deze service voldoet. <br/>De statuskolom geeft aan of de betreffende specificatie reeds tot officiële standaard is verklaard door het OGC."""
 Standard = "Standaard"
 Draft = "Concept"
 

go.mod

@@ -13,6 +13,7 @@ require (
 	github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572
 	github.com/gomarkdown/markdown v0.0.0-20230322041520-c84983bdbf2a
 	github.com/nicksnyder/go-i18n/v2 v2.2.1
+	github.com/sqids/sqids-go v0.4.1
 	github.com/stretchr/testify v1.8.2
 	github.com/urfave/cli/v2 v2.25.3
 	github.com/writeas/go-strip-markdown/v2 v2.1.1
@@ -36,7 +37,6 @@ require (
 	github.com/perimeterx/marshmallow v1.1.4 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
-	github.com/sqids/sqids-go v0.4.1 // indirect
 	github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
 	golang.org/x/crypto v0.9.0 // indirect
 	golang.org/x/sys v0.8.0 // indirect

ogc/features/domain/domain.go

@@ -124,8 +124,7 @@ func (c EncodedCursor) Decode() int64 {
 	if len(decodedValue) > 1 {
 		log.Printf("encountered more than one cursor value after decoding: '%v', "+
 			"this is not allowed! Defaulting to first value.", decodedValue)
-	}
-	if len(decodedValue) == 0 {
+	} else if len(decodedValue) == 0 {
 		log.Printf("decoding cursor value '%v' failed, defaulting to first page", decodedValue)
 		return 0
 	}

ogc/features/json.go

@@ -1,6 +1,7 @@
 package features
 
 import (
+	"bytes"
 	"encoding/json"
 	"fmt"
 	"net/http"
@@ -23,7 +24,7 @@ func (jf *jsonFeatures) featuresAsGeoJSON(w http.ResponseWriter, collectionID st
 	cursor domain.Cursor, limit int, fc *domain.FeatureCollection) {
 
 	fc.Links = jf.createFeatureCollectionLinks(collectionID, cursor, limit)
-	fcJSON, err := json.Marshal(&fc)
+	fcJSON, err := toJSON(&fc)
 	if err != nil {
 		http.Error(w, "Failed to marshal FeatureCollection to JSON", http.StatusInternalServerError)
 		return
@@ -33,7 +34,7 @@ func (jf *jsonFeatures) featuresAsGeoJSON(w http.ResponseWriter, collectionID st
 
 func (jf *jsonFeatures) featureAsGeoJSON(w http.ResponseWriter, collectionID string, feat *domain.Feature) {
 	feat.Links = jf.createFeatureLinks(collectionID, feat.ID)
-	featJSON, err := json.Marshal(feat)
+	featJSON, err := toJSON(feat)
 	if err != nil {
 		http.Error(w, "Failed to marshal Feature to JSON", http.StatusInternalServerError)
 		return
@@ -108,3 +109,14 @@ func (jf *jsonFeatures) createFeatureLinks(collectionID string, featureID string
 	})
 	return links
 }
+
+// toJSON performs the equivalent of json.Marshal but without escaping '<', '>' and '&'.
+// Especially the '&' is important since we use this character in the next/prev links.
+func toJSON(input interface{}) ([]byte, error) {
+	buffer := &bytes.Buffer{}
+	encoder := json.NewEncoder(buffer)
+	encoder.SetEscapeHTML(false)
+	err := encoder.Encode(input)
+	marshalled := bytes.TrimRight(buffer.Bytes(), "\n")
+	return marshalled, err
+}