Merge branch 'master' into FDroid

srkns · Apr 19, 2017 · 4292d91 · 4292d91
2 parents c7fb6e6 + 8db9a2d
commit 4292d91
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -37,9 +37,10 @@ android {
         // 0.6.0.170315 (26)    Bugfix for new Tag support (fdroid build failed)
         // 0.6.0.170402 (27)    language updates. (fdroid build failed)
         // 0.6.0.170404 (28)    same as 0.6.0.170402. try to fix fdroid build
+        // 0.6.0.170420 (29)    bugfix Map
 
-        versionCode = 28
-        versionName = '0.6.0.170404'
+        versionCode = 29
+        versionName = '0.6.0.170420'
     }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_7

diff --git a/app/src/main/java/de/k3b/android/androFotoFinder/locationmap/MarkerLoaderTask.java b/app/src/main/java/de/k3b/android/androFotoFinder/locationmap/MarkerLoaderTask.java
@@ -119,7 +119,7 @@ protected OverlayManager doInBackground(QueryParameter... queryParameter) {
                         "," + FotoSql.SQL_COL_LAT +
                         " or " + FotoSql.SQL_COL_PK);
             }
-            String markerItemCount = "1";
+            String markerItemCount = null;
             int increment = PROGRESS_INCREMENT;
             while (cursor.moveToNext()) {
                 int id = cursor.getInt(colIconID);
@@ -131,8 +131,9 @@ protected OverlayManager doInBackground(QueryParameter... queryParameter) {
                 } else {
                     marker = createMarker();
                     GeoPoint point = new GeoPoint(cursor.getDouble(colLat),cursor.getDouble(colLon));
+
                     if (colCount != -1) markerItemCount = cursor.getString(colCount);
-                    BitmapDrawable icon = (colCount != -1) ? null : createIcon(markerItemCount);
+                    BitmapDrawable icon = createIcon(markerItemCount);
                     marker.set(id, point, icon,null );
                 }
 

diff --git a/app/src/main/java/de/k3b/android/osmdroid/IconFactory.java b/app/src/main/java/de/k3b/android/osmdroid/IconFactory.java
@@ -64,11 +64,13 @@ public BitmapDrawable createIcon(String text) {
         Bitmap finalIcon = Bitmap.createBitmap(mBackground.getWidth(), mBackground.getHeight(), mBackground.getConfig());
         Canvas iconCanvas = new Canvas(finalIcon);
         iconCanvas.drawBitmap(mBackground, 0, 0, null);
-        int textHeight = (int) (mTextPaint.descent() + mTextPaint.ascent());
-        iconCanvas.drawText(text,
-                mTextAnchorU * finalIcon.getWidth(),
-                mTextAnchorV * finalIcon.getHeight() - textHeight / 2,
-                mTextPaint);
+        if ((text != null) && (text.length() > 0)) {
+            int textHeight = (int) (mTextPaint.descent() + mTextPaint.ascent());
+            iconCanvas.drawText(text,
+                    mTextAnchorU * finalIcon.getWidth(),
+                    mTextAnchorV * finalIcon.getHeight() - textHeight / 2,
+                    mTextPaint);
+        }
         return new BitmapDrawable(resources,  finalIcon);
     }
 }