doc: Add 1.9.22 release notes

[fw/altos] / altosdroid / app / src / main / java / org / altusmetrum / AltosDroid / AltosMapOffline.java

diff --git a/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/AltosMapOffline.java b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/AltosMapOffline.java
index cca958c50f873f1f0afbed954f241bebfdfd8bbb..ab841b10ee9c6e952e60340b92fc67b40f823a4b 100644 (file)
--- a/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/AltosMapOffline.java
+++ b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/AltosMapOffline.java
@@ -70,7 +70,7 @@ class Rocket implements Comparable {
 
        Rocket(int serial, AltosMapOffline map_offline) {
                this.serial = serial;
-               this.name = String.format("%d", serial);
+               this.name = String.format(Locale.ROOT, "%d", serial);
                this.map_offline = map_offline;
        }
 }
@@ -223,12 +223,20 @@ public class AltosMapOffline extends View implements ScaleGestureDetector.OnScal
                MapMark(double lat, double lon, int state) {
                        super(lat, lon, state);
                }
+
+               MapMark(double lat, double lon, int state, String label) {
+                       super(lat, lon, state, label);
+               }
        }
 
        public AltosMapMark new_mark(double lat, double lon, int state) {
                return new MapMark(lat, lon, state);
        }
 
+       public AltosMapMark new_mark(double lat, double lon, int state, String label) {
+               return new MapMark(lat, lon, state, label);
+       }
+
        public int width() {
                return getWidth();
        }
@@ -352,6 +360,10 @@ public class AltosMapOffline extends View implements ScaleGestureDetector.OnScal
                        debug("MapView draw without map\n");
                        return;
                }
+               if (map.transform == null) {
+                       debug("MapView draw without transform\n");
+                       return;
+               }
                canvas = view_canvas;
                paint = new Paint(Paint.ANTI_ALIAS_FLAG);
                paint.setStrokeWidth(stroke_width);