Refactor geojson options

src/components/Map/VMap.global.vue

@@ -258,7 +258,7 @@ onUnmounted(() => {
 function setGeoJSON(geojson) {
   if (geojson) {
     L.geoJSON(geojson, {
-      ...geojsonDefaultOptions,
+      ...geojsonDefaultOptions(L),
       ...props.geojsonOptions
     }).addTo(geoJSONGroup)
 

src/components/Map/icons/AssertedDistribution.js

@@ -1,7 +1,6 @@
 import L from 'leaflet'
-
-export const AssertedDistribution = L.divIcon({
+export const AssertedDistribution = {
   className: 'bg-map-asserted bg-opacity-50 rounded-full',
   iconSize: [8, 8],
   iconAnchor: [4, 4]
-})
+}

src/components/Map/icons/CollectionObject.js

@@ -1,7 +1,5 @@
-import L from 'leaflet'
-
-export const CollectionObject = L.divIcon({
+export const CollectionObject = {
   className: 'bg-map-collection-object bg-opacity-50 rounded-full',
   iconSize: [8, 8],
   iconAnchor: [4, 4]
-})
+}

src/components/Map/icons/Georeference.js

@@ -1,7 +1,5 @@
-import L from 'leaflet'
-
-export const Georeference = L.divIcon({
+export const Georeference = {
   className: 'bg-map-georeference bg-opacity-50 rounded-full',
   iconSize: [8, 8],
   iconAnchor: [4, 4]
-})
+}

src/components/Map/icons/TypeMaterial.js

@@ -1,7 +1,5 @@
-import L from 'leaflet'
-
-export const TypeMaterial = L.divIcon({
+export const TypeMaterial = {
   className: 'bg-map-type-material bg-opacity-50 rounded-full',
   iconSize: [8, 8],
   iconAnchor: [4, 4]
-})
+}

src/components/Map/utils/geojsonOptions.js

@@ -25,7 +25,7 @@ function getRelevantType(base) {
   return types[0]
 }
 
-export default {
+export default (L) => ({
   onEachFeature: (feature, layer) => {
     const label = `
     <div class="max-h-32 overflow-y-auto text-xs">
@@ -53,7 +53,10 @@ export default {
 
   pointToLayer: (feature, latLng) => {
     const type = getRelevantType(feature.properties.base)
-    const marker = L.marker(latLng, { icon: Icons[type] || Icon.Georeference })
+    const markerStyle = Icons[type] || Icon.Georeference
+    const marker = L.marker(latLng, {
+      icon: L.divIcon(markerStyle)
+    })
 
     marker.pm.setOptions(DEFAULT_OPTIONS)
 
@@ -67,4 +70,4 @@ export default {
       return Shape[type]
     }
   }
-}
+})

src/modules/otus/components/Panel/PanelNomenclature/PanelNomenclature.vue

@@ -18,6 +18,16 @@ const props = defineProps({
   taxonId: {
     type: [Number, String],
     required: true
+  },
+
+  taxon: {
+    type: Object,
+    default: undefined
+  },
+
+  otu: {
+    type: Object,
+    default: undefined
   }
 })