Merge lp:~steve-evolvedlight/opensatnav/os-maps-update-memory-fix into lp:~opensatnav-admins/opensatnav/release-1.0

Proposed by evolvedlight
Status: Merged
Merged at revision: 152
Proposed branch: lp:~steve-evolvedlight/opensatnav/os-maps-update-memory-fix
Merge into: lp:~opensatnav-admins/opensatnav/release-1.0
Diff against target: 25 lines (+2/-2)
2 files modified
src/org/andnav/osm/views/util/OpenStreetMapRendererInfo.java (+1/-1)
src/org/andnav/osm/views/util/constants/OpenStreetMapViewConstants.java (+1/-1)
To merge this branch: bzr merge lp:~steve-evolvedlight/opensatnav/os-maps-update-memory-fix
Reviewer Review Type Date Requested Status
Kieran Fleming Approve
Review via email: mp+24998@code.launchpad.net

Description of the change

Finally what I meant to commit, against the correct branch.

This may be a fix for the memory problem.

This also makes OS maps zoom in more.

To post a comment you must log in.
Revision history for this message
Kieran Fleming (kieran-fleming) wrote :

I can't replicate the problem no matter what I try! It's probably best to apply this change anyway and see if it fixes the problem.

Revision history for this message
Kieran Fleming (kieran-fleming) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/org/andnav/osm/views/util/OpenStreetMapRendererInfo.java'
--- src/org/andnav/osm/views/util/OpenStreetMapRendererInfo.java 2010-04-06 22:04:13 +0000
+++ src/org/andnav/osm/views/util/OpenStreetMapRendererInfo.java 2010-05-10 14:49:28 +0000
@@ -38,7 +38,7 @@
38 R.string.prefs_map_noname, "noname", ".png", 18, 256),38 R.string.prefs_map_noname, "noname", ".png", 18, 256),
39 OS(39 OS(
40 "http://os.openstreetmap.org/sv/",40 "http://os.openstreetmap.org/sv/",
41 R.string.prefs_map_os, "OS StreetView", ".png", 16, 256),41 R.string.prefs_map_os, "OS StreetView", ".png", 17, 256),
42 42
43 // OPENARIELMAP("http://tile.openaerialmap.org/tiles/1.0.0/openaerialmap-900913/",43 // OPENARIELMAP("http://tile.openaerialmap.org/tiles/1.0.0/openaerialmap-900913/",
44 // "OpenAerialMap (Satellite)", ".jpg", 13, 256),44 // "OpenAerialMap (Satellite)", ".jpg", 13, 256),
4545
=== modified file 'src/org/andnav/osm/views/util/constants/OpenStreetMapViewConstants.java'
--- src/org/andnav/osm/views/util/constants/OpenStreetMapViewConstants.java 2009-10-28 13:02:42 +0000
+++ src/org/andnav/osm/views/util/constants/OpenStreetMapViewConstants.java 2010-05-10 14:49:28 +0000
@@ -29,7 +29,7 @@
29 29
30 public static final boolean DEBUGMODE = false;30 public static final boolean DEBUGMODE = false;
31 31
32 public static final int CACHE_MAPTILECOUNT_DEFAULT = 36;32 public static final int CACHE_MAPTILECOUNT_DEFAULT = 25;
33 33
34 public static final int MAPTILE_LATITUDE_INDEX = 0;34 public static final int MAPTILE_LATITUDE_INDEX = 0;
35 public static final int MAPTILE_LONGITUDE_INDEX = 1;35 public static final int MAPTILE_LONGITUDE_INDEX = 1;

Subscribers

People subscribed via source and target branches

to all changes: