Merge pull request #397 from PDOK/collection-page-adjustments

Collection page adjustments for search collection

Author: mortenzwarenstein

assets/css/gokoala.css

@@ -33,6 +33,12 @@
 .card-header a:hover {
     color: var(--secondary-color);
 }
+.collapse-chevron {
+    transition: transform 0.2s ease-in-out;
+}
+a[data-bs-toggle="collapse"]:not([aria-expanded="false"]) .collapse-chevron {
+    transform: rotate(-180deg);
+}
 
 hgroup {
     margin-bottom: 0.5rem;

assets/i18n/en.yaml

@@ -76,6 +76,7 @@ CollectionsHeader: Collections
 SearchHelpText: Search query must be at least two characters long.
 NoCollectionSelectedText: A minimum of one collection must be selected.
 
+
 # Tile/TileMatrixSet page
 NetherlandsRDNewQuadAbstract: |-
   The tiles can be requested via the URL template below, where
@@ -126,8 +127,11 @@ BrowseSchemaAttributesSuffix: of the attributes for more details
 FeaturesExplanation: GeoJSON is an open and widely accepted format for feature data and the first choice for many (web) applications. However, it formally only supports the WGS84 projection. JSON-FG is an extension of GeoJSON and does offer official support for other projections. Since JSON-FG is a recent development, from a compatibility point of view GeoJSON is also offered in other projections for the time being.
 CollectionTilesHTML: This collection is available as vector tiles in one or multiple projections.
 CollectionTilesPlain: This collection is available as vector tiles in one or multiple projections.
-DisplayNameTemplate: Display template
 OGCCollections: Related OGC API feature collections
+DisplayNameExample: Display example
+DisplayedAs: Displayed as
+CollectionFilter: Collection filter
+Details: Details
 
 # Features page
 Geometry: geometry

assets/i18n/nl.yaml

@@ -76,6 +76,7 @@ CollectionsHeader: Collecties
 SearchHelpText: Zoekterm moet minimaal twee tekens lang zijn.
 NoCollectionSelectedText: Er moet minimaal één collectie geselecteerd zijn.
 
+
 # Tile/TileMatrixSet page
 NetherlandsRDNewQuadAbstract: |-
   De tiles zijn op te vragen via onderstaande URL-template. Daarbij is
@@ -126,9 +127,11 @@ BrowseSchemaAttributesSuffix: van de attributes voor meer details
 FeaturesExplanation: GeoJSON is een open en breed geaccepteerd formaat voor feature data en voor veel (web)toepassingen de eerste keus. Formeel ondersteunt het echter alleen de WGS84 projectie. JSON-FG is een uitbreiding op GeoJSON en biedt officiële ondersteuning voor andere projecties. Aangezien JSON-FG een recente ontwikkeling is wordt er vanuit compatibiliteit oogpunt vooralsnog ook GeoJSON in andere projecties aangeboden.
 CollectionTilesHTML: Deze collectie wordt beschikbaar gesteld als vector tiles in één of meerdere projecties.
 CollectionTilesPlain: Deze collectie wordt beschikbaar gesteld als vector tiles in één of meerdere projecties.
-DisplayNameTemplate: Weergavesjabloon
 OGCCollections: Gerelateerde OGC API feature collecties
-
+DisplayedAs: Weergegeven als
+DisplayNameExample: Voorbeeldweergave
+CollectionFilter: Collectiefilter
+Details: Details
 # Features page
 Geometry: geometrie
 Prev: Vorige

assets/js/bootstrap.min.js

@@ -81,6 +81,24 @@ func (csfs FeaturesSearchCollections) ContainsID(id string) bool {
 	return false
 }
 
+func (csfs FeaturesSearchCollections) GetCollectionRefsByCollectionID(collectionID string) []RelatedOGCAPIFeaturesCollection {
+	var collection FeaturesSearchCollection
+	for _, coll := range csfs {
+		if coll.ID == collectionID {
+			collection = coll
+			break
+		}
+	}
+	if collection.CollectionRefs == nil {
+		return make([]RelatedOGCAPIFeaturesCollection, 0)
+	}
+
+	result := make([]RelatedOGCAPIFeaturesCollection, len(collection.CollectionRefs))
+	copy(result, collection.CollectionRefs)
+
+	return result
+}
+
 // +kubebuilder:object:generate=true
 //
 //nolint:recvcheck
@@ -97,11 +115,14 @@ type FeaturesSearchCollection struct {
 	// +optional
 	Links *CollectionLinks `yaml:"links,omitempty" json:"links,omitempty"`
 
-	// Fields that make up the display name and/or suggestions. These fields can be used as variables in the DisplayNameTemplate.
+	// Fields that make up the display name and/or suggestions. These fields can be used as variables in the DisplayNameExample.
 	Fields []string `yaml:"fields,omitempty" json:"fields,omitempty"`
 
 	// Template that indicates how a search record is displayed. Uses Go text/template syntax to reference fields.
-	DisplayNameTemplate string `yaml:"displayNameTemplate,omitempty" json:"displayNameTemplate,omitempty"`
+	DisplayNameExample string `yaml:"displayNameExample,omitempty" json:"displayNameExample,omitempty"`
+
+	// Filter that is applied to gather data from FeatureCollections.
+	CollectionFilter string `yaml:"collectionFilter,omitempty" json:"collectionFilter,omitempty"`
 
 	// Version of the collection exposed through the API.
 	// +kubebuilder:default=1

config/ogcapi_features_search.go

@@ -61,7 +61,8 @@ ogcApi:
           - address_street
           - address_postal
           - address_place
-        displayNameTemplate: "{{ .address_street | firstupper  }} {{ .address_postal}} {{ .address_place }}"
+        displayNameExample: "Lange Jansstraat 1, 3512 BA Utrecht"
+        collectionFilter: "address_postal LIKE '1234%'"
         collectionRefs:
           - collection: addresses  # reference the locally hosted feature collection
             geometryType: point
@@ -79,11 +80,15 @@ ogcApi:
         fields:
           - street
           - place
-        displayNameTemplate: "{{ .street | firstupper  }} {{ .place }}"
+        displayNameExample: "Domplein 9, 3512 JC Utrecht"
+        collectionFilter: "address_postal LIKE '1234%'"
         collectionRefs:
           - api: https://example.com/ogc/v1  # reference a remote hosted feature collection
             collection: buildings
             geometryType: polygon
+          - api: https://example.com/ogc/v2  # reference a remote hosted feature collection
+            collection: buildings2
+            geometryType: polygon
         tableName: buildings
         metadata:
           title: Dutch Buildings

examples/config_search.yaml

@@ -8,7 +8,7 @@ collections:
       - address_street
       - address_postal
       - address_place
-    displayNameTemplate: "{{ .address_street | firstupper  }} {{ .address_postal}} {{ .address_place }}"
+    displayNameExample: "Lange Jansstraat 1, 3512 BA Utrecht"
     suggestTemplates:
       - "{{ .address_street | firstupper  }} {{ .address_postal}} {{ .address_place }}" # equal to display name
       - "{{ .address_street | firstupper  }} {{ .address_postal}}, {{ .address_place }}"
@@ -20,7 +20,7 @@ collections:
     fields:
       - street
       - place
-    displayNameTemplate: "{{ .street | firstupper  }} {{ .place }}"
+    displayNameExample: "Lange Jansstraat Utrecht"
     suggestTemplates:
       - "{{ .street | firstupper  }} {{ .place }}" # equal to display name
       - "{{ .street | firstupper  }} - {{ .place }}"

examples/config_search_etl.yaml

@@ -158,5 +158,6 @@
         </div>
     </footer>
 
+    <script src="js/bootstrap.min.js"></script>
 </body>
 </html>

internal/engine/templates/layout.go.html

@@ -133,6 +133,17 @@ func TestNewCollections_Collections(t *testing.T) {
 				statusCode:   http.StatusOK,
 			},
 		},
+		{
+			name: "search config, single collectionRef renders direct link in card header",
+			fields: fields{
+				configFile: "internal/ogc/features_search/testdata/config_search.yaml",
+				url:        "http://localhost:8080/collections?f=html",
+			},
+			want: want{
+				bodyContains: "href=\"https://example.com/ogc/v1/collections/addresses/items\"",
+				statusCode:   http.StatusOK,
+			},
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {