Skip to content

Various fixes #62

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AmonRaNet merged 2 commits into from
May 5, 2025
Merged

Various fixes #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b7298d4
Fix for CMake 4+
OgreTransporter Apr 22, 2025
b2fd891
Fix spelling
OgreTransporter Apr 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.0 FATAL_ERROR)
cmake_minimum_required(VERSION 3.10 FATAL_ERROR)

project(QGeoView LANGUAGES C CXX)

Expand Down
8 changes: 7 additions & 1 deletion lib/include/QGeoView/QGVGlobal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,9 @@ class QGV_LIB_DECL GeoPos
static QString lonToString(double lon, const QString& format = "[+-]d");
static QString latToString(double lat, const QString& format = "[+-]d");

bool operator==(const GeoPos& rhs);
bool operator!=(const GeoPos& rhs);

private:
bool mEmpty;
double mLat;
Expand All @@ -141,14 +144,17 @@ class QGV_LIB_DECL GeoRect
GeoPos bottomLeft() const;
GeoPos bottomRight() const;
double lonLeft() const;
double lonRigth() const;
double lonRight() const;
double latBottom() const;
double latTop() const;

bool contains(GeoPos const& pos) const;
bool contains(GeoRect const& rect) const;
bool intersects(GeoRect const& rect) const;

bool operator==(const GeoRect& rhs);
bool operator!=(const GeoRect& rhs);

private:
GeoPos mTopLeft;
GeoPos mBottomRight;
Expand Down
26 changes: 23 additions & 3 deletions lib/src/QGVGlobal.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,16 @@ QString GeoPos::latToString(double lat, const QString& format)
return result;
}

bool GeoPos::operator==(const GeoPos& rhs)
{
return (mEmpty && rhs.mEmpty) || (mLat == rhs.mLat && mLon == rhs.mLon);
}

bool GeoPos::operator!=(const GeoPos& rhs)
{
return !(*this == rhs);
}

GeoRect::GeoRect()
{
}
Expand Down Expand Up @@ -202,7 +212,7 @@ double GeoRect::lonLeft() const
return mTopLeft.longitude();
}

double GeoRect::lonRigth() const
double GeoRect::lonRight() const
{
return mBottomRight.longitude();
}
Expand All @@ -219,13 +229,13 @@ double GeoRect::latTop() const

