v0.8.1:

- Initial zoom level setting with translations - Native icon to show position + fixed auto-center on Xperia (check horizontalAccuracy)
sthocs · Nov 18, 2017 · 872dacd · 872dacd
1 parent 9d78e57
commit 872dacd
Show file tree

Hide file tree

Showing 14 changed files with 67 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -9,7 +9,7 @@ You can also save your favourites stations and see their status on the cover.
 
 500+ cities availables in 50+ countries. Check if yours is there!
 
-Get it on [OpenRepos](https://openrepos.net/content/sthocs/bikeme). 
+Get it on [OpenRepos](https://openrepos.net/content/sthocs/bikeme).  
 Translations on [Transifex](https://www.transifex.com/sthocs/harbour-bikeme).
 
 ![BikeMe banner](images/banner.png)
diff --git a/qml/icons/me.png b/qml/icons/me.png
diff --git a/qml/items/StationMarker.qml b/qml/items/StationMarker.qml
@@ -12,15 +12,15 @@ Item {
     property string _COLOR_AVAILABLE : "#77A834"
     property string _COLOR_ALMOST_EMPTY : "orange"
     property string _COLOR_EMPTY : "red"
-    property string _COLOR_SELECTED1 : "steelblue" // blue when data is available
+    property string _COLOR_SELECTED1 : "DodgerBlue" // blue when data is available
     property string _COLOR_SELECTED2 : "#D60080" // pink when no data is available
 
     Rectangle {
         z: 2
         width: Theme.iconSizeSmall; height: Theme.iconSizeSmall
         radius: 10
         color: {
-            if (!opened) {
+            if (!opened && !selected) {
                 return "grey";
             }
             if (!displayAllStatus || available < 0) {
@@ -60,7 +60,7 @@ Item {
         x: Theme.iconSizeSmall / 4; y: Theme.iconSizeSmall / 4 * 2.5
         width: Theme.iconSizeSmall / 2; height: Theme.iconSizeSmall / 2 // c²=512 -> c=22.63 -> c/2=11.31
         color: {
-            if (!opened) {
+            if (!opened && !selected) {
                 return "grey";
             }
             if (selected) {

diff --git a/qml/pages/InteractiveMap.qml b/qml/pages/InteractiveMap.qml
@@ -60,10 +60,11 @@ Page {
 
             Component.onCompleted: {
                 center = QtPositioning.coordinate(43.5508823, 7.0168207);
-                map.zoomLevel = autoEnableGPS ? 14 : city.zoom || 13;
-                if (mapPlugin === "osm") {
-                    map.zoomLevel += 1;
-                }
+                var zoomSetting = !isNaN(configManager.getSetting("zoomLevel")) ?
+                            parseInt(configManager.getSetting("zoomLevel")) : 15
+                zoomLevel = zoomSetting >= minimumZoomLevel && zoomSetting <= maximumZoomLevel ?
+                            zoomSetting : 15
+
                 updateFilter();
                 stationLoadingLabel.visible = true;
                 stations.city = city;
@@ -74,7 +75,6 @@ Page {
             }
 
             gesture.onPanFinished: {
-                console.log("Pan FINISHED");
                 updateFilter();
             }
             gesture.onPinchFinished: {
@@ -88,10 +88,11 @@ Page {
                 coordinate: positionSource.position.coordinate
                 visible: positionReceived
                 sourceItem: Image {
-                    source: "../icons/me.png"
+                    id: dot
+                    source: "image://theme/icon-m-dot?DodgerBlue"
                 }
-                anchorPoint.x: 24
-                anchorPoint.y: 24
+                anchorPoint.x: dot.width / 2
+                anchorPoint.y: dot.height / 2
             }
 
             MapMouseArea {
@@ -279,7 +280,8 @@ Page {
         active: false
 
         onPositionChanged: {
-            if (!positionReceived && active && position.horizontalAccuracyValid) { // First time we receive a valid position, go to it.
+            if (!positionReceived && active && position.horizontalAccuracyValid &&
+                    position.horizontalAccuracy < 500) { // First time we receive a valid position, go to it.
                 positionReceived = true;
                 // Keep coordinates in a different object to avoid map auto-centering.
                 var pos = QtPositioning.coordinate(positionSource.position.coordinate.latitude,
@@ -377,7 +379,8 @@ Page {
 
     Image {
         id: centerPosIcon
-        source: positionReceived ? "image://theme/icon-cover-location" : "image://theme/icon-cover-location?gray"
+        source: positionSource.active && positionSource.position.horizontalAccuracyValid &&
+                positionSource.position.horizontalAccuracy < 500 ? "image://theme/icon-cover-location" : "image://theme/icon-cover-location?gray"
         anchors {
             right: gpsIcon.left
             rightMargin: Theme.paddingMedium
@@ -391,7 +394,8 @@ Page {
         MouseArea {
             anchors.fill: parent
             onClicked: {
-                if (positionReceived) {
+                if (positionSource.active && positionSource.position.horizontalAccuracyValid &&
+                        positionSource.position.horizontalAccuracy < 500) {
                     map.center = map.toCoordinate(Qt.point(map.width / 2, map.height / 2));
                     var pos = QtPositioning.coordinate(positionSource.position.coordinate.latitude,
                                                        positionSource.position.coordinate.longitude)

diff --git a/qml/pages/Settings.qml b/qml/pages/Settings.qml
@@ -88,6 +88,19 @@ Page {
                 checked = configManager.getSetting("autoEnableGPS") !== "false";
             }
         }
+        Slider {
+            label: qsTr("Map initial zoom level")
+            width: parent.width
+            minimumValue: 12
+            maximumValue: 18
+            value: !isNaN(configManager.getSetting("zoomLevel")) ?
+                       parseInt(configManager.getSetting("zoomLevel")) : 15
+            valueText: value
+            stepSize: 1
+            onValueChanged: {
+                configManager.saveSetting("zoomLevel", value);
+            }
+         }
         Item {
             width: parent.width
             height: Theme.paddingLarge * 5

diff --git a/rpm/harbour-bikeme.changes b/rpm/harbour-bikeme.changes
@@ -1,3 +1,8 @@
+* Mon Nov 13 2017 Sthocs <sthocs@hotmail.com> 0.8.1-1
+- Use native icon to show position
+- Map initial zoom level setting
+- Removed dead systems, added tests, added Rennes (fr)
+
 * Tue Jun 27 2017 Sthocs <sthocs@hotmail.com> 0.8-1
 - Added option to use CityBikes as data source
 - Workaround for the onPanFinished bug

diff --git a/rpm/harbour-bikeme.yaml b/rpm/harbour-bikeme.yaml
@@ -1,6 +1,6 @@
 Name: harbour-bikeme
 Summary: Find a bike with your Sailfish OS device!
-Version: 0.8
+Version: 0.8.1
 Release: 1
 Group: Qt/Qt
 URL: https://openrepos.net/users/sthocs

diff --git a/translations/harbour-bikeme-en.ts b/translations/harbour-bikeme-en.ts
@@ -17,7 +17,7 @@
     </message>
     <message>
         <source>Many thanks for the translations: %1</source>
-        <translation>Many thanks for the translations: %</translation>
+        <translation>Many thanks for the translations: %1</translation>
     </message>
     <message>
         <source>This app helps you to find a bike or a free parking spot for various self-service bicycle schemes arround the world:&lt;ul&gt;%1&lt;li&gt;And more!&lt;/li&gt;&lt;/ul&gt;BikeMe provides a simple interactive map displaying all stations by city, their number of available bikes and free parking spots, and the geolocation.&lt;br /&gt;Click on %2 to activate the geolocation and on %3 to center the map on your position.&lt;br/&gt;Regular users: Save your favourites stations and see their status directly on the cover!</source>
@@ -254,5 +254,9 @@
         <source>Open map on my position</source>
         <translation>Open map on my position</translation>
     </message>
+    <message>
+        <source>Map initial zoom level</source>
+        <translation>Map initial zoom level</translation>
+    </message>
 </context>
 </TS>
diff --git a/translations/harbour-bikeme-es.ts b/translations/harbour-bikeme-es.ts
@@ -246,5 +246,9 @@
         <source>Open map on my position</source>
         <translation>Abrir mapa en tu posición</translation>
     </message>
+    <message>
+        <source>Map initial zoom level</source>
+        <translation>Nivel de zoom inicial en mapa</translation>
+    </message>
 </context>
 </TS>
diff --git a/translations/harbour-bikeme-fr.ts b/translations/harbour-bikeme-fr.ts
@@ -254,5 +254,9 @@
         <source>Open map on my position</source>
         <translation>Ouvrir la carte sur ma position</translation>
     </message>
+    <message>
+        <source>Map initial zoom level</source>
+        <translation>Zoom initial de la carte</translation>
+    </message>
 </context>
 </TS>
diff --git a/translations/harbour-bikeme-pl.ts b/translations/harbour-bikeme-pl.ts
@@ -246,5 +246,9 @@
         <source>Open map on my position</source>
         <translation>Otwórz mapę w mojej lokalizacji</translation>
     </message>
+    <message>
+        <source>Map initial zoom level</source>
+        <translation>Początkowy poziom powiększenia mapy</translation>
+    </message>
 </context>
 </TS>
diff --git a/translations/harbour-bikeme-ru.ts b/translations/harbour-bikeme-ru.ts
@@ -246,5 +246,9 @@
         <source>Open map on my position</source>
         <translation>Показать мое местоположение на карте</translation>
     </message>
+    <message>
+        <source>Map initial zoom level</source>
+        <translation>Масштаб карты при запуске приложения</translation>
+    </message>
 </context>
 </TS>
diff --git a/translations/harbour-bikeme-sv.ts b/translations/harbour-bikeme-sv.ts
@@ -246,5 +246,9 @@
         <source>Open map on my position</source>
         <translation>Öppna kartan på min position</translation>
     </message>
+    <message>
+        <source>Map initial zoom level</source>
+        <translation>Kartans inledande zoomnivå</translation>
+    </message>
 </context>
 </TS>
diff --git a/translations/harbour-bikeme.ts b/translations/harbour-bikeme.ts
@@ -252,5 +252,9 @@
         <source>Open map on my position</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Map initial zoom level</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>