Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'master' of ssh://github.com/osmandapp/Osmand into TelegramImprovements

Browse source
This commit is contained in:
Chumva 2019-01-18 10:19:48 +02:00
commit bd1709a306
7 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
OsmAnd-telegram/src/net/osmand/telegram/ui/LiveNowTabFragment.kt
View file

@ -461,7 +461,7 @@ class LiveNowTabFragment : Fragment(), TelegramListener, TelegramIncomingMessage
this@LiveNowTabFragment,
app.getExternalFilesDir(null),
item.userId,
60 * 60 * 6 * 1000
60 * 60 * 24 * 1000
)
true
}
@ -492,7 +492,7 @@ class LiveNowTabFragment : Fragment(), TelegramListener, TelegramIncomingMessage
this@LiveNowTabFragment,
app.getExternalFilesDir(null),
currentUserId,
60 * 60 * 6 * 1000
60 * 60 * 24 * 1000
)
}
}

3
OsmAnd/AndroidManifest.xml
View file

@ -182,8 +182,11 @@
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="content"/>
<data android:scheme="file"/>
<data android:scheme="data"/>
<data android:host="*"/>
<data android:mimeType="*/*"/>
<data android:pathPattern=".*\\.kmz" />
<data android:pathPattern=".*\\..*\\.kmz" />
<data android:pathPattern=".*\\..*\\..*\\.kmz" />

1
OsmAnd/assets/bundled_assets.xml
View file

@ -21,6 +21,7 @@
<asset source="voice/fa/fa_tts.js" destination="voice/fa-tts/fa_tts.js" mode="overwriteOnlyIfExists" />
<asset source="voice/fi/fi_tts.js" destination="voice/fi-tts/fi_tts.js" mode="overwriteOnlyIfExists" />
<asset source="voice/fr/fr_tts.js" destination="voice/fr-tts/fr_tts.js" mode="alwaysOverwriteOrCopy" />
<asset source="voice/gn-py/gn-py_tts.js" destination="voice/gn-py-tts/gn-py_tts.js" mode="overwriteOnlyIfExists" />
<!--<asset source="voice/he/he_tts.js" destination="voice/he-tts/he_tts.js" mode="overwriteOnlyIfExists" />-->
<asset source="voice/nb/nb_tts.js" destination="voice/nb-tts/nb_tts.js" mode="overwriteOnlyIfExists" />
<asset source="voice/hi/hi_tts.js" destination="voice/hi-tts/hi_tts.js" mode="overwriteOnlyIfExists" />

1
OsmAnd/res/values/strings.xml
View file

@ -1511,6 +1511,7 @@
<string name="lang_uk">Ukrainian</string>
<string name="lang_vi">Vietnamese</string>
<string name="lang_cy">Welsh</string>
<string name="lang_gn_py">Guaraní</string>
<string name="index_name_canada">North America - Canada</string>
<string name="index_name_italy">Europe - Italy</string>
<string name="index_name_gb">Europe - Great Britain</string>

4
OsmAnd/src/net/osmand/plus/activities/actions/StartGPSStatus.java
View file

@ -35,7 +35,9 @@ public class StartGPSStatus extends OsmAndAction {
GPS_TEST("GPS Test", "com.chartcross.gpstest", "com.chartcross.gpstestplus", ""),
INVIU_GPS("inViu GPS-details ", "de.enaikoon.android.inviu.gpsdetails", "", ""),
ANDROI_TS_GPS_TEST("AndroiTS GPS Test", "com.androits.gps.test.free", "com.androits.gps.test.pro", ""),
SAT_STAT("SatStat (F-droid)", "com.vonglasow.michael.satstat", "", "");
SAT_STAT("SatStat (F-droid)", "com.vonglasow.michael.satstat", "", ""),
GPSTESTSS("GPSTest (F-droid)", "com.android.gpstest", "", "");
public final String stringRes;
public final String appName;

2
OsmAnd/src/net/osmand/plus/base/MapViewTrackingUtilities.java
View file

@ -239,7 +239,7 @@ public class MapViewTrackingUtilities implements OsmAndLocationListener, IMapLoc
}
public static boolean isSmallSpeedForDirectionOfMovement(Location location, float speedToDirectionOfMovement) {
return !location.hasSpeed() || location.getSpeed() < speedToDirectionOfMovement;
return !location.hasSpeed() || location.getSpeed()* 3.6 < speedToDirectionOfMovement;
}
public static boolean isSmallSpeedForCompass(Location location) {

11
OsmAnd/src/net/osmand/plus/views/TurnPathHelper.java
View file

@ -591,10 +591,15 @@ public class TurnPathHelper {
}
} else if (turnIndex == SECOND_TURN) {
if (TurnType.isLeftTurn(firstTurnType) && TurnType.isLeftTurn(secondTurnType)) {
turnResource = null;
if(TurnType.isSlightTurn(firstTurnType))
turnResource = new TurnResource(secondTurnType, true, false, leftSide);
else turnResource = null;
} else if (TurnType.isRightTurn(firstTurnType) && TurnType.isRightTurn(secondTurnType)) {
turnResource = null;
} else if (firstTurnType == TurnType.C || thirdTurnType == TurnType.C) {
if(TurnType.isSlightTurn(firstTurnType))
turnResource = new TurnResource(secondTurnType, true, false, leftSide);
else turnResource = null;
} else
if (firstTurnType == TurnType.C || thirdTurnType == TurnType.C) {
// get the small one
turnResource = new TurnResource(secondTurnType, true, false, leftSide);
} else {