Merge branch develop to main for 3.4 release

mousebird-consulting-inc · Feb 1, 2022 · 4364780 · 4364780
2 parents 453f36a + 564beb4
commit 4364780
Show file tree

Hide file tree

Showing 1,176 changed files with 9,194 additions and 5,679 deletions.
diff --git a/WhirlyGlobe.podspec b/WhirlyGlobe.podspec
@@ -21,7 +21,7 @@ Pod::Spec.new do |s|
   s.author           = { "Steve Gifford" => "[email protected]" }
   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' }

diff --git a/...p/src/main/java/com/mousebirdconsulting/autotester/TestCases/AnimatedBaseMapTestCase.java b/...p/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.

diff --git a/...p/src/main/java/com/mousebirdconsulting/autotester/TestCases/AnimationDelegateTestCase.kt b/...p/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.

diff --git a/...ndroid/app/src/main/java/com/mousebirdconsulting/autotester/TestCases/BillboardAdapter.kt b/...ndroid/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.

diff --git a/...droid/app/src/main/java/com/mousebirdconsulting/autotester/TestCases/BillboardTestCase.kt b/...droid/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.

diff --git a/...erAndroid/app/src/main/java/com/mousebirdconsulting/autotester/TestCases/CartoTestCase.kt b/...erAndroid/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>) {
+        }
     }
 }
diff --git a/...pp/src/main/java/com/mousebirdconsulting/autotester/TestCases/ClusteredMarkersTestCase.kt b/...pp/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.

diff --git a/...src/main/java/com/mousebirdconsulting/autotester/TestCases/ComponentObjectLeakTestCase.kt b/...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.

diff --git a/...d/app/src/main/java/com/mousebirdconsulting/autotester/TestCases/CustomBNGCoordAdapter.kt b/...d/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.

diff --git a/...oid/app/src/main/java/com/mousebirdconsulting/autotester/TestCases/CustomBNGTileSource.kt b/...oid/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.

diff --git a/...oid/app/src/main/java/com/mousebirdconsulting/autotester/TestCases/ImageReloadTestCase.kt b/...oid/app/src/main/java/com/mousebirdconsulting/autotester/TestCases/ImageReloadTestCase.kt
@@ -3,7 +3,7 @@
 *  WhirlyGlobeLib
 *
 *  Created by sjg
-*  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.

diff --git a/...Android/app/src/main/java/com/mousebirdconsulting/autotester/TestCases/LightingAdapter.kt b/...Android/app/src/main/java/com/mousebirdconsulting/autotester/TestCases/LightingAdapter.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.

diff --git a/...ndroid/app/src/main/java/com/mousebirdconsulting/autotester/TestCases/LightingTestCase.kt b/...ndroid/app/src/main/java/com/mousebirdconsulting/autotester/TestCases/LightingTestCase.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.

diff --git a/...pp/src/main/java/com/mousebirdconsulting/autotester/TestCases/MaplyStarModelTestCase.java b/...pp/src/main/java/com/mousebirdconsulting/autotester/TestCases/MaplyStarModelTestCase.java
@@ -3,7 +3,7 @@
  *  WhirlyGlobeLib
  *
  *  Created by jmnavarro
- *  Copyright 2011-2015 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.

diff --git a/...src/main/java/com/mousebirdconsulting/autotester/TestCases/MovingScreenMarkersTestCase.kt b/...src/main/java/com/mousebirdconsulting/autotester/TestCases/MovingScreenMarkersTestCase.kt
@@ -3,7 +3,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.
@@ -22,6 +22,7 @@ package com.mousebirdconsulting.autotester.TestCases
 
 import android.app.Activity
 import android.graphics.BitmapFactory
+import android.graphics.Color
 import android.os.Handler
 import com.mousebird.maply.*
 import com.mousebirdconsulting.autotester.Framework.MaplyTestCase
@@ -56,8 +57,8 @@ class MovingScreenMarkersTestCase(activity: Activity) :
                 controller.addTexture(icon1, null, threadCurrent)!!)
 
         timerRunnable = Runnable {
-            clearMarkers()
-            markerObj = makeMarkers()
+            clear()
+            objs.addAll(makeMarkers())
             timerRunnable?.let {
                 timerHandler.postDelayed(it, (1000 * duration).toLong())
             }
@@ -72,25 +73,24 @@ class MovingScreenMarkersTestCase(activity: Activity) :
             timerHandler.removeCallbacks(it)
         }
 
