Merge branch develop to main for 3.4 release

Author: TimSylvester

WhirlyGlobe.podspec

@@ -21,7 +21,7 @@ Pod::Spec.new do |s|
   s.author           = { "Steve Gifford" => "contact@mousebirdconsulting.com" }
   s.social_media_url = 'https://twitter.com/@mousebirdc'
 
-  s.platform         = :ios, '9.0'
+  s.platform         = :ios, '12.0'
   s.requires_arc     = true
 
   s.source           = { :git => 'https://github.com/mousebird/WhirlyGlobe.git', :branch => 'develop' }

android/apps/AutoTesterAndroid/app/src/main/java/com/mousebirdconsulting/autotester/TestCases/AnimatedBaseMapTestCase.java

@@ -3,7 +3,7 @@
  *  WhirlyGlobeLib
  *
  *  Created by Steve Gifford on 3/22/19.
- *  Copyright 2011-2019 mousebird consulting
+ *  Copyright 2011-2022 mousebird consulting
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.

android/apps/AutoTesterAndroid/app/src/main/java/com/mousebirdconsulting/autotester/TestCases/AnimationDelegateTestCase.kt

@@ -2,7 +2,7 @@
  *  WhirlyGlobeLib
  *
  *  Created by Tim Sylvester on 9 Feb 2021.
- *  Copyright 2021 mousebird consulting
+ *  Copyright 2021-2022 mousebird consulting
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.

android/apps/AutoTesterAndroid/app/src/main/java/com/mousebirdconsulting/autotester/TestCases/BillboardAdapter.kt

@@ -2,7 +2,7 @@
  *  WhirlyGlobeLib
  *
  *  Created by jmnavarro
- *  Copyright 2011-2021 mousebird consulting
+ *  Copyright 2011-2022 mousebird consulting
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.

android/apps/AutoTesterAndroid/app/src/main/java/com/mousebirdconsulting/autotester/TestCases/BillboardTestCase.kt

@@ -2,7 +2,7 @@
  *  WhirlyGlobeLib
  *
  *  Created by jmnavarro
- *  Copyright 2011-2021 mousebird consulting
+ *  Copyright 2011-2022 mousebird consulting
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.

android/apps/AutoTesterAndroid/app/src/main/java/com/mousebirdconsulting/autotester/TestCases/CartoTestCase.kt

@@ -2,7 +2,7 @@
  *  WhirlyGlobeLib
  *
  *  Created by sjg
- *  Copyright 2011-2021 mousebird consulting
+ *  Copyright 2011-2022 mousebird consulting
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -102,12 +102,12 @@ class CartoTestCase(activity: Activity) :
 
         // Generate the fetch request for the chunk of data we want
         override fun fetchInfoForTile(tileID: TileID?, flipY: Boolean): Any {
-            val bbox = theLoader?.geoBoundsForTile(tileID)
+            val bbox = tileID?.let { theLoader?.geoBoundsForTile(it) } ?: Mbr()
 
             // Construct the query string
             val fetchInfo = RemoteTileFetchInfo()
             val toDeg = 180.0/ PI
-            val query = String.format(search,bbox!!.ll.x*toDeg,bbox.ll.y*toDeg,bbox.ur.x*toDeg,bbox.ur.y*toDeg)
+            val query = String.format(search,bbox.ll.x*toDeg,bbox.ll.y*toDeg,bbox.ur.x*toDeg,bbox.ur.y*toDeg)
             val encodeQuery = URLEncoder.encode(query,"utf-8")
             val fullURLStr = String.format("https://pluto.cartodb.com/api/v2/sql?format=GeoJSON&q=%s",encodeQuery)
             fetchInfo.urlReq = Request.Builder().url(URL(fullURLStr)).build()
@@ -135,5 +135,11 @@ class CartoTestCase(activity: Activity) :
             loadReturn.addComponentObject(vc.addVector(vecObj,vecInfoFill,ThreadMode.ThreadCurrent))
             loadReturn.addComponentObject(vc.addVector(vecObj,vecInfoOutline,ThreadMode.ThreadCurrent))
         }
+    
+        /**
+         * Some tiles were just removed.
+         */
+        override fun tilesUnloaded(ids: Array<out TileID>) {
+        }
     }
 }

android/apps/AutoTesterAndroid/app/src/main/java/com/mousebirdconsulting/autotester/TestCases/ClusteredMarkersTestCase.kt

@@ -2,7 +2,7 @@
  *  WhirlyGlobeLib
  *
  *  Created by jmnavarro
- *  Copyright 2011-2021 mousebird consulting
+ *  Copyright 2011-2022 mousebird consulting
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.

android/apps/AutoTesterAndroid/app/src/main/java/com/mousebirdconsulting/autotester/TestCases/ComponentObjectLeakTestCase.kt

@@ -2,7 +2,7 @@
  *  WhirlyGlobeLib
  *
  *  Created by jmnavarro
- *  Copyright 2011-2021 mousebird consulting
+ *  Copyright 2011-2022 mousebird consulting
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.

android/apps/AutoTesterAndroid/app/src/main/java/com/mousebirdconsulting/autotester/TestCases/CustomBNGCoordAdapter.kt

@@ -2,7 +2,7 @@
  *  WhirlyGlobeLib
  *
  *  Created by Steve Gifford on 2/13/16.
- *  Copyright 2016-2021 mousebird consulting
+ *  Copyright 2016-2022 mousebird consulting
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.

android/apps/AutoTesterAndroid/app/src/main/java/com/mousebirdconsulting/autotester/TestCases/CustomBNGTileSource.kt

@@ -2,7 +2,7 @@
  *  WhirlyGlobeLib
  *
  *  Created by Steve Gifford on 2/13/16.
- *  Copyright 2016-2021 mousebird consulting
+ *  Copyright 2016-2022 mousebird consulting
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.