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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2013-11-26 13:45:47 +01:00
commit e675817024
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
OsmAnd/src/net/osmand/plus/render/MapRenderRepositories.java
View file

@ -476,6 +476,8 @@ public class MapRenderRepositories {
try { try {
c.searchMapIndex(searchRequest); c.searchMapIndex(searchRequest);
} catch (IOException e) { } catch (IOException e) {
// lots of FalsePositive cases
return false;
} }
if (!empty[0]) { if (!empty[0]) {
return false; return false;
@ -487,6 +489,8 @@ public class MapRenderRepositories {
return false; return false;
} }
} catch (IOException e) { } catch (IOException e) {
// lots of FalsePositive cases
return false;
} }
} }
} }

3
OsmAnd/src/net/osmand/plus/views/mapwidgets/RouteInfoWidgetsFactory.java
View file

@ -646,14 +646,17 @@ public class RouteInfoWidgetsFactory {
} }
} else if(alarm.getType() == AlarmInfo.SPEED_CAMERA) { } else if(alarm.getType() == AlarmInfo.SPEED_CAMERA) {
locimgId = R.drawable.warnings_speed_camera; locimgId = R.drawable.warnings_speed_camera;
text = "";
} else if(alarm.getType() == AlarmInfo.BORDER_CONTROL) { } else if(alarm.getType() == AlarmInfo.BORDER_CONTROL) {
text = "CLO"; text = "CLO";
} else if(alarm.getType() == AlarmInfo.TOLL_BOOTH) { } else if(alarm.getType() == AlarmInfo.TOLL_BOOTH) {
text = "$"; text = "$";
} else if(alarm.getType() == AlarmInfo.TRAFFIC_CALMING) { } else if(alarm.getType() == AlarmInfo.TRAFFIC_CALMING) {
locimgId = R.drawable.warnings_speed_bump; locimgId = R.drawable.warnings_speed_bump;
text = "";
} else if(alarm.getType() == AlarmInfo.STOP) { } else if(alarm.getType() == AlarmInfo.STOP) {
// text = "STOP"; // text = "STOP";
text = "";
} }
visible = (text != null && text.length() > 0) || locimgId != 0; visible = (text != null && text.length() > 0) || locimgId != 0;
if (visible) { if (visible) {