Skip to content

Commit

Permalink
Merge branch 'main' into min-size-for-attribute-interpolators-d3style
Browse files Browse the repository at this point in the history
  • Loading branch information
msbarry committed Nov 20, 2023
2 parents eca9ddf + 1df1bf0 commit 8be54b9
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 10 deletions.
2 changes: 1 addition & 1 deletion planetiler-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -209,17 +209,14 @@ record InitializationEntry(TileArchiveMetadata metadata) implements Entry {}

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 {
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

0 comments on commit 8be54b9

Please sign in to comment.