Merge branch 'EMC-290_UKEOF_UI_updates' into 'develop'

Resolve EMC-290 "Additional relationships for UKEOF catalogue" Closes EMC-290 See merge request eip/catalogue!747
NERC-CEH · Oct 24, 2024 · f5ed31c · f5ed31c
2 parents 6e23a8c + c93d936
commit f5ed31c
Show file tree

Hide file tree

Showing 39 changed files with 449 additions and 112 deletions.
diff --git a/fixtures/datastore/REV-1/3ebb3a34-517d-4892-be5a-e020532e0298.meta b/fixtures/datastore/REV-1/3ebb3a34-517d-4892-be5a-e020532e0298.meta
@@ -0,0 +1,18 @@
+{
+    "rawType": "application/vnd.monitoring-facility+json",
+    "state": "published",
+    "documentType": "monitoring-facility",
+    "permissions": {
+        "EDIT": [
+            "superadmin"
+        ],
+        "VIEW": [
+            "superadmin",
+            "public"
+        ],
+        "DELETE": [
+            "superadmin"
+        ]
+    },
+    "catalogue": "ukceh"
+}
diff --git a/fixtures/datastore/REV-1/3ebb3a34-517d-4892-be5a-e020532e0298.raw b/fixtures/datastore/REV-1/3ebb3a34-517d-4892-be5a-e020532e0298.raw
@@ -0,0 +1,38 @@
+{
+    "id": "3ebb3a34-517d-4892-be5a-e020532e0298",
+    "uri": "https://catalogue-staging.ceh.ac.uk/id/3ebb3a34-517d-4892-be5a-e020532e0298",
+    "type": "monitoringFacility",
+    "title": "BT Tower London Atmospheric Pollution Observatory",
+    "metadataDate": "2024-09-24T12:49:47",
+    "resourceIdentifiers": [
+        {
+            "code": "https://catalogue-staging.ceh.ac.uk/id/3ebb3a34-517d-4892-be5a-e020532e0298"
+        }
+    ],
+    "relationships": [
+        {
+            "relation": "http://onto.ceh.ac.uk/EF#belongsTo",
+            "target": "4d40c67c-2bd6-4461-a7c4-43058abf9a16"
+        }
+    ],
+    "keywords": [
+        {
+            "value": "Sentinel site"
+        }
+    ],
+    "geometry": {
+        "geometryString": "{\"type\":\"Feature\",\"properties\":{},\"geometry\":{\"type\":\"Point\",\"coordinates\":[-0.13879,51.52142]}}",
+        "wkt": "POINT(-0.13879 51.52142)"
+    },
+    "geometryRepresentative": false,
+    "mobile": false,
+    "responsibleParties": [
+        {
+            "individualName": "Carole Helfter",
+            "organisationName": "UK Centre for Ecology & Hydrology",
+            "organisationIdentifier": "https://ror.org/00pggkr55",
+            "role": "pointOfContact",
+            "email": "[email protected]"
+        }
+    ]
+}
diff --git a/fixtures/datastore/REV-1/4d40c67c-2bd6-4461-a7c4-43058abf9a16.meta b/fixtures/datastore/REV-1/4d40c67c-2bd6-4461-a7c4-43058abf9a16.meta
@@ -0,0 +1,18 @@
+{
+    "rawType": "application/vnd.monitoring-network+json",
+    "state": "published",
+    "documentType": "monitoring-network",
+    "permissions": {
+        "EDIT": [
+            "superadmin"
+        ],
+        "VIEW": [
+            "superadmin",
+            "public"
+        ],
+        "DELETE": [
+            "superadmin"
+        ]
+    },
+    "catalogue": "ukceh"
+}
diff --git a/fixtures/datastore/REV-1/4d40c67c-2bd6-4461-a7c4-43058abf9a16.raw b/fixtures/datastore/REV-1/4d40c67c-2bd6-4461-a7c4-43058abf9a16.raw
@@ -0,0 +1,20 @@
+{
+    "id": "4d40c67c-2bd6-4461-a7c4-43058abf9a16",
+    "uri": "https://catalogue-staging.ceh.ac.uk/id/4d40c67c-2bd6-4461-a7c4-43058abf9a16",
+    "type": "monitoringNetwork",
+    "title": "UKCEH Sentinel sites",
+    "metadataDate": "2024-09-24T12:50:00",
+    "resourceIdentifiers": [
+        {
+            "code": "https://catalogue-staging.ceh.ac.uk/id/4d40c67c-2bd6-4461-a7c4-43058abf9a16"
+        }
+    ],
+    "boundingBox": {
+        "westBoundLongitude": -1.11097,
+        "eastBoundLongitude": -0.13869,
+        "southBoundLatitude": 51.521319999999996,
+        "northBoundLatitude": 51.60276,
+        "coordinates": "[[[-1.11097, 51.521319999999996], [-1.11097, 51.60276], [-0.13869, 51.60276], [-0.13869, 51.521319999999996], [-1.11097, 51.521319999999996]]]",
+        "bounds": "{\"type\": \"Feature\",      \"properties\": {},      \"geometry\": {        \"type\": \"Polygon\",        \"coordinates\": [[[-1.11097, 51.521319999999996], [-1.11097, 51.60276], [-0.13869, 51.60276], [-0.13869, 51.521319999999996], [-1.11097, 51.521319999999996]]]      }}"
+    }
+}
diff --git a/fixtures/datastore/REV-1/5d4fd6ea-18a1-44b7-a845-8c29e34bbb46.meta b/fixtures/datastore/REV-1/5d4fd6ea-18a1-44b7-a845-8c29e34bbb46.meta
@@ -0,0 +1,18 @@
+{
+    "rawType": "application/vnd.monitoring-facility+json",
+    "state": "published",
+    "documentType": "monitoring-facility",
+    "permissions": {
+        "EDIT": [
+            "superadmin"
+        ],
+        "VIEW": [
+            "superadmin",
+            "public"
+        ],
+        "DELETE": [
+            "superadmin"
+        ]
+    },
+    "catalogue": "ukceh"
+}
diff --git a/fixtures/datastore/REV-1/5d4fd6ea-18a1-44b7-a845-8c29e34bbb46.raw b/fixtures/datastore/REV-1/5d4fd6ea-18a1-44b7-a845-8c29e34bbb46.raw
@@ -0,0 +1,33 @@
+{
+    "id": "5d4fd6ea-18a1-44b7-a845-8c29e34bbb46",
+    "uri": "https://catalogue-staging.ceh.ac.uk/id/5d4fd6ea-18a1-44b7-a845-8c29e34bbb46",
+    "type": "monitoringFacility",
+    "title": "Wallingford Meteorological Site",
+    "metadataDate": "2024-09-24T12:50:00",
+    "resourceIdentifiers": [
+        {
+            "code": "https://catalogue-staging.ceh.ac.uk/id/5d4fd6ea-18a1-44b7-a845-8c29e34bbb46"
+        }
+    ],
+    "relationships": [
+        {
+            "relation": "http://onto.ceh.ac.uk/EF#belongsTo",
+            "target": "4d40c67c-2bd6-4461-a7c4-43058abf9a16"
+        }
+    ],
+    "keywords": [
+        {
+            "value": "Sentinel site"
+        }
+    ],
+    "facilityType": {
+        "value": "site",
+        "uri": "http://ex.com/facilityType/site"
+    },
+    "geometry": {
+        "geometryString": "{\"type\":\"Feature\",\"properties\":{},\"geometry\":{\"type\":\"Point\",\"coordinates\":[-1.11087,51.60266]}}",
+        "wkt": "POINT(-1.11087 51.60266)"
+    },
+    "geometryRepresentative": false,
+    "mobile": false
+}
diff --git a/java/src/main/java/uk/ac/ceh/gateway/catalogue/indexing/jena/Ontology.java b/java/src/main/java/uk/ac/ceh/gateway/catalogue/indexing/jena/Ontology.java
@@ -22,19 +22,22 @@ public class Ontology {
     public static final Property EIDC_MEMBER_OF = ResourceFactory.createProperty("https://vocabs.ceh.ac.uk/eidc#memberOf");
     public static final Property EIDC_USES = ResourceFactory.createProperty("https://vocabs.ceh.ac.uk/eidc#uses");
 
-    public static final Property SET_UP_FOR = ResourceFactory.createProperty("http://purl.org/voc/ef#setUpFor");
-    public static final Property USES = ResourceFactory.createProperty("http://purl.org/voc/ef#uses");
-    public static final Property INVOLVED_IN = ResourceFactory.createProperty("http://purl.org/voc/ef#involvedIn");
-    public static final Property SUPERSEDES = ResourceFactory.createProperty("http://purl.org/voc/ef#supersedes");
-    public static final Property SUPERSEDED_BY = ResourceFactory.createProperty("http://purl.org/voc/ef#supersededBy");
-    public static final Property BROADER = ResourceFactory.createProperty("http://purl.org/voc/ef#broader");
-    public static final Property NARROWER = ResourceFactory.createProperty("http://purl.org/voc/ef#narrower");
-    public static final Property BELONGS_TO = ResourceFactory.createProperty("http://purl.org/voc/ef#belongsTo");
-    public static final Property RELATED_TO = ResourceFactory.createProperty("http://purl.org/voc/ef#relatedTo");
-    public static final Property CONTAINS = ResourceFactory.createProperty("http://purl.org/voc/ef#contains");
-    public static final Property TRIGGERS = ResourceFactory.createProperty("http://purl.org/voc/ef#triggers");
+    public static final Property SET_UP_FOR = ResourceFactory.createProperty("http://onto.ceh.ac.uk/EF#setUpFor");
+    public static final Property USES = ResourceFactory.createProperty("http://onto.ceh.ac.uk/EF#uses");
+    public static final Property INVOLVED_IN = ResourceFactory.createProperty("http://onto.ceh.ac.uk/EF#involvedIn");
+    public static final Property SUPERSEDES = ResourceFactory.createProperty("http://onto.ceh.ac.uk/EF#supersedes");
+    public static final Property SUPERSEDED_BY = ResourceFactory.createProperty("http://onto.ceh.ac.uk/EF#supersededBy");
+    public static final Property BROADER = ResourceFactory.createProperty("http://onto.ceh.ac.uk/EF#broader");
+    public static final Property NARROWER = ResourceFactory.createProperty("http://onto.ceh.ac.uk/EF#narrower");
+    public static final Property HASCHILD = ResourceFactory.createProperty("http://onto.ceh.ac.uk/EF#hasChild");
+    public static final Property BELONGS_TO = ResourceFactory.createProperty("http://onto.ceh.ac.uk/EF#belongsTo");
+    public static final Property RELATED_TO = ResourceFactory.createProperty("http://onto.ceh.ac.uk/EF#relatedTo");
+    public static final Property UTILISES = ResourceFactory.createProperty("http://onto.ceh.ac.uk/EF#utilises");
+    public static final Property ASSOCIATED_WITH = ResourceFactory.createProperty("http://onto.ceh.ac.uk/EF#associatedWith");
+    public static final Property CONTAINS = ResourceFactory.createProperty("http://onto.ceh.ac.uk/EF#contains");
+    public static final Property TRIGGERS = ResourceFactory.createProperty("http://onto.ceh.ac.uk/EF#triggers");
 
-    public static final Property LINKING_TIME = ResourceFactory.createProperty("http://purl.org/voc/ef#linkingTime");
+    public static final Property LINKING_TIME = ResourceFactory.createProperty("http://onto.ceh.ac.uk/EF#linkingTime");
     public static final Property TEMPORAL_BEGIN = ResourceFactory.createProperty("http://def.seegrid.csiro.au/isotc211/iso19108/2002/temporal#begin");
     public static final Property TEMPORAL_END = ResourceFactory.createProperty("http://def.seegrid.csiro.au/isotc211/iso19108/2002/temporal#end");
 

diff --git a/java/src/main/java/uk/ac/ceh/gateway/catalogue/model/ResponsibleParty.java b/java/src/main/java/uk/ac/ceh/gateway/catalogue/model/ResponsibleParty.java
@@ -69,13 +69,13 @@ private String toTitlecase(String camelCase) {
             char c = camelCase.charAt(i);
             if( prevChar == ' ')
             {
-                result.append(Character.toUpperCase(c));
+                result.append(Character.toLowerCase(c));
             }
             else if(Character.isUpperCase(c) && !Character.isUpperCase(prevChar))
             {
                 // insert space before start of word if camel case
                 result.append( ' ' );
-                result.append(Character.toUpperCase( c ));
+                result.append(Character.toLowerCase( c ));
             }
             else
             {

diff --git a/java/src/main/java/uk/ac/ceh/gateway/catalogue/monitoring/MonitoringActivity.java b/java/src/main/java/uk/ac/ceh/gateway/catalogue/monitoring/MonitoringActivity.java
@@ -26,7 +26,7 @@
 })
 public class MonitoringActivity extends AbstractMetadataDocument implements WellKnownText {
     private List<String> alternateTitles;
-    private String objectives;
+    private String objectives, operationalStatus;
     private BoundingBox boundingBox;
     private List<ResponsibleParty> responsibleParties;
     private List<TimePeriod> operatingPeriod;

diff --git a/java/src/main/java/uk/ac/ceh/gateway/catalogue/monitoring/MonitoringFacility.java b/java/src/main/java/uk/ac/ceh/gateway/catalogue/monitoring/MonitoringFacility.java
@@ -26,6 +26,7 @@
     @Template(called="rdf/monitoring/facility.ftl", whenRequestedAs=RDF_TTL_VALUE)
 })
 public class MonitoringFacility extends AbstractMetadataDocument implements WellKnownText {
+    private String operationalStatus;
     private List<String> alternateTitles;
     private Keyword facilityType;
     private Geometry geometry;

diff --git a/java/src/main/java/uk/ac/ceh/gateway/catalogue/monitoring/MonitoringNetwork.java b/java/src/main/java/uk/ac/ceh/gateway/catalogue/monitoring/MonitoringNetwork.java
@@ -27,7 +27,7 @@
 })
 public class MonitoringNetwork extends AbstractMetadataDocument implements WellKnownText {
     private List<String> alternateTitles;
-    private String objectives;
+    private String objectives, operationalStatus;
     private List<ResponsibleParty> responsibleParties;
     private TimePeriod operatingPeriod;
     private List<Keyword> environmentalDomain, keywordsParameters;
@@ -39,3 +39,4 @@ public List<String> getWKTs() {
         return Stream.ofNullable(boundingBox).map(BoundingBox::getWkt).toList();
     }
 }
