diff --git a/src/js/client/bioblitz.js b/src/js/client/bioblitz.js index d80bf74..d46ba43 100644 --- a/src/js/client/bioblitz.js +++ b/src/js/client/bioblitz.js @@ -12,23 +12,6 @@ fluid.defaults("maxwell.bioblitzDiversityPane", { } }); -// AS has requested the region selection bar to appear in a special area above the taxonomy -fluid.defaults("maxwell.regionSelectionBar.withHoist", { - gradeNames: "maxwell.widgetHandler", - listeners: { - "bindWidget.hoist": { - funcName: "maxwell.regionSelectionBar.hoist", - priority: "before:impl" - } - } -}); - -maxwell.regionSelectionBar.hoist = function (element, that, paneHandler) { - const target = paneHandler.container[0].querySelector(".fl-imerss-checklist-widgets"); - target.appendChild(element); -}; - - fluid.defaults("maxwell.bioblitzStatusPane", { gradeNames: ["maxwell.scrollyPaneHandler", "maxwell.scrollyVizBinder", "maxwell.withNativeLegend"], members: { @@ -105,7 +88,7 @@ fluid.defaults("maxwell.mapWithStatus", { } }); -// TODO put this back up in leafletMapWithRegions.js +// TODO this is now back up in leafletMapWithRegions.js, update when we can hortis.normaliseToClass = function (str) { return str.toLowerCase().replace(/[| ]/g, "-"); }; diff --git a/src/js/client/reknit-client.js b/src/js/client/reknit-client.js index 68ccedc..e9d501e 100644 --- a/src/js/client/reknit-client.js +++ b/src/js/client/reknit-client.js @@ -138,6 +138,22 @@ maxwell.withSliderAnimation.bind = function (element, that, paneHandler, scrolly }, that.options.delay); }; +// AS has requested the region selection bar to appear in a special area above the taxonomy +fluid.defaults("maxwell.regionSelectionBar.withHoist", { + gradeNames: "maxwell.widgetHandler", + listeners: { + "bindWidget.hoist": { + funcName: "maxwell.regionSelectionBar.hoist", + priority: "before:impl" + } + } +}); + +maxwell.regionSelectionBar.hoist = function (element, that, paneHandler) { + const target = paneHandler.container[0].querySelector(".fl-imerss-checklist-widgets"); + target.appendChild(element); +}; + fluid.defaults("maxwell.regionSelectionBar", { gradeNames: "maxwell.widgetHandler", listeners: { @@ -173,7 +189,7 @@ maxwell.regionSelectionBar.bind = function (element, that, paneHandler) { const regionName = e.points[0].data.name; vizBinder.map.events.selectRegion.fire(null, regionName); }); - // TODO: Parameterise a bit + // TODO: Parameterise a bit - depends on maxwell.regionSelectionBar.withHoist impl maxwell.makeResizableWidth(element, paneHandler, ".fl-imerss-checklist-outer"); }; diff --git a/viz_data/Galiano-2023-Diversity-Annelida.json.lz4 b/viz_data/Galiano-2023-Diversity-Annelida.json.lz4 index 0cc0657..52644d7 100644 Binary files a/viz_data/Galiano-2023-Diversity-Annelida.json.lz4 and b/viz_data/Galiano-2023-Diversity-Annelida.json.lz4 differ diff --git a/viz_data/Galiano-2023-Diversity-Brachiopoda.json.lz4 b/viz_data/Galiano-2023-Diversity-Brachiopoda.json.lz4 index 9aaa0c1..2b97852 100644 Binary files a/viz_data/Galiano-2023-Diversity-Brachiopoda.json.lz4 and b/viz_data/Galiano-2023-Diversity-Brachiopoda.json.lz4 differ diff --git a/viz_data/Galiano-2023-Diversity-Bryozoa.json.lz4 b/viz_data/Galiano-2023-Diversity-Bryozoa.json.lz4 index c909fc2..a2ba0f9 100644 Binary files a/viz_data/Galiano-2023-Diversity-Bryozoa.json.lz4 and b/viz_data/Galiano-2023-Diversity-Bryozoa.json.lz4 differ diff --git a/viz_data/Galiano-2023-Diversity-Chaetognatha.json.lz4 b/viz_data/Galiano-2023-Diversity-Chaetognatha.json.lz4 index 3781f90..01cea51 100644 Binary files a/viz_data/Galiano-2023-Diversity-Chaetognatha.json.lz4 and b/viz_data/Galiano-2023-Diversity-Chaetognatha.json.lz4 differ diff --git a/viz_data/Galiano-2023-Diversity-Cnidaria.json.lz4 b/viz_data/Galiano-2023-Diversity-Cnidaria.json.lz4 index 51b3c39..a6d825a 100644 Binary files a/viz_data/Galiano-2023-Diversity-Cnidaria.json.lz4 and b/viz_data/Galiano-2023-Diversity-Cnidaria.json.lz4 differ diff --git a/viz_data/Galiano-2023-Diversity-Crustacea.json.lz4 b/viz_data/Galiano-2023-Diversity-Crustacea.json.lz4 index e1f0205..6a6987e 100644 Binary files a/viz_data/Galiano-2023-Diversity-Crustacea.json.lz4 and b/viz_data/Galiano-2023-Diversity-Crustacea.json.lz4 differ diff --git a/viz_data/Galiano-2023-Diversity-Ctenophora.json.lz4 b/viz_data/Galiano-2023-Diversity-Ctenophora.json.lz4 index 7486f63..a827298 100644 Binary files a/viz_data/Galiano-2023-Diversity-Ctenophora.json.lz4 and b/viz_data/Galiano-2023-Diversity-Ctenophora.json.lz4 differ diff --git a/viz_data/Galiano-2023-Diversity-Echinodermata.json.lz4 b/viz_data/Galiano-2023-Diversity-Echinodermata.json.lz4 index 243a691..d58115b 100644 Binary files a/viz_data/Galiano-2023-Diversity-Echinodermata.json.lz4 and b/viz_data/Galiano-2023-Diversity-Echinodermata.json.lz4 differ diff --git a/viz_data/Galiano-2023-Diversity-Entoprocta.json.lz4 b/viz_data/Galiano-2023-Diversity-Entoprocta.json.lz4 index d21572a..ce59d05 100644 Binary files a/viz_data/Galiano-2023-Diversity-Entoprocta.json.lz4 and b/viz_data/Galiano-2023-Diversity-Entoprocta.json.lz4 differ diff --git a/viz_data/Galiano-2023-Diversity-Fishes.json.lz4 b/viz_data/Galiano-2023-Diversity-Fishes.json.lz4 index d5d22da..d087939 100644 Binary files a/viz_data/Galiano-2023-Diversity-Fishes.json.lz4 and b/viz_data/Galiano-2023-Diversity-Fishes.json.lz4 differ diff --git a/viz_data/Galiano-2023-Diversity-Mammalia.json.lz4 b/viz_data/Galiano-2023-Diversity-Mammalia.json.lz4 index bbf7e80..5875dbe 100644 Binary files a/viz_data/Galiano-2023-Diversity-Mammalia.json.lz4 and b/viz_data/Galiano-2023-Diversity-Mammalia.json.lz4 differ diff --git a/viz_data/Galiano-2023-Diversity-Mollusca.json.lz4 b/viz_data/Galiano-2023-Diversity-Mollusca.json.lz4 index 8fb7af5..b4d78ba 100644 Binary files a/viz_data/Galiano-2023-Diversity-Mollusca.json.lz4 and b/viz_data/Galiano-2023-Diversity-Mollusca.json.lz4 differ diff --git a/viz_data/Galiano-2023-Diversity-Nemertea.json.lz4 b/viz_data/Galiano-2023-Diversity-Nemertea.json.lz4 index b2f1634..b2f63cc 100644 Binary files a/viz_data/Galiano-2023-Diversity-Nemertea.json.lz4 and b/viz_data/Galiano-2023-Diversity-Nemertea.json.lz4 differ diff --git a/viz_data/Galiano-2023-Diversity-Phoronida.json.lz4 b/viz_data/Galiano-2023-Diversity-Phoronida.json.lz4 index e043695..2770bc4 100644 Binary files a/viz_data/Galiano-2023-Diversity-Phoronida.json.lz4 and b/viz_data/Galiano-2023-Diversity-Phoronida.json.lz4 differ diff --git a/viz_data/Galiano-2023-Diversity-Platyhelminthes.json.lz4 b/viz_data/Galiano-2023-Diversity-Platyhelminthes.json.lz4 index 156055b..c46aba0 100644 Binary files a/viz_data/Galiano-2023-Diversity-Platyhelminthes.json.lz4 and b/viz_data/Galiano-2023-Diversity-Platyhelminthes.json.lz4 differ diff --git a/viz_data/Galiano-2023-Diversity-Porifera.json.lz4 b/viz_data/Galiano-2023-Diversity-Porifera.json.lz4 index 99e31a0..b8da057 100644 Binary files a/viz_data/Galiano-2023-Diversity-Porifera.json.lz4 and b/viz_data/Galiano-2023-Diversity-Porifera.json.lz4 differ diff --git a/viz_data/Galiano-2023-Diversity-Sipuncula.json.lz4 b/viz_data/Galiano-2023-Diversity-Sipuncula.json.lz4 index 9bac67a..d6ea76a 100644 Binary files a/viz_data/Galiano-2023-Diversity-Sipuncula.json.lz4 and b/viz_data/Galiano-2023-Diversity-Sipuncula.json.lz4 differ diff --git a/viz_data/Galiano-2023-Diversity-Tunicata.json.lz4 b/viz_data/Galiano-2023-Diversity-Tunicata.json.lz4 index 4ff3f5c..cd418c3 100644 Binary files a/viz_data/Galiano-2023-Diversity-Tunicata.json.lz4 and b/viz_data/Galiano-2023-Diversity-Tunicata.json.lz4 differ diff --git a/viz_data/Galiano-2023-Status-Annelida.json.lz4 b/viz_data/Galiano-2023-Status-Annelida.json.lz4 index 0de2bff..27a7c98 100644 Binary files a/viz_data/Galiano-2023-Status-Annelida.json.lz4 and b/viz_data/Galiano-2023-Status-Annelida.json.lz4 differ diff --git a/viz_data/Galiano-2023-Status-Brachiopoda.json.lz4 b/viz_data/Galiano-2023-Status-Brachiopoda.json.lz4 index cbcbca3..640cef7 100644 Binary files a/viz_data/Galiano-2023-Status-Brachiopoda.json.lz4 and b/viz_data/Galiano-2023-Status-Brachiopoda.json.lz4 differ diff --git a/viz_data/Galiano-2023-Status-Bryozoa.json.lz4 b/viz_data/Galiano-2023-Status-Bryozoa.json.lz4 index 697934e..9d7d5ef 100644 Binary files a/viz_data/Galiano-2023-Status-Bryozoa.json.lz4 and b/viz_data/Galiano-2023-Status-Bryozoa.json.lz4 differ diff --git a/viz_data/Galiano-2023-Status-Chaetognatha.json.lz4 b/viz_data/Galiano-2023-Status-Chaetognatha.json.lz4 index 088f371..58b79c3 100644 Binary files a/viz_data/Galiano-2023-Status-Chaetognatha.json.lz4 and b/viz_data/Galiano-2023-Status-Chaetognatha.json.lz4 differ diff --git a/viz_data/Galiano-2023-Status-Cnidaria.json.lz4 b/viz_data/Galiano-2023-Status-Cnidaria.json.lz4 index 0dc870a..873fb7f 100644 Binary files a/viz_data/Galiano-2023-Status-Cnidaria.json.lz4 and b/viz_data/Galiano-2023-Status-Cnidaria.json.lz4 differ diff --git a/viz_data/Galiano-2023-Status-Crustacea.json.lz4 b/viz_data/Galiano-2023-Status-Crustacea.json.lz4 index 8b779ef..aee5a26 100644 Binary files a/viz_data/Galiano-2023-Status-Crustacea.json.lz4 and b/viz_data/Galiano-2023-Status-Crustacea.json.lz4 differ diff --git a/viz_data/Galiano-2023-Status-Ctenophora.json.lz4 b/viz_data/Galiano-2023-Status-Ctenophora.json.lz4 index eaa39f4..f8025ff 100644 Binary files a/viz_data/Galiano-2023-Status-Ctenophora.json.lz4 and b/viz_data/Galiano-2023-Status-Ctenophora.json.lz4 differ diff --git a/viz_data/Galiano-2023-Status-Echinodermata.json.lz4 b/viz_data/Galiano-2023-Status-Echinodermata.json.lz4 index eda7dec..b8c2c31 100644 Binary files a/viz_data/Galiano-2023-Status-Echinodermata.json.lz4 and b/viz_data/Galiano-2023-Status-Echinodermata.json.lz4 differ diff --git a/viz_data/Galiano-2023-Status-Entoprocta.json.lz4 b/viz_data/Galiano-2023-Status-Entoprocta.json.lz4 index 2221c63..23799ca 100644 Binary files a/viz_data/Galiano-2023-Status-Entoprocta.json.lz4 and b/viz_data/Galiano-2023-Status-Entoprocta.json.lz4 differ diff --git a/viz_data/Galiano-2023-Status-Fishes.json.lz4 b/viz_data/Galiano-2023-Status-Fishes.json.lz4 index 4212f6d..b6dc02e 100644 Binary files a/viz_data/Galiano-2023-Status-Fishes.json.lz4 and b/viz_data/Galiano-2023-Status-Fishes.json.lz4 differ diff --git a/viz_data/Galiano-2023-Status-Mammalia.json.lz4 b/viz_data/Galiano-2023-Status-Mammalia.json.lz4 index 0c72495..e770b37 100644 Binary files a/viz_data/Galiano-2023-Status-Mammalia.json.lz4 and b/viz_data/Galiano-2023-Status-Mammalia.json.lz4 differ diff --git a/viz_data/Galiano-2023-Status-Mollusca.json.lz4 b/viz_data/Galiano-2023-Status-Mollusca.json.lz4 index d4f48af..7064ccc 100644 Binary files a/viz_data/Galiano-2023-Status-Mollusca.json.lz4 and b/viz_data/Galiano-2023-Status-Mollusca.json.lz4 differ diff --git a/viz_data/Galiano-2023-Status-Nemertea.json.lz4 b/viz_data/Galiano-2023-Status-Nemertea.json.lz4 index cc80a7a..abaec35 100644 Binary files a/viz_data/Galiano-2023-Status-Nemertea.json.lz4 and b/viz_data/Galiano-2023-Status-Nemertea.json.lz4 differ diff --git a/viz_data/Galiano-2023-Status-Phoronida.json.lz4 b/viz_data/Galiano-2023-Status-Phoronida.json.lz4 index 9de0195..61c67ee 100644 Binary files a/viz_data/Galiano-2023-Status-Phoronida.json.lz4 and b/viz_data/Galiano-2023-Status-Phoronida.json.lz4 differ diff --git a/viz_data/Galiano-2023-Status-Platyhelminthes.json.lz4 b/viz_data/Galiano-2023-Status-Platyhelminthes.json.lz4 index 311f984..b7edac6 100644 Binary files a/viz_data/Galiano-2023-Status-Platyhelminthes.json.lz4 and b/viz_data/Galiano-2023-Status-Platyhelminthes.json.lz4 differ diff --git a/viz_data/Galiano-2023-Status-Porifera.json.lz4 b/viz_data/Galiano-2023-Status-Porifera.json.lz4 index b79eb31..ee282a2 100644 Binary files a/viz_data/Galiano-2023-Status-Porifera.json.lz4 and b/viz_data/Galiano-2023-Status-Porifera.json.lz4 differ diff --git a/viz_data/Galiano-2023-Status-Sipuncula.json.lz4 b/viz_data/Galiano-2023-Status-Sipuncula.json.lz4 index d95b4bd..983affe 100644 Binary files a/viz_data/Galiano-2023-Status-Sipuncula.json.lz4 and b/viz_data/Galiano-2023-Status-Sipuncula.json.lz4 differ diff --git a/viz_data/Galiano-2023-Status-Tunicata.json.lz4 b/viz_data/Galiano-2023-Status-Tunicata.json.lz4 index aa2d14c..c0eab72 100644 Binary files a/viz_data/Galiano-2023-Status-Tunicata.json.lz4 and b/viz_data/Galiano-2023-Status-Tunicata.json.lz4 differ