Upgrade planetiler-basemap to be compatible with OpenMapTiles 3.13 (#49)

Applying changes to layers from [OpenMapTiles 3.13 release](https://github.com/openmaptiles/openmaptiles/releases/tag/v3.13) (https://github.com/openmaptiles/openmaptiles/compare/v3.12.2...v3.13), minus transportation network connectivity improvements - those will be a separate change.
This commit is contained in:
Michael Barry
2022-01-19 05:36:44 -05:00
committed by GitHub
parent 8e49c0831c
commit 0baaf8d886
37 changed files with 1690 additions and 464 deletions

View File

@@ -58,7 +58,7 @@ public class Generate {
private static final String LINE_SEPARATOR = System.lineSeparator();
private static final String GENERATED_FILE_HEADER = """
/*
Copyright (c) 2016, KlokanTech.com & OpenMapTiles contributors.
Copyright (c) 2021, MapTiler.com & OpenMapTiles contributors.
All rights reserved.
Code license: BSD 3-Clause License
@@ -690,12 +690,12 @@ public class Generate {
* Models for deserializing yaml into:
*/
private static record OpenmaptilesConfig(
private record OpenmaptilesConfig(
OpenmaptilesTileSet tileset
) {}
@JsonIgnoreProperties(ignoreUnknown = true)
private static record OpenmaptilesTileSet(
private record OpenmaptilesTileSet(
List<String> layers,
String version,
String attribution,
@@ -705,51 +705,52 @@ public class Generate {
) {}
@JsonIgnoreProperties(ignoreUnknown = true)
private static record LayerDetails(
private record LayerDetails(
String id,
String description,
Map<String, JsonNode> fields,
double buffer_size
) {}
private static record Datasource(
private record Datasource(
String type,
String mapping_file
) {}
@JsonIgnoreProperties(ignoreUnknown = true)
private static record LayerConfig(
private record LayerConfig(
LayerDetails layer,
List<Datasource> datasources
) {}
private static record Imposm3Column(
private record Imposm3Column(
String type,
String name,
String key,
boolean from_member
) {}
static record Imposm3Filters(
record Imposm3Filters(
JsonNode reject,
JsonNode require
) {}
static record Imposm3Table(
record Imposm3Table(
String type,
@JsonProperty("_resolve_wikidata") boolean resolveWikidata,
List<Imposm3Column> columns,
Imposm3Filters filters,
JsonNode mapping,
Map<String, JsonNode> type_mappings
Map<String, JsonNode> type_mappings,
@JsonProperty("relation_types") List<String> relationTypes
) {}
@JsonIgnoreProperties(ignoreUnknown = true)
private static record Imposm3Mapping(
private record Imposm3Mapping(
Map<String, Imposm3Table> tables
) {}
private static record OsmTableField(
private record OsmTableField(
String clazz,
String name,
String extractCode