Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Added MGRS coordinates support in details, widget, extended search and quick search.

Browse source
This commit is contained in:
Jan Backhaus 2020-10-29 16:24:56 +01:00
parent a8560b8667
commit f1b1a471d0
14 changed files with 318 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
OsmAnd-java/src/main/java/net/osmand/LocationConvert.java
View file

@ -15,6 +15,7 @@ public class LocationConvert {
public static final int FORMAT_SECONDS = 2; public static final int FORMAT_SECONDS = 2;
public static final int UTM_FORMAT = 3; public static final int UTM_FORMAT = 3;
public static final int OLC_FORMAT = 4; public static final int OLC_FORMAT = 4;
public static final int MGRS_FORMAT = 5;
private static final char DELIM = ':'; private static final char DELIM = ':';
private static final char DELIMITER_DEGREES = '°'; private static final char DELIMITER_DEGREES = '°';
private static final char DELIMITER_MINUTES = '′'; private static final char DELIMITER_MINUTES = '′';

20
OsmAnd-java/src/main/java/net/osmand/util/LocationParser.java
View file

@ -3,6 +3,7 @@ package net.osmand.util;
import com.google.openlocationcode.OpenLocationCode; import com.google.openlocationcode.OpenLocationCode;
import com.google.openlocationcode.OpenLocationCode.CodeArea; import com.google.openlocationcode.OpenLocationCode.CodeArea;
import com.jwetherell.openmap.common.LatLonPoint; import com.jwetherell.openmap.common.LatLonPoint;
import com.jwetherell.openmap.common.MGRSPoint;
import com.jwetherell.openmap.common.UTMPoint; import com.jwetherell.openmap.common.UTMPoint;
import net.osmand.data.LatLon; import net.osmand.data.LatLon;
@ -111,7 +112,7 @@ public class LocationParser {
return null; return null;
} }
// detect UTM // detect UTM
if (all.size() == 4 && d.size() == 3 && all.get(1) instanceof String) { if (all.size() == 4 && d.size() == 3 && all.get(1) instanceof String && ((String) all.get(1)).length() == 1) {
char ch = all.get(1).toString().charAt(0); char ch = all.get(1).toString().charAt(0);
if (Character.isLetter(ch)) { if (Character.isLetter(ch)) {
UTMPoint upoint = new UTMPoint(d.get(2), d.get(1), d.get(0).intValue(), ch); UTMPoint upoint = new UTMPoint(d.get(2), d.get(1), d.get(0).intValue(), ch);
@ -120,7 +121,7 @@ public class LocationParser {
} }
} }
if (all.size() == 3 && d.size() == 2 && all.get(1) instanceof String) { if (all.size() == 3 && d.size() == 2 && all.get(1) instanceof String && ((String) all.get(1)).length() == 1) {
char ch = all.get(1).toString().charAt(0); char ch = all.get(1).toString().charAt(0);
String combined = strings.get(2); String combined = strings.get(2);
if (Character.isLetter(ch)) { if (Character.isLetter(ch)) {
@ -135,6 +136,21 @@ public class LocationParser {
} }
} }
} }
//detect MGRS
if (all.size() >= 3 && (d.size() == 2 || d.size() == 3) && all.get(1) instanceof String) {
try {
StringBuilder s = new StringBuilder();
for (String i : strings) {
s.append(i);
}
MGRSPoint mgrsPoint = new MGRSPoint(s.toString());
LatLonPoint ll = mgrsPoint.toLatLonPoint();
return validateAndCreateLatLon(ll.getLatitude(), ll.getLongitude());
} catch (NumberFormatException e) {
//do nothing
}
}
// try to find split lat/lon position // try to find split lat/lon position
int jointNumbers = 0; int jointNumbers = 0;
int lastJoin = 0; int lastJoin = 0;

46
OsmAnd/res/layout/search_advanced_coords.xml
View file

@ -324,6 +324,52 @@
</LinearLayout> </LinearLayout>
<LinearLayout
android:id="@+id/mgrsLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingTop="16dp"
android:visibility="gone">
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<com.google.android.material.textfield.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="54dp"
android:layout_marginRight="16dp"
android:layout_marginStart="54dp"
android:layout_marginEnd="16dp">
<EditText
android:id="@+id/mgrsEditText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/navigate_point_mgrs"
android:imeOptions="actionDone"
android:inputType="textCapCharacters|textNoSuggestions"
tools:text="22.12345"/>
</com.google.android.material.textfield.TextInputLayout>
<ImageButton
android:id="@+id/mgrsClearButton"
style="@style/Widget.AppCompat.ActionButton"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_gravity="end"
android:layout_marginRight="4dp"
android:contentDescription="@string/shared_string_clear"
app:srcCompat="@drawable/ic_action_remove_dark"
android:layout_marginEnd="4dp" />
</FrameLayout>
</LinearLayout>
<LinearLayout <LinearLayout
android:id="@+id/olcLayout" android:id="@+id/olcLayout"
android:layout_width="match_parent" android:layout_width="match_parent"

20
OsmAnd/res/layout/search_point.xml
View file

@ -139,6 +139,26 @@
android:layout_marginEnd="5dp"></EditText> android:layout_marginEnd="5dp"></EditText>
</TableRow> </TableRow>
<TableRow android:layout_width="fill_parent" android:id="@+id/mgrs_row">
<TextView
android:textSize="@dimen/default_list_text_size"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:text="@string/navigate_point_mgrs"
android:layout_marginStart="5dp"></TextView>
<EditText
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:id="@+id/MGRSEdit"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:layout_marginStart="5dp"
android:layout_marginEnd="5dp"></EditText>
</TableRow>
<TableRow android:layout_width="fill_parent" > <TableRow android:layout_width="fill_parent" >
<TextView <TextView

2
OsmAnd/res/values-de/strings.xml
View file

@ -3224,8 +3224,10 @@
<string name="get_discount_first_few_part">%1$s für die ersten %2$s</string> <string name="get_discount_first_few_part">%1$s für die ersten %2$s</string>
<string name="configure_profile_info">Einstellungen für Profil:</string> <string name="configure_profile_info">Einstellungen für Profil:</string>
<string name="utm_format_descr">OsmAnd verwendet den UTM-Standard, der ähnlich, aber nicht identisch zum UTM-NATO-Format ist.</string> <string name="utm_format_descr">OsmAnd verwendet den UTM-Standard, der ähnlich, aber nicht identisch zum UTM-NATO-Format ist.</string>
<string name="mgrs_format_descr">OsmAnd verwendet MGRS, das identisch zum UTM-NATO-Format ist.</string>
<string name="shared_string_example">Beispiel</string> <string name="shared_string_example">Beispiel</string>
<string name="navigate_point_format_utm">UTM-Standard</string> <string name="navigate_point_format_utm">UTM-Standard</string>
<string name="navigate_point_format_mgrs">MGRS</string>
<string name="coordinates_format_info">Das gewählte Format wird in der gesamten App angewandt.</string> <string name="coordinates_format_info">Das gewählte Format wird in der gesamten App angewandt.</string>
<string name="pref_selected_by_default_for_profiles">Für Profile wird als Vorgabe diese Einstellung gewählt: %s</string> <string name="pref_selected_by_default_for_profiles">Für Profile wird als Vorgabe diese Einstellung gewählt: %s</string>
<string name="change_default_settings">Einstellung ändern</string> <string name="change_default_settings">Einstellung ändern</string>

