From 953cfec17bd2446d3cc924e329e5d220d0adfea6 Mon Sep 17 00:00:00 2001 From: Alexander Sytnyk Date: Mon, 5 Feb 2018 15:51:30 +0200 Subject: [PATCH] Revert changes --- .../osmand/plus/dialogs/ConfigureMapMenu.java | 3 -- .../osmand/plus/render/RendererRegistry.java | 37 ++++++++----------- 2 files changed, 16 insertions(+), 24 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java b/OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java index bea1ac0eb1..091b5bbcb9 100644 --- a/OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java +++ b/OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java @@ -42,15 +42,12 @@ import net.osmand.plus.activities.MapActivity; import net.osmand.plus.activities.MapActivityLayers; import net.osmand.plus.activities.PluginActivity; import net.osmand.plus.activities.SettingsActivity; -import net.osmand.plus.dashboard.DashboardOnMap; import net.osmand.plus.openseamapsplugin.NauticalMapsPlugin; import net.osmand.plus.poi.PoiFiltersHelper; import net.osmand.plus.rastermaps.OsmandRasterMapsPlugin; import net.osmand.plus.render.RendererRegistry; import net.osmand.plus.srtmplugin.SRTMPlugin; -import net.osmand.plus.views.GPXLayer; import net.osmand.plus.views.OsmandMapTileView; -import net.osmand.plus.views.RouteLayer; import net.osmand.plus.views.corenative.NativeCoreContext; import net.osmand.render.RenderingRule; import net.osmand.render.RenderingRuleProperty; diff --git a/OsmAnd/src/net/osmand/plus/render/RendererRegistry.java b/OsmAnd/src/net/osmand/plus/render/RendererRegistry.java index 617d39b3bd..0bb20fcdcb 100644 --- a/OsmAnd/src/net/osmand/plus/render/RendererRegistry.java +++ b/OsmAnd/src/net/osmand/plus/render/RendererRegistry.java @@ -1,5 +1,18 @@ package net.osmand.plus.render; +import net.osmand.IProgress; +import net.osmand.IndexConstants; +import net.osmand.PlatformUtil; +import net.osmand.plus.OsmandApplication; +import net.osmand.render.RenderingRuleProperty; +import net.osmand.render.RenderingRulesStorage; +import net.osmand.render.RenderingRulesStorage.RenderingRulesStorageResolver; +import net.osmand.util.Algorithms; + +import org.apache.commons.logging.Log; +import org.xmlpull.v1.XmlPullParser; +import org.xmlpull.v1.XmlPullParserException; + import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; @@ -11,20 +24,6 @@ import java.util.LinkedHashMap; import java.util.LinkedHashSet; import java.util.Map; -import net.osmand.IProgress; -import net.osmand.IndexConstants; -import net.osmand.PlatformUtil; -import net.osmand.plus.OsmandApplication; -import net.osmand.plus.R; -import net.osmand.render.RenderingRuleProperty; -import net.osmand.render.RenderingRulesStorage; -import net.osmand.render.RenderingRulesStorage.RenderingRulesStorageResolver; -import net.osmand.util.Algorithms; - -import org.apache.commons.logging.Log; -import org.xmlpull.v1.XmlPullParser; -import org.xmlpull.v1.XmlPullParserException; - public class RendererRegistry { @@ -32,12 +31,11 @@ public class RendererRegistry { public final static String DEFAULT_RENDER = "OsmAnd"; //$NON-NLS-1$ public final static String DEFAULT_RENDER_FILE_PATH = "default.render.xml"; + public final static String TOURING_VIEW = "Touring view (contrast and details)"; //$NON-NLS-1$ + public final static String WINTER_SKI_RENDER = "Winter and ski"; //$NON-NLS-1$ + public final static String NAUTICAL_RENDER = "Nautical"; //$NON-NLS-1$ public final static String TOPO_RENDER = "Topo"; //$NON-NLS-1$ public final static String MAPNIK_RENDER = "Mapnik"; //$NON-NLS-1$ - // Translatable renders - public static String TOURING_VIEW; - public static String WINTER_SKI_RENDER; - public static String NAUTICAL_RENDER; private RenderingRulesStorage defaultRender = null; private RenderingRulesStorage currentSelectedRender = null; @@ -57,9 +55,6 @@ public class RendererRegistry { public RendererRegistry(OsmandApplication app){ this.app = app; - WINTER_SKI_RENDER = app.getResources().getString(R.string.winter_and_ski_renderer); - TOURING_VIEW = app.getResources().getString(R.string.touring_view_renderer); - NAUTICAL_RENDER = app.getResources().getString(R.string.nautical_renderer); internalRenderers.put(DEFAULT_RENDER, DEFAULT_RENDER_FILE_PATH); internalRenderers.put(TOURING_VIEW, "Touring-view_(more-contrast-and-details)" +".render.xml"); internalRenderers.put(TOPO_RENDER, "topo" + ".render.xml");