pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Added CoordinatesFormat enum to C++ lib to reflect Java enum.

Browse source 
Changed measurement_utils::FormatOsmLink function to use bits::BitwiseMerge and remove call to ceil().

Signed-off-by: S. Kozyr <s.trump@gmail.com>
This commit is contained in:
Sergiy Kozyr 2021-09-29 12:39:49 +03:00 • committed by Viktor Govako
parent 2dd97f9410
commit 184073c96e
4 changed files with 26 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
android/jni/com/mapswithme/maps/Framework.cpp
View file

@ -922,16 +922,16 @@ Java_com_mapswithme_maps_Framework_nativeGetDistanceAndAzimuthFromLatLon(
JNIEXPORT jobject JNICALL
Java_com_mapswithme_maps_Framework_nativeFormatLatLon(JNIEnv * env, jclass, jdouble lat, jdouble lon, int coordsFormat)
{
switch (coordsFormat) // See CoordinatesFormat enum for all possible values.
switch (static_cast<android::CoordinatesFormat>(coordsFormat))
{
default:
case 0: // DMS, comma separated
case android::CoordinatesFormat::LatLonDMS: // DMS, comma separated
return jni::ToJavaString(env, measurement_utils::FormatLatLonAsDMS(lat, lon, true /*withComma*/, 2));
case 1: // Decimal, comma separated
case android::CoordinatesFormat::LatLonDecimal: // Decimal, comma separated
return jni::ToJavaString(env, measurement_utils::FormatLatLon(lat, lon, true /* withComma */, 6));
case 2: // Open location code, long format
case android::CoordinatesFormat::OLCFull: // Open location code, long format
return jni::ToJavaString(env, openlocationcode::Encode({lat, lon}));
case 3: // Link to osm.org
case android::CoordinatesFormat::OSMLink: // Link to osm.org
return jni::ToJavaString(env, measurement_utils::FormatOsmLink(lat, lon, 14));
}
}

8
android/jni/com/mapswithme/maps/Framework.hpp
View file

@ -39,6 +39,14 @@ struct EverywhereSearchParams;
namespace android
{
enum CoordinatesFormat // See Java enum com.mapswithme.maps.widget.placepage.CoordinatesFormat for all possible values.
{
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=
};
class Framework : private power_management::PowerManager::Subscriber
{
private:

2
android/src/com/mapswithme/maps/widget/placepage/CoordinatesFormat.java
View file

@ -27,6 +27,6 @@ public enum CoordinatesFormat
return cursor;
}
throw new IllegalArgumentException();
return LatLonDMS; // Default format is DMS
}
}

37
platform/measurement_utils.cpp
View file

@ -5,6 +5,7 @@
#include "geometry/mercator.hpp"
#include "base/assert.hpp"
#include "base/bits.hpp"
#include "base/macros.hpp"
#include "base/math.hpp"
#include "base/stl_helpers.hpp"
@ -245,38 +246,24 @@ string FormatSpeedUnits(Units units)
UNREACHABLE();
}
// Interleaves the bits of two 32-bit numbers.
// The result is known as a Morton code.
long interleave_bits(long x, long y)
{
long c = 0;
for(int i=31; i>=0; i--)
{
c = (c << 1) | ((x >> i) & 1);
c = (c << 1) | ((y >> i) & 1);
}
return c;
}
string FormatOsmLink(double lat, double lon, int zoom)
{
long x = round((lon + 180.0) / 360.0 * (1L<<32));
long y = round((lat + 90.0) / 180.0 * (1L<<32));
long code = interleave_bits(x, y);
string encodedCoords = "";
char char_array[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_~";
int i;
static char char_array[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_~";
uint32_t x = round((lon + 180.0) / 360.0 * (1L<<32));
uint32_t y = round((lat + 90.0) / 180.0 * (1L<<32));
uint64_t code = bits::BitwiseMerge(y, x);
string osmUrl = "https://osm.org/go/";
for (i = 0; i < ceil((zoom + 8) / 3.0); ++i) {
for (int i = 0; i < ((zoom+10)/3) ; ++i)
{
int digit = (code >> (58 - (6 * i))) & 0x3f;
encodedCoords += char_array[digit];
osmUrl += char_array[digit];
}
for (i = 0; i < ((zoom + 8) % 3); ++i)
encodedCoords += "-";
for (int i = 0; i < ((zoom + 8) % 3); ++i)
osmUrl += "-";
return "https://osm.org/go/" + encodedCoords + "?m=";
return osmUrl + "?m=";
}
bool OSMDistanceToMeters(string const & osmRawValue, double & outMeters)