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 2015-02-16 09:43:08 +01:00
commit 9ce7fb50f3
3 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
OsmAnd-java/src/net/osmand/map/OsmandRegions.java
View file

@ -309,6 +309,9 @@ public class OsmandRegions {
String prefix = getPrefix(o).toLowerCase();
String locPrefix = downloadNamesToLocaleNames.get(prefix);
String locName = downloadNamesToLocaleNames.get(downloadName);
if(locPrefix == null || locName == null) {
throw new IllegalStateException("There is no prefix registered for " + downloadName + " (" + prefix + ") ");
}
downloadNamesToLocaleNames.put(downloadName, locPrefix + " " + locName);
String index = downloadNamesToLowercaseIndex.get(downloadName);
downloadNamesToLowercaseIndex.put(downloadName, index + " " + prefix + " " + locPrefix.toLowerCase());

3
OsmAnd-java/src/net/osmand/osm/edit/EntityParser.java
View file

@ -19,9 +19,6 @@ import net.osmand.util.Algorithms;
public class EntityParser {
public static void parseMapObject(MapObject mo, Entity e) {
parseMapObject(mo, e, e.getId());
}
public static void parseMapObject(MapObject mo, Entity e, long lid) {
mo.setId(e.getId());
if(mo instanceof Amenity) {
mo.setId((e.getId() << 1) + ((e instanceof Node) ? 0 : 1));

16
OsmAnd/src/net/osmand/plus/render/MapVectorLayer.java
View file

@ -106,10 +106,10 @@ public class MapVectorLayer extends BaseMapLayer {
cachedUnderlay = st.MAP_UNDERLAY.get();
ITileSource tileSource = st.getTileSourceByName(cachedUnderlay, false);
if (tileSource != null) {
// TileSourceProxyProvider prov = new TileSourceProxyProvider(view.getApplication(), tileSource);
// mapRenderer.setMapLayerProvider(-1, prov.instantiateProxy(true));
// prov.swigReleaseOwnership();
mapRenderer.setMapLayerProvider(-1, net.osmand.core.jni.OnlineTileSources.getBuiltIn().createProviderFor("Mapnik (OsmAnd)"));
TileSourceProxyProvider prov = new TileSourceProxyProvider(view.getApplication(), tileSource);
mapRenderer.setMapLayerProvider(-1, prov.instantiateProxy(true));
prov.swigReleaseOwnership();
// mapRenderer.setMapLayerProvider(-1, net.osmand.core.jni.OnlineTileSources.getBuiltIn().createProviderFor("Mapnik (OsmAnd)"));
} else {
mapRenderer.resetMapLayerProvider(-1);
}
@ -124,10 +124,10 @@ public class MapVectorLayer extends BaseMapLayer {
cachedOverlay = st.MAP_OVERLAY.get();
ITileSource tileSource = st.getTileSourceByName(cachedOverlay, false);
if (tileSource != null) {
//TileSourceProxyProvider prov = new TileSourceProxyProvider(view.getApplication(), tileSource);
//mapRenderer.setMapLayerProvider(1, prov.instantiateProxy(true));
//prov.swigReleaseOwnership();
mapRenderer.setMapLayerProvider(1, net.osmand.core.jni.OnlineTileSources.getBuiltIn().createProviderFor("Mapnik (OsmAnd)"));
TileSourceProxyProvider prov = new TileSourceProxyProvider(view.getApplication(), tileSource);
mapRenderer.setMapLayerProvider(1, prov.instantiateProxy(true));
prov.swigReleaseOwnership();
// mapRenderer.setMapLayerProvider(1, net.osmand.core.jni.OnlineTileSources.getBuiltIn().createProviderFor("Mapnik (OsmAnd)"));
} else {
mapRenderer.resetMapLayerProvider(1);
}