Merge branch '1417-export-with-overlay' into 'devel_15.1.x'

export of map to image ignored overlays

See merge request !1261

CHANGELOG

@@ -13,6 +13,8 @@ minerva (15.1.1) stable; urgency=medium
     unexpected error (#1416)
   * Bug fix: normal user could not update tos information (#1419)
   * Bug fix: and operator in SBGN-like view was not drawn (#1408)
+  * Bug fix: export of overlayed map as an image did not respect overlay colors
+   (#1417)
 
  -- Piotr Gawron <piotr.gawron@uni.lu>  Thu, 23 Nov 2020 15:00:00 +0200
 

rest-api/src/main/java/lcsb/mapviewer/api/projects/models/ModelRestImpl.java

@@ -27,6 +27,8 @@ import lcsb.mapviewer.model.map.BioEntity;
 import lcsb.mapviewer.model.map.InconsistentModelException;
 import lcsb.mapviewer.model.map.layout.*;
 import lcsb.mapviewer.model.map.model.*;
+import lcsb.mapviewer.model.map.reaction.Reaction;
+import lcsb.mapviewer.model.map.species.Element;
 import lcsb.mapviewer.model.user.User;
 import lcsb.mapviewer.services.interfaces.ILayoutService;
 import lcsb.mapviewer.services.utils.ColorSchemaReader;
@@ -325,7 +327,7 @@ public class ModelRestImpl extends BaseRestImpl {
 
     Path2D polygon = stringToPolygon(polygonString, colorModel);
 
-    SubModelCommand subModelCommand = new SubModelCommand(originalModel, polygon);
+    SubModelCommand subModelCommand = new SubModelCommand(colorModel, polygon);
     Model part = subModelCommand.execute();
 
     Double minX = originalModel.getWidth();
@@ -366,7 +368,7 @@ public class ModelRestImpl extends BaseRestImpl {
     }
     List<Integer> visibleLayoutIds = deserializeIdList(overlayIds);
     for (Integer integer : visibleLayoutIds) {
-      Map<BioEntity, ColorSchema> map = layoutService.getElementsForLayout(colorModel, integer);
+      Map<BioEntity, ColorSchema> map = layoutService.getElementsForLayout(part, integer);
       params.addVisibleLayout(map);
     }