Fixed map bounds issues

pkg/Info.plist

@@ -478,6 +478,22 @@
 			<key>CFBundleTypeRole</key>
 			<string>Viewer</string>
 		</dict>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>sqlite</string>
+			</array>
+			<key>CFBundleTypeMIMETypes</key>
+			<array>
+				<string>application/vnd.osmdroid.sqlite</string>
+			</array>
+			<key>CFBundleTypeIconFile</key>
+			<string>icons/sqlt.icns</string>
+			<key>CFBundleTypeName</key>
+			<string>Osmdroid SQLite Map File</string>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+		</dict>
 		<dict>
 			<key>CFBundleTypeExtensions</key>
 			<array>
@@ -1235,6 +1251,29 @@
 				<string>application/vnd.alpinequest.aqm</string>
 			</dict>
 		</dict>
+		<dict>
+			<key>UTTypeIdentifier</key>
+			<string>org.osmdroid.sqlite</string>
+			<key>UTTypeReferenceURL</key>
+			<string>https://github.com/osmdroid/osmdroid</string>
+			<key>UTTypeDescription</key>
+			<string>Osmdroid SQLite Map File</string>
+			<key>UTTypeIconFile</key>
+			<string>icons/sqlt.icns</string>
+			<key>UTTypeConformsTo</key>
+			<array>
+				<string>public.data</string>
+			</array>
+			<key>UTTypeTagSpecification</key>
+			<dict>
+				<key>public.filename-extension</key>
+				<array>
+					<string>sqlite</string>
+				</array>
+				<key>public.mime-type</key>
+				<string>application/vnd.osmdroid.sqlite</string>
+			</dict>
+		</dict>
 		<dict>
 			<key>UTTypeIdentifier</key>
 			<string>com.robert.maps</string>

pkg/appdata.xml

@@ -21,6 +21,7 @@
 			<li>Offline maps (MBTiles, OziExplorer maps, TrekBuddy maps/atlases,
 				TwoNav RMaps, Garmin IMG &amp; JNX maps, GeoTIFF images,
 				BSB nautical charts, KMZ maps, AlpineQuest maps,
+				Locus/OsmAnd/RMaps SQLite maps, Osmdroid SQLite maps,
 				Mapsforge maps, QCT maps, ESRI world files).</li>
 			<li>Elevation, speed, heart rate, cadence, power, temperature and
 				gear ratio graphs.</li>
@@ -92,6 +93,7 @@
 		<mimetype>application/vnd.google-earth.kmz</mimetype>
 		<mimetype>application/vnd.alpinequest.aqm</mimetype>
 		<mimetype>application/vnd.rmaps.sqlite</mimetype>
+		<mimetype>application/vnd.osmdroid.sqlite</mimetype>
 		<mimetype>application/vnd.mapsforge.map</mimetype>
 		<mimetype>application/vnd.tomtom.ov2</mimetype>
 		<mimetype>application/vnd.tomtom.itn</mimetype>

pkg/gpxsee.desktop

@@ -15,4 +15,4 @@ Icon=gpxsee
 Terminal=false
 Type=Application
 Categories=Graphics;Viewer;Education;Geography;Maps;Sports;Qt
-MimeType=application/gpx+xml;application/vnd.garmin.tcx+xml;application/vnd.ant.fit;application/vnd.google-earth.kml+xml;application/vnd.fai.igc;application/vnd.nmea.nmea;application/vnd.oziexplorer.plt;application/vnd.oziexplorer.rte;application/vnd.oziexplorer.wpt;application/vnd.groundspeak.loc+xml;application/vnd.sigma.slf+xml;application/geo+json;application/vnd.naviter.seeyou.cup;application/vnd.garmin.gpi;application/vnd.suunto.sml+xml;image/jpeg;text/csv;application/vnd.garmin.img;application/vnd.garmin.jnx;application/vnd.garmin.gmap+xml;image/vnd.maptech.kap;application/vnd.oziexplorer.map;application/vnd.mapbox.mbtiles;application/vnd.twonav.rmap;application/vnd.trekbuddy.tba;application/vnd.gpxsee.map+xml;application/x-tar;image/tiff;application/vnd.google-earth.kmz;application/vnd.alpinequest.aqm;application/vnd.rmaps.sqlite;application/vnd.mapsforge.map;application/vnd.tomtom.ov2;application/vnd.tomtom.itn;application/vnd.esri.wld;application/vnd.onmove.omd;application/vnd.onmove.ghp;application/vnd.memory-map.qct;application/vnd.twonav.trk;application/vnd.twonav.rte;application/vnd.twonav.wpt
+MimeType=application/gpx+xml;application/vnd.garmin.tcx+xml;application/vnd.ant.fit;application/vnd.google-earth.kml+xml;application/vnd.fai.igc;application/vnd.nmea.nmea;application/vnd.oziexplorer.plt;application/vnd.oziexplorer.rte;application/vnd.oziexplorer.wpt;application/vnd.groundspeak.loc+xml;application/vnd.sigma.slf+xml;application/geo+json;application/vnd.naviter.seeyou.cup;application/vnd.garmin.gpi;application/vnd.suunto.sml+xml;image/jpeg;text/csv;application/vnd.garmin.img;application/vnd.garmin.jnx;application/vnd.garmin.gmap+xml;image/vnd.maptech.kap;application/vnd.oziexplorer.map;application/vnd.mapbox.mbtiles;application/vnd.twonav.rmap;application/vnd.trekbuddy.tba;application/vnd.gpxsee.map+xml;application/x-tar;image/tiff;application/vnd.google-earth.kmz;application/vnd.alpinequest.aqm;application/vnd.rmaps.sqlite;application/vnd.osmdroid.sqlite;application/vnd.mapsforge.map;application/vnd.tomtom.ov2;application/vnd.tomtom.itn;application/vnd.esri.wld;application/vnd.onmove.omd;application/vnd.onmove.ghp;application/vnd.memory-map.qct;application/vnd.twonav.trk;application/vnd.twonav.rte;application/vnd.twonav.wpt

