This is an automated email from the ASF dual-hosted git repository.
bchapuis pushed a change to branch pmtiles
in repository https://gitbox.apache.org/repos/asf/incubator-baremaps.git
omit 2bf080d6 Minor improvements
omit b2f99a34 Replace the Directories record by a class
omit d4505239 Implement run length and tile deduplication
omit 41af3186 Correctly set header and metadata
omit 5ad26c9c Add a minimalistic tile writer
omit 8c780a06 Refactor package and introduce a PMTilesReader class
omit b11c6c92 Fix unit tests
omit 7000b2be Port additional methods and tests
omit 48c14d8c Format code
omit ade0fab5 Implement header serialization and deserialization
omit 8c2a2460 Add pmtiles functions
add 961e4012 Move fonts and sprites to project's website (#796)
add d71e3245 Fix unzip task and add shaded relief workflow (#798)
add 1405103e Create inital workflow for daylight (#757)
add 88f35b8c Add leisure and improve low level zooms (#800)
add a6d7edb8 Add building extrusions (#788)
add c3cdfced Add support for openstreetmap changes (#801)
add ac8d8c80 Add documentation for the cache flag (#803)
add 70f6d5f4 Handle no arguments in the init command (#804)
add 5699ebe1 Add pmtiles functions
add 7e798964 Implement header serialization and deserialization
add 532bffc5 Format code
add 434db676 Port additional methods and tests
add 7fb0ef14 Fix unit tests
add 0fc98b79 Refactor package and introduce a PMTilesReader class
add 037cfdc0 Add a minimalistic tile writer
add b33e75fd Correctly set header and metadata
add f3eddf42 Implement run length and tile deduplication
add 7713fcfe Replace the Directories record by a class
add 4ec3f6d0 Minor improvements
add 2fc612de Improve export task and fix tileset
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 (2bf080d6)
\
N -- N -- N refs/heads/pmtiles (2fc612de)
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:
.run/basemap-dev.run.xml | 5 -
...iles.run.xml => basemap-export-mbtiles.run.xml} | 5 +-
...iles.run.xml => basemap-export-pmtiles.run.xml} | 5 +-
.run/basemap-mbtiles.run.xml | 10 -
.run/basemap-serve.run.xml | 5 -
.run/basemap-workflow.run.xml | 10 +-
...reate.run.xml => naturalearth-workflow.run.xml} | 2 +-
.run/openstreetmap-dev.run.xml | 10 -
.run/openstreetmap-export.run.xml | 5 -
.run/openstreetmap-serve.run.xml | 10 -
.run/openstreetmap-workflow.run.xml | 10 -
.run/simplification-workflow.run.xml | 5 -
.run/transformation-workflow.run.xml | 5 -
.run/workflow-execute.run.xml | 5 -
.run/workflow-init.run.xml | 5 -
LICENSE | 1 +
NOTICE | 7 +
.../org/apache/baremaps/cli/database/Database.java | 2 +-
.../{ImportOpenStreetMap.java => ImportOsm.java} | 11 +-
.../{UpdateOpenStreetMap.java => UpdateOsm.java} | 5 +-
.../main/java/org/apache/baremaps/cli/map/Dev.java | 3 +-
.../java/org/apache/baremaps/cli/map/Init.java | 4 +
.../java/org/apache/baremaps/cli/map/Serve.java | 5 +-
.../database/collection/DataCollectionAdapter.java | 2 +-
.../geocoderosm/GeocoderOsmDocumentMapper.java | 2 +-
.../apache/baremaps/openstreetmap/DiffService.java | 6 +-
.../function/ChangeEntitiesHandler.java | 2 +-
.../function/CoordinateMapBuilder.java | 2 +-
.../openstreetmap/function/GeometryMapBuilder.java | 2 +-
.../function/OpenstreetmapDocumentMapper.java | 2 +-
.../function/ReferenceMapBuilder.java | 2 +-
.../function/RelationGeometryBuilder.java | 4 +-
.../openstreetmap/function/WayGeometryBuilder.java | 2 +-
.../baremaps/openstreetmap/model/Element.java | 37 +-
.../apache/baremaps/openstreetmap/model/Node.java | 37 +-
.../baremaps/openstreetmap/model/Relation.java | 13 +-
.../apache/baremaps/openstreetmap/model/Way.java | 13 +-
.../postgres/PostgresCoordinateMap.java | 122 +++---
.../postgres/PostgresHeaderRepository.java | 28 +-
.../postgres/PostgresNodeRepository.java | 67 +--
.../postgres/PostgresReferenceMap.java | 117 +++---
.../postgres/PostgresRelationRepository.java | 51 ++-
.../postgres/PostgresWayRepository.java | 68 +--
.../repository/CopyChangeImporter.java | 110 +++++
...{ChangeImporter.java => PutChangeImporter.java} | 77 ++--
.../baremaps/openstreetmap/state/StateReader.java | 186 ++++++++-
.../openstreetmap/xml/XmlChangeSpliterator.java | 6 +-
.../storage/postgres/PostgresDataSchema.java | 9 +-
.../storage/shapefile/ShapefileDataTable.java | 7 +-
.../shapefile/internal/DbaseByteReader.java | 1 +
.../shapefile/internal/ShapefileByteReader.java | 21 +-
.../baremaps/tilestore/TileStoreException.java | 10 +
.../baremaps/tilestore/pmtiles/PMTilesStore.java | 45 +-
.../baremaps/tilestore/pmtiles/PMTilesWriter.java | 86 +++-
.../tilestore/postgres/PostgresQueryGenerator.java | 2 +-
.../tilestore/postgres/PostgresTileStore.java | 12 +-
.../org/apache/baremaps/utils/Compression.java | 59 +++
.../baremaps/utils/ProjectionTransformer.java | 5 +-
.../baremaps/vectortile/tileset/Tileset.java | 1 -
.../java/org/apache/baremaps/workflow/Task.java | 13 +-
.../apache/baremaps/workflow/WorkflowExecutor.java | 87 ++--
.../{UngzipFile.java => DecompressBZip2.java} | 25 +-
.../baremaps/workflow/tasks/DecompressFile.java | 141 +++++++
.../apache/baremaps/workflow/tasks/ExecuteSql.java | 10 +-
.../baremaps/workflow/tasks/ExportVectorTiles.java | 4 +-
.../workflow/tasks/ImportDaylightFeatures.java | 105 +++++
.../workflow/tasks/ImportDaylightTranslations.java | 108 +++++
...eocoderOpenStreetMap.java => ImportOsmOsc.java} | 99 ++---
...{ImportOpenStreetMap.java => ImportOsmPbf.java} | 43 +-
.../apache/baremaps/workflow/tasks/UnzipFile.java | 36 +-
...teOpenStreetMap.java => UpdateOsmDatabase.java} | 74 ++--
.../baremaps/database/calcite/CalciteTest.java | 1 +
.../baremaps/openstreetmap/OpenStreetMapTest.java | 2 +-
.../EntityDataTypeGeometryBuilderTest.java | 60 +--
.../geometry/RelationGeometryBuilderTest.java | 4 +-
.../postgres/PostgresNodeRepositoryTest.java | 14 +-
.../postgres/PostgresRelationRepositoryTest.java | 14 +-
.../postgres/PostgresWayRepositoryTest.java | 14 +-
.../openstreetmap/repository/Constants.java | 50 +--
.../state/StateReaderTest.java} | 19 +-
.../org/apache/baremaps/testing/TestFiles.java | 10 +
.../apache/baremaps/workflow/ObjectMapperTest.java | 12 +-
.../org/apache/baremaps/workflow/WorkflowTest.java | 7 +-
.../workflow/tasks/DecompressFileTest.java | 68 +++
.../workflow/tasks/ExecuteCommandTest.java | 2 +-
.../baremaps/workflow/tasks/ImportMonacoTest.java | 6 +-
...rtOpenStreetMapTest.java => ImportPbfTest.java} | 4 +-
.../workflow/tasks/ImportUpdateDataTest.java | 8 +-
.../tasks/ImportUpdateLiechtensteinTest.java | 14 +-
baremaps-core/src/test/resources/archives/file.bz2 | Bin 0 -> 40 bytes
baremaps-core/src/test/resources/archives/file.gz | Bin 0 -> 33 bytes
.../src/test/resources/archives/file.tar.bz2 | Bin 0 -> 136 bytes
.../src/test/resources/archives/file.tar.gz | Bin 0 -> 123 bytes
baremaps-core/src/test/resources/archives/file.zip | Bin 0 -> 170 bytes
.../simple/000/000/{001.osc.gz => 002.osc.gz} | Bin
.../000/000/{001.state.txt => 002.state.txt} | 0
.../simple/{000/000/001.state.txt => state.txt} | 0
.../org/apache/baremaps/server/TileResource.java | 5 +
basemap/config.js | 2 +-
basemap/{workflow.js => import.js} | 72 +++-
basemap/layers/boundary/globaladm0_clean.sql | 36 --
basemap/layers/boundary/globaladm0_index.sql | 28 --
basemap/layers/boundary/globaladm0_simplify.sql | 76 ----
basemap/layers/boundary/globaladm1_clean.sql | 36 --
basemap/layers/boundary/globaladm1_index.sql | 28 --
basemap/layers/boundary/globaladm1_simplify.sql | 76 ----
.../layers/building/{number.js => extrusion.js} | 47 ++-
basemap/layers/building/shape.js | 7 +
basemap/layers/building/tileset.js | 54 ++-
basemap/layers/highway/clean.sql | 25 +-
basemap/layers/highway/prepare.sql | 4 +-
.../{route/prepare.sql => highway/refresh.sql} | 27 +-
basemap/layers/landuse/clean.sql | 1 +
basemap/layers/landuse/prepare.sql | 2 +-
basemap/layers/landuse/refresh.sql | 62 +++
basemap/layers/landuse/tileset.js | 8 +-
basemap/layers/leisure/clean.sql | 72 ++++
basemap/layers/leisure/index.sql | 27 ++
basemap/layers/leisure/prepare.sql | 233 +++++++++++
basemap/layers/leisure/refresh.sql | 62 +++
basemap/layers/{landuse => leisure}/simplify.sql | 80 ++--
basemap/layers/leisure/tileset.js | 6 +
basemap/layers/linestring/clean.sql | 1 +
basemap/layers/linestring/index.sql | 1 +
basemap/layers/linestring/prepare.sql | 5 +-
.../linestring/refresh.sql} | 3 +-
.../initialize.sql => layers/member/refresh.sql} | 3 +-
basemap/layers/natural/refresh.sql | 57 +++
basemap/layers/point/index.sql | 1 +
.../layers/point/refresh.sql | 18 +-
.../initialize.sql => layers/polygon/refresh.sql} | 3 +-
basemap/layers/railway/clean.sql | 23 ++
basemap/layers/railway/index.sql | 1 +
basemap/layers/railway/prepare.sql | 7 +-
.../{route/prepare.sql => railway/refresh.sql} | 27 +-
basemap/layers/route/clean.sql | 23 ++
basemap/layers/route/index.sql | 1 +
basemap/layers/route/prepare.sql | 1 +
.../schema.sql => basemap/layers/route/refresh.sql | 22 +-
basemap/layers/route/simplify.sql | 1 +
basemap/layers/waterway/clean.sql | 23 ++
basemap/layers/waterway/index.sql | 1 +
basemap/layers/waterway/prepare.sql | 2 +
.../{route/prepare.sql => waterway/refresh.sql} | 27 +-
basemap/queries/assertions.sql | 48 +++
basemap/queries/functions.sql | 49 +++
basemap/queries/initialize.sql | 1 +
basemap/queries/ne_index.sql | 1 +
basemap/queries/osm_relations.sql | 1 +
basemap/queries/osm_ways.sql | 1 +
basemap/queries/statistics.sql | 1 +
basemap/refresh.js | 143 +++++++
basemap/style.js | 6 +-
basemap/tileset.js | 2 +-
basemap/{layers/railway/tileset.js => update.js} | 23 +-
.../attraction/tileset.js => daylight/config.js | 13 +-
daylight/layers/coastline/prepare.sql | 23 ++
daylight/layers/coastline/style.js | 34 ++
daylight/layers/coastline/tileset.js | 26 ++
daylight/layers/landcover/prepare.sql | 17 +
daylight/layers/landcover/style.js | 56 +++
daylight/layers/landcover/tileset.js | 21 +
daylight/style.js | 130 ++++++
daylight/tileset.js | 67 +++
daylight/workflow.js | 460 +++++++++++++++++++++
examples/extrusion/workflow.json | 2 +-
examples/openstreetmap/workflow.json | 2 +-
examples/shadedrelief/workflow.json | 20 +
168 files changed, 3727 insertions(+), 1152 deletions(-)
copy .run/{basemap-mbtiles.run.xml => basemap-export-mbtiles.run.xml} (68%)
copy .run/{basemap-mbtiles.run.xml => basemap-export-pmtiles.run.xml} (68%)
rename .run/{naturalearth-create.run.xml => naturalearth-workflow.run.xml}
(78%)
rename
baremaps-cli/src/main/java/org/apache/baremaps/cli/database/{ImportOpenStreetMap.java
=> ImportOsm.java} (87%)
rename
baremaps-cli/src/main/java/org/apache/baremaps/cli/database/{UpdateOpenStreetMap.java
=> UpdateOsm.java} (91%)
create mode 100644
baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/repository/CopyChangeImporter.java
rename
baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/repository/{ChangeImporter.java
=> PutChangeImporter.java} (50%)
create mode 100644
baremaps-core/src/main/java/org/apache/baremaps/utils/Compression.java
copy
baremaps-core/src/main/java/org/apache/baremaps/workflow/tasks/{UngzipFile.java
=> DecompressBZip2.java} (61%)
create mode 100644
baremaps-core/src/main/java/org/apache/baremaps/workflow/tasks/DecompressFile.java
create mode 100644
baremaps-core/src/main/java/org/apache/baremaps/workflow/tasks/ImportDaylightFeatures.java
create mode 100644
baremaps-core/src/main/java/org/apache/baremaps/workflow/tasks/ImportDaylightTranslations.java
copy
baremaps-core/src/main/java/org/apache/baremaps/workflow/tasks/{CreateGeocoderOpenStreetMap.java
=> ImportOsmOsc.java} (56%)
rename
baremaps-core/src/main/java/org/apache/baremaps/workflow/tasks/{ImportOpenStreetMap.java
=> ImportOsmPbf.java} (85%)
rename
baremaps-core/src/main/java/org/apache/baremaps/workflow/tasks/{UpdateOpenStreetMap.java
=> UpdateOsmDatabase.java} (65%)
copy
baremaps-core/src/test/java/org/apache/baremaps/{database/type/LonLatDataTypeTest.java
=> openstreetmap/state/StateReaderTest.java} (68%)
create mode 100644
baremaps-core/src/test/java/org/apache/baremaps/workflow/tasks/DecompressFileTest.java
rename
baremaps-core/src/test/java/org/apache/baremaps/workflow/tasks/{ImportOpenStreetMapTest.java
=> ImportPbfTest.java} (91%)
create mode 100644 baremaps-core/src/test/resources/archives/file.bz2
create mode 100644 baremaps-core/src/test/resources/archives/file.gz
create mode 100644 baremaps-core/src/test/resources/archives/file.tar.bz2
create mode 100644 baremaps-core/src/test/resources/archives/file.tar.gz
create mode 100644 baremaps-core/src/test/resources/archives/file.zip
rename baremaps-core/src/test/resources/simple/000/000/{001.osc.gz =>
002.osc.gz} (100%)
copy baremaps-core/src/test/resources/simple/000/000/{001.state.txt =>
002.state.txt} (100%)
rename baremaps-core/src/test/resources/simple/{000/000/001.state.txt =>
state.txt} (100%)
rename basemap/{workflow.js => import.js} (88%)
delete mode 100644 basemap/layers/boundary/globaladm0_clean.sql
delete mode 100644 basemap/layers/boundary/globaladm0_index.sql
delete mode 100644 basemap/layers/boundary/globaladm0_simplify.sql
delete mode 100644 basemap/layers/boundary/globaladm1_clean.sql
delete mode 100644 basemap/layers/boundary/globaladm1_index.sql
delete mode 100644 basemap/layers/boundary/globaladm1_simplify.sql
copy basemap/layers/building/{number.js => extrusion.js} (54%)
copy basemap/layers/{route/prepare.sql => highway/refresh.sql} (59%)
create mode 100644 basemap/layers/landuse/refresh.sql
create mode 100644 basemap/layers/leisure/clean.sql
create mode 100644 basemap/layers/leisure/index.sql
create mode 100644 basemap/layers/leisure/prepare.sql
create mode 100644 basemap/layers/leisure/refresh.sql
copy basemap/layers/{landuse => leisure}/simplify.sql (66%)
copy basemap/{queries/initialize.sql => layers/linestring/refresh.sql} (94%)
copy basemap/{queries/initialize.sql => layers/member/refresh.sql} (95%)
create mode 100644 basemap/layers/natural/refresh.sql
copy baremaps-core/src/test/resources/queries/queries.sql =>
basemap/layers/point/refresh.sql (60%)
copy basemap/{queries/initialize.sql => layers/polygon/refresh.sql} (95%)
copy basemap/layers/{route/prepare.sql => railway/refresh.sql} (59%)
copy baremaps-core/src/test/resources/queries/schema.sql =>
basemap/layers/route/refresh.sql (60%)
copy basemap/layers/{route/prepare.sql => waterway/refresh.sql} (58%)
create mode 100644 basemap/queries/assertions.sql
create mode 100644 basemap/queries/functions.sql
create mode 100644 basemap/refresh.js
copy basemap/{layers/railway/tileset.js => update.js} (66%)
copy basemap/layers/attraction/tileset.js => daylight/config.js (78%)
create mode 100644 daylight/layers/coastline/prepare.sql
create mode 100644 daylight/layers/coastline/style.js
create mode 100644 daylight/layers/coastline/tileset.js
create mode 100644 daylight/layers/landcover/prepare.sql
create mode 100644 daylight/layers/landcover/style.js
create mode 100644 daylight/layers/landcover/tileset.js
create mode 100644 daylight/style.js
create mode 100644 daylight/tileset.js
create mode 100644 daylight/workflow.js
create mode 100644 examples/shadedrelief/workflow.json
