From c388efa435e7e8d85993e4c0e356a8c76a2d94fc Mon Sep 17 00:00:00 2001 From: Sven Carrillo Castillo Date: Tue, 27 Feb 2024 22:34:42 +0100 Subject: [PATCH] new RasterizerConfiguration --- .../com/recom/commons/map/MapComposer.java | 64 +++++++++++-------- .../map/rasterizer/BaseMapRasterizer.java | 10 ++- .../map/rasterizer/ContourMapRasterizer.java | 10 ++- .../map/rasterizer/HeightMapRasterizer.java | 10 ++- .../map/rasterizer/ShadowedMapRasterizer.java | 10 ++- .../SlopeAndAspectMapRasterizer.java | 10 ++- .../map/rasterizer/SlopeMapRasterizer.java | 10 ++- ...> HasMapLayerRasterizerConfiguration.java} | 2 +- ...rRenderer.java => MapLayerRasterizer.java} | 5 +- .../maprendererpipeline/CreatedArtifact.java | 4 +- .../MapComposerConfiguration.java | 9 ++- .../MapLayerRendererConfiguration.java | 7 +- .../MapRendererPipelineArtifacts.java | 8 +-- .../map/topography/MapTopographyService.java | 1 - 14 files changed, 108 insertions(+), 52 deletions(-) rename libs/commons/src/main/java/com/recom/commons/map/rasterizer/configuration/{HasMapLayerRendererConfiguration.java => HasMapLayerRasterizerConfiguration.java} (82%) rename libs/commons/src/main/java/com/recom/commons/map/rasterizer/configuration/{MapLayerRenderer.java => MapLayerRasterizer.java} (68%) diff --git a/libs/commons/src/main/java/com/recom/commons/map/MapComposer.java b/libs/commons/src/main/java/com/recom/commons/map/MapComposer.java index 9394b29b..29cb09c1 100644 --- a/libs/commons/src/main/java/com/recom/commons/map/MapComposer.java +++ b/libs/commons/src/main/java/com/recom/commons/map/MapComposer.java @@ -2,9 +2,8 @@ import com.recom.commons.calculator.ARGBCalculator; import com.recom.commons.map.rasterizer.*; -import com.recom.commons.map.rasterizer.configuration.MapLayerRenderer; +import com.recom.commons.map.rasterizer.configuration.MapLayerRasterizer; import com.recom.commons.model.maprendererpipeline.MapComposerWorkPackage; -import com.recom.commons.model.maprendererpipeline.MapLayerRendererConfiguration; import com.recom.commons.model.maprendererpipeline.report.PipelineLogMessage; import lombok.NoArgsConstructor; import lombok.NonNull; @@ -23,7 +22,7 @@ public class MapComposer { @NonNull - private final Map mapLayerRendererPipeline = new HashMap<>(); + private final List mapLayerRasterizerPipeline = new ArrayList<>(); @NonNull private final ExecutorService executorService = Executors.newVirtualThreadPerTaskExecutor(); @NonNull @@ -44,14 +43,13 @@ public static MapComposer withDefaultConfiguration() { return mapComposer; } - public void registerRenderer(@NonNull final MapLayerRenderer renderer) { - mapLayerRendererPipeline.put(renderer.getClass().getSimpleName(), renderer); + public void registerRenderer(@NonNull final MapLayerRasterizer rasterizer) { + mapLayerRasterizerPipeline.add(rasterizer); } @NonNull public void execute(@NonNull final MapComposerWorkPackage workPackage) throws MissingRequiredPropertiesException { - applyConfigurationToRenderer(workPackage); - + applyConfigurationToRasterizer(workPackage); // scale step here or before // bilinear interpolation @@ -64,10 +62,11 @@ public void execute(@NonNull final MapComposerWorkPackage workPackage) throws Mi @NonNull private void renderDataInParallel(@NonNull final MapComposerWorkPackage workPackage) { - mapLayerRendererPipeline.values().stream() - .sorted(Comparator.comparingInt((final MapLayerRenderer mapLayerRenderer) -> mapLayerRenderer.getMapLayerRendererConfiguration().getLayerOrder().getOrder())) - .filter((final MapLayerRenderer renderer) -> renderer.getMapLayerRendererConfiguration().isEnabled()) - .filter((final MapLayerRenderer renderer) -> !renderer.getMapLayerRendererConfiguration().isSequentialCoreData()) + mapLayerRasterizerPipeline + .stream() + .sorted(Comparator.comparingInt((final MapLayerRasterizer mapLayerRasterizer) -> mapLayerRasterizer.getMapLayerRendererConfiguration().getLayerOrder().getOrder())) + .filter((final MapLayerRasterizer renderer) -> renderer.getMapLayerRendererConfiguration().isEnabled()) + .filter((final MapLayerRasterizer renderer) -> !renderer.getMapLayerRendererConfiguration().isSequentialCoreData()) .map(renderer -> CompletableFuture.supplyAsync(() -> { try { renderer.render(workPackage); @@ -84,10 +83,12 @@ private void renderDataInParallel(@NonNull final MapComposerWorkPackage workPack @NonNull private void renderCoreDataInSequence(@NonNull final MapComposerWorkPackage workPackage) { - mapLayerRendererPipeline.values().stream() - .sorted(Comparator.comparingInt((final MapLayerRenderer mapLayerRenderer) -> mapLayerRenderer.getMapLayerRendererConfiguration().getLayerOrder().getOrder())) - .filter((final MapLayerRenderer renderer) -> renderer.getMapLayerRendererConfiguration().isEnabled()) - .filter((final MapLayerRenderer renderer) -> renderer.getMapLayerRendererConfiguration().isSequentialCoreData()) +// mapLayerRendererPipeline.values() + mapLayerRasterizerPipeline + .stream() + .sorted(Comparator.comparingInt((final MapLayerRasterizer mapLayerRasterizer) -> mapLayerRasterizer.getMapLayerRendererConfiguration().getLayerOrder().getOrder())) + .filter((final MapLayerRasterizer renderer) -> renderer.getMapLayerRendererConfiguration().isEnabled()) + .filter((final MapLayerRasterizer renderer) -> renderer.getMapLayerRendererConfiguration().isSequentialCoreData()) .peek(renderer -> { try { renderer.render(workPackage); @@ -108,16 +109,29 @@ private void handleException(@NonNull final MapComposerWorkPackage workPackage) } } - private void applyConfigurationToRenderer(@NonNull final MapComposerWorkPackage workPackage) { - workPackage.getMapComposerConfiguration().getRendererConfiguration().entrySet().stream() - .filter(entry -> mapLayerRendererPipeline.containsKey(entry.getKey())) - .forEach(configurationEntry -> { - final String layerRendererName = configurationEntry.getKey(); - final MapLayerRendererConfiguration configuration = configurationEntry.getValue(); - - final MapLayerRenderer mapLayerRenderer = mapLayerRendererPipeline.get(layerRendererName); - configuration.applyConfiguration(mapLayerRenderer); + private void applyConfigurationToRasterizer(@NonNull final MapComposerWorkPackage workPackage) { + // @TODO <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< + final Map indexedRasterizer = mapLayerRasterizerPipeline.stream() + .collect(HashMap::new, (map, rasterizer) -> map.put(rasterizer.getRasterizerName(), rasterizer), HashMap::putAll); + + workPackage.getMapComposerConfiguration().getRendererConfiguration().stream() +// .filter(configuration -> mapLayerRasterizerPipeline.containsKey(configuration.getRendererName())) + .filter(configuration -> indexedRasterizer.containsKey(configuration.getRasterizerName())) + .forEach(configuration -> { + final MapLayerRasterizer mapLayerRasterizer = indexedRasterizer.get(configuration.getRasterizerName()); + configuration.applyConfiguration(mapLayerRasterizer); }); + + // @TODO <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< +// workPackage.getMapComposerConfiguration().getRendererConfiguration().entrySet().stream() +// .filter(entry -> indexedRasterizer.containsKey(entry.getKey())) +// .forEach(configurationEntry -> { +// final String layerRendererName = configurationEntry.getKey(); +// final MapLayerRendererConfiguration configuration = configurationEntry.getValue(); +// +// final MapLayerRasterizer mapLayerRasterizer = indexedRasterizer.get(layerRendererName); +// configuration.applyConfiguration(mapLayerRasterizer); +// }); } @NonNull @@ -139,7 +153,7 @@ public int[] merge( return workPackage.getPipelineArtifacts().getArtifacts().entrySet().stream() .sorted(Comparator.comparingInt((entry) -> entry.getValue().getCreator().getMapLayerRendererConfiguration().getLayerOrder().getOrder())) .filter(entry -> { - final MapLayerRenderer artifactCreator = entry.getValue().getCreator(); + final MapLayerRasterizer artifactCreator = entry.getValue().getCreator(); return artifactCreator.getMapLayerRendererConfiguration().isEnabled() && artifactCreator.getMapLayerRendererConfiguration().isVisible(); }) diff --git a/libs/commons/src/main/java/com/recom/commons/map/rasterizer/BaseMapRasterizer.java b/libs/commons/src/main/java/com/recom/commons/map/rasterizer/BaseMapRasterizer.java index 49ac70a5..5bc5e015 100644 --- a/libs/commons/src/main/java/com/recom/commons/map/rasterizer/BaseMapRasterizer.java +++ b/libs/commons/src/main/java/com/recom/commons/map/rasterizer/BaseMapRasterizer.java @@ -3,7 +3,7 @@ import com.recom.commons.calculator.ARGBCalculator; import com.recom.commons.calculator.ARGBColor; import com.recom.commons.map.rasterizer.configuration.LayerOrder; -import com.recom.commons.map.rasterizer.configuration.MapLayerRenderer; +import com.recom.commons.map.rasterizer.configuration.MapLayerRasterizer; import com.recom.commons.map.rasterizer.mapdesignscheme.MapDesignScheme; import com.recom.commons.map.rasterizer.scaler.DEMScalerNearestNeighbor; import com.recom.commons.model.DEMDescriptor; @@ -13,13 +13,14 @@ import lombok.NonNull; -public class BaseMapRasterizer implements MapLayerRenderer { +public class BaseMapRasterizer implements MapLayerRasterizer { @NonNull private final ARGBCalculator argbCalculator = new ARGBCalculator(); @Getter @NonNull private MapLayerRendererConfiguration mapLayerRendererConfiguration = MapLayerRendererConfiguration.builder() + .rasterizerName(getClass().getSimpleName()) .layerOrder(LayerOrder.BASE_MAP) .build(); @NonNull @@ -73,6 +74,11 @@ public int[] rasterizeBaseMap( return imageBuffer; } + @Override + public String getRasterizerName() { + return getClass().getSimpleName(); + } + @Override public void render(@NonNull final MapComposerWorkPackage workPackage) { final int[] rawBaseMap = rasterizeBaseMap(workPackage.getMapComposerConfiguration().getDemDescriptor(), workPackage.getMapComposerConfiguration().getMapDesignScheme()); diff --git a/libs/commons/src/main/java/com/recom/commons/map/rasterizer/ContourMapRasterizer.java b/libs/commons/src/main/java/com/recom/commons/map/rasterizer/ContourMapRasterizer.java index c89d3a10..d8caf8c8 100644 --- a/libs/commons/src/main/java/com/recom/commons/map/rasterizer/ContourMapRasterizer.java +++ b/libs/commons/src/main/java/com/recom/commons/map/rasterizer/ContourMapRasterizer.java @@ -2,7 +2,7 @@ import com.recom.commons.calculator.d8algorithm.D8AlgorithmForContourMap; import com.recom.commons.map.rasterizer.configuration.LayerOrder; -import com.recom.commons.map.rasterizer.configuration.MapLayerRenderer; +import com.recom.commons.map.rasterizer.configuration.MapLayerRasterizer; import com.recom.commons.map.rasterizer.mapdesignscheme.MapDesignScheme; import com.recom.commons.model.DEMDescriptor; import com.recom.commons.model.maprendererpipeline.MapComposerWorkPackage; @@ -12,10 +12,11 @@ @Getter -public class ContourMapRasterizer implements MapLayerRenderer { +public class ContourMapRasterizer implements MapLayerRasterizer { @NonNull private MapLayerRendererConfiguration mapLayerRendererConfiguration = MapLayerRendererConfiguration.builder() + .rasterizerName(getClass().getSimpleName()) .layerOrder(LayerOrder.CONTOUR_MAP) .build(); @@ -42,6 +43,11 @@ public int[] rasterizeContourMap( return pixelBuffer; } + @Override + public String getRasterizerName() { + return getClass().getSimpleName(); + } + @Override public void render(@NonNull final MapComposerWorkPackage workPackage) { final int[] rawContourMap = rasterizeContourMap(workPackage.getMapComposerConfiguration().getDemDescriptor(), workPackage.getMapComposerConfiguration().getMapDesignScheme()); diff --git a/libs/commons/src/main/java/com/recom/commons/map/rasterizer/HeightMapRasterizer.java b/libs/commons/src/main/java/com/recom/commons/map/rasterizer/HeightMapRasterizer.java index 56417828..f0a85431 100644 --- a/libs/commons/src/main/java/com/recom/commons/map/rasterizer/HeightMapRasterizer.java +++ b/libs/commons/src/main/java/com/recom/commons/map/rasterizer/HeightMapRasterizer.java @@ -1,7 +1,7 @@ package com.recom.commons.map.rasterizer; import com.recom.commons.map.rasterizer.configuration.LayerOrder; -import com.recom.commons.map.rasterizer.configuration.MapLayerRenderer; +import com.recom.commons.map.rasterizer.configuration.MapLayerRasterizer; import com.recom.commons.map.rasterizer.scaler.DEMScalerNearestNeighbor; import com.recom.commons.model.DEMDescriptor; import com.recom.commons.model.maprendererpipeline.MapComposerWorkPackage; @@ -12,11 +12,12 @@ import java.awt.*; -public class HeightMapRasterizer implements MapLayerRenderer { +public class HeightMapRasterizer implements MapLayerRasterizer { @Getter @NonNull private MapLayerRendererConfiguration mapLayerRendererConfiguration = MapLayerRendererConfiguration.builder() + .rasterizerName(getClass().getSimpleName()) .layerOrder(LayerOrder.HEIGHT_MAP) .visible(false) .enabled(false) @@ -74,6 +75,11 @@ public int[] rasterizeHeightMap(@NonNull final DEMDescriptor demDescriptor) { return imageBuffer; } + @Override + public String getRasterizerName() { + return getClass().getSimpleName(); + } + @Override public void render(@NonNull final MapComposerWorkPackage workPackage) { final int[] rawHeightMap = rasterizeHeightMap(workPackage.getMapComposerConfiguration().getDemDescriptor()); diff --git a/libs/commons/src/main/java/com/recom/commons/map/rasterizer/ShadowedMapRasterizer.java b/libs/commons/src/main/java/com/recom/commons/map/rasterizer/ShadowedMapRasterizer.java index 4ad553a0..b883b3b5 100644 --- a/libs/commons/src/main/java/com/recom/commons/map/rasterizer/ShadowedMapRasterizer.java +++ b/libs/commons/src/main/java/com/recom/commons/map/rasterizer/ShadowedMapRasterizer.java @@ -2,7 +2,7 @@ import com.recom.commons.calculator.d8algorithm.D8AlgorithmForShadedMap; import com.recom.commons.map.rasterizer.configuration.LayerOrder; -import com.recom.commons.map.rasterizer.configuration.MapLayerRenderer; +import com.recom.commons.map.rasterizer.configuration.MapLayerRasterizer; import com.recom.commons.map.rasterizer.mapdesignscheme.MapDesignScheme; import com.recom.commons.model.DEMDescriptor; import com.recom.commons.model.SlopeAndAspectMap; @@ -16,10 +16,11 @@ @Getter @Setter -public class ShadowedMapRasterizer implements MapLayerRenderer { +public class ShadowedMapRasterizer implements MapLayerRasterizer { @NonNull private MapLayerRendererConfiguration mapLayerRendererConfiguration = MapLayerRendererConfiguration.builder() + .rasterizerName(getClass().getSimpleName()) .layerOrder(LayerOrder.SHADOWED_MAP) .build(); @@ -46,6 +47,11 @@ public int[] rasterizeShadowedMap( return pixelBuffer; } + @Override + public String getRasterizerName() { + return getClass().getSimpleName(); + } + @Override public void render(@NonNull final MapComposerWorkPackage workPackage) { workPackage.getPipelineArtifacts().getArtifactFrom(SlopeAndAspectMapRasterizer.class).ifPresent((final CreatedArtifact artifact) -> { diff --git a/libs/commons/src/main/java/com/recom/commons/map/rasterizer/SlopeAndAspectMapRasterizer.java b/libs/commons/src/main/java/com/recom/commons/map/rasterizer/SlopeAndAspectMapRasterizer.java index 592b9d97..60996309 100644 --- a/libs/commons/src/main/java/com/recom/commons/map/rasterizer/SlopeAndAspectMapRasterizer.java +++ b/libs/commons/src/main/java/com/recom/commons/map/rasterizer/SlopeAndAspectMapRasterizer.java @@ -2,7 +2,7 @@ import com.recom.commons.calculator.d8algorithm.D8AlgorithmForSlopeAndAspectMap; import com.recom.commons.map.rasterizer.configuration.LayerOrder; -import com.recom.commons.map.rasterizer.configuration.MapLayerRenderer; +import com.recom.commons.map.rasterizer.configuration.MapLayerRasterizer; import com.recom.commons.model.DEMDescriptor; import com.recom.commons.model.SlopeAndAspect; import com.recom.commons.model.SlopeAndAspectMap; @@ -14,11 +14,12 @@ @Getter @Setter -public class SlopeAndAspectMapRasterizer implements MapLayerRenderer { +public class SlopeAndAspectMapRasterizer implements MapLayerRasterizer { @Getter @NonNull private MapLayerRendererConfiguration mapLayerRendererConfiguration = MapLayerRendererConfiguration.builder() + .rasterizerName(getClass().getSimpleName()) .layerOrder(LayerOrder.SLOPE_AND_ASPECT_MAP) .sequentialCoreData(true) .build(); @@ -34,6 +35,11 @@ public SlopeAndAspectMap rasterizeSlopeAndAspectMap(@NonNull final DEMDescriptor .build(); } + @Override + public String getRasterizerName() { + return getClass().getSimpleName(); + } + @Override public void render(@NonNull final MapComposerWorkPackage workPackage) { final SlopeAndAspectMap slopeAndAspectMap = rasterizeSlopeAndAspectMap(workPackage.getMapComposerConfiguration().getDemDescriptor()); diff --git a/libs/commons/src/main/java/com/recom/commons/map/rasterizer/SlopeMapRasterizer.java b/libs/commons/src/main/java/com/recom/commons/map/rasterizer/SlopeMapRasterizer.java index 8b2321fa..dd90fe57 100644 --- a/libs/commons/src/main/java/com/recom/commons/map/rasterizer/SlopeMapRasterizer.java +++ b/libs/commons/src/main/java/com/recom/commons/map/rasterizer/SlopeMapRasterizer.java @@ -3,7 +3,7 @@ import com.recom.commons.calculator.d8algorithm.D8AlgorithmForSlopeAndAspectMap; import com.recom.commons.calculator.d8algorithm.D8AlgorithmForSlopeMap; import com.recom.commons.map.rasterizer.configuration.LayerOrder; -import com.recom.commons.map.rasterizer.configuration.MapLayerRenderer; +import com.recom.commons.map.rasterizer.configuration.MapLayerRasterizer; import com.recom.commons.map.rasterizer.mapdesignscheme.MapDesignScheme; import com.recom.commons.model.DEMDescriptor; import com.recom.commons.model.SlopeAndAspect; @@ -16,10 +16,11 @@ @Getter @Setter -public class SlopeMapRasterizer implements MapLayerRenderer { +public class SlopeMapRasterizer implements MapLayerRasterizer { @NonNull private MapLayerRendererConfiguration mapLayerRendererConfiguration = MapLayerRendererConfiguration.builder() + .rasterizerName(getClass().getSimpleName()) .layerOrder(LayerOrder.HEIGHT_MAP) .visible(false) .build(); @@ -49,6 +50,11 @@ public int[] rasterizeSlopeMap( return pixelBuffer; } + @Override + public String getRasterizerName() { + return getClass().getSimpleName(); + } + @Override public void render(@NonNull MapComposerWorkPackage workPackage) { final int[] rawSlopeMap = rasterizeSlopeMap(workPackage.getMapComposerConfiguration().getDemDescriptor(), workPackage.getMapComposerConfiguration().getMapDesignScheme()); diff --git a/libs/commons/src/main/java/com/recom/commons/map/rasterizer/configuration/HasMapLayerRendererConfiguration.java b/libs/commons/src/main/java/com/recom/commons/map/rasterizer/configuration/HasMapLayerRasterizerConfiguration.java similarity index 82% rename from libs/commons/src/main/java/com/recom/commons/map/rasterizer/configuration/HasMapLayerRendererConfiguration.java rename to libs/commons/src/main/java/com/recom/commons/map/rasterizer/configuration/HasMapLayerRasterizerConfiguration.java index 43c3d093..efab2398 100644 --- a/libs/commons/src/main/java/com/recom/commons/map/rasterizer/configuration/HasMapLayerRendererConfiguration.java +++ b/libs/commons/src/main/java/com/recom/commons/map/rasterizer/configuration/HasMapLayerRasterizerConfiguration.java @@ -3,7 +3,7 @@ import com.recom.commons.model.maprendererpipeline.MapLayerRendererConfiguration; import lombok.NonNull; -public interface HasMapLayerRendererConfiguration { +public interface HasMapLayerRasterizerConfiguration { @NonNull MapLayerRendererConfiguration getMapLayerRendererConfiguration(); diff --git a/libs/commons/src/main/java/com/recom/commons/map/rasterizer/configuration/MapLayerRenderer.java b/libs/commons/src/main/java/com/recom/commons/map/rasterizer/configuration/MapLayerRasterizer.java similarity index 68% rename from libs/commons/src/main/java/com/recom/commons/map/rasterizer/configuration/MapLayerRenderer.java rename to libs/commons/src/main/java/com/recom/commons/map/rasterizer/configuration/MapLayerRasterizer.java index 57e28b99..e1bad1e9 100644 --- a/libs/commons/src/main/java/com/recom/commons/map/rasterizer/configuration/MapLayerRenderer.java +++ b/libs/commons/src/main/java/com/recom/commons/map/rasterizer/configuration/MapLayerRasterizer.java @@ -5,7 +5,10 @@ import java.io.IOException; -public interface MapLayerRenderer extends HasMapLayerRendererConfiguration { +public interface MapLayerRasterizer extends HasMapLayerRasterizerConfiguration { + + @NonNull + String getRasterizerName(); void render(@NonNull final MapComposerWorkPackage workPackage) throws IOException; diff --git a/libs/commons/src/main/java/com/recom/commons/model/maprendererpipeline/CreatedArtifact.java b/libs/commons/src/main/java/com/recom/commons/model/maprendererpipeline/CreatedArtifact.java index 4a6c7e18..20911023 100644 --- a/libs/commons/src/main/java/com/recom/commons/model/maprendererpipeline/CreatedArtifact.java +++ b/libs/commons/src/main/java/com/recom/commons/model/maprendererpipeline/CreatedArtifact.java @@ -1,6 +1,6 @@ package com.recom.commons.model.maprendererpipeline; -import com.recom.commons.map.rasterizer.configuration.MapLayerRenderer; +import com.recom.commons.map.rasterizer.configuration.MapLayerRasterizer; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; @@ -12,7 +12,7 @@ public class CreatedArtifact { @Getter @NonNull - private final MapLayerRenderer creator; + private final MapLayerRasterizer creator; @NonNull private final Object data; diff --git a/libs/commons/src/main/java/com/recom/commons/model/maprendererpipeline/MapComposerConfiguration.java b/libs/commons/src/main/java/com/recom/commons/model/maprendererpipeline/MapComposerConfiguration.java index 17074b21..e0266eab 100644 --- a/libs/commons/src/main/java/com/recom/commons/model/maprendererpipeline/MapComposerConfiguration.java +++ b/libs/commons/src/main/java/com/recom/commons/model/maprendererpipeline/MapComposerConfiguration.java @@ -4,8 +4,8 @@ import com.recom.commons.model.DEMDescriptor; import lombok.*; -import java.util.HashMap; -import java.util.Map; +import java.util.ArrayList; +import java.util.List; @Data @Builder @@ -19,7 +19,10 @@ public class MapComposerConfiguration { @NonNull private MapDesignScheme mapDesignScheme; +// @NonNull +// private final Map rendererConfiguration = new HashMap<>(); + @NonNull - private final Map rendererConfiguration = new HashMap<>(); + private final List rendererConfiguration = new ArrayList<>(); } diff --git a/libs/commons/src/main/java/com/recom/commons/model/maprendererpipeline/MapLayerRendererConfiguration.java b/libs/commons/src/main/java/com/recom/commons/model/maprendererpipeline/MapLayerRendererConfiguration.java index 5aaaafd6..d0815f00 100644 --- a/libs/commons/src/main/java/com/recom/commons/model/maprendererpipeline/MapLayerRendererConfiguration.java +++ b/libs/commons/src/main/java/com/recom/commons/model/maprendererpipeline/MapLayerRendererConfiguration.java @@ -1,7 +1,7 @@ package com.recom.commons.model.maprendererpipeline; import com.recom.commons.map.rasterizer.configuration.LayerOrder; -import com.recom.commons.map.rasterizer.configuration.MapLayerRenderer; +import com.recom.commons.map.rasterizer.configuration.MapLayerRasterizer; import lombok.*; @@ -12,6 +12,8 @@ @AllArgsConstructor public class MapLayerRendererConfiguration { + @NonNull + private String rasterizerName; @Builder.Default private boolean enabled = true; @Builder.Default @@ -21,8 +23,7 @@ public class MapLayerRendererConfiguration { @NonNull private LayerOrder layerOrder; - - public void applyConfiguration(@NonNull final MapLayerRenderer renderer) { + public void applyConfiguration(@NonNull final MapLayerRasterizer renderer) { renderer.getMapLayerRendererConfiguration().setLayerOrder(layerOrder); renderer.getMapLayerRendererConfiguration().setVisible(visible); renderer.getMapLayerRendererConfiguration().setEnabled(enabled); diff --git a/libs/commons/src/main/java/com/recom/commons/model/maprendererpipeline/MapRendererPipelineArtifacts.java b/libs/commons/src/main/java/com/recom/commons/model/maprendererpipeline/MapRendererPipelineArtifacts.java index 8273d23c..069d9f83 100644 --- a/libs/commons/src/main/java/com/recom/commons/model/maprendererpipeline/MapRendererPipelineArtifacts.java +++ b/libs/commons/src/main/java/com/recom/commons/model/maprendererpipeline/MapRendererPipelineArtifacts.java @@ -1,6 +1,6 @@ package com.recom.commons.model.maprendererpipeline; -import com.recom.commons.map.rasterizer.configuration.MapLayerRenderer; +import com.recom.commons.map.rasterizer.configuration.MapLayerRasterizer; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; @@ -16,11 +16,11 @@ public class MapRendererPipelineArtifacts { @Getter @NonNull - private final Map, CreatedArtifact> artifacts = new HashMap<>(); + private final Map, CreatedArtifact> artifacts = new HashMap<>(); public void addArtifact( - @NonNull final MapLayerRenderer creator, + @NonNull final MapLayerRasterizer creator, @NonNull final Object artifact ) { final CreatedArtifact createdArtifact = CreatedArtifact.builder() @@ -31,7 +31,7 @@ public void addArtifact( artifacts.put(creator.getClass(), createdArtifact); } - public Optional getArtifactFrom(@NonNull final Class rendererName) { + public Optional getArtifactFrom(@NonNull final Class rendererName) { return Optional.ofNullable(artifacts.get(rendererName)); } diff --git a/services/recom-backend/src/main/java/com/recom/service/map/topography/MapTopographyService.java b/services/recom-backend/src/main/java/com/recom/service/map/topography/MapTopographyService.java index 590cb0e1..2089a5a0 100644 --- a/services/recom-backend/src/main/java/com/recom/service/map/topography/MapTopographyService.java +++ b/services/recom-backend/src/main/java/com/recom/service/map/topography/MapTopographyService.java @@ -11,7 +11,6 @@ import com.recom.exception.HttpNotFoundException; import com.recom.exception.HttpUnprocessableEntityException; import com.recom.persistence.map.topography.MapLocatedTopographyPersistenceLayer; -import com.recom.service.SerializationService; import lombok.NonNull; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j;