From 52127f9bd4505ff9f3a234852b2e65adabf3f0ab Mon Sep 17 00:00:00 2001 From: Alexey Date: Fri, 14 Apr 2017 15:36:40 +0300 Subject: [PATCH] Fix open location crash --- .../src/net/osmand/data/PointDescription.java | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/OsmAnd/src/net/osmand/data/PointDescription.java b/OsmAnd/src/net/osmand/data/PointDescription.java index a447f5c4ec..6486dbb856 100644 --- a/OsmAnd/src/net/osmand/data/PointDescription.java +++ b/OsmAnd/src/net/osmand/data/PointDescription.java @@ -158,12 +158,17 @@ public class PointDescription { return pnt.zone_number + "" + pnt.zone_letter + " " + ((long) pnt.easting) + " " + ((long) pnt.northing); } else if (f == PointDescription.OLC_FORMAT) { - return getLocationOlcName(lat, lon); + try { + return getLocationOlcName(lat, lon); + } catch (RuntimeException e) { + e.printStackTrace(); + return "0+0"; + } } else { try { return ctx.getString(sh ? R.string.short_location_on_map : R.string.location_on_map, LocationConvert.convert(lat, f), LocationConvert.convert(lon, f)); - } catch(RuntimeException e) { + } catch (RuntimeException e) { e.printStackTrace(); return ctx.getString(sh ? R.string.short_location_on_map : R.string.location_on_map, 0, 0); } @@ -178,11 +183,16 @@ public class PointDescription { return pnt.zone_number + "" + pnt.zone_letter + " " + ((long) pnt.easting) + " " + ((long) pnt.northing); } else if (f == PointDescription.OLC_FORMAT) { - return getLocationOlcName(lat, lon); + try { + return getLocationOlcName(lat, lon); + } catch (RuntimeException e) { + e.printStackTrace(); + return "0+0"; + } } else { try { return LocationConvert.convert(lat, f) + ", " + LocationConvert.convert(lon, f); - } catch(RuntimeException e) { + } catch (RuntimeException e) { e.printStackTrace(); return "0, 0"; } @@ -366,4 +376,4 @@ public class PointDescription { } } -} \ No newline at end of file +}