Merge pull request #341 from moagrius/bug/339-340

Bug fixes for 339 and 340

Author: moagrius

README.md

@@ -44,7 +44,7 @@ Javadocs are [here](http://moagrius.github.io/TileView/index.html?com/qozix/tile
 ###Installation
 Gradle:
 ```
-compile 'com.qozix:tileview:2.2.1'
+compile 'com.qozix:tileview:'2.2.2'
 ```
 
 The library is hosted on jcenter, and is not currently available from maven.
@@ -64,7 +64,7 @@ A demo application, built in Android Studio, is available in the `demo` folder o
 at the 2nd column from left and 3rd row from top.
 1. Create a new application with a single activity ('Main').
 1. Save the image tiles to your `assets` directory.
-1. Add `compile 'com.qozix:tileview:2.2.1'` to your gradle dependencies.
+1. Add `compile 'com.qozix:tileview:2.2.2'` to your gradle dependencies.
 1. In the Main Activity, use this for `onCreate`:
 ```
 @Override

tileview/build.gradle

@@ -7,7 +7,7 @@ android {
         minSdkVersion 11
         targetSdkVersion 23
         versionCode 33
-        versionName "2.2.1"
+        versionName "2.2.2"
     }
     buildTypes {
         release {

tileview/src/main/java/com/qozix/tileview/detail/DetailLevel.java

@@ -124,7 +124,7 @@ public boolean equals( Object object ) {
     }
     if( object instanceof DetailLevel ) {
       DetailLevel detailLevel = (DetailLevel) object;
-      return mScale == detailLevel.getScale();
+      return mScale == detailLevel.getScale() && mData != null && mData.equals( detailLevel.getData() );
     }
     return false;
   }

tileview/src/main/java/com/qozix/tileview/tiles/TileCanvasViewGroup.java

@@ -203,9 +203,9 @@ public boolean getIsRendering() {
    * Clears existing tiles and cancels any existing render tasks.
    */
   public void clear() {
-    suppressRender();
     cancelRender();
     mTilesInCurrentViewport.clear();
+    mPreviouslyDrawnTiles.clear();
     invalidate();
   }