bool GeoRect::contains(GeoPos const& pos) const
{
return (lonLeft() <= pos.longitude() && pos.longitude() < lonRigth() && latBottom() < pos.latitude() &&
return (lonLeft() <= pos.longitude() && pos.longitude() < lonRight() && latBottom() < pos.latitude() &&
pos.latitude() <= latTop());
}

bool GeoRect::contains(GeoRect const& rect) const
{
return (lonLeft() <= rect.lonLeft() && rect.lonRigth() <= lonRigth() && latBottom() <= rect.latBottom() &&
return (lonLeft() <= rect.lonLeft() && rect.lonRight() <= lonRight() && latBottom() <= rect.latBottom() &&
rect.latTop() <= latTop());
}

Expand All @@ -236,6 +246,16 @@ bool GeoRect::intersects(const GeoRect& rect) const
rect.contains(bottomLeft()) || rect.contains(bottomRight());
}

bool GeoRect::operator==(const GeoRect& rhs)
{
return mTopLeft == rhs.mTopLeft && mBottomRight == rhs.mBottomRight;
}

bool GeoRect::operator!=(const GeoRect& rhs)
{
return !(*this == rhs);
}

GeoTilePos::GeoTilePos()
: mZoom(-1)
{
Expand Down
18 changes: 9 additions & 9 deletions lib/src/QGVLayerBDGEx.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@
namespace {
// clang-format off
const QStringList URLTemplates = {
"http://bdgex.eb.mil.br/mapcache?request=GetMap&service=WMS&version=1.1.1&layers=ctm25&srs=EPSG%3A4326&bbox=lonLeft,latBottom,lonRigth,latTop&width=WIDTH&height=HEIGHT&format=image%2Fpng",
"http://bdgex.eb.mil.br/mapcache?request=GetMap&service=WMS&version=1.1.1&layers=ctm50&srs=EPSG%3A4326&bbox=lonLeft,latBottom,lonRigth,latTop&width=WIDTH&height=HEIGHT&format=image%2Fpng",
"http://bdgex.eb.mil.br/mapcache?request=GetMap&service=WMS&version=1.1.1&layers=ctm100&srs=EPSG%3A4326&bbox=lonLeft,latBottom,lonRigth,latTop&width=WIDTH&height=HEIGHT&format=image%2Fpng",
"http://bdgex.eb.mil.br/mapcache?request=GetMap&service=WMS&version=1.1.1&layers=ctm250&srs=EPSG%3A4326&bbox=lonLeft,latBottom,lonRigth,latTop&width=WIDTH&height=HEIGHT&format=image%2Fpng",
"http://bdgex.eb.mil.br/mapcache?request=GetMap&service=WMS&version=1.1.1&layers=ctm250&srs=EPSG%3A4326&bbox=lonLeft,latBottom,lonRigth,latTop&width=WIDTH&height=HEIGHT&format=image%2Fpng",
"http://bdgex.eb.mil.br/mapcache?request=GetMap&service=WMS&version=1.1.1&layers=ctmmultiescalas&srs=EPSG%3A4326&bbox=lonLeft,latBottom,lonRigth,latTop&width=WIDTH&height=HEIGHT&format=image%2Fpng",
"http://bdgex.eb.mil.br/mapcache?request=GetMap&service=WMS&version=1.1.1&layers=ctmmultiescalas_mercator&srs=EPSG%3A3857&bbox=lonLeft,latBottom,lonRigth,latTop&width=WIDTH&height=HEIGHT&format=image%2Fpng"
"http://bdgex.eb.mil.br/mapcache?request=GetMap&service=WMS&version=1.1.1&layers=ctm25&srs=EPSG%3A4326&bbox=lonLeft,latBottom,lonRight,latTop&width=WIDTH&height=HEIGHT&format=image%2Fpng",
"http://bdgex.eb.mil.br/mapcache?request=GetMap&service=WMS&version=1.1.1&layers=ctm50&srs=EPSG%3A4326&bbox=lonLeft,latBottom,lonRight,latTop&width=WIDTH&height=HEIGHT&format=image%2Fpng",
"http://bdgex.eb.mil.br/mapcache?request=GetMap&service=WMS&version=1.1.1&layers=ctm100&srs=EPSG%3A4326&bbox=lonLeft,latBottom,lonRight,latTop&width=WIDTH&height=HEIGHT&format=image%2Fpng",
"http://bdgex.eb.mil.br/mapcache?request=GetMap&service=WMS&version=1.1.1&layers=ctm250&srs=EPSG%3A4326&bbox=lonLeft,latBottom,lonRight,latTop&width=WIDTH&height=HEIGHT&format=image%2Fpng",
"http://bdgex.eb.mil.br/mapcache?request=GetMap&service=WMS&version=1.1.1&layers=ctm250&srs=EPSG%3A4326&bbox=lonLeft,latBottom,lonRight,latTop&width=WIDTH&height=HEIGHT&format=image%2Fpng",
"http://bdgex.eb.mil.br/mapcache?request=GetMap&service=WMS&version=1.1.1&layers=ctmmultiescalas&srs=EPSG%3A4326&bbox=lonLeft,latBottom,lonRight,latTop&width=WIDTH&height=HEIGHT&format=image%2Fpng",
"http://bdgex.eb.mil.br/mapcache?request=GetMap&service=WMS&version=1.1.1&layers=ctmmultiescalas_mercator&srs=EPSG%3A3857&bbox=lonLeft,latBottom,lonRight,latTop&width=WIDTH&height=HEIGHT&format=image%2Fpng"
};
// clang-format on
}
Expand Down Expand Up @@ -74,9 +74,9 @@ QString QGVLayerBDGEx::tilePosToUrl(const QGV::GeoTilePos& tilePos) const
QGV::GeoRect rect = tilePos.toGeoRect();
url.replace("lonLeft", QString::number(rect.lonLeft(), 'f', 6));
url.replace("latBottom", QString::number(rect.latBottom(), 'f', 6));
url.replace("lonRigth", QString::number(rect.lonRigth(), 'f', 6));
url.replace("lonRight", QString::number(rect.lonRight(), 'f', 6));
url.replace("latTop", QString::number(rect.latTop(), 'f', 6));
double m_width = rect.lonRigth() - rect.lonLeft();
double m_width = rect.lonRight() - rect.lonLeft();
double m_height = rect.latTop() - rect.latBottom();
double ratio = m_width / m_height;
int width_pixels = 900;
Expand Down
2 changes: 1 addition & 1 deletion samples/fun/mainwindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ QPixmap MainWindow::createQGVImage() const
QGVLayer* MainWindow::createQGVLayer() const
{
const auto target = targetQGVArea();
const auto sizeLon = target.lonLeft() - target.lonRigth();
const auto sizeLon = target.lonLeft() - target.lonRight();
const auto sizeLat = target.latTop() - target.latBottom();

/*
Expand Down
2 changes: 1 addition & 1 deletion samples/shared/helpers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ QGV::GeoRect Helpers::randRect(QGVMap* geoMap, const QGV::GeoRect& targetArea)
QGV::GeoPos Helpers::randPos(const QGV::GeoRect& targetArea)
{
const double latRange = targetArea.latTop() - targetArea.latBottom();
const double lonRange = targetArea.lonRigth() - targetArea.lonLeft();
const double lonRange = targetArea.lonRight() - targetArea.lonLeft();
static const int range = 1000;

return { targetArea.latBottom() + latRange * (randomInt(0, range)) / range,
Expand Down
Loading