Merge branch 'fix-dwc-basisOfRecord' into release-phyx.js-v1.2.0

phyloref · Jun 19, 2024 · 328e813 · 328e813
2 parents 62e0168 + fac1269
commit 328e813
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/src/wrappers/SpecimenWrapper.js b/src/wrappers/SpecimenWrapper.js
@@ -10,8 +10,8 @@ const { PhyxCacheManager } = require('../utils/PhyxCacheManager');
  *
  * - TaxonomicUnitWrapper.TYPE_SPECIMEN: A specimen.
  *    - Based on http://rs.tdwg.org/dwc/terms/Occurrence
- *    - Should have a dwc:occurrenceID with the occurrence identifier.
- *    - Should have a dwc:basisOfRecord to indicate what sort of occurrence this is.
+ *    - Should have a occurrenceID with the occurrence identifier.
+ *    - Should have a basisOfRecord to indicate what sort of occurrence this is.
  *
  * Since TaxonNameWrapper follows the TDWG ontology, we'd love to do the same for
  * SpecimenWrapper, but unfortunately the TaxonOccurrence ontology has been deprecated
@@ -38,7 +38,7 @@ class SpecimenWrapper {
     const normalizedSpecimen = {
       '@type': SpecimenWrapper.TYPE_SPECIMEN,
       label: wrapped.label,
-      'dwc:basisOfRecord': wrapped.basisOfRecord,
+      basisOfRecord: wrapped.basisOfRecord,
       occurrenceID: wrapped.occurrenceID,
       catalogNumber: wrapped.catalogNumber,
       institutionCode: wrapped.institutionCode,
@@ -57,12 +57,12 @@ class SpecimenWrapper {
   static fromOccurrenceID(occurrenceID, basisOfRecord = 'PreservedSpecimen') {
     // Copy the occurrence ID so we can truncate it if necessary.
     let occurID = occurrenceID;
-    if (occurID.startsWith('urn:catalog:')) occurID = occurID.substr(12);
+    if (occurID.startsWith('urn:catalog:')) occurID = occurID.substring(12);
 
     // Prepare the specimen.
     const specimen = {
       '@type': SpecimenWrapper.TYPE_SPECIMEN,
-      'dwc:basisOfRecord': basisOfRecord,
+      basisOfRecord,
       occurrenceID: occurID,
     };
 
@@ -185,7 +185,7 @@ class SpecimenWrapper {
    * Return the basis of record, if one is present.
    */
   get basisOfRecord() {
-    if (has(this.specimen, 'dwc:basisOfRecord')) return this.specimen['dwc:basisOfRecord'];
+    if (has(this.specimen, 'basisOfRecord')) return this.specimen.basisOfRecord;
     return undefined;
   }
 
@@ -194,7 +194,7 @@ class SpecimenWrapper {
    * recommended values.
    */
   set basisOfRecord(bor) {
-    this.specimen['dwc:basisOfRecord'] = bor;
+    this.specimen.basisOfRecord = bor;
   }
 
   /** Return this specimen as a taxon concept if it contains taxon name information. */

diff --git a/test/specimens.js b/test/specimens.js
@@ -24,7 +24,7 @@ describe('SpecimenWrapper', function () {
     it('should be able to extract an occurenceID and catalogNumber from simple specimen IDs', function () {
       const wrapper = new phyx.SpecimenWrapper({
         occurrenceID: 'Wall 2527, Fiji (uc)',
-        'dwc:basisOfRecord': 'PreservedSpecimen',
+        basisOfRecord: 'PreservedSpecimen',
       });
       expect(wrapper.occurrenceID).to.equal('Wall 2527, Fiji (uc)');
       expect(wrapper.catalogNumber).to.equal('Wall 2527, Fiji (uc)');
@@ -33,7 +33,7 @@ describe('SpecimenWrapper', function () {
     it('should extract institutionCode and catalogNumber from a institutionCode:catalogNumber combination', function () {
       const wrapper = new phyx.SpecimenWrapper({
         occurrenceID: 'FMNH:PR 2081',
-        'dwc:basisOfRecord': 'PreservedSpecimen',
+        basisOfRecord: 'PreservedSpecimen',
       });
       expect(wrapper.occurrenceID).to.equal('FMNH:PR 2081');
       expect(wrapper.institutionCode).to.equal('FMNH');
@@ -80,7 +80,7 @@ describe('SpecimenWrapper', function () {
       expect(specimen.institutionCode).to.equal('FMNH');
       expect(specimen.collectionCode).to.equal('PR');
       expect(specimen.catalogNumber).to.equal('2081');
-      expect(specimen['dwc:basisOfRecord']).to.equal('PreservedSpecimen');
+      expect(specimen.basisOfRecord).to.equal('PreservedSpecimen');
     });
   });
 });