This is an automated email from the ASF dual-hosted git repository.
bchapuis pushed a change to branch raster-processing
in repository https://gitbox.apache.org/repos/asf/incubator-baremaps.git
omit 38b70feb Compute hillshades and contour
omit d30b08b2 Add hillshade and isolines algorithms
omit 545144e8 Format code
omit 75eedb61 use double instead of float values
omit 7e927a48 Fix minor formatting issues
omit ef76b7dc Port the MARTINI algorithm to java
add 1ee41570 Fix some issues detected by sonar (#867)
add 607861f1 Fix some issues detected by sonar (#868)
add c259a2d7 Fix some issues detected by sonar (#869)
add 47b39228 Fix some issues detected by sonar (#870)
add fc64ee17 Fix some issues detected by sonar (#873)
add 375d0a3c Add missing lang attribute to html files (#874)
add 0f29daf6 Prevent zip slip and path injection (#875)
add 7de2b147 Add mandatory html tags (#876)
add 2cf01119 Fix some issues detected by sonar (#877)
add 00ec04d7 Bugfix when key is out of Boundary for MemoryAlignedDataMap
(#880)
add 8716d535 Performance improvement (#882)
add 933ca83e Add a flatgeobuf submodule (#881)
add 091a0e98 Fix NoSuchFileException in IP to location example (#883)
add acebe4ca Port the MARTINI algorithm to java
add b034bf28 Fix minor formatting issues
add a24f8987 use double instead of float values
add 6104fb9a Format code
add ebc0f437 Add hillshade and isolines algorithms
add 4eb2d23e Compute hillshades and contour
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (38b70feb)
\
N -- N -- N refs/heads/raster-processing (4eb2d23e)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
baremaps-cli/pom.xml | 4 +-
baremaps-cli/src/license/override.properties | 1 -
.../java/org/apache/baremaps/cli/Baremaps.java | 19 +-
.../org/apache/baremaps/cli/BaremapsException.java | 23 +-
.../org/apache/baremaps/cli/database/Database.java | 5 +-
.../apache/baremaps/cli/database/ExecuteSql.java | 5 +-
.../apache/baremaps/cli/database/ImportOsm.java | 5 +-
.../apache/baremaps/cli/database/UpdateOsm.java | 5 +-
.../org/apache/baremaps/cli/geocoder/Geocoder.java | 8 +-
.../org/apache/baremaps/cli/geocoder/Search.java | 9 +-
.../org/apache/baremaps/cli/geocoder/Serve.java | 9 +-
.../java/org/apache/baremaps/cli/iploc/IpLoc.java | 7 +-
.../java/org/apache/baremaps/cli/iploc/Serve.java | 5 +-
.../main/java/org/apache/baremaps/cli/map/Dev.java | 10 +-
.../java/org/apache/baremaps/cli/map/Export.java | 7 +-
.../java/org/apache/baremaps/cli/map/Init.java | 5 +-
.../java/org/apache/baremaps/cli/map/MBTiles.java | 71 +--
.../main/java/org/apache/baremaps/cli/map/Map.java | 9 +-
.../java/org/apache/baremaps/cli/map/Serve.java | 81 ++--
.../org/apache/baremaps/cli/raster/HillShade.java | 343 +++++++-------
.../org/apache/baremaps/cli/workflow/Execute.java | 5 +-
.../org/apache/baremaps/cli/workflow/Init.java | 5 +-
.../org/apache/baremaps/cli/workflow/Workflow.java | 7 +-
baremaps-core/pom.xml | 8 +-
.../org/apache/baremaps/config/ConfigReader.java | 5 +-
.../org/apache/baremaps/database/DiffService.java | 18 +-
.../apache/baremaps/database/copy/CopyWriter.java | 147 +++---
.../baremaps/database/copy/JsonbValueHandler.java | 14 +-
.../database/function/ChangeElementsImporter.java | 7 +-
.../database/function/CopyChangeImporter.java | 66 ++-
.../database/function/PutChangeImporter.java | 63 ++-
.../database/metadata/DatabaseMetadata.java | 140 ++++--
.../baremaps/database/postgres/CoordinateMap.java | 2 +-
.../database/postgres/HeaderRepository.java | 45 +-
.../baremaps/database/postgres/NodeRepository.java | 33 +-
.../database/postgres/RelationRepository.java | 46 +-
.../baremaps/database/postgres/WayRepository.java | 26 +-
.../baremaps/geocoder/GeonamesDocumentMapper.java | 50 +-
.../{GeonamesRecord.java => GeonamesEntry.java} | 6 +-
.../baremaps/geocoder/GeonamesQueryBuilder.java | 6 +-
.../apache/baremaps/geocoder/GeonamesReader.java | 8 +-
.../baremaps/geocoderosm/GeocoderOsmQuery.java | 4 +-
.../apache/baremaps/iploc/InetAddressUtils.java | 4 +
.../org/apache/baremaps/iploc/IpLocMapper.java | 3 +-
.../org/apache/baremaps/iploc/IpLocRepository.java | 52 ++-
.../java/org/apache/baremaps/iploc/NicReader.java | 4 +-
.../storage/flatgeobuf/FlatGeoBufDataTable.java | 220 ++++-----
.../flatgeobuf/FlatGeoBufTypeConversion.java | 224 +++------
.../storage/geopackage/GeoPackageDataTable.java | 39 +-
.../storage/geoparquet/GeoParquetDataTable.java | 6 +-
.../storage/postgres/PostgresDataStore.java | 40 +-
.../storage/postgres/PostgresDataTable.java | 28 +-
.../storage/postgres/PostgresTypeConversion.java | 7 +-
.../storage/shapefile/ShapefileDataTable.java | 16 +-
.../shapefile/internal/CommonByteReader.java | 13 +-
.../storage/shapefile/internal/DBaseDataType.java | 30 +-
.../shapefile/internal/DbaseByteReader.java | 36 +-
.../shapefile/internal/ShapefileByteReader.java | 100 ++--
.../shapefile/internal/ShapefileGeometryType.java | 30 +-
.../shapefile/internal/ShapefileInputStream.java | 9 +-
.../shapefile/internal/ShapefileReader.java | 3 +-
.../org/apache/baremaps/tilestore/TileCoord.java | 25 +-
.../baremaps/tilestore/mbtiles/MBTilesStore.java | 24 +-
.../baremaps/tilestore/pmtiles/PMTilesStore.java | 4 +-
.../tilestore/postgres/PostgresQueryGenerator.java | 17 +-
.../tilestore/postgres/PostgresTileStore.java | 7 +-
.../org/apache/baremaps/utils/Compression.java | 20 +-
.../apache/baremaps/utils/ObjectMapperUtils.java | 14 +-
.../org/apache/baremaps/utils/PostgresUtils.java | 17 -
.../java/org/apache/baremaps/workflow/Task.java | 1 +
.../apache/baremaps/workflow/WorkflowExecutor.java | 4 -
.../baremaps/workflow/tasks/CleanContextCache.java | 4 +-
.../baremaps/workflow/tasks/CleanContextData.java | 4 +-
.../workflow/tasks/CreateGeonamesIndex.java | 10 +-
.../baremaps/workflow/tasks/CreateIplocIndex.java | 4 +-
.../baremaps/workflow/tasks/DecompressFile.java | 101 ++--
.../apache/baremaps/workflow/tasks/ExecuteSql.java | 1 +
.../baremaps/workflow/tasks/ExportVectorTiles.java | 47 +-
.../workflow/tasks/ImportDaylightFeatures.java | 61 +--
.../workflow/tasks/ImportDaylightTranslations.java | 65 +--
.../baremaps/workflow/tasks/ImportGeoPackage.java | 1 +
.../baremaps/workflow/tasks/ImportOsmPbf.java | 13 +-
.../baremaps/workflow/tasks/UpdateOsmDatabase.java | 24 +-
.../org/apache/baremaps/calcite/CalciteTest.java | 5 +-
.../org/apache/baremaps/config/TileSetTest.java | 8 +-
.../baremaps/database/PostgresContainerTest.java | 4 +-
.../database/postgres/HeaderRepositoryTest.java | 19 +-
.../database/postgres/NodeRepositoryTest.java | 10 +-
.../database/postgres/RelationRepositoryTest.java | 14 +-
.../database/postgres/WayRepositoryTest.java | 14 +-
.../baremaps/geocoder/GeonamesIndexTest.java | 4 +-
.../baremaps/geocoder/GeonamesReaderTest.java | 6 +-
.../apache/baremaps/geocoderosm/OSMIndexTest.java | 8 +-
.../org/apache/baremaps/iploc/IpLocObjectTest.java | 4 +-
.../flatgeobuf/FlatGeoBufDataTableTest.java | 4 +-
.../geopackage/GeoPackageDataStoreTest.java | 4 +-
.../geopackage/GeoPackageToPostgresTest.java | 2 +-
.../baremaps/tilestore/TileCoordIteratorTest.java | 10 +-
.../postgres/PostgresQueryGeneratorTest.java | 3 +-
.../baremaps/utils/ProjectionTransformerTest.java | 2 +-
.../org/apache/baremaps/workflow/WorkflowTest.java | 17 +-
.../workflow/tasks/ExecuteCommandTest.java | 2 +-
.../workflow/tasks/ExecuteSqlIntegrationTest.java | 1 +
.../workflow/tasks/ExecuteSqlScriptTest.java | 1 +
.../workflow/tasks/ImportGeoPackageTest.java | 7 +-
.../workflow/tasks/ImportUpdateSampleTest.java | 12 +-
.../baremaps/data/algorithm/BinarySearch.java | 4 +
.../baremaps/data/algorithm/ExternalMergeSort.java | 24 +-
.../apache/baremaps/data/algorithm/Hilbert.java | 6 +-
.../apache/baremaps/data/calcite/SqlDataTable.java | 6 +-
.../baremaps/data/calcite/SqlTypeConversion.java | 4 +
.../baremaps/data/collection/AppendOnlyLog.java | 15 +-
.../baremaps/data/collection/DataConversions.java | 53 ++-
.../apache/baremaps/data/collection/DataList.java | 4 +-
.../data/collection/FixedSizeDataList.java | 4 +-
.../data/collection/MemoryAlignedDataList.java | 7 +-
.../data/collection/MemoryAlignedDataMap.java | 33 +-
.../org/apache/baremaps/data/storage/DataRow.java | 2 +-
.../apache/baremaps/data/storage/DataRowImpl.java | 2 +-
.../data/storage/DataTableGeometryMapper.java | 4 +-
.../baremaps/data/storage/DataTableMapper.java | 3 +-
.../apache/baremaps/data/type/BooleanDataType.java | 4 +-
.../baremaps/data/type/FixedSizeDataType.java | 2 +-
.../data/type/GeometryCollectionDataType.java | 2 +-
.../baremaps/data/type/GeometryDataType.java | 9 +-
.../baremaps/data/type/MemoryAlignedDataType.java | 2 +-
.../org/apache/baremaps/data/type/RowDataType.java | 2 +-
.../baremaps/data/type/SmallIntegerDataType.java | 4 +-
.../org/apache/baremaps/data/type/WKBDataType.java | 14 +-
.../org/apache/baremaps/data/util/FileUtils.java | 4 +
.../baremaps/data/util/MappedByteBufferUtils.java | 9 +-
.../baremaps/data/algorithm/UnionStreamTest.java | 8 +-
.../data/collection/IndexedDataMapTest.java | 192 ++++++++
.../data/collection/MemoryAlignedDataMapTest.java | 182 ++++++++
.../baremaps/data/sort/ExternalMergeSortTest.java | 12 +-
.../baremaps/data/type/DataTypeProvider.java | 2 -
{baremaps-pmtiles => baremaps-flatgeobuf}/pom.xml | 11 +-
baremaps-flatgeobuf/src/main/fbs/feature.fbs | 32 ++
baremaps-flatgeobuf/src/main/fbs/header.fbs | 94 ++++
.../org/apache/baremaps/flatgeobuf/FlatGeoBuf.java | 143 ++++++
.../baremaps/flatgeobuf/FlatGeoBufReader.java | 403 ++++++++++++++++
.../baremaps/flatgeobuf/FlatGeoBufWriter.java | 292 ++++++++++++
.../baremaps/flatgeobuf/GeometryConversions.java | 454 ++++++++++++++++++
.../apache/baremaps/flatgeobuf/PackedRTree.java | 508 +++++++++++++++++++++
.../baremaps/flatgeobuf/generated/Column.java | 233 ++++++++++
.../baremaps/flatgeobuf/generated/ColumnType.java | 46 ++
.../apache/baremaps/flatgeobuf/generated/Crs.java | 185 ++++++++
.../baremaps/flatgeobuf/generated/Feature.java | 188 ++++++++
.../baremaps/flatgeobuf/generated/Geometry.java | 397 ++++++++++++++++
.../flatgeobuf/generated/GeometryType.java | 51 +++
.../baremaps/flatgeobuf/generated/Header.java | 340 ++++++++++++++
.../apache/baremaps/flatgeobuf/FlatGeoBufTest.java | 207 +++++++++
.../geoparquet/data/GeoParquetGroupImpl.java | 15 +-
.../data/GeoParquetGroupRecordConverter.java | 6 +-
.../geoparquet/data/GeoParquetMaterializer.java | 2 +-
.../geoparquet/hadoop/GeoParquetWriter.java | 12 +-
.../baremaps/geoparquet/GeoParquetReaderTest.java | 25 +-
.../baremaps/maplibre/expression/Expressions.java | 26 +-
.../org/apache/baremaps/maplibre/style/Style.java | 12 +-
.../apache/baremaps/maplibre/style/StyleLayer.java | 12 +-
.../baremaps/maplibre/tilejson/TileJSON.java | 17 +-
.../apache/baremaps/maplibre/tileset/Database.java | 4 +-
.../apache/baremaps/maplibre/tileset/Tileset.java | 23 +-
.../maplibre/vectortile/VectorTileDecoder.java | 12 +-
.../maplibre/vectortile/VectorTileEncoder.java | 48 +-
.../maplibre/vectortile/VectorTileFunctions.java | 9 +-
.../maplibre/expression/ExpressionsTest.java | 51 +--
.../maplibre/vectortile/VectorTileDecoderTest.java | 14 +-
.../maplibre/vectortile/VectorTileEncoderTest.java | 14 +-
.../vectortile/VectorTileFunctionsTest.java | 1 -
.../maplibre/vectortile/VectorTileTest.java | 6 +-
.../maplibre/vectortile/VectorTileViewer.java | 5 +-
.../function/ChangeEntitiesHandler.java | 2 +-
.../function/EntityToGeometryMapper.java | 4 +-
.../function/ProjectionTransformer.java | 4 +-
.../function/RelationMultiPolygonBuilder.java | 17 +-
.../openstreetmap/function/WayGeometryBuilder.java | 1 +
.../apache/baremaps/openstreetmap/model/Bound.java | 91 +---
.../baremaps/openstreetmap/model/Change.java | 42 +-
.../baremaps/openstreetmap/model/Element.java | 4 +-
.../baremaps/openstreetmap/model/Header.java | 110 +----
.../baremaps/openstreetmap/model/Member.java | 96 +---
.../apache/baremaps/openstreetmap/model/State.java | 34 +-
.../apache/baremaps/openstreetmap/model/User.java | 54 +--
.../baremaps/openstreetmap/state/StateReader.java | 98 ++--
.../openstreetmap/stream/BatchedSpliterator.java | 2 +-
.../openstreetmap/stream/ConsumerUtils.java | 12 +-
.../baremaps/openstreetmap/stream/StreamUtils.java | 4 +
.../openstreetmap/stream/SupplierUtils.java | 8 +-
.../baremaps/openstreetmap/utils/CRSUtils.java | 4 +
.../openstreetmap/utils/GeometryUtils.java | 2 -
.../openstreetmap/xml/XmlChangeSpliterator.java | 41 +-
.../openstreetmap/xml/XmlEntitySpliterator.java | 15 +-
.../{OsmTestData.java => OsmDataTest.java} | 24 +-
.../baremaps/openstreetmap/OsmSampleTest.java | 14 +-
.../openstreetmap/state/StateReaderTest.java | 2 +-
.../stream/BatchedSpliteratorTest.java | 4 +-
.../openstreetmap/stream/StreamUtilsTest.java | 11 +-
.../xml/XmlChangeSpliteratorTest.java | 12 +-
...DataType.java => XmlEntitySpliteratorTest.java} | 6 +-
.../org/apache/baremaps/pmtiles/Compression.java | 40 +-
.../java/org/apache/baremaps/pmtiles/Entry.java | 2 +-
.../java/org/apache/baremaps/pmtiles/Header.java | 3 +-
.../org/apache/baremaps/pmtiles/PMTilesReader.java | 31 +-
.../pmtiles/{PMTiles.java => PMTilesUtils.java} | 52 ++-
.../org/apache/baremaps/pmtiles/PMTilesWriter.java | 30 +-
.../java/org/apache/baremaps/pmtiles/TileType.java | 14 +-
.../{PMTilesTest.java => PMTilesUtilsTest.java} | 155 ++++---
.../org/apache/baremaps/raster/ImageUtils.java | 34 +-
.../apache/baremaps/raster/contour/IsoLines.java | 3 +-
.../baremaps/raster/hillshade/HillShade.java | 14 +-
.../baremaps/raster/contour/IsoLineRenderer.java | 1 -
.../baremaps/raster/contour/IsoLinesTest.java | 1 -
.../raster/hillshade/HillShadeRenderer.java | 2 -
.../baremaps/raster/hillshade/HillShadeTest.java | 1 -
.../baremaps/raster/martini/MartiniTest.java | 1 -
baremaps-renderer/assets/report-template.html | 2 +-
.../org/apache/baremaps/server/ChangeResource.java | 1 +
.../apache/baremaps/server/GeocoderResource.java | 3 +-
.../org/apache/baremaps/server/IpLocResource.java | 3 +-
.../org/apache/baremaps/server/SearchResource.java | 2 +-
.../src/main/resources/geocoder/index.html | 8 +-
.../src/main/resources/iploc/index.html | 8 +-
.../src/main/resources/static/server.html | 14 +-
.../src/main/resources/static/viewer.html | 20 +-
baremaps-testing/pom.xml | 6 +
.../baremaps/testing/GeometryAssertions.java | 14 +-
.../org/apache/baremaps/testing/TestFiles.java | 4 +
basemap/index.html | 2 +-
examples/ip-to-location/workflow.js | 2 +-
examples/openstreetmap/index.html | 2 +-
pom.xml | 19 +-
scripts/generate-flatgeobuf.sh | 6 +
233 files changed, 6184 insertions(+), 2386 deletions(-)
copy
baremaps-core/src/main/java/org/apache/baremaps/workflow/WorkflowException.java
=> baremaps-cli/src/main/java/org/apache/baremaps/cli/BaremapsException.java
(64%)
rename
baremaps-core/src/main/java/org/apache/baremaps/geocoder/{GeonamesRecord.java
=> GeonamesEntry.java} (98%)
create mode 100644
baremaps-data/src/test/java/org/apache/baremaps/data/collection/IndexedDataMapTest.java
create mode 100644
baremaps-data/src/test/java/org/apache/baremaps/data/collection/MemoryAlignedDataMapTest.java
copy {baremaps-pmtiles => baremaps-flatgeobuf}/pom.xml (68%)
create mode 100644 baremaps-flatgeobuf/src/main/fbs/feature.fbs
create mode 100644 baremaps-flatgeobuf/src/main/fbs/header.fbs
create mode 100644
baremaps-flatgeobuf/src/main/java/org/apache/baremaps/flatgeobuf/FlatGeoBuf.java
create mode 100644
baremaps-flatgeobuf/src/main/java/org/apache/baremaps/flatgeobuf/FlatGeoBufReader.java
create mode 100644
baremaps-flatgeobuf/src/main/java/org/apache/baremaps/flatgeobuf/FlatGeoBufWriter.java
create mode 100644
baremaps-flatgeobuf/src/main/java/org/apache/baremaps/flatgeobuf/GeometryConversions.java
create mode 100644
baremaps-flatgeobuf/src/main/java/org/apache/baremaps/flatgeobuf/PackedRTree.java
create mode 100644
baremaps-flatgeobuf/src/main/java/org/apache/baremaps/flatgeobuf/generated/Column.java
create mode 100644
baremaps-flatgeobuf/src/main/java/org/apache/baremaps/flatgeobuf/generated/ColumnType.java
create mode 100644
baremaps-flatgeobuf/src/main/java/org/apache/baremaps/flatgeobuf/generated/Crs.java
create mode 100644
baremaps-flatgeobuf/src/main/java/org/apache/baremaps/flatgeobuf/generated/Feature.java
create mode 100644
baremaps-flatgeobuf/src/main/java/org/apache/baremaps/flatgeobuf/generated/Geometry.java
create mode 100644
baremaps-flatgeobuf/src/main/java/org/apache/baremaps/flatgeobuf/generated/GeometryType.java
create mode 100644
baremaps-flatgeobuf/src/main/java/org/apache/baremaps/flatgeobuf/generated/Header.java
create mode 100644
baremaps-flatgeobuf/src/test/java/org/apache/baremaps/flatgeobuf/FlatGeoBufTest.java
rename
baremaps-openstreetmap/src/test/java/org/apache/baremaps/openstreetmap/{OsmTestData.java
=> OsmDataTest.java} (93%)
rename
baremaps-openstreetmap/src/test/java/org/apache/baremaps/openstreetmap/xml/{XmlEntitySpliteratorTestDataType.java
=> XmlEntitySpliteratorTest.java} (91%)
rename
baremaps-pmtiles/src/main/java/org/apache/baremaps/pmtiles/{PMTiles.java =>
PMTilesUtils.java} (88%)
rename
baremaps-pmtiles/src/test/java/org/apache/baremaps/pmtiles/{PMTilesTest.java =>
PMTilesUtilsTest.java} (55%)
create mode 100755 scripts/generate-flatgeobuf.sh
