Skip to content

Commit 4ee946f

Browse files
AmonRaNetAmonRaNet
authored
Merge branch 'master' into fix/wheelZoom
2 parents ec86945 + 3e1fba8 commit 4ee946f

117 files changed

Lines changed: 158 additions & 132 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.pre-commit-config.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ repos:
88
language: script
99
always_run: true
1010
pass_filenames: false
11-
stages: [commit]
11+
stages: [pre-commit]
1212

1313
- repo: https://github.com/pocc/pre-commit-hooks
1414
rev: v1.1.1

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.0 FATAL_ERROR)
1+
cmake_minimum_required(VERSION 3.10 FATAL_ERROR)
22

33
project(QGeoView LANGUAGES C CXX)
44

‎lib/include/QGeoView/QGVCamera.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/***************************************************************************
22
* QGeoView is a Qt / C ++ widget for visualizing geographic data.
3-
* Copyright (C) 2018-2024 Andrey Yaroshenko.
3+
* Copyright (C) 2018-2025 Andrey Yaroshenko.
44
*
55
* This program is free software: you can redistribute it and/or modify
66
* it under the terms of the GNU Lesser General Public License as published by

‎lib/include/QGeoView/QGVDrawItem.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/***************************************************************************
22
* QGeoView is a Qt / C ++ widget for visualizing geographic data.
3-
* Copyright (C) 2018-2024 Andrey Yaroshenko.
3+
* Copyright (C) 2018-2025 Andrey Yaroshenko.
44
*
55
* This program is free software: you can redistribute it and/or modify
66
* it under the terms of the GNU Lesser General Public License as published by

‎lib/include/QGeoView/QGVGlobal.h‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/***************************************************************************
22
* QGeoView is a Qt / C ++ widget for visualizing geographic data.
3-
* Copyright (C) 2018-2024 Andrey Yaroshenko.
3+
* Copyright (C) 2018-2025 Andrey Yaroshenko.
44
*
55
* This program is free software: you can redistribute it and/or modify
66
* it under the terms of the GNU Lesser General Public License as published by
@@ -121,6 +121,9 @@ class QGV_LIB_DECL GeoPos
121121
static QString lonToString(double lon, const QString& format = "[+-]d");
122122
static QString latToString(double lat, const QString& format = "[+-]d");
123123

124+
bool operator==(const GeoPos& rhs);
125+
bool operator!=(const GeoPos& rhs);
126+
124127
private:
125128
bool mEmpty;
126129
double mLat;
@@ -141,14 +144,17 @@ class QGV_LIB_DECL GeoRect
141144
GeoPos bottomLeft() const;
142145
GeoPos bottomRight() const;
143146
double lonLeft() const;
144-
double lonRigth() const;
147+
double lonRight() const;
145148
double latBottom() const;
146149
double latTop() const;
147150

148151
bool contains(GeoPos const& pos) const;
149152
bool contains(GeoRect const& rect) const;
150153
bool intersects(GeoRect const& rect) const;
151154

155+
bool operator==(const GeoRect& rhs);
156+
bool operator!=(const GeoRect& rhs);
157+
152158
private:
153159
GeoPos mTopLeft;
154160
GeoPos mBottomRight;

‎lib/include/QGeoView/QGVItem.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/***************************************************************************
22
* QGeoView is a Qt / C ++ widget for visualizing geographic data.
3-
* Copyright (C) 2018-2024 Andrey Yaroshenko.
3+
* Copyright (C) 2018-2025 Andrey Yaroshenko.
44
*
55
* This program is free software: you can redistribute it and/or modify
66
* it under the terms of the GNU Lesser General Public License as published by

‎lib/include/QGeoView/QGVLayer.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/***************************************************************************
22
* QGeoView is a Qt / C ++ widget for visualizing geographic data.
3-
* Copyright (C) 2018-2024 Andrey Yaroshenko.
3+
* Copyright (C) 2018-2025 Andrey Yaroshenko.
44
*
55
* This program is free software: you can redistribute it and/or modify
66
* it under the terms of the GNU Lesser General Public License as published by

‎lib/include/QGeoView/QGVLayerBDGEx.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/***************************************************************************
22
* QGeoView is a Qt / C ++ widget for visualizing geographic data.
3-
* Copyright (C) 2018-2024 Andrey Yaroshenko.
3+
* Copyright (C) 2018-2025 Andrey Yaroshenko.
44
*
55
* This program is free software: you can redistribute it and/or modify
66
* it under the terms of the GNU Lesser General Public License as published by

‎lib/include/QGeoView/QGVLayerBing.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/***************************************************************************
22
* QGeoView is a Qt / C ++ widget for visualizing geographic data.
3-
* Copyright (C) 2018-2024 Andrey Yaroshenko.
3+
* Copyright (C) 2018-2025 Andrey Yaroshenko.
44
*
55
* This program is free software: you can redistribute it and/or modify
66
* it under the terms of the GNU Lesser General Public License as published by

‎lib/include/QGeoView/QGVLayerGoogle.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/***************************************************************************
22
* QGeoView is a Qt / C ++ widget for visualizing geographic data.
3-
* Copyright (C) 2018-2024 Andrey Yaroshenko.
3+
* Copyright (C) 2018-2025 Andrey Yaroshenko.
44
*
55
* This program is free software: you can redistribute it and/or modify
66
* it under the terms of the GNU Lesser General Public License as published by

0 commit comments

Comments
 (0)