+
diff --git a/java/src/main/java/uk/ac/ceh/gateway/catalogue/monitoring/MonitoringProgramme.java b/java/src/main/java/uk/ac/ceh/gateway/catalogue/monitoring/MonitoringProgramme.java
@@ -26,7 +26,7 @@
 })
 public class MonitoringProgramme extends AbstractMetadataDocument implements WellKnownText {
     private List<String> alternateTitles;
-    private String objectives;
+    private String objectives, operationalStatus;
     private BoundingBox boundingBox;
     private List<ResponsibleParty> responsibleParties;
     private List<TimePeriod> operatingPeriod;

diff --git a/java/src/test/java/templates/RdfTurtleTest.java b/java/src/test/java/templates/RdfTurtleTest.java
@@ -88,7 +88,7 @@ void loadActivity() {
                     createStatement(
                         createResource("https://example.com/id/9371"),
                         createProperty("http://www.w3.org/1999/02/22-rdf-syntax-ns#type"),
-                        createResource("http://www.w3.org/2015/03/inspire/ef#EnvironmentalMonitoringActivity")
+                        createResource("http://onto.ceh.ac.uk/EF#Activity")
                     )
                 )
             );
@@ -111,7 +111,7 @@ void loadFacility() {
                     createStatement(
                         createResource("https://example.com/id/1234"),
                         createProperty("http://www.w3.org/1999/02/22-rdf-syntax-ns#type"),
-                        createResource("http://www.w3.org/2015/03/inspire/ef#EnvironmentalMonitoringFacility")
+                        createResource("http://onto.ceh.ac.uk/EF#Facility")
                     )
                 )
             );
