diff --git a/OsmAnd-java/src/main/java/net/osmand/TspAnt.java b/OsmAnd-java/src/main/java/net/osmand/TspAnt.java index 815bddb7ef..6964a3facd 100644 --- a/OsmAnd-java/src/main/java/net/osmand/TspAnt.java +++ b/OsmAnd-java/src/main/java/net/osmand/TspAnt.java @@ -106,9 +106,11 @@ public class TspAnt { // Allocates all memory. // Adds 1 to edge lengths to ensure no zero length edges. public TspAnt readGraph(List intermediates, LatLon start, LatLon end) { - boolean keepEndPoint = end != null; - List l = new ArrayList(); - l.add(start); + boolean keepEndPoint = end != null; + List l = new ArrayList(); + if (start != null) { + l.add(start); + } l.addAll(intermediates); if (keepEndPoint) { l.add(end); diff --git a/OsmAnd/build.gradle b/OsmAnd/build.gradle index 3638a103ca..ea1b4ef294 100644 --- a/OsmAnd/build.gradle +++ b/OsmAnd/build.gradle @@ -188,38 +188,24 @@ android { dimension "version" applicationId "net.osmand" } - freeres { - dimension "version" - applicationId "net.osmand" - resConfig "en" - } - freecustom { - dimension "version" - applicationId "net.osmand.freecustom" - } full { dimension "version" applicationId "net.osmand.plus" } - fulldev { - dimension "version" - applicationId "net.osmand.plus" - resConfig "en" - // resConfigs "xxhdpi", "nodpi" - } freehuawei { dimension "version" applicationId "net.osmand.huawei" } // CoreVersion + // Build that doesn't include 3D OpenGL legacy { dimension "coreversion" } - + // Build that includes 3D OpenGL release qtcore { dimension "coreversion" } - + // Build that includes 3D OpenGL debug qtcoredebug { dimension "coreversion" } diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/cards/ImageCard.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/cards/ImageCard.java index c3da090ef9..26c81f03a7 100644 --- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/cards/ImageCard.java +++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/cards/ImageCard.java @@ -495,7 +495,7 @@ public abstract class ImageCard extends AbstractCard { } } } catch (Exception e) { - e.printStackTrace(); + LOG.error(e); } if (listener != null) { listener.onPostProcess(result);