Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2017-06-10 15:29:51 +02:00
commit a106fa96e8
5 changed files with 0 additions and 32 deletions

View file

@ -487,14 +487,6 @@ public class ConfigureMapMenu {
public static void refreshMapComplete(final MapActivity activity) { public static void refreshMapComplete(final MapActivity activity) {
activity.getMyApplication().getResourceManager().getRenderer().clearCache(); activity.getMyApplication().getResourceManager().getRenderer().clearCache();
activity.updateMapSettings(); activity.updateMapSettings();
GPXLayer gpx = activity.getMapView().getLayerByClass(GPXLayer.class);
if (gpx != null) {
gpx.updateLayerStyle();
}
RouteLayer rte = activity.getMapView().getLayerByClass(RouteLayer.class);
if (rte != null) {
rte.updateLayerStyle();
}
activity.getMapView().refreshMap(true); activity.getMapView().refreshMap(true);
} }

View file

@ -182,14 +182,6 @@ public class RasterMapMenu {
public static void refreshMapComplete(final MapActivity activity) { public static void refreshMapComplete(final MapActivity activity) {
activity.getMyApplication().getResourceManager().getRenderer().clearCache(); activity.getMyApplication().getResourceManager().getRenderer().clearCache();
activity.updateMapSettings(); activity.updateMapSettings();
GPXLayer gpx = activity.getMapView().getLayerByClass(GPXLayer.class);
if (gpx != null) {
gpx.updateLayerStyle();
}
RouteLayer rte = activity.getMapView().getLayerByClass(RouteLayer.class);
if (rte != null) {
rte.updateLayerStyle();
}
activity.getMapView().refreshMap(true); activity.getMapView().refreshMap(true);
} }
} }

View file

@ -338,14 +338,6 @@ public class SRTMPlugin extends OsmandPlugin {
public static void refreshMapComplete(final MapActivity activity) { public static void refreshMapComplete(final MapActivity activity) {
activity.getMyApplication().getResourceManager().getRenderer().clearCache(); activity.getMyApplication().getResourceManager().getRenderer().clearCache();
activity.updateMapSettings(); activity.updateMapSettings();
GPXLayer gpx = activity.getMapView().getLayerByClass(GPXLayer.class);
if (gpx != null) {
gpx.updateLayerStyle();
}
RouteLayer rte = activity.getMapView().getLayerByClass(RouteLayer.class);
if (rte != null) {
rte.updateLayerStyle();
}
activity.getMapView().refreshMap(true); activity.getMapView().refreshMap(true);
} }
} }

View file

@ -187,10 +187,6 @@ public class GPXLayer extends OsmandMapLayer implements ContextMenuLayer.IContex
} }
} }
public void updateLayerStyle() {
cachedHash = -1;
}
private int updatePaints(int color, boolean routePoints, boolean currentTrack, DrawSettings nightMode, RotatedTileBox tileBox) { private int updatePaints(int color, boolean routePoints, boolean currentTrack, DrawSettings nightMode, RotatedTileBox tileBox) {
RenderingRulesStorage rrs = view.getApplication().getRendererRegistry().getCurrentSelectedRenderer(); RenderingRulesStorage rrs = view.getApplication().getRendererRegistry().getCurrentSelectedRenderer();
final boolean isNight = nightMode != null && nightMode.isNightMode(); final boolean isNight = nightMode != null && nightMode.isNightMode();

View file

@ -102,10 +102,6 @@ public class RouteLayer extends OsmandMapLayer {
initUI(); initUI();
} }
public void updateLayerStyle() {
attrs.cachedHash = -1;
}
@Override @Override
public void onPrepareBufferImage(Canvas canvas, RotatedTileBox tileBox, DrawSettings settings) { public void onPrepareBufferImage(Canvas canvas, RotatedTileBox tileBox, DrawSettings settings) {