Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add Nautical-based Marine style by Adam (quantenschaum) and translation strings #19947

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Add Nautical-based Marine style by Adam (quantenschaum) and translation strings #19947

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bd0f15b
Register new Marine style
RZR-UA May 24, 2024
45de884
Add translation strings for new Marine style
RZR-UA May 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 44 additions & 0 deletions OsmAnd/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,50 @@
Thx - Hardy
-->

<!-- Marine style -->
<string name="marine_renderer">Marine</string>
<string name="marine_render_descr">Highly customizable Marine navigation style. Based on Nautical style. Works better with Nautical World Seamarks map and optional Depth maps.</string>
<string name="rendering_attr_hideAreas_name">Depth areas</string>
<string name="rendering_attr_hideAreas_description">Hide depth areas</string>
<string name="rendering_attr_hideContours_name">Depth contours</string>
<string name="rendering_attr_hideContours_description">Hide depth contours</string>
<string name="rendering_attr_hideFairways_name">Fairways</string>
<string name="rendering_attr_hideFairways_description">Hide fairways</string>
<string name="rendering_attr_hideFerries_name">Ferry routes</string>
<string name="rendering_attr_hideFerries_description">Hide ferry routes</string>
<string name="rendering_attr_hideLightSectors_name">Light sectors</string>
<string name="rendering_attr_hideLightSectors_description">Hide light sectors</string>
<string name="rendering_attr_hideLightSectorSources_name">Light sectors sources</string>
<string name="rendering_attr_hideLightSectorSources_description">Hide light sectors sources</string>
<string name="rendering_attr_hideMinorContours_name">Minor depth contours</string>
<string name="rendering_attr_hideMinorContours_description">Hide minor depth contours</string>
<string name="rendering_attr_hideNoLNAM_name">OSM seamarks (some)</string>
<string name="rendering_attr_hideNoLNAM_description">Hide OSM seamarks (some)</string>
<string name="rendering_attr_hideSpots_name">Spot soundings</string>
<string name="rendering_attr_hideSpots_description">Hide spot soundings</string>
<string name="rendering_attr_hideTidalFlats_name">Tidal flats</string>
<string name="rendering_attr_hideTidalFlats_description">Hide tidal flats</string>
<string name="rendering_attr_depthColorScheme_name">Depth color scheme</string>
<string name="rendering_attr_depthColorScheme_description">Depth color scheme</string>
<string name="rendering_attr_depthContoursDashed_name">Dashed depth contours</string>
<string name="rendering_attr_depthContoursDashed_description">Dashed depth contours</string>
<string name="rendering_attr_fairwayStyle_name">Fairway color</string>
<string name="rendering_attr_fairwayStyle_description">Color of fairways</string>
<string name="rendering_attr_safetyContour_name">Safety depth contour</string>
<string name="rendering_attr_safetyContour_description">Safety depth contour</string>
<string name="rendering_attr_shellsStyle_name">Shells style</string>
<string name="rendering_attr_shellsStyle_description">Style for shells on the seabed</string>
<string name="rendering_attr_showLNAMmarker_name">ENC markers</string>
<string name="rendering_attr_showLNAMmarker_description">Show ENC markers</string>
<string name="rendering_attr_spotDistance_name">Spot sounding distance</string>
<string name="rendering_attr_spotDistance_description">Spot sounding distance</string>
<string name="rendering_attr_spotSize_name">Spot sounding size</string>
<string name="rendering_attr_spotSize_description">Spot sounding size</string>
<string name="rendering_attr_tidalFlatStyle_name">Tidal flat style</string>
<string name="rendering_attr_tidalFlatStyle_description">Style of tidal flats</string>
<string name="rendering_attr_watercolor_name">Water color</string>
<string name="rendering_attr_watercolor_description">Color of water</string>

<string name="disable_map_layers">Disable map layers</string>
<string name="disable_map_layers_descr">Disable all map layers above the vector map (restart required).</string>
<string name="height_legend_description">Altitude color maps are used to visualize relief.</string>
Expand Down
6 changes: 6 additions & 0 deletions OsmAnd/src/net/osmand/plus/render/RendererRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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;
}
Expand All @@ -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:
Expand Down
Loading