Skip to content
Snippets Groups Projects

Resolve "enable edition of layer data"

Merged Piotr Gawron requested to merge 2167-enable-edition-of-layer-data into development
11 files
+ 47
106
Compare changes
  • Side-by-side
  • Inline
Files
11
@@ -11,7 +11,6 @@ import lcsb.mapviewer.services.ObjectNotFoundException;
import lcsb.mapviewer.services.interfaces.IGlyphService;
import lcsb.mapviewer.services.interfaces.ILayerImageService;
import lcsb.mapviewer.services.interfaces.ILayerService;
import lcsb.mapviewer.services.interfaces.IProjectService;
import lcsb.mapviewer.web.api.NewApiResponseSerializer;
import org.hibernate.validator.constraints.NotBlank;
import org.springframework.beans.factory.annotation.Autowired;
@@ -47,7 +46,6 @@ import java.util.Map;
produces = MediaType.APPLICATION_JSON_VALUE)
public class NewImageController {
private final IProjectService projectService;
private final ILayerService layerService;
private final NewApiResponseSerializer serializer;
private final ILayerImageService layerImageService;
@@ -58,11 +56,9 @@ public class NewImageController {
final NewApiResponseSerializer serializer,
final ILayerService layerService,
final ILayerImageService layerImageService,
final IProjectService projectService,
final IGlyphService glyphService) {
this.serializer = serializer;
this.layerService = layerService;
this.projectService = projectService;
this.layerImageService = layerImageService;
this.glyphService = glyphService;
}
@@ -111,8 +107,7 @@ public class NewImageController {
final LayerImage image = new LayerImage();
data.saveToLayer(image, projectService.getBackgrounds(projectId, false).isEmpty(),
(glyphId) -> getGlyphFromService(projectId, glyphId));
data.saveToLayer(image, (glyphId) -> getGlyphFromService(projectId, glyphId));
image.setLayer(layer);
layerImageService.add(image);
@@ -145,8 +140,7 @@ public class NewImageController {
throws QueryException, ObjectNotFoundException {
final LayerImage image = getImageFromService(projectId, mapId, layerId, imageId);
serializer.checkETag(oldETag, image);
data.saveToLayer(image, projectService.getBackgrounds(projectId, false).isEmpty(),
(glyphId) -> getGlyphFromService(projectId, glyphId));
data.saveToLayer(image, (glyphId) -> getGlyphFromService(projectId, glyphId));
layerImageService.update(image);
return serializer.prepareResponse(getImageFromService(projectId, mapId, layerId, imageId));
Loading