|
[-]
[+]
|
Changed |
_service:tar_git:harbour-pure-maps.spec
|
|
|
|
[-]
[+]
|
Changed |
_service
^
|
| @@ -2,6 +2,7 @@
<service name="tar_git">
<param name="url">https://github.com/rinigus/pure-maps.git</param>
<param name="branch">master</param>
+ <param name="revision">2.7.5</param>
<param name="debian">N</param>
<param name="dumb">N</param>
</service>
|
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-pure-maps-2.7.5+master.20210714194025.9.g708b35b8.tar.xz/maps/thunderforest_outdoors.json
^
|
| @@ -1,11 +0,0 @@
-{
- "attribution": {
- "© Thunderforest": "https://www.thunderforest.com/",
- "© OpenStreetMap": "https://www.openstreetmap.org/copyright"
- },
- "format": "raster",
- "name": "Thunderforest Outdoors",
- "profiles": ["mixed", "online"],
- "tile_size": 256,
- "tile_url": "https://tile.thunderforest.com/outdoors/{z}/{x}/{y}@2x.png?apikey=9a913f34956945b494e3b9f5159968ad"
-}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-pure-maps-2.7.5.tar.xz/packaging/pure-maps.appdata.xml
^
|
| @@ -17,7 +17,7 @@
<url type="bugtracker">https://github.com/rinigus/pure-maps/issues</url>
<url type="donation">https://rinigus.github.io/donate</url>
<url type="translate">https://www.transifex.com/rinigus/pure-maps</url>
- <launchable type="desktop-id">io.github.rinigus.PureMaps.desktop</launchable>
+ <launchable desktop-id="io.github.rinigus.PureMaps"/>
<provides>
<binary>pure-maps</binary>
</provides>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-pure-maps-2.7.5.tar.xz/poor/util.py
^
|
| @@ -276,7 +276,7 @@
def format_location_message(x, y, extra_text, html=False, extra=True, osm=True, gmaps=False):
"""Format coordinates of a point into a location message."""
if osm: osm_url = short_osm(y,x)
- if gmaps: gm = 'https://maps.google.com/?q={y:.5f},{x:.5f}'.format(x=x, y=y)
+ if gmaps: gm = 'http://maps.google.com/?q={y:.5f},{x:.5f}'.format(x=x, y=y)
plus = olc_encode(y,x)
if html:
if extra_text and extra: r = extra_text + '<br>'
@@ -419,11 +419,11 @@
Provide coordinates and optional zoom level. e.g.:
>>> short_osm(50.671530961990356, 6.09715461730957)
- https://osm.org/go/0GAjIv8h
+ http://osm.org/go/0GAjIv8h
>>> short_osm(0, 0, 3)
- https://osm.org/go/wAAA--
+ http://osm.org/go/wAAA--
>>> short_osm(0, 0, 4)
- https://osm.org/go/wAAA
+ http://osm.org/go/wAAA
"""
# OSM short link, from https://gist.github.com/mdornseif/5652824
# osm_shortlink.py - MAximillian Dornseif 2013 - Public Domain
@@ -464,7 +464,7 @@
c = (c << 1) | ((y >> i) & 1)
return c
- return 'https://osm.org/go/' + _encode(lat, lon, zoom) + "?m"
+ return 'http://osm.org/go/' + _encode(lat, lon, zoom) + "?m"
def path2uri(path):
"""Convert local filepath to URI."""
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-pure-maps-2.7.5.tar.xz/qml/InitPage.qml
^
|
| @@ -24,6 +24,7 @@
id: page
title: "Pure Maps"
+ property bool mapboxKeyMissing: false
property bool ready: false
BusyModal {
@@ -50,7 +51,7 @@
"in Preferences. This key is not needed if you plan to use " +
"Pure Maps with the offline map provider.")
});
- app.mapboxKeyMissing = true;
+ mapboxKeyMissing = true;
} else start();
}
}
@@ -59,5 +60,7 @@
function start() {
app.rootPage = app.pages.replace(Qt.resolvedUrl("RootPage.qml"));
+ app.initialize();
+ if (mapboxKeyMissing) app.showMenu();
}
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-pure-maps-2.7.5.tar.xz/qml/PositionSource.qml
^
|
| @@ -48,20 +48,14 @@
property var timeActivate: Date.now()
property var timePosition: Date.now()
- Component.onCompleted: checkReady()
-
onActiveChanged: {
// Keep track of when positioning was (re)activated.
if (active) timeActivate = Date.now();
- checkReady();
+ else ready = false;
}
onPositionChanged: {
timePosition = Date.now();
- checkReady();
- }
-
- function checkReady() {
ready = position.latitudeValid &&
position.longitudeValid &&
position.coordinate.latitude &&
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-pure-maps-2.7.5.tar.xz/qml/RootPage.qml
^
|
| @@ -130,14 +130,11 @@
app.remorse = remorse;
// connect modal dialog properties
app.modalDialogBasemap = Qt.binding(function () { return basemapButton.openMenu; });
+ // after all objects are initialized
+ CmdLineParser.process()
}
onPageStatusActive: {
if (!app.infoActive) app.stateId = "";
- // finish initialization after the root page is shown
- if (!app.initialized) {
- app.initialize();
- if (app.mapboxKeyMissing) app.showMenu();
- }
}
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-pure-maps-2.7.5.tar.xz/qml/pure-maps.qml
^
|
| @@ -49,7 +49,6 @@
// and the associated constant Theme.itemSizeSmall.
property real listItemVerticalMargin: (styler.themeItemSizeSmall - 1.125 * styler.themeFontSizeMedium) / 2
property var map: null
- property bool mapboxKeyMissing: false
property string mapMatchingMode: {
if (!hasMapMatching) return "none";
else if (app.mode === modes.navigate || app.mode === modes.followMe || app.mode === modes.navigatePost)
@@ -221,8 +220,6 @@
else
app.hasMapMatching = mapMatchingAvailable;
initialized = true;
- // after all objects and pages are initialized
- CmdLineParser.process()
}
function openMapErrorMessage(error) {
|
