MIN_PIXEL_SIZE_THRESHOLDS = ZoomFunction.fromMaxZoomThresholds(Map.of(
diff --git a/src/main/java/com/onthegomap/planetiler/basemap/layers/MountainPeak.java b/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/MountainPeak.java
similarity index 93%
rename from src/main/java/com/onthegomap/planetiler/basemap/layers/MountainPeak.java
rename to src/main/java/com/onthegomap/planetiler/openmaptiles/layers/MountainPeak.java
index e8b0671337..ba967cdc5e 100644
--- a/src/main/java/com/onthegomap/planetiler/basemap/layers/MountainPeak.java
+++ b/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/MountainPeak.java
@@ -33,18 +33,18 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
See https://github.com/openmaptiles/openmaptiles/blob/master/LICENSE.md for details on usage
*/
-package com.onthegomap.planetiler.basemap.layers;
+package com.onthegomap.planetiler.openmaptiles.layers;
-import static com.onthegomap.planetiler.basemap.util.Utils.elevationTags;
-import static com.onthegomap.planetiler.basemap.util.Utils.nullIfEmpty;
+import static com.onthegomap.planetiler.openmaptiles.util.Utils.elevationTags;
+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.basemap.BasemapProfile;
-import com.onthegomap.planetiler.basemap.generated.OpenMapTilesSchema;
-import com.onthegomap.planetiler.basemap.generated.Tables;
-import com.onthegomap.planetiler.basemap.util.LanguageUtils;
+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;
@@ -70,11 +70,11 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* sql files.
*/
public class MountainPeak implements
- BasemapProfile.NaturalEarthProcessor,
+ OpenMapTilesProfile.NaturalEarthProcessor,
OpenMapTilesSchema.MountainPeak,
Tables.OsmPeakPoint.Handler,
Tables.OsmMountainLinestring.Handler,
- BasemapProfile.FeaturePostProcessor {
+ OpenMapTilesProfile.FeaturePostProcessor {
/*
* Mountain peaks come from OpenStreetMap data and are ranked by importance (based on if they
diff --git a/src/main/java/com/onthegomap/planetiler/basemap/layers/Park.java b/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Park.java
similarity index 92%
rename from src/main/java/com/onthegomap/planetiler/basemap/layers/Park.java
rename to src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Park.java
index 4d39424a44..f66f34411b 100644
--- a/src/main/java/com/onthegomap/planetiler/basemap/layers/Park.java
+++ b/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Park.java
@@ -33,20 +33,20 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
See https://github.com/openmaptiles/openmaptiles/blob/master/LICENSE.md for details on usage
*/
-package com.onthegomap.planetiler.basemap.layers;
+package com.onthegomap.planetiler.openmaptiles.layers;
-import static com.onthegomap.planetiler.basemap.util.Utils.coalesce;
-import static com.onthegomap.planetiler.basemap.util.Utils.nullIfEmpty;
+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.basemap.BasemapProfile;
-import com.onthegomap.planetiler.basemap.generated.OpenMapTilesSchema;
-import com.onthegomap.planetiler.basemap.generated.Tables;
-import com.onthegomap.planetiler.basemap.util.LanguageUtils;
+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;
@@ -68,7 +68,7 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
public class Park implements
OpenMapTilesSchema.Park,
Tables.OsmParkPolygon.Handler,
- BasemapProfile.FeaturePostProcessor {
+ OpenMapTilesProfile.FeaturePostProcessor {
// constants for packing the minimum zoom ordering of park labels into the sort-key field
private static final int PARK_NATIONAL_PARK_BOOST = 1 << (SORT_KEY_BITS - 1);
diff --git a/src/main/java/com/onthegomap/planetiler/basemap/layers/Place.java b/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Place.java
similarity index 96%
rename from src/main/java/com/onthegomap/planetiler/basemap/layers/Place.java
rename to src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Place.java
index f355727e8b..099605b2d6 100644
--- a/src/main/java/com/onthegomap/planetiler/basemap/layers/Place.java
+++ b/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Place.java
@@ -33,20 +33,20 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
See https://github.com/openmaptiles/openmaptiles/blob/master/LICENSE.md for details on usage
*/
-package com.onthegomap.planetiler.basemap.layers;
+package com.onthegomap.planetiler.openmaptiles.layers;
-import static com.onthegomap.planetiler.basemap.util.Utils.coalesce;
-import static com.onthegomap.planetiler.basemap.util.Utils.nullIfEmpty;
-import static com.onthegomap.planetiler.basemap.util.Utils.nullOrEmpty;
+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.basemap.BasemapProfile;
-import com.onthegomap.planetiler.basemap.generated.OpenMapTilesSchema;
-import com.onthegomap.planetiler.basemap.generated.Tables;
-import com.onthegomap.planetiler.basemap.util.LanguageUtils;
+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;
@@ -81,14 +81,14 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
*/
public class Place implements
OpenMapTilesSchema.Place,
- BasemapProfile.NaturalEarthProcessor,
+ OpenMapTilesProfile.NaturalEarthProcessor,
Tables.OsmContinentPoint.Handler,
Tables.OsmCountryPoint.Handler,
Tables.OsmStatePoint.Handler,
Tables.OsmIslandPoint.Handler,
Tables.OsmIslandPolygon.Handler,
Tables.OsmCityPoint.Handler,
- BasemapProfile.FeaturePostProcessor {
+ OpenMapTilesProfile.FeaturePostProcessor {
/*
* Place labels locations and names come from OpenStreetMap, but we also join with natural
diff --git a/src/main/java/com/onthegomap/planetiler/basemap/layers/Poi.java b/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Poi.java
similarity index 91%
rename from src/main/java/com/onthegomap/planetiler/basemap/layers/Poi.java
rename to src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Poi.java
index 546deb021d..c090f5fb7f 100644
--- a/src/main/java/com/onthegomap/planetiler/basemap/layers/Poi.java
+++ b/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Poi.java
@@ -33,21 +33,21 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
See https://github.com/openmaptiles/openmaptiles/blob/master/LICENSE.md for details on usage
*/
-package com.onthegomap.planetiler.basemap.layers;
+package com.onthegomap.planetiler.openmaptiles.layers;
-import static com.onthegomap.planetiler.basemap.util.Utils.coalesce;
-import static com.onthegomap.planetiler.basemap.util.Utils.nullIfEmpty;
-import static com.onthegomap.planetiler.basemap.util.Utils.nullIfLong;
-import static com.onthegomap.planetiler.basemap.util.Utils.nullOrEmpty;
+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.nullIfLong;
+import static com.onthegomap.planetiler.openmaptiles.util.Utils.nullOrEmpty;
import static java.util.Map.entry;
import com.carrotsearch.hppc.LongIntMap;
import com.onthegomap.planetiler.FeatureCollector;
import com.onthegomap.planetiler.VectorTile;
-import com.onthegomap.planetiler.basemap.BasemapProfile;
-import com.onthegomap.planetiler.basemap.generated.OpenMapTilesSchema;
-import com.onthegomap.planetiler.basemap.generated.Tables;
-import com.onthegomap.planetiler.basemap.util.LanguageUtils;
+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.expression.MultiExpression;
@@ -68,7 +68,7 @@ public class Poi implements
OpenMapTilesSchema.Poi,
Tables.OsmPoiPoint.Handler,
Tables.OsmPoiPolygon.Handler,
- BasemapProfile.FeaturePostProcessor {
+ OpenMapTilesProfile.FeaturePostProcessor {
/*
* process() creates the raw POI feature from OSM elements and postProcess()
diff --git a/src/main/java/com/onthegomap/planetiler/basemap/layers/Transportation.java b/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Transportation.java
similarity index 97%
rename from src/main/java/com/onthegomap/planetiler/basemap/layers/Transportation.java
rename to src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Transportation.java
index dacc80c485..4743760c78 100644
--- a/src/main/java/com/onthegomap/planetiler/basemap/layers/Transportation.java
+++ b/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Transportation.java
@@ -33,9 +33,9 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
See https://github.com/openmaptiles/openmaptiles/blob/master/LICENSE.md for details on usage
*/
-package com.onthegomap.planetiler.basemap.layers;
+package com.onthegomap.planetiler.openmaptiles.layers;
-import static com.onthegomap.planetiler.basemap.util.Utils.*;
+import static com.onthegomap.planetiler.openmaptiles.util.Utils.*;
import static com.onthegomap.planetiler.util.MemoryEstimator.CLASS_HEADER_BYTES;
import static com.onthegomap.planetiler.util.MemoryEstimator.POINTER_BYTES;
import static com.onthegomap.planetiler.util.MemoryEstimator.estimateSize;
@@ -44,9 +44,9 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
import com.onthegomap.planetiler.FeatureCollector;
import com.onthegomap.planetiler.FeatureMerge;
import com.onthegomap.planetiler.VectorTile;
-import com.onthegomap.planetiler.basemap.BasemapProfile;
-import com.onthegomap.planetiler.basemap.generated.OpenMapTilesSchema;
-import com.onthegomap.planetiler.basemap.generated.Tables;
+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;
@@ -91,10 +91,10 @@ public class Transportation implements
Tables.OsmRailwayLinestring.Handler,
Tables.OsmShipwayLinestring.Handler,
Tables.OsmHighwayPolygon.Handler,
- BasemapProfile.NaturalEarthProcessor,
- BasemapProfile.FeaturePostProcessor,
- BasemapProfile.OsmRelationPreprocessor,
- BasemapProfile.IgnoreWikidata {
+ OpenMapTilesProfile.NaturalEarthProcessor,
+ OpenMapTilesProfile.FeaturePostProcessor,
+ OpenMapTilesProfile.OsmRelationPreprocessor,
+ OpenMapTilesProfile.IgnoreWikidata {
/*
* Generates the shape for roads, trails, ferries, railways with detailed
diff --git a/src/main/java/com/onthegomap/planetiler/basemap/layers/TransportationName.java b/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/TransportationName.java
similarity index 95%
rename from src/main/java/com/onthegomap/planetiler/basemap/layers/TransportationName.java
rename to src/main/java/com/onthegomap/planetiler/openmaptiles/layers/TransportationName.java
index 8eaeb271e4..39d3b80303 100644
--- a/src/main/java/com/onthegomap/planetiler/basemap/layers/TransportationName.java
+++ b/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/TransportationName.java
@@ -33,12 +33,12 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
See https://github.com/openmaptiles/openmaptiles/blob/master/LICENSE.md for details on usage
*/
-package com.onthegomap.planetiler.basemap.layers;
+package com.onthegomap.planetiler.openmaptiles.layers;
-import static com.onthegomap.planetiler.basemap.layers.Transportation.highwayClass;
-import static com.onthegomap.planetiler.basemap.layers.Transportation.highwaySubclass;
-import static com.onthegomap.planetiler.basemap.layers.Transportation.isFootwayOrSteps;
-import static com.onthegomap.planetiler.basemap.util.Utils.*;
+import static com.onthegomap.planetiler.openmaptiles.layers.Transportation.highwayClass;
+import static com.onthegomap.planetiler.openmaptiles.layers.Transportation.highwaySubclass;
+import static com.onthegomap.planetiler.openmaptiles.layers.Transportation.isFootwayOrSteps;
+import static com.onthegomap.planetiler.openmaptiles.util.Utils.*;
import com.carrotsearch.hppc.LongArrayList;
import com.carrotsearch.hppc.LongByteMap;
@@ -48,10 +48,10 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
import com.onthegomap.planetiler.FeatureMerge;
import com.onthegomap.planetiler.ForwardingProfile;
import com.onthegomap.planetiler.VectorTile;
-import com.onthegomap.planetiler.basemap.BasemapProfile;
-import com.onthegomap.planetiler.basemap.generated.OpenMapTilesSchema;
-import com.onthegomap.planetiler.basemap.generated.Tables;
-import com.onthegomap.planetiler.basemap.util.LanguageUtils;
+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;
@@ -79,8 +79,8 @@ public class TransportationName implements
Tables.OsmHighwayLinestring.Handler,
Tables.OsmAerialwayLinestring.Handler,
Tables.OsmShipwayLinestring.Handler,
- BasemapProfile.FeaturePostProcessor,
- BasemapProfile.IgnoreWikidata,
+ OpenMapTilesProfile.FeaturePostProcessor,
+ OpenMapTilesProfile.IgnoreWikidata,
ForwardingProfile.OsmNodePreprocessor,
ForwardingProfile.OsmWayPreprocessor {
diff --git a/src/main/java/com/onthegomap/planetiler/basemap/layers/Water.java b/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Water.java
similarity index 92%
rename from src/main/java/com/onthegomap/planetiler/basemap/layers/Water.java
rename to src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Water.java
index 49afd2920e..18dcd21858 100644
--- a/src/main/java/com/onthegomap/planetiler/basemap/layers/Water.java
+++ b/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Water.java
@@ -33,13 +33,13 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
See https://github.com/openmaptiles/openmaptiles/blob/master/LICENSE.md for details on usage
*/
-package com.onthegomap.planetiler.basemap.layers;
+package com.onthegomap.planetiler.openmaptiles.layers;
import com.onthegomap.planetiler.FeatureCollector;
-import com.onthegomap.planetiler.basemap.BasemapProfile;
-import com.onthegomap.planetiler.basemap.generated.OpenMapTilesSchema;
-import com.onthegomap.planetiler.basemap.generated.Tables;
-import com.onthegomap.planetiler.basemap.util.Utils;
+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.reader.SourceFeature;
@@ -55,8 +55,8 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
public class Water implements
OpenMapTilesSchema.Water,
Tables.OsmWaterPolygon.Handler,
- BasemapProfile.NaturalEarthProcessor,
- BasemapProfile.OsmWaterPolygonProcessor {
+ OpenMapTilesProfile.NaturalEarthProcessor,
+ OpenMapTilesProfile.OsmWaterPolygonProcessor {
/*
* At low zoom levels, use natural earth for oceans and major lakes, and at high zoom levels
diff --git a/src/main/java/com/onthegomap/planetiler/basemap/layers/WaterName.java b/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/WaterName.java
similarity index 94%
rename from src/main/java/com/onthegomap/planetiler/basemap/layers/WaterName.java
rename to src/main/java/com/onthegomap/planetiler/openmaptiles/layers/WaterName.java
index ed0e673aa5..8e9ee467eb 100644
--- a/src/main/java/com/onthegomap/planetiler/basemap/layers/WaterName.java
+++ b/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/WaterName.java
@@ -33,16 +33,16 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
See https://github.com/openmaptiles/openmaptiles/blob/master/LICENSE.md for details on usage
*/
-package com.onthegomap.planetiler.basemap.layers;
+package com.onthegomap.planetiler.openmaptiles.layers;
-import static com.onthegomap.planetiler.basemap.util.Utils.nullIfEmpty;
+import static com.onthegomap.planetiler.openmaptiles.util.Utils.nullIfEmpty;
import com.carrotsearch.hppc.LongObjectMap;
import com.onthegomap.planetiler.FeatureCollector;
-import com.onthegomap.planetiler.basemap.BasemapProfile;
-import com.onthegomap.planetiler.basemap.generated.OpenMapTilesSchema;
-import com.onthegomap.planetiler.basemap.generated.Tables;
-import com.onthegomap.planetiler.basemap.util.LanguageUtils;
+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;
@@ -69,8 +69,8 @@ public class WaterName implements
OpenMapTilesSchema.WaterName,
Tables.OsmMarinePoint.Handler,
Tables.OsmWaterPolygon.Handler,
- BasemapProfile.NaturalEarthProcessor,
- BasemapProfile.LakeCenterlineProcessor {
+ OpenMapTilesProfile.NaturalEarthProcessor,
+ OpenMapTilesProfile.LakeCenterlineProcessor {
/*
* Labels for lakes and oceans come primarily from OpenStreetMap data, but we also join
diff --git a/src/main/java/com/onthegomap/planetiler/basemap/layers/Waterway.java b/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Waterway.java
similarity index 93%
rename from src/main/java/com/onthegomap/planetiler/basemap/layers/Waterway.java
rename to src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Waterway.java
index c91fcb6c5a..c1ab87831b 100644
--- a/src/main/java/com/onthegomap/planetiler/basemap/layers/Waterway.java
+++ b/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Waterway.java
@@ -33,20 +33,20 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
See https://github.com/openmaptiles/openmaptiles/blob/master/LICENSE.md for details on usage
*/
-package com.onthegomap.planetiler.basemap.layers;
+package com.onthegomap.planetiler.openmaptiles.layers;
-import static com.onthegomap.planetiler.basemap.util.Utils.nullIfEmpty;
+import static com.onthegomap.planetiler.openmaptiles.util.Utils.nullIfEmpty;
import com.carrotsearch.hppc.LongObjectHashMap;
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.basemap.BasemapProfile;
-import com.onthegomap.planetiler.basemap.generated.OpenMapTilesSchema;
-import com.onthegomap.planetiler.basemap.generated.Tables;
-import com.onthegomap.planetiler.basemap.util.LanguageUtils;
-import com.onthegomap.planetiler.basemap.util.Utils;
+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;
@@ -70,10 +70,10 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
public class Waterway implements
OpenMapTilesSchema.Waterway,
Tables.OsmWaterwayLinestring.Handler,
- BasemapProfile.FeaturePostProcessor,
- BasemapProfile.NaturalEarthProcessor,
- BasemapProfile.OsmRelationPreprocessor,
- BasemapProfile.OsmAllProcessor {
+ OpenMapTilesProfile.FeaturePostProcessor,
+ OpenMapTilesProfile.NaturalEarthProcessor,
+ OpenMapTilesProfile.OsmRelationPreprocessor,
+ OpenMapTilesProfile.OsmAllProcessor {
/*
* Uses Natural Earth at lower zoom-levels and OpenStreetMap at higher zoom levels.
diff --git a/src/main/java/com/onthegomap/planetiler/basemap/util/LanguageUtils.java b/src/main/java/com/onthegomap/planetiler/openmaptiles/util/LanguageUtils.java
similarity index 97%
rename from src/main/java/com/onthegomap/planetiler/basemap/util/LanguageUtils.java
rename to src/main/java/com/onthegomap/planetiler/openmaptiles/util/LanguageUtils.java
index d65b26e0e3..8a29c5a158 100644
--- a/src/main/java/com/onthegomap/planetiler/basemap/util/LanguageUtils.java
+++ b/src/main/java/com/onthegomap/planetiler/openmaptiles/util/LanguageUtils.java
@@ -33,10 +33,10 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
See https://github.com/openmaptiles/openmaptiles/blob/master/LICENSE.md for details on usage
*/
-package com.onthegomap.planetiler.basemap.util;
+package com.onthegomap.planetiler.openmaptiles.util;
-import static com.onthegomap.planetiler.basemap.util.Utils.coalesce;
-import static com.onthegomap.planetiler.basemap.util.Utils.nullIfEmpty;
+import static com.onthegomap.planetiler.openmaptiles.util.Utils.coalesce;
+import static com.onthegomap.planetiler.openmaptiles.util.Utils.nullIfEmpty;
import com.onthegomap.planetiler.util.Translations;
import java.util.HashMap;
diff --git a/src/main/java/com/onthegomap/planetiler/basemap/util/Utils.java b/src/main/java/com/onthegomap/planetiler/openmaptiles/util/Utils.java
similarity index 98%
rename from src/main/java/com/onthegomap/planetiler/basemap/util/Utils.java
rename to src/main/java/com/onthegomap/planetiler/openmaptiles/util/Utils.java
index 130815538b..fe8190cb00 100644
--- a/src/main/java/com/onthegomap/planetiler/basemap/util/Utils.java
+++ b/src/main/java/com/onthegomap/planetiler/openmaptiles/util/Utils.java
@@ -1,4 +1,4 @@
-package com.onthegomap.planetiler.basemap.util;
+package com.onthegomap.planetiler.openmaptiles.util;
import com.onthegomap.planetiler.util.Parse;
import java.util.Map;
diff --git a/src/main/java/com/onthegomap/planetiler/basemap/util/VerifyMonaco.java b/src/main/java/com/onthegomap/planetiler/openmaptiles/util/VerifyMonaco.java
similarity index 96%
rename from src/main/java/com/onthegomap/planetiler/basemap/util/VerifyMonaco.java
rename to src/main/java/com/onthegomap/planetiler/openmaptiles/util/VerifyMonaco.java
index 5250a80cf2..efd57d429e 100644
--- a/src/main/java/com/onthegomap/planetiler/basemap/util/VerifyMonaco.java
+++ b/src/main/java/com/onthegomap/planetiler/openmaptiles/util/VerifyMonaco.java
@@ -1,4 +1,4 @@
-package com.onthegomap.planetiler.basemap.util;
+package com.onthegomap.planetiler.openmaptiles.util;
import com.onthegomap.planetiler.mbtiles.Mbtiles;
import com.onthegomap.planetiler.mbtiles.Verify;
diff --git a/src/test/java/com/onthegomap/planetiler/basemap/GenerateTest.java b/src/test/java/com/onthegomap/planetiler/openmaptiles/GenerateTest.java
similarity index 97%
rename from src/test/java/com/onthegomap/planetiler/basemap/GenerateTest.java
rename to src/test/java/com/onthegomap/planetiler/openmaptiles/GenerateTest.java
index 227dd4ac6d..a0d9ca3dc0 100644
--- a/src/test/java/com/onthegomap/planetiler/basemap/GenerateTest.java
+++ b/src/test/java/com/onthegomap/planetiler/openmaptiles/GenerateTest.java
@@ -1,6 +1,6 @@
-package com.onthegomap.planetiler.basemap;
+package com.onthegomap.planetiler.openmaptiles;
-import static com.onthegomap.planetiler.basemap.Generate.parseYaml;
+import static com.onthegomap.planetiler.openmaptiles.Generate.parseYaml;
import static com.onthegomap.planetiler.expression.Expression.*;
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/basemap/BasemapProfileTest.java b/src/test/java/com/onthegomap/planetiler/openmaptiles/OpenMapTilesProfileTest.java
similarity index 86%
rename from src/test/java/com/onthegomap/planetiler/basemap/BasemapProfileTest.java
rename to src/test/java/com/onthegomap/planetiler/openmaptiles/OpenMapTilesProfileTest.java
index e7d4941886..864d8ee2d7 100644
--- a/src/test/java/com/onthegomap/planetiler/basemap/BasemapProfileTest.java
+++ b/src/test/java/com/onthegomap/planetiler/openmaptiles/OpenMapTilesProfileTest.java
@@ -1,4 +1,4 @@
-package com.onthegomap.planetiler.basemap;
+package com.onthegomap.planetiler.openmaptiles;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -11,12 +11,12 @@
import java.util.List;
import org.junit.jupiter.api.Test;
-class BasemapProfileTest {
+class OpenMapTilesProfileTest {
private final Wikidata.WikidataTranslations wikidataTranslations = new Wikidata.WikidataTranslations();
private final Translations translations = Translations.defaultProvider(List.of("en", "es", "de"))
.addTranslationProvider(wikidataTranslations);
- private final BasemapProfile profile = new BasemapProfile(translations, PlanetilerConfig.defaults(),
+ private final OpenMapTilesProfile profile = new OpenMapTilesProfile(translations, PlanetilerConfig.defaults(),
Stats.inMemory());
@Test
diff --git a/src/test/java/com/onthegomap/planetiler/basemap/BasemapTest.java b/src/test/java/com/onthegomap/planetiler/openmaptiles/OpenMapTilesTest.java
similarity index 95%
rename from src/test/java/com/onthegomap/planetiler/basemap/BasemapTest.java
rename to src/test/java/com/onthegomap/planetiler/openmaptiles/OpenMapTilesTest.java
index ef50abff10..5c41213a4b 100644
--- a/src/test/java/com/onthegomap/planetiler/basemap/BasemapTest.java
+++ b/src/test/java/com/onthegomap/planetiler/openmaptiles/OpenMapTilesTest.java
@@ -1,15 +1,15 @@
-package com.onthegomap.planetiler.basemap;
+package com.onthegomap.planetiler.openmaptiles;
import static com.onthegomap.planetiler.TestUtils.assertContains;
import static com.onthegomap.planetiler.TestUtils.assertFeatureNear;
-import static com.onthegomap.planetiler.basemap.util.VerifyMonaco.MONACO_BOUNDS;
+import static com.onthegomap.planetiler.openmaptiles.util.VerifyMonaco.MONACO_BOUNDS;
import static com.onthegomap.planetiler.util.Gzip.gunzip;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.DynamicTest.dynamicTest;
import com.onthegomap.planetiler.TestUtils;
import com.onthegomap.planetiler.VectorTile;
-import com.onthegomap.planetiler.basemap.util.VerifyMonaco;
+import com.onthegomap.planetiler.openmaptiles.util.VerifyMonaco;
import com.onthegomap.planetiler.config.Arguments;
import com.onthegomap.planetiler.mbtiles.Mbtiles;
import java.io.IOException;
@@ -30,12 +30,12 @@
import org.locationtech.jts.geom.Polygon;
/**
- * End-to-end tests for basemap generation.
+ * End-to-end tests for OpenMapTiles generation.
*
* Generates an entire map for the smallest openstreetmap extract available (Monaco) and asserts that expected output
* features exist
*/
-class BasemapTest {
+class OpenMapTilesTest {
@TempDir
static Path tmpDir;
@@ -44,7 +44,7 @@ class BasemapTest {
@BeforeAll
public static void runPlanetiler() throws Exception {
Path dbPath = tmpDir.resolve("output.mbtiles");
- BasemapMain.run(Arguments.of(
+ OpenMapTilesMain.run(Arguments.of(
// Override input source locations
"osm_path", TestUtils.pathToResource("monaco-latest.osm.pbf"),
"natural_earth_path", TestUtils.pathToResource("natural_earth_vector.sqlite.zip"),
diff --git a/src/test/java/com/onthegomap/planetiler/basemap/layers/AbstractLayerTest.java b/src/test/java/com/onthegomap/planetiler/openmaptiles/layers/AbstractLayerTest.java
similarity index 95%
rename from src/test/java/com/onthegomap/planetiler/basemap/layers/AbstractLayerTest.java
rename to src/test/java/com/onthegomap/planetiler/openmaptiles/layers/AbstractLayerTest.java
index 581af6b8ff..ba23fbf30a 100644
--- a/src/test/java/com/onthegomap/planetiler/basemap/layers/AbstractLayerTest.java
+++ b/src/test/java/com/onthegomap/planetiler/openmaptiles/layers/AbstractLayerTest.java
@@ -1,18 +1,18 @@
-package com.onthegomap.planetiler.basemap.layers;
+package com.onthegomap.planetiler.openmaptiles.layers;
import static com.onthegomap.planetiler.TestUtils.assertSubmap;
import static com.onthegomap.planetiler.TestUtils.newLineString;
import static com.onthegomap.planetiler.TestUtils.newPoint;
import static com.onthegomap.planetiler.TestUtils.rectangle;
-import static com.onthegomap.planetiler.basemap.BasemapProfile.OSM_SOURCE;
-import static com.onthegomap.planetiler.basemap.util.Utils.coalesce;
+import static com.onthegomap.planetiler.openmaptiles.OpenMapTilesProfile.OSM_SOURCE;
+import static com.onthegomap.planetiler.openmaptiles.util.Utils.coalesce;
import static org.junit.jupiter.api.Assertions.assertEquals;
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.basemap.BasemapProfile;
+import com.onthegomap.planetiler.openmaptiles.OpenMapTilesProfile;
import com.onthegomap.planetiler.config.PlanetilerConfig;
import com.onthegomap.planetiler.geo.GeoUtils;
import com.onthegomap.planetiler.geo.GeometryException;
@@ -37,7 +37,7 @@ public abstract class AbstractLayerTest {
.addTranslationProvider(wikidataTranslations);
final PlanetilerConfig params = PlanetilerConfig.defaults();
- final BasemapProfile profile = new BasemapProfile(translations, PlanetilerConfig.defaults(),
+ final OpenMapTilesProfile profile = new OpenMapTilesProfile(translations, PlanetilerConfig.defaults(),
Stats.inMemory());
final Stats stats = Stats.inMemory();
final FeatureCollector.Factory featureCollectorFactory = new FeatureCollector.Factory(params, stats);
diff --git a/src/test/java/com/onthegomap/planetiler/basemap/layers/AerodromeLabelTest.java b/src/test/java/com/onthegomap/planetiler/openmaptiles/layers/AerodromeLabelTest.java
similarity index 98%
rename from src/test/java/com/onthegomap/planetiler/basemap/layers/AerodromeLabelTest.java
rename to src/test/java/com/onthegomap/planetiler/openmaptiles/layers/AerodromeLabelTest.java
index 5de48118b2..82b8cfe203 100644
--- a/src/test/java/com/onthegomap/planetiler/basemap/layers/AerodromeLabelTest.java
+++ b/src/test/java/com/onthegomap/planetiler/openmaptiles/layers/AerodromeLabelTest.java
@@ -1,4 +1,4 @@
-package com.onthegomap.planetiler.basemap.layers;
+package com.onthegomap.planetiler.openmaptiles.layers;
import java.util.List;
import java.util.Map;
diff --git a/src/test/java/com/onthegomap/planetiler/basemap/layers/AerowayTest.java b/src/test/java/com/onthegomap/planetiler/openmaptiles/layers/AerowayTest.java
similarity index 97%
rename from src/test/java/com/onthegomap/planetiler/basemap/layers/AerowayTest.java
rename to src/test/java/com/onthegomap/planetiler/openmaptiles/layers/AerowayTest.java
index 67ebd33a19..ec55d8a5a6 100644
--- a/src/test/java/com/onthegomap/planetiler/basemap/layers/AerowayTest.java
+++ b/src/test/java/com/onthegomap/planetiler/openmaptiles/layers/AerowayTest.java
@@ -1,4 +1,4 @@
-package com.onthegomap.planetiler.basemap.layers;
+package com.onthegomap.planetiler.openmaptiles.layers;
import java.util.List;
import java.util.Map;
diff --git a/src/test/java/com/onthegomap/planetiler/basemap/layers/BoundaryTest.java b/src/test/java/com/onthegomap/planetiler/openmaptiles/layers/BoundaryTest.java
similarity index 98%
rename from src/test/java/com/onthegomap/planetiler/basemap/layers/BoundaryTest.java
rename to src/test/java/com/onthegomap/planetiler/openmaptiles/layers/BoundaryTest.java
index 5ac0e1ccea..33070632ef 100644
--- a/src/test/java/com/onthegomap/planetiler/basemap/layers/BoundaryTest.java
+++ b/src/test/java/com/onthegomap/planetiler/openmaptiles/layers/BoundaryTest.java
@@ -1,9 +1,9 @@
-package com.onthegomap.planetiler.basemap.layers;
+package com.onthegomap.planetiler.openmaptiles.layers;
import static com.onthegomap.planetiler.TestUtils.newLineString;
import static com.onthegomap.planetiler.TestUtils.rectangle;
-import static com.onthegomap.planetiler.basemap.BasemapProfile.NATURAL_EARTH_SOURCE;
-import static com.onthegomap.planetiler.basemap.BasemapProfile.OSM_SOURCE;
+import static com.onthegomap.planetiler.openmaptiles.OpenMapTilesProfile.NATURAL_EARTH_SOURCE;
+import static com.onthegomap.planetiler.openmaptiles.OpenMapTilesProfile.OSM_SOURCE;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNull;
diff --git a/src/test/java/com/onthegomap/planetiler/basemap/layers/BuildingTest.java b/src/test/java/com/onthegomap/planetiler/openmaptiles/layers/BuildingTest.java
similarity index 97%
rename from src/test/java/com/onthegomap/planetiler/basemap/layers/BuildingTest.java
rename to src/test/java/com/onthegomap/planetiler/openmaptiles/layers/BuildingTest.java
index c97a96e981..8a4b9eeddf 100644
--- a/src/test/java/com/onthegomap/planetiler/basemap/layers/BuildingTest.java
+++ b/src/test/java/com/onthegomap/planetiler/openmaptiles/layers/BuildingTest.java
@@ -1,7 +1,7 @@
-package com.onthegomap.planetiler.basemap.layers;
+package com.onthegomap.planetiler.openmaptiles.layers;
import static com.onthegomap.planetiler.TestUtils.rectangle;
-import static com.onthegomap.planetiler.basemap.BasemapProfile.OSM_SOURCE;
+import static com.onthegomap.planetiler.openmaptiles.OpenMapTilesProfile.OSM_SOURCE;
import static org.junit.jupiter.api.Assertions.assertEquals;
import com.onthegomap.planetiler.VectorTile;
diff --git a/src/test/java/com/onthegomap/planetiler/basemap/layers/HousenumberTest.java b/src/test/java/com/onthegomap/planetiler/openmaptiles/layers/HousenumberTest.java
similarity index 92%
rename from src/test/java/com/onthegomap/planetiler/basemap/layers/HousenumberTest.java
rename to src/test/java/com/onthegomap/planetiler/openmaptiles/layers/HousenumberTest.java
index f2f0dedc1e..045fce4815 100644
--- a/src/test/java/com/onthegomap/planetiler/basemap/layers/HousenumberTest.java
+++ b/src/test/java/com/onthegomap/planetiler/openmaptiles/layers/HousenumberTest.java
@@ -1,4 +1,4 @@
-package com.onthegomap.planetiler.basemap.layers;
+package com.onthegomap.planetiler.openmaptiles.layers;
import java.util.List;
import java.util.Map;
diff --git a/src/test/java/com/onthegomap/planetiler/basemap/layers/LandcoverTest.java b/src/test/java/com/onthegomap/planetiler/openmaptiles/layers/LandcoverTest.java
similarity index 97%
rename from src/test/java/com/onthegomap/planetiler/basemap/layers/LandcoverTest.java
rename to src/test/java/com/onthegomap/planetiler/openmaptiles/layers/LandcoverTest.java
index 94d26cea2c..5f2fab2e98 100644
--- a/src/test/java/com/onthegomap/planetiler/basemap/layers/LandcoverTest.java
+++ b/src/test/java/com/onthegomap/planetiler/openmaptiles/layers/LandcoverTest.java
@@ -1,7 +1,7 @@
-package com.onthegomap.planetiler.basemap.layers;
+package com.onthegomap.planetiler.openmaptiles.layers;
import static com.onthegomap.planetiler.TestUtils.rectangle;
-import static com.onthegomap.planetiler.basemap.BasemapProfile.NATURAL_EARTH_SOURCE;
+import static com.onthegomap.planetiler.openmaptiles.OpenMapTilesProfile.NATURAL_EARTH_SOURCE;
import static org.junit.jupiter.api.Assertions.assertEquals;
import com.onthegomap.planetiler.VectorTile;
diff --git a/src/test/java/com/onthegomap/planetiler/basemap/layers/LanduseTest.java b/src/test/java/com/onthegomap/planetiler/openmaptiles/layers/LanduseTest.java
similarity index 93%
rename from src/test/java/com/onthegomap/planetiler/basemap/layers/LanduseTest.java
rename to src/test/java/com/onthegomap/planetiler/openmaptiles/layers/LanduseTest.java
index a054d00f09..ff21bcab1d 100644
--- a/src/test/java/com/onthegomap/planetiler/basemap/layers/LanduseTest.java
+++ b/src/test/java/com/onthegomap/planetiler/openmaptiles/layers/LanduseTest.java
@@ -1,7 +1,7 @@
-package com.onthegomap.planetiler.basemap.layers;
+package com.onthegomap.planetiler.openmaptiles.layers;
import static com.onthegomap.planetiler.TestUtils.rectangle;
-import static com.onthegomap.planetiler.basemap.BasemapProfile.NATURAL_EARTH_SOURCE;
+import static com.onthegomap.planetiler.openmaptiles.OpenMapTilesProfile.NATURAL_EARTH_SOURCE;
import com.onthegomap.planetiler.geo.GeoUtils;
import com.onthegomap.planetiler.reader.SimpleFeature;
diff --git a/src/test/java/com/onthegomap/planetiler/basemap/layers/MountainPeakTest.java b/src/test/java/com/onthegomap/planetiler/openmaptiles/layers/MountainPeakTest.java
similarity index 96%
rename from src/test/java/com/onthegomap/planetiler/basemap/layers/MountainPeakTest.java
rename to src/test/java/com/onthegomap/planetiler/openmaptiles/layers/MountainPeakTest.java
index f121e78668..991bbfbbed 100644
--- a/src/test/java/com/onthegomap/planetiler/basemap/layers/MountainPeakTest.java
+++ b/src/test/java/com/onthegomap/planetiler/openmaptiles/layers/MountainPeakTest.java
@@ -1,9 +1,9 @@
-package com.onthegomap.planetiler.basemap.layers;
+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.basemap.BasemapProfile.NATURAL_EARTH_SOURCE;
-import static com.onthegomap.planetiler.basemap.BasemapProfile.OSM_SOURCE;
+import static com.onthegomap.planetiler.openmaptiles.OpenMapTilesProfile.NATURAL_EARTH_SOURCE;
+import static com.onthegomap.planetiler.openmaptiles.OpenMapTilesProfile.OSM_SOURCE;
import static org.junit.jupiter.api.Assertions.assertEquals;
import com.google.common.collect.Lists;
diff --git a/src/test/java/com/onthegomap/planetiler/basemap/layers/ParkTest.java b/src/test/java/com/onthegomap/planetiler/openmaptiles/layers/ParkTest.java
similarity index 98%
rename from src/test/java/com/onthegomap/planetiler/basemap/layers/ParkTest.java
rename to src/test/java/com/onthegomap/planetiler/openmaptiles/layers/ParkTest.java
index d914891bb3..33cd12a2ab 100644
--- a/src/test/java/com/onthegomap/planetiler/basemap/layers/ParkTest.java
+++ b/src/test/java/com/onthegomap/planetiler/openmaptiles/layers/ParkTest.java
@@ -1,4 +1,4 @@
-package com.onthegomap.planetiler.basemap.layers;
+package com.onthegomap.planetiler.openmaptiles.layers;
import com.onthegomap.planetiler.geo.GeoUtils;
import java.util.List;
diff --git a/src/test/java/com/onthegomap/planetiler/basemap/layers/PlaceTest.java b/src/test/java/com/onthegomap/planetiler/openmaptiles/layers/PlaceTest.java
similarity index 97%
rename from src/test/java/com/onthegomap/planetiler/basemap/layers/PlaceTest.java
rename to src/test/java/com/onthegomap/planetiler/openmaptiles/layers/PlaceTest.java
index 8c7e9feaee..1523991788 100644
--- a/src/test/java/com/onthegomap/planetiler/basemap/layers/PlaceTest.java
+++ b/src/test/java/com/onthegomap/planetiler/openmaptiles/layers/PlaceTest.java
@@ -1,10 +1,10 @@
-package com.onthegomap.planetiler.basemap.layers;
+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.basemap.BasemapProfile.NATURAL_EARTH_SOURCE;
-import static com.onthegomap.planetiler.basemap.BasemapProfile.OSM_SOURCE;
-import static com.onthegomap.planetiler.basemap.layers.Place.getSortKey;
+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;
diff --git a/src/test/java/com/onthegomap/planetiler/basemap/layers/PoiTest.java b/src/test/java/com/onthegomap/planetiler/openmaptiles/layers/PoiTest.java
similarity index 98%
rename from src/test/java/com/onthegomap/planetiler/basemap/layers/PoiTest.java
rename to src/test/java/com/onthegomap/planetiler/openmaptiles/layers/PoiTest.java
index 82dedb1e46..bfa26e71e2 100644
--- a/src/test/java/com/onthegomap/planetiler/basemap/layers/PoiTest.java
+++ b/src/test/java/com/onthegomap/planetiler/openmaptiles/layers/PoiTest.java
@@ -1,4 +1,4 @@
-package com.onthegomap.planetiler.basemap.layers;
+package com.onthegomap.planetiler.openmaptiles.layers;
import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/src/test/java/com/onthegomap/planetiler/basemap/layers/TransportationTest.java b/src/test/java/com/onthegomap/planetiler/openmaptiles/layers/TransportationTest.java
similarity index 98%
rename from src/test/java/com/onthegomap/planetiler/basemap/layers/TransportationTest.java
rename to src/test/java/com/onthegomap/planetiler/openmaptiles/layers/TransportationTest.java
index 613f80b43d..535ab5ebf7 100644
--- a/src/test/java/com/onthegomap/planetiler/basemap/layers/TransportationTest.java
+++ b/src/test/java/com/onthegomap/planetiler/openmaptiles/layers/TransportationTest.java
@@ -1,13 +1,13 @@
-package com.onthegomap.planetiler.basemap.layers;
+package com.onthegomap.planetiler.openmaptiles.layers;
import static com.onthegomap.planetiler.TestUtils.newLineString;
import static com.onthegomap.planetiler.TestUtils.newPoint;
import static com.onthegomap.planetiler.TestUtils.rectangle;
-import static com.onthegomap.planetiler.basemap.BasemapProfile.NATURAL_EARTH_SOURCE;
-import static com.onthegomap.planetiler.basemap.BasemapProfile.OSM_SOURCE;
+import static com.onthegomap.planetiler.openmaptiles.OpenMapTilesProfile.NATURAL_EARTH_SOURCE;
+import static com.onthegomap.planetiler.openmaptiles.OpenMapTilesProfile.OSM_SOURCE;
import com.onthegomap.planetiler.FeatureCollector;
-import com.onthegomap.planetiler.basemap.BasemapProfile;
+import com.onthegomap.planetiler.openmaptiles.OpenMapTilesProfile;
import com.onthegomap.planetiler.config.Arguments;
import com.onthegomap.planetiler.config.PlanetilerConfig;
import com.onthegomap.planetiler.geo.GeometryException;
@@ -400,7 +400,7 @@ void testMinorRouteRef() {
"highway", "tertiary"
))));
- var profileWithMinorRefs = new BasemapProfile(translations, PlanetilerConfig.from(Arguments.of(Map.of(
+ var profileWithMinorRefs = new OpenMapTilesProfile(translations, PlanetilerConfig.from(Arguments.of(Map.of(
"transportation_name_minor_refs", "true"
))), Stats.inMemory());
@@ -1225,7 +1225,7 @@ void testSortKeys() {
@Test
void testTransportationNameLayerRequiresTransportationLayer() {
- var profile = new BasemapProfile(translations, PlanetilerConfig.from(Arguments.of(
+ var profile = new OpenMapTilesProfile(translations, PlanetilerConfig.from(Arguments.of(
"only_layers", "transportation_name"
)), Stats.inMemory());
SourceFeature feature = lineFeature(Map.of(
diff --git a/src/test/java/com/onthegomap/planetiler/basemap/layers/WaterNameTest.java b/src/test/java/com/onthegomap/planetiler/openmaptiles/layers/WaterNameTest.java
similarity index 94%
rename from src/test/java/com/onthegomap/planetiler/basemap/layers/WaterNameTest.java
rename to src/test/java/com/onthegomap/planetiler/openmaptiles/layers/WaterNameTest.java
index dd5370b0b9..bcf3317b26 100644
--- a/src/test/java/com/onthegomap/planetiler/basemap/layers/WaterNameTest.java
+++ b/src/test/java/com/onthegomap/planetiler/openmaptiles/layers/WaterNameTest.java
@@ -1,10 +1,10 @@
-package com.onthegomap.planetiler.basemap.layers;
+package com.onthegomap.planetiler.openmaptiles.layers;
import static com.onthegomap.planetiler.TestUtils.newLineString;
import static com.onthegomap.planetiler.TestUtils.rectangle;
-import static com.onthegomap.planetiler.basemap.BasemapProfile.LAKE_CENTERLINE_SOURCE;
-import static com.onthegomap.planetiler.basemap.BasemapProfile.NATURAL_EARTH_SOURCE;
-import static com.onthegomap.planetiler.basemap.BasemapProfile.OSM_SOURCE;
+import static com.onthegomap.planetiler.openmaptiles.OpenMapTilesProfile.LAKE_CENTERLINE_SOURCE;
+import static com.onthegomap.planetiler.openmaptiles.OpenMapTilesProfile.NATURAL_EARTH_SOURCE;
+import static com.onthegomap.planetiler.openmaptiles.OpenMapTilesProfile.OSM_SOURCE;
import com.onthegomap.planetiler.TestUtils;
import com.onthegomap.planetiler.geo.GeoUtils;
diff --git a/src/test/java/com/onthegomap/planetiler/basemap/layers/WaterTest.java b/src/test/java/com/onthegomap/planetiler/openmaptiles/layers/WaterTest.java
similarity index 94%
rename from src/test/java/com/onthegomap/planetiler/basemap/layers/WaterTest.java
rename to src/test/java/com/onthegomap/planetiler/openmaptiles/layers/WaterTest.java
index 2347a3f3f6..703ce278ad 100644
--- a/src/test/java/com/onthegomap/planetiler/basemap/layers/WaterTest.java
+++ b/src/test/java/com/onthegomap/planetiler/openmaptiles/layers/WaterTest.java
@@ -1,9 +1,9 @@
-package com.onthegomap.planetiler.basemap.layers;
+package com.onthegomap.planetiler.openmaptiles.layers;
import static com.onthegomap.planetiler.TestUtils.rectangle;
-import static com.onthegomap.planetiler.basemap.BasemapProfile.NATURAL_EARTH_SOURCE;
-import static com.onthegomap.planetiler.basemap.BasemapProfile.OSM_SOURCE;
-import static com.onthegomap.planetiler.basemap.BasemapProfile.WATER_POLYGON_SOURCE;
+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.OpenMapTilesProfile.WATER_POLYGON_SOURCE;
import com.onthegomap.planetiler.reader.SimpleFeature;
import java.util.List;
diff --git a/src/test/java/com/onthegomap/planetiler/basemap/layers/WaterwayTest.java b/src/test/java/com/onthegomap/planetiler/openmaptiles/layers/WaterwayTest.java
similarity index 96%
rename from src/test/java/com/onthegomap/planetiler/basemap/layers/WaterwayTest.java
rename to src/test/java/com/onthegomap/planetiler/openmaptiles/layers/WaterwayTest.java
index b43d9a9d2d..d05cedb626 100644
--- a/src/test/java/com/onthegomap/planetiler/basemap/layers/WaterwayTest.java
+++ b/src/test/java/com/onthegomap/planetiler/openmaptiles/layers/WaterwayTest.java
@@ -1,8 +1,8 @@
-package com.onthegomap.planetiler.basemap.layers;
+package com.onthegomap.planetiler.openmaptiles.layers;
import static com.onthegomap.planetiler.TestUtils.newLineString;
-import static com.onthegomap.planetiler.basemap.BasemapProfile.NATURAL_EARTH_SOURCE;
-import static com.onthegomap.planetiler.basemap.BasemapProfile.OSM_SOURCE;
+import static com.onthegomap.planetiler.openmaptiles.OpenMapTilesProfile.NATURAL_EARTH_SOURCE;
+import static com.onthegomap.planetiler.openmaptiles.OpenMapTilesProfile.OSM_SOURCE;
import static org.junit.jupiter.api.Assertions.assertEquals;
import com.onthegomap.planetiler.FeatureCollector;
diff --git a/src/test/java/com/onthegomap/planetiler/basemap/util/LanguageUtilsTest.java b/src/test/java/com/onthegomap/planetiler/openmaptiles/util/LanguageUtilsTest.java
similarity index 97%
rename from src/test/java/com/onthegomap/planetiler/basemap/util/LanguageUtilsTest.java
rename to src/test/java/com/onthegomap/planetiler/openmaptiles/util/LanguageUtilsTest.java
index fb51f61031..2e14df0210 100644
--- a/src/test/java/com/onthegomap/planetiler/basemap/util/LanguageUtilsTest.java
+++ b/src/test/java/com/onthegomap/planetiler/openmaptiles/util/LanguageUtilsTest.java
@@ -1,7 +1,7 @@
-package com.onthegomap.planetiler.basemap.util;
+package com.onthegomap.planetiler.openmaptiles.util;
import static com.onthegomap.planetiler.TestUtils.assertSubmap;
-import static com.onthegomap.planetiler.basemap.util.LanguageUtils.containsOnlyLatinCharacters;
+import static com.onthegomap.planetiler.openmaptiles.util.LanguageUtils.containsOnlyLatinCharacters;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNull;
diff --git a/src/test/java/com/onthegomap/planetiler/basemap/util/VerifyMonacoTest.java b/src/test/java/com/onthegomap/planetiler/openmaptiles/util/VerifyMonacoTest.java
similarity index 96%
rename from src/test/java/com/onthegomap/planetiler/basemap/util/VerifyMonacoTest.java
rename to src/test/java/com/onthegomap/planetiler/openmaptiles/util/VerifyMonacoTest.java
index e74ee6a212..5438be75c1 100644
--- a/src/test/java/com/onthegomap/planetiler/basemap/util/VerifyMonacoTest.java
+++ b/src/test/java/com/onthegomap/planetiler/openmaptiles/util/VerifyMonacoTest.java
@@ -1,4 +1,4 @@
-package com.onthegomap.planetiler.basemap.util;
+package com.onthegomap.planetiler.openmaptiles.util;
import static com.onthegomap.planetiler.geo.GeoUtils.point;
import static com.onthegomap.planetiler.util.Gzip.gzip;