From bd0f15bd3c3ce78f25c67ad31b596af27df914c5 Mon Sep 17 00:00:00 2001 From: RZR-UA Date: Fri, 24 May 2024 17:39:36 +0200 Subject: [PATCH 1/2] Register new Marine style --- OsmAnd/src/net/osmand/plus/render/RendererRegistry.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/OsmAnd/src/net/osmand/plus/render/RendererRegistry.java b/OsmAnd/src/net/osmand/plus/render/RendererRegistry.java index fef003e1524..ac680ba58da 100644 --- a/OsmAnd/src/net/osmand/plus/render/RendererRegistry.java +++ b/OsmAnd/src/net/osmand/plus/render/RendererRegistry.java @@ -43,6 +43,7 @@ public class RendererRegistry { public static final String TOURING_VIEW = "Touring view (contrast and details)"; public static final String WINTER_SKI_RENDER = "Winter and ski"; public static final String NAUTICAL_RENDER = "Nautical"; + public static final String MARINE_RENDER = "Marine"; public static final String TOPO_RENDER = "Topo"; public static final String OSM_CARTO_RENDER = "OSM-carto"; public static final String OFFROAD_RENDER = "Offroad"; @@ -80,6 +81,7 @@ public RendererRegistry(@NonNull OsmandApplication app) { internalRenderers.put(LIGHTRS_RENDER, "LightRS" + RENDERER_INDEX_EXT); internalRenderers.put(UNIRS_RENDER, "UniRS" + RENDERER_INDEX_EXT); internalRenderers.put(NAUTICAL_RENDER, "nautical" + RENDERER_INDEX_EXT); + internalRenderers.put(MARINE_RENDER, "marine" + RENDERER_INDEX_EXT); internalRenderers.put(WINTER_SKI_RENDER, "skimap" + RENDERER_INDEX_EXT); internalRenderers.put(OFFROAD_RENDER, "offroad" + RENDERER_INDEX_EXT); internalRenderers.put(DESERT_RENDER, "desert" + RENDERER_INDEX_EXT); @@ -380,6 +382,8 @@ public static String getTranslatedRendererName(@NonNull Context ctx, @NonNull St return ctx.getString(R.string.winter_and_ski_renderer); case NAUTICAL_RENDER: return ctx.getString(R.string.nautical_renderer); + case MARINE_RENDER: + return ctx.getString(R.string.marine_renderer); } return null; } @@ -403,6 +407,8 @@ public static String getRendererDescription(@NonNull Context ctx, @NonNull Strin return ctx.getString(R.string.ski_map_render_descr); case NAUTICAL_RENDER: return ctx.getString(R.string.nautical_render_descr); + case MARINE_RENDER: + return ctx.getString(R.string.marine_render_descr); case OFFROAD_RENDER: return ctx.getString(R.string.off_road_render_descr); case DESERT_RENDER: From 45de8841bf66fd440b4c59bc7fcd320db365c848 Mon Sep 17 00:00:00 2001 From: RZR-UA Date: Fri, 24 May 2024 18:24:33 +0200 Subject: [PATCH 2/2] Add translation strings for new Marine style --- OsmAnd/res/values/strings.xml | 44 +++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index b1feb588f51..71c0689be05 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -11,6 +11,50 @@ Thx - Hardy --> + + Marine + Highly customizable Marine navigation style. Based on Nautical style. Works better with Nautical World Seamarks map and optional Depth maps. + Depth areas + Hide depth areas + Depth contours + Hide depth contours + Fairways + Hide fairways + Ferry routes + Hide ferry routes + Light sectors + Hide light sectors + Light sectors sources + Hide light sectors sources + Minor depth contours + Hide minor depth contours + OSM seamarks (some) + Hide OSM seamarks (some) + Spot soundings + Hide spot soundings + Tidal flats + Hide tidal flats + Depth color scheme + Depth color scheme + Dashed depth contours + Dashed depth contours + Fairway color + Color of fairways + Safety depth contour + Safety depth contour + Shells style + Style for shells on the seabed + ENC markers + Show ENC markers + Spot sounding distance + Spot sounding distance + Spot sounding size + Spot sounding size + Tidal flat style + Style of tidal flats + Water color + Color of water + Disable map layers Disable all map layers above the vector map (restart required). Altitude color maps are used to visualize relief.