Hello community,
here is the log from the commit of package gpxsee for openSUSE:Factory checked in at 2019-06-21 09:58:44
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gpxsee (Old)
and /work/SRC/openSUSE:Factory/.gpxsee.new.4811 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gpxsee"
Fri Jun 21 09:58:44 2019 rev:45 rq:711224 version:7.9
Changes:
--------
--- /work/SRC/openSUSE:Factory/gpxsee/gpxsee.changes 2019-06-01 09:56:33.171179811 +0200
+++ /work/SRC/openSUSE:Factory/.gpxsee.new.4811/gpxsee.changes 2019-06-21 09:58:46.716697211 +0200
@@ -1,0 +2,7 @@
+Sat Jun 15 22:36:58 CEST 2019 - tumic@cbox.cz
+
+- Update to version 7.9
+ * Removed the annoying map view re-zooming on window resize.
+ * Improved POI handling and text rendering in IMG maps.
+
+-------------------------------------------------------------------
Old:
----
GPXSee-7.8.tar.gz
New:
----
GPXSee-7.9.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gpxsee.spec ++++++
--- /var/tmp/diff_new_pack.8DAszL/_old 2019-06-21 09:58:48.180699391 +0200
+++ /var/tmp/diff_new_pack.8DAszL/_new 2019-06-21 09:58:48.184699397 +0200
@@ -19,7 +19,7 @@
# See also http://en.opensuse.org/openSUSE:Specfile_guidelines
Name: gpxsee
-Version: 7.8
+Version: 7.9
Release: 1
Summary: GPS log file visualization and analysis tool
License: GPL-3.0-only
@@ -30,7 +30,6 @@
BuildRequires: gcc-c++
BuildRequires: make
%if 0%{?fedora_version}
-%if 0%{?fedora_version} >= 24
BuildRequires: qt5-qtbase
BuildRequires: qt5-qtbase-gui
BuildRequires: qt5-qtbase-devel
@@ -38,9 +37,6 @@
Recommends: qt5-qtimageformats
Recommends: qt5-qtpbfimageformat
%else
-BuildRequires: libqt4-devel
-%endif
-%endif
%if 0%{?suse_version}
BuildRequires: libQt5Core-devel
BuildRequires: libQt5Concurrent-devel
@@ -54,11 +50,26 @@
Recommends: libQt5Sql5-sqlite
Recommends: libqt5-qtimageformats
Recommends: libqt5-qtpbfimageformat
-%endif
+%else
%if 0%{?rhel_version} || 0%{?centos_version}
BuildRequires: libqt4-devel
+%else
+# Mageia
+BuildRequires: libqt5core-devel
+BuildRequires: libqt5gui-devel
+BuildRequires: libqt5concurrent-devel
+BuildRequires: libqt5widgets-devel
+BuildRequires: libqt5network-devel
+BuildRequires: libqt5printsupport-devel
+BuildRequires: libqt5opengl-devel
+BuildRequires: libqt5sql-devel
+BuildRequires: qttools5
+Recommends: qtimageformats5
+Recommends: libqt5-database-plugin-sqlite
+Recommends: libqt5-qtpbfimageformat
+%endif
+%endif
%endif
-
%description
GPXSee is a Qt-based tool for visualizing and analyzing GPX, TCX, FIT, KML,
@@ -69,16 +80,21 @@
%setup -q -n GPXSee-%{version}
%build
-%if 0%{?fedora_version} >= 24
-lrelease-qt5 gpxsee.pro
-%{qmake_qt5} gpxsee.pro
-%else
%if 0%{?suse_version}
lrelease-qt5 gpxsee.pro
%{qmake5} gpxsee.pro
%else
+%if 0%{?fedora_version}
+lrelease-qt5 gpxsee.pro
+%{qmake_qt5} gpxsee.pro
+%else
+%if 0%{?rhel_version} || 0%{?centos_version}
lrelease-qt4 gpxsee.pro
qmake-qt4 PREFIX=/usr gpxsee.pro
+%else
+lrelease gpxsee.pro
+%{qmake_qt5} gpxsee.pro
+%endif
%endif
%endif
make %{?_smp_mflags}
++++++ GPXSee-7.8.tar.gz -> GPXSee-7.9.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GPXSee-7.8/.appveyor.yml new/GPXSee-7.9/.appveyor.yml
--- old/GPXSee-7.8/.appveyor.yml 2019-05-29 21:24:37.000000000 +0200
+++ new/GPXSee-7.9/.appveyor.yml 2019-06-15 09:25:16.000000000 +0200
@@ -1,4 +1,4 @@
-version: 7.8.{build}
+version: 7.9.{build}
configuration: Release
platform: Any CPU
environment:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GPXSee-7.8/README.md new/GPXSee-7.9/README.md
--- old/GPXSee-7.8/README.md 2019-05-29 21:24:37.000000000 +0200
+++ new/GPXSee-7.9/README.md 2019-06-15 09:25:16.000000000 +0200
@@ -3,7 +3,7 @@
## Features
* Opens GPX, TCX, FIT, KML, IGC, NMEA, SLF, LOC, GeoJSON, OziExplorer (PLT, RTE, WPT), Garmin CSV and geotagged JPEG files.
-* User-definable online maps (OpenStreetMap/Google tiles, WMTS, WMS, TMS).
+* User-definable online maps (OpenStreetMap/Google tiles, WMTS, WMS, TMS, QuadTiles).
* Offline maps (MBTiles, OziExplorer maps, TrekBuddy maps/atlases, Garmin IMG & JNX maps, TwoNav RMaps, GeoTIFF images).
* Elevation, speed, heart rate, cadence, power, temperature and gear ratio/shifts graphs.
* Support for DEM files (SRTM HGT).
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GPXSee-7.8/gpxsee.pro new/GPXSee-7.9/gpxsee.pro
--- old/GPXSee-7.8/gpxsee.pro 2019-05-29 21:24:37.000000000 +0200
+++ new/GPXSee-7.9/gpxsee.pro 2019-06-15 09:25:16.000000000 +0200
@@ -3,7 +3,7 @@
} else {
TARGET = GPXSee
}
-VERSION = 7.8
+VERSION = 7.9
QT += core \
gui \
@@ -179,7 +179,8 @@
src/map/IMG/style.h \
src/map/IMG/netfile.h \
src/GUI/limitedcombobox.h \
- src/GUI/pathtickitem.h
+ src/GUI/pathtickitem.h \
+ src/map/IMG/textitem.h
SOURCES += src/main.cpp \
src/common/coordinates.cpp \
src/common/rectc.cpp \
@@ -309,7 +310,8 @@
src/map/IMG/vectortile.cpp \
src/map/IMG/style.cpp \
src/map/IMG/netfile.cpp \
- src/GUI/pathtickitem.cpp
+ src/GUI/pathtickitem.cpp \
+ src/map/IMG/textitem.cpp
greaterThan(QT_MAJOR_VERSION, 4) {
HEADERS += src/data/geojsonparser.h
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GPXSee-7.8/gpxsee.qrc new/GPXSee-7.9/gpxsee.qrc
--- old/GPXSee-7.8/gpxsee.qrc 2019-05-29 21:24:37.000000000 +0200
+++ new/GPXSee-7.9/gpxsee.qrc 2019-06-15 09:25:16.000000000 +0200
@@ -1,5 +1,6 @@
<RCC>
<qresource prefix="/">
+ <!-- GUI -->
<file alias="gpxsee.png">icons/gpxsee.png</file>
<file alias="gpxsee@2x.png">icons/gpxsee@2x.png</file>
<file alias="dialog-close.png">icons/GUI/dialog-close.png</file>
@@ -42,5 +43,83 @@
<file alias="view-filter@2x.png">icons/GUI/view-filter@2x.png</file>
<file alias="applications-internet_32.png">icons/GUI/applications-internet_32.png</file>
<file alias="applications-internet_32@2x.png">icons/GUI/applications-internet_32@2x.png</file>
+
+ <!-- POI -->
+ <file alias="airfield-11.png">icons/POI/airfield-11.png</file>
+ <file alias="airport-11.png">icons/POI/airport-11.png</file>
+ <file alias="amusement-park-11.png">icons/POI/amusement-park-11.png</file>
+ <file alias="bakery-11.png">icons/POI/bakery-11.png</file>
+ <file alias="bank-11.png">icons/POI/bank-11.png</file>
+ <file alias="bar-11.png">icons/POI/bar-11.png</file>
+ <file alias="bbq-11.png">icons/POI/bbq-11.png</file>
+ <file alias="beach-11.png">icons/POI/beach-11.png</file>
+ <file alias="bowling-alley-11.png">icons/POI/bowling-alley-11.png</file>
+ <file alias="building-alt1-11.png">icons/POI/building-alt1-11.png</file>
+ <file alias="bridge-11.png">icons/POI/bridge-11.png</file>
+ <file alias="bus-11.png">icons/POI/bus-11.png</file>
+ <file alias="cafe-11.png">icons/POI/cafe-11.png</file>
+ <file alias="campsite-11.png">icons/POI/campsite-11.png</file>
+ <file alias="car-11.png">icons/POI/car-11.png</file>
+ <file alias="car-rental-11.png">icons/POI/car-rental-11.png</file>
+ <file alias="car-repair-11.png">icons/POI/car-repair-11.png</file>
+ <file alias="casino-11.png">icons/POI/casino-11.png</file>
+ <file alias="cemetery-11.png">icons/POI/cemetery-11.png</file>
+ <file alias="cinema-11.png">icons/POI/cinema-11.png</file>
+ <file alias="clothing-store-11.png">icons/POI/clothing-store-11.png</file>
+ <file alias="communications-tower-11.png">icons/POI/communications-tower-11.png</file>
+ <file alias="dam-11.png">icons/POI/dam-11.png</file>
+ <file alias="danger-11.png">icons/POI/danger-11.png</file>
+ <file alias="drinking-water-11.png">icons/POI/drinking-water-11.png</file>
+ <file alias="fast-food-11.png">icons/POI/fast-food-11.png</file>
+ <file alias="fire-station-11.png">icons/POI/fire-station-11.png</file>
+ <file alias="fitness-centre-11.png">icons/POI/fitness-centre-11.png</file>
+ <file alias="fuel-11.png">icons/POI/fuel-11.png</file>
+ <file alias="furniture-11.png">icons/POI/furniture-11.png</file>
+ <file alias="garden-11.png">icons/POI/garden-11.png</file>
+ <file alias="garden-centre-11.png">icons/POI/garden-centre-11.png</file>
+ <file alias="golf-11.png">icons/POI/golf-11.png</file>
+ <file alias="grocery-11.png">icons/POI/grocery-11.png</file>
+ <file alias="hairdresser-11.png">icons/POI/hairdresser-11.png</file>
+ <file alias="harbor-11.png">icons/POI/harbor-11.png</file>
+ <file alias="hardware-11.png">icons/POI/hardware-11.png</file>
+ <file alias="heliport-11.png">icons/POI/heliport-11.png</file>
+ <file alias="hospital-11.png">icons/POI/hospital-11.png</file>
+ <file alias="information-11.png">icons/POI/information-11.png</file>
+ <file alias="landmark-11.png">icons/POI/landmark-11.png</file>
+ <file alias="library-11.png">icons/POI/library-11.png</file>
+ <file alias="lodging-11.png">icons/POI/lodging-11.png</file>
+ <file alias="mountain-11.png">icons/POI/mountain-11.png</file>
+ <file alias="museum-11.png">icons/POI/museum-11.png</file>
+ <file alias="park-11.png">icons/POI/park-11.png</file>
+ <file alias="parking-11.png">icons/POI/parking-11.png</file>
+ <file alias="pharmacy-11.png">icons/POI/pharmacy-11.png</file>
+ <file alias="picnic-site-11.png">icons/POI/picnic-site-11.png</file>
+ <file alias="place-of-worship-11.png">icons/POI/place-of-worship-11.png</file>
+ <file alias="police-11.png">icons/POI/police-11.png</file>
+ <file alias="post-11.png">icons/POI/post-11.png</file>
+ <file alias="prison-11.png">icons/POI/prison-11.png</file>
+ <file alias="religious-christian-11.png">icons/POI/religious-christian-11.png</file>
+ <file alias="religious-jewish-11.png">icons/POI/religious-jewish-11.png</file>
+ <file alias="religious-muslim-11.png">icons/POI/religious-muslim-11.png</file>
+ <file alias="restaurant-11.png">icons/POI/restaurant-11.png</file>
+ <file alias="restaurant-noodle-11.png">icons/POI/restaurant-noodle-11.png</file>
+ <file alias="restaurant-pizza-11.png">icons/POI/restaurant-pizza-11.png</file>
+ <file alias="restaurant-seafood-11.png">icons/POI/restaurant-seafood-11.png</file>
+ <file alias="roadblock-11.png">icons/POI/roadblock-11.png</file>
+ <file alias="school-11.png">icons/POI/school-11.png</file>
+ <file alias="shelter-11.png">icons/POI/shelter-11.png</file>
+ <file alias="shop-11.png">icons/POI/shop-11.png</file>
+ <file alias="skiing-11.png">icons/POI/skiing-11.png</file>
+ <file alias="soccer-11.png">icons/POI/soccer-11.png</file>
+ <file alias="swimming-11.png">icons/POI/swimming-11.png</file>
+ <file alias="theatre-11.png">icons/POI/theatre-11.png</file>
+ <file alias="telephone-11.png">icons/POI/telephone-11.png</file>
+ <file alias="toilet-11.png">icons/POI/toilet-11.png</file>
+ <file alias="town-hall-11.png">icons/POI/town-hall-11.png</file>
+ <file alias="viewpoint-11.png">icons/POI/viewpoint-11.png</file>
+ <file alias="village-11.png">icons/POI/village-11.png</file>
+ <file alias="waterfall-11.png">icons/POI/waterfall-11.png</file>
+ <file alias="wetland-11.png">icons/POI/wetland-11.png</file>
+ <file alias="zoo-11.png">icons/POI/zoo-11.png</file>
</qresource>
</RCC>
Binary files old/GPXSee-7.8/icons/POI/airfield-11.png and new/GPXSee-7.9/icons/POI/airfield-11.png differ
Binary files old/GPXSee-7.8/icons/POI/airport-11.png and new/GPXSee-7.9/icons/POI/airport-11.png differ
Binary files old/GPXSee-7.8/icons/POI/amusement-park-11.png and new/GPXSee-7.9/icons/POI/amusement-park-11.png differ
Binary files old/GPXSee-7.8/icons/POI/bakery-11.png and new/GPXSee-7.9/icons/POI/bakery-11.png differ
Binary files old/GPXSee-7.8/icons/POI/bank-11.png and new/GPXSee-7.9/icons/POI/bank-11.png differ
Binary files old/GPXSee-7.8/icons/POI/bar-11.png and new/GPXSee-7.9/icons/POI/bar-11.png differ
Binary files old/GPXSee-7.8/icons/POI/bbq-11.png and new/GPXSee-7.9/icons/POI/bbq-11.png differ
Binary files old/GPXSee-7.8/icons/POI/beach-11.png and new/GPXSee-7.9/icons/POI/beach-11.png differ
Binary files old/GPXSee-7.8/icons/POI/bowling-alley-11.png and new/GPXSee-7.9/icons/POI/bowling-alley-11.png differ
Binary files old/GPXSee-7.8/icons/POI/bridge-11.png and new/GPXSee-7.9/icons/POI/bridge-11.png differ
Binary files old/GPXSee-7.8/icons/POI/building-alt1-11.png and new/GPXSee-7.9/icons/POI/building-alt1-11.png differ
Binary files old/GPXSee-7.8/icons/POI/bus-11.png and new/GPXSee-7.9/icons/POI/bus-11.png differ
Binary files old/GPXSee-7.8/icons/POI/cafe-11.png and new/GPXSee-7.9/icons/POI/cafe-11.png differ
Binary files old/GPXSee-7.8/icons/POI/campsite-11.png and new/GPXSee-7.9/icons/POI/campsite-11.png differ
Binary files old/GPXSee-7.8/icons/POI/car-11.png and new/GPXSee-7.9/icons/POI/car-11.png differ
Binary files old/GPXSee-7.8/icons/POI/car-rental-11.png and new/GPXSee-7.9/icons/POI/car-rental-11.png differ
Binary files old/GPXSee-7.8/icons/POI/car-repair-11.png and new/GPXSee-7.9/icons/POI/car-repair-11.png differ
Binary files old/GPXSee-7.8/icons/POI/casino-11.png and new/GPXSee-7.9/icons/POI/casino-11.png differ
Binary files old/GPXSee-7.8/icons/POI/cemetery-11.png and new/GPXSee-7.9/icons/POI/cemetery-11.png differ
Binary files old/GPXSee-7.8/icons/POI/cinema-11.png and new/GPXSee-7.9/icons/POI/cinema-11.png differ
Binary files old/GPXSee-7.8/icons/POI/clothing-store-11.png and new/GPXSee-7.9/icons/POI/clothing-store-11.png differ
Binary files old/GPXSee-7.8/icons/POI/communications-tower-11.png and new/GPXSee-7.9/icons/POI/communications-tower-11.png differ
Binary files old/GPXSee-7.8/icons/POI/dam-11.png and new/GPXSee-7.9/icons/POI/dam-11.png differ
Binary files old/GPXSee-7.8/icons/POI/danger-11.png and new/GPXSee-7.9/icons/POI/danger-11.png differ
Binary files old/GPXSee-7.8/icons/POI/drinking-water-11.png and new/GPXSee-7.9/icons/POI/drinking-water-11.png differ
Binary files old/GPXSee-7.8/icons/POI/fast-food-11.png and new/GPXSee-7.9/icons/POI/fast-food-11.png differ
Binary files old/GPXSee-7.8/icons/POI/fire-station-11.png and new/GPXSee-7.9/icons/POI/fire-station-11.png differ
Binary files old/GPXSee-7.8/icons/POI/fitness-centre-11.png and new/GPXSee-7.9/icons/POI/fitness-centre-11.png differ
Binary files old/GPXSee-7.8/icons/POI/fuel-11.png and new/GPXSee-7.9/icons/POI/fuel-11.png differ
Binary files old/GPXSee-7.8/icons/POI/furniture-11.png and new/GPXSee-7.9/icons/POI/furniture-11.png differ
Binary files old/GPXSee-7.8/icons/POI/garden-11.png and new/GPXSee-7.9/icons/POI/garden-11.png differ
Binary files old/GPXSee-7.8/icons/POI/garden-centre-11.png and new/GPXSee-7.9/icons/POI/garden-centre-11.png differ
Binary files old/GPXSee-7.8/icons/POI/golf-11.png and new/GPXSee-7.9/icons/POI/golf-11.png differ
Binary files old/GPXSee-7.8/icons/POI/grocery-11.png and new/GPXSee-7.9/icons/POI/grocery-11.png differ
Binary files old/GPXSee-7.8/icons/POI/hairdresser-11.png and new/GPXSee-7.9/icons/POI/hairdresser-11.png differ
Binary files old/GPXSee-7.8/icons/POI/harbor-11.png and new/GPXSee-7.9/icons/POI/harbor-11.png differ
Binary files old/GPXSee-7.8/icons/POI/hardware-11.png and new/GPXSee-7.9/icons/POI/hardware-11.png differ
Binary files old/GPXSee-7.8/icons/POI/heliport-11.png and new/GPXSee-7.9/icons/POI/heliport-11.png differ
Binary files old/GPXSee-7.8/icons/POI/hospital-11.png and new/GPXSee-7.9/icons/POI/hospital-11.png differ
Binary files old/GPXSee-7.8/icons/POI/information-11.png and new/GPXSee-7.9/icons/POI/information-11.png differ
Binary files old/GPXSee-7.8/icons/POI/landmark-11.png and new/GPXSee-7.9/icons/POI/landmark-11.png differ
Binary files old/GPXSee-7.8/icons/POI/library-11.png and new/GPXSee-7.9/icons/POI/library-11.png differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GPXSee-7.8/icons/POI/licence.txt new/GPXSee-7.9/icons/POI/licence.txt
--- old/GPXSee-7.8/icons/POI/licence.txt 1970-01-01 01:00:00.000000000 +0100
+++ new/GPXSee-7.9/icons/POI/licence.txt 2019-06-15 09:25:16.000000000 +0200
@@ -0,0 +1,126 @@
+The POI icons are Mapbox Maki icons (https://labs.mapbox.com/maki-icons/)
+licensed under CC0.
+
+-----
+
+Creative Commons Legal Code
+
+CC0 1.0 Universal
+
+ CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
+ LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN
+ ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
+ INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
+ REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS
+ PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM
+ THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED
+ HEREUNDER.
+
+Statement of Purpose
+
+The laws of most jurisdictions throughout the world automatically confer
+exclusive Copyright and Related Rights (defined below) upon the creator
+and subsequent owner(s) (each and all, an "owner") of an original work of
+authorship and/or a database (each, a "Work").
+
+Certain owners wish to permanently relinquish those rights to a Work for
+the purpose of contributing to a commons of creative, cultural and
+scientific works ("Commons") that the public can reliably and without fear
+of later claims of infringement build upon, modify, incorporate in other
+works, reuse and redistribute as freely as possible in any form whatsoever
+and for any purposes, including without limitation commercial purposes.
+These owners may contribute to the Commons to promote the ideal of a free
+culture and the further production of creative, cultural and scientific
+works, or to gain reputation or greater distribution for their Work in
+part through the use and efforts of others.
+
+For these and/or other purposes and motivations, and without any
+expectation of additional consideration or compensation, the person
+associating CC0 with a Work (the "Affirmer"), to the extent that he or she
+is an owner of Copyright and Related Rights in the Work, voluntarily
+elects to apply CC0 to the Work and publicly distribute the Work under its
+terms, with knowledge of his or her Copyright and Related Rights in the
+Work and the meaning and intended legal effect of CC0 on those rights.
+
+1. Copyright and Related Rights. A Work made available under CC0 may be
+protected by copyright and related or neighboring rights ("Copyright and
+Related Rights"). Copyright and Related Rights include, but are not
+limited to, the following:
+
+ i. the right to reproduce, adapt, distribute, perform, display,
+ communicate, and translate a Work;
+ ii. moral rights retained by the original author(s) and/or performer(s);
+iii. publicity and privacy rights pertaining to a person's image or
+ likeness depicted in a Work;
+ iv. rights protecting against unfair competition in regards to a Work,
+ subject to the limitations in paragraph 4(a), below;
+ v. rights protecting the extraction, dissemination, use and reuse of data
+ in a Work;
+ vi. database rights (such as those arising under Directive 96/9/EC of the
+ European Parliament and of the Council of 11 March 1996 on the legal
+ protection of databases, and under any national implementation
+ thereof, including any amended or successor version of such
+ directive); and
+vii. other similar, equivalent or corresponding rights throughout the
+ world based on applicable law or treaty, and any national
+ implementations thereof.
+
+2. Waiver. To the greatest extent permitted by, but not in contravention
+of, applicable law, Affirmer hereby overtly, fully, permanently,
+irrevocably and unconditionally waives, abandons, and surrenders all of
+Affirmer's Copyright and Related Rights and associated claims and causes
+of action, whether now known or unknown (including existing as well as
+future claims and causes of action), in the Work (i) in all territories
+worldwide, (ii) for the maximum duration provided by applicable law or
+treaty (including future time extensions), (iii) in any current or future
+medium and for any number of copies, and (iv) for any purpose whatsoever,
+including without limitation commercial, advertising or promotional
+purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each
+member of the public at large and to the detriment of Affirmer's heirs and
+successors, fully intending that such Waiver shall not be subject to
+revocation, rescission, cancellation, termination, or any other legal or
+equitable action to disrupt the quiet enjoyment of the Work by the public
+as contemplated by Affirmer's express Statement of Purpose.
+
+3. Public License Fallback. Should any part of the Waiver for any reason
+be judged legally invalid or ineffective under applicable law, then the
+Waiver shall be preserved to the maximum extent permitted taking into
+account Affirmer's express Statement of Purpose. In addition, to the
+extent the Waiver is so judged Affirmer hereby grants to each affected
+person a royalty-free, non transferable, non sublicensable, non exclusive,
+irrevocable and unconditional license to exercise Affirmer's Copyright and
+Related Rights in the Work (i) in all territories worldwide, (ii) for the
+maximum duration provided by applicable law or treaty (including future
+time extensions), (iii) in any current or future medium and for any number
+of copies, and (iv) for any purpose whatsoever, including without
+limitation commercial, advertising or promotional purposes (the
+"License"). The License shall be deemed effective as of the date CC0 was
+applied by Affirmer to the Work. Should any part of the License for any
+reason be judged legally invalid or ineffective under applicable law, such
+partial invalidity or ineffectiveness shall not invalidate the remainder
+of the License, and in such case Affirmer hereby affirms that he or she
+will not (i) exercise any of his or her remaining Copyright and Related
+Rights in the Work or (ii) assert any associated claims and causes of
+action with respect to the Work, in either case contrary to Affirmer's
+express Statement of Purpose.
+
+4. Limitations and Disclaimers.
+
+ a. No trademark or patent rights held by Affirmer are waived, abandoned,
+ surrendered, licensed or otherwise affected by this document.
+ b. Affirmer offers the Work as-is and makes no representations or
+ warranties of any kind concerning the Work, express, implied,
+ statutory or otherwise, including without limitation warranties of
+ title, merchantability, fitness for a particular purpose, non
+ infringement, or the absence of latent or other defects, accuracy, or
+ the present or absence of errors, whether or not discoverable, all to
+ the greatest extent permissible under applicable law.
+ c. Affirmer disclaims responsibility for clearing rights of other persons
+ that may apply to the Work or any use thereof, including without
+ limitation any person's Copyright and Related Rights in the Work.
+ Further, Affirmer disclaims responsibility for obtaining any necessary
+ consents, permissions or other rights required for any use of the
+ Work.
+ d. Affirmer understands and acknowledges that Creative Commons is not a
+ party to this document and has no duty or obligation with respect to
+ this CC0 or use of the Work.
Binary files old/GPXSee-7.8/icons/POI/lodging-11.png and new/GPXSee-7.9/icons/POI/lodging-11.png differ
Binary files old/GPXSee-7.8/icons/POI/mountain-11.png and new/GPXSee-7.9/icons/POI/mountain-11.png differ
Binary files old/GPXSee-7.8/icons/POI/museum-11.png and new/GPXSee-7.9/icons/POI/museum-11.png differ
Binary files old/GPXSee-7.8/icons/POI/park-11.png and new/GPXSee-7.9/icons/POI/park-11.png differ
Binary files old/GPXSee-7.8/icons/POI/parking-11.png and new/GPXSee-7.9/icons/POI/parking-11.png differ
Binary files old/GPXSee-7.8/icons/POI/pharmacy-11.png and new/GPXSee-7.9/icons/POI/pharmacy-11.png differ
Binary files old/GPXSee-7.8/icons/POI/picnic-site-11.png and new/GPXSee-7.9/icons/POI/picnic-site-11.png differ
Binary files old/GPXSee-7.8/icons/POI/place-of-worship-11.png and new/GPXSee-7.9/icons/POI/place-of-worship-11.png differ
Binary files old/GPXSee-7.8/icons/POI/police-11.png and new/GPXSee-7.9/icons/POI/police-11.png differ
Binary files old/GPXSee-7.8/icons/POI/post-11.png and new/GPXSee-7.9/icons/POI/post-11.png differ
Binary files old/GPXSee-7.8/icons/POI/prison-11.png and new/GPXSee-7.9/icons/POI/prison-11.png differ
Binary files old/GPXSee-7.8/icons/POI/religious-christian-11.png and new/GPXSee-7.9/icons/POI/religious-christian-11.png differ
Binary files old/GPXSee-7.8/icons/POI/religious-jewish-11.png and new/GPXSee-7.9/icons/POI/religious-jewish-11.png differ
Binary files old/GPXSee-7.8/icons/POI/religious-muslim-11.png and new/GPXSee-7.9/icons/POI/religious-muslim-11.png differ
Binary files old/GPXSee-7.8/icons/POI/restaurant-11.png and new/GPXSee-7.9/icons/POI/restaurant-11.png differ
Binary files old/GPXSee-7.8/icons/POI/restaurant-noodle-11.png and new/GPXSee-7.9/icons/POI/restaurant-noodle-11.png differ
Binary files old/GPXSee-7.8/icons/POI/restaurant-pizza-11.png and new/GPXSee-7.9/icons/POI/restaurant-pizza-11.png differ
Binary files old/GPXSee-7.8/icons/POI/restaurant-seafood-11.png and new/GPXSee-7.9/icons/POI/restaurant-seafood-11.png differ
Binary files old/GPXSee-7.8/icons/POI/roadblock-11.png and new/GPXSee-7.9/icons/POI/roadblock-11.png differ
Binary files old/GPXSee-7.8/icons/POI/school-11.png and new/GPXSee-7.9/icons/POI/school-11.png differ
Binary files old/GPXSee-7.8/icons/POI/shelter-11.png and new/GPXSee-7.9/icons/POI/shelter-11.png differ
Binary files old/GPXSee-7.8/icons/POI/shop-11.png and new/GPXSee-7.9/icons/POI/shop-11.png differ
Binary files old/GPXSee-7.8/icons/POI/skiing-11.png and new/GPXSee-7.9/icons/POI/skiing-11.png differ
Binary files old/GPXSee-7.8/icons/POI/soccer-11.png and new/GPXSee-7.9/icons/POI/soccer-11.png differ
Binary files old/GPXSee-7.8/icons/POI/swimming-11.png and new/GPXSee-7.9/icons/POI/swimming-11.png differ
Binary files old/GPXSee-7.8/icons/POI/telephone-11.png and new/GPXSee-7.9/icons/POI/telephone-11.png differ
Binary files old/GPXSee-7.8/icons/POI/theatre-11.png and new/GPXSee-7.9/icons/POI/theatre-11.png differ
Binary files old/GPXSee-7.8/icons/POI/toilet-11.png and new/GPXSee-7.9/icons/POI/toilet-11.png differ
Binary files old/GPXSee-7.8/icons/POI/town-hall-11.png and new/GPXSee-7.9/icons/POI/town-hall-11.png differ
Binary files old/GPXSee-7.8/icons/POI/viewpoint-11.png and new/GPXSee-7.9/icons/POI/viewpoint-11.png differ
Binary files old/GPXSee-7.8/icons/POI/village-11.png and new/GPXSee-7.9/icons/POI/village-11.png differ
Binary files old/GPXSee-7.8/icons/POI/waterfall-11.png and new/GPXSee-7.9/icons/POI/waterfall-11.png differ
Binary files old/GPXSee-7.8/icons/POI/wetland-11.png and new/GPXSee-7.9/icons/POI/wetland-11.png differ
Binary files old/GPXSee-7.8/icons/POI/zoo-11.png and new/GPXSee-7.9/icons/POI/zoo-11.png differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GPXSee-7.8/lang/gpxsee_fr.ts new/GPXSee-7.9/lang/gpxsee_fr.ts
--- old/GPXSee-7.8/lang/gpxsee_fr.ts 2019-05-29 21:24:37.000000000 +0200
+++ new/GPXSee-7.9/lang/gpxsee_fr.ts 2019-06-15 09:25:16.000000000 +0200
@@ -479,7 +479,7 @@
<message>
<location filename="../src/GUI/gui.cpp" line="352"/>
<source>km/mi markers</source>
- <translation type="unfinished"></translation>
+ <translation>Bornes kilométriques ou milliaires</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="359"/>
@@ -606,7 +606,7 @@
<message>
<location filename="../src/GUI/gui.cpp" line="670"/>
<source>GPXSee is distributed under the terms of the GNU General Public License version 3. For more info about GPXSee visit the project homepage at %1.</source>
- <translation>GPXSee est distribué selon les termes de la licence publique générale GNU (version 3). Pour plus d'information sur GPXSee, visiter le site du projet sur %1.</translation>
+ <translation>GPXSee est distribué selon les termes de la licence publique générale GNU (version 3). Pour plus d'information sur GPXSee, visiter le site du projet %1.</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="697"/>
@@ -666,7 +666,7 @@
<message>
<location filename="../src/GUI/gui.cpp" line="733"/>
<source>Styles directory:</source>
- <translation type="unfinished"></translation>
+ <translation>Dossier de styles :</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="1037"/>
@@ -1017,7 +1017,7 @@
<message>
<location filename="../src/map/maplist.cpp" line="123"/>
<source>Garmin IMG maps</source>
- <translation type="unfinished"></translation>
+ <translation>Cartes Garmin IMG</translation>
</message>
<message>
<location filename="../src/map/maplist.cpp" line="125"/>
@@ -1349,12 +1349,12 @@
<message>
<location filename="../src/GUI/optionsdialog.cpp" line="72"/>
<source>Projection:</source>
- <translation type="unfinished"></translation>
+ <translation>Projection :</translation>
</message>
<message>
<location filename="../src/GUI/optionsdialog.cpp" line="94"/>
<source>Vector maps</source>
- <translation type="unfinished"></translation>
+ <translation>Cartes vectorielles</translation>
</message>
<message>
<location filename="../src/GUI/optionsdialog.cpp" line="147"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GPXSee-7.8/pkg/gpxsee.nsi new/GPXSee-7.9/pkg/gpxsee.nsi
--- old/GPXSee-7.8/pkg/gpxsee.nsi 2019-05-29 21:24:37.000000000 +0200
+++ new/GPXSee-7.9/pkg/gpxsee.nsi 2019-06-15 09:25:16.000000000 +0200
@@ -7,7 +7,7 @@
; The name of the installer
Name "GPXSee"
; Program version
-!define VERSION "7.8"
+!define VERSION "7.9"
; The file to write
OutFile "GPXSee-${VERSION}.exe"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GPXSee-7.8/pkg/gpxsee64.nsi new/GPXSee-7.9/pkg/gpxsee64.nsi
--- old/GPXSee-7.8/pkg/gpxsee64.nsi 2019-05-29 21:24:37.000000000 +0200
+++ new/GPXSee-7.9/pkg/gpxsee64.nsi 2019-06-15 09:25:16.000000000 +0200
@@ -7,7 +7,7 @@
; The name of the installer
Name "GPXSee"
; Program version
-!define VERSION "7.8"
+!define VERSION "7.9"
; The file to write
OutFile "GPXSee-${VERSION}_x64.exe"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GPXSee-7.8/src/GUI/gui.cpp new/GPXSee-7.9/src/GUI/gui.cpp
--- old/GPXSee-7.8/src/GUI/gui.cpp 2019-05-29 21:24:37.000000000 +0200
+++ new/GPXSee-7.9/src/GUI/gui.cpp 2019-06-15 09:25:16.000000000 +0200
@@ -2216,6 +2216,8 @@
connect(w, SIGNAL(screenChanged(QScreen*)), this,
SLOT(screenChanged(QScreen*)));
#endif // ENABLE_HIDPI
+
+ _mapView->fitContentToSize();
}
void GUI::screenChanged(QScreen *screen)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GPXSee-7.8/src/GUI/mapview.cpp new/GPXSee-7.9/src/GUI/mapview.cpp
--- old/GPXSee-7.8/src/GUI/mapview.cpp 2019-05-29 21:24:37.000000000 +0200
+++ new/GPXSee-7.9/src/GUI/mapview.cpp 2019-06-15 09:25:16.000000000 +0200
@@ -39,6 +39,7 @@
setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
setRenderHint(QPainter::Antialiasing, true);
+ setResizeAnchor(QGraphicsView::AnchorViewCenter);
setAcceptDrops(false);
_mapScale = new ScaleItem();
@@ -901,17 +902,6 @@
}
}
-void MapView::resizeEvent(QResizeEvent *event)
-{
- QGraphicsView::resizeEvent(event);
-
- int zoom = _map->zoom();
- if (fitMapZoom() != zoom)
- rescale();
-
- centerOn(contentCenter());
-}
-
void MapView::paintEvent(QPaintEvent *event)
{
QPointF scaleScenePos = mapToScene(rect().bottomRight() + QPoint(
@@ -1042,3 +1032,12 @@
rescale();
centerOn(_map->ll2xy(center));
}
+
+void MapView::fitContentToSize()
+{
+ int zoom = _map->zoom();
+ if (fitMapZoom() != zoom)
+ rescale();
+
+ centerOn(contentCenter());
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GPXSee-7.8/src/GUI/mapview.h new/GPXSee-7.9/src/GUI/mapview.h
--- old/GPXSee-7.8/src/GUI/mapview.h 2019-05-29 21:24:37.000000000 +0200
+++ new/GPXSee-7.9/src/GUI/mapview.h 2019-06-15 09:25:16.000000000 +0200
@@ -85,6 +85,8 @@
void setDevicePixelRatio(qreal deviceRatio, qreal mapRatio);
void setProjection(int id);
+ void fitContentToSize();
+
private slots:
void updatePOI();
void reloadMap();
@@ -111,7 +113,6 @@
void wheelEvent(QWheelEvent *event);
void keyPressEvent(QKeyEvent *event);
void drawBackground(QPainter *painter, const QRectF &rect);
- void resizeEvent(QResizeEvent *event);
void paintEvent(QPaintEvent *event);
void scrollContentsBy(int dx, int dy);
void mouseMoveEvent(QMouseEvent *event);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GPXSee-7.8/src/GUI/optionsdialog.cpp new/GPXSee-7.9/src/GUI/optionsdialog.cpp
--- old/GPXSee-7.8/src/GUI/optionsdialog.cpp 2019-05-29 21:24:37.000000000 +0200
+++ new/GPXSee-7.9/src/GUI/optionsdialog.cpp 2019-06-15 09:25:16.000000000 +0200
@@ -12,7 +12,6 @@
#include <QRadioButton>
#include <QLabel>
#include <QSysInfo>
-#include <QInputDialog>
#include "map/pcs.h"
#include "icons.h"
#include "colorbox.h"
@@ -35,7 +34,7 @@
return l;
}
-#endif
+#endif // Q_OS_MAC
QWidget *OptionsDialog::createMapPage()
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GPXSee-7.8/src/GUI/optionsdialog.h new/GPXSee-7.9/src/GUI/optionsdialog.h
--- old/GPXSee-7.8/src/GUI/optionsdialog.h 2019-05-29 21:24:37.000000000 +0200
+++ new/GPXSee-7.9/src/GUI/optionsdialog.h 2019-06-15 09:25:16.000000000 +0200
@@ -86,9 +86,6 @@
public:
OptionsDialog(Options *options, QWidget *parent = 0);
-//private slots:
-// void projectionChanged(int index);
-
private:
QWidget *createMapPage();
QWidget *createAppearancePage();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GPXSee-7.8/src/map/IMG/img.cpp new/GPXSee-7.9/src/map/IMG/img.cpp
--- old/GPXSee-7.8/src/map/IMG/img.cpp 2019-05-29 21:24:37.000000000 +0200
+++ new/GPXSee-7.9/src/map/IMG/img.cpp 2019-06-15 09:25:16.000000000 +0200
@@ -255,3 +255,18 @@
return true;
}
+
+#ifndef QT_NO_DEBUG
+QDebug operator<<(QDebug dbg, const IMG::Point &point)
+{
+ dbg.nospace() << "Point(" << hex << point.type << ", " << point.label
+ << ", " << point.poi << ")";
+ return dbg.space();
+}
+
+QDebug operator<<(QDebug dbg, const IMG::Poly &poly)
+{
+ dbg.nospace() << "Poly(" << hex << poly.type << ", " << poly.label << ")";
+ return dbg.space();
+}
+#endif // QT_NO_DEBUG
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GPXSee-7.8/src/map/IMG/img.h new/GPXSee-7.9/src/map/IMG/img.h
--- old/GPXSee-7.8/src/map/IMG/img.h 2019-05-29 21:24:37.000000000 +0200
+++ new/GPXSee-7.9/src/map/IMG/img.h 2019-06-15 09:25:16.000000000 +0200
@@ -40,7 +40,7 @@
quint64 id;
bool operator<(const Point &other) const
- {return id < other.id;}
+ {return id > other.id;}
};
@@ -84,4 +84,9 @@
QString _errorString;
};
+#ifndef QT_NO_DEBUG
+QDebug operator<<(QDebug dbg, const IMG::Point &point);
+QDebug operator<<(QDebug dbg, const IMG::Poly &poly);
+#endif // QT_NO_DEBUG
+
#endif // IMG_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GPXSee-7.8/src/map/IMG/rgnfile.cpp new/GPXSee-7.9/src/map/IMG/rgnfile.cpp
--- old/GPXSee-7.8/src/map/IMG/rgnfile.cpp 2019-05-29 21:24:37.000000000 +0200
+++ new/GPXSee-7.9/src/map/IMG/rgnfile.cpp 2019-06-15 09:25:16.000000000 +0200
@@ -338,7 +338,8 @@
point.poi = labelPtr & 0x400000;
if (lbl && (labelPtr & 0x3FFFFF)) {
point.label = lbl->label(lblHdl, labelPtr & 0x3FFFFF, point.poi);
- point.id = ((quint64)lbl->offset())<<24 | (labelPtr & 0x3FFFFF);
+ point.id = ((quint64)point.type)<<40 | ((quint64)lbl->offset())<<24
+ | (labelPtr & 0x3FFFFF);
}
points->append(point);
@@ -383,7 +384,8 @@
point.poi = labelPtr & 0x400000;
if (lbl && (labelPtr & 0x3FFFFF)) {
point.label = lbl->label(lblHdl, labelPtr & 0x3FFFFF, point.poi);
- point.id = ((quint64)lbl->offset())<<24 | (labelPtr & 0x3FFFFF);
+ point.id = ((quint64)point.type)<<40
+ | ((quint64)lbl->offset())<<24 | (labelPtr & 0x3FFFFF);
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GPXSee-7.8/src/map/IMG/style.cpp new/GPXSee-7.9/src/map/IMG/style.cpp
--- old/GPXSee-7.8/src/map/IMG/style.cpp 2019-05-29 21:24:37.000000000 +0200
+++ new/GPXSee-7.9/src/map/IMG/style.cpp 2019-06-15 09:25:16.000000000 +0200
@@ -75,10 +75,11 @@
<< TYPE(0x42) << TYPE(0x43) << TYPE(0x44) << TYPE(0x45) << TYPE(0x46)
<< TYPE(0x47) << TYPE(0x48) << TYPE(0x49) << TYPE(0x4c) << TYPE(0x4d)
<< TYPE(0x4e) << TYPE(0x4f) << TYPE(0x50) << TYPE(0x51) << TYPE(0x52)
- << TYPE(0x14) << TYPE(0x15) << TYPE(0x1e) << TYPE(0x1f) << TYPE(0x04)
- << TYPE(0x05) << TYPE(0x06) << TYPE(0x07) << TYPE(0x08) << TYPE(0x09)
- << TYPE(0x0a) << TYPE(0x0b) << TYPE(0x0c) << TYPE(0x0d) << TYPE(0x0e)
- << TYPE(0x0f) << TYPE(0x10) << TYPE(0x11) << TYPE(0x12) << TYPE(0x13);
+ << TYPE(0x14) << TYPE(0x15) << TYPE(0x16) << TYPE(0x1e) << TYPE(0x1f)
+ << TYPE(0x04) << TYPE(0x05) << TYPE(0x06) << TYPE(0x07) << TYPE(0x08)
+ << TYPE(0x09) << TYPE(0x0a) << TYPE(0x0b) << TYPE(0x0c) << TYPE(0x0d)
+ << TYPE(0x0e) << TYPE(0x0f) << TYPE(0x10) << TYPE(0x11) << TYPE(0x12)
+ << TYPE(0x13);
}
void Style::defaultLineStyle()
@@ -147,6 +148,137 @@
_lines[TYPE(0x29)].setTextFontSize(Style::None);
}
+void Style::defaultPOIStyle()
+{
+ _points[0x2a00] = Point(QImage(":/restaurant-11.png"));
+ _points[0x2a01] = Point(QImage(":/restaurant-11.png"));
+ _points[0x2a02] = Point(QImage(":/restaurant-noodle-11.png"));
+ _points[0x2a03] = Point(QImage(":/bbq-11.png"));
+ _points[0x2a04] = Point(QImage(":/restaurant-noodle-11.png"));
+ _points[0x2a05] = Point(QImage(":/bakery-11.png"));
+ _points[0x2a06] = Point(QImage(":/restaurant-11.png"));
+ _points[0x2a07] = Point(QImage(":/fast-food-11.png"));
+ _points[0x2a08] = Point(QImage(":/restaurant-pizza-11.png"));
+ _points[0x2a09] = Point(QImage(":/restaurant-11.png"));
+ _points[0x2a0a] = Point(QImage(":/restaurant-pizza-11.png"));
+ _points[0x2a0b] = Point(QImage(":/restaurant-seafood-11.png"));
+ _points[0x2a0c] = Point(QImage(":/restaurant-11.png"));
+ _points[0x2a0d] = Point(QImage(":/bakery-11.png"));
+ _points[0x2a0e] = Point(QImage(":/cafe-11.png"));
+ _points[0x2a0f] = Point(QImage(":/restaurant-11.png"));
+ _points[0x2a10] = Point(QImage(":/restaurant-11.png"));
+ _points[0x2a11] = Point(QImage(":/restaurant-11.png"));
+ _points[0x2a12] = Point(QImage(":/restaurant-11.png"));
+ _points[0x2a13] = Point(QImage(":/restaurant-11.png"));
+
+ _points[0x2b01] = Point(QImage(":/lodging-11.png"));
+ _points[0x2b02] = Point(QImage(":/lodging-11.png"));
+ _points[0x2b03] = Point(QImage(":/campsite-11.png"));
+ _points[0x2b04] = Point(QImage(":/village-11.png"));
+ _points[0x2b06] = Point(QImage(":/shelter-11.png"));
+
+ _points[0x2c01] = Point(QImage(":/amusement-park-11.png"));
+ _points[0x2c02] = Point(QImage(":/museum-11.png"));
+ _points[0x2c03] = Point(QImage(":/library-11.png"));
+ _points[0x2c04] = Point(QImage(":/landmark-11.png"));
+ _points[0x2c05] = Point(QImage(":/school-11.png"));
+ _points[0x2c06] = Point(QImage(":/garden-11.png"));
+ _points[0x2c07] = Point(QImage(":/zoo-11.png"));
+ _points[0x2c08] = Point(QImage(":/soccer-11.png"));
+ _points[0x2c0a] = Point(QImage(":/bar-11.png"));
+ _points[0x2c0b] = Point(QImage(":/place-of-worship-11.png"));
+ _points[0x2c0d] = Point(QImage(":/religious-muslim-11.png"));
+ _points[0x2c0e] = Point(QImage(":/religious-christian-11.png"));
+ _points[0x2c10] = Point(QImage(":/religious-jewish-11.png"));
+ _points[0x2d01] = Point(QImage(":/theatre-11.png"));
+ _points[0x2d02] = Point(QImage(":/bar-11.png"));
+ _points[0x2d03] = Point(QImage(":/cinema-11.png"));
+ _points[0x2d04] = Point(QImage(":/casino-11.png"));
+ _points[0x2d05] = Point(QImage(":/golf-11.png"));
+ _points[0x2d06] = Point(QImage(":/skiing-11.png"));
+ _points[0x2d07] = Point(QImage(":/bowling-alley-11.png"));
+ _points[0x2d09] = Point(QImage(":/swimming-11.png"));
+ _points[0x2d0a] = Point(QImage(":/fitness-centre-11.png"));
+ _points[0x2d0b] = Point(QImage(":/airfield-11.png"));
+
+ _points[0x2e02] = Point(QImage(":/grocery-11.png"));
+ _points[0x2e05] = Point(QImage(":/pharmacy-11.png"));
+ _points[0x2e07] = Point(QImage(":/clothing-store-11.png"));
+ _points[0x2e08] = Point(QImage(":/garden-centre-11.png"));
+ _points[0x2e09] = Point(QImage(":/furniture-11.png"));
+ _points[0x2e0c] = Point(QImage(":/shop-11.png"));
+
+ _points[0x2f01] = Point(QImage(":/fuel-11.png"));
+ _points[0x2f02] = Point(QImage(":/car-rental-11.png"));
+ _points[0x2f03] = Point(QImage(":/car-repair-11.png"));
+ _points[0x2f04] = Point(QImage(":/airport-11.png"));
+ _points[0x2f05] = Point(QImage(":/post-11.png"));
+ _points[0x2f06] = Point(QImage(":/bank-11.png"));
+ _points[0x2f07] = Point(QImage(":/car-11.png"));
+ _points[0x2f08] = Point(QImage(":/bus-11.png"));
+ _points[0x2f09] = Point(QImage(":/harbor-11.png"));
+ _points[0x2f0b] = Point(QImage(":/parking-11.png"));
+ _points[0x2f0b].setTextFontSize(None);
+ _points[0x2f0c] = Point(QImage(":/toilet-11.png"));
+ _points[0x2f0c].setTextFontSize(None);
+ _points[0x2f10] = Point(QImage(":/hairdresser-11.png"));
+ _points[0x2f12].setTextFontSize(None);
+ _points[0x2f13] = Point(QImage(":/hardware-11.png"));
+ _points[0x2f17] = Point(QImage(":/bus-11.png"));
+
+ _points[0x3001] = Point(QImage(":/police-11.png"));
+ _points[0x3002] = Point(QImage(":/hospital-11.png"));
+ _points[0x3003] = Point(QImage(":/town-hall-11.png"));
+ _points[0x3007] = Point(QImage(":/prison-11.png"));
+ _points[0x3008] = Point(QImage(":/fire-station-11.png"));
+
+ _points[0x4000] = Point(QImage(":/golf-11.png"));
+ _points[0x4300] = Point(QImage(":/harbor-11.png"));
+ _points[0x4400] = Point(QImage(":/fuel-11.png"));
+ _points[0x4500] = Point(QImage(":/restaurant-11.png"));
+ _points[0x4600] = Point(QImage(":/bar-11.png"));
+ _points[0x4900] = Point(QImage(":/park-11.png"));
+ _points[0x4a00] = Point(QImage(":/picnic-site-11.png"));
+ _points[0x4c00] = Point(QImage(":/information-11.png"));
+ _points[0x4800] = Point(QImage(":/campsite-11.png"));
+ _points[0x4a00] = Point(QImage(":/picnic-site-11.png"));
+ _points[0x4b00] = Point(QImage(":/hospital-11.png"));
+ _points[0x4c00] = Point(QImage(":/information-11.png"));
+ _points[0x4d00] = Point(QImage(":/parking-11.png"));
+ _points[0x4d00].setTextFontSize(None);
+ _points[0x4e00] = Point(QImage(":/toilet-11.png"));
+ _points[0x4e00].setTextFontSize(None);
+ _points[0x5000] = Point(QImage(":/drinking-water-11.png"));
+ _points[0x5000].setTextFontSize(None);
+ _points[0x5100] = Point(QImage(":/telephone-11.png"));
+ _points[0x5200] = Point(QImage(":/viewpoint-11.png"));
+ _points[0x5300] = Point(QImage(":/skiing-11.png"));
+ _points[0x5400] = Point(QImage(":/swimming-11.png"));
+ _points[0x5500] = Point(QImage(":/dam-11.png"));
+ _points[0x5700] = Point(QImage(":/danger-11.png"));
+ _points[0x5800] = Point(QImage(":/roadblock-11.png"));
+ _points[0x5900] = Point(QImage(":/airport-11.png"));
+ _points[0x5901] = Point(QImage(":/airport-11.png"));
+ _points[0x5904] = Point(QImage(":/heliport-11.png"));
+
+ _points[0x6401] = Point(QImage(":/bridge-11.png"));
+ _points[0x6402] = Point(QImage(":/building-alt1-11.png"));
+ _points[0x6403] = Point(QImage(":/cemetery-11.png"));
+ _points[0x6404] = Point(QImage(":/religious-christian-11.png"));
+ _points[0x6407] = Point(QImage(":/dam-11.png"));
+ _points[0x6408] = Point(QImage(":/hospital-11.png"));
+ _points[0x6409] = Point(QImage(":/dam-11.png"));
+ _points[0x640d] = Point(QImage(":/communications-tower-11.png"));
+ _points[0x640e] = Point(QImage(":/park-11.png"));
+ _points[0x640f] = Point(QImage(":/post-11.png"));
+ _points[0x6411] = Point(QImage(":/communications-tower-11.png"));
+
+ _points[0x6508] = Point(QImage(":/waterfall-11.png"));
+ _points[0x6513] = Point(QImage(":/wetland-11.png"));
+ _points[0x6604] = Point(QImage(":/beach-11.png"));
+ _points[0x6616] = Point(QImage(":/mountain-11.png"));
+}
+
static bool readBitmap(SubFile *file, SubFile::Handle &hdl, QImage &img,
int bpp)
{
@@ -790,6 +922,7 @@
{
defaultLineStyle();
defaultPolygonStyle();
+ defaultPOIStyle();
if (typ && typ->isValid())
parseTYPFile(typ);
@@ -830,6 +963,37 @@
return (type == TYPE(0x62) || type == TYPE(0x63));
}
+bool Style::isSummit(quint32 type)
+{
+ return (type == 0x6616);
+}
+
+Style::POIClass Style::poiClass(quint32 type)
+{
+ if ((type >= 0x2a00 && type < 0x2b00) || type == 0x2c0a || type == 0x2d02)
+ return Food;
+ else if (type >= 0x2b00 && type < 0x2c00)
+ return Accommodation;
+ else if (type >= 0x2c00 && type < 0x2e00)
+ return Recreation;
+ else if (type >= 0x2e00 && type < 0x2f00)
+ return Shopping;
+ else if ((type >= 0x2f00 && type < 0x2f0f) || type == 0x2f17)
+ return Transport;
+ else if (type >= 0x2f0f && type < 0x3000)
+ return Services;
+ else if (type >= 0x3000 && type < 0x3100)
+ return Community;
+ else if (type >= 0x4000 && type < 0x6000)
+ return Elementary;
+ else if (type >= 0x6400 && type < 0x6500)
+ return ManmadePlaces;
+ else if (type >= 0x6500 && type < 0x6700)
+ return NaturePlaces;
+ else
+ return Unknown;
+}
+
#ifndef QT_NO_DEBUG
static QString penColor(const QPen &pen)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GPXSee-7.8/src/map/IMG/style.h new/GPXSee-7.9/src/map/IMG/style.h
--- old/GPXSee-7.8/src/map/IMG/style.h 2019-05-29 21:24:37.000000000 +0200
+++ new/GPXSee-7.9/src/map/IMG/style.h 2019-06-15 09:25:16.000000000 +0200
@@ -18,6 +18,20 @@
Large = 4
};
+ enum POIClass {
+ Unknown,
+ Food,
+ Accommodation,
+ Recreation,
+ Shopping,
+ Transport,
+ Services,
+ Community,
+ Elementary,
+ ManmadePlaces,
+ NaturePlaces
+ };
+
class Polygon {
public:
Polygon() : _brush(Qt::NoBrush), _pen(Qt::NoPen) {}
@@ -91,6 +105,8 @@
static bool isContourLine(quint32 type);
static bool isSpot(quint32 type);
+ static bool isSummit(quint32 type);
+ static POIClass poiClass(quint32 type);
private:
struct Section {
@@ -121,6 +137,7 @@
const Section §ion, ItemInfo &info);
void defaultPolygonStyle();
void defaultLineStyle();
+ void defaultPOIStyle();
QMap