New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Test the readers with osm-test data #816

Merged

bchapuis merged 12 commits into main from osm-test

Jan 2, 2024

Member

bchapuis commented Dec 20, 2023

No description provided.

bchapuis added 2 commits

December 20, 2023 13:56


          Test the readers with osm-test data

bf66fac


          Format code with spotless

c90da8d

github-advanced-security bot found potential problems

View reviewed changes

...maps-core/src/main/java/org/apache/baremaps/openstreetmap/function/CleanDuplicatePoints.java Fixed Show fixed Hide fixed

...maps-core/src/main/java/org/apache/baremaps/openstreetmap/function/CleanDuplicatePoints.java Fixed Show fixed Hide fixed

...maps-core/src/main/java/org/apache/baremaps/openstreetmap/function/CleanDuplicatePoints.java Fixed Show fixed Hide fixed

baremaps-core/src/test/java/org/apache/baremaps/openstreetmap/OsmTestRunner.java Fixed Show fixed Hide fixed

baremaps-core/src/test/java/org/apache/baremaps/openstreetmap/OsmTestRunner.java Fixed Show fixed Hide fixed

...maps-core/src/main/java/org/apache/baremaps/openstreetmap/function/CleanDuplicatePoints.java Fixed Show fixed Hide fixed

baremaps-core/src/test/java/org/apache/baremaps/openstreetmap/OsmTestRunner.java Fixed Show fixed Hide fixed

baremaps-core/src/test/java/org/apache/baremaps/openstreetmap/OsmTestRunner.java Fixed Show fixed Hide fixed

bchapuis added 3 commits

December 20, 2023 15:12


          Fix self intersecting geometries

ca53088


          Make relation geometry builder pass all the tests

6b4ed98


          Keep only grid test of osm-testdata

84625b5

github-advanced-security bot found potential problems

View reviewed changes

baremaps-core/src/test/java/org/apache/baremaps/openstreetmap/OsmTestData.java

+                    try {
+                      Files.lines(path).forEach(line -> {
+                        var needle = line.indexOf(' ');
+                        var id = Long.parseLong(line.substring(0, needle).strip());

Check notice

Code scanning / CodeQL

Missing catch of NumberFormatException Note test

Potential uncaught 'java.lang.NumberFormatException'.

...s-core/src/main/java/org/apache/baremaps/openstreetmap/function/RelationGeometryBuilder.java Fixed Show fixed Hide fixed

baremaps-core/src/test/java/org/apache/baremaps/openstreetmap/OsmTestData.java

+                  }
+                }
+                private class OsmTest implements Comparable<OsmTest> {

Check notice

Code scanning / CodeQL

Inner class could be static Note test

OsmTest should be made static, since the enclosing instance is not used.

baremaps-core/src/test/java/org/apache/baremaps/openstreetmap/OsmTestData.java Fixed Show fixed Hide fixed

baremaps-core/src/main/java/org/apache/baremaps/utils/GeometryUtils.java Fixed Show fixed Hide fixed

baremaps-core/src/main/java/org/apache/baremaps/utils/GeometryUtils.java Fixed Show fixed Hide fixed

baremaps-core/src/test/java/org/apache/baremaps/openstreetmap/OsmTestData.java

+                  }
+                }
+                private class OsmTest implements Comparable<OsmTest> {

Check warning

Code scanning / CodeQL

Inconsistent compareTo Warning test

This class declares

compareTo

but inherits equals; the two could be inconsistent.


          Refactor the relation geometry builder and improve tests

c1eda1c

bchapuis force-pushed the osm-test branch from aa52bc9 to c1eda1c Compare

January 1, 2024 18:40


          Remove unused code

13579c0

bchapuis force-pushed the osm-test branch from 6b8b22f to dbd846c Compare

January 1, 2024 19:01

github-advanced-security bot found potential problems

View reviewed changes

baremaps-core/src/test/java/org/apache/baremaps/openstreetmap/OsmTestData.java

+                        && multiPolygon.getNumGeometries() == 1) {
+                      testGeometry = multiPolygon.getGeometryN(0);
+                    }
+                    if (!testGeometry.isValid()) {

Check warning

Code scanning / CodeQL

Dereferenced variable may be null Warning test

Variable

testGeometry

may be null at this access because of

this

assignment.

bchapuis force-pushed the osm-test branch from dbd846c to 3f70c03 Compare

January 1, 2024 19:09


          Activate tests for the pbf reader

dc24319

bchapuis force-pushed the osm-test branch from 3f70c03 to dc24319 Compare

January 1, 2024 19:10

bchapuis marked this pull request as ready for review

January 1, 2024 21:36

bchapuis added 4 commits

January 2, 2024 10:30


          Add predicate logic to the node, way, and relation geometry builders

29a8183


          Set empty multipolygons instead of points

e87b033


          Move the predicate logic in the entity geometry builder

4fcfd24


          Indicate the source of osm-testdata

9a9f36f

sonarqubecloud bot commented Jan 2, 2024

Quality Gate passed

The SonarCloud Quality Gate passed, but some issues were introduced.

11 New issues
0 Security Hotspots
No data about Coverage
0.0% Duplication on New Code

See analysis details on SonarCloud

bchapuis merged commit 8ea446a into main

9 checks passed

bchapuis deleted the osm-test branch

January 2, 2024 11:00

bchapuis mentioned this pull request

Replace the osm files by osm-testdata #815

Closed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet