trafficcue/planetiler-openmaptiles
1
0
Fork 0
mirror of https://github.com/cfpwastaken/planetiler-openmaptiles.git synced 2026-02-04 04:21:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Landuse flowerbed to landcover (#198)

Browse Source 
* we are now past 3.15 so we're going to follow master

* regenerate-openmaptiles.sh b3d67ed5b327c9059aeea0b3304772c6b4c8c7e9  (to match content of OMT PR 1661)
This commit is contained in:
Peter Hanecak
2024-10-09 11:57:29 +02:00
committed by GitHub
parent c27185fb5f
commit 63eeb6bd32
3 changed files with 30 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
scripts/regenerate-openmaptiles.sh
View File

@@ -4,7 +4,8 @@ set -o errexit
set -o pipefail
set -o nounset
TAG="${1:-"v3.15"}"
# TODO: change to "v3.16" once that is released
TAG="${1:-"master"}"
echo "tag=${TAG}"
BASE_URL="${2:-"https://raw.githubusercontent.com/openmaptiles/openmaptiles/"}"

48
src/main/java/org/openmaptiles/generated/OpenMapTilesSchema.java
View File

@@ -49,8 +49,8 @@ import org.openmaptiles.Layer;
/**
* All vector tile layer definitions, attributes, and allowed values generated from the
* <a href="https://github.com/openmaptiles/openmaptiles/blob/v3.15/openmaptiles.yaml">OpenMapTiles vector tile schema
* v3.15</a>.
* <a href="https://github.com/openmaptiles/openmaptiles/blob/master/openmaptiles.yaml">OpenMapTiles vector tile schema
* master</a>.
*/
@SuppressWarnings("unused")
public class OpenMapTilesSchema {
@@ -96,7 +96,7 @@ public class OpenMapTilesSchema {
* boundaries show up. So you might not be able to use border styling for ocean water features.
*
* Generated from
* <a href="https://github.com/openmaptiles/openmaptiles/blob/v3.15/layers/water/water.yaml">water.yaml</a>
* <a href="https://github.com/openmaptiles/openmaptiles/blob/master/layers/water/water.yaml">water.yaml</a>
*/
public interface Water extends Layer {
double BUFFER_SIZE = 4.0;
@@ -195,7 +195,7 @@ public class OpenMapTilesSchema {
* field applied. Waterways do not have a <code>subclass</code> field.
*
* Generated from
* <a href="https://github.com/openmaptiles/openmaptiles/blob/v3.15/layers/waterway/waterway.yaml">waterway.yaml</a>
* <a href="https://github.com/openmaptiles/openmaptiles/blob/master/layers/waterway/waterway.yaml">waterway.yaml</a>
*/
public interface Waterway extends Layer {
double BUFFER_SIZE = 4.0;
@@ -287,7 +287,7 @@ public class OpenMapTilesSchema {
* layer is to style wood (<code>class=wood</code>) and grass (<code>class=grass</code>) areas.
*
* Generated from <a href=
* "https://github.com/openmaptiles/openmaptiles/blob/v3.15/layers/landcover/landcover.yaml">landcover.yaml</a>
* "https://github.com/openmaptiles/openmaptiles/blob/master/layers/landcover/landcover.yaml">landcover.yaml</a>
*/
public interface Landcover extends Layer {
double BUFFER_SIZE = 4.0;
@@ -335,6 +335,7 @@ public class OpenMapTilesSchema {
* <li>"farm"
* <li>"farmland"
* <li>"fell"
* <li>"flowerbed"
* <li>"forest"
* <li>"garden"
* <li>"glacier"
@@ -387,6 +388,7 @@ public class OpenMapTilesSchema {
public static final String SUBCLASS_FARM = "farm";
public static final String SUBCLASS_FARMLAND = "farmland";
public static final String SUBCLASS_FELL = "fell";
public static final String SUBCLASS_FLOWERBED = "flowerbed";
public static final String SUBCLASS_FOREST = "forest";
public static final String SUBCLASS_GARDEN = "garden";
public static final String SUBCLASS_GLACIER = "glacier";
@@ -416,9 +418,9 @@ public class OpenMapTilesSchema {
public static final String SUBCLASS_WOOD = "wood";
public static final Set<String> SUBCLASS_VALUES =
Set.of("allotments", "bare_rock", "beach", "bog", "dune", "scrub", "shrubbery", "farm", "farmland", "fell",
"forest", "garden", "glacier", "grass", "grassland", "golf_course", "heath", "mangrove", "marsh", "meadow",
"orchard", "park", "plant_nursery", "recreation_ground", "reedbed", "saltern", "saltmarsh", "sand", "scree",
"swamp", "tidalflat", "tundra", "village_green", "vineyard", "wet_meadow", "wetland", "wood");
"flowerbed", "forest", "garden", "glacier", "grass", "grassland", "golf_course", "heath", "mangrove", "marsh",
"meadow", "orchard", "park", "plant_nursery", "recreation_ground", "reedbed", "saltern", "saltmarsh", "sand",
"scree", "swamp", "tidalflat", "tundra", "village_green", "vineyard", "wet_meadow", "wetland", "wood");
}
/** Complex mappings to generate attribute values from OSM element tags in the landcover layer. */
final class FieldMappings {
@@ -431,8 +433,8 @@ public class OpenMapTilesSchema {
MultiExpression.entry("wood", matchAny("subclass", "wood", "forest")),
MultiExpression.entry("rock", matchAny("subclass", "bare_rock", "scree")),
MultiExpression.entry("grass",
matchAny("subclass", "fell", "grassland", "heath", "scrub", "shrubbery", "tundra", "grass", "meadow",
"allotments", "park", "village_green", "recreation_ground", "garden", "golf_course")),
matchAny("subclass", "fell", "flowerbed", "grassland", "heath", "scrub", "shrubbery", "tundra", "grass",
"meadow", "allotments", "park", "village_green", "recreation_ground", "garden", "golf_course")),
MultiExpression.entry("wetland",
matchAny("subclass", "wetland", "bog", "swamp", "wet_meadow", "marsh", "reedbed", "saltern", "tidalflat",
"saltmarsh", "mangrove")),
@@ -444,7 +446,7 @@ public class OpenMapTilesSchema {
* residential (urban) areas and at higher zoom levels mostly OSM <code>landuse</code> tags.
*
* Generated from
* <a href="https://github.com/openmaptiles/openmaptiles/blob/v3.15/layers/landuse/landuse.yaml">landuse.yaml</a>
* <a href="https://github.com/openmaptiles/openmaptiles/blob/master/layers/landuse/landuse.yaml">landuse.yaml</a>
*/
public interface Landuse extends Layer {
double BUFFER_SIZE = 4.0;
@@ -540,7 +542,7 @@ public class OpenMapTilesSchema {
* <a href="http://wiki.openstreetmap.org/wiki/Tag:natural%3Dpeak">Natural peaks</a>
*
* Generated from <a href=
* "https://github.com/openmaptiles/openmaptiles/blob/v3.15/layers/mountain_peak/mountain_peak.yaml">mountain_peak.yaml</a>
* "https://github.com/openmaptiles/openmaptiles/blob/master/layers/mountain_peak/mountain_peak.yaml">mountain_peak.yaml</a>
*/
public interface MountainPeak extends Layer {
double BUFFER_SIZE = 64.0;
@@ -624,7 +626,7 @@ public class OpenMapTilesSchema {
* <a href="https://wiki.openstreetmap.org/wiki/Tag:leisure%3Dnature_reserve"><code>leisure=nature_reserve</code></a>.
*
* Generated from
* <a href="https://github.com/openmaptiles/openmaptiles/blob/v3.15/layers/park/park.yaml">park.yaml</a>
* <a href="https://github.com/openmaptiles/openmaptiles/blob/master/layers/park/park.yaml">park.yaml</a>
*/
public interface Park extends Layer {
double BUFFER_SIZE = 4.0;
@@ -687,7 +689,7 @@ public class OpenMapTilesSchema {
* but for most styles it makes sense to just style <code>admin_level=2</code> and <code>admin_level=4</code>.
*
* Generated from
* <a href="https://github.com/openmaptiles/openmaptiles/blob/v3.15/layers/boundary/boundary.yaml">boundary.yaml</a>
* <a href="https://github.com/openmaptiles/openmaptiles/blob/master/layers/boundary/boundary.yaml">boundary.yaml</a>
*/
public interface Boundary extends Layer {
double BUFFER_SIZE = 4.0;
@@ -797,7 +799,7 @@ public class OpenMapTilesSchema {
* in the <strong>aeroway</strong> layer.
*
* Generated from
* <a href="https://github.com/openmaptiles/openmaptiles/blob/v3.15/layers/aeroway/aeroway.yaml">aeroway.yaml</a>
* <a href="https://github.com/openmaptiles/openmaptiles/blob/master/layers/aeroway/aeroway.yaml">aeroway.yaml</a>
*/
public interface Aeroway extends Layer {
double BUFFER_SIZE = 4.0;
@@ -857,7 +859,7 @@ public class OpenMapTilesSchema {
* features like plazas.
*
* Generated from <a href=
* "https://github.com/openmaptiles/openmaptiles/blob/v3.15/layers/transportation/transportation.yaml">transportation.yaml</a>
* "https://github.com/openmaptiles/openmaptiles/blob/master/layers/transportation/transportation.yaml">transportation.yaml</a>
*/
public interface Transportation extends Layer {
double BUFFER_SIZE = 4.0;
@@ -1202,7 +1204,7 @@ public class OpenMapTilesSchema {
* location:underground are excluded.
*
* Generated from
* <a href="https://github.com/openmaptiles/openmaptiles/blob/v3.15/layers/building/building.yaml">building.yaml</a>
* <a href="https://github.com/openmaptiles/openmaptiles/blob/master/layers/building/building.yaml">building.yaml</a>
*/
public interface Building extends Layer {
double BUFFER_SIZE = 4.0;
@@ -1244,7 +1246,7 @@ public class OpenMapTilesSchema {
* from OSM water bodies. Only the most important lakes contain labels.
*
* Generated from <a href=
* "https://github.com/openmaptiles/openmaptiles/blob/v3.15/layers/water_name/water_name.yaml">water_name.yaml</a>
* "https://github.com/openmaptiles/openmaptiles/blob/master/layers/water_name/water_name.yaml">water_name.yaml</a>
*/
public interface WaterName extends Layer {
double BUFFER_SIZE = 256.0;
@@ -1321,7 +1323,7 @@ public class OpenMapTilesSchema {
* while for other roads you should use <code>name</code>.
*
* Generated from <a href=
* "https://github.com/openmaptiles/openmaptiles/blob/v3.15/layers/transportation_name/transportation_name.yaml">transportation_name.yaml</a>
* "https://github.com/openmaptiles/openmaptiles/blob/master/layers/transportation_name/transportation_name.yaml">transportation_name.yaml</a>
*/
public interface TransportationName extends Layer {
double BUFFER_SIZE = 8.0;
@@ -1593,7 +1595,7 @@ public class OpenMapTilesSchema {
* create a text hierarchy.
*
* Generated from
* <a href="https://github.com/openmaptiles/openmaptiles/blob/v3.15/layers/place/place.yaml">place.yaml</a>
* <a href="https://github.com/openmaptiles/openmaptiles/blob/master/layers/place/place.yaml">place.yaml</a>
*/
public interface Place extends Layer {
double BUFFER_SIZE = 256.0;
@@ -1717,7 +1719,7 @@ public class OpenMapTilesSchema {
* tag are prioritized for preservation).
*
* Generated from <a href=
* "https://github.com/openmaptiles/openmaptiles/blob/v3.15/layers/housenumber/housenumber.yaml">housenumber.yaml</a>
* "https://github.com/openmaptiles/openmaptiles/blob/master/layers/housenumber/housenumber.yaml">housenumber.yaml</a>
*/
public interface Housenumber extends Layer {
double BUFFER_SIZE = 8.0;
@@ -1749,7 +1751,7 @@ public class OpenMapTilesSchema {
* <a href="http://wiki.openstreetmap.org/wiki/Points_of_interest">Points of interests</a> containing a of a variety
* of OpenStreetMap tags. Mostly contains amenities, sport, shop and tourist POIs.
*
* Generated from <a href="https://github.com/openmaptiles/openmaptiles/blob/v3.15/layers/poi/poi.yaml">poi.yaml</a>
* Generated from <a href="https://github.com/openmaptiles/openmaptiles/blob/master/layers/poi/poi.yaml">poi.yaml</a>
*/
public interface Poi extends Layer {
double BUFFER_SIZE = 64.0;
@@ -1993,7 +1995,7 @@ public class OpenMapTilesSchema {
* <a href="http://wiki.openstreetmap.org/wiki/Tag:aeroway%3Daerodrome">Aerodrome labels</a>
*
* Generated from <a href=
* "https://github.com/openmaptiles/openmaptiles/blob/v3.15/layers/aerodrome_label/aerodrome_label.yaml">aerodrome_label.yaml</a>
* "https://github.com/openmaptiles/openmaptiles/blob/master/layers/aerodrome_label/aerodrome_label.yaml">aerodrome_label.yaml</a>
*/
public interface AerodromeLabel extends Layer {
double BUFFER_SIZE = 64.0;

6
src/main/java/org/openmaptiles/generated/Tables.java
View File

@@ -50,7 +50,7 @@ import java.util.Map;
/**
* OSM element parsers generated from the <a href="https://github.com/omniscale/imposm3">imposm3</a> table definitions
* in the <a href="https://github.com/openmaptiles/openmaptiles/blob/v3.15/openmaptiles.yaml">OpenMapTiles vector tile
* in the <a href="https://github.com/openmaptiles/openmaptiles/blob/master/openmaptiles.yaml">OpenMapTiles vector tile
* schema</a>.
*
* These filter and parse the raw OSM key/value attribute pairs on tags into records with fields that match the columns
@@ -153,8 +153,8 @@ public class Tables {
/** Imposm3 "mapping" to filter OSM elements that should appear in this "table". */
public static final Expression MAPPING = and(or(
matchAny("landuse", "allotments", "farm", "farmland", "orchard", "plant_nursery", "vineyard", "grass",
"grassland", "meadow", "forest", "village_green", "recreation_ground"),
matchAny("landuse", "allotments", "farm", "farmland", "orchard", "flowerbed", "plant_nursery", "vineyard",
"grass", "grassland", "meadow", "forest", "village_green", "recreation_ground"),
matchAny("natural", "wood", "wetland", "fell", "grassland", "heath", "scrub", "shrubbery", "tundra", "glacier",
"bare_rock", "scree", "beach", "sand", "dune"),
matchAny("leisure", "park", "garden", "golf_course"), matchAny("wetland", "bog", "swamp", "wet_meadow", "marsh",