This is an automated email from the ASF dual-hosted git repository.
bchapuis pushed a commit to branch raster-processing
in repository https://gitbox.apache.org/repos/asf/incubator-baremaps.git
The following commit(s) were added to refs/heads/raster-processing by this push:
new 2db80a14 Improve naming
2db80a14 is described below
commit 2db80a14a47cdb3e05d927c49dd32b9e7f9745a1
Author: Bertil Chapuis <[email protected]>
AuthorDate: Sat Aug 3 10:49:17 2024 +0200
Improve naming
---
.../baremaps/raster/ContourTileStoreTest.java | 2 +-
.../raster/ContourTracerLineStringTest.java | 32 +++++++++++-----------
.../baremaps/raster/ContourTracerPolygonTest.java | 32 +++++++++++-----------
...etryDrawer.java => MarchingSquareRenderer.java} | 9 +++---
...ngSquareCases.java => MarchingSquareUtils.java} | 2 +-
5 files changed, 38 insertions(+), 39 deletions(-)
diff --git
a/baremaps-raster/src/test/java/org/apache/baremaps/raster/ContourTileStoreTest.java
b/baremaps-raster/src/test/java/org/apache/baremaps/raster/ContourTileStoreTest.java
index ded591b9..7ce97aac 100644
---
a/baremaps-raster/src/test/java/org/apache/baremaps/raster/ContourTileStoreTest.java
+++
b/baremaps-raster/src/test/java/org/apache/baremaps/raster/ContourTileStoreTest.java
@@ -38,7 +38,7 @@ class ContourTileStoreTest {
.toList();
JFrame frame = new JFrame("Geometry Drawer");
- GeometryDrawer drawer = new GeometryDrawer(contours);
+ MarchingSquareRenderer drawer = new MarchingSquareRenderer(contours);
frame.add(drawer);
frame.setSize(1200, 1200);
frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
diff --git
a/baremaps-raster/src/test/java/org/apache/baremaps/raster/ContourTracerLineStringTest.java
b/baremaps-raster/src/test/java/org/apache/baremaps/raster/ContourTracerLineStringTest.java
index ce4cab75..4182f6cb 100644
---
a/baremaps-raster/src/test/java/org/apache/baremaps/raster/ContourTracerLineStringTest.java
+++
b/baremaps-raster/src/test/java/org/apache/baremaps/raster/ContourTracerLineStringTest.java
@@ -30,21 +30,21 @@ class ContourTracerLineStringTest {
@Test
@DisplayName("Test case 0")
void testProcessCellWithCase00() {
- var lines = trace(MarchingSquareCases.CASE_00);
+ var lines = trace(MarchingSquareUtils.CASE_00);
assertTrue(lines.isEmpty());
}
@Test
@DisplayName("Test case 1")
void testProcessCellWithCase01() {
- var lines = trace(MarchingSquareCases.CASE_01);
+ var lines = trace(MarchingSquareUtils.CASE_01);
assertGeometryEquals("LINESTRING (0 0.5, 0.5 0)", lines.get(0));
}
@Test
@DisplayName("Test case 2")
void testProcessCellWithCase02() {
- var lines = trace(MarchingSquareCases.CASE_02);
+ var lines = trace(MarchingSquareUtils.CASE_02);
assertEquals(1, lines.size());
assertGeometryEquals("LINESTRING (0.5 0, 1 0.5)", lines.get(0));
}
@@ -52,7 +52,7 @@ class ContourTracerLineStringTest {
@Test
@DisplayName("Test case 3")
void testProcessCellWithCase03() {
- var lines = trace(MarchingSquareCases.CASE_03);
+ var lines = trace(MarchingSquareUtils.CASE_03);
assertEquals(1, lines.size());
assertGeometryEquals("LINESTRING (0 0.5, 1 0.5)", lines.get(0));
}
@@ -60,7 +60,7 @@ class ContourTracerLineStringTest {
@Test
@DisplayName("Test case 4")
void testProcessCellWithCase04() {
- var lines = trace(MarchingSquareCases.CASE_04);
+ var lines = trace(MarchingSquareUtils.CASE_04);
assertEquals(1, lines.size());
assertGeometryEquals("LINESTRING (1 0.5, 0.5 1)", lines.get(0));
}
@@ -68,7 +68,7 @@ class ContourTracerLineStringTest {
@Test
@DisplayName("Test case 5")
void testProcessCellWithCase05() {
- var lines = trace(MarchingSquareCases.CASE_05);
+ var lines = trace(MarchingSquareUtils.CASE_05);
assertEquals(2, lines.size());
assertGeometryEquals("LINESTRING (0 0.5, 0.5 1)", lines.get(0));
assertGeometryEquals("LINESTRING (1 0.5, 0.5 0)", lines.get(1));
@@ -77,7 +77,7 @@ class ContourTracerLineStringTest {
@Test
@DisplayName("Test case 6")
void testProcessCellWithCase06() {
- var lines = trace(MarchingSquareCases.CASE_06);
+ var lines = trace(MarchingSquareUtils.CASE_06);
assertEquals(1, lines.size());
assertGeometryEquals("LINESTRING (0.5 0, 0.5 1)", lines.get(0));
}
@@ -85,7 +85,7 @@ class ContourTracerLineStringTest {
@Test
@DisplayName("Test case 7")
void testProcessCellWithCase07() {
- var lines = trace(MarchingSquareCases.CASE_07);
+ var lines = trace(MarchingSquareUtils.CASE_07);
assertEquals(1, lines.size());
assertGeometryEquals("LINESTRING (0 0.5, 0.5 1)", lines.get(0));
}
@@ -93,7 +93,7 @@ class ContourTracerLineStringTest {
@Test
@DisplayName("Test case 8")
void testProcessCellWithCase08() {
- var lines = trace(MarchingSquareCases.CASE_08);
+ var lines = trace(MarchingSquareUtils.CASE_08);
assertEquals(1, lines.size());
assertGeometryEquals("LINESTRING (0.5 1, 0 0.5)", lines.get(0));
}
@@ -101,7 +101,7 @@ class ContourTracerLineStringTest {
@Test
@DisplayName("Test case 9")
void testProcessCellWithCase09() {
- var lines = trace(MarchingSquareCases.CASE_09);
+ var lines = trace(MarchingSquareUtils.CASE_09);
assertEquals(1, lines.size());
assertGeometryEquals("LINESTRING (0.5 1, 0.5 0)", lines.get(0));
}
@@ -109,7 +109,7 @@ class ContourTracerLineStringTest {
@Test
@DisplayName("Test case 10")
void testProcessCellWithCase10() {
- var lines = trace(MarchingSquareCases.CASE_10);
+ var lines = trace(MarchingSquareUtils.CASE_10);
assertEquals(2, lines.size());
assertGeometryEquals("LINESTRING (0.5 0, 0 0.5)", lines.get(0));
assertGeometryEquals("LINESTRING (0.5 1, 1 0.5)", lines.get(1));
@@ -118,7 +118,7 @@ class ContourTracerLineStringTest {
@Test
@DisplayName("Test case 11")
void testProcessCellWithCase11() {
- var lines = trace(MarchingSquareCases.CASE_11);
+ var lines = trace(MarchingSquareUtils.CASE_11);
assertEquals(1, lines.size());
assertGeometryEquals("LINESTRING (0.5 1, 1 0.5)", lines.get(0));
}
@@ -126,7 +126,7 @@ class ContourTracerLineStringTest {
@Test
@DisplayName("Test case 12")
void testProcessCellWithCase12() {
- var lines = trace(MarchingSquareCases.CASE_12);
+ var lines = trace(MarchingSquareUtils.CASE_12);
assertEquals(1, lines.size());
assertGeometryEquals("LINESTRING (1 0.5, 0 0.5)", lines.get(0));
}
@@ -134,7 +134,7 @@ class ContourTracerLineStringTest {
@Test
@DisplayName("Test case 13")
void testProcessCellWithCase13() {
- var lines = trace(MarchingSquareCases.CASE_13);
+ var lines = trace(MarchingSquareUtils.CASE_13);
assertEquals(1, lines.size());
assertGeometryEquals("LINESTRING (1 0.5, 0.5 0)", lines.get(0));
}
@@ -142,7 +142,7 @@ class ContourTracerLineStringTest {
@Test
@DisplayName("Test case 14")
void testProcessCellWithCase14() {
- var lines = trace(MarchingSquareCases.CASE_14);
+ var lines = trace(MarchingSquareUtils.CASE_14);
assertEquals(1, lines.size());
assertGeometryEquals("LINESTRING (0.5 0, 0 0.5)", lines.get(0));
}
@@ -150,7 +150,7 @@ class ContourTracerLineStringTest {
@Test
@DisplayName("Test case 15")
void testProcessCellWithCase15() {
- var lines = trace(MarchingSquareCases.CASE_15);
+ var lines = trace(MarchingSquareUtils.CASE_15);
assertTrue(lines.isEmpty());
}
diff --git
a/baremaps-raster/src/test/java/org/apache/baremaps/raster/ContourTracerPolygonTest.java
b/baremaps-raster/src/test/java/org/apache/baremaps/raster/ContourTracerPolygonTest.java
index 6c84c311..7ad50958 100644
---
a/baremaps-raster/src/test/java/org/apache/baremaps/raster/ContourTracerPolygonTest.java
+++
b/baremaps-raster/src/test/java/org/apache/baremaps/raster/ContourTracerPolygonTest.java
@@ -30,21 +30,21 @@ class ContourTracerPolygonTest {
@Test
@DisplayName("Test case 0")
void testProcessCellWithCase00() {
- var polygons = trace(MarchingSquareCases.CASE_00);
+ var polygons = trace(MarchingSquareUtils.CASE_00);
assertTrue(polygons.isEmpty());
}
@Test
@DisplayName("Test case 1")
void testProcessCellWithCase01() {
- var polygons = trace(MarchingSquareCases.CASE_01);
+ var polygons = trace(MarchingSquareUtils.CASE_01);
assertGeometryEquals("POLYGON ((0.5 0, 0 0, 0 0.5, 0.5 0))",
polygons.get(0));
}
@Test
@DisplayName("Test case 2")
void testProcessCellWithCase02() {
- var polygons = trace(MarchingSquareCases.CASE_02);
+ var polygons = trace(MarchingSquareUtils.CASE_02);
assertEquals(1, polygons.size());
assertGeometryEquals("POLYGON ((1 0.5, 1 0, 0.5 0, 1 0.5))",
polygons.get(0));
}
@@ -52,7 +52,7 @@ class ContourTracerPolygonTest {
@Test
@DisplayName("Test case 3")
void testProcessCellWithCase03() {
- var polygons = trace(MarchingSquareCases.CASE_03);
+ var polygons = trace(MarchingSquareUtils.CASE_03);
assertEquals(1, polygons.size());
assertGeometryEquals("POLYGON ((0 0, 0 0.5, 1 0.5, 1 0, 0 0))",
polygons.get(0));
}
@@ -60,7 +60,7 @@ class ContourTracerPolygonTest {
@Test
@DisplayName("Test case 4")
void testProcessCellWithCase04() {
- var polygons = trace(MarchingSquareCases.CASE_04);
+ var polygons = trace(MarchingSquareUtils.CASE_04);
assertEquals(1, polygons.size());
assertGeometryEquals("POLYGON ((1 1, 1 0.5, 0.5 1, 1 1))",
polygons.get(0));
}
@@ -68,7 +68,7 @@ class ContourTracerPolygonTest {
@Test
@DisplayName("Test case 5")
void testProcessCellWithCase05() {
- var polygons = trace(MarchingSquareCases.CASE_05);
+ var polygons = trace(MarchingSquareUtils.CASE_05);
assertEquals(1, polygons.size());
assertGeometryEquals("POLYGON ((1 1, 1 0.5, 0.5 0, 0 0, 0 0.5, 0.5 1, 1
1))",
polygons.get(0));
@@ -77,7 +77,7 @@ class ContourTracerPolygonTest {
@Test
@DisplayName("Test case 6")
void testProcessCellWithCase06() {
- var polygons = trace(MarchingSquareCases.CASE_06);
+ var polygons = trace(MarchingSquareUtils.CASE_06);
assertEquals(1, polygons.size());
assertGeometryEquals("POLYGON ((0.5 1, 1 1, 1 0, 0.5 0, 0.5 1))",
polygons.get(0));
}
@@ -85,7 +85,7 @@ class ContourTracerPolygonTest {
@Test
@DisplayName("Test case 7")
void testProcessCellWithCase07() {
- var polygons = trace(MarchingSquareCases.CASE_07);
+ var polygons = trace(MarchingSquareUtils.CASE_07);
assertEquals(1, polygons.size());
assertGeometryEquals("POLYGON ((1 1, 1 0, 0 0, 0 0.5, 0.5 1, 1 1))",
polygons.get(0));
}
@@ -93,7 +93,7 @@ class ContourTracerPolygonTest {
@Test
@DisplayName("Test case 8")
void testProcessCellWithCase08() {
- var polygons = trace(MarchingSquareCases.CASE_08);
+ var polygons = trace(MarchingSquareUtils.CASE_08);
assertEquals(1, polygons.size());
assertGeometryEquals("POLYGON ((0.5 1, 0 0.5, 0 1, 0.5 1))",
polygons.get(0));
}
@@ -101,7 +101,7 @@ class ContourTracerPolygonTest {
@Test
@DisplayName("Test case 9")
void testProcessCellWithCase09() {
- var polygons = trace(MarchingSquareCases.CASE_09);
+ var polygons = trace(MarchingSquareUtils.CASE_09);
assertEquals(1, polygons.size());
assertGeometryEquals("POLYGON ((0.5 1, 0.5 0, 0 0, 0 1, 0.5 1))",
polygons.get(0));
}
@@ -109,7 +109,7 @@ class ContourTracerPolygonTest {
@Test
@DisplayName("Test case 10")
void testProcessCellWithCase10() {
- var polygons = trace(MarchingSquareCases.CASE_10);
+ var polygons = trace(MarchingSquareUtils.CASE_10);
assertEquals(1, polygons.size());
assertGeometryEquals("POLYGON ((0.5 1, 1 0.5, 1 0, 0.5 0, 0 0.5, 0 1, 0.5
1))",
polygons.get(0));
@@ -118,7 +118,7 @@ class ContourTracerPolygonTest {
@Test
@DisplayName("Test case 11")
void testProcessCellWithCase11() {
- var polygons = trace(MarchingSquareCases.CASE_11);
+ var polygons = trace(MarchingSquareUtils.CASE_11);
assertEquals(1, polygons.size());
assertGeometryEquals("POLYGON ((1 0, 0 0, 0 1, 0.5 1, 1 0.5, 1 0))",
polygons.get(0));
}
@@ -126,7 +126,7 @@ class ContourTracerPolygonTest {
@Test
@DisplayName("Test case 12")
void testProcessCellWithCase12() {
- var polygons = trace(MarchingSquareCases.CASE_12);
+ var polygons = trace(MarchingSquareUtils.CASE_12);
assertEquals(1, polygons.size());
assertGeometryEquals("POLYGON ((1 0.5, 0 0.5, 0 1, 1 1, 1 0.5))",
polygons.get(0));
}
@@ -134,7 +134,7 @@ class ContourTracerPolygonTest {
@Test
@DisplayName("Test case 13")
void testProcessCellWithCase13() {
- var polygons = trace(MarchingSquareCases.CASE_13);
+ var polygons = trace(MarchingSquareUtils.CASE_13);
assertEquals(1, polygons.size());
assertGeometryEquals("POLYGON ((0.5 0, 0 0, 0 1, 1 1, 1 0.5, 0.5 0))",
polygons.get(0));
}
@@ -142,7 +142,7 @@ class ContourTracerPolygonTest {
@Test
@DisplayName("Test case 14")
void testProcessCellWithCase14() {
- var polygons = trace(MarchingSquareCases.CASE_14);
+ var polygons = trace(MarchingSquareUtils.CASE_14);
assertEquals(1, polygons.size());
assertGeometryEquals("POLYGON ((0 0.5, 0 1, 1 1, 1 0, 0.5 0, 0 0.5))",
polygons.get(0));
}
@@ -150,7 +150,7 @@ class ContourTracerPolygonTest {
@Test
@DisplayName("Test case 15")
void testProcessCellWithCase15() {
- var polygons = trace(MarchingSquareCases.CASE_15);
+ var polygons = trace(MarchingSquareUtils.CASE_15);
assertEquals(1, polygons.size());
assertGeometryEquals("POLYGON ((0 0, 0 1, 1 1, 1 0, 0 0))",
polygons.get(0));
}
diff --git
a/baremaps-raster/src/test/java/org/apache/baremaps/raster/GeometryDrawer.java
b/baremaps-raster/src/test/java/org/apache/baremaps/raster/MarchingSquareRenderer.java
similarity index 93%
rename from
baremaps-raster/src/test/java/org/apache/baremaps/raster/GeometryDrawer.java
rename to
baremaps-raster/src/test/java/org/apache/baremaps/raster/MarchingSquareRenderer.java
index 944ffa07..63e1621d 100644
---
a/baremaps-raster/src/test/java/org/apache/baremaps/raster/GeometryDrawer.java
+++
b/baremaps-raster/src/test/java/org/apache/baremaps/raster/MarchingSquareRenderer.java
@@ -28,10 +28,10 @@ import org.locationtech.jts.geom.LineString;
import org.locationtech.jts.geom.Polygon;
import org.locationtech.jts.geom.util.AffineTransformation;
-public class GeometryDrawer extends JPanel {
+public class MarchingSquareRenderer extends JPanel {
private List<Geometry> geometries;
- public GeometryDrawer(List<Geometry> geometries) {
+ public MarchingSquareRenderer(List<Geometry> geometries) {
this.geometries = geometries;
}
@@ -87,19 +87,18 @@ public class GeometryDrawer extends JPanel {
}
public static void main(String[] args) {
-
JFrame frame = new JFrame("Geometry Drawer");
JPanel mainPanel = new JPanel(new GridLayout(4, 4));
// mainPanel.setLayout(new BoxLayout(mainPanel, BoxLayout.Y_AXIS));
- for (double[] c : MarchingSquareCases.BUFFERED_CASES) {
+ for (double[] c : MarchingSquareUtils.CASES) {
List<Geometry> geometries = trace(c)
.stream()
.map(AffineTransformation.scaleInstance(50, 50).translate(0,
0)::transform)
.toList();
- GeometryDrawer drawer = new GeometryDrawer(geometries);
+ MarchingSquareRenderer drawer = new MarchingSquareRenderer(geometries);
mainPanel.add(drawer);
}
diff --git
a/baremaps-raster/src/test/java/org/apache/baremaps/raster/MarchingSquareCases.java
b/baremaps-raster/src/test/java/org/apache/baremaps/raster/MarchingSquareUtils.java
similarity index 98%
rename from
baremaps-raster/src/test/java/org/apache/baremaps/raster/MarchingSquareCases.java
rename to
baremaps-raster/src/test/java/org/apache/baremaps/raster/MarchingSquareUtils.java
index 2b7029d6..26bb5c82 100644
---
a/baremaps-raster/src/test/java/org/apache/baremaps/raster/MarchingSquareCases.java
+++
b/baremaps-raster/src/test/java/org/apache/baremaps/raster/MarchingSquareUtils.java
@@ -19,7 +19,7 @@ package org.apache.baremaps.raster;
import java.util.List;
-public class MarchingSquareCases {
+public class MarchingSquareUtils {
public static final double[] CASE_00 = {
0, 0,
