diff --git a/src/components/Map/utils/geojsonOptions.js b/src/components/Map/utils/geojsonOptions.js
index 7c67716..a987194 100644
--- a/src/components/Map/utils/geojsonOptions.js
+++ b/src/components/Map/utils/geojsonOptions.js
@@ -27,23 +27,32 @@ function getRelevantType(base) {
export default (L) => ({
onEachFeature: (feature, layer) => {
+ const labels = (feature.properties.base || [])
+ .map((item) => item.label)
+ .filter(Boolean)
+
+ if (!labels.length) {
+ return
+ }
+
const label = `
-
-
- ${feature.properties.base
- .map(
- (item) =>
- `
- -
- ${item.label}
-
- `
- )
- .join('')}
-
`
+
+
+ ${labels
+ .map(
+ (label) =>
+ `
+ -
+ ${label}
+
+ `
+ )
+ .join('')}
+
+
`
layer.pm.setOptions(DEFAULT_OPTIONS)
layer.pm.disable()
diff --git a/src/modules/otus/components/DWCDownload.vue b/src/modules/otus/components/DWCDownload.vue
index ae77638..7ec2a9f 100644
--- a/src/modules/otus/components/DWCDownload.vue
+++ b/src/modules/otus/components/DWCDownload.vue
@@ -2,7 +2,11 @@
{
+ downloadCSV()
+ }
+ "
>
DwC
@@ -10,8 +14,7 @@
diff --git a/src/modules/otus/components/Panel/PanelNomenclature/PanelNomenclature.vue b/src/modules/otus/components/Panel/PanelNomenclature/PanelNomenclature.vue
index 09e2f6f..f272516 100644
--- a/src/modules/otus/components/Panel/PanelNomenclature/PanelNomenclature.vue
+++ b/src/modules/otus/components/Panel/PanelNomenclature/PanelNomenclature.vue
@@ -1,12 +1,59 @@
-
-
+
+
+
+ Nomenclature ({{ store.catalog.timeline.length }})
+
+
+
+
+
+
+
+
+
+
diff --git a/src/modules/otus/components/Panel/PanelNomenclature/PanelNomenclatureCitations.vue b/src/modules/otus/components/Panel/PanelNomenclature/PanelNomenclatureCitations.vue
deleted file mode 100644
index 22c5932..0000000
--- a/src/modules/otus/components/Panel/PanelNomenclature/PanelNomenclatureCitations.vue
+++ /dev/null
@@ -1,71 +0,0 @@
-
-
-
- Nomenclature ({{ list.length }})
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/modules/otus/components/Panel/PanelNomenclature/PanelNomenclatureReferences.vue b/src/modules/otus/components/Panel/PanelNomenclatureReferences/PanelNomenclatureReferences.vue
similarity index 75%
rename from src/modules/otus/components/Panel/PanelNomenclature/PanelNomenclatureReferences.vue
rename to src/modules/otus/components/Panel/PanelNomenclatureReferences/PanelNomenclatureReferences.vue
index d6f646d..774fc77 100644
--- a/src/modules/otus/components/Panel/PanelNomenclature/PanelNomenclatureReferences.vue
+++ b/src/modules/otus/components/Panel/PanelNomenclatureReferences/PanelNomenclatureReferences.vue
@@ -1,7 +1,9 @@
- Nomenclature references ({{ list.length }})
+
+ Nomenclature references ({{ store.catalog.sources.length }})
+
import { computed, ref } from 'vue'
-import { splitList } from './splitList'
-import PanelNomenclatureShowMore from './PanelNomenclatureShowMore.vue'
+import { splitList } from '../PanelNomenclature/splitList'
+import { useOtuStore } from '@/modules/otus/store/store'
+import PanelNomenclatureShowMore from '../PanelNomenclature/PanelNomenclatureShowMore.vue'
import PanelReferenceRow from './PanelReferenceRow.vue'
import PanelDropdown from '../PanelDropdown.vue'
const MAX_REFERENCES = 2
-const props = defineProps({
- list: {
- type: Array,
- default: () => []
- }
-})
+const store = useOtuStore()
const showAll = ref(false)
-const referenceList = computed(() => splitList(props.list, MAX_REFERENCES))
+const referenceList = computed(() =>
+ splitList(store.catalog.sources, MAX_REFERENCES)
+)
const menuOptions = computed(() => [
{
diff --git a/src/modules/otus/components/Panel/PanelNomenclature/PanelReferenceRow.vue b/src/modules/otus/components/Panel/PanelNomenclatureReferences/PanelReferenceRow.vue
similarity index 100%
rename from src/modules/otus/components/Panel/PanelNomenclature/PanelReferenceRow.vue
rename to src/modules/otus/components/Panel/PanelNomenclatureReferences/PanelReferenceRow.vue
diff --git a/src/modules/otus/constants/overviewLayout.js b/src/modules/otus/constants/overviewLayout.js
index 49dc2fd..31cc0d9 100644
--- a/src/modules/otus/constants/overviewLayout.js
+++ b/src/modules/otus/constants/overviewLayout.js
@@ -3,6 +3,7 @@ import PanelGallery from '../components/Panel/PanelGallery/Gallery.vue'
import PanelTypeSpecimen from '../components/Panel/PanelTypeSpecimen/PanelTypeSpecimen.vue'
import PanelTypeDesignation from '../components/Panel/PanelTypeDesignation/PanelTypeDesignation.vue'
import PanelNomenclature from '../components/Panel/PanelNomenclature/PanelNomenclature.vue'
+import PanelNomenclatureReference from '../components/Panel/PanelNomenclatureReferences/PanelNomenclatureReferences.vue'
import PanelMap from '../components/Panel/PanelMap/PanelMap.vue'
import PanelDescendants from '../components/Panel/PanelDescendants/Descendants.vue'
import PanelContent from '../components/Panel/PanelContent/PanelContent.vue'
@@ -19,7 +20,8 @@ export const overviewLayout = {
component: PanelTypeDesignation,
available: [FAMILY_GROUP, GENUS_GROUP]
},
- { component: PanelNomenclature }
+ { component: PanelNomenclature },
+ { component: PanelNomenclatureReference }
],
right: [
diff --git a/src/modules/otus/services/TaxonWorks.js b/src/modules/otus/services/TaxonWorks.js
index f6f92ed..55cb24a 100644
--- a/src/modules/otus/services/TaxonWorks.js
+++ b/src/modules/otus/services/TaxonWorks.js
@@ -65,10 +65,6 @@ export default class TaxonWorks {
})
}
- static getDwC(otuId) {
- return makeAPIRequest.get(`/otus/${otuId}/inventory/dwc`)
- }
-
static getCachedMap(id) {
return makeAPIRequest.get(`/cached_maps/${id}`)
}