Merge pull request #62 from OgreTransporter/master

AmonRaNet · web-flow · commit 85efc389b70e · 2025-05-05T16:38:14.000+02:00
Various fixes
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -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)
 
diff --git a/lib/include/QGeoView/QGVGlobal.h b/lib/include/QGeoView/QGVGlobal.h
@@ -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;
@@ -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;
diff --git a/lib/src/QGVGlobal.cpp b/lib/src/QGVGlobal.cpp
@@ -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()
 {
 }
@@ -202,7 +212,7 @@ double GeoRect::lonLeft() const
     return mTopLeft.longitude();
 }
 
-double GeoRect::lonRigth() const
+double GeoRect::lonRight() const
 {
     return mBottomRight.longitude();
 }
@@ -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());
 }
 
@@ -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)
 {
diff --git a/lib/src/QGVLayerBDGEx.cpp b/lib/src/QGVLayerBDGEx.cpp
@@ -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
 }
@@ -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;
diff --git a/samples/fun/mainwindow.cpp b/samples/fun/mainwindow.cpp
@@ -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();
 
     /*
diff --git a/samples/shared/helpers.cpp b/samples/shared/helpers.cpp
@@ -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,

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-cmake_minimum_required(VERSION 3.0 FATAL_ERROR)`
	`1`	`+cmake_minimum_required(VERSION 3.10 FATAL_ERROR)`
`2`	`2`
`3`	`3`	`project(QGeoView LANGUAGES C CXX)`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -156,6 +156,16 @@ QString GeoPos::latToString(double lat, const QString& format)`
`156`	`156`	`return result;`
`157`	`157`	`}`
`158`	`158`
	`159`	`+bool GeoPos::operator==(const GeoPos& rhs)`
	`160`	`+{`
	`161`	`+ return (mEmpty && rhs.mEmpty) \|\| (mLat == rhs.mLat && mLon == rhs.mLon);`
	`162`	`+}`
	`163`	`+`
	`164`	`+bool GeoPos::operator!=(const GeoPos& rhs)`
	`165`	`+{`
	`166`	`+ return !(*this == rhs);`
	`167`	`+}`
	`168`	`+`
`159`	`169`	`GeoRect::GeoRect()`
`160`	`170`	`{`
`161`	`171`	`}`
`@@ -202,7 +212,7 @@ double GeoRect::lonLeft() const`
`202`	`212`	`return mTopLeft.longitude();`
`203`	`213`	`}`
`204`	`214`
`205`		`-double GeoRect::lonRigth() const`
	`215`	`+double GeoRect::lonRight() const`
`206`	`216`	`{`
`207`	`217`	`return mBottomRight.longitude();`
`208`	`218`	`}`
`@@ -219,13 +229,13 @@ double GeoRect::latTop() const`
`219`	`229`
`220`	`230`	`bool GeoRect::contains(GeoPos const& pos) const`
`221`	`231`	`{`
`222`		`- return (lonLeft() <= pos.longitude() && pos.longitude() < lonRigth() && latBottom() < pos.latitude() &&`
	`232`	`+ return (lonLeft() <= pos.longitude() && pos.longitude() < lonRight() && latBottom() < pos.latitude() &&`
`223`	`233`	`pos.latitude() <= latTop());`
`224`	`234`	`}`
`225`	`235`
`226`	`236`	`bool GeoRect::contains(GeoRect const& rect) const`
`227`	`237`	`{`
`228`		`- return (lonLeft() <= rect.lonLeft() && rect.lonRigth() <= lonRigth() && latBottom() <= rect.latBottom() &&`
	`238`	`+ return (lonLeft() <= rect.lonLeft() && rect.lonRight() <= lonRight() && latBottom() <= rect.latBottom() &&`
`229`	`239`	`rect.latTop() <= latTop());`
`230`	`240`	`}`
`231`	`241`
`@@ -236,6 +246,16 @@ bool GeoRect::intersects(const GeoRect& rect) const`
`236`	`246`	`rect.contains(bottomLeft()) \|\| rect.contains(bottomRight());`
`237`	`247`	`}`
`238`	`248`
	`249`	`+bool GeoRect::operator==(const GeoRect& rhs)`
	`250`	`+{`
	`251`	`+ return mTopLeft == rhs.mTopLeft && mBottomRight == rhs.mBottomRight;`
	`252`	`+}`
	`253`	`+`
	`254`	`+bool GeoRect::operator!=(const GeoRect& rhs)`
	`255`	`+{`
	`256`	`+ return !(*this == rhs);`
	`257`	`+}`
	`258`	`+`
`239`	`259`	`GeoTilePos::GeoTilePos()`
`240`	`260`	`: mZoom(-1)`
`241`	`261`	`{`
Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ QPixmap MainWindow::createQGVImage() const`
`101`	`101`	`QGVLayer* MainWindow::createQGVLayer() const`
`102`	`102`	`{`
`103`	`103`	`const auto target = targetQGVArea();`
`104`		`- const auto sizeLon = target.lonLeft() - target.lonRigth();`
	`104`	`+ const auto sizeLon = target.lonLeft() - target.lonRight();`
`105`	`105`	`const auto sizeLat = target.latTop() - target.latBottom();`
`106`	`106`
`107`	`107`	`/*`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ QGV::GeoRect Helpers::randRect(QGVMap* geoMap, const QGV::GeoRect& targetArea)`
`51`	`51`	`QGV::GeoPos Helpers::randPos(const QGV::GeoRect& targetArea)`
`52`	`52`	`{`
`53`	`53`	`const double latRange = targetArea.latTop() - targetArea.latBottom();`
`54`		`- const double lonRange = targetArea.lonRigth() - targetArea.lonLeft();`
	`54`	`+ const double lonRange = targetArea.lonRight() - targetArea.lonLeft();`
`55`	`55`	`static const int range = 1000;`
`56`	`56`
`57`	`57`	`return { targetArea.latBottom() + latRange * (randomInt(0, range)) / range,`