fix D8 SpatialItem neighbor detection plus add working gradient :D

svencc · Mar 11, 2024 · 377494d · 377494d
1 parent 4060833
commit 377494d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 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
@@ -80,10 +80,10 @@ private int calculateForestFragment(
 
         if (treeDensity < forestDensityThreshold) {
             return mapScheme.getBaseColorForestBackground();
-        } else if (treeDensity >= forestDensityThreshold && surroundingForestNeighbourSpaces >= 5) {
+        } else if (treeDensity >= forestDensityThreshold && surroundingForestNeighbourSpaces >= 8) {
             return mapScheme.getBaseColorForest();
         } else {
-            return colorCalculator.modifyTransparency(mapScheme.getBaseColorForest(), surroundingForestNeighbourSpaces * 0.1);
+            return colorCalculator.modifyTransparency(mapScheme.getBaseColorForest(), (surroundingForestNeighbourSpaces + 1) * 0.125);
         }
     }
 

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
@@ -80,11 +80,20 @@ private int calculateStructureFragment(
 
         if (StructureDensity < structureDensityThreshold) {
             return mapScheme.getBaseColorStructureBackground();
-        } else if (StructureDensity >= structureDensityThreshold && surroundingStructureNeighbourSpaces >= 5) {
+        } else if (StructureDensity >= structureDensityThreshold && surroundingStructureNeighbourSpaces >= 8) {
             return mapScheme.getBaseColorStructure();
         } else {
-            return colorCalculator.modifyTransparency(mapScheme.getBaseColorStructure(), surroundingStructureNeighbourSpaces * 0.1);
+            return colorCalculator.modifyTransparency(mapScheme.getBaseColorStructure(), surroundingStructureNeighbourSpaces * 0.125);
         }
+
+//        if (StructureDensity < structureDensityThreshold) {
+//            return mapScheme.getBaseColorStructureBackground();
+//        } else if (StructureDensity >= structureDensityThreshold && surroundingStructureNeighbourSpaces >= 3) {
+//            return mapScheme.getBaseColorStructure();
+//        } else {
+//            int transparencyFactor = 0x04;
+//            return colorCalculator.setTransparency(mapScheme.getBaseColorStructure(), (surroundingStructureNeighbourSpaces + 1) * transparencyFactor);
+//        }
     }
 
 }