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 2012-09-09 00:00:11 +02:00
commit bcab6569f9
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java
View file

@ -524,6 +524,7 @@ public class SearchPOIActivity extends OsmandListActivity implements SensorEvent
int z = Math.max(16, settings.getLastKnownMapZoom());
MapActivityActions.createDirectionsActions(qa, amenity.getLocation(), amenity, name, z, this, true , null);
ActionItem poiDescription = new ActionItem();
poiDescription.setIcon(getResources().getDrawable(R.drawable.list_activities_show_poi_description));
poiDescription.setTitle(getString(R.string.poi_context_menu_showdescription));
poiDescription.setOnClickListener(new OnClickListener() {

4
config/site/tile_sources.xml
View file

@ -15,6 +15,8 @@
url_template="public static String eqt(int z, int x, int y) {static final char[] NUM_CHAR = { '0', '1', '2', '3' };char[] tn = new char[z];for (int i = z - 1; i >= 0; i--) {int num = (x % 2) | ((y % 2) << 1);tn[i] = NUM_CHAR[num];x >>= 1;y >>= 1;}return new String(tn);} String getTileUrl(int z, int x, int y) { return "http://" + "a" + "0" + ".ortho.tiles.virtualearth.net/tiles/" + "a" + eqt(z,x,y) + ".jpg" + "?g=45";}"/>
<tile_source name="ÖPNV Transit" url_template="http://tile.xn--pnvkarte-m4a.de/tilegen/{0}/{1}/{2}.png" ext=".png" min_zoom="1" max_zoom="18" tile_size="256" img_density="16" avg_img_size="18000"/>
<tile_source name="Public Transport" url_template="http://openptmap.org/tiles/{0}/{1}/{2}.png" ext=".png" min_zoom="1" max_zoom="17" tile_size="256" img_density="16" avg_img_size="5000"/>
<tile_source name="Hike Bike Map" url_template="http://toolserver.org/tiles/hikebike/{0}/{1}/{2}.png" ext=".png" min_zoom="1" max_zoom="17" tile_size="256" img_density="8" avg_img_size="18000"/>
<tile_source name="Hike Bike Map (Hills Underlay)" url_template="http://toolserver.org/~cmarqu/hill/{0}/{1}/{2}.png" ext=".png" min_zoom="1" max_zoom="17" tile_size="256" img_density="16" avg_img_size="18000"/>
@ -22,6 +24,8 @@
<tile_source name="OpenPisteMap" url_template="http://openpistemap.org/tiles/contours/{0}/{1}/{2}.png" ext=".png" min_zoom="5" max_zoom="17" tile_size="256" img_density="32" avg_img_size="18000"/>
<tile_source name="Relief" url_template="http://www.maps-for-free.com/layer/relief/z{0}/row{2}/{0}_{1}-{2}.jpg" ext=".jpg" min_zoom="1" max_zoom="12" tile_size="256" img_density="32" avg_img_size="24000"/>
<tile_source name="Fire Hydrants" url_template="http://openfiremap.org/hytiles/{0}/{1}/{2}.png" ext=".png" min_zoom="1" max_zoom="17" tile_size="256" img_density="16" avg_img_size="2000"/>
<!--
<tile_source name="Cykloatlas CZ" url_template="http://services.tmapserver.cz/tiles/gm/shc/{0}/{1}/{2}.png" ext=".png" min_zoom="7" max_zoom="16" tile_size="256" img_density="16" avg_img_size="26000"/>
<tile_source name="Cykloatlas CZ HillShade" url_template="http://services.tmapserver.cz/tiles/gm/sum/{0}/{1}/{2}.png" ext=".png" min_zoom="7" max_zoom="15" tile_size="256" img_density="16" avg_img_size="26000"/>