@abi-software/flatmap-viewer 2.2.6 → 2.2.7

package/README.rst

@@ -38,7 +38,7 @@ The map server endpoint is specified as ``MAP_ENDPOINT`` in ``src/main.js``. It
 Package Installation
 ====================
 
-* ``npm install @abi-software/flatmap-viewer@2.2.6``
+* ``npm install @abi-software/flatmap-viewer@2.2.7``
 
 Documentation
 -------------

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abi-software/flatmap-viewer",
-  "version": "2.2.6",
+  "version": "2.2.7",
   "description": "Flatmap viewer using Maplibre GL",
   "repository": "https://github.com/AnatomicMaps/flatmap-viewer.git",
   "main": "src/main.js",

package/src/flatmap-viewer.js

@@ -1095,10 +1095,13 @@ export class MapManager
         let latestMap = null;
         let lastCreatedTime = '';
         for (const map of this._mapList) {
-            if ('uuid' in map && mapDescribes === map.uuid
+            if (('uuid' in map && mapDescribes === map.uuid
              || mapDescribes === map.id
              || 'taxon' in map && mapDescribes === map.taxon
-             || mapDescribes === map.source) {
+             || mapDescribes === map.source)
+            && (!('biologicalSex' in identifier)
+             || ('biologicalSex' in map
+               && identifier.biologicalSex === map.biologicalSex))) {
                 if ('created' in map) {
                     if (lastCreatedTime < map.created) {
                         lastCreatedTime = map.created;
@@ -1110,13 +1113,6 @@ export class MapManager
                 }
             }
         }
-        if (latestMap !== null) {
-            if ('biologicalSex' in identifier
-             && 'biologicalSex' in latestMap
-             && identifier.biologicalSex !== latestMap.biologicalSex) {
-                latestMap = null;
-            }
-        }
         return latestMap;
     }
 
@@ -1140,7 +1136,7 @@ export class MapManager
     * @arg identifier.taxon {string} The taxon identifier of the species represented by the map. This is
     *                                specified as metadata in the map's source file.)
     * @arg identifier.biologicalSex {string} The biological sex of the species represented by the map.
-    *                                 This is specified as metadatain the map's source file.)
+    *                                 This is specified as metadata in the map's source file.)
     * @arg identifier.uuid {string} The unique uuid the flatmap. If given then this exact map will
     *                                be loaded, overriding ``taxon`` and ``biologicalSex``.
     * @arg container {string} The id of the HTML container in which to display the map.