Merge branch 'master' of

https://github.com/QualitativeDataRepository/dataverse-previewers.git

Author: qqmyers

5.2curlcommands.md

@@ -864,6 +864,7 @@ curl -X POST -H 'Content-type: application/json' http://localhost:8080/api/admin
   "toolName":"3D model Previewer",
   "scope":"file",
   "types":["preview"],
+<<<<<<< HEAD
   "toolUrl":"https://qualitativedatarepository.github.io/dataverse-previewers/previewers/v1.5/X3DPreview.html",
   "toolParameters": {
       "queryParameters":[
@@ -1004,6 +1005,148 @@ curl -X POST -H 'Content-type: application/json' http://localhost:8080/api/admin
   "scope":"file",
   "types":["preview"],
   "toolUrl":"https://qualitativedatarepository.github.io/dataverse-previewers/previewers/v1.5/VoyagerPreview.html",
+=======
+  "toolUrl":"https://gdcc.github.io/dataverse-previewers/previewers/v1.5/X3DPreview.html",
+  "toolParameters": {
+      "queryParameters":[
+        {"fileid":"{fileId}"},
+        {"siteUrl":"{siteUrl}"},
+        {"datasetid":"{datasetId}"},
+        {"datasetversion":"{datasetVersion}"},
+        {"locale":"{localeCode}"}
+      ]
+    },
+  "contentType":"model/x3d+xml"
+}'
+```
+
+More types for 3D models that X_ITE can load below.
+
+```bash
+curl -X POST -H 'Content-type: application/json' http://localhost:8080/api/admin/externalTools -d \
+'{
+  "displayName":"Read 3D model",
+  "description":"Read the 3D model file using X3D from X_ITE.",
+  "toolName":"3D model Previewer",
+  "scope":"file",
+  "types":["preview"],
+  "toolUrl":"https://gdcc.github.io/dataverse-previewers/previewers/v1.5/X3DPreview.html",
+  "toolParameters": {
+      "queryParameters":[
+        {"fileid":"{fileId}"},
+        {"siteUrl":"{siteUrl}"},
+        {"datasetid":"{datasetId}"},
+        {"datasetversion":"{datasetVersion}"},
+        {"locale":"{localeCode}"}
+      ]
+    },
+  "contentType":"model/vrml"
+}'
+```
+
+```bash
+curl -X POST -H 'Content-type: application/json' http://localhost:8080/api/admin/externalTools -d \
+'{
+  "displayName":"Read 3D model",
+  "description":"Read the 3D model file using X3D from X_ITE.",
+  "toolName":"3D model Previewer",
+  "scope":"file",
+  "types":["preview"],
+  "toolUrl":"https://gdcc.github.io/dataverse-previewers/previewers/v1.5/X3DPreview.html",
+  "toolParameters": {
+      "queryParameters":[
+        {"fileid":"{fileId}"},
+        {"siteUrl":"{siteUrl}"},
+        {"datasetid":"{datasetId}"},
+        {"datasetversion":"{datasetVersion}"},
+        {"locale":"{localeCode}"}
+      ]
+    },
+  "contentType":"model/gltf-binary"
+}'
+```
+
+```bash
+curl -X POST -H 'Content-type: application/json' http://localhost:8080/api/admin/externalTools -d \
+'{
+  "displayName":"Read 3D model",
+  "description":"Read the 3D model file using X3D from X_ITE.",
+  "toolName":"3D model Previewer",
+  "scope":"file",
+  "types":["preview"],
+  "toolUrl":"https://gdcc.github.io/dataverse-previewers/previewers/v1.5/X3DPreview.html",
+  "toolParameters": {
+      "queryParameters":[
+        {"fileid":"{fileId}"},
+        {"siteUrl":"{siteUrl}"},
+        {"datasetid":"{datasetId}"},
+        {"datasetversion":"{datasetVersion}"},
+        {"locale":"{localeCode}"}
+      ]
+    },
+  "contentType":"model/obj"
+}'
+```
+
+```bash
+curl -X POST -H 'Content-type: application/json' http://localhost:8080/api/admin/externalTools -d \
+'{
+  "displayName":"Read 3D model",
+  "description":"Read the 3D model file using X3D from X_ITE.",
+  "toolName":"3D model Previewer",
+  "scope":"file",
+  "types":["preview"],
+  "toolUrl":"https://gdcc.github.io/dataverse-previewers/previewers/v1.5/X3DPreview.html",
+  "toolParameters": {
+      "queryParameters":[
+        {"fileid":"{fileId}"},
+        {"siteUrl":"{siteUrl}"},
+        {"datasetid":"{datasetId}"},
+        {"datasetversion":"{datasetVersion}"},
+        {"locale":"{localeCode}"}
+      ]
+    },
+  "contentType":"model/stl"
+}'
+```
+
+```bash
+curl -X POST -H 'Content-type: application/json' http://localhost:8080/api/admin/externalTools -d \
+'{
+  "displayName":"Read 3D model",
+  "description":"Read the 3D model file using X3D from X_ITE.",
+  "toolName":"3D model Previewer",
+  "scope":"file",
+  "types":["preview"],
+  "toolUrl":"https://gdcc.github.io/dataverse-previewers/previewers/v1.5/X3DPreview.html",
+  "toolParameters": {
+      "queryParameters":[
+        {"fileid":"{fileId}"},
+        {"siteUrl":"{siteUrl}"},
+        {"datasetid":"{datasetId}"},
+        {"datasetversion":"{datasetVersion}"},
+        {"locale":"{localeCode}"}
+      ]
+    },
+  "contentType":"model/x-ply"
+}'
+```
+### Smithsonian Voyager 3D model Previewer
+
+__Note:__ Voyager supports multiple formats. Only *.glb (model/gltf-binary) is currently supported by the Previewer.
+Also note that with current styling the Voyager app fills the window when launched as a separate page, so the usual 
+preview header/footer information doesn't show (and therefore isn't even requested from Dataverse).
+
+```bash
+curl -X POST -H 'Content-type: application/json' http://localhost:8080/api/admin/externalTools -d \
+'{
+  "displayName":"View 3D model",
+  "description":"Explore the 3D model file using Voyager.",
+  "toolName":"voyagerPreviewer",
+  "scope":"file",
+  "types":["preview"],
+  "toolUrl":"https://gdcc.github.io/dataverse-previewers/previewers/v1.5/VoyagerPreview.html",
+>>>>>>> branch 'master' of https://github.com/QualitativeDataRepository/dataverse-previewers.git
   "toolParameters": {
       "queryParameters":[
         {"fileid":"{fileId}"},

6.1curlcommands.md

@@ -1394,7 +1394,7 @@ curl -X POST -H 'Content-type: application/json' http://localhost:8080/api/admin
 }'
 ```
 
-### Markdown Previewer (beta)
+### Markdown Previewer
 
 ```bash
 curl -X POST -H 'Content-type: application/json' http://localhost:8080/api/admin/externalTools -d \
@@ -1437,7 +1437,7 @@ curl -X POST -H 'Content-type: application/json' http://localhost:8080/api/admin
   ]
 }'
 ```
-### ESRI Shape Previewer (beta)
+### ESRI Shape Previewer
 
 This previewer includes a hard-coded file size limit of a zipped shp file of 20 MB (larger zips will not be loaded). If you want to change this limit you can change the value in "previewers/v1.5/js/mapshp.js", but then you have to host the customised previewer yourself (e.g. via github pages). Instructions on how to build external tools yourself can be found here: https://guides.dataverse.org/en/latest/api/external-tools.html. 
 
@@ -1483,7 +1483,7 @@ curl -X POST -H 'Content-type: application/json' http://localhost:8080/api/admin
 }'
 ```
 
