cleanup

antivoland · Jul 17, 2023 · c0589f7 · c0589f7
1 parent 4747be3
commit c0589f7
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 8 deletions.
diff --git a/src/main/java/antivoland/transporeon/model/segmentation/Segmentation.java b/src/main/java/antivoland/transporeon/model/segmentation/Segmentation.java
@@ -54,8 +54,8 @@ public Slice<? extends Segment> sliceFor(int lat) {
     public Collection<? extends Segment> segments() {
         return slices
                 .stream()
-                .flatMap(slice -> slice.segments().stream())
-                .filter(segment -> !segment.spots.isEmpty())
+                .map(Slice::nonEmptySegments)
+                .flatMap(Collection::stream)
                 .toList();
     }
 }
diff --git a/src/main/java/antivoland/transporeon/model/segmentation/segment/NorthPoleSegment.java b/src/main/java/antivoland/transporeon/model/segmentation/segment/NorthPoleSegment.java
@@ -15,7 +15,7 @@ public NorthPoleSegment(NorthPoleSlice slice) {
     @Override
     public Collection<Segment> environment(double kmDelta) {
         Collection<Segment> segments = new ArrayList<>();
-        slice.southernSlices(kmDelta).forEach(slice -> segments.addAll(slice.segments()));
+        slice.southernSlices(kmDelta).forEach(slice -> segments.addAll(slice.nonEmptySegments()));
         return segments;
     }
 

diff --git a/src/main/java/antivoland/transporeon/model/segmentation/segment/SouthPoleSegment.java b/src/main/java/antivoland/transporeon/model/segmentation/segment/SouthPoleSegment.java
@@ -15,7 +15,7 @@ public SouthPoleSegment(SouthPoleSlice slice) {
     @Override
     public Collection<Segment> environment(double kmDelta) {
         Collection<Segment> segments = new ArrayList<>();
-        slice.northernSlices(kmDelta).forEach(slice -> segments.addAll(slice.segments()));
+        slice.northernSlices(kmDelta).forEach(slice -> segments.addAll(slice.nonEmptySegments()));
         return segments;
     }
 

diff --git a/src/main/java/antivoland/transporeon/model/segmentation/slice/NorthPoleSlice.java b/src/main/java/antivoland/transporeon/model/segmentation/slice/NorthPoleSlice.java
@@ -19,7 +19,7 @@ public NorthPoleSegment segmentFor(int lon) {
     }
 
     @Override
-    public Collection<NorthPoleSegment> segments() {
+    protected Collection<NorthPoleSegment> segments() {
         return List.of(segment);
     }
 

diff --git a/src/main/java/antivoland/transporeon/model/segmentation/slice/RegularSlice.java b/src/main/java/antivoland/transporeon/model/segmentation/slice/RegularSlice.java
@@ -27,7 +27,7 @@ public RegularSegment segmentFor(int lon) {
     }
 
     @Override
-    public Collection<RegularSegment> segments() {
+    protected Collection<RegularSegment> segments() {
         return segments.values();
     }
 

diff --git a/src/main/java/antivoland/transporeon/model/segmentation/slice/Slice.java b/src/main/java/antivoland/transporeon/model/segmentation/slice/Slice.java
@@ -28,7 +28,14 @@ public final SEGMENT segmentFor(double lon) {
 
     public abstract SEGMENT segmentFor(int lon);
 
-    public abstract Collection<SEGMENT> segments();
+    protected abstract Collection<SEGMENT> segments();
+
+    public final Collection<SEGMENT> nonEmptySegments() {
+        return segments()
+                .stream()
+                .filter(segment -> !segment.spots.isEmpty())
+                .toList();
+    }
 
     public final Collection<Slice<?>> southernSlices(double kmDelta) {
         if (type == SliceType.SOUTH_POLE) return List.of();

diff --git a/src/main/java/antivoland/transporeon/model/segmentation/slice/SouthPoleSlice.java b/src/main/java/antivoland/transporeon/model/segmentation/slice/SouthPoleSlice.java
@@ -19,7 +19,7 @@ public SouthPoleSegment segmentFor(int lon) {
     }
 
     @Override
-    public Collection<SouthPoleSegment> segments() {
+    protected Collection<SouthPoleSegment> segments() {
         return List.of(segment);
     }