[core] TileCoordinate::fromLatLng no longer depens on TransformState
This commit is contained in:
@@ -18,23 +18,25 @@ public:
|
||||
TileCoordinatePoint p;
|
||||
double z;
|
||||
|
||||
static TileCoordinate fromLatLng(const TransformState& state, double zoom, const LatLng& latLng) {
|
||||
const double scale = std::pow(2, zoom - state.getZoom());
|
||||
return { Projection::project(latLng, state.getScale()) * scale / double(util::tileSize), zoom };
|
||||
static TileCoordinate fromLatLng(double zoom, const LatLng& latLng) {
|
||||
const double scale = std::pow(2.0, zoom);
|
||||
return { Projection::project(latLng, scale) / double(util::tileSize), zoom };
|
||||
}
|
||||
|
||||
static TileCoordinate fromScreenCoordinate(const TransformState& state, double zoom, const ScreenCoordinate& screenCoordinate) {
|
||||
return fromLatLng(state, zoom, state.screenCoordinateToLatLng(screenCoordinate));
|
||||
return fromLatLng(zoom, state.screenCoordinateToLatLng(screenCoordinate));
|
||||
}
|
||||
|
||||
TileCoordinate zoomTo(double zoom) const {
|
||||
return { p * std::pow(2, zoom - z), zoom };
|
||||
const double scaleDiff = std::pow(2.0, zoom - z);
|
||||
return { p * scaleDiff, zoom };
|
||||
}
|
||||
|
||||
static GeometryCoordinate toGeometryCoordinate(const UnwrappedTileID& tileID, const TileCoordinatePoint& point) {
|
||||
const double scale = std::pow(2.0, tileID.canonical.z);
|
||||
auto zoomed = TileCoordinate { point, 0 }.zoomTo(tileID.canonical.z);
|
||||
return {
|
||||
int16_t(util::clamp<int64_t>((zoomed.p.x - tileID.canonical.x - tileID.wrap * std::pow(2.0, tileID.canonical.z)) * util::EXTENT,
|
||||
int16_t(util::clamp<int64_t>((zoomed.p.x - tileID.canonical.x - tileID.wrap * scale) * util::EXTENT,
|
||||
std::numeric_limits<int16_t>::min(),
|
||||
std::numeric_limits<int16_t>::max())),
|
||||
int16_t(util::clamp<int64_t>((zoomed.p.y - tileID.canonical.y) * util::EXTENT,
|
||||
|
||||
@@ -147,13 +147,12 @@ std::vector<UnwrappedTileID> tileCover(const LatLngBounds& bounds_, int32_t z) {
|
||||
{ std::max(bounds_.south(), -util::LATITUDE_MAX), bounds_.west() },
|
||||
{ std::min(bounds_.north(), util::LATITUDE_MAX), bounds_.east() });
|
||||
|
||||
const TransformState state;
|
||||
return tileCover(
|
||||
TileCoordinate::fromLatLng(state, z, bounds.northwest()).p,
|
||||
TileCoordinate::fromLatLng(state, z, bounds.northeast()).p,
|
||||
TileCoordinate::fromLatLng(state, z, bounds.southeast()).p,
|
||||
TileCoordinate::fromLatLng(state, z, bounds.southwest()).p,
|
||||
TileCoordinate::fromLatLng(state, z, bounds.center()).p,
|
||||
TileCoordinate::fromLatLng(z, bounds.northwest()).p,
|
||||
TileCoordinate::fromLatLng(z, bounds.northeast()).p,
|
||||
TileCoordinate::fromLatLng(z, bounds.southeast()).p,
|
||||
TileCoordinate::fromLatLng(z, bounds.southwest()).p,
|
||||
TileCoordinate::fromLatLng(z, bounds.center()).p,
|
||||
z);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user