Merge branch 'main' into min-size-for-attribute-interpolators-d3style

pull/728/head
Mike Barry 2023-11-20 06:18:50 -05:00
commit 8be54b9c44
3 zmienionych plików z 7 dodań i 10 usunięć

Wyświetl plik

@ -67,7 +67,7 @@
<dependency>
<groupId>org.xerial</groupId>
<artifactId>sqlite-jdbc</artifactId>
<version>3.43.2.2</version>
<version>3.44.0.0</version>
</dependency>
<dependency>
<groupId>org.msgpack</groupId>

Wyświetl plik

@ -209,17 +209,14 @@ public final class WriteableJsonStreamArchive extends WriteableStreamArchive {
record FinishEntry(TileArchiveMetadata metadata) implements Entry {}
private interface TileArchiveMetadataMixin {
private record TileArchiveMetadataMixin(
@JsonIgnore(false)
Envelope bounds();
@JsonIgnore(false) Envelope bounds,
@JsonIgnore(false)
CoordinateXY center();
@JsonIgnore(false) CoordinateXY center,
@JsonIgnore(false)
List<LayerAttrStats.VectorLayer> vectorLayers();
}
@JsonIgnore(false) List<LayerAttrStats.VectorLayer> vectorLayers
) {}
@JsonIncludeProperties({"minX", "maxX", "minY", "maxY"})
private abstract static class EnvelopeMixin {

Wyświetl plik

@ -20,7 +20,7 @@
<maven.compiler.source>21</maven.compiler.source>
<maven.compiler.target>21</maven.compiler.target>
<maven.source.excludeResources>true</maven.source.excludeResources>
<jackson.version>2.15.3</jackson.version>
<jackson.version>2.16.0</jackson.version>
<junit.version>5.10.1</junit.version>
<sonar.host.url>https://sonarcloud.io</sonar.host.url>
<sonar.organization>onthegomap</sonar.organization>