Merge branch 'development' into rails7.2

SpeciesFileGroup · Nov 26, 2024 · 1998c39 · 1998c39
2 parents d5e5f8c + 5335765
commit 1998c39
Show file tree

Hide file tree

Showing 6 changed files with 192 additions and 151 deletions.
diff --git a/app/javascript/vue/tasks/nomenclature/new_taxon_name/components/pickOriginalCombination.vue b/app/javascript/vue/tasks/nomenclature/new_taxon_name/components/pickOriginalCombination.vue
@@ -9,7 +9,10 @@
       <h3>{{ isICN ? 'Basionym' : 'Original combination and rank' }}</h3>
     </template>
     <template #body>
-      <div class="original-combination-picker">
+      <div
+        class="original-combination-picker"
+        v-if="taxon.id"
+      >
         <form class="horizontal-left-content">
           <div class="button-current separate-right">
             <v-btn
@@ -89,11 +92,7 @@
             },
             filter: '.item-filter'
           }"
-          :relationships="
-            isICN
-              ? combinationRanks.SpeciesAndInfraspeciesGroup
-              : combinationRanks.speciesGroup
-          "
+          :relationships="speciesRanks"
         />
         <div class="original-combination separate-top separate-bottom">
           <div class="flex-wrap-column rank-name-label">
@@ -172,13 +171,17 @@ export default {
       return !!Object.values(this.originalCombinations).length
     },
 
+    speciesRanks() {
+      return this.isICN
+        ? this.combinationRanks.SpeciesAndInfraspeciesGroup
+        : this.combinationRanks.speciesGroup
+    },
+
     types() {
       return Object.assign(
         {},
         this.combinationRanks.genusGroup,
-        this.isICN
-          ? this.combinationRanks.SpeciesAndInfraspeciesGroup
-          : this.combinationRanks.speciesGroup
+        ...this.speciesRanks
       )
     },
 

diff --git a/app/models/georeference/geo_locate.rb b/app/models/georeference/geo_locate.rb
@@ -91,7 +91,7 @@ def make_geographic_point(x, y, z = '0.0')
       test_grs = []
     else
       test_grs = GeographicItem::Point
-                   .where("point = ST_GeographyFromText('POINT(? ? ?)')", x.to_f, y.to_f, z.to_f)
+                   .where('point = ST_GeographyFromText(?)', "POINT(#{x.to_f} #{y.to_f} #{z.to_f})")
                    # .where(['ST_Z(point::geometry) = ?', z.to_f])
     end
     if test_grs.empty? # put a new one in the array

diff --git a/app/models/georeference/verbatim_data.rb b/app/models/georeference/verbatim_data.rb
@@ -48,7 +48,7 @@ def initialize(params = {})
       if point.nil?
         test_grs = []
       else
-        test_grs = GeographicItem::Point.where("point = ST_GeographyFromText('POINT(? ? ?)')", point.x, point.y, point.z)
+        test_grs = GeographicItem::Point.where('point = ST_GeographyFromText(?)', "POINT(#{point.x} #{point.y} #{point.z})")
       end
 
       if test_grs.empty?
@@ -67,7 +67,7 @@ def dwc_georeference_attributes
       verbatimLatitude: collecting_event.verbatim_latitude,
       verbatimLongitude: collecting_event.verbatim_longitude,
       coordinateUncertaintyInMeters: error_radius,
-      georeferenceSources: "Physical collection object.",
+      georeferenceSources: 'Physical collection object.',
       georeferenceRemarks: "Derived from a instance of TaxonWorks' Georeference::VerbatimData.",
       geodeticDatum: nil  # TODO: check
     )

diff --git a/config/interface/hub/user_tasks.yml b/config/interface/hub/user_tasks.yml
@@ -854,6 +854,7 @@ new_field_occurrence_task:
   categories:
     - collecting_event
     - georeference
+    - new
   status: prototype
   description: 'Link OTUs to collecting events. Used when no physical object was collected and returned to a repository.'
 debug_geographic_item_task:
@@ -998,4 +999,3 @@ print_key_task:
   categories:
   status: prototype
   description: 'Format a key for print.'
-