fix D8 SpatialItem neighbor detection plus add working gradient :D

svencc · Mar 11, 2024 · 4060833 · 4060833
1 parent 332b516
commit 4060833
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/...mmons/src/main/java/com/recom/commons/calculator/d8algorithm/D8AlgorithmForForestMap.java b/...mmons/src/main/java/com/recom/commons/calculator/d8algorithm/D8AlgorithmForForestMap.java
@@ -57,8 +57,8 @@ private int calculateForestFragment(
 
         int surroundingForestNeighbourSpaces = 0;
         for (int direction = 0; direction < 8; direction++) {
-            final double adjacentNeighborSpatialX = spacialX + (D8AspectMatrix.directionXComponentMatrix[direction] * demDescriptor.getStepSize()); // Calculate the X-coordinate of the adjacent neighbor.
-            final double adjacentNeighborSpatialY = spacialY + (D8AspectMatrix.directionYComponentMatrix[direction] * demDescriptor.getStepSize()); // Calculate the Y-coordinate of the adjacent neighbor.
+            final double adjacentNeighborSpatialX = spacialX + (D8AspectMatrix.directionXComponentMatrix[direction] * spacialIndex.getCellSizeInMeter()); // Calculate the X-coordinate of the adjacent neighbor.
+            final double adjacentNeighborSpatialY = spacialY + (D8AspectMatrix.directionYComponentMatrix[direction] * spacialIndex.getCellSizeInMeter()); // Calculate the Y-coordinate of the adjacent neighbor.
 
             if (adjacentNeighborSpatialX < 0 || adjacentNeighborSpatialX > demDescriptor.getMapWidthInMeter() || adjacentNeighborSpatialY < 0 || adjacentNeighborSpatialY > demDescriptor.getMapHeightInMeter()) {
                 continue;
@@ -83,7 +83,7 @@ private int calculateForestFragment(
         } else if (treeDensity >= forestDensityThreshold && surroundingForestNeighbourSpaces >= 5) {
             return mapScheme.getBaseColorForest();
         } else {
-            return colorCalculator.modifyTransparency(mapScheme.getBaseColorForest(), 0.5);
+            return colorCalculator.modifyTransparency(mapScheme.getBaseColorForest(), surroundingForestNeighbourSpaces * 0.1);
         }
     }
 

diff --git a/...ns/src/main/java/com/recom/commons/calculator/d8algorithm/D8AlgorithmForStructureMap.java b/...ns/src/main/java/com/recom/commons/calculator/d8algorithm/D8AlgorithmForStructureMap.java
@@ -57,8 +57,8 @@ private int calculateStructureFragment(
 
         int surroundingStructureNeighbourSpaces = 0;
         for (int direction = 0; direction < 8; direction++) {
-            final double adjacentNeighborSpatialX = spacialX + (D8AspectMatrix.directionXComponentMatrix[direction] * demDescriptor.getStepSize()); // Calculate the X-coordinate of the adjacent neighbor.
-            final double adjacentNeighborSpatialY = spacialY + (D8AspectMatrix.directionYComponentMatrix[direction] * demDescriptor.getStepSize()); // Calculate the Y-coordinate of the adjacent neighbor.
+            final double adjacentNeighborSpatialX = spacialX + (D8AspectMatrix.directionXComponentMatrix[direction] * spacialIndex.getCellSizeInMeter()); // Calculate the X-coordinate of the adjacent neighbor.
+            final double adjacentNeighborSpatialY = spacialY + (D8AspectMatrix.directionYComponentMatrix[direction] * spacialIndex.getCellSizeInMeter()); // Calculate the Y-coordinate of the adjacent neighbor.
 
             if (adjacentNeighborSpatialX < 0 || adjacentNeighborSpatialX > demDescriptor.getMapWidthInMeter() || adjacentNeighborSpatialY < 0 || adjacentNeighborSpatialY > demDescriptor.getMapHeightInMeter()) {
                 continue;
@@ -83,7 +83,7 @@ private int calculateStructureFragment(
         } else if (StructureDensity >= structureDensityThreshold && surroundingStructureNeighbourSpaces >= 5) {
             return mapScheme.getBaseColorStructure();
         } else {
-            return colorCalculator.modifyTransparency(mapScheme.getBaseColorStructure(), 0.5);
+            return colorCalculator.modifyTransparency(mapScheme.getBaseColorStructure(), surroundingStructureNeighbourSpaces * 0.1);
         }
     }