Merge pull request #555 from camicroscope/develop

For 3.9.10

Author: birm

HISTORY.md

@@ -24,13 +24,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * **Version 1**
     * [1.0.x](#camicroscope-10)
 
-### caMicroscope [Unreleased](https://github.com/camicroscope/camicroscope/compare/v3.9.8...camicroscope:develop)
+### caMicroscope [Unreleased](https://github.com/camicroscope/camicroscope/compare/v3.9.10...camicroscope:develop)
 ###### TBD
 
 ### caMicroscope [3.9.9](https://github.com/camicroscope/camicroscope/compare/v3.9.8...camicroscope:v3.9.9)
 ###### 2021-11-08
 * Fix and enhance Human Readable URL support
 
+### caMicroscope [3.9.10](https://github.com/camicroscope/camicroscope/compare/v3.9.8...camicroscope:v3.9.10)
+###### 2021-01-20
+* Human Readable Urls for pathdb
+
 ### caMicroscope [3.9.8](https://github.com/camicroscope/camicroscope/compare/v3.9.6...camicroscope:v3.9.8)
 ###### 2021-10-21
 * Add Segmentation -> Annotation Functionality [#542](https://github.com/camicroscope/caMicroscope/pull/542)

apps/viewer/init.js

@@ -150,7 +150,6 @@ function initCore() {
     slideQuery.id = $D.params.slideId;
     slideQuery.name = $D.params.slide;
     slideQuery.location = $D.params.location;
-    slideQuery.collection = $D.params.collection;
     opt.addRulerCallback = onAddRuler;
     opt.deleteRulerCallback = onDeleteRuler;
     $CAMIC = new CaMic('main_viewer', slideQuery, opt);

apps/viewer/viewer.html

@@ -405,6 +405,11 @@
     // get slide id from url
     $D.params = getUrlVars();
 
+    if ($D.params.mode == 'pathdb') {
+      $D.pages.home = '../../../';
+      $D.pages.table = '../../../';
+    }
+
     // load if we have at least one slide query element
     if ($D.params && $D.params.slideId) {
       // normal initialization starts
@@ -421,8 +426,8 @@
       let STORE = new Store('../../data/');
       STORE.findSlide(
         $D.params.slide,
-        $D.params.study,
         $D.params.specimen,
+        $D.params.study,
         $D.params.location,
         null,
         $D.params.collection

common/PathdbMods.js

@@ -22,6 +22,9 @@ function PathDbMods() {
 
   function convertPathDbSlide(data){
     let x={}
+    if (Array.isArray(data) && data.length > 0){
+      data = data[0]
+    }
     x["_raw"] = data
     x.mpp = 1e9
     x.source="pathdb"
@@ -103,7 +106,7 @@ function PathDbMods() {
         text: response.statusText,
         url: response.url
       };
-      return response.json().then(convertPathDbSlide).then(x => [x]);
+      return response.json().then(x=>convertPathDbSlide(x[0])).then(x => [x]);
     })
   }
   Store.prototype.default_getSlide = Store.prototype.getSlide