From 06ab43ad7cf7c4ad4d305ed048b288c0c0b833e1 Mon Sep 17 00:00:00 2001
From: Richard Kettelerij <richard@mindloops.nl>
Date: Mon, 8 Jul 2024 11:03:21 +0200
Subject: [PATCH] chore(html): Always open GeoJSON/JSON-FG is new window

---
 .../expected_multiple_ogc_apis_single_collection.html    | 4 ++--
 .../ogc/common/geospatial/templates/collection.go.html   | 9 ++-------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/internal/engine/testdata/expected_multiple_ogc_apis_single_collection.html b/internal/engine/testdata/expected_multiple_ogc_apis_single_collection.html
index b8515d0d..2fb03bdb 100644
--- a/internal/engine/testdata/expected_multiple_ogc_apis_single_collection.html
+++ b/internal/engine/testdata/expected_multiple_ogc_apis_single_collection.html
@@ -28,7 +28,7 @@ <h2 class="card-header h5">
 <option value="http://www.opengis.net/def/crs/EPSG/0/28992">EPSG:28992</option>
 </select>
 als
-<a href="#" onclick="gotoFeatures('json', 'selectjson'); return false;">GeoJSON</a>.
+<a href="http://localhost:8180/collections/NewYork" onclick="gotoFeatures('json', 'selectjson'); return false;">GeoJSON</a>.
 </li>
 <li> <label for="selectjsonfg" class="visually-hidden">Ga naar Features in</label>
 <select id="selectjsonfg">
@@ -36,7 +36,7 @@ <h2 class="card-header h5">
 <option value="http://www.opengis.net/def/crs/EPSG/0/28992">EPSG:28992</option>
 </select>
 als
-<a href="#" onclick="gotoFeatures('jsonfg', 'selectjsonfg'); return false;">JSON-FG</a>.
+<a href="http://localhost:8180/collections/NewYork" onclick="gotoFeatures('jsonfg', 'selectjsonfg'); return false;">JSON-FG</a>.
 </li>
 </ul>
 </p>
diff --git a/internal/ogc/common/geospatial/templates/collection.go.html b/internal/ogc/common/geospatial/templates/collection.go.html
index 8103762a..1201941b 100644
--- a/internal/ogc/common/geospatial/templates/collection.go.html
+++ b/internal/ogc/common/geospatial/templates/collection.go.html
@@ -12,12 +12,7 @@
     } else {
       url = `${baseURL}?f=${format}&crs=${crs}`;
     }
-
-    if (event.ctrlKey) {
-      window.open(url, '_blank');
-    } else {
-      window.location.href = url;
-    }
+    window.open(url, '_blank');
   }
 </script>
 
@@ -163,7 +158,7 @@ <h2 class="card-header h5">
                                 {{ end }}
                             </select>
                             {{ i18n "As" }}
-                            <a href="#" onclick="gotoFeatures('{{ $formatKey }}', 'select{{ $formatKey }}'); return false;">{{ $formatName }}</a>.
+                            <a href="{{ $.Config.BaseURL }}/collections/{{ $.Params.ID }}" onclick="gotoFeatures('{{ $formatKey }}', 'select{{ $formatKey }}'); return false;">{{ $formatName }}</a>.
                            </li>
                         {{ end }}
                         </ul>