+        clear()
+
         baseCase.shutdown()
         super.shutdown()
     }
 
-    private fun clearMarkers() {
-        markerObj?.also {
-            controller.removeObject(it, threadCurrent)
-            markerObj = null
-        }
+    private fun clear() {
+        controller.removeObjects(objs, threadCurrent)
+        objs.clear()
     }
 
-    private fun makeMarkers(): ComponentObject? {
+    private fun makeMarkers(): Collection<ComponentObject> {
         val pts = arrayOf(
                 Point2d.FromDegrees(0.0, 0.0),
                 Point2d.FromDegrees(10.0, 10.0),
                 Point2d.FromDegrees(0.0, 20.0),
                 Point2d.FromDegrees(-10.0, 10.0)
         )
-
         val markers = pts.indices.map {
             ScreenMovingMarker().apply {
                 duration = this@MovingScreenMarkersTestCase.duration
@@ -102,9 +102,27 @@ class MovingScreenMarkersTestCase(activity: Activity) :
                 layoutImportance = Float.MAX_VALUE
             }
         }
-        return controller.addScreenMovingMarkers(markers, MarkerInfo(), threadCurrent)
+        val labels = pts.indices.map {
+            ScreenMovingLabel().apply {
+                duration = this@MovingScreenMarkersTestCase.duration
+                //period = [email protected] / 2
+                loc = pts[it]
+                endLoc = pts[(it + 1) % pts.size]
+                layoutImportance = Float.MAX_VALUE
+                offset = Point2d(20.0, -10.0)
+                text = "<=="
+            }
+        }
+        val labelInfo = LabelInfo().apply {
+            textColor = Color.RED
+            fontSize = 20.0f
+        }
+        return listOfNotNull(
+            controller.addScreenMovingMarkers(markers, MarkerInfo(), threadCurrent),
+            controller.addScreenMovingLabels(labels, labelInfo, threadCurrent)
+        )
     }
-
+    
     private val threadCurrent = ThreadMode.ThreadCurrent
 
     private var baseCase = VectorsTestCase(activity)
@@ -114,5 +132,5 @@ class MovingScreenMarkersTestCase(activity: Activity) :
     private val timerHandler = Handler()
 
     private var textures: Array<MaplyTexture>? = null
-    private var markerObj: ComponentObject? = null
+    private val objs = ArrayList<ComponentObject>()
 }
diff --git a/...oid/app/src/main/java/com/mousebirdconsulting/autotester/TestCases/PagingLayerTestCase.kt b/...oid/app/src/main/java/com/mousebirdconsulting/autotester/TestCases/PagingLayerTestCase.kt
@@ -3,7 +3,7 @@
  *  WhirlyGlobeLib
  *
  *  Created by sjg
- *  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.

diff --git a/...erAndroid/app/src/main/java/com/mousebirdconsulting/autotester/TestCases/SLDTestCase.java b/...erAndroid/app/src/main/java/com/mousebirdconsulting/autotester/TestCases/SLDTestCase.java
@@ -3,7 +3,7 @@
  *  WhirlyGlobeLib
  *
  *  Created by rghosh on 2017-03-14.
- *  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.

diff --git a/...rAndroid/app/src/main/java/com/mousebirdconsulting/autotester/TestCases/ShapesTestCase.kt b/...rAndroid/app/src/main/java/com/mousebirdconsulting/autotester/TestCases/ShapesTestCase.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.

diff --git a/...oid/app/src/main/java/com/mousebirdconsulting/autotester/TestCases/SimpleStyleTestCase.kt b/...oid/app/src/main/java/com/mousebirdconsulting/autotester/TestCases/SimpleStyleTestCase.kt
@@ -41,8 +41,7 @@ class SimpleStyleTestCase(activity: Activity) : MaplyTestCase(activity, "Simple
         super.userDidSelect(mapControl, selObjs, loc, screenLoc)
         selObjs?.forEach { so ->
             (so.selObj as? VectorObject)?.let { obj ->
-                val json = obj.attributes.getString("json")
-                val x = json
+                val json = obj.attributes?.getString("json")
             }
         }
     }
@@ -88,12 +87,10 @@ class SimpleStyleTestCase(activity: Activity) : MaplyTestCase(activity, "Simple
                     obj.selectable = true
                     if (obj.attributes == null) {
                         // has no effect if the vector object has no shapes
-                        obj.attributes = AttrDictionary()
+                        obj.setAttributes(AttrDictionary())
                     }
-                    if (obj.attributes != null) {
-                        obj.attributes.setString("json", json);
-                    }
-
+                    obj.attributes?.setString("json", json);
+
                     if (obj.fromGeoJSON(json)) {
                         styleMan.addFeatures(obj, threadAny)
                     } else {

diff --git a/...id/app/src/main/java/com/mousebirdconsulting/autotester/TestCases/StamenRemoteTestCase.kt b/...id/app/src/main/java/com/mousebirdconsulting/autotester/TestCases/StamenRemoteTestCase.kt
@@ -2,7 +2,7 @@
  *  WhirlyGlobeLib
  *
  *  Created by Steve Gifford on 3/22/19.
- *  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.

diff --git a/...p/src/main/java/com/mousebirdconsulting/autotester/TestCases/StartupShutdownTestCase.java b/...p/src/main/java/com/mousebirdconsulting/autotester/TestCases/StartupShutdownTestCase.java
@@ -3,7 +3,7 @@
  *  WhirlyGlobeLib
  *
  *  Created by Steve Gifford.
- *  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.

diff --git a/...roid/app/src/main/java/com/mousebirdconsulting/autotester/TestCases/StickersTestCase.java b/...roid/app/src/main/java/com/mousebirdconsulting/autotester/TestCases/StickersTestCase.java
@@ -3,7 +3,7 @@
  *  WhirlyGlobeLib
  *
  *  Created by Steve Gifford.
- *  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.

diff --git a/...d/app/src/main/java/com/mousebirdconsulting/autotester/TestCases/TextureVectorTestCase.kt b/...d/app/src/main/java/com/mousebirdconsulting/autotester/TestCases/TextureVectorTestCase.kt
@@ -3,7 +3,7 @@
  *  WhirlyGlobeLib
  *
  *  Created by Steve Gifford.
- *  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.
@@ -78,8 +78,8 @@ class TextureVectorTestCase(activity: Activity) : MaplyTestCase(activity, "Textu
                             // Center of the texture application
                             val center = loopObj.center()
                             val attrs = loopObj.attributes
-                            attrs.setDouble("veccenterx", center.x)
-                            attrs.setDouble("veccentery", center.y)
+                            attrs?.setDouble("veccenterx", center.x)
+                            attrs?.setDouble("veccentery", center.y)
 
                             var thisClipGridLon = ClipGridSize
                             if (isGlobe) {

diff --git a/...roid/app/src/main/java/com/mousebirdconsulting/autotester/TestCases/VectorHoleTestCase.kt b/...roid/app/src/main/java/com/mousebirdconsulting/autotester/TestCases/VectorHoleTestCase.kt
@@ -2,7 +2,7 @@
  *  WhirlyGlobeLib
  *
  *  Created by Steve Gifford.
- *  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.

diff --git a/...d/app/src/main/java/com/mousebirdconsulting/autotester/TestCases/VectorMBTilesTestCase.kt b/...d/app/src/main/java/com/mousebirdconsulting/autotester/TestCases/VectorMBTilesTestCase.kt
@@ -2,7 +2,7 @@
  *  WhirlyGlobeLib
  *
  *  Created by Steve Gifford.
- *  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.

diff --git a/...oid/app/src/main/java/com/mousebirdconsulting/autotester/TestCases/VectorStyleTestCase.kt b/...oid/app/src/main/java/com/mousebirdconsulting/autotester/TestCases/VectorStyleTestCase.kt
@@ -2,7 +2,7 @@
  *  WhirlyGlobeLib
  *
  *  Created by Steve Gifford.
- *  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.