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

moagrius · web-flow · commit 1dd2b0efd49a · 2016-08-25T20:42:47.000-05:00
Bug fixes for 339 and 340
diff --git a/README.md b/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
diff --git a/tileview/build.gradle b/tileview/build.gradle
@@ -7,7 +7,7 @@ android {
         minSdkVersion 11
         targetSdkVersion 23
         versionCode 33
-        versionName "2.2.1"
+        versionName "2.2.2"
     }
     buildTypes {
         release {
diff --git a/tileview/src/main/java/com/qozix/tileview/detail/DetailLevel.java b/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;
   }
diff --git a/tileview/src/main/java/com/qozix/tileview/tiles/TileCanvasViewGroup.java b/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();
   }
 

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ android {`
`7`	`7`	`minSdkVersion 11`
`8`	`8`	`targetSdkVersion 23`
`9`	`9`	`versionCode 33`
`10`		`- versionName "2.2.1"`
	`10`	`+ versionName "2.2.2"`
`11`	`11`	`}`
`12`	`12`	`buildTypes {`
`13`	`13`	`release {`
Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ public boolean equals( Object object ) {`
`124`	`124`	`}`
`125`	`125`	`if( object instanceof DetailLevel ) {`
`126`	`126`	`DetailLevel detailLevel = (DetailLevel) object;`
`127`		`- return mScale == detailLevel.getScale();`
	`127`	`+ return mScale == detailLevel.getScale() && mData != null && mData.equals( detailLevel.getData() );`
`128`	`128`	`}`
`129`	`129`	`return false;`
`130`	`130`	`}`