From 008d95d1a708a0a2e8a0c3448df6a2551f0ba4d0 Mon Sep 17 00:00:00 2001 From: lazaa32 Date: Tue, 7 Jun 2022 12:42:36 +0200 Subject: [PATCH] spotless:apply --- .../planetiler/openmaptiles/OpenMapTilesMain.java | 2 +- .../planetiler/openmaptiles/OpenMapTilesProfile.java | 4 ++-- .../openmaptiles/generated/OpenMapTilesSchema.java | 2 +- .../planetiler/openmaptiles/layers/AerodromeLabel.java | 4 ++-- .../planetiler/openmaptiles/layers/Aeroway.java | 2 +- .../planetiler/openmaptiles/layers/Boundary.java | 4 ++-- .../planetiler/openmaptiles/layers/Building.java | 4 ++-- .../planetiler/openmaptiles/layers/Housenumber.java | 2 +- .../planetiler/openmaptiles/layers/Landcover.java | 6 +++--- .../planetiler/openmaptiles/layers/Landuse.java | 2 +- .../planetiler/openmaptiles/layers/MountainPeak.java | 6 +++--- .../planetiler/openmaptiles/layers/Park.java | 10 +++++----- .../planetiler/openmaptiles/layers/Place.java | 10 +++++----- .../onthegomap/planetiler/openmaptiles/layers/Poi.java | 6 +++--- .../planetiler/openmaptiles/layers/Transportation.java | 6 +++--- .../openmaptiles/layers/TransportationName.java | 4 ++-- .../planetiler/openmaptiles/layers/Water.java | 6 +++--- .../planetiler/openmaptiles/layers/WaterName.java | 8 ++++---- .../planetiler/openmaptiles/layers/Waterway.java | 6 +++--- .../planetiler/openmaptiles/GenerateTest.java | 2 +- .../planetiler/openmaptiles/OpenMapTilesTest.java | 2 +- .../openmaptiles/layers/AbstractLayerTest.java | 2 +- .../planetiler/openmaptiles/layers/PlaceTest.java | 4 ++-- .../openmaptiles/layers/TransportationTest.java | 2 +- 24 files changed, 53 insertions(+), 53 deletions(-) diff --git a/src/main/java/com/onthegomap/planetiler/openmaptiles/OpenMapTilesMain.java b/src/main/java/com/onthegomap/planetiler/openmaptiles/OpenMapTilesMain.java index 3c9abc6..2663b22 100644 --- a/src/main/java/com/onthegomap/planetiler/openmaptiles/OpenMapTilesMain.java +++ b/src/main/java/com/onthegomap/planetiler/openmaptiles/OpenMapTilesMain.java @@ -1,8 +1,8 @@ package com.onthegomap.planetiler.openmaptiles; import com.onthegomap.planetiler.Planetiler; -import com.onthegomap.planetiler.openmaptiles.generated.OpenMapTilesSchema; import com.onthegomap.planetiler.config.Arguments; +import com.onthegomap.planetiler.openmaptiles.generated.OpenMapTilesSchema; import java.nio.file.Path; /** diff --git a/src/main/java/com/onthegomap/planetiler/openmaptiles/OpenMapTilesProfile.java b/src/main/java/com/onthegomap/planetiler/openmaptiles/OpenMapTilesProfile.java index 91fec55..98a28c8 100644 --- a/src/main/java/com/onthegomap/planetiler/openmaptiles/OpenMapTilesProfile.java +++ b/src/main/java/com/onthegomap/planetiler/openmaptiles/OpenMapTilesProfile.java @@ -8,12 +8,12 @@ import com.onthegomap.planetiler.FeatureCollector; import com.onthegomap.planetiler.ForwardingProfile; import com.onthegomap.planetiler.Planetiler; import com.onthegomap.planetiler.Profile; +import com.onthegomap.planetiler.config.PlanetilerConfig; +import com.onthegomap.planetiler.expression.MultiExpression; import com.onthegomap.planetiler.openmaptiles.generated.OpenMapTilesSchema; import com.onthegomap.planetiler.openmaptiles.generated.Tables; import com.onthegomap.planetiler.openmaptiles.layers.Transportation; import com.onthegomap.planetiler.openmaptiles.layers.TransportationName; -import com.onthegomap.planetiler.config.PlanetilerConfig; -import com.onthegomap.planetiler.expression.MultiExpression; import com.onthegomap.planetiler.reader.SimpleFeature; import com.onthegomap.planetiler.reader.SourceFeature; import com.onthegomap.planetiler.reader.osm.OsmElement; diff --git a/src/main/java/com/onthegomap/planetiler/openmaptiles/generated/OpenMapTilesSchema.java b/src/main/java/com/onthegomap/planetiler/openmaptiles/generated/OpenMapTilesSchema.java index d9e52a0..f440f61 100644 --- a/src/main/java/com/onthegomap/planetiler/openmaptiles/generated/OpenMapTilesSchema.java +++ b/src/main/java/com/onthegomap/planetiler/openmaptiles/generated/OpenMapTilesSchema.java @@ -39,9 +39,9 @@ package com.onthegomap.planetiler.openmaptiles.generated; import static com.onthegomap.planetiler.expression.Expression.*; -import com.onthegomap.planetiler.openmaptiles.Layer; import com.onthegomap.planetiler.config.PlanetilerConfig; import com.onthegomap.planetiler.expression.MultiExpression; +import com.onthegomap.planetiler.openmaptiles.Layer; import com.onthegomap.planetiler.stats.Stats; import com.onthegomap.planetiler.util.Translations; import java.util.List; diff --git a/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/AerodromeLabel.java b/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/AerodromeLabel.java index 30621fe..a1267c6 100644 --- a/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/AerodromeLabel.java +++ b/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/AerodromeLabel.java @@ -39,12 +39,12 @@ import static com.onthegomap.planetiler.openmaptiles.util.Utils.nullIfEmpty; import static com.onthegomap.planetiler.openmaptiles.util.Utils.nullOrEmpty; import com.onthegomap.planetiler.FeatureCollector; +import com.onthegomap.planetiler.config.PlanetilerConfig; +import com.onthegomap.planetiler.expression.MultiExpression; import com.onthegomap.planetiler.openmaptiles.generated.OpenMapTilesSchema; import com.onthegomap.planetiler.openmaptiles.generated.Tables; import com.onthegomap.planetiler.openmaptiles.util.LanguageUtils; import com.onthegomap.planetiler.openmaptiles.util.Utils; -import com.onthegomap.planetiler.config.PlanetilerConfig; -import com.onthegomap.planetiler.expression.MultiExpression; import com.onthegomap.planetiler.stats.Stats; import com.onthegomap.planetiler.util.Translations; diff --git a/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Aeroway.java b/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Aeroway.java index 6c961dc..83241fd 100644 --- a/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Aeroway.java +++ b/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Aeroway.java @@ -36,9 +36,9 @@ See https://github.com/openmaptiles/openmaptiles/blob/master/LICENSE.md for deta package com.onthegomap.planetiler.openmaptiles.layers; import com.onthegomap.planetiler.FeatureCollector; +import com.onthegomap.planetiler.config.PlanetilerConfig; import com.onthegomap.planetiler.openmaptiles.generated.OpenMapTilesSchema; import com.onthegomap.planetiler.openmaptiles.generated.Tables; -import com.onthegomap.planetiler.config.PlanetilerConfig; import com.onthegomap.planetiler.stats.Stats; import com.onthegomap.planetiler.util.Translations; diff --git a/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Boundary.java b/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Boundary.java index a5da6ea..06d15d3 100644 --- a/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Boundary.java +++ b/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Boundary.java @@ -45,12 +45,12 @@ import com.carrotsearch.hppc.LongObjectMap; import com.onthegomap.planetiler.FeatureCollector; import com.onthegomap.planetiler.FeatureMerge; import com.onthegomap.planetiler.VectorTile; -import com.onthegomap.planetiler.openmaptiles.OpenMapTilesProfile; -import com.onthegomap.planetiler.openmaptiles.generated.OpenMapTilesSchema; import com.onthegomap.planetiler.collection.Hppc; import com.onthegomap.planetiler.config.PlanetilerConfig; import com.onthegomap.planetiler.geo.GeoUtils; import com.onthegomap.planetiler.geo.GeometryException; +import com.onthegomap.planetiler.openmaptiles.OpenMapTilesProfile; +import com.onthegomap.planetiler.openmaptiles.generated.OpenMapTilesSchema; import com.onthegomap.planetiler.reader.SimpleFeature; import com.onthegomap.planetiler.reader.SourceFeature; import com.onthegomap.planetiler.reader.osm.OsmElement; diff --git a/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Building.java b/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Building.java index 77631cc..f22ec66 100644 --- a/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Building.java +++ b/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Building.java @@ -43,11 +43,11 @@ import static java.util.Map.entry; import com.onthegomap.planetiler.FeatureCollector; import com.onthegomap.planetiler.FeatureMerge; import com.onthegomap.planetiler.VectorTile; +import com.onthegomap.planetiler.config.PlanetilerConfig; +import com.onthegomap.planetiler.geo.GeometryException; import com.onthegomap.planetiler.openmaptiles.OpenMapTilesProfile; import com.onthegomap.planetiler.openmaptiles.generated.OpenMapTilesSchema; import com.onthegomap.planetiler.openmaptiles.generated.Tables; -import com.onthegomap.planetiler.config.PlanetilerConfig; -import com.onthegomap.planetiler.geo.GeometryException; import com.onthegomap.planetiler.reader.osm.OsmElement; import com.onthegomap.planetiler.reader.osm.OsmRelationInfo; import com.onthegomap.planetiler.stats.Stats; diff --git a/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Housenumber.java b/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Housenumber.java index 7735507..01002a7 100644 --- a/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Housenumber.java +++ b/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Housenumber.java @@ -36,9 +36,9 @@ See https://github.com/openmaptiles/openmaptiles/blob/master/LICENSE.md for deta package com.onthegomap.planetiler.openmaptiles.layers; import com.onthegomap.planetiler.FeatureCollector; +import com.onthegomap.planetiler.config.PlanetilerConfig; import com.onthegomap.planetiler.openmaptiles.generated.OpenMapTilesSchema; import com.onthegomap.planetiler.openmaptiles.generated.Tables; -import com.onthegomap.planetiler.config.PlanetilerConfig; import com.onthegomap.planetiler.stats.Stats; import com.onthegomap.planetiler.util.Translations; diff --git a/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Landcover.java b/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Landcover.java index 68b34b8..d2d621c 100644 --- a/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Landcover.java +++ b/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Landcover.java @@ -38,12 +38,12 @@ package com.onthegomap.planetiler.openmaptiles.layers; import com.onthegomap.planetiler.FeatureCollector; import com.onthegomap.planetiler.FeatureMerge; import com.onthegomap.planetiler.VectorTile; -import com.onthegomap.planetiler.openmaptiles.OpenMapTilesProfile; -import com.onthegomap.planetiler.openmaptiles.generated.OpenMapTilesSchema; -import com.onthegomap.planetiler.openmaptiles.generated.Tables; import com.onthegomap.planetiler.config.PlanetilerConfig; import com.onthegomap.planetiler.expression.MultiExpression; import com.onthegomap.planetiler.geo.GeometryException; +import com.onthegomap.planetiler.openmaptiles.OpenMapTilesProfile; +import com.onthegomap.planetiler.openmaptiles.generated.OpenMapTilesSchema; +import com.onthegomap.planetiler.openmaptiles.generated.Tables; import com.onthegomap.planetiler.reader.SourceFeature; import com.onthegomap.planetiler.stats.Stats; import com.onthegomap.planetiler.util.Translations; diff --git a/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Landuse.java b/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Landuse.java index 1d9c0ab..d5082af 100644 --- a/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Landuse.java +++ b/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Landuse.java @@ -39,10 +39,10 @@ import static com.onthegomap.planetiler.openmaptiles.util.Utils.coalesce; import static com.onthegomap.planetiler.openmaptiles.util.Utils.nullIfEmpty; import com.onthegomap.planetiler.FeatureCollector; +import com.onthegomap.planetiler.config.PlanetilerConfig; import com.onthegomap.planetiler.openmaptiles.OpenMapTilesProfile; import com.onthegomap.planetiler.openmaptiles.generated.OpenMapTilesSchema; import com.onthegomap.planetiler.openmaptiles.generated.Tables; -import com.onthegomap.planetiler.config.PlanetilerConfig; import com.onthegomap.planetiler.reader.SourceFeature; import com.onthegomap.planetiler.stats.Stats; import com.onthegomap.planetiler.util.Parse; diff --git a/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/MountainPeak.java b/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/MountainPeak.java index ba967cd..eb5fed3 100644 --- a/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/MountainPeak.java +++ b/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/MountainPeak.java @@ -41,13 +41,13 @@ import static com.onthegomap.planetiler.openmaptiles.util.Utils.nullIfEmpty; import com.carrotsearch.hppc.LongIntMap; import com.onthegomap.planetiler.FeatureCollector; import com.onthegomap.planetiler.VectorTile; +import com.onthegomap.planetiler.collection.Hppc; +import com.onthegomap.planetiler.config.PlanetilerConfig; +import com.onthegomap.planetiler.geo.GeometryException; import com.onthegomap.planetiler.openmaptiles.OpenMapTilesProfile; import com.onthegomap.planetiler.openmaptiles.generated.OpenMapTilesSchema; import com.onthegomap.planetiler.openmaptiles.generated.Tables; import com.onthegomap.planetiler.openmaptiles.util.LanguageUtils; -import com.onthegomap.planetiler.collection.Hppc; -import com.onthegomap.planetiler.config.PlanetilerConfig; -import com.onthegomap.planetiler.geo.GeometryException; import com.onthegomap.planetiler.reader.SourceFeature; import com.onthegomap.planetiler.stats.Stats; import com.onthegomap.planetiler.util.Parse; diff --git a/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Park.java b/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Park.java index f66f344..3ff922f 100644 --- a/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Park.java +++ b/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Park.java @@ -35,23 +35,23 @@ See https://github.com/openmaptiles/openmaptiles/blob/master/LICENSE.md for deta */ package com.onthegomap.planetiler.openmaptiles.layers; +import static com.onthegomap.planetiler.collection.FeatureGroup.SORT_KEY_BITS; import static com.onthegomap.planetiler.openmaptiles.util.Utils.coalesce; import static com.onthegomap.planetiler.openmaptiles.util.Utils.nullIfEmpty; -import static com.onthegomap.planetiler.collection.FeatureGroup.SORT_KEY_BITS; import com.carrotsearch.hppc.LongIntMap; import com.onthegomap.planetiler.FeatureCollector; import com.onthegomap.planetiler.FeatureMerge; import com.onthegomap.planetiler.VectorTile; -import com.onthegomap.planetiler.openmaptiles.OpenMapTilesProfile; -import com.onthegomap.planetiler.openmaptiles.generated.OpenMapTilesSchema; -import com.onthegomap.planetiler.openmaptiles.generated.Tables; -import com.onthegomap.planetiler.openmaptiles.util.LanguageUtils; import com.onthegomap.planetiler.collection.Hppc; import com.onthegomap.planetiler.config.PlanetilerConfig; import com.onthegomap.planetiler.geo.GeoUtils; import com.onthegomap.planetiler.geo.GeometryException; import com.onthegomap.planetiler.geo.GeometryType; +import com.onthegomap.planetiler.openmaptiles.OpenMapTilesProfile; +import com.onthegomap.planetiler.openmaptiles.generated.OpenMapTilesSchema; +import com.onthegomap.planetiler.openmaptiles.generated.Tables; +import com.onthegomap.planetiler.openmaptiles.util.LanguageUtils; import com.onthegomap.planetiler.stats.Stats; import com.onthegomap.planetiler.util.SortKey; import com.onthegomap.planetiler.util.Translations; diff --git a/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Place.java b/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Place.java index 099605b..00a58be 100644 --- a/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Place.java +++ b/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Place.java @@ -35,24 +35,24 @@ See https://github.com/openmaptiles/openmaptiles/blob/master/LICENSE.md for deta */ package com.onthegomap.planetiler.openmaptiles.layers; +import static com.onthegomap.planetiler.collection.FeatureGroup.SORT_KEY_BITS; import static com.onthegomap.planetiler.openmaptiles.util.Utils.coalesce; import static com.onthegomap.planetiler.openmaptiles.util.Utils.nullIfEmpty; import static com.onthegomap.planetiler.openmaptiles.util.Utils.nullOrEmpty; -import static com.onthegomap.planetiler.collection.FeatureGroup.SORT_KEY_BITS; import com.carrotsearch.hppc.LongIntMap; import com.onthegomap.planetiler.FeatureCollector; import com.onthegomap.planetiler.VectorTile; -import com.onthegomap.planetiler.openmaptiles.OpenMapTilesProfile; -import com.onthegomap.planetiler.openmaptiles.generated.OpenMapTilesSchema; -import com.onthegomap.planetiler.openmaptiles.generated.Tables; -import com.onthegomap.planetiler.openmaptiles.util.LanguageUtils; import com.onthegomap.planetiler.collection.Hppc; import com.onthegomap.planetiler.config.PlanetilerConfig; import com.onthegomap.planetiler.geo.GeoUtils; import com.onthegomap.planetiler.geo.GeometryException; import com.onthegomap.planetiler.geo.PointIndex; import com.onthegomap.planetiler.geo.PolygonIndex; +import com.onthegomap.planetiler.openmaptiles.OpenMapTilesProfile; +import com.onthegomap.planetiler.openmaptiles.generated.OpenMapTilesSchema; +import com.onthegomap.planetiler.openmaptiles.generated.Tables; +import com.onthegomap.planetiler.openmaptiles.util.LanguageUtils; import com.onthegomap.planetiler.reader.SourceFeature; import com.onthegomap.planetiler.stats.Stats; import com.onthegomap.planetiler.util.Parse; diff --git a/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Poi.java b/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Poi.java index 26ce999..5f376bc 100644 --- a/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Poi.java +++ b/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Poi.java @@ -45,12 +45,12 @@ import com.carrotsearch.hppc.LongIntMap; import com.onthegomap.planetiler.FeatureCollector; import com.onthegomap.planetiler.ForwardingProfile; import com.onthegomap.planetiler.VectorTile; -import com.onthegomap.planetiler.openmaptiles.generated.OpenMapTilesSchema; -import com.onthegomap.planetiler.openmaptiles.generated.Tables; -import com.onthegomap.planetiler.openmaptiles.util.LanguageUtils; import com.onthegomap.planetiler.collection.Hppc; import com.onthegomap.planetiler.config.PlanetilerConfig; import com.onthegomap.planetiler.expression.MultiExpression; +import com.onthegomap.planetiler.openmaptiles.generated.OpenMapTilesSchema; +import com.onthegomap.planetiler.openmaptiles.generated.Tables; +import com.onthegomap.planetiler.openmaptiles.util.LanguageUtils; import com.onthegomap.planetiler.stats.Stats; import com.onthegomap.planetiler.util.Parse; import com.onthegomap.planetiler.util.Translations; diff --git a/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Transportation.java b/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Transportation.java index 4743760..f275d7b 100644 --- a/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Transportation.java +++ b/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Transportation.java @@ -44,13 +44,13 @@ import static java.util.Map.entry; import com.onthegomap.planetiler.FeatureCollector; import com.onthegomap.planetiler.FeatureMerge; import com.onthegomap.planetiler.VectorTile; -import com.onthegomap.planetiler.openmaptiles.OpenMapTilesProfile; -import com.onthegomap.planetiler.openmaptiles.generated.OpenMapTilesSchema; -import com.onthegomap.planetiler.openmaptiles.generated.Tables; import com.onthegomap.planetiler.config.PlanetilerConfig; import com.onthegomap.planetiler.expression.MultiExpression; import com.onthegomap.planetiler.geo.GeoUtils; import com.onthegomap.planetiler.geo.GeometryException; +import com.onthegomap.planetiler.openmaptiles.OpenMapTilesProfile; +import com.onthegomap.planetiler.openmaptiles.generated.OpenMapTilesSchema; +import com.onthegomap.planetiler.openmaptiles.generated.Tables; import com.onthegomap.planetiler.reader.SourceFeature; import com.onthegomap.planetiler.reader.osm.OsmElement; import com.onthegomap.planetiler.reader.osm.OsmReader; diff --git a/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/TransportationName.java b/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/TransportationName.java index 39d3b80..7be39c0 100644 --- a/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/TransportationName.java +++ b/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/TransportationName.java @@ -48,12 +48,12 @@ import com.onthegomap.planetiler.FeatureCollector; import com.onthegomap.planetiler.FeatureMerge; import com.onthegomap.planetiler.ForwardingProfile; import com.onthegomap.planetiler.VectorTile; +import com.onthegomap.planetiler.collection.Hppc; +import com.onthegomap.planetiler.config.PlanetilerConfig; import com.onthegomap.planetiler.openmaptiles.OpenMapTilesProfile; import com.onthegomap.planetiler.openmaptiles.generated.OpenMapTilesSchema; import com.onthegomap.planetiler.openmaptiles.generated.Tables; import com.onthegomap.planetiler.openmaptiles.util.LanguageUtils; -import com.onthegomap.planetiler.collection.Hppc; -import com.onthegomap.planetiler.config.PlanetilerConfig; import com.onthegomap.planetiler.reader.osm.OsmElement; import com.onthegomap.planetiler.stats.Stats; import com.onthegomap.planetiler.util.Parse; diff --git a/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Water.java b/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Water.java index 7aabbad..b98ce8f 100644 --- a/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Water.java +++ b/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Water.java @@ -39,13 +39,13 @@ import com.onthegomap.planetiler.FeatureCollector; import com.onthegomap.planetiler.FeatureMerge; import com.onthegomap.planetiler.ForwardingProfile; import com.onthegomap.planetiler.VectorTile; +import com.onthegomap.planetiler.config.PlanetilerConfig; +import com.onthegomap.planetiler.expression.MultiExpression; +import com.onthegomap.planetiler.geo.GeometryException; import com.onthegomap.planetiler.openmaptiles.OpenMapTilesProfile; import com.onthegomap.planetiler.openmaptiles.generated.OpenMapTilesSchema; import com.onthegomap.planetiler.openmaptiles.generated.Tables; import com.onthegomap.planetiler.openmaptiles.util.Utils; -import com.onthegomap.planetiler.config.PlanetilerConfig; -import com.onthegomap.planetiler.expression.MultiExpression; -import com.onthegomap.planetiler.geo.GeometryException; import com.onthegomap.planetiler.reader.SourceFeature; import com.onthegomap.planetiler.stats.Stats; import com.onthegomap.planetiler.util.Translations; diff --git a/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/WaterName.java b/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/WaterName.java index 8e9ee46..c49b2f3 100644 --- a/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/WaterName.java +++ b/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/WaterName.java @@ -39,14 +39,14 @@ import static com.onthegomap.planetiler.openmaptiles.util.Utils.nullIfEmpty; import com.carrotsearch.hppc.LongObjectMap; import com.onthegomap.planetiler.FeatureCollector; -import com.onthegomap.planetiler.openmaptiles.OpenMapTilesProfile; -import com.onthegomap.planetiler.openmaptiles.generated.OpenMapTilesSchema; -import com.onthegomap.planetiler.openmaptiles.generated.Tables; -import com.onthegomap.planetiler.openmaptiles.util.LanguageUtils; import com.onthegomap.planetiler.collection.Hppc; import com.onthegomap.planetiler.config.PlanetilerConfig; import com.onthegomap.planetiler.geo.GeoUtils; import com.onthegomap.planetiler.geo.GeometryException; +import com.onthegomap.planetiler.openmaptiles.OpenMapTilesProfile; +import com.onthegomap.planetiler.openmaptiles.generated.OpenMapTilesSchema; +import com.onthegomap.planetiler.openmaptiles.generated.Tables; +import com.onthegomap.planetiler.openmaptiles.util.LanguageUtils; import com.onthegomap.planetiler.reader.SourceFeature; import com.onthegomap.planetiler.stats.Stats; import com.onthegomap.planetiler.util.Parse; diff --git a/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Waterway.java b/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Waterway.java index c1ab878..d4d7f49 100644 --- a/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Waterway.java +++ b/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Waterway.java @@ -42,14 +42,14 @@ import com.google.common.util.concurrent.AtomicDouble; import com.onthegomap.planetiler.FeatureCollector; import com.onthegomap.planetiler.FeatureMerge; import com.onthegomap.planetiler.VectorTile; +import com.onthegomap.planetiler.collection.Hppc; +import com.onthegomap.planetiler.config.PlanetilerConfig; +import com.onthegomap.planetiler.geo.GeometryException; import com.onthegomap.planetiler.openmaptiles.OpenMapTilesProfile; import com.onthegomap.planetiler.openmaptiles.generated.OpenMapTilesSchema; import com.onthegomap.planetiler.openmaptiles.generated.Tables; import com.onthegomap.planetiler.openmaptiles.util.LanguageUtils; import com.onthegomap.planetiler.openmaptiles.util.Utils; -import com.onthegomap.planetiler.collection.Hppc; -import com.onthegomap.planetiler.config.PlanetilerConfig; -import com.onthegomap.planetiler.geo.GeometryException; import com.onthegomap.planetiler.reader.SourceFeature; import com.onthegomap.planetiler.reader.osm.OsmElement; import com.onthegomap.planetiler.reader.osm.OsmReader; diff --git a/src/test/java/com/onthegomap/planetiler/openmaptiles/GenerateTest.java b/src/test/java/com/onthegomap/planetiler/openmaptiles/GenerateTest.java index a0d9ca3..96ca0f7 100644 --- a/src/test/java/com/onthegomap/planetiler/openmaptiles/GenerateTest.java +++ b/src/test/java/com/onthegomap/planetiler/openmaptiles/GenerateTest.java @@ -1,7 +1,7 @@ package com.onthegomap.planetiler.openmaptiles; -import static com.onthegomap.planetiler.openmaptiles.Generate.parseYaml; import static com.onthegomap.planetiler.expression.Expression.*; +import static com.onthegomap.planetiler.openmaptiles.Generate.parseYaml; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.DynamicTest.dynamicTest; diff --git a/src/test/java/com/onthegomap/planetiler/openmaptiles/OpenMapTilesTest.java b/src/test/java/com/onthegomap/planetiler/openmaptiles/OpenMapTilesTest.java index 5c41213..bc30a10 100644 --- a/src/test/java/com/onthegomap/planetiler/openmaptiles/OpenMapTilesTest.java +++ b/src/test/java/com/onthegomap/planetiler/openmaptiles/OpenMapTilesTest.java @@ -9,9 +9,9 @@ import static org.junit.jupiter.api.DynamicTest.dynamicTest; import com.onthegomap.planetiler.TestUtils; import com.onthegomap.planetiler.VectorTile; -import com.onthegomap.planetiler.openmaptiles.util.VerifyMonaco; import com.onthegomap.planetiler.config.Arguments; import com.onthegomap.planetiler.mbtiles.Mbtiles; +import com.onthegomap.planetiler.openmaptiles.util.VerifyMonaco; import java.io.IOException; import java.nio.file.Path; import java.util.Map; diff --git a/src/test/java/com/onthegomap/planetiler/openmaptiles/layers/AbstractLayerTest.java b/src/test/java/com/onthegomap/planetiler/openmaptiles/layers/AbstractLayerTest.java index ba23fbf..b63c57f 100644 --- a/src/test/java/com/onthegomap/planetiler/openmaptiles/layers/AbstractLayerTest.java +++ b/src/test/java/com/onthegomap/planetiler/openmaptiles/layers/AbstractLayerTest.java @@ -12,10 +12,10 @@ import static org.junit.jupiter.api.Assertions.fail; import com.onthegomap.planetiler.FeatureCollector; import com.onthegomap.planetiler.TestUtils; import com.onthegomap.planetiler.VectorTile; -import com.onthegomap.planetiler.openmaptiles.OpenMapTilesProfile; import com.onthegomap.planetiler.config.PlanetilerConfig; import com.onthegomap.planetiler.geo.GeoUtils; import com.onthegomap.planetiler.geo.GeometryException; +import com.onthegomap.planetiler.openmaptiles.OpenMapTilesProfile; import com.onthegomap.planetiler.reader.SimpleFeature; import com.onthegomap.planetiler.reader.SourceFeature; import com.onthegomap.planetiler.reader.osm.OsmReader; diff --git a/src/test/java/com/onthegomap/planetiler/openmaptiles/layers/PlaceTest.java b/src/test/java/com/onthegomap/planetiler/openmaptiles/layers/PlaceTest.java index 1523991..972f98d 100644 --- a/src/test/java/com/onthegomap/planetiler/openmaptiles/layers/PlaceTest.java +++ b/src/test/java/com/onthegomap/planetiler/openmaptiles/layers/PlaceTest.java @@ -2,11 +2,11 @@ package com.onthegomap.planetiler.openmaptiles.layers; import static com.onthegomap.planetiler.TestUtils.newPoint; import static com.onthegomap.planetiler.TestUtils.rectangle; +import static com.onthegomap.planetiler.collection.FeatureGroup.SORT_KEY_MAX; +import static com.onthegomap.planetiler.collection.FeatureGroup.SORT_KEY_MIN; import static com.onthegomap.planetiler.openmaptiles.OpenMapTilesProfile.NATURAL_EARTH_SOURCE; import static com.onthegomap.planetiler.openmaptiles.OpenMapTilesProfile.OSM_SOURCE; import static com.onthegomap.planetiler.openmaptiles.layers.Place.getSortKey; -import static com.onthegomap.planetiler.collection.FeatureGroup.SORT_KEY_MAX; -import static com.onthegomap.planetiler.collection.FeatureGroup.SORT_KEY_MIN; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.fail; diff --git a/src/test/java/com/onthegomap/planetiler/openmaptiles/layers/TransportationTest.java b/src/test/java/com/onthegomap/planetiler/openmaptiles/layers/TransportationTest.java index 0ee5a1d..79574ee 100644 --- a/src/test/java/com/onthegomap/planetiler/openmaptiles/layers/TransportationTest.java +++ b/src/test/java/com/onthegomap/planetiler/openmaptiles/layers/TransportationTest.java @@ -7,10 +7,10 @@ import static com.onthegomap.planetiler.openmaptiles.OpenMapTilesProfile.NATURAL import static com.onthegomap.planetiler.openmaptiles.OpenMapTilesProfile.OSM_SOURCE; import com.onthegomap.planetiler.FeatureCollector; -import com.onthegomap.planetiler.openmaptiles.OpenMapTilesProfile; import com.onthegomap.planetiler.config.Arguments; import com.onthegomap.planetiler.config.PlanetilerConfig; import com.onthegomap.planetiler.geo.GeometryException; +import com.onthegomap.planetiler.openmaptiles.OpenMapTilesProfile; import com.onthegomap.planetiler.reader.SimpleFeature; import com.onthegomap.planetiler.reader.SourceFeature; import com.onthegomap.planetiler.reader.osm.OsmElement;