3
OsmAnd/res/values/strings.xml
View file

@ -628,8 +628,10 @@
<string name="configure_profile">Configure profile</string> <string name="configure_profile">Configure profile</string>
<string name="configure_profile_info">Settings for profile:</string> <string name="configure_profile_info">Settings for profile:</string>
<string name="utm_format_descr">OsmAnd uses the UTM Standard, which is similar but not identical to the UTM NATO format.</string> <string name="utm_format_descr">OsmAnd uses the UTM Standard, which is similar but not identical to the UTM NATO format.</string>
<string name="mgrs_format_descr">OsmAnd uses MGRS, which is similar to the UTM NATO format.</string>
<string name="shared_string_example">Example</string> <string name="shared_string_example">Example</string>
<string name="navigate_point_format_utm">UTM Standard</string> <string name="navigate_point_format_utm">UTM Standard</string>
<string name="navigate_point_format_mgrs">MGRS</string>
<string name="navigate_point_format_olc">Open Location Code</string> <string name="navigate_point_format_olc">Open Location Code</string>
<string name="coordinates_format_info">The selected format will be applied throughout the app.</string> <string name="coordinates_format_info">The selected format will be applied throughout the app.</string>
<string name="pref_selected_by_default_for_profiles">This setting is selected by default for profiles: %s</string> <string name="pref_selected_by_default_for_profiles">This setting is selected by default for profiles: %s</string>
@ -2209,6 +2211,7 @@
<string name="map_locale">Map language</string> <string name="map_locale">Map language</string>
<string name="rendering_attr_transportStops_name">Transport stops</string> <string name="rendering_attr_transportStops_name">Transport stops</string>
<string name="navigate_point_zone">Zone</string> <string name="navigate_point_zone">Zone</string>
<string name="navigate_point_mgrs">MGRS</string>
<!-- (OLC) is a geocode system --> <!-- (OLC) is a geocode system -->
<string name="navigate_point_olc">Open Location Code</string> <string name="navigate_point_olc">Open Location Code</string>
<string name="navigate_point_olc_info_invalid">Invalid OLC\n</string> <string name="navigate_point_olc_info_invalid">Invalid OLC\n</string>

6
OsmAnd/res/xml/coordinates_format.xml
View file

@ -27,6 +27,12 @@
android:persistent="false" android:persistent="false"
android:title="@string/navigate_point_format_utm" /> android:title="@string/navigate_point_format_utm" />
<CheckBoxPreference
android:key="mgrs_format"
android:layout="@layout/preference_radio_button"
android:persistent="false"
android:title="@string/navigate_point_format_mgrs" />
<CheckBoxPreference <CheckBoxPreference
android:key="olc_format" android:key="olc_format"
android:layout="@layout/preference_radio_button" android:layout="@layout/preference_radio_button"

7
OsmAnd/src/net/osmand/data/PointDescription.java
View file

