fixes #2586

GMOD · Feb 24, 2021 · b19f3d8 · b19f3d8
1 parent 20caebb
commit b19f3d8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -17,6 +17,7 @@ Bug Fixes:
 - Vcf reads as ISO-8859-1 instead of UTF-8 from reader mangling some symbols. [2498](https://github.com/GMOD/Apollo/issues/2498).
 - Added security fixes for web services. [2564](https://github.com/GMOD/Apollo/pull/2564).
 - In some cases web services tries to create a preference which results in incorrect results [2580](https://github.com/GMOD/Apollo/issues/2580).
+- For the track service, the overlap filter is too restrictive when converting NCList to JSON [2586](https://github.com/GMOD/Apollo/issues/2586).
 
 Infrastructure Changes
 

diff --git a/grails-app/controllers/org/bbop/apollo/TrackController.groovy b/grails-app/controllers/org/bbop/apollo/TrackController.groovy
@@ -236,7 +236,10 @@ class TrackController {
         try {
             JSONArray filteredList = trackService.getNCList(trackName, organismString, sequence, fmin, fmax)
           // there should be 2 nclists, one for 20 and one for 40
-          renderedArray = trackService.convertAllNCListToObject(filteredList, sequenceDTO,fmin,fmax)
+            Long filterValue = overlapFilter * (fmax - fmin)
+            Long fminAdjusted = fmin - filterValue < 0 ? fmin : fmin - filterValue
+            Long fmaxAdjusted = fmax + filterValue
+            renderedArray = trackService.convertAllNCListToObject(filteredList, sequenceDTO,fminAdjusted,fmaxAdjusted)
         } catch (FileNotFoundException fnfe) {
             log.warn(fnfe.message)
             response.status = 404