organicmaps/organicmaps-tmp
Archived
13
Fork 1
Code Issues 2.7k Pull requests 182 Projects Releases 65 Wiki Activity Actions

[Android] Added UTM and MGRS coordinates to Android PlacePage UI

Browse source 
Signed-off-by: S. Kozyr <s.trump@gmail.com>
This commit is contained in:
Sergiy Kozyr 2023-05-26 10:13:59 +03:00
parent ff90c47416
commit e5fe0bb18a
Signed by: strump
GPG key ID: C622E5563CAC205D
4 changed files with 36 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
android/jni/app/organicmaps/Framework.cpp
View file

@ -39,12 +39,13 @@
#include "platform/local_country_file.hpp"
#include "platform/local_country_file_utils.hpp"
#include "platform/location.hpp"
#include "platform/localization.hpp"
#include "platform/measurement_utils.hpp"
#include "platform/network_policy.hpp"
#include "platform/platform.hpp"
#include "platform/preferred_languages.hpp"
#include "platform/settings.hpp"
#include "platform/localization.hpp"
#include "platform/utm_mgrs_utils.hpp"
#include "base/assert.hpp"
#include "base/file_name_utils.hpp"
@ -960,6 +961,10 @@ Java_app_organicmaps_Framework_nativeFormatLatLon(JNIEnv * env, jclass, jdouble
return jni::ToJavaString(env, openlocationcode::Encode({lat, lon}));
case android::CoordinatesFormat::OSMLink: // Link to osm.org
return jni::ToJavaString(env, measurement_utils::FormatOsmLink(lat, lon, 14));
case android::CoordinatesFormat::UTM: // Universal Transverse Mercator
return jni::ToJavaString(env, utm_mgrs_utils::FormatUTM(lat, lon));
case android::CoordinatesFormat::MGRS: // Military Grid Reference System
return jni::ToJavaString(env, utm_mgrs_utils::FormatMGRS(lat, lon, 5));
}
}

4
android/jni/app/organicmaps/Framework.hpp
View file

@ -44,7 +44,9 @@ namespace android
LatLonDMS = 0, // Latitude, Longitude in degrees minutes seconds format, comma separated
LatLonDecimal = 1, // Latitude, Longitude in decimal format, comma separated
OLCFull = 2, // Open location code, full format
OSMLink = 3 // Link to the OSM. E.g. https://osm.org/go/xcXjyqQlq-?m=
OSMLink = 3, // Link to the OSM. E.g. https://osm.org/go/xcXjyqQlq-?m=
UTM = 4, // Universal Transverse Mercator
MGRS = 5 // Military Grid Reference System
};
class Framework : private power_management::PowerManager::Subscriber

26
android/src/app/organicmaps/widget/placepage/CoordinatesFormat.java
View file

@ -2,16 +2,22 @@ package app.organicmaps.widget.placepage;
public enum CoordinatesFormat
{
LatLonDMS(0), // Latitude, Longitude in degrees minutes seconds format, comma separated
LatLonDecimal(1), // Latitude, Longitude in decimal format, comma separated
OLCFull(2), // Open location code, full format
OSMLink(3); // Link to the OSM. E.g. https://osm.org/go/xcXjyqQlq-?m=
LatLonDMS(0, "DMS", false), // Latitude, Longitude in degrees minutes seconds format, comma separated
LatLonDecimal(1, "Decimal", false), // Latitude, Longitude in decimal format, comma separated
OLCFull(2, "OLC", false), // Open location code, full format
OSMLink(3, "osm.org", false), // Link to the OSM. E.g. https://osm.org/go/xcXjyqQlq-?m=
UTM(4, "UTM", true), // Universal Transverse Mercator
MGRS(5, "MGRS", true); // Military Grid Reference System
private final int id;
private final String label;
private final boolean showLabel;
CoordinatesFormat(int id)
CoordinatesFormat(int id, String label, boolean showLabel)
{
this.id = id;
this.label = label;
this.showLabel = showLabel;
}
public int getId()
@ -19,6 +25,16 @@ public enum CoordinatesFormat
return id;
}
public String getLabel()
{
return label;
}
public boolean getShowLabel()
{
return showLabel;
}
public static CoordinatesFormat fromId(int id)
{
for (CoordinatesFormat cursor: CoordinatesFormat.values())

7
android/src/app/organicmaps/widget/placepage/PlacePageView.java
View file

@ -71,6 +71,8 @@ public class PlacePageView extends Fragment implements View.OnClickListener,
Arrays.asList(CoordinatesFormat.LatLonDMS,
CoordinatesFormat.LatLonDecimal,
CoordinatesFormat.OLCFull,
CoordinatesFormat.UTM,
CoordinatesFormat.MGRS,
CoordinatesFormat.OSMLink);
private View mFrame;
// Preview.
@ -449,7 +451,10 @@ public class PlacePageView extends Fragment implements View.OnClickListener,
final double lat = mMapObject.getLat();
final double lon = mMapObject.getLon();
final String latLon = Framework.nativeFormatLatLon(lat, lon, mCoordsFormat.getId());
mTvLatlon.setText(latLon);
if (mCoordsFormat.getShowLabel())
mTvLatlon.setText(mCoordsFormat.getLabel() + ": " + latLon);
else
mTvLatlon.setText(latLon);
}
private void addOrganisation()