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

Fix issue 403

Browse source
This commit is contained in:
Victor Shcherb 2011-04-24 16:23:52 +02:00
parent 4daa4045de
commit bc48c18e59
3 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
DataExtractionOSM/src/net/osmand/ToDoConstants.java
View file

@ -8,13 +8,14 @@ package net.osmand;
public class ToDoConstants { public class ToDoConstants {
// == Osmand application (TODO 122) == // == Osmand application (TODO 123) ==
// === Refactoring issues === // === Refactoring issues ===
// || 116 || Move all messages.properties related Android application inside strings.xml to have better access with their translation || // || 116 || Move all messages.properties related Android application inside strings.xml to have better access with their translation ||
// === Common issues === // === Common issues ===
// || 122 || Frozen sqlite db images (bug?). When images are loaded into sqlite the whole map is frozen ||
// || 121 || Filter network location from GPS location (wait for 10 seconds before start using network location) || // || 121 || Filter network location from GPS location (wait for 10 seconds before start using network location) ||
// || 120 || Show icons over poi circle || // || 120 || Show icons over poi circle ||
// || 119 || Dialog on main screen tips and tricks || // || 119 || Dialog on main screen tips and tricks ||

2
OsmAnd/AndroidManifest.xml
View file

@ -2,7 +2,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="net.osmand.plus" android:installLocation="auto" android:versionName="0.6.1" android:versionCode="30"> package="net.osmand.plus" android:installLocation="auto" android:versionName="0.6.1" android:versionCode="30">
<application android:icon="@drawable/icon" android:label="@string/app_name" <application android:icon="@drawable/icon" android:label="@string/app_name"
android:debuggable="false" android:name=".activities.OsmandApplication" android:description="@string/app_description"> android:debuggable="true" android:name=".activities.OsmandApplication" android:description="@string/app_description">
<activity android:name=".activities.MainMenuActivity" <activity android:name=".activities.MainMenuActivity"
android:label="@string/app_name"> android:label="@string/app_name">
<intent-filter> <intent-filter>

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

@ -34,6 +34,7 @@ import net.osmand.plus.R;
import net.osmand.plus.RotatedTileBox; import net.osmand.plus.RotatedTileBox;
import net.osmand.plus.activities.OsmandApplication; import net.osmand.plus.activities.OsmandApplication;
import net.osmand.plus.render.OsmandRenderer.RenderingContext; import net.osmand.plus.render.OsmandRenderer.RenderingContext;
import net.osmand.render.OsmandRenderingRulesParser;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
@ -231,7 +232,11 @@ public class MapRenderRepositories {
int type = types.get(j); int type = types.get(j);
int mask = type & 3; int mask = type & 3;
TagValuePair pair = root.decodeType(type); TagValuePair pair = root.decodeType(type);
if (pair != null && renderingType.isObjectVisible(pair.tag, pair.value, zoom, mask)) { if (pair != null && renderingType.isObjectVisible(pair.tag, pair.value, zoom, mask)) {
return true;
}
if(pair != null && mask == OsmandRenderingRulesParser.POINT_STATE &&
renderingType.isObjectVisible(pair.tag, pair.value, zoom, OsmandRenderingRulesParser.TEXT_STATE)){
return true; return true;
} }
} }