Add kml selection exports

specifyweb/frontend/js_src/lib/components/QueryBuilder/Export.tsx

@@ -54,7 +54,8 @@ export function QueryExportButtons({
   function doQueryExport(
     url: string,
     delimiter: string | undefined,
-    bom: boolean | undefined
+    bom: boolean | undefined,
+    selectedRows: ReadonlySet<number> | undefined
   ): void {
     if (typeof getQueryFieldRecords === 'function')
       queryResource.set('fields', getQueryFieldRecords());
@@ -70,6 +71,8 @@ export function QueryExportButtons({
             generateMappingPathPreview(baseTableName, mappingPath)
           ),
         recordSetId,
+        selectedRows:
+          selectedRows === undefined ? undefined : Array.from(selectedRows),
         delimiter,
         bom,
       }),
@@ -93,7 +96,8 @@ export function QueryExportButtons({
    *Will be only called if query is not distinct,
    *selection not enabled when distinct selected
    */
-  async function exportSelected(): Promise<void> {
+
+  async function exportCsvSelected(): Promise<void> {
     const name = `${
       queryResource.isNew()
         ? `${queryText.newQueryName()} ${genericTables[baseTableName].label}`
@@ -158,8 +162,13 @@ export function QueryExportButtons({
           showConfirmation={showConfirmation}
           onClick={(): void => {
             selectedRows.size === 0
-              ? doQueryExport('/stored_query/exportcsv/', separator, utf8Bom)
-              : exportSelected().catch(softFail);
+              ? doQueryExport(
+                  '/stored_query/exportcsv/',
+                  separator,
+                  utf8Bom,
+                  undefined
+                )
+              : exportCsvSelected().catch(softFail);
           }}
         >
           {queryText.createCsv()}
@@ -171,7 +180,12 @@ export function QueryExportButtons({
           showConfirmation={showConfirmation}
           onClick={(): void =>
             hasLocalityColumns(fields)
-              ? doQueryExport('/stored_query/exportkml/', undefined, undefined)
+              ? doQueryExport(
+                  '/stored_query/exportkml/',
+                  undefined,
+                  undefined,
+                  selectedRows.size === 0 ? undefined : selectedRows
+                )
               : setState('warning')
           }
         >

specifyweb/stored_queries/execution.py

@@ -169,7 +169,7 @@ def do_export(spquery, collection, user, filename, exporttype, host):
                          distinct=spquery['selectdistinct'], delimiter=spquery['delimiter'], bom=spquery['bom'])
         elif exporttype == 'kml':
             query_to_kml(session, collection, user, tableid, field_specs, path, spquery['captions'], host,
-                         recordsetid=recordsetid, strip_id=False)
+                         recordsetid=recordsetid, strip_id=False, selected_rows=spquery.get('selectedrows', None))
             message_type = 'query-export-to-kml-complete'
 
     Message.objects.create(user=user, content=json.dumps({
@@ -235,7 +235,7 @@ def row_has_geocoords(coord_cols, row):
 
 
 def query_to_kml(session, collection, user, tableid, field_specs, path, captions, host,
-                 recordsetid=None, strip_id=False):
+                 recordsetid=None, strip_id=False, selected_rows=None):
     """Build a sqlalchemy query using the QueryField objects given by
     field_specs and send the results to a kml file at the given
     file path.
@@ -244,6 +244,10 @@ def query_to_kml(session, collection, user, tableid, field_specs, path, captions
     """
     set_group_concat_max_len(session.connection())
     query, __ = build_query(session, collection, user, tableid, field_specs, recordsetid, replace_nulls=True)
+    if selected_rows:
+        model = models.models_by_tableid[tableid]
+        id_field = getattr(model, model._id)
+        query = query.filter(id_field.in_(selected_rows))
 
     logger.debug('query_to_kml starting')