-### GeoTIFF Previewer (beta)
+### GeoTIFF Previewer
 
 Please note that the Geotiff Previewer tries to display ALL image/tiff files in a map (because there is no own mimetype for Geotiffs at the moment). Therefore please only use it if you want to use Geotiffs only. As soon as there is an own mimetype for Geotiffs, this will be updated.
 
@@ -1577,7 +1577,7 @@ curl -X POST -H 'Content-type: application/json' http://localhost:8080/api/admin
 ```
 
 
-### RO-Crate Previewer (beta)
+### RO-Crate Previewer
 
 ```bash
 curl -X POST -H 'Content-type: application/json' http://localhost:8080/api/admin/externalTools -d \
@@ -1587,7 +1587,7 @@ curl -X POST -H 'Content-type: application/json' http://localhost:8080/api/admin
   "toolName":"rocratePreviewer",
   "scope":"file",
   "types":["preview"],
-  "toolUrl":"https://qualitativedatarepository.github.io/dataverse-previewers/previewers/v1.5/ROCratePreview.html",
+  "toolUrl":"https://qualitativedatarepository.github.io/dataverse-previewers/previewers/v1.5/ROCrate.html",
   "toolParameters": {
       "queryParameters":[
         {"fileid":"{fileId}"},
@@ -1633,7 +1633,7 @@ curl -X POST -H 'Content-type: application/json' http://localhost:8080/api/admin
   "toolName":"3D model Previewer",
   "scope":"file",
   "types":["preview"],
-  "toolUrl":"https://qualitativedatarepository.github.io/dataverse-previewers/previewers/betatest/X3DPreview.html",
+  "toolUrl":"https://qualitativedatarepository.github.io/dataverse-previewers/previewers/v1.5/X3DPreview.html",
   "toolParameters": {
       "queryParameters":[
         {"fileid":"{fileId}"},
@@ -1677,7 +1677,7 @@ curl -X POST -H 'Content-type: application/json' http://localhost:8080/api/admin
   "toolName":"3D model Previewer",
   "scope":"file",
   "types":["preview"],
-  "toolUrl":"https://qualitativedatarepository.github.io/dataverse-previewers/previewers/betatest/X3DPreview.html",
+  "toolUrl":"https://qualitativedatarepository.github.io/dataverse-previewers/previewers/v1.5/X3DPreview.html",
   "toolParameters": {
       "queryParameters":[
         {"fileid":"{fileId}"},
@@ -1719,7 +1719,7 @@ curl -X POST -H 'Content-type: application/json' http://localhost:8080/api/admin
   "toolName":"3D model Previewer",
   "scope":"file",
   "types":["preview"],
-  "toolUrl":"https://qualitativedatarepository.github.io/dataverse-previewers/previewers/betatest/X3DPreview.html",
+  "toolUrl":"https://qualitativedatarepository.github.io/dataverse-previewers/previewers/v1.5/X3DPreview.html",
   "toolParameters": {
       "queryParameters":[
         {"fileid":"{fileId}"},
@@ -1761,7 +1761,7 @@ curl -X POST -H 'Content-type: application/json' http://localhost:8080/api/admin
   "toolName":"3D model Previewer",
   "scope":"file",
   "types":["preview"],
-  "toolUrl":"https://qualitativedatarepository.github.io/dataverse-previewers/previewers/betatest/X3DPreview.html",
+  "toolUrl":"https://qualitativedatarepository.github.io/dataverse-previewers/previewers/v1.5/X3DPreview.html",
   "toolParameters": {
       "queryParameters":[
         {"fileid":"{fileId}"},
@@ -1803,7 +1803,7 @@ curl -X POST -H 'Content-type: application/json' http://localhost:8080/api/admin
   "toolName":"3D model Previewer",
   "scope":"file",
   "types":["preview"],
-  "toolUrl":"https://qualitativedatarepository.github.io/dataverse-previewers/previewers/betatest/X3DPreview.html",
+  "toolUrl":"https://qualitativedatarepository.github.io/dataverse-previewers/previewers/v1.5/X3DPreview.html",
   "toolParameters": {
       "queryParameters":[
         {"fileid":"{fileId}"},
@@ -1845,7 +1845,7 @@ curl -X POST -H 'Content-type: application/json' http://localhost:8080/api/admin
   "toolName":"3D model Previewer",
   "scope":"file",
   "types":["preview"],
-  "toolUrl":"https://qualitativedatarepository.github.io/dataverse-previewers/previewers/betatest/X3DPreview.html",
+  "toolUrl":"https://qualitativedatarepository.github.io/dataverse-previewers/previewers/v1.5/X3DPreview.html",
   "toolParameters": {
       "queryParameters":[
         {"fileid":"{fileId}"},
@@ -1892,7 +1892,7 @@ curl -X POST -H 'Content-type: application/json' http://localhost:8080/api/admin
   "toolName":"voyagerPreviewer",
   "scope":"file",
   "types":["preview"],
-  "toolUrl":"https://qualitativedatarepository.github.io/dataverse-previewers/previewers/betatest/VoyagerPreview.html",
+  "toolUrl":"https://qualitativedatarepository.github.io/dataverse-previewers/previewers/v1.5/VoyagerPreview.html",
   "toolParameters": {
       "queryParameters":[
         {"fileid":"{fileId}"},

previewers/betatest/AudioPreview.html

@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 
 <head>

previewers/betatest/HtmlPreview.html

@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 
 <head>

previewers/betatest/HypothesisPreview.html

@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 
 <head>

previewers/betatest/ImagePreview.html

@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 
 <head>

previewers/betatest/MapPreview.html

@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
     <head>
         <meta charset="utf-8">

previewers/betatest/MapRasterPreview.html

@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
     <head>
         <meta charset="utf-8">

previewers/betatest/MapShpPreview.html

@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
     <head>
         <meta charset="utf-8">

previewers/betatest/MdPreview.html

@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 
 <head>