@@ -134,7 +134,7 @@ void loadNetwork() {
                     createStatement(
                         createResource("https://example.com/id/7453"),
                         createProperty("http://www.w3.org/1999/02/22-rdf-syntax-ns#type"),
-                        createResource("http://www.w3.org/2015/03/inspire/ef#EnvironmentalMonitoringNetwork")
+                        createResource("http://onto.ceh.ac.uk/EF#Network")
                     )
                 )
             );

diff --git a/java/src/test/java/uk/ac/ceh/gateway/catalogue/gemini/ResponsiblePartyTest.java b/java/src/test/java/uk/ac/ceh/gateway/catalogue/gemini/ResponsiblePartyTest.java
@@ -13,7 +13,7 @@ public class ResponsiblePartyTest {
     public void authorIsHumanReadable() {
         //Given
         ResponsibleParty author = ResponsibleParty.builder().role("author").build();
-        String expected = "Author";
+        String expected = "author";
 
         //When
         String actual = author.getRoleDisplayName();
@@ -26,7 +26,7 @@ public void authorIsHumanReadable() {
     public void resourceProviderIsHumanReadable() {
         //Given
         ResponsibleParty author = ResponsibleParty.builder().role("resourceProvider").build();
-        String expected = "Resource Provider";
+        String expected = "resource provider";
 
         //When
         String actual = author.getRoleDisplayName();

diff --git a/java/src/test/resources/uk/ac/ceh/gateway/catalogue/controllers/bibtex.txt b/java/src/test/resources/uk/ac/ceh/gateway/catalogue/controllers/bibtex.txt
@@ -1,8 +1,8 @@
 @misc{1234:45553,
         doi = {1234:45553},
         url = {https://doi.org/1234:45553},
-     author = {Foo;Bar},
+     author = {Foo AND Bar},
   publisher = {BOB},
       title = {Land and Water},
        year = {2020}
-}
+}
diff --git a/templates/citation/bib.ftlh b/templates/citation/bib.ftlh
@@ -1,8 +1,8 @@
 @misc{${doi},
         doi = {${doi}},
         url = {${url}},
-     author = {${authors?join(';')}},
+     author = {${authors?join(' AND ')}},
   publisher = {${publisher}},
       title = {${title}},
        year = {${year?c}}
-}
+}
diff --git a/templates/html/ceh-model.ftlh b/templates/html/ceh-model.ftlh
@@ -89,7 +89,7 @@
             <#if otherContacts?? && otherContacts?has_content>
               <@m.key "Other contacts">
               <#list otherContacts as otherContact>
-                <dt>${otherContact.roleDisplayName}</dt>
+                <dt>${otherContact.roleDisplayName?cap_first}</dt>
                 <dd>
                   <div class="responsibleParty">
                     <@func.displayContact otherContact, true, true, false />

diff --git a/templates/html/document/_contacts.ftlh b/templates/html/document/_contacts.ftlh
@@ -63,7 +63,7 @@
 
   <#if otherContacts?has_content>
     <#list otherContacts as otherContact>
-      <dt>${otherContact.roleDisplayName}</dt>
+      <dt>${otherContact.roleDisplayName?cap_first}</dt>
       <dd>
         <div class="responsibleParty">
           <@func.displayContact otherContact false true false />

diff --git a/templates/html/footer/eidc.ftlh b/templates/html/footer/eidc.ftlh
@@ -17,9 +17,6 @@
       <a target="_blank" href="https://eidc.ac.uk/contact" aria-label="Contact us" class="social">
           <i class="fa-solid fa-xl fa-fw fa-envelope"></i>
       </a>
-      <a class="social" target="_blank" href="https://twitter.com/EIDC_data" aria-label="Go to our X (Twitter) feed">
-          <i class="fa-brands fa-xl fa-fw fa-x-twitter"></i>
-      </a>
     </div>
     <div class="footer-terms">
       UKCEH &copy; ${.now?datetime?string['yyyy']}

diff --git a/templates/html/monitoring/activity.ftlh b/templates/html/monitoring/activity.ftlh
@@ -11,9 +11,8 @@
 
   </#if>
 
-  <@m.relationships "Uses" "Uses these facilities/networks" "http://onto.nerc.ac.uk/CEHMD/rels/uses" />
-  <@m.relationships "Setup for" "Set up for these programmes" "http://ontm.nerc.ac.uk/CEHMD/rels/setupFor" />
-  <@m.inverseRelationships "Setup for" "Set up for these programmes" "http://onto.nerc.ac.uk/CEHMD/rels/triggers" />
+  <@m.relationships "http://onto.ceh.ac.uk/EF#uses" "Uses these facilities/networks"/>
+  <@m.inverseRelationships  "http://onto.ceh.ac.uk/EF#triggers"  "Set up for these programmes"/>
 
 </@m.base>
 

diff --git a/templates/html/monitoring/facility.ftlh b/templates/html/monitoring/facility.ftlh
@@ -21,8 +21,19 @@
   </div>
   </#if>
 
-    <@m.inverseRelationships "Uses" "Used by these activities" "http://onto.nerc.ac.uk/CEHMD/rels/uses" />
-    <@m.relationships "Belongs To" "Belongs to these networks" "http://purl.org/voc/ef#belongsTo" />
-    <@m.relationships "Supersedes" "Supersedes" "http://purl.org/voc/ef#supersedes" />
-    <@m.inverseRelationships "Superseded by" "Superseded by" "http://purl.org/voc/ef#supersedes" />
+  <div class="relationships">
+    <@m.relationships "http://onto.ceh.ac.uk/EF#belongsTo" "Belongs to these networks"/>
+
+    <@m.inverseRelationships "http://onto.ceh.ac.uk/EF#uses" "Used by"  />
+    <@m.inverseRelationships "http://onto.ceh.ac.uk/EF#utilises" "Used by"  />
+
+    <@m.relationships "http://onto.ceh.ac.uk/EF#supersedes" "Supersedes" />
+    <@m.inverseRelationships "http://onto.ceh.ac.uk/EF#supersedes" "Superseded by"  />
+
+    <@m.relationships "http://onto.ceh.ac.uk/EF#narrower" "Child facilities" />
+    <@m.inverseRelationships "http://onto.ceh.ac.uk/EF#narrower" "Parent facilities"  />
+
+    <@m.symmetricRelationships "http://onto.ceh.ac.uk/EF#associatedWith" "Related"/>
+  </div>
+
 </@m.base>