This is an automated email from the ASF dual-hosted git repository.
bchapuis pushed a change to branch modularization
in repository https://gitbox.apache.org/repos/asf/incubator-baremaps.git
from 9356ef3f Improve the openstreetmap api
add 5b2ec375 Improve structure of core and testing modules
add e043a06f Refactor and simplify database package
No new revisions were added by this update.
Summary of changes:
.../{openstreetmap => database}/DiffService.java | 6 +-
.../{postgres => database}/copy/CopyWriter.java | 2 +-
.../copy/GeometryValueHandler.java | 2 +-
.../function}/BlockImporter.java | 3 +-
.../function}/ChangeElementsImporter.java | 4 +-
.../function}/CopyChangeImporter.java | 4 +-
.../function}/PutChangeImporter.java | 4 +-
.../metadata/ColumnResult.java | 2 +-
.../metadata/DatabaseMetadata.java | 2 +-
.../metadata/PrimaryKeyResult.java | 2 +-
.../metadata/TableMetadata.java | 2 +-
.../metadata/TableResult.java | 2 +-
.../postgres/CoordinateMap.java} | 18 ++---
.../postgres/HeaderRepository.java} | 26 ++++----
.../postgres/JsonbMapper.java} | 6 +-
.../postgres/NodeRepository.java} | 20 +++---
.../postgres/PostgresMap.java | 4 +-
.../postgres/ReferenceMap.java} | 14 ++--
.../postgres/RelationRepository.java} | 18 +++--
.../postgres}/Repository.java | 2 +-
.../postgres}/RepositoryException.java | 2 +-
.../postgres/ResultSetIterator.java} | 6 +-
.../postgres/WayRepository.java} | 20 +++---
.../function/OpenstreetmapDocumentMapper.java | 76 ----------------------
.../openstreetmap/repository/HeaderRepository.java | 41 ------------
.../openstreetmap/repository/NodeRepository.java | 27 --------
.../repository/RelationRepository.java | 27 --------
.../openstreetmap/repository/WayRepository.java | 27 --------
.../storage/postgres/PostgresDataSchema.java | 8 +--
.../tilestore/postgres/PostgresQueryGenerator.java | 4 +-
.../workflow/tasks/ImportDaylightFeatures.java | 12 ++--
.../workflow/tasks/ImportDaylightTranslations.java | 12 ++--
.../baremaps/workflow/tasks/ImportOsmOsc.java | 10 +--
.../baremaps/workflow/tasks/ImportOsmPbf.java | 16 ++---
.../baremaps/workflow/tasks/UpdateOsmDatabase.java | 21 +++---
.../org/apache/baremaps/calcite/CalciteTest.java | 2 -
.../apache/baremaps/config/ConfigReaderTest.java | 2 +-
.../baremaps/{maplibre => config}/TileSetTest.java | 3 +-
.../PostgresContainerTest.java | 2 +-
.../metadata/PostgresMetadataTest.java | 4 +-
.../postgres/HeaderRepositoryTest.java} | 15 ++---
.../postgres/NodeRepositoryTest.java} | 11 ++--
.../postgres/PostgresRepositoryTest.java | 4 +-
.../postgres/RelationRepositoryTest.java} | 11 ++--
.../postgres/WayRepositoryTest.java} | 11 ++--
.../repository/BlockImporterTest.java | 28 ++++----
.../repository/Constants.java | 2 +-
.../baremaps/geocoder/GeonamesIndexTest.java | 2 +-
.../baremaps/geocoder/GeonamesReaderTest.java | 2 +-
.../apache/baremaps/geocoderosm/OSMIndexTest.java | 2 +-
.../org/apache/baremaps/iploc/IpLocObjectTest.java | 2 +-
.../java/org/apache/baremaps/iploc/NicData.java | 2 +-
.../apache/baremaps/postgres/TestContainers.java | 23 -------
.../org/apache/baremaps/storage/MockDataTable.java | 2 +-
.../flatgeobuf/FlatGeoBufDataTableTest.java | 2 +-
.../geopackage/GeoPackageDataSchemaTest.java | 2 +-
.../geopackage/GeoPackageToPostgresTest.java | 4 +-
.../storage/postgres/PostgresDataSchemaTest.java | 2 +-
.../storage/postgres/PostgresDataTableTest.java | 4 +-
.../postgres/PostgresQueryGeneratorTest.java | 2 +-
.../org/apache/baremaps/workflow/WorkflowTest.java | 2 +-
.../workflow/tasks/DecompressFileTest.java | 2 +-
.../workflow/tasks/ExecuteSqlIntegrationTest.java | 4 +-
.../workflow/tasks/ExecuteSqlScriptTest.java | 4 +-
.../workflow/tasks/ImportGeoPackageTest.java | 4 +-
.../workflow/tasks/ImportUpdateSampleTest.java | 36 +++++-----
.../function/EntityGeometryBuilder.java | 5 +-
.../function/EntityProjectionTransformer.java | 3 +-
.../baremaps/openstreetmap/OsmSampleTest.java | 7 +-
.../apache/baremaps/openstreetmap/OsmTestData.java | 2 +-
.../xml/XmlChangeSpliteratorTest.java | 6 +-
.../xml/XmlEntitySpliteratorTestDataType.java | 6 +-
.../org/apache/baremaps/pmtiles/PMTilesTest.java | 2 +-
.../apache/baremaps/openstreetmap/TestFiles.java | 45 -------------
.../baremaps/testing/GeometryAssertions.java | 0
.../OsmSample.java => testing/TestFiles.java} | 36 ++++++++--
76 files changed, 256 insertions(+), 506 deletions(-)
rename baremaps-core/src/main/java/org/apache/baremaps/{openstreetmap =>
database}/DiffService.java (97%)
rename baremaps-core/src/main/java/org/apache/baremaps/{postgres =>
database}/copy/CopyWriter.java (99%)
rename baremaps-core/src/main/java/org/apache/baremaps/{postgres =>
database}/copy/GeometryValueHandler.java (97%)
rename
baremaps-core/src/main/java/org/apache/baremaps/{openstreetmap/repository =>
database/function}/BlockImporter.java (95%)
rename
baremaps-core/src/main/java/org/apache/baremaps/{openstreetmap/repository =>
database/function}/ChangeElementsImporter.java (93%)
rename
baremaps-core/src/main/java/org/apache/baremaps/{openstreetmap/repository =>
database/function}/CopyChangeImporter.java (95%)
rename
baremaps-core/src/main/java/org/apache/baremaps/{openstreetmap/repository =>
database/function}/PutChangeImporter.java (95%)
rename baremaps-core/src/main/java/org/apache/baremaps/{postgres =>
database}/metadata/ColumnResult.java (96%)
rename baremaps-core/src/main/java/org/apache/baremaps/{postgres =>
database}/metadata/DatabaseMetadata.java (99%)
rename baremaps-core/src/main/java/org/apache/baremaps/{postgres =>
database}/metadata/PrimaryKeyResult.java (95%)
rename baremaps-core/src/main/java/org/apache/baremaps/{postgres =>
database}/metadata/TableMetadata.java (95%)
rename baremaps-core/src/main/java/org/apache/baremaps/{postgres =>
database}/metadata/TableResult.java (95%)
rename
baremaps-core/src/main/java/org/apache/baremaps/{openstreetmap/postgres/PostgresCoordinateMap.java
=> database/postgres/CoordinateMap.java} (93%)
rename
baremaps-core/src/main/java/org/apache/baremaps/{openstreetmap/postgres/PostgresHeaderRepository.java
=> database/postgres/HeaderRepository.java} (95%)
rename
baremaps-core/src/main/java/org/apache/baremaps/{openstreetmap/postgres/PostgresJsonbMapper.java
=> database/postgres/JsonbMapper.java} (94%)
rename
baremaps-core/src/main/java/org/apache/baremaps/{openstreetmap/postgres/PostgresNodeRepository.java
=> database/postgres/NodeRepository.java} (93%)
rename baremaps-core/src/main/java/org/apache/baremaps/{openstreetmap =>
database}/postgres/PostgresMap.java (96%)
rename
baremaps-core/src/main/java/org/apache/baremaps/{openstreetmap/postgres/PostgresReferenceMap.java
=> database/postgres/ReferenceMap.java} (94%)
rename
baremaps-core/src/main/java/org/apache/baremaps/{openstreetmap/postgres/PostgresRelationRepository.java
=> database/postgres/RelationRepository.java} (94%)
rename
baremaps-core/src/main/java/org/apache/baremaps/{openstreetmap/repository =>
database/postgres}/Repository.java (98%)
rename
baremaps-core/src/main/java/org/apache/baremaps/{openstreetmap/repository =>
database/postgres}/RepositoryException.java (96%)
rename
baremaps-core/src/main/java/org/apache/baremaps/{openstreetmap/postgres/PostgresIterator.java
=> database/postgres/ResultSetIterator.java} (89%)
rename
baremaps-core/src/main/java/org/apache/baremaps/{openstreetmap/postgres/PostgresWayRepository.java
=> database/postgres/WayRepository.java} (93%)
delete mode 100644
baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/function/OpenstreetmapDocumentMapper.java
delete mode 100644
baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/repository/HeaderRepository.java
delete mode 100644
baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/repository/NodeRepository.java
delete mode 100644
baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/repository/RelationRepository.java
delete mode 100644
baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/repository/WayRepository.java
rename baremaps-core/src/test/java/org/apache/baremaps/{maplibre =>
config}/TileSetTest.java (97%)
rename baremaps-core/src/test/java/org/apache/baremaps/{testing =>
database}/PostgresContainerTest.java (98%)
rename baremaps-core/src/test/java/org/apache/baremaps/{postgres =>
database}/metadata/PostgresMetadataTest.java (95%)
rename
baremaps-core/src/test/java/org/apache/baremaps/{openstreetmap/postgres/PostgresHeaderRepositoryTest.java
=> database/postgres/HeaderRepositoryTest.java} (86%)
rename
baremaps-core/src/test/java/org/apache/baremaps/{openstreetmap/postgres/PostgresNodeRepositoryTest.java
=> database/postgres/NodeRepositoryTest.java} (89%)
rename baremaps-core/src/test/java/org/apache/baremaps/{openstreetmap =>
database}/postgres/PostgresRepositoryTest.java (93%)
rename
baremaps-core/src/test/java/org/apache/baremaps/{openstreetmap/postgres/PostgresRelationRepositoryTest.java
=> database/postgres/RelationRepositoryTest.java} (89%)
rename
baremaps-core/src/test/java/org/apache/baremaps/{openstreetmap/postgres/PostgresWayRepositoryTest.java
=> database/postgres/WayRepositoryTest.java} (89%)
rename baremaps-core/src/test/java/org/apache/baremaps/{openstreetmap =>
database}/repository/BlockImporterTest.java (72%)
rename baremaps-core/src/test/java/org/apache/baremaps/{openstreetmap =>
database}/repository/Constants.java (98%)
delete mode 100644
baremaps-core/src/test/java/org/apache/baremaps/postgres/TestContainers.java
delete mode 100644
baremaps-testing/src/main/java/org/apache/baremaps/openstreetmap/TestFiles.java
rename {baremaps-core/src/test =>
baremaps-testing/src/main}/java/org/apache/baremaps/testing/GeometryAssertions.java
(100%)
rename
baremaps-testing/src/main/java/org/apache/baremaps/{openstreetmap/OsmSample.java
=> testing/TestFiles.java} (90%)