@ -171,6 +171,7 @@ public class PointDescription {
String utm = OsmAndFormatter.getFormattedCoordinates(lat, lon, OsmAndFormatter.UTM_FORMAT); String utm = OsmAndFormatter.getFormattedCoordinates(lat, lon, OsmAndFormatter.UTM_FORMAT);
String olc = OsmAndFormatter.getFormattedCoordinates(lat, lon, OsmAndFormatter.OLC_FORMAT); String olc = OsmAndFormatter.getFormattedCoordinates(lat, lon, OsmAndFormatter.OLC_FORMAT);
String mgrs = OsmAndFormatter.getFormattedCoordinates(lat, lon, OsmAndFormatter.MGRS_FORMAT);
try { try {
latLonString = OsmAndFormatter.getFormattedCoordinates(lat, lon, OsmAndFormatter.FORMAT_DEGREES_SHORT); latLonString = OsmAndFormatter.getFormattedCoordinates(lat, lon, OsmAndFormatter.FORMAT_DEGREES_SHORT);
@ -190,6 +191,7 @@ public class PointDescription {
results.put(OsmAndFormatter.FORMAT_SECONDS, latLonSec); results.put(OsmAndFormatter.FORMAT_SECONDS, latLonSec);
results.put(OsmAndFormatter.UTM_FORMAT, utm); results.put(OsmAndFormatter.UTM_FORMAT, utm);
results.put(OsmAndFormatter.OLC_FORMAT, olc); results.put(OsmAndFormatter.OLC_FORMAT, olc);
results.put(OsmAndFormatter.MGRS_FORMAT, mgrs);
int zoom = 17; int zoom = 17;
if (ctx.getMapView() != null) { if (ctx.getMapView() != null) {
@ -204,6 +206,8 @@ public class PointDescription {
results.put(LOCATION_LIST_HEADER, utm); results.put(LOCATION_LIST_HEADER, utm);
} else if (f == PointDescription.OLC_FORMAT) { } else if (f == PointDescription.OLC_FORMAT) {
results.put(LOCATION_LIST_HEADER, olc); results.put(LOCATION_LIST_HEADER, olc);
} else if (f == PointDescription.MGRS_FORMAT) {
results.put(LOCATION_LIST_HEADER, mgrs);
} else if (f == PointDescription.FORMAT_DEGREES) { } else if (f == PointDescription.FORMAT_DEGREES) {
results.put(LOCATION_LIST_HEADER, latLonDeg); results.put(LOCATION_LIST_HEADER, latLonDeg);
} else if (f == PointDescription.FORMAT_MINUTES) { } else if (f == PointDescription.FORMAT_MINUTES) {
@ -396,6 +400,7 @@ public class PointDescription {
public static final int FORMAT_SECONDS = LocationConvert.FORMAT_SECONDS; public static final int FORMAT_SECONDS = LocationConvert.FORMAT_SECONDS;
public static final int UTM_FORMAT = LocationConvert.UTM_FORMAT; public static final int UTM_FORMAT = LocationConvert.UTM_FORMAT;
public static final int OLC_FORMAT = LocationConvert.OLC_FORMAT; public static final int OLC_FORMAT = LocationConvert.OLC_FORMAT;
public static final int MGRS_FORMAT = LocationConvert.MGRS_FORMAT;
public static String formatToHumanString(Context ctx, int format) { public static String formatToHumanString(Context ctx, int format) {
switch (format) { switch (format) {
@ -409,6 +414,8 @@ public class PointDescription {
return "UTM"; return "UTM";
case LocationConvert.OLC_FORMAT: case LocationConvert.OLC_FORMAT:
return "OLC"; return "OLC";
case LocationConvert.MGRS_FORMAT:
return "MGRS";
default: default:
return "Unknown format"; return "Unknown format";
} }

5
OsmAnd/src/net/osmand/plus/OsmAndFormatter.java
View file

@ -4,6 +4,7 @@ import android.content.Context;
import android.text.format.DateUtils; import android.text.format.DateUtils;
import com.jwetherell.openmap.common.LatLonPoint; import com.jwetherell.openmap.common.LatLonPoint;
import com.jwetherell.openmap.common.MGRSPoint;
import com.jwetherell.openmap.common.UTMPoint; import com.jwetherell.openmap.common.UTMPoint;
import net.osmand.LocationConvert; import net.osmand.LocationConvert;
@ -53,6 +54,7 @@ public class OsmAndFormatter {
public static final int FORMAT_SECONDS = LocationConvert.FORMAT_SECONDS; public static final int FORMAT_SECONDS = LocationConvert.FORMAT_SECONDS;
public static final int UTM_FORMAT = LocationConvert.UTM_FORMAT; public static final int UTM_FORMAT = LocationConvert.UTM_FORMAT;
public static final int OLC_FORMAT = LocationConvert.OLC_FORMAT; public static final int OLC_FORMAT = LocationConvert.OLC_FORMAT;
public static final int MGRS_FORMAT = LocationConvert.MGRS_FORMAT;
private static final char DELIMITER_DEGREES = '°'; private static final char DELIMITER_DEGREES = '°';
private static final char DELIMITER_MINUTES = '′'; private static final char DELIMITER_MINUTES = '′';
private static final char DELIMITER_SECONDS = '″'; private static final char DELIMITER_SECONDS = '″';
@ -518,6 +520,9 @@ public class OsmAndFormatter {
r = "0, 0"; r = "0, 0";
} }
result.append(r); result.append(r);
} else if (outputFormat == MGRS_FORMAT) {
MGRSPoint pnt = new MGRSPoint(new LatLonPoint(lat, lon));
result.append(pnt.toString());
} }
return result.toString(); return result.toString();
} }

63
OsmAnd/src/net/osmand/plus/activities/NavigatePointFragment.java
View file

@ -21,6 +21,7 @@ import android.widget.TextView;
import androidx.fragment.app.Fragment; import androidx.fragment.app.Fragment;
import com.jwetherell.openmap.common.LatLonPoint; import com.jwetherell.openmap.common.LatLonPoint;
import com.jwetherell.openmap.common.MGRSPoint;
import com.jwetherell.openmap.common.UTMPoint; import com.jwetherell.openmap.common.UTMPoint;
import net.osmand.LocationConvert; import net.osmand.LocationConvert;
@ -71,7 +72,7 @@ public class NavigatePointFragment extends Fragment implements SearchActivityChi
currentFormat = app.getSettings().COORDINATES_FORMAT.get(); currentFormat = app.getSettings().COORDINATES_FORMAT.get();
initUI(location.getLatitude(), location.getLongitude()); initUI(location.getLatitude(), location.getLongitude());
if(savedInstanceState != null && savedInstanceState.containsKey(SEARCH_LAT) && savedInstanceState.containsKey(SEARCH_LON) && if(savedInstanceState != null && savedInstanceState.containsKey(SEARCH_LAT) && savedInstanceState.containsKey(SEARCH_LON) &&
currentFormat != PointDescription.UTM_FORMAT) { currentFormat != PointDescription.UTM_FORMAT && currentFormat != PointDescription.MGRS_FORMAT) {
String lat = savedInstanceState.getString(SEARCH_LAT); String lat = savedInstanceState.getString(SEARCH_LAT);
String lon = savedInstanceState.getString(SEARCH_LON); String lon = savedInstanceState.getString(SEARCH_LON);
if(lat != null && lon != null && lat.length() > 0 && lon.length() > 0) { if(lat != null && lon != null && lat.length() > 0 && lon.length() > 0) {
@ -152,24 +153,53 @@ public class NavigatePointFragment extends Fragment implements SearchActivityChi
protected void showCurrentFormat(LatLon l) { protected void showCurrentFormat(LatLon l) {
final EditText latEdit = ((EditText)view.findViewById(R.id.LatitudeEdit)); final EditText latEdit = ((EditText)view.findViewById(R.id.LatitudeEdit));
final EditText lonEdit = ((EditText)view.findViewById(R.id.LongitudeEdit)); final EditText lonEdit = ((EditText)view.findViewById(R.id.LongitudeEdit));
boolean utm = currentFormat == PointDescription.UTM_FORMAT; switch (currentFormat){
view.findViewById(R.id.easting_row).setVisibility(utm ? View.VISIBLE : View.GONE); case PointDescription.UTM_FORMAT: {
view.findViewById(R.id.northing_row).setVisibility(utm ? View.VISIBLE : View.GONE); view.findViewById(R.id.easting_row).setVisibility(View.VISIBLE);
view.findViewById(R.id.zone_row).setVisibility(utm ? View.VISIBLE : View.GONE); view.findViewById(R.id.northing_row).setVisibility(View.VISIBLE);
view.findViewById(R.id.lat_row).setVisibility(!utm ? View.VISIBLE : View.GONE); view.findViewById(R.id.zone_row).setVisibility(View.VISIBLE);
view.findViewById(R.id.lon_row).setVisibility(!utm ? View.VISIBLE : View.GONE); view.findViewById(R.id.lat_row).setVisibility(View.GONE);
if(currentFormat == PointDescription.UTM_FORMAT) { view.findViewById(R.id.lon_row).setVisibility(View.GONE);
final EditText northingEdit = ((EditText)view.findViewById(R.id.NorthingEdit)); view.findViewById(R.id.mgrs_row).setVisibility(View.GONE);
final EditText eastingEdit = ((EditText)view.findViewById(R.id.EastingEdit));
final EditText zoneEdit = ((EditText)view.findViewById(R.id.ZoneEdit)); final EditText northingEdit = ((EditText) view.findViewById(R.id.NorthingEdit));
final EditText eastingEdit = ((EditText) view.findViewById(R.id.EastingEdit));
final EditText zoneEdit = ((EditText) view.findViewById(R.id.ZoneEdit));
UTMPoint pnt = new UTMPoint(new LatLonPoint(l.getLatitude(), l.getLongitude())); UTMPoint pnt = new UTMPoint(new LatLonPoint(l.getLatitude(), l.getLongitude()));
zoneEdit.setText(pnt.zone_number + ""+pnt.zone_letter); zoneEdit.setText(pnt.zone_number + "" + pnt.zone_letter);
northingEdit.setText(((long)pnt.northing)+""); northingEdit.setText(((long) pnt.northing) + "");
eastingEdit.setText(((long)pnt.easting)+""); eastingEdit.setText(((long) pnt.easting) + "");
} else { break;
}
case PointDescription.MGRS_FORMAT: {
view.findViewById(R.id.easting_row).setVisibility(View.GONE);
view.findViewById(R.id.northing_row).setVisibility(View.GONE);
view.findViewById(R.id.zone_row).setVisibility(View.GONE);
view.findViewById(R.id.lat_row).setVisibility(View.GONE);
view.findViewById(R.id.lon_row).setVisibility(View.GONE);
view.findViewById(R.id.mgrs_row).setVisibility(View.VISIBLE);
final EditText mgrsEdit = ((EditText) view.findViewById(R.id.MGRSEdit));
MGRSPoint pnt = new MGRSPoint(new LatLonPoint(l.getLatitude(), l.getLongitude()));
mgrsEdit.setText(pnt.toString());
break;
}
default: {
view.findViewById(R.id.easting_row).setVisibility(View.GONE);
view.findViewById(R.id.northing_row).setVisibility(View.GONE);
view.findViewById(R.id.zone_row).setVisibility(View.GONE);
view.findViewById(R.id.lat_row).setVisibility(View.VISIBLE);
view.findViewById(R.id.lon_row).setVisibility(View.VISIBLE);
view.findViewById(R.id.mgrs_row).setVisibility(View.GONE);
latEdit.setText(LocationConvert.convert(MapUtils.checkLatitude(l.getLatitude()), currentFormat)); latEdit.setText(LocationConvert.convert(MapUtils.checkLatitude(l.getLatitude()), currentFormat));
lonEdit.setText(LocationConvert.convert(MapUtils.checkLongitude(l.getLongitude()), currentFormat)); lonEdit.setText(LocationConvert.convert(MapUtils.checkLongitude(l.getLongitude()), currentFormat));
} }
}
} }
protected LatLon parseLocation() { protected LatLon parseLocation() {
@ -199,6 +229,7 @@ public class NavigatePointFragment extends Fragment implements SearchActivityChi
PointDescription.formatToHumanString(this.getContext(), PointDescription.FORMAT_MINUTES), PointDescription.formatToHumanString(this.getContext(), PointDescription.FORMAT_MINUTES),
PointDescription.formatToHumanString(this.getContext(), PointDescription.FORMAT_SECONDS), PointDescription.formatToHumanString(this.getContext(), PointDescription.FORMAT_SECONDS),
PointDescription.formatToHumanString(this.getContext(), PointDescription.UTM_FORMAT), PointDescription.formatToHumanString(this.getContext(), PointDescription.UTM_FORMAT),
PointDescription.formatToHumanString(this.getContext(), PointDescription.MGRS_FORMAT),
}); });
adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
format.setAdapter(adapter); format.setAdapter(adapter);
@ -217,6 +248,8 @@ public class NavigatePointFragment extends Fragment implements SearchActivityChi
newFormat = PointDescription.FORMAT_SECONDS; newFormat = PointDescription.FORMAT_SECONDS;
} else if (PointDescription.formatToHumanString(NavigatePointFragment.this.getContext(), PointDescription.UTM_FORMAT).equals(itm)) { } else if (PointDescription.formatToHumanString(NavigatePointFragment.this.getContext(), PointDescription.UTM_FORMAT).equals(itm)) {
newFormat = PointDescription.UTM_FORMAT; newFormat = PointDescription.UTM_FORMAT;
} else if (PointDescription.formatToHumanString(NavigatePointFragment.this.getContext(), PointDescription.MGRS_FORMAT).equals(itm)) {
newFormat = PointDescription.MGRS_FORMAT;
} }
try { try {
LatLon loc = parseLocation(); LatLon loc = parseLocation();

10
OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuBuilder.java
View file

@ -676,9 +676,15 @@ public class MenuBuilder {
LinearLayout llv = buildCollapsableContentView(mapActivity, true, true); LinearLayout llv = buildCollapsableContentView(mapActivity, true, true);
for (final Map.Entry<Integer, String> line : locationData.entrySet()) { for (final Map.Entry<Integer, String> line : locationData.entrySet()) {
final TextViewEx button = buildButtonInCollapsableView(mapActivity, false, false); final TextViewEx button = buildButtonInCollapsableView(mapActivity, false, false);
if (line.getKey() == OsmAndFormatter.UTM_FORMAT || line.getKey() == OsmAndFormatter.OLC_FORMAT) { if (line.getKey() == OsmAndFormatter.UTM_FORMAT || line.getKey() == OsmAndFormatter.OLC_FORMAT || line.getKey() == OsmAndFormatter.MGRS_FORMAT) {
SpannableStringBuilder ssb = new SpannableStringBuilder(); SpannableStringBuilder ssb = new SpannableStringBuilder();
ssb.append(line.getKey() == OsmAndFormatter.UTM_FORMAT ? "UTM: " : "OLC: "); if (line.getKey() == OsmAndFormatter.UTM_FORMAT) {
ssb.append("UTM: ");
} else if (line.getKey() == OsmAndFormatter.MGRS_FORMAT) {
ssb.append("MGRS: ");
} else if (line.getKey() == OsmAndFormatter.OLC_FORMAT){
ssb.append("OLC: ");
}
ssb.setSpan(new ForegroundColorSpan(app.getResources().getColor(R.color.text_color_secondary_light)), 0, 4, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); ssb.setSpan(new ForegroundColorSpan(app.getResources().getColor(R.color.text_color_secondary_light)), 0, 4, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
ssb.append(line.getValue()); ssb.append(line.getValue());
button.setText(ssb); button.setText(ssb);

95
OsmAnd/src/net/osmand/plus/search/QuickSearchCoordinatesFragment.java
View file

@ -29,6 +29,7 @@ import androidx.fragment.app.DialogFragment;
import com.google.openlocationcode.OpenLocationCode; import com.google.openlocationcode.OpenLocationCode;
import com.jwetherell.openmap.common.LatLonPoint; import com.jwetherell.openmap.common.LatLonPoint;
import com.jwetherell.openmap.common.MGRSPoint;
import com.jwetherell.openmap.common.UTMPoint; import com.jwetherell.openmap.common.UTMPoint;
import net.osmand.AndroidUtils; import net.osmand.AndroidUtils;
@ -73,6 +74,7 @@ public class QuickSearchCoordinatesFragment extends DialogFragment implements Os
private static final String QUICK_SEARCH_COORDS_NORTH_KEY = "quick_search_coords_north_key"; private static final String QUICK_SEARCH_COORDS_NORTH_KEY = "quick_search_coords_north_key";
private static final String QUICK_SEARCH_COORDS_EAST_KEY = "quick_search_coords_east_key"; private static final String QUICK_SEARCH_COORDS_EAST_KEY = "quick_search_coords_east_key";
private static final String QUICK_SEARCH_COORDS_ZONE_KEY = "quick_search_coords_zone_key"; private static final String QUICK_SEARCH_COORDS_ZONE_KEY = "quick_search_coords_zone_key";
private static final String QUICK_SEARCH_COORDS_MGRS_KEY = "quick_search_coords_mgrs_key";
private static final String QUICK_SEARCH_COORDS_OLC_KEY = "quick_search_coords_olc_key"; private static final String QUICK_SEARCH_COORDS_OLC_KEY = "quick_search_coords_olc_key";
private static final String QUICK_SEARCH_COORDS_OLC_INFO_KEY = "quick_search_coords_olc_info_key"; private static final String QUICK_SEARCH_COORDS_OLC_INFO_KEY = "quick_search_coords_olc_info_key";
private static final String QUICK_SEARCH_COORDS_FORMAT_KEY = "quick_search_coords_format_key"; private static final String QUICK_SEARCH_COORDS_FORMAT_KEY = "quick_search_coords_format_key";
@ -89,6 +91,7 @@ public class QuickSearchCoordinatesFragment extends DialogFragment implements Os
private EditText northingEdit; private EditText northingEdit;
private EditText eastingEdit; private EditText eastingEdit;
private EditText zoneEdit; private EditText zoneEdit;
private EditText mgrsEdit;
private EditText olcEdit; private EditText olcEdit;
private TextView olcInfo; private TextView olcInfo;
private EditText formatEdit; private EditText formatEdit;
@ -153,6 +156,7 @@ public class QuickSearchCoordinatesFragment extends DialogFragment implements Os
northingEdit = ((EditText) view.findViewById(R.id.northingEditText)); northingEdit = ((EditText) view.findViewById(R.id.northingEditText));
eastingEdit = ((EditText) view.findViewById(R.id.eastingEditText)); eastingEdit = ((EditText) view.findViewById(R.id.eastingEditText));
zoneEdit = ((EditText) view.findViewById(R.id.zoneEditText)); zoneEdit = ((EditText) view.findViewById(R.id.zoneEditText));
mgrsEdit = ((EditText) view.findViewById(R.id.mgrsEditText));
olcEdit = ((EditText) view.findViewById(R.id.olcEditText)); olcEdit = ((EditText) view.findViewById(R.id.olcEditText));
olcInfo = ((TextView) view.findViewById(R.id.olcInfoTextView)); olcInfo = ((TextView) view.findViewById(R.id.olcInfoTextView));
formatEdit = ((EditText) view.findViewById(R.id.formatEditText)); formatEdit = ((EditText) view.findViewById(R.id.formatEditText));
@ -160,6 +164,7 @@ public class QuickSearchCoordinatesFragment extends DialogFragment implements Os
String defaultLat = ""; String defaultLat = "";
String defaultZone = ""; String defaultZone = "";
String defaultMgrs = "";
String defaultOlc = ""; String defaultOlc = "";
boolean coordinatesApplied = false; boolean coordinatesApplied = false;
if (getArguments() != null) { if (getArguments() != null) {
@ -167,6 +172,8 @@ public class QuickSearchCoordinatesFragment extends DialogFragment implements Os
if (!Algorithms.isEmpty(text)) { if (!Algorithms.isEmpty(text)) {
if (currentFormat == PointDescription.UTM_FORMAT) { if (currentFormat == PointDescription.UTM_FORMAT) {
defaultZone = text.trim(); defaultZone = text.trim();
} else if (currentFormat == PointDescription.MGRS_FORMAT) {
defaultMgrs = text.trim();
} else if (currentFormat == PointDescription.OLC_FORMAT) { } else if (currentFormat == PointDescription.OLC_FORMAT) {
defaultOlc = text.trim(); defaultOlc = text.trim();
} else { } else {
@ -188,6 +195,7 @@ public class QuickSearchCoordinatesFragment extends DialogFragment implements Os
String northingStr = getStringValue(savedInstanceState, QUICK_SEARCH_COORDS_NORTH_KEY, ""); String northingStr = getStringValue(savedInstanceState, QUICK_SEARCH_COORDS_NORTH_KEY, "");
String eastingStr = getStringValue(savedInstanceState, QUICK_SEARCH_COORDS_EAST_KEY, ""); String eastingStr = getStringValue(savedInstanceState, QUICK_SEARCH_COORDS_EAST_KEY, "");
String zoneStr = getStringValue(savedInstanceState, QUICK_SEARCH_COORDS_ZONE_KEY, defaultZone); String zoneStr = getStringValue(savedInstanceState, QUICK_SEARCH_COORDS_ZONE_KEY, defaultZone);
String mgrsStr = getStringValue(savedInstanceState, QUICK_SEARCH_COORDS_MGRS_KEY, defaultMgrs);
String olcStr = getStringValue(savedInstanceState, QUICK_SEARCH_COORDS_OLC_KEY, defaultOlc); String olcStr = getStringValue(savedInstanceState, QUICK_SEARCH_COORDS_OLC_KEY, defaultOlc);
String olcInfoStr = getStringValue(savedInstanceState, QUICK_SEARCH_COORDS_OLC_INFO_KEY, defaultOlc); String olcInfoStr = getStringValue(savedInstanceState, QUICK_SEARCH_COORDS_OLC_INFO_KEY, defaultOlc);
@ -209,6 +217,8 @@ public class QuickSearchCoordinatesFragment extends DialogFragment implements Os
eastingEdit.setSelection(eastingStr.length()); eastingEdit.setSelection(eastingStr.length());
zoneEdit.setText(zoneStr); zoneEdit.setText(zoneStr);
zoneEdit.setSelection(zoneStr.length()); zoneEdit.setSelection(zoneStr.length());
mgrsEdit.setText(mgrsStr);
mgrsEdit.setSelection(mgrsStr.length());
olcEdit.setText(olcStr); olcEdit.setText(olcStr);
olcEdit.setSelection(olcStr.length()); olcEdit.setSelection(olcStr.length());
olcInfo.setText(olcInfoStr); olcInfo.setText(olcInfoStr);
@ -242,6 +252,7 @@ public class QuickSearchCoordinatesFragment extends DialogFragment implements Os
northingEdit.addTextChangedListener(textWatcher); northingEdit.addTextChangedListener(textWatcher);
eastingEdit.addTextChangedListener(textWatcher); eastingEdit.addTextChangedListener(textWatcher);
zoneEdit.addTextChangedListener(textWatcher); zoneEdit.addTextChangedListener(textWatcher);
mgrsEdit.addTextChangedListener(textWatcher);
olcEdit.addTextChangedListener(textWatcher); olcEdit.addTextChangedListener(textWatcher);
OnEditorActionListener doneListener = new OnEditorActionListener() { OnEditorActionListener doneListener = new OnEditorActionListener() {
@ -258,6 +269,7 @@ public class QuickSearchCoordinatesFragment extends DialogFragment implements Os
lonEdit.setOnEditorActionListener(doneListener); lonEdit.setOnEditorActionListener(doneListener);
zoneEdit.setOnEditorActionListener(doneListener); zoneEdit.setOnEditorActionListener(doneListener);
mgrsEdit.setOnEditorActionListener(doneListener);
olcEdit.setOnEditorActionListener(doneListener); olcEdit.setOnEditorActionListener(doneListener);
UiUtilities ic = app.getUIUtilities(); UiUtilities ic = app.getUIUtilities();
@ -318,6 +330,15 @@ public class QuickSearchCoordinatesFragment extends DialogFragment implements Os
olcEdit.setText(""); olcEdit.setText("");
} }
}); });
ImageButton mgrsClearButton = (ImageButton) view.findViewById(R.id.mgrsClearButton);
mgrsClearButton.setImageDrawable(ic.getThemedIcon(R.drawable.ic_action_remove_dark));
mgrsClearButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
mgrsEdit.setText("");
}
});
ImageButton formatSelectButton = (ImageButton) view.findViewById(R.id.formatSelectButton); ImageButton formatSelectButton = (ImageButton) view.findViewById(R.id.formatSelectButton);
formatSelectButton.setImageDrawable(ic.getThemedIcon(R.drawable.ic_action_arrow_drop_down)); formatSelectButton.setImageDrawable(ic.getThemedIcon(R.drawable.ic_action_arrow_drop_down));
formatSelectButton.setOnClickListener(new View.OnClickListener() { formatSelectButton.setOnClickListener(new View.OnClickListener() {
@ -364,6 +385,7 @@ public class QuickSearchCoordinatesFragment extends DialogFragment implements Os
final TextView northEdit = ((TextView) view.findViewById(R.id.northingEditText)); final TextView northEdit = ((TextView) view.findViewById(R.id.northingEditText));
final TextView eastEdit = ((TextView) view.findViewById(R.id.eastingEditText)); final TextView eastEdit = ((TextView) view.findViewById(R.id.eastingEditText));
final TextView zoneEdit = ((TextView) view.findViewById(R.id.zoneEditText)); final TextView zoneEdit = ((TextView) view.findViewById(R.id.zoneEditText));
final TextView mgrsEdit = ((TextView) view.findViewById(R.id.mgrsEditText));
final TextView olcEdit = ((TextView) view.findViewById(R.id.olcEditText)); final TextView olcEdit = ((TextView) view.findViewById(R.id.olcEditText));
final TextView olcInfo = ((TextView) view.findViewById(R.id.olcInfoTextView)); final TextView olcInfo = ((TextView) view.findViewById(R.id.olcInfoTextView));
outState.putString(QUICK_SEARCH_COORDS_LAT_KEY, latEdit.getText().toString()); outState.putString(QUICK_SEARCH_COORDS_LAT_KEY, latEdit.getText().toString());
@ -371,6 +393,7 @@ public class QuickSearchCoordinatesFragment extends DialogFragment implements Os
outState.putString(QUICK_SEARCH_COORDS_NORTH_KEY, northEdit.getText().toString()); outState.putString(QUICK_SEARCH_COORDS_NORTH_KEY, northEdit.getText().toString());
outState.putString(QUICK_SEARCH_COORDS_EAST_KEY, eastEdit.getText().toString()); outState.putString(QUICK_SEARCH_COORDS_EAST_KEY, eastEdit.getText().toString());
outState.putString(QUICK_SEARCH_COORDS_ZONE_KEY, zoneEdit.getText().toString()); outState.putString(QUICK_SEARCH_COORDS_ZONE_KEY, zoneEdit.getText().toString());
outState.putString(QUICK_SEARCH_COORDS_MGRS_KEY, mgrsEdit.getText().toString());
outState.putString(QUICK_SEARCH_COORDS_OLC_KEY, olcEdit.getText().toString()); outState.putString(QUICK_SEARCH_COORDS_OLC_KEY, olcEdit.getText().toString());
outState.putString(QUICK_SEARCH_COORDS_OLC_INFO_KEY, olcInfo.getText().toString()); outState.putString(QUICK_SEARCH_COORDS_OLC_INFO_KEY, olcInfo.getText().toString());
} }
@ -470,7 +493,9 @@ public class QuickSearchCoordinatesFragment extends DialogFragment implements Os
} }
private void updateControlsVisibility() { private void updateControlsVisibility() {
if (currentFormat == PointDescription.OLC_FORMAT) { switch (currentFormat){
case PointDescription.OLC_FORMAT: {
view.findViewById(R.id.eastingLayout).setVisibility(View.GONE); view.findViewById(R.id.eastingLayout).setVisibility(View.GONE);
view.findViewById(R.id.northingLayout).setVisibility(View.GONE); view.findViewById(R.id.northingLayout).setVisibility(View.GONE);
view.findViewById(R.id.zoneLayout).setVisibility(View.GONE); view.findViewById(R.id.zoneLayout).setVisibility(View.GONE);
@ -478,15 +503,42 @@ public class QuickSearchCoordinatesFragment extends DialogFragment implements Os
view.findViewById(R.id.olcInfoLayout).setVisibility(View.VISIBLE); view.findViewById(R.id.olcInfoLayout).setVisibility(View.VISIBLE);
view.findViewById(R.id.latitudeLayout).setVisibility(View.GONE); view.findViewById(R.id.latitudeLayout).setVisibility(View.GONE);
view.findViewById(R.id.longitudeLayout).setVisibility(View.GONE); view.findViewById(R.id.longitudeLayout).setVisibility(View.GONE);
} else { view.findViewById(R.id.mgrsLayout).setVisibility(View.GONE);
boolean utm = currentFormat == PointDescription.UTM_FORMAT; break;
view.findViewById(R.id.eastingLayout).setVisibility(utm ? View.VISIBLE : View.GONE); }
view.findViewById(R.id.northingLayout).setVisibility(utm ? View.VISIBLE : View.GONE); case PointDescription.UTM_FORMAT: {
view.findViewById(R.id.zoneLayout).setVisibility(utm ? View.VISIBLE : View.GONE); view.findViewById(R.id.eastingLayout).setVisibility(View.VISIBLE);
view.findViewById(R.id.northingLayout).setVisibility(View.VISIBLE);
view.findViewById(R.id.zoneLayout).setVisibility(View.VISIBLE);
view.findViewById(R.id.olcLayout).setVisibility(View.GONE); view.findViewById(R.id.olcLayout).setVisibility(View.GONE);
view.findViewById(R.id.olcInfoLayout).setVisibility(View.GONE); view.findViewById(R.id.olcInfoLayout).setVisibility(View.GONE);
view.findViewById(R.id.latitudeLayout).setVisibility(!utm ? View.VISIBLE : View.GONE); view.findViewById(R.id.latitudeLayout).setVisibility(View.GONE);
view.findViewById(R.id.longitudeLayout).setVisibility(!utm ? View.VISIBLE : View.GONE); view.findViewById(R.id.longitudeLayout).setVisibility(View.GONE);
view.findViewById(R.id.mgrsLayout).setVisibility(View.GONE);
break;
}
case PointDescription.MGRS_FORMAT: {
view.findViewById(R.id.eastingLayout).setVisibility(View.GONE);
view.findViewById(R.id.northingLayout).setVisibility(View.GONE);
view.findViewById(R.id.zoneLayout).setVisibility(View.GONE);
view.findViewById(R.id.olcLayout).setVisibility(View.GONE);
view.findViewById(R.id.olcInfoLayout).setVisibility(View.GONE);
view.findViewById(R.id.latitudeLayout).setVisibility(View.GONE);
view.findViewById(R.id.longitudeLayout).setVisibility(View.GONE);
view.findViewById(R.id.mgrsLayout).setVisibility(View.VISIBLE);
break;
}
default: {
view.findViewById(R.id.eastingLayout).setVisibility(View.GONE);
view.findViewById(R.id.northingLayout).setVisibility(View.GONE);
view.findViewById(R.id.zoneLayout).setVisibility(View.GONE);
view.findViewById(R.id.olcLayout).setVisibility(View.GONE);
view.findViewById(R.id.olcInfoLayout).setVisibility(View.GONE);
view.findViewById(R.id.latitudeLayout).setVisibility(View.VISIBLE);
view.findViewById(R.id.longitudeLayout).setVisibility(View.VISIBLE);
view.findViewById(R.id.mgrsLayout).setVisibility(View.GONE);
break;
}
} }
} }
@ -544,11 +596,24 @@ public class QuickSearchCoordinatesFragment extends DialogFragment implements Os
zoneEdit.setText(olcEdit.getText()); zoneEdit.setText(olcEdit.getText());
northingEdit.setText(""); northingEdit.setText("");
eastingEdit.setText(""); eastingEdit.setText("");
} else if (prevFormat == PointDescription.MGRS_FORMAT) {
zoneEdit.setText(mgrsEdit.getText());
northingEdit.setText("");
eastingEdit.setText("");
} else { } else {
zoneEdit.setText(latEdit.getText()); zoneEdit.setText(latEdit.getText());
northingEdit.setText(""); northingEdit.setText("");
eastingEdit.setText(""); eastingEdit.setText("");
} }
} else if (currentFormat == PointDescription.MGRS_FORMAT) {
final EditText mgrsEdit = ((EditText) view.findViewById(R.id.mgrsEditText));
if (latLon != null) {
MGRSPoint pnt = new MGRSPoint(new LatLonPoint(latLon.getLatitude(), latLon.getLongitude()));
mgrsEdit.setText(pnt.toString());
} else {
mgrsEdit.setText(latEdit.getText());
}
} else if (currentFormat == PointDescription.OLC_FORMAT) { } else if (currentFormat == PointDescription.OLC_FORMAT) {
if (latLon != null) { if (latLon != null) {
String olc = OpenLocationCode.encode(latLon.getLatitude(), latLon.getLongitude()); String olc = OpenLocationCode.encode(latLon.getLatitude(), latLon.getLongitude());
@ -557,6 +622,9 @@ public class QuickSearchCoordinatesFragment extends DialogFragment implements Os
} else if (prevFormat == PointDescription.UTM_FORMAT) { } else if (prevFormat == PointDescription.UTM_FORMAT) {
olcEdit.setText(zoneEdit.getText()); olcEdit.setText(zoneEdit.getText());
olcInfo.setText(provideOlcInfo(olcEdit.getText().toString())); olcInfo.setText(provideOlcInfo(olcEdit.getText().toString()));
} else if (prevFormat == PointDescription.MGRS_FORMAT) {
olcEdit.setText(mgrsEdit.getText());
olcInfo.setText(provideOlcInfo(olcEdit.getText().toString()));
} else { } else {
olcEdit.setText(latEdit.getText()); olcEdit.setText(latEdit.getText());
olcInfo.setText(provideOlcInfo(olcEdit.getText().toString())); olcInfo.setText(provideOlcInfo(olcEdit.getText().toString()));
@ -568,6 +636,9 @@ public class QuickSearchCoordinatesFragment extends DialogFragment implements Os
} else if (prevFormat == PointDescription.UTM_FORMAT) { } else if (prevFormat == PointDescription.UTM_FORMAT) {
latEdit.setText(zoneEdit.getText()); latEdit.setText(zoneEdit.getText());
lonEdit.setText(""); lonEdit.setText("");
} else if (prevFormat == PointDescription.MGRS_FORMAT) {
latEdit.setText(mgrsEdit.getText());
lonEdit.setText("");
} else if (prevFormat == PointDescription.OLC_FORMAT) { } else if (prevFormat == PointDescription.OLC_FORMAT) {
latEdit.setText(olcEdit.getText()); latEdit.setText(olcEdit.getText());
lonEdit.setText(""); lonEdit.setText("");
@ -591,6 +662,11 @@ public class QuickSearchCoordinatesFragment extends DialogFragment implements Os
UTMPoint upoint = new UTMPoint(northing, easting, z, c); UTMPoint upoint = new UTMPoint(northing, easting, z, c);
LatLonPoint ll = upoint.toLatLonPoint(); LatLonPoint ll = upoint.toLatLonPoint();
loc = new LatLon(ll.getLatitude(), ll.getLongitude()); loc = new LatLon(ll.getLatitude(), ll.getLongitude());
} else if (currentFormat == LocationConvert.MGRS_FORMAT) {
String mgrs = (mgrsEdit.getText().toString());
MGRSPoint upoint = new MGRSPoint(mgrs);
LatLonPoint ll = upoint.toLatLonPoint();
loc = new LatLon(ll.getLatitude(), ll.getLongitude());
} else if (currentFormat == LocationConvert.OLC_FORMAT) { } else if (currentFormat == LocationConvert.OLC_FORMAT) {
String olcText = olcEdit.getText().toString(); String olcText = olcEdit.getText().toString();
olcInfo.setText(provideOlcInfo(olcText)); olcInfo.setText(provideOlcInfo(olcText));
@ -851,12 +927,13 @@ public class QuickSearchCoordinatesFragment extends DialogFragment implements Os
@Override @Override
public Dialog onCreateDialog(Bundle savedInstanceState) { public Dialog onCreateDialog(Bundle savedInstanceState) {
final QuickSearchCoordinatesFragment parent = (QuickSearchCoordinatesFragment) getParentFragment(); final QuickSearchCoordinatesFragment parent = (QuickSearchCoordinatesFragment) getParentFragment();
String[] entries = new String[5]; String[] entries = new String[6];
entries[0] = PointDescription.formatToHumanString(getContext(), PointDescription.FORMAT_DEGREES); entries[0] = PointDescription.formatToHumanString(getContext(), PointDescription.FORMAT_DEGREES);
entries[1] = PointDescription.formatToHumanString(getContext(), PointDescription.FORMAT_MINUTES); entries[1] = PointDescription.formatToHumanString(getContext(), PointDescription.FORMAT_MINUTES);
entries[2] = PointDescription.formatToHumanString(getContext(), PointDescription.FORMAT_SECONDS); entries[2] = PointDescription.formatToHumanString(getContext(), PointDescription.FORMAT_SECONDS);
entries[3] = PointDescription.formatToHumanString(getContext(), PointDescription.UTM_FORMAT); entries[3] = PointDescription.formatToHumanString(getContext(), PointDescription.UTM_FORMAT);
entries[4] = PointDescription.formatToHumanString(getContext(), PointDescription.OLC_FORMAT); entries[4] = PointDescription.formatToHumanString(getContext(), PointDescription.OLC_FORMAT);
entries[5] = PointDescription.formatToHumanString(getContext(), PointDescription.MGRS_FORMAT);
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
builder.setTitle(R.string.coords_format) builder.setTitle(R.string.coords_format)

44
OsmAnd/src/net/osmand/plus/settings/fragments/CoordinatesFormatFragment.java
View file

@ -31,11 +31,13 @@ public class CoordinatesFormatFragment extends BaseSettingsFragment {
public static final String TAG = CoordinatesFormatFragment.class.getSimpleName(); public static final String TAG = CoordinatesFormatFragment.class.getSimpleName();
private static final String UTM_FORMAT_WIKI_LINK = "https://en.wikipedia.org/wiki/Universal_Transverse_Mercator_coordinate_system"; private static final String UTM_FORMAT_WIKI_LINK = "https://en.wikipedia.org/wiki/Universal_Transverse_Mercator_coordinate_system";
private static final String MGRS_FORMAT_WIKI_LINK = "https://en.wikipedia.org/wiki/Military_Grid_Reference_System";
private static final String FORMAT_DEGREES = "format_degrees"; private static final String FORMAT_DEGREES = "format_degrees";
private static final String FORMAT_MINUTES = "format_minutes"; private static final String FORMAT_MINUTES = "format_minutes";
private static final String FORMAT_SECONDS = "format_seconds"; private static final String FORMAT_SECONDS = "format_seconds";
private static final String UTM_FORMAT = "utm_format"; private static final String UTM_FORMAT = "utm_format";
private static final String MGRS_FORMAT = "mgrs_format";
private static final String OLC_FORMAT = "olc_format"; private static final String OLC_FORMAT = "olc_format";
@Override @Override
@ -44,6 +46,7 @@ public class CoordinatesFormatFragment extends BaseSettingsFragment {
CheckBoxPreference minutesPref = (CheckBoxPreference) findPreference(FORMAT_MINUTES); CheckBoxPreference minutesPref = (CheckBoxPreference) findPreference(FORMAT_MINUTES);
CheckBoxPreference secondsPref = (CheckBoxPreference) findPreference(FORMAT_SECONDS); CheckBoxPreference secondsPref = (CheckBoxPreference) findPreference(FORMAT_SECONDS);
CheckBoxPreference utmPref = (CheckBoxPreference) findPreference(UTM_FORMAT); CheckBoxPreference utmPref = (CheckBoxPreference) findPreference(UTM_FORMAT);
CheckBoxPreference mgrsPref = (CheckBoxPreference) findPreference(MGRS_FORMAT);
CheckBoxPreference olcPref = (CheckBoxPreference) findPreference(OLC_FORMAT); CheckBoxPreference olcPref = (CheckBoxPreference) findPreference(OLC_FORMAT);
Location loc = app.getLocationProvider().getLastKnownLocation(); Location loc = app.getLocationProvider().getLastKnownLocation();
@ -52,6 +55,7 @@ public class CoordinatesFormatFragment extends BaseSettingsFragment {
minutesPref.setSummary(getCoordinatesFormatSummary(loc, PointDescription.FORMAT_MINUTES)); minutesPref.setSummary(getCoordinatesFormatSummary(loc, PointDescription.FORMAT_MINUTES));
secondsPref.setSummary(getCoordinatesFormatSummary(loc, PointDescription.FORMAT_SECONDS)); secondsPref.setSummary(getCoordinatesFormatSummary(loc, PointDescription.FORMAT_SECONDS));
utmPref.setSummary(getCoordinatesFormatSummary(loc, PointDescription.UTM_FORMAT)); utmPref.setSummary(getCoordinatesFormatSummary(loc, PointDescription.UTM_FORMAT));
mgrsPref.setSummary(getCoordinatesFormatSummary(loc, PointDescription.MGRS_FORMAT));
olcPref.setSummary(getCoordinatesFormatSummary(loc, PointDescription.OLC_FORMAT)); olcPref.setSummary(getCoordinatesFormatSummary(loc, PointDescription.OLC_FORMAT));
int currentFormat = settings.COORDINATES_FORMAT.getModeValue(getSelectedAppMode()); int currentFormat = settings.COORDINATES_FORMAT.getModeValue(getSelectedAppMode());
@ -69,6 +73,12 @@ public class CoordinatesFormatFragment extends BaseSettingsFragment {
summaryView.setOnTouchListener(new ClickableSpanTouchListener()); summaryView.setOnTouchListener(new ClickableSpanTouchListener());
} }
} }
if (MGRS_FORMAT.equals(preference.getKey())) {
TextView summaryView = (TextView) holder.findViewById(android.R.id.summary);
if (summaryView != null) {
summaryView.setOnTouchListener(new ClickableSpanTouchListener());
}
}
} }
private CharSequence getCoordinatesFormatSummary(Location loc, int format) { private CharSequence getCoordinatesFormatSummary(Location loc, int format) {
@ -106,6 +116,36 @@ public class CoordinatesFormatFragment extends BaseSettingsFragment {
return spannableBuilder; return spannableBuilder;
} }
if (format == PointDescription.MGRS_FORMAT) {
SpannableStringBuilder spannableBuilder = new SpannableStringBuilder();
String combined = getString(R.string.ltr_or_rtl_combine_via_colon, getString(R.string.shared_string_example), formattedCoordinates);
spannableBuilder.append(combined);
spannableBuilder.append("\n");
spannableBuilder.append(getString(R.string.mgrs_format_descr));
int start = spannableBuilder.length();
spannableBuilder.append(" ");
spannableBuilder.append(getString(R.string.shared_string_read_more));
ClickableSpan clickableSpan = new ClickableSpan() {
@Override
public void onClick(@NonNull View widget) {
Context ctx = getContext();
if (ctx != null) {
WikipediaDialogFragment.showFullArticle(ctx, Uri.parse(MGRS_FORMAT_WIKI_LINK), isNightMode());
}
}
@Override
public void updateDrawState(@NonNull TextPaint ds) {
super.updateDrawState(ds);
ds.setUnderlineText(false);
}
};
spannableBuilder.setSpan(clickableSpan, start, spannableBuilder.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
return spannableBuilder;
}
return getString(R.string.ltr_or_rtl_combine_via_colon, getString(R.string.shared_string_example), formattedCoordinates); return getString(R.string.ltr_or_rtl_combine_via_colon, getString(R.string.shared_string_example), formattedCoordinates);
} }
@ -159,6 +199,8 @@ public class CoordinatesFormatFragment extends BaseSettingsFragment {
return PointDescription.FORMAT_SECONDS; return PointDescription.FORMAT_SECONDS;
case UTM_FORMAT: case UTM_FORMAT:
return PointDescription.UTM_FORMAT; return PointDescription.UTM_FORMAT;
case MGRS_FORMAT:
return PointDescription.MGRS_FORMAT;
case OLC_FORMAT: case OLC_FORMAT:
return PointDescription.OLC_FORMAT; return PointDescription.OLC_FORMAT;
default: default:
@ -176,6 +218,8 @@ public class CoordinatesFormatFragment extends BaseSettingsFragment {
return FORMAT_SECONDS; return FORMAT_SECONDS;
case PointDescription.UTM_FORMAT: case PointDescription.UTM_FORMAT:
return UTM_FORMAT; return UTM_FORMAT;
case PointDescription.MGRS_FORMAT:
return MGRS_FORMAT;
case PointDescription.OLC_FORMAT: case PointDescription.OLC_FORMAT:
return OLC_FORMAT; return OLC_FORMAT;
default: default:

8
OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java
View file

@ -33,6 +33,7 @@ import androidx.core.graphics.drawable.DrawableCompat;
import com.google.android.material.snackbar.Snackbar; import com.google.android.material.snackbar.Snackbar;
import com.jwetherell.openmap.common.LatLonPoint; import com.jwetherell.openmap.common.LatLonPoint;
import com.jwetherell.openmap.common.MGRSPoint;
import com.jwetherell.openmap.common.UTMPoint; import com.jwetherell.openmap.common.UTMPoint;
import net.osmand.AndroidUtils; import net.osmand.AndroidUtils;
@ -1251,6 +1252,13 @@ public class MapInfoWidgetsFactory {
UTMPoint pnt = new UTMPoint(new LatLonPoint(lat, lon)); UTMPoint pnt = new UTMPoint(new LatLonPoint(lat, lon));
String utmLocation = pnt.zone_number + "" + pnt.zone_letter + " " + ((long) pnt.easting) + " " + ((long) pnt.northing); String utmLocation = pnt.zone_number + "" + pnt.zone_letter + " " + ((long) pnt.easting) + " " + ((long) pnt.northing);
latitudeText.setText(utmLocation); latitudeText.setText(utmLocation);
} else if (f == PointDescription.MGRS_FORMAT) {
AndroidUiHelper.updateVisibility(lonCoordinatesContainer, false);
AndroidUiHelper.updateVisibility(coordinatesDivider, false);
AndroidUiHelper.updateVisibility(latitudeIcon, true);
latitudeIcon.setImageDrawable(iconsCache.getIcon(nightMode ? R.drawable.widget_coordinates_utm_night : R.drawable.widget_coordinates_utm_day));
MGRSPoint pnt = new MGRSPoint(new LatLonPoint(lat, lon));
latitudeText.setText(pnt.toString());
} else if (f == PointDescription.OLC_FORMAT) { } else if (f == PointDescription.OLC_FORMAT) {
AndroidUiHelper.updateVisibility(lonCoordinatesContainer, false); AndroidUiHelper.updateVisibility(lonCoordinatesContainer, false);
AndroidUiHelper.updateVisibility(coordinatesDivider, false); AndroidUiHelper.updateVisibility(coordinatesDivider, false);