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

bugfix

Browse source 
git-svn-id: https://osmand.googlecode.com/svn/trunk@401 e29c36b1-1cfa-d876-8d93-3434fc2bb7b8
This commit is contained in:
Victor Shcherb 2010-07-27 19:24:21 +00:00
parent d707d5295b
commit 028149033a
3 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
OsmAnd/src/com/osmand/OsmandSettings.java
View file

@ -326,12 +326,14 @@ public class OsmandSettings {
String url = null; String url = null;
File readUrl = new File(dir, "url"); //$NON-NLS-1$ File readUrl = new File(dir, "url"); //$NON-NLS-1$
try { try {
BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(readUrl), "UTF-8")); //$NON-NLS-1$ if (readUrl.exists()) {
url = reader.readLine(); BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(readUrl), "UTF-8")); //$NON-NLS-1$
url = url.replaceAll(Pattern.quote("{$z}"), "{0}"); //$NON-NLS-1$ //$NON-NLS-2$ url = reader.readLine();
url = url.replaceAll(Pattern.quote("{$x}"), "{1}"); //$NON-NLS-1$//$NON-NLS-2$ url = url.replaceAll(Pattern.quote("{$z}"), "{0}"); //$NON-NLS-1$ //$NON-NLS-2$
url = url.replaceAll(Pattern.quote("{$y}"), "{2}"); //$NON-NLS-1$ //$NON-NLS-2$ url = url.replaceAll(Pattern.quote("{$x}"), "{1}"); //$NON-NLS-1$//$NON-NLS-2$
reader.close(); url = url.replaceAll(Pattern.quote("{$y}"), "{2}"); //$NON-NLS-1$ //$NON-NLS-2$
reader.close();
}
} catch (IOException e) { } catch (IOException e) {
Log.d(LogUtil.TAG, "Error reading url " + dir.getName(), e); //$NON-NLS-1$ Log.d(LogUtil.TAG, "Error reading url " + dir.getName(), e); //$NON-NLS-1$
} }

2
OsmAnd/src/com/osmand/SQLiteTileSource.java
View file

@ -50,7 +50,7 @@ public class SQLiteTileSource implements ITileSource {
@Override @Override
public int getBitDensity() { public int getBitDensity() {
return base != null ? base.getBitDensity() : 32; return base != null ? base.getBitDensity() : 16;
} }
@Override @Override

9
OsmAnd/src/com/osmand/views/OsmBugsLayer.java
View file

@ -6,11 +6,8 @@ import java.io.InputStreamReader;
import java.net.URL; import java.net.URL;
import java.net.URLConnection; import java.net.URLConnection;
import java.net.URLEncoder; import java.net.URLEncoder;
import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Locale;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
@ -56,7 +53,7 @@ public class OsmBugsLayer implements OsmandMapLayer {
private Paint pointClosedUI; private Paint pointClosedUI;
private Paint pointOpenedUI; private Paint pointOpenedUI;
private Pattern patternToParse = Pattern.compile("putAJAXMarker\\((\\d*), ((\\d|\\.)*), ((\\d|\\.)*), '([^']*)', (\\d)\\);"); //$NON-NLS-1$ private Pattern patternToParse = Pattern.compile("putAJAXMarker\\((\\d*), ((\\d|\\.)*), ((\\d|\\.)*), '([^']*)', (\\d)\\);"); //$NON-NLS-1$
private SimpleDateFormat dateFormat = new SimpleDateFormat("dd.MM.yyyy hh:mm aaa", Locale.US); //$NON-NLS-1$ // private SimpleDateFormat dateFormat = new SimpleDateFormat("dd.MM.yyyy hh:mm aaa", Locale.US); //$NON-NLS-1$
private double cTopLatitude; private double cTopLatitude;
private double cBottomLatitude; private double cBottomLatitude;
@ -263,7 +260,7 @@ public class OsmBugsLayer implements OsmandMapLayer {
b.append("http://openstreetbugs.schokokeks.org/api/0.1/addPOIexec?"); //$NON-NLS-1$ b.append("http://openstreetbugs.schokokeks.org/api/0.1/addPOIexec?"); //$NON-NLS-1$
b.append("lat=").append(latitude); //$NON-NLS-1$ b.append("lat=").append(latitude); //$NON-NLS-1$
b.append("&lon=").append(longitude); //$NON-NLS-1$ b.append("&lon=").append(longitude); //$NON-NLS-1$
text = text + " [" + authorName +" "+ dateFormat.format(new Date())+ "]"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ text = text + " [" + authorName + "]"; //$NON-NLS-1$ //$NON-NLS-2$
b.append("&text=").append(URLEncoder.encode(text)); //$NON-NLS-1$ b.append("&text=").append(URLEncoder.encode(text)); //$NON-NLS-1$
b.append("&name=").append(URLEncoder.encode(authorName)); //$NON-NLS-1$ b.append("&name=").append(URLEncoder.encode(authorName)); //$NON-NLS-1$
return editingPOI(b.toString(), "creating bug"); //$NON-NLS-1$ return editingPOI(b.toString(), "creating bug"); //$NON-NLS-1$
@ -273,7 +270,7 @@ public class OsmBugsLayer implements OsmandMapLayer {
StringBuilder b = new StringBuilder(); StringBuilder b = new StringBuilder();
b.append("http://openstreetbugs.schokokeks.org/api/0.1/editPOIexec?"); //$NON-NLS-1$ b.append("http://openstreetbugs.schokokeks.org/api/0.1/editPOIexec?"); //$NON-NLS-1$
b.append("id=").append(id); //$NON-NLS-1$ b.append("id=").append(id); //$NON-NLS-1$
text = text + " [" + authorName +" "+ dateFormat.format(new Date())+ "]"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ text = text + " [" + authorName + "]"; //$NON-NLS-1$ //$NON-NLS-2$
b.append("&text=").append(URLEncoder.encode(text)); //$NON-NLS-1$ b.append("&text=").append(URLEncoder.encode(text)); //$NON-NLS-1$
b.append("&name=").append(URLEncoder.encode(authorName)); //$NON-NLS-1$ b.append("&name=").append(URLEncoder.encode(authorName)); //$NON-NLS-1$
return editingPOI(b.toString(), "adding comment"); //$NON-NLS-1$ return editingPOI(b.toString(), "adding comment"); //$NON-NLS-1$