pkg/gpxsee.xml

@@ -286,6 +286,13 @@
 		<glob pattern="*.sqlitedb"/>
 	</mime-type>
 
+	<mime-type type="application/vnd.osmdroid.sqlite">
+		<comment>Osmdroid SQLite Map File</comment>
+		<sub-class-of type="application/vnd.sqlite3"/>
+		<generic-icon name="application/octet-stream"/>
+		<glob pattern="*.sqlite"/>
+	</mime-type>
+
 	<mime-type type="application/vnd.mapsforge.map">
 		<comment>Mapsforge Map File</comment>
 		<sub-class-of type="application/octet-stream"/>

pkg/gpxsee64.nsi

@@ -166,6 +166,7 @@ Section "GPXSee" SEC_APP
   !insertmacro FILE_ASSOCIATION_ADD "rmap" "TwoNav Raster Map File" 14
   !insertmacro FILE_ASSOCIATION_ADD "tba" "TrekBuddy Atlas" 15
   !insertmacro FILE_ASSOCIATION_ADD "aqm" "AlpineQuest Map File" 16
+  !insertmacro FILE_ASSOCIATION_ADD "sqlite" "Osmdroid SQLite Map File" 17
   !insertmacro FILE_ASSOCIATION_ADD "sqlitedb" "RMaps SQLite Map File" 17
   !insertmacro FILE_ASSOCIATION_ADD "ov2" "TomTom POI File" 18
   !insertmacro FILE_ASSOCIATION_ADD "itn" "TomTom Route File" 19
@@ -223,6 +224,7 @@ Section "GPXSee" SEC_APP
   WriteRegStr HKCR ".xml\OpenWithList" "GPXSee.exe" ""
   WriteRegStr HKCR ".kmz\OpenWithList" "GPXSee.exe" ""
   WriteRegStr HKCR ".aqm\OpenWithList" "GPXSee.exe" ""
+  WriteRegStr HKCR ".sqlite\OpenWithList" "GPXSee.exe" ""
   WriteRegStr HKCR ".sqlitedb\OpenWithList" "GPXSee.exe" ""
   WriteRegStr HKCR ".wld\OpenWithList" "GPXSee.exe" ""
   WriteRegStr HKCR ".jgw\OpenWithList" "GPXSee.exe" ""
@@ -373,6 +375,7 @@ Section "Uninstall"
   !insertmacro FILE_ASSOCIATION_REMOVE "tba"
   !insertmacro FILE_ASSOCIATION_REMOVE "kmz"
   !insertmacro FILE_ASSOCIATION_REMOVE "aqm"
+  !insertmacro FILE_ASSOCIATION_REMOVE "sqlite"
   !insertmacro FILE_ASSOCIATION_REMOVE "sqlitedb"
   !insertmacro FILE_ASSOCIATION_REMOVE "ov2"
   !insertmacro FILE_ASSOCIATION_REMOVE "itn"
@@ -421,6 +424,7 @@ Section "Uninstall"
   DeleteRegValue HKCR ".xml\OpenWithList" "GPXSee.exe"
   DeleteRegValue HKCR ".kmz\OpenWithList" "GPXSee.exe"
   DeleteRegValue HKCR ".aqm\OpenWithList" "GPXSee.exe"
+  DeleteRegValue HKCR ".sqlite\OpenWithList" "GPXSee.exe"
   DeleteRegValue HKCR ".sqlitedb\OpenWithList" "GPXSee.exe"
   DeleteRegValue HKCR ".wld\OpenWithList" "GPXSee.exe"
   DeleteRegValue HKCR ".jgw\OpenWithList" "GPXSee.exe"

src/map/osmdroidmap.cpp

@@ -71,9 +71,9 @@ OsmdroidMap::OsmdroidMap(const QString &fileName, QObject *parent)
 		for (quint64 i = 0; i < (quint64)OSM::ZOOMS.max(); i++) {
 			quint64 key = ((i << i) << i);
 
-			if (key < min)
+			if (key <= min)
 				_zooms.setMin(i);
-			if (key < max)
+			if (key <= max)
 				_zooms.setMax(i);
 		}
 
@@ -139,6 +139,10 @@ OsmdroidMap::OsmdroidMap(const QString &fileName, QObject *parent)
 	tl.rlat() = -tl.lat();
 	Coordinates br(OSM::tile2ll(QPoint(r + 1, b + 1), z));
 	br.rlat() = -br.lat();
+	// Workaround of broken zoom levels 0 and 1 due to numerical
+	// instability
+	tl.rlat() = qMin(tl.lat(), OSM::BOUNDS.top());
+	br.rlat() = qMax(br.lat(), OSM::BOUNDS.bottom());
 	_bounds = RectC(tl, br);
 
 	{