Added WhirlyGlobe-Maply .xcframework and implemented map layer switch

224 files changed, 28619 insertions, 9 deletions

diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/Info.plist b/iosApp/WhirlyGlobeMaplyComponent.xcframework/Info.plist
new file mode 100644
index 0000000..18dc2b7
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/Info.plist
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>AvailableLibraries</key>
+	<array>
+		<dict>
+			<key>LibraryIdentifier</key>
+			<string>ios-arm64_x86_64-simulator</string>
+			<key>LibraryPath</key>
+			<string>WhirlyGlobeMaplyComponent.framework</string>
+			<key>SupportedArchitectures</key>
+			<array>
+				<string>arm64</string>
+				<string>x86_64</string>
+			</array>
+			<key>SupportedPlatform</key>
+			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
+		</dict>
+		<dict>
+			<key>LibraryIdentifier</key>
+			<string>ios-arm64</string>
+			<key>LibraryPath</key>
+			<string>WhirlyGlobeMaplyComponent.framework</string>
+			<key>SupportedArchitectures</key>
+			<array>
+				<string>arm64</string>
+			</array>
+			<key>SupportedPlatform</key>
+			<string>ios</string>
+		</dict>
+	</array>
+	<key>CFBundlePackageType</key>
+	<string>XFWK</string>
+	<key>XCFrameworkFormatVersion</key>
+	<string>1.0</string>
+</dict>
+</plist>
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Config-ac.h.in b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Config-ac.h.in
new file mode 100644
index 0000000..ac3ba0b
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Config-ac.h.in
@@ -0,0 +1,91 @@
+/* include/GeographicLib/Config-ac.h.in.  Generated from configure.ac by autoheader.  */
+
+/* Define if building universal (internal helper macro) */
+#undef AC_APPLE_UNIVERSAL_BUILD
+
+/* major version number */
+#undef GEOGRAPHICLIB_VERSION_MAJOR
+
+/* minor version number */
+#undef GEOGRAPHICLIB_VERSION_MINOR
+
+/* patch number */
+#undef GEOGRAPHICLIB_VERSION_PATCH
+
+/* define if the compiler supports basic C++11 syntax */
+#undef HAVE_CXX11
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#undef HAVE_DLFCN_H
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define to 1 if the system has the type `long double'. */
+#undef HAVE_LONG_DOUBLE
+
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
+
+/* Define to the sub-directory where libtool stores uninstalled libraries. */
+#undef LT_OBJDIR
+
+/* Name of package */
+#undef PACKAGE
+
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
+/* Version number of package */
+#undef VERSION
+
+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+   significant byte first (like Motorola and SPARC, unlike Intel). */
+#if defined AC_APPLE_UNIVERSAL_BUILD
+# if defined __BIG_ENDIAN__
+#  define WORDS_BIGENDIAN 1
+# endif
+#else
+# ifndef WORDS_BIGENDIAN
+#  undef WORDS_BIGENDIAN
+# endif
+#endif
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/GeoJSONSource.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/GeoJSONSource.h
new file mode 100644
index 0000000..55c1446
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/GeoJSONSource.h
@@ -0,0 +1,40 @@
+/*  GeoJSONSource.mm
+ *  WhirlyGlobe-MaplyComponent
+ *
+ *  Created by Ranen Ghosh on 2016-11-18.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#import <UIKit/UIKit.h>
+#import <WhirlyGlobeMaplyComponent/MaplyBaseViewController.h>
+
+#define GEOJSON_MAX_POINTS 4096
+
+/**
+ This class will read GeoJSON via URL with an associated Styled Layer Descriptor via URL.  It will then
+  parse both of them and apply the SLD style to the GeoJSON data.  This results in visual data in
+ much the same way as loading vector tiles would.
+ */
+@interface GeoJSONSource : NSObject
+
+- (id _Nullable)initWithViewC:(NSObject<MaplyRenderControllerProtocol> * _Nonnull)baseVC GeoJSONURL:(NSURL * _Nonnull)geoJSONURL sldURL:(NSURL * _Nonnull)sldURL relativeDrawPriority:(int)relativeDrawPriority ;
+
+- (void)startParseWithCompletion:(nonnull void (^)(void)) completionBlock;
+
+- (void)startParse;
+
+@property (nonatomic, readonly) bool loaded;
+@property (nonatomic, assign) bool enabled;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/GeographicLib_ObjC.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/GeographicLib_ObjC.h
new file mode 100644
index 0000000..e57a3d2
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/GeographicLib_ObjC.h
@@ -0,0 +1,100 @@
+//
+//  geowrap.h
+//  WhirlyGlobeLib
+//
+//  Created by Tim Sylvester on 12/14/20.
+//  Copyright 2020 mousebird consulting. All rights reserved.
+//
+
+#ifndef GeographicLib_Wrapper_h
+#define GeographicLib_Wrapper_h
+
+#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
+
+typedef struct GeoLibInv_t {
+    double distance;    // meters
+    double azimuth1;    // radians
+    double azimuth2;    // radians
+} GeoLibInv;
+
+typedef struct GeoLibInt_t {
+    MaplyCoordinateD intersection;
+    bool intersects;
+} GeoLibInt;
+
+typedef struct GeoLibIntPair_t {
+    MaplyCoordinateD intersections[2];
+    double distances[2];
+    unsigned int count;
+} GeoLibIntPair;
+
+typedef struct GeoLibOrthoDist_t {
+    double downtrackDistance;
+    double crosstrackDistance;
+    double segmentLength;
+} GeoLibOrthoDist;
+
+#if defined __cplusplus
+extern "C" {
+#endif
+
+/// Solve the direct geodesic problem where the length of the geodesic is specified in terms of distance.
+/// azimuth in radians, distance in meters
+MaplyCoordinate GeoLibCalcDirectF(MaplyCoordinate origin, double azimuth, double distance);
+MaplyCoordinateD GeoLibCalcDirectD(MaplyCoordinateD origin, double azimuth, double distance);
+
+// Solve the inverse geodesic problem
+GeoLibInv GeoLibCalcInverseF(MaplyCoordinate p1, MaplyCoordinate p2);
+GeoLibInv GeoLibCalcInverseD(MaplyCoordinateD p1, MaplyCoordinateD p2);
+
+// Test for a point lying inside the specified polygon
+bool MaplyCoordinateInPolygon(MaplyCoordinate p, const MaplyCoordinate polygon[], unsigned count);
+bool MaplyCoordinateDInPolygon(MaplyCoordinateD p, const MaplyCoordinate polygon[], unsigned count);
+bool MaplyCoordinateInPolygonD(MaplyCoordinate p, const MaplyCoordinateD polygon[], unsigned count);
+bool MaplyCoordinateDInPolygonD(MaplyCoordinateD p, const MaplyCoordinateD polygon[], unsigned count);
+
+double GeoLibDistanceD(MaplyCoordinateD startPt, MaplyCoordinateD endPt);
+
+// Test for a segment intersecting a polygon.
+// Note that if the line is completely within the polygon the result is false.
+bool GeoLibLineDIntersectsPolygonD(MaplyCoordinateD startPt, MaplyCoordinateD endPt, const MaplyCoordinateD[], unsigned count);
+
+// Compute the intersection point of two geodesic segments
+GeoLibInt GeoLibIntersectD(MaplyCoordinateD a, MaplyCoordinateD b, MaplyCoordinateD c, MaplyCoordinateD d);
+
+// Determine where a great circle intersects a small circle
+GeoLibIntPair GeoLibLineDIntersectCircleD(MaplyCoordinateD startPt, MaplyCoordinateD endPt, MaplyCoordinateD center, double radiusMeters);
+
+// Determine whether there's an intersection without bothering to compute its location
+bool GeoLibLineDIntersectsCircleD(MaplyCoordinateD startPt, MaplyCoordinateD endPt, MaplyCoordinateD center, double radiusMeters);
+
+// Compute the orthogonal distances for a point.
+//
+// Given a segment and a point, find the perpendicular intersection point (the closest point along the
+// segment) and compute the distance from that point to the segment starting point (down-track) and
+// to the specified point (cross-track).
+//
+//  negative down-track distance          C
+//                             v          |    <- negative cross-track distance
+//                         - - - - - A--------B
+//                         |              |    <- positive cross-track distance
+//                         C              C
+//                                    ----
+//                                     ^ positive down-track-distance
+//
+// If the point lies "before" the segment start point, the down-track distance will be negative.
+// If the point lies "after" the segment end point, the down-track distance will be greater than the segment length.
+// If the point lies to the right of the segment, the cross-track distance will be positive.
+// If the point lies to the left of the segment, the cross-track distance will be negative.
+GeoLibOrthoDist GeoLibOrthoDistD(MaplyCoordinateD a, MaplyCoordinateD b, MaplyCoordinateD c);
+
+// Generate points along an arc
+double GeoLibSampleArcD(MaplyCoordinateD center, double radiusMeters,
+                        double beginAzimuthRad, double endAziumthRad, bool clockwise,
+                        MaplyCoordinateD points[], unsigned count);
+
+#if defined __cplusplus
+}   // extern "C"
+#endif
+
+#endif /* GeographicLib_Wrapper_h */
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/GlobeDoubleTapDelegate.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/GlobeDoubleTapDelegate.h
new file mode 100644
index 0000000..ea1b934
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/GlobeDoubleTapDelegate.h
@@ -0,0 +1,34 @@
+/*  GlobeDoubleTapDelegate.h
+ *
+ *  Created by Steve Gifford on 2/7/14.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
+
+@interface WhirlyGlobeDoubleTapDelegate : NSObject<UIGestureRecognizerDelegate>
+
+@property (nonatomic,weak) UIGestureRecognizer *gestureRecognizer;
+
+// How much we zoom in by
+@property (nonatomic) float zoomTapFactor;
+
+// How long the zoom animation takes
+@property (nonatomic) float zoomAnimationDuration;
+
+/// Zoom limits
+@property (nonatomic) float minZoom,maxZoom;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/GlobeDoubleTapDragDelegate.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/GlobeDoubleTapDragDelegate.h
new file mode 100644
index 0000000..7df7f12
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/GlobeDoubleTapDragDelegate.h
@@ -0,0 +1,33 @@
+/*  GlobeDoubleTapDragDelegate.h
+ *
+ *  Created by Steve Gifford on 2/7/14.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#import <Foundation/Foundation.h>
+#import <WhirlyGlobeMaplyComponent/GlobePinchDelegate.h>
+
+// Sent out when the double tap delegate takes control
+#define kGlobeDoubleTapDragDidStart @"WKGlobeDoubleTapDragStarted"
+// Sent out when the double tap delegate finished (but hands off to momentum)
+#define kGlobeDoubleTapDragDidEnd @"WKGlobeDoubleTapDragEnded"
+
+@interface WhirlyGlobeDoubleTapDragDelegate : NSObject<UIGestureRecognizerDelegate>
+
+@property (nonatomic,weak) UIGestureRecognizer *gestureRecognizer;
+
+/// Zoom limits
+@property (nonatomic) float minZoom,maxZoom;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/GlobePanDelegate.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/GlobePanDelegate.h
new file mode 100644
index 0000000..02d2249
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/GlobePanDelegate.h
@@ -0,0 +1,48 @@
+/*
+ *  GlobePanDelegate.h
+ *  WhirlyGlobeApp
+ *
+ *  Created by Stephen Gifford on 4/28/11.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <UIKit/UIKit.h>
+
+// Sent out when the pan delegate takes control
+#define kPanDelegateDidStart @"WKPanDelegateStarted"
+// Sent out when the pan delegate finished (but hands off to momentum)
+#define kPanDelegateDidEnd @"WKPanDelegateEnded"
+
+#define kPanDelegateMinTime 0.1
+
+// Custom pan gesture recognizer that plays well with scroll views.
+@interface MinDelayPanGestureRecognizer : UIPanGestureRecognizer {
+    // time of start of gesture
+    CFTimeInterval startTime;
+}
+
+- (void)forceEnd;
+
+@end
+
+
+// The pan delegate handles panning and rotates the globe accordingly
+@interface WhirlyGlobePanDelegate : NSObject<UIGestureRecognizerDelegate>
+
+@property(nonatomic,assign) bool northUp;
+
+@property (nonatomic,weak) UIGestureRecognizer *gestureRecognizer;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/GlobePinchDelegate.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/GlobePinchDelegate.h
new file mode 100644
index 0000000..35d40d8
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/GlobePinchDelegate.h
@@ -0,0 +1,61 @@
+/*  GlobePinchDelegate.h
+ *  WhirlyGlobeLib
+ *
+ *  Created by Steve Gifford on 8/22/12.
+ *  Copyright 2012-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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#import <UIKit/UIKit.h>
+
+@class WhirlyGlobeRotateDelegate;
+
+// Sent out when the pinch delegate takes control
+#define kPinchDelegateDidStart @"WKPinchDelegateStarted"
+// Sent out when the pinch delegate finished (but hands off to momentum)
+#define kPinchDelegateDidEnd @"WKPinchDelegateEnded"
+
+/** WhirlyGlobe Pinch Gesture Delegate
+ Responds to pinches on a UIView and manipulates the globe view
+ accordingly.
+ */
+@interface WhirlyGlobePinchDelegate : NSObject <UIGestureRecognizerDelegate>
+
+/// Min and max height to allow the user to change
+@property (nonatomic,assign) float minHeight,maxHeight;
+
+/// If set we're cooperating with the rotation delegate (HACK!)
+@property (nonatomic,weak) WhirlyGlobeRotateDelegate *rotateDelegate;
+
+/// If set, we'll zoom around the pinch, rather than the center of the view
+@property (nonatomic,assign) bool zoomAroundPinch;
+
+/// If set, we'll rotate around the pinch
+@property (nonatomic,assign) bool doRotation;
+
+/// If set, we'll pan around the center point.  If not, we just zoom.
+@property (nonatomic,assign) bool allowPan;
+
+/// If set, we'll maintain north as up
+@property (nonatomic,assign) bool northUp;
+
+@property (nonatomic,weak) UIGestureRecognizer *gestureRecognizer;
+
+// If set, we'll keep track up rather than north up
+- (void)setTrackUp:(double)trackUp;
+
+// Turn track up back off
+- (void)clearTrackUp;
+
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/GlobeRotateDelegate.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/GlobeRotateDelegate.h
new file mode 100644
index 0000000..9e57c3a
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/GlobeRotateDelegate.h
@@ -0,0 +1,37 @@
+/*  GlobeRotateDelegate.h
+ *  WhirlyGlobeLib
+ *
+ *  Created by Steve Gifford on 6/10/11.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#import <UIKit/UIKit.h>
+
+@protocol WhirlyKitViewWrapper;
+
+/** Rotation delegate 
+    is for two fingered rotation around the axis at the middle of the screen
+ */
+@interface WhirlyGlobeRotateDelegate : NSObject <UIGestureRecognizerDelegate> 
+
+/// If set, the rotation will occur around the center between the two fingers rather than the current viewpoint
+@property (nonatomic) bool rotateAroundCenter;
+
+/// Gesture recognizer attached to this delegate (or vice versa, actually)
+@property (nonatomic,weak) UIGestureRecognizer *gestureRecognizer;
+
+/// Can be called by a cooperating delegate (which is also messing with rotation) (HACK!)
+- (void)updateWithCenter:(CGPoint)center touch:(CGPoint)touch wrapView:(UIView<WhirlyKitViewWrapper> *)glView;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/GlobeTapDelegate.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/GlobeTapDelegate.h
new file mode 100644
index 0000000..61e3492
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/GlobeTapDelegate.h
@@ -0,0 +1,29 @@
+/*  GlobeTapDelegate.h
+ *  WhirlyGlobeLib
+ *
+ *  Created by Steve Gifford on 2/3/11.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <UIKit/UIKit.h>
+
+/** WhirlyGlobe tap gesture delegate
+	responds to taps by blasting out a notification.
+ */
+@interface WhirlyGlobeTapDelegate : NSObject <UIGestureRecognizerDelegate>
+
+@property (nonatomic,weak) UIGestureRecognizer *gestureRecognizer;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/GlobeTiltDelegate.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/GlobeTiltDelegate.h
new file mode 100644
index 0000000..f326c3e
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/GlobeTiltDelegate.h
@@ -0,0 +1,28 @@
+/*  GlobeTiltDelegate.h
+ *
+ *  Created by Stephen Gifford on 1/5/15.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#import <WhirlyGlobeMaplyComponent/GlobePinchDelegate.h>
+
+// The tilt delegate handle the 3D camera tilt
+@interface WhirlyGlobeTiltDelegate : NSObject<UIGestureRecognizerDelegate>
+
+@property (nonatomic,weak) UIGestureRecognizer *gestureRecognizer;
+
+// Set so we can turn off the pinch delegate when we're working
+@property (nonatomic,weak) WhirlyGlobePinchDelegate *pinchDelegate;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/GlobeTwoFingerTapDelegate.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/GlobeTwoFingerTapDelegate.h
new file mode 100644
index 0000000..93bea5e
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/GlobeTwoFingerTapDelegate.h
@@ -0,0 +1,34 @@
+/*  GlobeTwoFingerTapDelegate.h
+ *
+ *  Created by Steve Gifford on 2/7/14.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
+
+@interface WhirlyGlobeTwoFingerTapDelegate : NSObject<UIGestureRecognizerDelegate>
+
+@property (nonatomic,weak) UIGestureRecognizer *gestureRecognizer;
+
+// How much we zoom in by
+@property (nonatomic) float zoomTapFactor;
+
+// How long the zoom animation takes
+@property (nonatomic) float zoomAnimationDuration;
+
+/// Zoom limits
+@property (nonatomic) float minZoom,maxZoom;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MapboxVectorInterpreter.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MapboxVectorInterpreter.h
new file mode 100644
index 0000000..6229604
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MapboxVectorInterpreter.h
@@ -0,0 +1,65 @@
+/*
+ *  MapboxVectorTilesImageDelegate.h
+ *  WhirlyGlobe-MaplyComponent
+ *
+ *  Created by Steve Gifford on January 24 2018
+ *  Copyright 2011-2022 Saildrone
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+
+#import <Foundation/Foundation.h>
+#import <WhirlyGlobeMaplyComponent/MaplyTileSourceNew.h>
+#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
+#import <WhirlyGlobeMaplyComponent/MaplyVectorStyle.h>
+#import <WhirlyGlobeMaplyComponent/MapboxVectorTiles.h>
+#import <WhirlyGlobeMaplyComponent/MaplyQuadImageFrameLoader.h>
+
+@class MapboxVectorStyleSet;
+
+/**
+ An interpreter for Mapbox Vector Tiles.
+ 
+ This will turn vector tiles into images, visual objects, or a combination of the two.  Loader interpreters like
+    this one can be used by Loaders that talk to ondevice objects (such as MBTiles files) or remote tile
+    sources.
+ */
+@interface MapboxVectorInterpreter : NSObject<MaplyLoaderInterpreter>
+
+/** This version of the init takes an image style set, a vector style set,
+    and an offline renderer to build the image tiles.
+ 
+    Image tiles will be used as a background and vectors put on top of them.
+    This is very nice for the globe, but requires specialized style sheets.
+  */
+- (instancetype _Nullable ) initWithImageStyle:(NSObject<MaplyVectorStyleDelegate> *__nonnull)imageStyle
+                         offlineRender:(MaplyRenderController *__nonnull)renderControl
+                           vectorStyle:(NSObject<MaplyVectorStyleDelegate> *__nonnull)vectorStyle
+                                 viewC:(NSObject<MaplyRenderControllerProtocol> *__nonnull)viewC;
+
+/** This version of the init builds visual features for vector tiles.
+ 
+    This interpreter can be used as overlay data or a full map, depending
+    on how your style is configured.
+  */
+- (instancetype __nullable) initWithVectorStyle:(NSObject<MaplyVectorStyleDelegate> *__nonnull)vectorStyle
+                                          viewC:(NSObject<MaplyRenderControllerProtocol> *__nonnull)viewC;
+
+/**
+ Set an optional list of unique features we'll filter on.
+ Any feature we want to pass through must have the given attribute name and one of the values.
+ */
+- (void)setUUIDName:(NSString * __nonnull)uuidName uuidValues:(NSArray<NSString *> * __nonnull)uuids;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MapboxVectorStyleSet.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MapboxVectorStyleSet.h
new file mode 100644
index 0000000..acf5d30
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MapboxVectorStyleSet.h
@@ -0,0 +1,139 @@
+/*
+ *  MapboxVectorStyleSet.h
+ *  WhirlyGlobe-MaplyComponent
+ *
+ *  Created by Steve Gifford on 2/16/15.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <Foundation/Foundation.h>
+#import <WhirlyGlobeMaplyComponent/MaplyVectorStyle.h>
+#import <WhirlyGlobeMaplyComponent/MapboxVectorTiles.h>
+
+typedef NS_ENUM(NSUInteger,MapboxLayerType) {
+    MapboxLayerTypeBackground,
+    MapboxLayerTypeCircle,
+    MapboxLayerTypeFill,
+    MapboxLayerTypeLine,
+    MapboxLayerTypeRaster,
+    MapboxLayerTypeSymbol,
+    MapboxLayerTypeUnknown
+};
+
+/**
+ A single entry in the legend array returned by
+ */
+@interface MaplyLegendEntry : NSObject
+
+/// Name of this entry
+@property (nonatomic,nonnull) NSString *name;
+
+/// Image for this entry, if this is a single entry
+@property (nonatomic,nullable) UIImage *image;
+
+/// Array of entries if this is a group
+@property (nonatomic,nullable) NSMutableArray<MaplyLegendEntry *> *entries;
+
+@end
+
+/** @brief The Mapbox Vector Style Set parses Mapbox GL Style sheets and turns them into Maply compatible styles.
+    @details A style delegate is required by the Mapnik parser to build geometry out of Mapnik vector tiles.  This style delegate can read a Mapbox GL Style sheet and produce compatible styles.
+ */
+@interface MapboxVectorStyleSet : NSObject<MaplyVectorStyleDelegate>
+
+/// @brief Initialize with the style dictionary alreayd parsed from JSON
+/// @details We'll parse the style JSON passed in and return nil on failure.
+/// @details The optional filter can be used to reject layers we won't use
+- (id __nullable)initWithDict:(NSDictionary * __nonnull)styleDict
+                     settings:(MaplyVectorStyleSettings * __nonnull)settings
+                        viewC:(NSObject<MaplyRenderControllerProtocol> * __nonnull)viewC;
+
+/// @brief Initialize with the style JSON and the view controller
+/// @details We'll parse the style JSON passed in and return nil on failure.
+/// @details The optional filter can be used to reject layers we won't use
+- (id __nullable)initWithJSON:(NSData * __nonnull)styleJSON
+                     settings:(MaplyVectorStyleSettings * __nonnull)settings
+                        viewC:(NSObject<MaplyRenderControllerProtocol> * __nonnull)viewC;
+
+/// @brief Where we can fetch the sprites
+@property (nonatomic, strong, nullable) NSString *spriteURL;
+
+/// Tile sources
+@property (nonatomic, strong, nonnull) NSArray *sources;
+
+/// All the layer names
+@property (nonatomic) NSArray<NSString *> * __nonnull layerNames;
+
+/// Type of the given layer
+- (MapboxLayerType) layerType:(NSString * __nonnull)layerName;
+
+/// Add the sprint sheet for use in symbols.  Return false on failures.
+- (bool)addSprites:(NSDictionary * __nonnull)spriteDict image:(UIImage * __nonnull)image;
+
+/**
+ This method will poke around in the given layer to determine a distinc color for it.
+ For circle layers, you get the circle color.  For fill and line layers, it's the paint color.
+ For symbols, you get the text color.
+ This is useful for visualizing layers, it has nothing to do with rendering them.
+ */
+- (UIColor * __nullable) colorForLayer:(NSString *__nonnull)layerName;
+
+/// If there is a background layer, calculate the color for a given zoom level.
+/// Otherwise return nil
+- (UIColor * __nullable)backgroundColorForZoom:(double)zoom;
+
+/// Make a layer visible/invisible
+- (void)setLayerVisible:(NSString *__nonnull)layerName visible:(bool)visible;
+
+/// Slot for continuous zoom levels.  If not set, we won't use those.
+- (void)setZoomSlot:(int)zoomSlot;
+
+/**
+ Returns a dictionary containing a flexible legend for the layers contained in this style.
+ Each layer is rendered as a representative image at the given size.
+ Layer names that start with the same "<name>_" will be grouped together in the hiearchy if
+  the group parameter is set.  Otherwise they'll be flat.
+ */
+- (NSArray<MaplyLegendEntry *> * __nonnull)layerLegend:(CGSize)imageSize group:(bool)useGroups;
+
+@property (nonatomic, weak, nullable) NSObject<MaplyRenderControllerProtocol> *viewC;
+
+@end
+
+typedef enum : NSUInteger {
+    MapboxSourceVector,
+    MapboxSourceRaster,
+    // TODO: Support the rest of these eventually
+} MapboxSourceType;
+
+// Sources are called out individually
+@interface MaplyMapboxVectorStyleSource : NSObject
+
+// Name of the source
+@property (nonatomic,nullable) NSString *name;
+
+// Vector and raster sources supported for now
+@property (nonatomic) MapboxSourceType type;
+
+// TileJSON URL, if present
+@property (nonatomic,nullable) NSString *url;
+
+// If the TileJSON spec is inline, this is it
+@property (nonatomic,nullable) NSDictionary *tileSpec;
+
+// Initialize with the entry in the style file
+- (id __nullable)initWithName:(NSString *__nonnull)name styleEntry:(NSDictionary * __nonnull)styleEntry styleSet:(MapboxVectorStyleSet * __nonnull)styleSet viewC:(NSObject<MaplyRenderControllerProtocol> * __nonnull)viewC;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MapboxVectorTiles.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MapboxVectorTiles.h
new file mode 100644
index 0000000..b52cd5b
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MapboxVectorTiles.h
@@ -0,0 +1,65 @@
+/*
+ *  MapboxVectorTiles.h
+ *  WhirlyGlobeLib
+ *
+ *  Created by Steve Gifford on 4/10/19.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <WhirlyGlobeMaplyComponent/MaplyVectorTileStyle.h>
+#import <WhirlyGlobeMaplyComponent/MaplyTileSourceNew.h>
+#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
+#import <WhirlyGlobeMaplyComponent/MaplyVectorStyle.h>
+
+typedef NS_ENUM(NSInteger,MapboxGeometryType)
+{
+    GeomTypeUnknown = 0,
+    GeomTypePoint = 1,
+    GeomTypeLineString = 2,
+    GeomTypePolygon = 3
+};
+
+
+/**
+  Container for data parsed out of a Mapbox Vector Tile stream.
+ 
+  This holds the parsed data as well as post-constructed data.  You will likely be handed one of these
+    if you see it at all.  There are few cases where you might construct one.
+  */
+@interface MaplyVectorTileData : NSObject
+
+/// Initialize with tile and bounds, both local coordinates and geographic
+- (id)initWithID:(MaplyTileID)tileID bbox:(MaplyBoundingBoxD)bbox geoBBox:(MaplyBoundingBoxD)geoBBox;
+
+/// Tile ID for the tile being built
+@property (readonly) MaplyTileID tileID;
+
+/// Bounding box in local coordinates
+@property (readonly) MaplyBoundingBoxD bounds;
+
+/// Bounding box in geographic
+@property (readonly) MaplyBoundingBoxD geoBounds;
+
+/// Add a single component object for tracking
+- (void)addComponentObject:(MaplyComponentObject *)compObj;
+
+/// When a style builds a component object, it needs to add it here
+///  for tracking.  This lets us delete it later.
+- (void)addComponentObjects:(NSArray *)compObjs;
+
+/// Return all the component objects thus collected
+- (NSArray *)componentObjects;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/Maply3DTouchPreviewDatasource.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/Maply3DTouchPreviewDatasource.h
new file mode 100644
index 0000000..ef42bf5
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/Maply3DTouchPreviewDatasource.h
@@ -0,0 +1,38 @@
+//
+//  Maply3DTouchPreviewDatasource.h
+//  WhirlyGlobe-MaplyComponent
+//
+//  Created by Jesse Crocker on 10/4/15.
+//
+//
+
+@class MaplyBaseViewController;
+
+@protocol Maply3dTouchPreviewDatasource <NSObject>
+
+@required
+/** 
+    Asks the data source for a view controller to display as a preview for a selected object
+ 
+    @param viewC the map requesting the view controller;
+ 
+    @param selectedObj The object a preview is being requested for.
+ 
+    @return a UIViewController, or nil if no preview should be displayed.
+ */
+- (UIViewController * _Nullable)maplyViewController:(MaplyBaseViewController * _Nonnull)viewC
+                  previewViewControllerForSelection:(NSObject * _Nonnull)selectedObj;
+
+/** 
+    Asks the data source to present a preview view controller.
+ 
+    the most likely implementation of this is [self show:previewViewC sender:self];
+ 
+    @param viewC the map requesting the view controller;
+ 
+    @param previewViewC the view controller to present.
+ */
+- (void)maplyViewController:(MaplyBaseViewController * _Nonnull)viewC
+  showPreviewViewController:(UIViewController * _Nonnull)previewViewC;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/Maply3dTouchPreviewDelegate.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/Maply3dTouchPreviewDelegate.h
new file mode 100644
index 0000000..5986f38
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/Maply3dTouchPreviewDelegate.h
@@ -0,0 +1,26 @@
+//
+//  Maply3dTouchDelegate.h
+//  WhirlyGlobeLib
+//
+//  Created by Jesse Crocker on 10/4/15.
+//
+//
+
+#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
+#import <WhirlyGlobeMaplyComponent/Maply3DTouchPreviewDatasource.h>
+
+@class MaplyBaseInteractionLayer;
+@class MaplyBaseViewController;
+
+@interface Maply3dTouchPreviewDelegate : NSObject <UIViewControllerPreviewingDelegate>
+
+@property (nonatomic, strong) NSObject<Maply3dTouchPreviewDatasource> * _Nonnull datasource;
+
+/// Create and configure new Maply3dTouchPreviewDelegate, but it is not activated.
++ (Maply3dTouchPreviewDelegate * _Nonnull)touchDelegate:(MaplyBaseViewController * _Nonnull)maplyViewC
+                                  interactLayer:( MaplyBaseInteractionLayer* _Nonnull)interactLayer
+                             datasource:(NSObject<Maply3dTouchPreviewDatasource>* _Nonnull)datasource;
+
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyActiveObject.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyActiveObject.h
new file mode 100644
index 0000000..864e853
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyActiveObject.h
@@ -0,0 +1,70 @@
+/*
+ *  MaplyActiveObject.h
+ *  WhirlyGlobe-MaplyComponent
+ *
+ *  Created by Steve Gifford on 4/3/13.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <Foundation/Foundation.h>
+
+@class MaplyBaseViewController;
+@protocol MaplyRenderControllerProtocol;
+
+/** 
+    Active Objects are used implement animation.
+    
+    Active Objects work in conjuction with the renderer to make updates on the main thread.  The way they work is this.  They're called right at the beginning of a frame draw.  They can make updates to regular Maply objects via the MaplyBaseViewController add and remove calls with the MaplyThreadMode set to MaplyThreadCurrent.  This forces the changes to happen immediately on the current (main) thread.
+
+    Fill in at least the hasUpdate and updateForFrameMethods.
+ 
+    Active Objects are run on the main thread and you're probably going to be asking the view controller to add and remove objects on the main thread.  As such, this can be slow.  Be sure to precalculate whatever you might need to make this run faster.  Also consider implementing your changes another way.  If it can be done on another thread, do it on another thread.
+ 
+ */
+@interface MaplyActiveObject : NSObject
+
+/** 
+    Initialize with a view controller
+    
+    The default initializer just takes a view controller.  If you replace this with your own, be sure to pass in what you need.
+  */
+- (nonnull instancetype)initWithViewController:(NSObject<MaplyRenderControllerProtocol> *__nonnull)viewC;
+
+/// The view controller this active object is associated with
+@property (nonatomic,weak,readonly) NSObject<MaplyRenderControllerProtocol> *__nullable viewC;
+
+/** Has Update
+ 
+    This is called every frame to determine if the active model has an update.
+    If it doesn't, we may not need to render.  So use this judiciously.
+  */
+- (bool)hasUpdate;
+
+/** Update for the current frame.
+ 
+    Run the update right now.  This should not take too long, as it's holding up
+    the renderer.
+ 
+    The frameInfo object is undefined at this point.
+  */
+- (void)updateForFrame:(void * __nonnull)frameInfo;
+
+/** Teardown active model.
+ 
+    The active model will no longer be run.  Get rid of your internal state.
+  */
+- (void)teardown;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyAnnotation.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyAnnotation.h
new file mode 100644
index 0000000..0a30524
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyAnnotation.h
@@ -0,0 +1,71 @@
+/*
+ *  MaplyAnnotation.h
+ *  WhirlyGlobe-MaplyComponent
+ *
+ *  Created by Steve Gifford on 12/13/13.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <UIKit/UIKit.h>
+#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
+
+/** 
+    This object displays an annotation at a particular point and will track that point as the map or globe moves.
+    
+    An annotation is used to point out some feature on the globe or map, typically that the user has tapped on.  It's a multi-part beast that may contain titles, subtitles, images, background views and such.
+    
+    To add one, create the MaplyAnnotation and then call addAnnotation:forPoint:offset: on the MaplyBaseViewController.
+    
+    The MaplyAnnotation is a wrapper around the SMCalloutView by Nick Farina.  It exposes much of the functionality, but sets things up correctly and deals with moving the annotation around.
+  */
+@interface MaplyAnnotation : NSObject
+
+/// The minimum viewer height this annotation is visible at.
+/// This is viewer height above the globe or map.  The annotation will only be visible if the user is above this height.
+@property (nonatomic,assign) float minVis;
+
+/// The maximum viewer height this annotation is visible at.
+/// This is viewer height above the globe or map.  The annotation will only be visible if the user is below this height.
+@property (nonatomic,assign) float maxVis;
+
+/// Set the popup's title
+@property (nonatomic,strong) NSString *title;
+
+/// Set the popup's subtitle
+@property (nonatomic,strong) NSString *subTitle;
+
+/// If set, the (optional) accessory view on the left
+@property (nonatomic,strong) UIView *leftAccessoryView;
+
+/// If set, the (optional) accessory view on the right
+@property (nonatomic,strong) UIView *rightAccessoryView;
+
+/// If set, the custom title view containing whatever you like.
+@property (nonatomic,strong) UIView *titleView;
+
+/// If set, the custom subtitle view containing whatever you put in there.
+@property (nonatomic,strong) UIView *subtitleView;
+
+/// If set, a custom content view.  Title, subtitle and views are ignored.
+@property (nonatomic,strong) UIView *contentView;
+
+/// The location of the annotation
+@property (nonatomic,readonly) MaplyCoordinate loc;
+
+/// If set, we'll reposition the globe or map to make the annotation visible.
+/// If the annotation would be off screen we would normally reposition the globe or map to make it visible.  If this is et to false, we won't.
+@property (nonatomic) bool repositionForVisibility;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyAtmosphere.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyAtmosphere.h
new file mode 100644
index 0000000..3af444f
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyAtmosphere.h
@@ -0,0 +1,81 @@
+/*
+ *  MaplyAtmosphere.h
+ *  WhirlyGlobe-MaplyComponent
+ *
+ *  Created by Steve Gifford on 6/30/15.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <UIKit/UIKit.h>
+#import <WhirlyGlobeMaplyComponent/MaplyComponentObject.h>
+#import <WhirlyGlobeMaplyComponent/WhirlyGlobeViewController.h>
+#import <WhirlyGlobeMaplyComponent/MaplyLight.h>
+
+/** 
+    Sets up the objects and shaders to implement an atmosphere.
+    
+    This object sets up a shader implementation of the simple atmosphere from GPU Gems 2  http://http.developer.nvidia.com/GPUGems2/gpugems2_chapter16.html
+  */
+@interface MaplyAtmosphere : NSObject
+
+/// Initialize the view controller.  Will place objects in that view controller.
+- (nullable instancetype)initWithViewC:(WhirlyGlobeViewController *__nonnull)viewC;
+
+/// Rayleigh scattering constant (0.0025 by default)
+@property (nonatomic) float Kr;
+
+/// Mie scattering constant (0.0010 by default)
+@property (nonatomic) float Km;
+
+/// Brightness of the sun (20.0 by default)
+@property (nonatomic) float ESun;
+
+/// Number of samples for the ray through the atmosphere (3 by default)
+@property (nonatomic) int numSamples;
+
+/// Outer radius of the atmosphere (1.05 by default).  Earth is radius 1.0.
+@property (nonatomic) float outerRadius;
+
+/// Constant used in the fragment shader.  Default is -0.95.
+@property (nonatomic) float g;
+
+/// Exposure constant in fragment shader.  Default is 2.0.
+@property (nonatomic) float exposure;
+
+/// The ground shader we set up.  You need to apply it yourself.
+@property (nonatomic,nullable,strong) MaplyShader *groundShader;
+
+/// If set we'll lock the sun direction to the camera position.  Permanent daylight.
+@property (nonatomic) bool lockToCamera;
+
+/// Wavelengths of the light (RGB).  Three floats, defaults are: 0.650, 0.570, 0.475
+- (void)setWavelength:(float *__nonnull)wavelength;
+
+/// Wavelengths of the light (RGB).  Defaults are: 0.650, 0.570, 0.475
+- (void)setWavelengthRed:(float) redWavelength green:(float)greenWavelength blue:(float)blueWavelength;
+
+/// Return the current wavelength settings (RGB)
+- (void)getWavelength:(float *__nonnull)wavelength;
+
+/// Return the current wavelength settings (RGB). The component is 0 for red, 1 for green and  2 for blue
+- (float)getWavelengthForComponent:(short)component;
+
+/// Set the sun's position relative to the earth.  This is what comes out of MaplySun.
+- (void)setSunPosition:(MaplyCoordinate3d)sunDir;
+
+/// Remove objects from the view controller we set it up in.
+- (void)removeFromViewC;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyBaseViewController.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyBaseViewController.h
new file mode 100644
index 0000000..9d5715b
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyBaseViewController.h
@@ -0,0 +1,1575 @@
+/*  MaplyBaseViewController.h
+ *  MaplyComponent
+ *
+ *  Created by Steve Gifford on 12/14/12.
+ *  Copyright 2012-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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#import <UIKit/UIKit.h>
+#import <Metal/Metal.h>
+#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
+#import <WhirlyGlobeMaplyComponent/MaplyScreenMarker.h>
+#import <WhirlyGlobeMaplyComponent/MaplyVectorObject.h>
+#import <WhirlyGlobeMaplyComponent/MaplyViewTracker.h>
+#import <WhirlyGlobeMaplyComponent/MaplyComponentObject.h>
+#import <WhirlyGlobeMaplyComponent/MaplySharedAttributes.h>
+#import <WhirlyGlobeMaplyComponent/MaplyControllerLayer.h>
+#import <WhirlyGlobeMaplyComponent/MaplyLight.h>
+#import <WhirlyGlobeMaplyComponent/MaplyShader.h>
+#import <WhirlyGlobeMaplyComponent/MaplyActiveObject.h>
+#import <WhirlyGlobeMaplyComponent/MaplyTexture.h>
+#import <WhirlyGlobeMaplyComponent/MaplyAnnotation.h>
+#import <WhirlyGlobeMaplyComponent/MaplyParticleSystem.h>
+#import <WhirlyGlobeMaplyComponent/MaplyPoints.h>
+#import <WhirlyGlobeMaplyComponent/MaplyCluster.h>
+#import <WhirlyGlobeMaplyComponent/Maply3DTouchPreviewDatasource.h>
+#import <WhirlyGlobeMaplyComponent/MaplyLocationTracker.h>
+#import <WhirlyGlobeMaplyComponent/MaplyRenderTarget.h>
+#import <WhirlyGlobeMaplyComponent/MaplyRenderController.h>
+#import <WhirlyGlobeMaplyComponent/MaplyRemoteTileFetcher.h>
+#import <WhirlyGlobeMaplyComponent/MaplyVertexAttribute.h>
+
+typedef double (^ZoomEasingBlock)(double z0,double z1,double t);
+
+/** 
+    When selecting multiple objects, one or more of these is returned.
+    
+    When you implement one of the selection delegates that takes multiple objects, you'll get an NSArray of these things.
+  */
+@interface MaplySelectedObject : NSObject
+
+/// Object the user selected
+/// This is the original object the user passed in when adding it to the globe or map.
+@property (nonatomic) id __nullable selectedObj;
+
+/// Distance from where the user tapped to the closest part of the object on the screen
+@property double screenDist;
+
+/// Distance from the user's viewpoint to the center of the object in 3-space.  Use this for sorting.
+@property double zDist;
+
+/// Set if this was part of a cluster
+@property bool cluster;
+
+@end
+
+/** Snapshot Delegate
+ 
+    Snapshots can be run as callbacks after the rendering.  If you keep your area
+    small enough you can even do it every frame.  This is the protocol for
+    snapshot delegates.
+  */
+@protocol MaplySnapshotDelegate
+
+/// Return true if you want a snapshot for this frame
+- (bool)needSnapshot:(NSTimeInterval)now viewC:(MaplyBaseViewController * __nonnull)viewC;
+
+/// If you want the whole thing return CGRectZero, otherwise return the rectangle you want based
+///  on the number of pixels.  So multiply by the scale first.
+- (CGRect)snapshotRect;
+
+/// Here's your snapshot data.  Do what you will, but do it quickly.  You can hold onto the NSData.
+- (void)snapshot:(NSData * __nonnull)snapshotData;
+
+/// If you want a specific render target, return it.  Otherwise nil for the screen.
+- (MaplyRenderTarget * __nullable)renderTarget;
+
+@optional
+/// If a render target calculates the min/max values after rendering, this snapshot callback will be called as well
+- (void)snapshotMinMax:(NSData * __nonnull)snapshotData;
+
+@end
+
+
+@protocol MaplyLocationTrackerDelegate;
+
+/** 
+    Base class for the Maply and WhirlyGlobe view controllers.
+    
+    The Maply Base View Controller is where most of the functionality lives.  For the most part Maply and WhirlyGlobe share methods and data structures.  This view controller sets up the rendering, the threading, basically everything that makes WhirlyGlobe-Maply work.
+    
+    Don't create one of these directly, instead use the MaplyViewController or the WhirlyGlobeViewController.
+ */
+@interface MaplyBaseViewController : UIViewController <MaplyRenderControllerProtocol>
+
+/** 
+    Turn selection on or off globally.
+    
+    If on we'll forward selected features on to the delegate.  When off, we don't do that.  On by default.
+  */
+@property(nonatomic,assign) bool selection;
+
+/** 
+    Set the globe (not the UIView's) background color.
+    
+    This property sets the clear color used by OpenGL.  By default it's black.
+  */
+@property (nonatomic,strong) UIColor * __nullable clearColor;
+
+/** 
+    Set the frame interval passed to the CADisplayLink.
+    
+    This sets the frame rate the renderer will attempt to achieve.
+ 
+ |value|frames per second|
+ |:----|:----------------|
+ |1|60fps|
+ |2|30fps|
+ |3|20fps|
+ |4|15fps|
+ |5|12fps|
+ |6|Really?  No, you can do better.|
+  */
+@property (nonatomic,assign) int frameInterval;
+
+///** 
+//    The elevation delegate that will provide elevation data per tile.
+//    
+//    We break the image tiles out from the elevation tiles.  The data is often coming from different sources, but in the end this is a probably a hack.  It's a hack that's going to be in place for a while.
+//    
+//    To provide elevation for your compatible MaplyTileSource objects, you fill out the MaplyElevationSourceDelegate protocol and assign the resulting object here.  When an image layer needs elevation, it will check for the delegate and then query for the respective file.
+//    
+//    At present there is no checking for coordinate system compatibility, so be aware.
+//  */
+//@property (nonatomic,weak) NSObject<MaplyElevationSourceDelegate> *__nullable elevDelegate;
+
+/** 
+    Set the offset for the screen space objects.
+    
+    In general you want the screen space objects to appear on top of everything else.  There used to be structural reasons for this, but now you can mix and match where everything appears.  This controls the offset that's used to push screen space objects behind everything else in the list (and thus, on top).
+    
+    If you set this to 0, you can control the ordering of everything more precisely.
+ */
+@property (nonatomic,assign) int screenObjectDrawPriorityOffset;
+
+/**
+    Controls whether objects with unique IDs fade in and out when added or removed from the layout manager
+ */
+@property (nonatomic,assign) bool layoutFade;
+
+/**
+    Controls the way height changes while animating the view
+    For simple, linear zoom use:
+
+        zoomEasing = ^(double z0,double z1,double t) { return z0 + (z1 - z0) * t; };
+ */
+@property (readwrite,copy) ZoomEasingBlock _Nullable animationZoomEasing;
+
+
+/**
+    If in Metal rendering mode, return the Metal device being used.
+  */
+- (id<MTLDevice> __nullable)getMetalDevice;
+
+/**
+   If in Metal rendering mode, return the shader library set up by the toolkit.
+  */
+- (id<MTLLibrary> __nullable)getMetalLibrary;
+
+/** 
+    Clear all the currently active lights.
+    
+    There are a default set of lights, so you'll want to do this before adding your own.
+  */
+- (void)clearLights;
+
+/** 
+    Reset the lighting back to its default state at startup.
+    
+    This clears out all the lights and adds in the default starting light source.
+ */
+- (void)resetLights;
+
+/** 
+    Add the given light to the list of active lights.
+    
+    This method will add the given light to our active lights.  Most shaders will recognize these lights and do the calculations.  If you have a custom shader in place, it may or may not use these.
+    
+    Triangle shaders use the lights, but line shaders do not.
+  */
+- (void)addLight:(MaplyLight *__nonnull)light;
+
+/// Remove the given light (assuming it's active) from the list of lights.
+- (void)removeLight:(MaplyLight *__nonnull)light;
+
+/** 
+    Set the rendering hints to control how the renderer is configured.
+    
+    This is a bit vestigial, but still has a few important uses.  The hints should be set right after the init call.  Any later and they'll probably be ignored.
+    
+    The rendering hints are as follows.
+ 
+ |Key|Type|Description|
+ |:--|:---|:----------|
+ |kMaplyRenderHintZBuffer|bool|If set, we'll explicitly turn on the Z buffer.  Normally it's off until a drawable requests it, allowing us to play neat tricks with overlays.  The only time you should be turning this on is if you're doing 3D elevation.  The default is off.|
+ |kMaplyRenderHintCulling|bool|If set, we'll use the internal culling logic.  Texture and drawable atlases have largely made this pointless.  Leave it off unless you have a compelling reason to turn it on.|
+ |kMaplyRendererLightingMode|NSString|This can be set to @"none", in which case we use optimized shaders that do no lighting or "regular".  The latter is the default.|
+  */
+- (void)setHints:(NSDictionary *__nonnull)hintsDict;
+
+/// This calls addScreenMarkers:desc:mode: with mode set to MaplyThreadAny
+- (MaplyComponentObject *__nullable)addScreenMarkers:(NSArray *__nonnull)markers desc:(NSDictionary *__nullable)desc;
+
+/** 
+    Add one or more screen markers to the current scene.
+    
+    This method will add the given MaplyScreenMaker objects to the current scene.  It will use the parameters in the description dictionary and it will do it on the thread specified.
+    
+    @param markers An NSArray of MaplyScreenMarker objects.
+    
+    @param desc The desciption dictionary which controls how the markers will be constructed.  It takes the following entries.
+ 
+ |Key|Type|Description|
+ |:--|:---|:----------|
+ |kMaplyColor|UIColor|The color we'll use for the rectangle that makes up a marker. White by default.|
+ |kMaplyMinVis|NSNumber|This is viewer height above the globe or map.  The marker will only be visible if the user is above this height.  Off by default.|
+ |kMaplyMaxVis|NSNumber|This is viewer height above the globe or map.  The marker will only be visible if the user is below this height.  Off by default.|
+ |kMaplyMinViewerDist|NSNumber|Minimum distance from the viewer at which to display object(s).|
+ |kMaplyMaxViewerDist|NSNumber|Maximum distance from the viewer at which to display object(s).|
+ |kMaplyViewableCenterX|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center X coordinate.|
+ |kMaplyViewableCenterY|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center Y coordinate.|
+ |kMaplyViewableCenterZ|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center Z coordinate.|
+ |kMaplyDrawPriority|NSNumber|If set, the markers are sorted by this number.  Larger numbers will be sorted later.|
+ |kMaplyFade|NSNumber|The number of seconds to fade a marker in when it appears and out when it disappears.|
+ |kMaplyFadeIn|NSNumber|The number of seconds to fade a marker in when it appears.  This overrides kMaplyFade.|
+ |kMaplyFadeOut|NSNumber|The number of seconds to fade a marker out when it disappears.  This override kMaplyFade.|
+ |kMaplyFadeOutTime|NSNumber|If you want to create an object, just to have it fade out at a specific time, this is what you set.|
+ |kMaplyShader|NSString|If set, this is the name of the MaplyShader to use when rendering the screen markers.|
+ |kMaplyEnable|NSNumber boolean|On by default, but if off then the feature exists, but is not turned on.  It can be enabled with enableObjects:|
+ |kMaplyEnableStart|NSNumber|If set, this controls when the resulting objects will be activated.|
+ |kMaplyEnableEnd|NSNumber|If set, this controls when the resulting objects will be deactivated.|
+ |kMaplyUUID|NSString|Unique ID to match up alternate representations of the same element.|
+ |kMaplyRepresentation|NSString|Name of the representation presented by this object.|
+ |kMaplyClusterGroup|NSNumber|If set, the screen markers will be clustered together according to the given group ID.  Off by default, but 0 is the default cluster.|
+
+    
+    @param threadMode MaplyThreadAny is preferred and will use another thread, thus not blocking the one you're on.  MaplyThreadCurrent will make the changes immediately, blocking this thread.
+ 
+    
+    @return Returns a MaplyComponentObject, which can be used to make modifications or delete the objects created.
+  */
+- (MaplyComponentObject *__nullable)addScreenMarkers:(NSArray *__nonnull)markers desc:(NSDictionary *__nullable)desc mode:(MaplyThreadMode)threadMode;
+
+/** 
+    Add a cluster generator for making clustered marker images on demand.
+    
+    When the layout system clusters a bunch of markers or labels together, it needs new images to represent the cluster.
+    
+    You can provide a custom image for each group of markers by filling in one of these generates and passing it in.
+  */
+- (void)addClusterGenerator:(NSObject <MaplyClusterGenerator> *__nonnull)clusterGen;
+
+/// This calls addMarkers:desc:mode: with mode set to MaplyThreadAny
+- (MaplyComponentObject *__nullable)addMarkers:(NSArray *__nonnull)markers desc:(NSDictionary *__nullable)desc;
+
+/** 
+    Add one or more 3D markers to the current scene.
+    
+    This method will add the given MaplyMarker objects to the current scene.  It will use the parameters in the description dictionary and it will do it on the thread specified.
+    
+    @param markers An NSArray of MaplyMarker objects.
+    
+    @param desc The desciption dictionary which controls how the markers will be constructed.  It takes the following entries.
+ 
+ |Key|Type|Description|
+ |:--|:---|:----------|
+ |kMaplyColor|UIColor|The color we'll use for the rectangle that makes up a marker. White by default.|
+ |kMaplyMinVis|NSNumber|This is viewer height above the globe or map.  The marker will only be visible if the user is above this height.  Off by default.|
+ |kMaplyMaxVis|NSNumber|This is viewer height above the globe or map.  The marker will only be visible if the user is below this height.  Off by default.|
+ |kMaplyMinViewerDist|NSNumber|Minimum distance from the viewer at which to display object(s).|
+ |kMaplyMaxViewerDist|NSNumber|Maximum distance from the viewer at which to display object(s).|
+ |kMaplyViewableCenterX|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center X coordinate.|
+ |kMaplyViewableCenterY|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center Y coordinate.|
+ |kMaplyViewableCenterZ|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center Z coordinate.|
+ |kMaplyFade|NSNumber|The number of seconds to fade a marker in when it appears and out when it disappears.|
+ |kMaplyFadeIn|NSNumber|The number of seconds to fade a marker in when it appears.  This overrides kMaplyFade.|
+ |kMaplyFadeOut|NSNumber|The number of seconds to fade a marker out when it disappears.  This override kMaplyFade.|
+ |kMaplyFadeOutTime|NSNumber|If you want to create an object, just to have it fade out at a specific time, this is what you set.|
+ |kMaplyDrawPriority|NSNumber|Geometry is sorted by this value before being drawn.  This ensures that some objects can come out on top of others.  By default this is kMaplyMarkerDrawPriorityDefault.|
+ |kMaplyZBufferRead|NSNumber boolean|If set this geometry will respect the z buffer.  It's off by default, meaning that the geometry will draw on top of anything (respecting the kMaplyDrawPriority).|
+ |kMaplyZBufferWrite|NSNumber boolean|If set this geometry will write to the z buffer.  That means following geometry that reads the z buffer will be occluded.  This is off by default.|
+ |kMaplyEnable|NSNumber boolean|On by default, but if off then the feature exists, but is not turned on.  It can be enabled with enableObjects:|
+ |kMaplyUUID|NSString|Unique ID to match up alternate representations of the same element.|
+ |kMaplyRepresentation|NSString|Name of the representation presented by this object.|
+
+ 
+    @param threadMode MaplyThreadAny is preferred and will use another thread, thus not blocking the one you're on.  MaplyThreadCurrent will make the changes immediately, blocking this thread.
+ 
+ 
+    @return Returns a MaplyComponentObject, which can be used to make modifications or delete the objects created.
+ */
+- (MaplyComponentObject *__nullable)addMarkers:(NSArray *__nonnull)markers desc:(NSDictionary *__nullable)desc mode:(MaplyThreadMode)threadMode;
+
+/// This calls addScreenLabels:desc:mode: with mode set to MaplyThreadAny
+- (MaplyComponentObject *__nullable)addScreenLabels:(NSArray *__nonnull)labels desc:(NSDictionary *__nullable)desc;
+
+/** 
+    Add one or more screen labels to the current scene.
+    
+    This method will add the given MaplyScreenLabel objects to the current scene.  It will use the parameters in the description dictionary and it will do it on the thread specified.
+    
+    @param labels An NSArray of MaplyScreenLabel objects.
+    
+    @param desc The desciption dictionary which controls how the labels will be constructed.  It takes the following entries.
+ 
+ |Key|Type|Description|
+ |:--|:---|:----------|
+ |kMaplyTextColor|UIColor|Color we'll use for the text. Black by default.|
+ |kMaplyBackgroundColor|UIColor|Color we'll use for the rectangle background.  Use clearColor to make this invisible.|
+ |kMaplyFont|UIFont|The font we'll use for the text.|
+ |kMaplyLabelHeight|NSNumber|Height of the text in points.|
+ |kMaplyLabelWidth|NSNumber|Width of the text in points.  It's best to set Height and leave this out.  That way the width will be calculated by the toolkit.|
+ |kMaplyJustify|NSString|This can be set to @"middle", @"left", or @"right" to justify the text around the location.|
+ |kMaplyTextJustify|NSString|This can be kMaplyTextJustifyRight, kMaplyTextJustifyCenter, or kMaplyTextJustifyLeft|
+ |kMaplyShadowSize|NSNumber|If set, we'll draw a shadow with the kMaplyShadowColor offset by this amount.  We recommend using an outline instead.|
+ |kMaplyShadowColor|UIColor|If we're drawing a shadow, this is its color.|
+ |kMaplyTextOutlineSize|NSNumber|If set, we'll draw an outline around the text (really draw it twice).  The outline will be this large.|
+ |kMaplyTextOutlineColor|UIColor|If we're drawing an outline, it's in this color.|
+ |kMaplyMinVis|NSNumber|This is viewer height above the globe or map.  The label will only be visible if the user is above this height.  Off by default.|
+ |kMaplyMaxVis|NSNumber|This is viewer height above the globe or map.  The label will only be visible if the user is below this height.  Off by default.|
+ |kMaplyMinViewerDist|NSNumber|Minimum distance from the viewer at which to display object(s).|
+ |kMaplyMaxViewerDist|NSNumber|Maximum distance from the viewer at which to display object(s).|
+ |kMaplyViewableCenterX|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center X coordinate.|
+ |kMaplyViewableCenterY|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center Y coordinate.|
+ |kMaplyViewableCenterZ|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center Z coordinate.|
+ |kMaplyDrawPriority|NSNumber|If set, the labels are sorted by this number.  Larger numbers will be sorted later.|
+ |kMaplyFade|NSNumber|The number of seconds to fade a screen label in when it appears and out when it disappears.|
+ |kMaplyEnable|NSNumber boolean|On by default, but if off then the feature exists, but is not turned on.  It can be enabled with enableObjects:|
+ |kMaplyEnableStart|NSNumber|If set, this controls when the resulting objects will be activated.|
+ |kMaplyEnableEnd|NSNumber|If set, this controls when the resulting objects will be deactivated.|
+ |kMaplyUUID|NSString|Unique ID to match up alternate representations of the same element.|
+ |kMaplyRepresentation|NSString|Name of the representation presented by this object.|
+
+    
+    @param threadMode MaplyThreadAny is preferred and will use another thread, thus not blocking the one you're on.  MaplyThreadCurrent will make the changes immediately, blocking this thread.
+ 
+    
+    @return Returns a MaplyComponentObject, which can be used to make modifications or delete the objects created.
+ */
+- (MaplyComponentObject *__nullable)addScreenLabels:(NSArray *__nonnull)labels desc:(NSDictionary *__nullable)desc mode:(MaplyThreadMode)threadMode;
+
+/// This calls addLabels:desc:mode: with mode set to MaplyThreadAny
+- (MaplyComponentObject *__nullable)addLabels:(NSArray *__nonnull)labels desc:(NSDictionary *__nullable)desc;
+
+/** 
+    Add one or more 3D labels to the current scene.
+    
+    This method will add the given MaplyLabel objects to the current scene.  It will use the parameters in the description dictionary and it will do it on the thread specified.
+    
+    @param labels An NSArray of MaplyLabel objects.
+    
+    @param desc The desciption dictionary which controls how the labels will be constructed.  It takes the following entries.
+ 
+ |Key|Type|Description|
+ |:--|:---|:----------|
+ |kMaplyTextColor|UIColor|Color we'll use for the text. Black by default.|
+ |kMaplyBackgroundColor|UIColor|Color we'll use for the rectangle background.  Use clearColor to make this invisible.|
+ |kMaplyFont|UIFont|The font we'll use for the text.|
+ |kMaplyLabelHeight|NSNumber|Height of the text in display coordinates.  For the globe these are based on radius = 1.0.|
+ |kMaplyLabelWidth|NSNumber|Width of the text in display coordinates.  It's best to set Height and leave this out.  That way the width will be calculated by the toolkit.|
+ |kMaplyJustify|NSString|This can be set to @"middle", @"left", or @"right" to justify the text around the location.|
+ |kMaplyShadowSize|NSNumber|If set, we'll draw a shadow with the kMaplyShadowColor offset by this amount.  We recommend using an outline instead.|
+ |kMaplyShadowColor|UIColor|If we're drawing a shadow, this is its color.|
+ |kMaplyMinVis|NSNumber|This is viewer height above the globe or map.  The label will only be visible if the user is above this height.  Off by default.|
+ |kMaplyMaxVis|NSNumber|This is viewer height above the globe or map.  The label will only be visible if the user is below this height.  Off by default.|
+ |kMaplyMinViewerDist|NSNumber|Minimum distance from the viewer at which to display object(s).|
+ |kMaplyMaxViewerDist|NSNumber|Maximum distance from the viewer at which to display object(s).|
+ |kMaplyViewableCenterX|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center X coordinate.|
+ |kMaplyViewableCenterY|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center Y coordinate.|
+ |kMaplyViewableCenterZ|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center Z coordinate.|
+ |kMaplyFade|NSNumber|The number of seconds to fade a label in when it appears and out when it disappears.|
+ |kMaplyDrawPriority|NSNumber|Geometry is sorted by this value before being drawn.  This ensures that some objects can come out on top of others.  By default this is kMaplyLabelDrawPriorityDefault.|
+ |kMaplyZBufferRead|NSNumber boolean|If set this geometry will respect the z buffer.  It's off by default, meaning that the geometry will draw on top of anything (respecting the kMaplyDrawPriority).|
+ |kMaplyZBufferWrite|NSNumber boolean|If set this geometry will write to the z buffer.  That means following geometry that reads the z buffer will be occluded.  This is off by default.|
+ |kMaplyEnable|NSNumber boolean|On by default, but if off then the feature exists, but is not turned on.  It can be enabled with enableObjects:|
+ |kMaplyUUID|NSString|Unique ID to match up alternate representations of the same element.|
+ |kMaplyRepresentation|NSString|Name of the representation presented by this object.|
+
+    @param threadMode MaplyThreadAny is preferred and will use another thread, thus not blocking the one you're on.  MaplyThreadCurrent will make the changes immediately, blocking this thread.
+ 
+ 
+    @return Returns a MaplyComponentObject, which can be used to make modifications or delete the objects created.
+ */
+- (MaplyComponentObject *__nullable)addLabels:(NSArray *__nonnull)labels desc:(NSDictionary *__nullable)desc mode:(MaplyThreadMode)threadMode;
+
+/// This calls addVectors:desc:mode: with mode set to MaplyThreadAny
+- (MaplyComponentObject *__nullable)addVectors:(NSArray *__nonnull)vectors desc:(NSDictionary *__nullable)desc;
+
+/** 
+    Add one or more vectors to the current scene.
+   
+    This method will add the given MaplyVectorObject objects to the current scene.  It will use the parameters in the description dictionary and it will do it on the thread specified.
+   
+    @param vectors An NSArray of MaplyVectorObject objects.
+   
+    @param desc The desciption dictionary which controls how the vectors will look.  It takes the following entries.
+ 
+ |Key|Type|Description|
+ |:--|:---|:----------|
+ |kMaplyColor|UIColor|Color we'll use for the vector features.|
+ |kMaplyVecWidth|NSNumber|If the geometry is not filled, this is the width of the GL lines.|
+ |kMaplyFilled|NSNumber boolean|If set, the areal geometry will be tesselated, taking holes into account.  The resulting triangles will be displayed instead of the vectors.|
+ |kMaplySubdivType|NSString|When present, this requests that the geometry be broken up to follow the globe (really only makes sense there).  It can be set to kMaplySubdivGreatCircle or kMaplySubdivSimple which do a great circle subdivision and a simple 3-space subdivision respectively.  If the key is missing, we do no subdivision at all.|
+ |kMaplySubdivEpsilon|NSNumber|If there's a kMaplySubdivType set this is the epsilon we'll pass into the subdivision routine.  The value is in display coordinates. 0.01 is a reasonable value.  Smaller results in more subdivision.|
+ |kMaplyVecTexture|UIImage|If set and the kMaplyFilled attribute is set, we will apply the given texture across any areal features.  How the texture is applied can be controlled by kMaplyVecTexScaleX, kMaplyVecTexScaleY, kMaplyVecCenterX, kMaplyVecCenterY, and kMaplyVecTextureProjection|
+ |kMaplyVecTexScaleX,kMaplyVecTexScaleY|NSNumber|These control the scale of the texture application.  We'll multiply by these numbers before generating texture coordinates from the vertices.|
+ |kMaplyVecCenterX,kMaplyVecCenterY|NSNumber|These control the center of a texture application.  If not set we'll use the areal's centroid.  If set, we'll use these instead.  They should be in local coordinates (probably geographic radians).|
+ |kMaplyVecTextureProjection|NSString|This controls how a texture is projected onto an areal feature.  By default we just use the geographic coordinates and stretch them out.  This looks odd for very large features.  If you set this to kMaplyProjectionTangentPlane then we'll take the center of the feature, make a tangent plane and then project the coordinates onto that tangent plane to get texture coordinates.  This looks nice at the poles.  If set to kMaplyProjectionScreen the texture is mapped on after screen space projection around the center of the feature.|
+ |kMaplyMinVis|NSNumber|This is viewer height above the globe or map.  The vectors will only be visible if the user is above this height.  Off by default.|
+ |kMaplyMaxVis|NSNumber|This is viewer height above the globe or map.  The vectors will only be visible if the user is below this height.  Off by default.|
+ |kMaplyMinViewerDist|NSNumber|Minimum distance from the viewer at which to display object(s).|
+ |kMaplyMaxViewerDist|NSNumber|Maximum distance from the viewer at which to display object(s).|
+ |kMaplyViewableCenterX|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center X coordinate.|
+ |kMaplyViewableCenterY|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center Y coordinate.|
+ |kMaplyViewableCenterZ|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center Z coordinate.|
+ |kMaplyFade|NSNumber|The number of seconds to fade a vector in when it appears and out when it disappears.|
+ |kMaplyDrawPriority|NSNumber|Geometry is sorted by this value before being drawn.  This ensures that some objects can come out on top of others.  By default this is kMaplyVectorDrawPriorityDefault.|
+ |kMaplyZBufferRead|NSNumber boolean|If set this geometry will respect the z buffer.  It's off by default, meaning that the geometry will draw on top of anything (respecting the kMaplyDrawPriority).|
+ |kMaplyZBufferWrite|NSNumber boolean|If set this geometry will write to the z buffer.  That means following geometry that reads the z buffer will be occluded.  This is off by default.|
+ |kMaplyEnable|NSNumber boolean|On by default, but if off then the feature exists, but is not turned on.  It can be enabled with enableObjects:|
+ |kMaplySelectable|NSNumber boolean|Off by default.  When enabled, the vector feature will be selectable by a user.|
+ |kMaplyUUID|NSString|Unique ID to match up alternate representations of the same element.|
+ |kMaplyRepresentation|NSString|Name of the representation presented by this object.|
+
+    @param threadMode MaplyThreadAny is preferred and will use another thread, thus not blocking the one you're on.  MaplyThreadCurrent will make the changes immediately, blocking this thread.
+ 
+ 
+    @return Returns a MaplyComponentObject, which can be used to make modifications or delete the objects created.
+ */
+- (MaplyComponentObject *__nullable)addVectors:(NSArray *__nonnull)vectors desc:(NSDictionary *__nullable)desc mode:(MaplyThreadMode)threadMode;
+
+/** 
+    Make a copy of the base object and apply the attributes given for the new version.
+ 
+    This call makes a cheap copy of the vectors in the given MaplyComponentObject and applies the given description to them.  You can use this to make a wider or thinner version of a set of vectors, or change their color, while continuing to draw the originals.  Or not, as the case may be.
+ 
+    This is useful for vector maps where we tend to reuse the same geometry at multiple levels and with different colors and line widths.
+ 
+    Instancing only works with a handful of visual changes.  For instance, you can't make a filled and non-filled version.
+ 
+    @param baseObj The MaplyComponentObject returned by an addVectors: call.  This only works for vectors.
+ 
+    @param desc The description dictionary with controls how vectors will be displayed.  It takes the following entries.
+
+ |Key|Type|Description|
+ |:--|:---|:----------|
+ |kMaplyColor|UIColor|Color we'll use for the vector features.|
+ |kMaplyVecWidth|NSNumber|If the geometry is not filled, this is the width of the GL lines.|
+ |kMaplyMinVis|NSNumber|This is viewer height above the globe or map.  The vectors will only be visible if the user is above this height.  Off by default.|
+ |kMaplyMaxVis|NSNumber|This is viewer height above the globe or map.  The vectors will only be visible if the user is below this height.  Off by default.|
+ |kMaplyMinViewerDist|NSNumber|Minimum distance from the viewer at which to display object(s).|
+ |kMaplyMaxViewerDist|NSNumber|Maximum distance from the viewer at which to display object(s).|
+ |kMaplyViewableCenterX|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center X coordinate.|
+ |kMaplyViewableCenterY|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center Y coordinate.|
+ |kMaplyViewableCenterZ|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center Z coordinate.|
+ |kMaplyDrawPriority|NSNumber|Geometry is sorted by this value before being drawn.  This ensures that some objects can come out on top of others.  By default this is kMaplyVectorDrawPriorityDefault.|
+ |kMaplyEnable|NSNumber boolean|On by default, but if off then the feature exists, but is not turned on.  It can be enabled with enableObjects:|
+ |kMaplyUUID|NSString|Unique ID to match up alternate representations of the same element.|
+ |kMaplyRepresentation|NSString|Name of the representation presented by this object.|
+
+    @param threadMode MaplyThreadAny is preferred and will use another thread, thus not blocking the one you're on.  MaplyThreadCurrent will make the changes immediately, blocking this thread.
+ 
+ 
+    @return Returns a MaplyComponentObject, which can be used to make modifications or delete the objects created.
+ */
+- (MaplyComponentObject *__nullable)instanceVectors:(MaplyComponentObject *__nonnull)baseObj desc:(NSDictionary *__nullable)desc mode:(MaplyThreadMode)threadMode;
+
+/** 
+    Add one or more widened vectors to the current scene.
+    
+    Build widened vectors
+
+ 
+    @param desc The description dictionary which controls how vectors will be displayed.  It takes the following entries.
+
+ |Key|Type|Description|
+ |:--|:---|:----------|
+ |kMaplyColor|UIColor|Color we'll use for the features.|
+ |kMaplyVecWidth|NSNumber|If the geometry is not filled, this is the width of the lines.|
+ |kMaplyWideVecCoordType|NSNumber|Vectors can be widened in real coordinates (kMaplyWideVecCoordTypeReal) or screen coordinates (kMaplyWideVecCoordTypeScreen).  In the latter case they stay the same size now matter how you zoom.|
+ |kMaplyWideVecJoinType|NSNumber|When lines meet in a join there are several options for representing them.  These include kMaplyWideVecMiterJoin, which is a simple miter join and kMaplyWideVecBevelJoin which is a more complicated bevel.  See http://www.w3.org/TR/SVG/painting.html#StrokeLinejoinProperty for how these look.|
+ |kMaplyWideVecMiterLimit|NSNumber|When using miter joins you can trigger them at a certain threshold.|
+ |kMaplyWideVecTexRepeatLen|NSNumber|This is the repeat size for a texture applied along the widened line.  For kMaplyWideVecCoordTypeScreen this is pixels.|
+ |kMaplyVecTexture|UIImage or MaplyTexture|This the texture to be applied to the widened vector.|
+ |kMaplyMinVis|NSNumber|This is viewer height above the globe or map.  The vectors will only be visible if the user is above this height.  Off by default.|
+ |kMaplyMaxVis|NSNumber|This is viewer height above the globe or map.  The vectors will only be visible if the user is below this height.  Off by default.|
+ |kMaplyMinViewerDist|NSNumber|Minimum distance from the viewer at which to display object(s).|
+ |kMaplyMaxViewerDist|NSNumber|Maximum distance from the viewer at which to display object(s).|
+ |kMaplyViewableCenterX|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center X coordinate.|
+ |kMaplyViewableCenterY|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center Y coordinate.|
+ |kMaplyViewableCenterZ|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center Z coordinate.|
+ |kMaplyDrawPriority|NSNumber|Geometry is sorted by this value before being drawn.  This ensures that some objects can come out on top of others.  By default this is kMaplyVectorDrawPriorityDefault.|
+ |kMaplyEnable|NSNumber boolean|On by default, but if off then the feature exists, but is not turned on.  It can be enabled with enableObjects:|
+ |kMaplyUUID|NSString|Unique ID to match up alternate representations of the same element.|
+ |kMaplyRepresentation|NSString|Name of the representation presented by this object.|
+
+    @param threadMode MaplyThreadAny is preferred and will use another thread, thus not blocking the one you're on.  MaplyThreadCurrent will make the changes immediately, blocking this thread.
+ 
+ 
+    @return Returns a MaplyComponentObject, which can be used to make modifications or delete the objects created.
+ */
+- (MaplyComponentObject *__nullable)addWideVectors:(NSArray *__nonnull)vectors desc:(NSDictionary *__nullable)desc mode:(MaplyThreadMode)threadMode;
+
+/// This calls addWideVectors:desc:mode: with mode set to MaplyThreadAny
+- (MaplyComponentObject *__nullable)addWideVectors:(NSArray *__nonnull)vectors desc:(NSDictionary *__nullable)desc;
+
+
+/// This calls addShapes:desc:mode: with mode set to MaplyThreadAny
+- (MaplyComponentObject *__nullable)addShapes:(NSArray *__nonnull)shapes desc:(NSDictionary *__nullable)desc;
+
+/** 
+    Add one or more model instances.
+    
+    Each MaplyGeomInstance points to a MaplyGeomModel.  All those passed in here will be grouped and processed together.
+ 
+ 
+    @param desc The description dictionary which controls how the models are displayed, selected, and so forth.
+ 
+ |Key|Type|Description|
+ |:--|:---|:----------|
+ |kMaplySelectable|NSNumber boolean|Off by default.  When enabled, the vector feature will be selectable by a user.|
+ |kMaplyEnable|NSNumber boolean|On by default, but if off then the feature exists, but is not turned on.  It can be enabled with enableObjects:|
+ |kMaplyUUID|NSString|Unique ID to match up alternate representations of the same element.|
+ |kMaplyRepresentation|NSString|Name of the representation presented by this object.|
+
+    @param threadMode MaplyThreadAny is preferred and will use another thread, thus not blocking the one you're on.  MaplyThreadCurrent will make the changes immediately, blocking this thread.
+ 
+ 
+    @return Returns a MaplyComponentObject, which can be used to make modifications or delete the objects created.
+  */
+- (MaplyComponentObject *__nullable)addModelInstances:(NSArray *__nonnull)modelInstances desc:(NSDictionary *__nullable)desc mode:(MaplyThreadMode)threadMode;
+
+/** 
+    Add one or raw geometry models.
+    
+    Each MaplyGeometryModel holds points and triangles in display space.  These are relatively "raw" geometry and are passed to the geometry manager as is.
+ 
+ 
+    @param desc The description dictionary which controls how the geometry is displayed, selected, and so forth.
+ 
+ |Key|Type|Description|
+ |:--|:---|:----------|
+ |kMaplySelectable|NSNumber boolean|Off by default.  When enabled, the vector feature will be selectable by a user.|
+ |kMaplyEnable|NSNumber boolean|On by default, but if off then the feature exists, but is not turned on.  It can be enabled with enableObjects:|
+ |kMaplyUUID|NSString|Unique ID to match up alternate representations of the same element.|
+ |kMaplyRepresentation|NSString|Name of the representation presented by this object.|
+
+    @param threadMode MaplyThreadAny is preferred and will use another thread, thus not blocking the one you're on.  MaplyThreadCurrent will make the changes immediately, blocking this thread.
+ 
+ 
+    @return Returns a MaplyComponentObject, which can be used to make modifications or delete the objects created.
+ */
+- (MaplyComponentObject *__nullable)addGeometry:(NSArray *__nonnull)geom desc:(NSDictionary *__nullable)desc mode:(MaplyThreadMode)threadMode;
+
+/** 
+    Add one or more MaplyShape children to the current scene.
+    
+    This method will add the given MaplyShape derived objects to the current scene.  It will use the parameters in the description dictionary and it will do it on the thread specified.
+    
+    @param shapes An NSArray of MaplyShape derived objects.
+    
+    @param desc The desciption dictionary which controls how the shapes will look.  It takes the following entries.
+ 
+ |Key|Type|Description|
+ |:--|:---|:----------|
+ |kMaplyColor|UIColor|Color we'll use for the shape features.|
+ |kMaplyShapeSampleX|NSNumber|Number of samples to use in one direction when converting to polygons.|
+ |kMaplyShapeSampleY|NSNumber|Number of samples to use in the other direction when converting to polygons.|
+ |kMaplyShapeInsideOut|NSNumber boolean|If set to YES, we'll make the spheres inside out and such.  Set to NO by default.|
+ |kMaplyMinVis|NSNumber|This is viewer height above the globe or map.  The shapes will only be visible if the user is above this height.  Off by default.|
+ |kMaplyMaxVis|NSNumber|This is viewer height above the globe or map.  The shapes will only be visible if the user is below this height.  Off by default.|
+ |kMaplyMinViewerDist|NSNumber|Minimum distance from the viewer at which to display object(s).|
+ |kMaplyMaxViewerDist|NSNumber|Maximum distance from the viewer at which to display object(s).|
+ |kMaplyViewableCenterX|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center X coordinate.|
+ |kMaplyViewableCenterY|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center Y coordinate.|
+ |kMaplyViewableCenterZ|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center Z coordinate.|
+ |kMaplyFade|NSNumber|The number of seconds to fade a shape in when it appears and out when it disappears.|
+ |kMaplyDrawPriority|NSNumber|Geometry is sorted by this value before being drawn.  This ensures that some objects can come out on top of others.  By default this is kMaplyVectorShapePriorityDefault.|
+ |kMaplyZBufferRead|NSNumber boolean|If set this geometry will respect the z buffer.  It's on by default, meaning that the geometry can be occluded by things drawn first.|
+ |kMaplyZBufferWrite|NSNumber boolean|If set this geometry will write to the z buffer.  That means following geometry that reads the z buffer will be occluded.  This is off by default.|
+ |kMaplyEnable|NSNumber boolean|On by default, but if off then the feature exists, but is not turned on.  It can be enabled with enableObjects:|
+ |kMaplyUUID|NSString|Unique ID to match up alternate representations of the same element.|
+ |kMaplyRepresentation|NSString|Name of the representation presented by this object.|
+
+    @param threadMode MaplyThreadAny is preferred and will use another thread, thus not blocking the one you're on.  MaplyThreadCurrent will make the changes immediately, blocking this thread.
+ 
+ 
+    @return Returns a MaplyComponentObject, which can be used to make modifications or delete the objects created.
+ */
+- (MaplyComponentObject *__nullable)addShapes:(NSArray *__nonnull)shapes desc:(NSDictionary *__nullable)desc mode:(MaplyThreadMode)threadMode;
+
+/// This calls addStickers:desc:mode: with mode set to MaplyThreadAny
+- (MaplyComponentObject *__nullable)addStickers:(NSArray *__nonnull)stickers desc:(NSDictionary *__nullable)desc;
+
+/** 
+    Add one or more MaplySticker objects to the current scene.
+    
+    This method will add the given MaplySticker objects to the current scene.  It will use the parameters in the description dictionary and it will do it on the thread specified.
+    
+    @param stickers An NSArray of MaplySticker derived objects.
+    
+    @param desc The desciption dictionary which controls how the stickers will look.  It takes the following entries.
+ 
+ |Key|Type|Description|
+ |:--|:---|:----------|
+ |kMaplyColor|UIColor|Color we'll use for the stickers.|
+ |kMaplyMinVis|NSNumber|This is viewer height above the globe or map.  The stickers will only be visible if the user is above this height.  Off by default.|
+ |kMaplyMaxVis|NSNumber|This is viewer height above the globe or map.  The stickers will only be visible if the user is below this height.  Off by default.|
+ |kMaplyMinViewerDist|NSNumber|Minimum distance from the viewer at which to display object(s).|
+ |kMaplyMaxViewerDist|NSNumber|Maximum distance from the viewer at which to display object(s).|
+ |kMaplyViewableCenterX|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center X coordinate.|
+ |kMaplyViewableCenterY|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center Y coordinate.|
+ |kMaplyViewableCenterZ|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center Z coordinate.|
+ |kMaplyFade|NSNumber|The number of seconds to fade a sticker in when it appears and out when it disappears.|
+ |kMaplySampleX|NSNumber|Stickers are broken up along two dimensions to adhere to the globe.  By default this is done adaptively.  If you want to override it, this is the X dimension for the sticker.|
+ |kMaplySampleY|NSNumber|If you want to override it, this is the Y dimension for the sticker.|
+ |kMaplyDrawPriority|NSNumber|Geometry is sorted by this value before being drawn.  This ensures that some objects can come out on top of others.  By default this is kMaplyVectorShapePriorityDefault.|
+ |kMaplyZBufferRead|NSNumber boolean|If set this geometry will respect the z buffer.  It's off by default, meaning that it will draw on top of things before it..|
+ |kMaplyZBufferWrite|NSNumber boolean|If set this geometry will write to the z buffer.  That means following geometry that reads the z buffer will be occluded.  This is off by default.|
+ |kMaplyEnable|NSNumber boolean|On by default, but if off then the feature exists, but is not turned on.  It can be enabled with enableObjects:|
+ |kMaplyShader|NSString|If set, this is the name of the MaplyShader to use when rendering the sticker(s).|
+ |kMaplyUUID|NSString|Unique ID to match up alternate representations of the same element.|
+ |kMaplyRepresentation|NSString|Name of the representation presented by this object.|
+
+    @param threadMode MaplyThreadAny is preferred and will use another thread, thus not blocking the one you're on.  MaplyThreadCurrent will make the changes immediately, blocking this thread.
+ 
+ 
+    @return Returns a MaplyComponentObject, which can be used to make modifications or delete the objects created.
+ */
+- (MaplyComponentObject *__nullable)addStickers:(NSArray *__nonnull)stickers desc:(NSDictionary *__nullable)desc mode:(MaplyThreadMode)threadMode;
+
+/** 
+    Modify an existing sticker.  This only supports changing the active textures.
+    
+    This method will change attributes of a sticker that's currently in use.  At present that's just the images it's displaying.  
+    
+    @param compObj The component object representing one or more existing stickers.
+    
+    @param desc The description dictionary for changes we're making to the sticker.
+ 
+ |Key|Type|Description|
+ |:--|:---|:----------|
+ |kMaplyStickerImages|NSARray|The array of images to apply to the sticker.  You can reuse old ones or introduce new ones.|
+  */
+- (void)changeSticker:(MaplyComponentObject *__nonnull)compObj desc:(NSDictionary *__nullable)desc mode:(MaplyThreadMode)threadMode;
+
+/** 
+    Add one or more MaplyBillboard objects to the current scene.
+    
+    This method will add the given MaplyBillboard objects to the current scene.  It will use the parameters in the description dictionary and it will do it on the thread specified.
+    
+    @param billboards An NSArray of MaplyBillboard objects.
+    
+    @param desc The description dictionary that controls how the billboards will look.  It takes the following entries.
+ 
+ |Key|Type|Description|
+ |:--|:---|:----------|
+ |kMaplyColor|UIColor|Color we'll use for the billboards.|
+ |kMaplyMinVis|NSNumber|This is viewer height above the globe or map.  The billboards will only be visible if the user is above this height.  Off by default.|
+ |kMaplyMaxVis|NSNumber|This is viewer height above the globe or map.  The billboards will only be visible if the user is below this height.  Off by default.|
+ |kMaplyMinViewerDist|NSNumber|Minimum distance from the viewer at which to display object(s).|
+ |kMaplyMaxViewerDist|NSNumber|Maximum distance from the viewer at which to display object(s).|
+ |kMaplyViewableCenterX|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center X coordinate.|
+ |kMaplyViewableCenterY|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center Y coordinate.|
+ |kMaplyViewableCenterZ|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center Z coordinate.|
+ |kMaplyDrawPriority|NSNumber|Geometry is sorted by this value before being drawn.  This ensures that some objects can come out on top of others.  By default this is kMaplyBillboardDrawPriorityDefault.|
+ |kMaplyBillboardOrient|NSNumber|Controls the billboard orientation.  It's either directly toward the eye with kMaplyBillboardOrientEye or takes the ground into account with kMaplyBillboardOrientGround.  Ground is the default.
+
+    
+    @param threadMode MaplyThreadAny is preferred and will use another thread, thus not blocking the one you're on.  MaplyThreadCurrent will make the changes immediately, blocking this thread.
+  */
+- (MaplyComponentObject *__nullable)addBillboards:(NSArray *__nonnull)billboards desc:(NSDictionary *__nullable)desc mode:(MaplyThreadMode)threadMode;
+
+/** 
+    Add a particle system to the scene.
+    
+    This adds a particle system to the scene, but does not kick off any particles.
+    
+    @param partSys The particle system to start.
+    
+    @param desc Any additional standard parameters (none at present).
+    
+    @param threadMode MaplyThreadAny will use another thread, thus not blocking the one you're on.  MaplyThreadCurrent will make the changes immediately, blocking this thread.  For particles, it's best to make a separate thread and use MaplyThreadCurrent.
+  */
+- (MaplyComponentObject *__nullable)addParticleSystem:(MaplyParticleSystem *__nonnull)partSys desc:(NSDictionary *__nullable)desc mode:(MaplyThreadMode)threadMode;
+
+/**
+    Change the render target for a particle system.
+
+    This changes the render target for an existing particle system that's already been created.
+    Can pass in nil, which means the particles are rendered to the screen directly.
+    This change takes place immediately, so call it on the main thread.
+ */
+- (void)changeParticleSystem:(MaplyComponentObject *__nonnull)compObj renderTarget:(MaplyRenderTarget *__nullable)target;
+
+/** 
+    Add a batch of particles to the current scene.
+    
+    Particles are short term objects, typically very small.  We create them in large groups for efficience.
+    
+    You'll need to fill out the MaplyParticleSystem initially and then the MaplyParticleBatch to create them.
+    
+    @param batch The batch of particles to add to an active particle system.
+    
+    @param threadMode MaplyThreadAny will use another thread, thus not blocking the one you're on.  MaplyThreadCurrent will make the changes immediately, blocking this thread.  For particles, it's best to make a separate thread and use MaplyThreadCurrent.
+  */
+- (void)addParticleBatch:(MaplyParticleBatch *__nonnull)batch mode:(MaplyThreadMode)threadMode;
+
+/** 
+    Add vectors that can be used for selections.
+    
+    These are MaplyVectorObject's that will show up in user selection, but won't be visible.  So if a user taps on one, you get the vector in your delegate.  Otherwise, no one will know it's there.
+    
+    @return Returns a MaplyComponentObject, which can be used to make modifications or delete the objects created.
+  */
+- (MaplyComponentObject *__nullable)addSelectionVectors:(NSArray *__nonnull)vectors;
+
+/** 
+    Change the representation of the given vector features.
+    
+    This will change how any vector features represented by the compObj look.
+    
+    You can change kMaplyColor, kMaplyMinVis, kMaplyMaxVis, and kMaplyDrawPriority.
+  */
+- (void)changeVector:(MaplyComponentObject *__nonnull)compObj desc:(NSDictionary *__nullable)desc;
+
+/** 
+    Change the representation of the given vector features.
+ 
+    This will change how any vector features represented by the compObj look.
+ 
+    You can change kMaplyColor, kMaplyMinVis, kMaplyMaxVis, and kMaplyDrawPriority.
+ 
+    This version takes a thread mode.
+ */
+- (void)changeVector:(MaplyComponentObject *__nonnull)compObj desc:(NSDictionary *__nullable)desc mode:(MaplyThreadMode)threadMode;
+
+/** 
+    Adds the MaplyVectorObject's passed in as lofted polygons.
+    
+    Lofted polygons are filled polygons draped on top of the globe with height.  By using a transparent color, these can be used to represent selection or relative values on the globe (or map).
+ 
+    
+    @param polys An NSArray of MaplyVectorObject.
+ 
+    @param desc The desciption dictionary which controls how the lofted polys will look.  It takes the following entries.
+    
+    @param threadMode For MaplyThreadAny we'll do the add on another thread.  For MaplyThreadCurrent we'll block the current thread to finish the add.  MaplyThreadAny is preferred.
+
+ |Key|Type|Description|
+ |:--|:---|:----------|
+ |kMaplyColor|UIColor|Color we'll use for the lofted polygons.  A bit of alpha looks good.|
+ |kMaplyLoftedPolyHeight|NSNumber|Height of the top of the lofted polygon in display units.  For the globe display units are based on a radius of 1.0.|
+ |kMaplyLoftedPolyBase|NSNumber|If present, we'll start the lofted poly at this height.  The height is in globe units, based on a radius of 1.0.|
+ |kMaplyLoftedPolyTop|NSNumber boolean|If on we'll create the geometry for the top.  On by default.|
+ |kMaplyLoftedPolySide|NSNumber boolean|If on we'll create geometry for the sides.  On by default.|
+ |kMaplyLoftedPolyGridSize|NSNumber|The size of the grid (in radians) we'll use to chop up the vector features to make them follow the sphere (for a globe).|
+ |kMaplyLoftedPolyOutline|NSNumber boolean|If set to @(YES) this will draw an outline around the top of the lofted poly in lines.|
+ |kMaplyLoftedPolyOutlineBottom|NSNumber boolean|If set to @(YES) this will draw an outline around the bottom of the lofted poly in lines.|
+ |kMaplyLoftedPolyOutlineColor|UIColor|If the outline is on this is the outline's color.|
+ |kMaplyLoftedPolyOutlineWidth|NSNumber|This is the outline's width if it's turned on.|
+ |kMaplyLoftedPolyOutlineDrawPriority|NSNumber|Draw priority of the lines created for the lofted poly outline.|
+ |kMaplyLoftedPolyOutlineSide|NSNumber boolean|If set and we're drawing an outline, this will create lines up the sides.|
+ |kMaplyMinVis|NSNumber|This is viewer height above the globe or map.  The lofted polys will only be visible if the user is above this height.  Off by default.|
+ |kMaplyMaxVis|NSNumber|This is viewer height above the globe or map.  The lofted polys will only be visible if the user is below this height.  Off by default.|
+ |kMaplyMinViewerDist|NSNumber|Minimum distance from the viewer at which to display object(s).|
+ |kMaplyMaxViewerDist|NSNumber|Maximum distance from the viewer at which to display object(s).|
+ |kMaplyViewableCenterX|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center X coordinate.|
+ |kMaplyViewableCenterY|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center Y coordinate.|
+ |kMaplyViewableCenterZ|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center Z coordinate.|
+ |kMaplyFade|NSNumber|The number of seconds to fade a lofted poly in when it appears and out when it disappears.|
+ |kMaplyDrawPriority|NSNumber|Geometry is sorted by this value before being drawn.  This ensures that some objects can come out on top of others.  By default this is kMaplyLoftedPolysShapePriorityDefault.|
+ |kMaplyZBufferRead|NSNumber boolean|If set this geometry will respect the z buffer.  It's on by default, meaning that it can be occluded by geometry coming before it.|
+ |kMaplyZBufferWrite|NSNumber boolean|If set this geometry will write to the z buffer.  That means following geometry that reads the z buffer will be occluded.  This is off by default.|
+ |kMaplyEnable|NSNumber boolean|On by default, but if off then the feature exists, but is not turned on.  It can be enabled with enableObjects:|
+ |kMaplyUUID|NSString|Unique ID to match up alternate representations of the same element.|
+ |kMaplyRepresentation|NSString|Name of the representation presented by this object.|
+
+    @return Returns a MaplyComponentObject, which can be used to make modifications or delete the objects created.
+  */
+- (MaplyComponentObject *__nullable)addLoftedPolys:(NSArray *__nonnull)polys desc:(NSDictionary *__nullable)desc mode:(MaplyThreadMode)threadMode;
+
+/** 
+    Add a group of points to the display.
+    
+    Adds a group of points all at once.  We're assuming you want to draw a lot of points, so you have to group them together into a MaplyPoints.
+
+    
+    @param points The points to add to the scene.
+    
+    @param desc The desciption dictionary which controls how the points will look.  It takes the following entries.
+    
+    @param threadMode For MaplyThreadAny we'll do the add on another thread.  For MaplyThreadCurrent we'll block the current thread to finish the add.  MaplyThreadAny is preferred.
+ 
+ |Key|Type|Description|
+ |:--|:---|:----------|
+ |kMaplyColor|UIColor|Color we'll use for the lofted polygons.  A bit of alpha looks good.|
+ |kMaplyMinVis|NSNumber|This is viewer height above the globe or map.  The lofted polys will only be visible if the user is above this height.  Off by default.|
+ |kMaplyMaxVis|NSNumber|This is viewer height above the globe or map.  The lofted polys will only be visible if the user is below this height.  Off by default.|
+ |kMaplyMinViewerDist|NSNumber|Minimum distance from the viewer at which to display object(s).|
+ |kMaplyMaxViewerDist|NSNumber|Maximum distance from the viewer at which to display object(s).|
+ |kMaplyViewableCenterX|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center X coordinate.|
+ |kMaplyViewableCenterY|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center Y coordinate.|
+ |kMaplyViewableCenterZ|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center Z coordinate.|
+ |kMaplyFade|NSNumber|The number of seconds to fade a lofted poly in when it appears and out when it disappears.|
+ |kMaplyDrawPriority|NSNumber|Geometry is sorted by this value before being drawn.  This ensures that some objects can come out on top of others.  By default this is kMaplyLoftedPolysShapePriorityDefault.|
+ |kMaplyZBufferRead|NSNumber boolean|If set this geometry will respect the z buffer.  It's on by default, meaning that it can be occluded by geometry coming before it.|
+ |kMaplyZBufferWrite|NSNumber boolean|If set this geometry will write to the z buffer.  That means following geometry that reads the z buffer will be occluded.  This is off by default.|
+ |kMaplyEnable|NSNumber boolean|On by default, but if off then the feature exists, but is not turned on.  It can be enabled with enableObjects:|
+ |kMaplyUUID|NSString|Unique ID to match up alternate representations of the same element.|
+ |kMaplyRepresentation|NSString|Name of the representation presented by this object.|
+
+    @return Returns a MaplyComponentObject, which can be used to make modifications or delete the objects created.
+  */
+- (MaplyComponentObject *__nullable)addPoints:(NSArray * __nonnull)points desc:(NSDictionary *__nullable)desc mode:(MaplyThreadMode)threadMode;
+
+/// Add a view tracker to move a UIView around based on a geographic location.
+- (void)addViewTracker:(MaplyViewTracker *__nonnull)viewTrack;
+
+/// Move an existing view tracker to a new location
+- (void)moveViewTracker:(MaplyViewTracker *__nonnull)viewTrack moveTo:(MaplyCoordinate)newPos;
+
+/** 
+    Add a single annotation which will track the given point.
+    
+    This adds a MaplyAnnotation that will follow the given geo coordinate, applying the screen offset as given.
+    
+    @param annotate The annotation we want to track a given point.
+    
+    @param coord The location on the map (or globe) we'd like to track.
+    
+    @param offset The screen offset for the annotation UIView.  You use this to put the annotation above or below objects.
+  */
+- (void)addAnnotation:(MaplyAnnotation *__nonnull)annotate forPoint:(MaplyCoordinate)coord offset:(CGPoint)offset;
+
+/** 
+    Remove the given annotation from the UIView.
+    
+    This will dismiss the given annotation with its animation.
+  */
+- (void)removeAnnotation:(MaplyAnnotation *__nonnull)annotate;
+
+/** 
+    Make the annotation stop moving.
+    
+    If you have controls in your annotation you may need to make the annotation stop moving while the user manipulates them.  Call this method to freeze the annotation while this happens.
+  */
+- (void)freezeAnnotation:(MaplyAnnotation *__nonnull)annotate;
+
+/** 
+    Call this to start an annotation following its location again after being frozen.
+  */
+- (void)unfreezeAnnotation:(MaplyAnnotation *__nonnull)annotate;
+
+/** 
+    Calls removeAnnotation: on all outstanding annotations.
+  */
+- (void)clearAnnotations;
+
+/** 
+    Return an array of active annotations.  Don't modify these.
+  */
+- (NSArray *__nullable)annotations;
+
+/// Remove an existing view tracker.
+- (void)removeViewTrackForView:(UIView *__nonnull)view;
+
+/** 
+    Return the location on screen for a given geographic (lon/lat radians) coordinate.
+    
+    @return Returns the screen point corresponding to a given geo coordinate.
+ */
+- (CGPoint)screenPointFromGeo:(MaplyCoordinate)geoCoord;
+
+/** 
+    Animate the given position to the screen position over time.
+ 
+    This is similar to animateToPosition:time: except that it will attempt to match up the screen position and the geographic position.  This is how you offset the location you're looking at.
+ 
+    If it's impossible to move newPos to loc, then nothing happens.
+ 
+    @param newPos The geographic position (lon/lat in radians) to move to.
+ 
+    @param loc The location on the screen where we'd like it to go.
+ 
+    @param howLong How long in seconds to take getting there.
+ */
+- (bool)animateToPosition:(MaplyCoordinate)newPos onScreen:(CGPoint)loc time:(NSTimeInterval)howLong;
+
+/** 
+    Add an image as a texture and return a MaplyTexture to track it.
+    
+    We reference count UIImages attached to Maply objects, but that has a couple of drawbacks.  First, it retains the UIImage and if that's large, that's a waste of memory.  Second, if you're adding and removing Maply objects you may repeatedly create and delete the same UIImage, which is a waste of CPU.
+    
+    This method solves the problem by letting you create the texture associated with the UIImage and use it where you like.  You can assign these in any place a UIImage is accepted on Maply objects.
+    
+    You don't have call this before using a UIImage in a MaplyScreenMarker or other object.  The system takes care of it for you.  This is purely for optimization.
+    
+    @param image The image we wish to retain the texture for.
+    
+    @param imageFormat If we create this image, this is the texture format we want it to use.
+ 
+ | Image Format | Description |
+ |:-------------|:------------|
+ | MaplyImageIntRGBA | 32 bit RGBA with 8 bits per channel.  The default. |
+ | MaplyImageUShort565 | 16 bits with 5/6/5 for RGB and none for A. |
+ | MaplyImageUShort4444 | 16 bits with 4 bits for each channel. |
+ | MaplyImageUShort5551 | 16 bits with 5/5/5 bits for RGB and 1 bit for A. |
+ | MaplyImageUByteRed | 8 bits, where we choose the R and ignore the rest. |
+ | MaplyImageUByteGreen | 8 bits, where we choose the G and ignore the rest. |
+ | MaplyImageUByteBlue | 8 bits, where we choose the B and ignore the rest. |
+ | MaplyImageUByteAlpha | 8 bits, where we choose the A and ignore the rest. |
+ | MaplyImageUByteRGB | 8 bits, where we average RGB for the value. |
+ | MaplyImage4Layer8Bit | 32 bits, four channels of 8 bits each.  Just like MaplyImageIntRGBA, but a warning not to do anything too clever in sampling. |
+
+    
+    @param wrapFlags These can be MaplyImageWrapX, MaplyImageWrapY, both or none.
+ 
+    
+    @param threadMode For MaplyThreadAny we'll do the add on another thread.  For MaplyThreadCurrent we'll block the current thread to finish the add.  MaplyThreadAny is preferred.
+ 
+    
+    @return A MaplyTexture you'll want to keep track of.  It goes out of scope, the OpenGL ES texture will be deleted.
+ */
+- (MaplyTexture *__nullable)addTexture:(UIImage *__nonnull)image imageFormat:(MaplyQuadImageFormat)imageFormat wrapFlags:(int)wrapFlags mode:(MaplyThreadMode)threadMode;
+
+/** 
+    Represent an image as a MaplyTexture.
+    
+    This version of addTexture: allows more precise control over how the texture is represented.  It replaces the other addTexture: and addTextureToAtlas calls.
+    
+    @param image The UIImage to add as a texture.
+    
+    @param desc A description dictionary controlling how the image is converted to a texture and represented in the system.
+
+ |Key|Type|Description|
+ |:--|:---|:----------|
+ |kMaplyTexFormat|NSNumber|The texture format to use for the image.  Consult addTexture:imageFormat:wrapFlags:mode: for a list.  Default is MaplyImageIntRGBA.|
+ |kMaplyTexMinFilter|NSNumber|Filter to use for minification.  This can be kMaplyMinFilterNearest or kMaplyMinFilterLinear. Default is kMaplyMinFilterLinear.|
+ |kMaplyTexMagFilter|NSNumber|Filter to use for magnification.  This can be kMaplyMinFilterNearest or kMaplyMinFilterLinear. Default is kMaplyMinFilterLinear.|
+ |kMaplyTexWrapX|NSNumber boolean|Texture wraps in x direction.  Off by default.|
+ |kMaplyTexWrapY|NSNumber boolean|Texture wraps in y direction.  Off by default.|
+ |kMaplyTexAtlas|NSNumber boolean|If set, the texture goes into an appropriate atlas.  If not set, it's a standalone texture (default).|
+ 
+    
+    @param threadMode For MaplyThreadAny we'll do the add on another thread.  For MaplyThreadCurrent we'll block the current thread to finish the add.  MaplyThreadAny is preferred.
+  */
+- (MaplyTexture *__nullable)addTexture:(UIImage *__nonnull)image desc:(NSDictionary *__nullable)desc mode:(MaplyThreadMode)threadMode;
+
+/** 
+    Create an empty texture and return it.
+    
+    Empty textures are used for offscreen rendering and other crazy stuff.  You probably don't want to do this.
+    
+    @param spec The description dictionary controlling the format and other textures goodies.
+
+ |Key|Type|Description|
+ |:--|:---|:----------|
+ |kMaplyTexFormat|NSNumber|The texture format to use for the image.  Consult addTexture:imageFormat:wrapFlags:mode: for a list.  Default is MaplyImageIntRGBA.|
+ |kMaplyTexMinFilter|NSNumber|Filter to use for minification.  This can be kMaplyMinFilterNearest or kMaplyMinFilterLinear. Default is kMaplyMinFilterLinear.|
+ |kMaplyTexMagFilter|NSNumber|Filter to use for magnification.  This can be kMaplyMinFilterNearest or kMaplyMinFilterLinear. Default is kMaplyMinFilterLinear.|
+ |kMaplyTexWrapX|NSNumber boolean|Texture wraps in x direction.  Off by default.|
+ |kMaplyTexWrapY|NSNumber boolean|Texture wraps in y direction.  Off by default.|
+ |kMaplyTexAtlas|NSNumber boolean|If set, the texture goes into an appropriate atlas.  If not set, it's a standalone texture (default).|
+ 
+    
+    @param sizeX The horizontal size of the textures (in pixels).
+    
+    @param sizeY Vertical size of the texture (in pixels).
+ */
+- (MaplyTexture *__nullable)createTexture:(NSDictionary * _Nullable)spec sizeX:(int)sizeX sizeY:(int)sizeY mode:(MaplyThreadMode)threadMode;
+
+/** 
+    Add an image as a texture, but put it in a texture atlas.  Return a
+ 
+    Texture atlases consolidate a number of compatible textures, speeding up rendering of any geometry they're used on.  If you know you're going to be using a UIImage with a lot of other images in, say, a group of markers, it's wise to add it here first.
+ 
+    The entry in a texture atlas will be released when the MaplyTexture is released.  So keep a copy of it around if you're going to use it.
+ 
+    @param image The image we're going to put in the texture.
+ 
+    @param threadMode For MaplyThreadAny we'll do the add on another thread.  For MaplyThreadCurrent we'll block the current thread to finish the add.  MaplyThreadAny is preferred if you're on the main thread.
+ 
+    @return A MaplyTexture you'll want to keep track of.  It goes out of scope, the entry in the texture atlas will be cleared.
+ */
+- (MaplyTexture *__nullable)addTextureToAtlas:(UIImage *__nonnull)image mode:(MaplyThreadMode)threadMode;
+
+/** 
+    Add an image as a texture, but put it in a texture atlas and return a MaplyTexture to track it.
+    
+    Texture atlases consolidate a number of compatible textures, speeding up rendering of any geometry they're used on.  If you know you're going to be using a UIImage with a lot of other images in, say, a group of markers, it's wise to add it here first.
+    
+    The entry in a texture atlas will be released when the MaplyTexture is released.  So keep a copy of it around if you're going to use it.
+ 
+    @param image The image we're going to put in the texture.
+ 
+    @param imageFormat If we create this image, this is the texture format we want it to use.
+ 
+ | Image Format | Description |
+ |:-------------|:------------|
+ | MaplyImageIntRGBA | 32 bit RGBA with 8 bits per channel.  The default. |
+ | MaplyImageUShort565 | 16 bits with 5/6/5 for RGB and none for A. |
+ | MaplyImageUShort4444 | 16 bits with 4 bits for each channel. |
+ | MaplyImageUShort5551 | 16 bits with 5/5/5 bits for RGB and 1 bit for A. |
+ | MaplyImageUByteRed | 8 bits, where we choose the R and ignore the rest. |
+ | MaplyImageUByteGreen | 8 bits, where we choose the G and ignore the rest. |
+ | MaplyImageUByteBlue | 8 bits, where we choose the B and ignore the rest. |
+ | MaplyImageUByteAlpha | 8 bits, where we choose the A and ignore the rest. |
+ | MaplyImageUByteRGB | 8 bits, where we average RGB for the value. |
+ | MaplyImage4Layer8Bit | 32 bits, four channels of 8 bits each.  Just like MaplyImageIntRGBA, but a warning not to do anything too clever in sampling. |
+
+ 
+    @param wrapFlags These can be MaplyImageWrapX, MaplyImageWrapY, both or none.
+
+ 
+    @param threadMode For MaplyThreadAny we'll do the add on another thread.  For MaplyThreadCurrent we'll block the current thread to finish the add.  MaplyThreadAny is preferred if you're on the main thread.
+ 
+    @return A MaplyTexture you'll want to keep track of.  It goes out of scope, the entry in the texture atlas will be cleared.
+  */
+- (MaplyTexture *__nullable)addTextureToAtlas:(UIImage *__nonnull)image imageFormat:(MaplyQuadImageFormat)imageFormat wrapFlags:(int)wrapFlags mode:(MaplyThreadMode)threadMode;
+
+/**
+   Creates a new texture that references part of an existing texture.
+ 
+   @param x Horizontal offset within the existing texture.
+   @param y Vertical offset within the existing texture.
+   @param width Width of the chunk to make a new texture.
+   @param height Height of the chunk to make a new texture.
+   @param threadMode For MaplyThreadAny we'll do the add on another thread.  For MaplyThreadCurrent we'll block the current thread to finish the add.  MaplyThreadAny is preferred if you're on the main thread.
+  */
+- (MaplyTexture *__nullable)addSubTexture:(MaplyTexture *__nonnull)tex xOffset:(int)x yOffset:(int)y width:(int)width height:(int)height mode:(MaplyThreadMode)threadMode;
+
+/** 
+    Remove the OpenGL ES texture associated with the given MaplyTexture.
+    
+    MaplyTexture's will remove their associated OpenGL textures when they go out of scope.  This method does it expicitly and clears out the internals of the MaplyTexture.
+    
+    Only call this if you're managing the texture explicitly and know you're finished with them.
+  */
+- (void)removeTexture:(MaplyTexture *__nonnull)image mode:(MaplyThreadMode)threadMode;
+
+/** 
+    Remove the OpenGL ES textures associated with the given MaplyTextures.
+    
+    MaplyTextures will remove their associated OpenGL textures when they go out of scope.  This method does it expicitly and clears out the internals of the MaplyTexture.
+    
+    Only call this if you're managing the texture explicitly and know you're finished with them.
+ */
+- (void)removeTextures:(NSArray *__nonnull)texture mode:(MaplyThreadMode)threadMode;
+
+/** 
+    Add a render target to the system
+    
+    Sets up a render target and will start rendering to it on the next frame.
+    
+    Keep the render target around so you can remove it later.
+  */
+- (void)addRenderTarget:(MaplyRenderTarget * _Nonnull)renderTarget;
+
+/**
+    Set the texture a given render target is writing to.
+ 
+    Render targets start out with one, but you may wish to change it.
+  */
+- (void)changeRenderTarget:(MaplyRenderTarget * __nonnull)renderTarget tex:(MaplyTexture * __nullable)tex;
+
+/**
+    Request a one time clear for the render target.
+
+    Rather than clearing every frame, you may want to specifically request a clear.  This will
+    be executed at the next frame and then not again.
+  */
+- (void)clearRenderTarget:(MaplyRenderTarget * __nonnull)renderTarget mode:(MaplyThreadMode)threadMode;
+
+/** 
+    Remove the given render target from the system.
+    
+    Ask the system to stop drawing to the given render target.  It will do this on the next frame.
+  */
+- (void)removeRenderTarget:(MaplyRenderTarget * _Nonnull)renderTarget;
+
+/** 
+    Set the max number of objects for the layout engine to display.
+    
+    The layout engine works with screen objects, such MaplyScreenLabel and MaplyScreenMaker.  If those have layoutImportance set, this will control the maximum number we can display.
+  */
+- (void)setMaxLayoutObjects:(int)maxLayoutObjects;
+
+/**
+ Screen markers and labels can have uniqueIDs.  We use these to ensure we're only displaying one version of an object with, say, vector tiles
+ that load multiple levels.
+ 
+ Now let's say you want to select some objects.  This will let you pull them out of the usual layout logic so they'll always be displayed.
+ */
+- (void)setLayoutOverrideIDs:(NSArray *__nullable)uuids;
+
+
+
+/**
+    Normally the layout layer runs periodically if you change something or when you move around.
+    You can ask it to run ASAP right here.  Layout runs on its own thread, so there may still be a delay.
+ */
+- (void)runLayout;
+
+/// Calls removeObjects:mode: with MaplyThreadAny.
+- (void)removeObject:(MaplyComponentObject *__nonnull)theObj;
+
+/// Calls removeObjects:mode: with MaplyThreadAny.
+- (void)removeObjects:(NSArray *__nonnull)theObjs;
+
+/** 
+    Remove all information associated with the given MaplyComponentObject's.
+    
+    Every add call returns a MaplyComponentObject.  This will remove any visible features, textures, selection data, or anything else associated with it.
+    
+    @param theObjs The MaplyComponentObject's we wish to remove.
+    
+    @param threadMode For MaplyThreadAny we'll do the removal on another thread.  For MaplyThreadCurrent we'll block the current thread to finish the removal.  MaplyThreadAny is preferred.
+ */
+- (void)removeObjects:(NSArray *__nonnull)theObjs mode:(MaplyThreadMode)threadMode;
+
+/** 
+    Disable a group of MaplyComponentObject's all at once.
+    
+    By default all of the geometry created for a given object will appear.  If you set kMaplyEnable to @(NO) then it will exist, but not appear.  This has the effect of setting kMaplyEnable to @(NO).
+    
+    @param theObjs The objects to disable.
+    
+    @param threadMode For MaplyThreadAny we'll do the disable on another thread.  For MaplyThreadCurrent we'll block the current thread to finish the disable.  MaplyThreadAny is preferred.
+  */
+- (void)disableObjects:(NSArray *__nonnull)theObjs mode:(MaplyThreadMode)threadMode;
+
+/** 
+    Enable a group of MaplyComponentObject's all at once.
+    
+    By default all of the geometry created for a given object will appear.  If you set kMaplyEnable to @(NO) then it will exist, but not appear.  This has the effect of setting kMaplyEnable to @(YES).
+    
+    @param theObjs The objects to enable.
+    
+    @param threadMode For MaplyThreadAny we'll do the enable on another thread.  For MaplyThreadCurrent we'll block the current thread to finish the enable.  MaplyThreadAny is preferred.
+*/
+- (void)enableObjects:(NSArray *__nonnull)theObjs mode:(MaplyThreadMode)threadMode;
+
+/**
+    Set the representation to use for the matching UUIDs by specifying the UUIDs directly.
+
+    @param uuids Array of NSString, the UUIDs to update
+    @param repName The representation value to apply, nil to return to the default
+*/
+- (void)setRepresentation:(NSString *__nullable)repName
+                  ofUUIDs:(NSArray<NSString *> *__nonnull)uuids;
+
+/**
+    Set the representation to use for the matching UUIDs by specifying the UUIDs directly.
+
+    @param repName The representation value to apply, nil to return to the default
+    @param fallbackRepName The representation to use if there are no matches
+    @param uuids Array of NSString, the UUIDs to update
+*/
+- (void)setRepresentation:(NSString *__nullable)repName
+          fallbackRepName:(NSString *__nullable)fallbackRepName
+                  ofUUIDs:(NSArray<NSString *> *__nonnull)uuids;
+
+/**
+    Set the representation to use for the matching UUIDs by specifying the UUIDs directly.
+
+    @param uuids Array of NSString, the UUIDs to update
+    @param repName The representation value to apply, nil to return to the default
+    @param threadMode For MaplyThreadAny we'll do the enable on another thread.  For MaplyThreadCurrent we'll block the current thread to finish the enable.  MaplyThreadAny is preferred.
+*/
+- (void)setRepresentation:(NSString *__nullable)repName
+                  ofUUIDs:(NSArray<NSString *> *__nonnull)uuids
+                     mode:(MaplyThreadMode)threadMode;
+
+/**
+    Set the representation to use for the matching UUIDs by specifying the UUIDs directly.
+
+    @param uuids Array of NSString, the UUIDs to update
+    @param repName The representation value to apply, nil to return to the default
+    @param fallbackRepName The representation to use if there are no matches
+    @param threadMode For MaplyThreadAny we'll do the enable on another thread.  For MaplyThreadCurrent we'll block the current thread to finish the enable.  MaplyThreadAny is preferred.
+*/
+- (void)setRepresentation:(NSString *__nullable)repName
+          fallbackRepName:(NSString *__nullable)fallbackRepName
+                  ofUUIDs:(NSArray<NSString *> *__nonnull)uuids
+                     mode:(MaplyThreadMode)threadMode;
+
+/**
+    Set the representation to use for the UUIDs of the given objects.
+
+    @param objects Array of ComponentObject, the UUIDs to update
+    @param repName The representation value to apply, nil to return to the default
+*/
+- (void)setRepresentation:(NSString *__nullable)repName
+                ofObjects:(NSArray<MaplyComponentObject *> *__nonnull)objects;
+
+/**
+    Set the representation to use for the UUIDs of the given objects.
+
+    @param objects Array of ComponentObject, the UUIDs to update
+    @param repName The representation value to apply, nil to return to the default
+*/
+- (void)setRepresentation:(NSString *__nullable)repName
+          fallbackRepName:(NSString *__nullable)fallbackRepName
+                ofObjects:(NSArray<MaplyComponentObject *> *__nonnull)objects;
+
+/**
+    Set the representation to use for the UUIDs of the given objects.
+
+    @param objects Array of ComponentObject, the UUIDs to update
+    @param repName The representation value to apply, nil to return to the default
+    @param fallbackRepName The representation to use if there are no matches
+    @param threadMode For MaplyThreadAny we'll do the enable on another thread.  For MaplyThreadCurrent we'll block the current thread to finish the enable.  MaplyThreadAny is preferred.
+*/
+- (void)setRepresentation:(NSString *__nullable)repName
+          fallbackRepName:(NSString *__nullable)fallbackRepName
+                ofObjects:(NSArray<MaplyComponentObject *> *__nonnull)objects
+                     mode:(MaplyThreadMode)threadMode;
+
+/**
+    Pass a uniform block through to a shader.  Only for Metal.
+ 
+    Custom Metal shaders may have their own uniform blocks associated with a known bufferID.
+    This is how you pass those through for objects you've already created.
+    Useful for things like custom animation.
+  */
+- (void)setUniformBlock:(NSData *__nonnull)uniBlock buffer:(int)bufferID forObjects:(NSArray<MaplyComponentObject *> *__nonnull)compObjs mode:(MaplyThreadMode)threadMode;
+
+/** 
+    Add the given active object to the scene.
+    
+    Active objects are used for immediate, frame based updates.  They're fairly expensive, so be careful.  After you create one, you add it to the scene here.
+  */
+- (void)addActiveObject:(MaplyActiveObject *__nonnull)theObj;
+
+/// Remove an active object from the scene.
+- (void)removeActiveObject:(MaplyActiveObject *__nonnull)theObj;
+
+/// Remove an array of active objects from the scene
+- (void)removeActiveObjects:(NSArray *__nonnull)theObjs;
+
+/** 
+    Add a MaplyControllerLayer to the globe or map.
+    
+    At present, layers are for paged geometry such as image tiles or vector tiles.  You can create someting like a MaplyQuadImageTilesLayer, set it up and then hand it to addLayer: to add to the scene.
+  */
+- (bool)addLayer:(MaplyControllerLayer *__nonnull)layer;
+
+/// Remove a MaplyControllerLayer from the globe or map.
+- (void)removeLayer:(MaplyControllerLayer *__nonnull)layer;
+
+/// Remove zero or more MaplyControllerLayer objects from the globe or map.
+- (void)removeLayers:(NSArray *__nonnull)layers;
+
+/// Remove all the user created MaplyControllerLayer objects from the globe or map.
+- (void)removeAllLayers;
+
+/** 
+    Utility routine to convert from a lat/lon (in radians) to display coordinates
+    
+    This is a simple routine to get display coordinates from geocoordinates.  Display coordinates for the globe are based on a radius of 1.0 and an origin of (0,0,0).
+    
+    @return The input coordinate in display coordinates.
+  */
+- (MaplyCoordinate3d)displayPointFromGeo:(MaplyCoordinate)geoCoord;
+
+/**
+    Utility routine to convert from a lat/lon (in radians) to display coordinates
+    
+    This is a simple routine to get display coordinates from geocoordinates.  Display coordinates for the globe are based on a radius of 1.0 and an origin of (0,0,0).
+    
+    @return The input coordinate in display coordinates.
+  */
+- (MaplyCoordinate3dD)displayPointFromGeoD:(MaplyCoordinate)geoCoord;
+
+/**
+    Utility routine to convert from a lat/lon (in radians) to display coordinates
+    
+    This is a simple routine to get display coordinates from geocoordinates.  Display coordinates for the globe are based on a radius of 1.0 and an origin of (0,0,0).
+    
+    @return The input coordinate in display coordinates.
+  */
+- (MaplyCoordinate3dD)displayPointFromGeoDD:(MaplyCoordinateD)geoCoord;
+
+/** 
+    If you've paused the animation earlier, this will start it again.
+    
+    The renderer relies on a CADisplayLink.  If it's paused, this will unpause it.
+  */
+- (void)startAnimation;
+
+/** 
+    Pause the animation. 
+    
+    The renderer relies on a CADisplayLink.  This will pause it.  You'll want to do this if your app is going into the background or if you generally want the OpenGL ES code to stop doing anything.
+  */
+- (void)stopAnimation;
+
+/** 
+    This shuts down the rendering and it cannot be restarted.
+    
+    There are times we need to explicitly shut down the rendering rather than wait for an unload or release.  This will do that.
+  */
+- (void)teardown;
+
+/** 
+    Add a compiled shader.  We'll refer to it by the scene name.
+    
+    Once you've create a MaplyShader, you'll need to add it to the scene to use it.
+    
+    @param shader The working shader (be sure valid is true) to add to the scene.
+    
+ |Scene Name|Purpose|
+ |:---------|:------|
+ |kMaplyShaderDefaultTri|The shader used on triangles by default when there is lighting.|
+ |kMaplyShaderDefaultTriNoLighting|The shader used when lighting is explicitly turned off.|
+ |kMaplyShaderDefaultTriMultiTex|The shader used when drawables have more than one texture.|
+ |kMaplyShaderDefaultLine|The shader used for line drawing on the globe.  This does a tricky bit of backface culling.|
+ |kMaplyShaderDefaultLineNoBackface|The shader used for line drawing on the map.  This does no backface culling.|
+  */
+- (void)addShaderProgram:(MaplyShader *__nonnull)shader;
+
+/** 
+    Look for a shader with the given name.  
+    
+    This is the shader's own name as specified in the init call, not the scene name as might be specified in addShaderProgram:sceneName:
+    
+    @return Returns the registered shader if it found one.
+  */
+- (MaplyShader *__nullable)getShaderByName:(NSString *__nonnull)name;
+
+/**
+    Remove a shader that was added earlier.
+  */
+- (void)removeShaderProgram:(MaplyShader *__nonnull)shader;
+
+/** 
+    Return the current map scale from the viewpoint.
+    
+    Calculate the map scale denominator (ala Mapnik) based on the current screen size and the 3D viewport.
+    
+    @return Returns the map scale denominator or MAXFLOAT if the system is not yet initialized.
+  */
+- (float)currentMapScale;
+
+/** 
+    Calculate the height that corresponds to a given Mapnik-style map scale.
+    
+    Figure out the viewer height that corresponds to a given scale denominator (ala Mapnik).
+    
+    This height will probably be use for visibility ranges on geometry.  This works as a mechanism for making geometry appear at certain map scales and disappear at others.
+    
+    @return Returns the height or 0.0 if the system isn't initialized yet.
+  */
+- (float)heightForMapScale:(float)scale;
+
+/** 
+    Takes a snapshot of the current OpenGL view and returns it.
+  */
+- (UIImage *__nullable)snapshot;
+
+/**
+    Return the raw data for a render target.
+
+    Copies the pixels for a render target out after rendering and returns them in an NSData object.
+    This is not fast.  Don't call it often.
+  */
+- (NSData * __nullable)shapshotRenderTarget:(MaplyRenderTarget * __nonnull)renderTarget;
+
+/** Add a snapshot delegate.
+ 
+ If you need more regular snapshots, you can fill this in to get a callback every frame.
+ Don't snapshot the screen or even offscreen render targets every frame.  It'll be slow.
+ */
+- (void)addSnapshotDelegate:(NSObject<MaplySnapshotDelegate> *__nonnull)snapshotDelegate;
+
+/** Remove your snapshot delegate.
+ 
+ Don't getting screenshots/render target snapshots?  Get rid of your delegate.  They're expensive.
+ */
+- (void)removeSnapshotDelegate:(NSObject<MaplySnapshotDelegate> *__nonnull)snapshotDelegate;
+
+
+/** 
+    Return the current map zoom from the viewpoint.
+ 
+    Calculate the map zoom (TMS) based on the current screen size and the 3D viewport.
+ 
+    @param coordinate the location to calculate for. This is needed because zoom is dependant on latitude.
+ 
+    @return Returns the map zoom or MAXFLOAT if the system is not yet initialized.
+ */
+- (float)currentMapZoom:(MaplyCoordinate)coordinate;
+
+/** 
+    Return the coordinate system being used for the display.
+    
+    This returns the local coordinate system, which is used to unroll the earth (for the globe) or via a scaling factor (for the flat map).
+  */
+- (MaplyCoordinateSystem *__nullable)coordSystem;
+
+/** 
+    Convert from a local coordinate (probably spherical mercator) to a display coordinate.
+    
+    This converts from a local coordinate (x,y,height) in the view controller's coordinate system (probably spherical mercator) to a coordinate in display space.  For the globe display space is based on a radius of 1.0.  For the flat map it's just stretched with a similar factor.
+  */
+- (MaplyCoordinate3d)displayCoordFromLocal:(MaplyCoordinate3d)localCoord;
+
+/**
+    Convert from a local coordinate (probably spherical mercator) to a display coordinate.
+    
+    This converts from a local coordinate (x,y,height) in the view controller's coordinate system (probably spherical mercator) to a coordinate in display space.  For the globe display space is based on a radius of 1.0.  For the flat map it's just stretched with a similar factor.
+  */
+- (MaplyCoordinate3dD)displayCoordFromLocalD:(MaplyCoordinate3dD)localCoord;
+
+/** 
+    Convert from a coordinate in the given system to display space.
+    
+    This converts from a coordinate (3d) in the given coordinate system to the view controller's display space.  For the globe, display space is based on a radius of 1.0.
+  */
+- (MaplyCoordinate3d)displayCoord:(MaplyCoordinate3d)localCoord fromSystem:(MaplyCoordinateSystem *__nonnull)coordSys;
+
+/** 
+    Convert from a coordinate in the given system to display space.
+ 
+    This converts from a double coordinate (3d) in the given coordinate system to the view controller's display space.  For the globe, display space is based on a radius of 1.0.
+ */
+- (MaplyCoordinate3dD)displayCoordD:(MaplyCoordinate3dD)localCoord fromSystem:(MaplyCoordinateSystem *__nonnull)coordSys;
+
+/** 
+    enable 3d touch object selection.
+ 
+    @param previewDataSource Data source to provide 3d touch preview view controllers.
+ 
+    @return true if 3d touch could be enabled
+ */
+- (BOOL)enable3dTouchSelection:(NSObject<Maply3dTouchPreviewDatasource> *__nonnull)previewDataSource;
+
+/** 
+    Disable 3dtouch object selection
+ */
+- (void)disable3dTouchSelection;
+
+/** 
+    Return all the selectable vector objects at the given location.
+    
+    Objects can be selected via the delegate or the search can be run directly here.
+    
+    This is not thread safe and will block the main thread.
+  */
+- (NSArray * _Nullable)objectsAtCoord:(MaplyCoordinate)coord;
+
+/**
+    Return all the selectable labels and markers at the given location.
+
+    Objects can be selected via the delegate or the search can be run directly here.
+
+    This is not thread safe and will block the main thread.
+ */
+- (NSArray * _Nullable)labelsAndMarkersAtCoord:(MaplyCoordinate)coord;
+
+/// Turn on/off performance output (goes to the log periodically).
+@property (nonatomic,assign) bool performanceOutput;
+
+/// Turn on/off debug outlines for layout objects
+@property (nonatomic,assign) bool showDebugLayoutBoundaries;
+
+/** 
+    See derived class method.
+ */
+- (void)requirePanGestureRecognizerToFailForGesture:(UIGestureRecognizer *__nullable)other;
+
+/** 
+    Start location tracking
+    
+    @param delegate The MaplyLocationTrackerDelegate for receiving location event callbacks
+    
+    @param useHeading Use location services heading information (requires physical magnetometer)
+    
+    @param useCourse Use location services course information as fallback if heading unavailable
+ */
+- (void)startLocationTrackingWithDelegate:(NSObject<MaplyLocationTrackerDelegate> *__nullable)delegate
+                               useHeading:(bool)useHeading
+                                useCourse:(bool)useCourse;
+
+/**
+    Start location tracking
+    
+    @param delegate The MaplyLocationTrackerDelegate for receiving location event callbacks
+    
+    @param simulator The MaplyLocationSimulatorDelegate for producing  locations
+ 
+    @param simInterval The time interval on which to update
+
+    @param useHeading Use location services heading information (requires physical magnetometer)
+    
+    @param useCourse Use location services course information as fallback if heading unavailable
+ */
+- (void)startLocationTrackingWithDelegate:(NSObject<MaplyLocationTrackerDelegate> *__nullable)delegate
+                                simulator:(NSObject<MaplyLocationSimulatorDelegate> *__nullable)simulator
+                              simInterval:(NSTimeInterval)simInterval
+                               useHeading:(bool)useHeading
+                                useCourse:(bool)useCourse;
+
+/**
+ Return the current location tracker, if there is one.
+ */
+- (MaplyLocationTracker * __nullable)getLocationTracker;
+
+/** 
+    Change lock type for location tracking
+    
+    @param lockType The MaplyLocationLockType value for lock behavior
+ */
+- (void)changeLocationTrackingLockType:(MaplyLocationLockType)lockType;
+
+/** 
+    Change lock type for location tracking
+    
+    @param lockType The MaplyLocationLockType value for lock behavior
+    
+    @param forwardTrackOffset The vertical offset if using MaplyLocationLockHeadingUpOffset (positive values are below the view center)
+ */
+- (void)changeLocationTrackingLockType:(MaplyLocationLockType)lockType forwardTrackOffset:(int)forwardTrackOffset;
+
+/** 
+    Stop location tracking
+ */
+- (void)stopLocationTracking;
+
+/** 
+    Get the current location tracker device location
+ 
+    @return The coordinate if valid, else kMaplyNullCoordinate
+ */
+- (MaplyCoordinate)getDeviceLocation;
+
+/** 
+    Exposes MaplyLocationTracker's location manager for use elsewhere
+    
+    @return The CLLocationmanager if it exists, else nil
+ */
+- (CLLocationManager * _Nullable )getTrackingLocationManager;
+
+/** 
+    Return all layers loaded by user.
+ 
+    All layers loaded by user than are currently loaded.
+ */
+-(NSArray * _Nonnull)loadedLayers;
+
+/// Return the renderer type being used
+- (MaplyRenderType)getRenderType;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyBillboard.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyBillboard.h
new file mode 100644
index 0000000..3a24e43
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyBillboard.h
@@ -0,0 +1,74 @@
+/*
+ *  MaplyBillboard.h
+ *  WhirlyGlobeComponent
+ *
+ *  Created by Steve Gifford on 10/28/13.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <UIKit/UIKit.h>
+#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
+#import <WhirlyGlobeMaplyComponent/MaplyScreenObject.h>
+
+/** 
+    A billboard is tied to a specific point, but rotates to face the user.
+    
+    The billboard object represents a rectangle which is rooted at a specific point, but will rotate to face the user.  These are typically used in 3D, when the globe or map has a tilt.  They make little sense in 2D.
+  */
+@interface MaplyBillboard : NSObject
+
+/** 
+    The point this billboard is rooted at.
+    
+    The x and y coordinates are radians.  The z coordinate is in meters.
+  */
+@property (nonatomic) MaplyCoordinate3d center;
+
+/// Set if you want to select these
+@property (nonatomic) bool selectable;
+
+/// The 2D polygonal description of what the billboard should be
+@property (nonatomic,strong) MaplyScreenObject * __nullable screenObj;
+
+/** 
+    Vertex attributes to apply to this billboard.
+    
+    MaplyVertexAttribute objects are passed all the way to the shader.  Read that page for details on what they do.
+    
+    The array of vertex attributes provided here will be copied onto all the vertices we create for the shader.  This means you can use these to do things for a single billboard in your shader.
+ */
+@property (nonatomic,strong) NSArray * __nullable vertexAttributes;
+
+/** 
+    User data object for selection
+    
+    When the user selects a feature and the developer gets it in their delegate, this is an object they can use to figure out what the screen label means to them.
+ */
+@property (nonatomic,strong) id __nullable userObject;
+
+/** 
+    Initialize with a single image, a given background and a size.
+    
+    This will create a simple billboard with a single image pasted on it.
+    
+    @param texture This can either be a UIImage or a MaplyTexture.
+    
+    @param color Color for the polygon that makes up the billboard.
+    
+    @param size Size of the billboard in display space.
+  */
+- (nullable instancetype)initWithImage:(id __nonnull)texture color:(UIColor * __nonnull)color size:(CGSize)size;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyBridge.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyBridge.h
new file mode 100644
index 0000000..152d869
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyBridge.h
@@ -0,0 +1,23 @@
+/*  MaplyBridge.h
+ *  MaplyBridge
+ *
+ *  Created by jmnavarro on 7/19/15.
+ *  Copyright 2015-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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#import <WhirlyGlobeMaplyComponent/MaplyComponent.h>
+#import <WhirlyGlobeMaplyComponent/MaplyBaseViewController.h>
+#import <WhirlyGlobeMaplyComponent/WhirlyGlobeViewController.h>
+#import <WhirlyGlobeMaplyComponent/MaplyGlobeRenderController.h>
+#import <WhirlyGlobeMaplyComponent/MaplyViewController.h>
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyCluster.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyCluster.h
new file mode 100644
index 0000000..aea79cf
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyCluster.h
@@ -0,0 +1,147 @@
+/*
+ *  MaplyCluster.h
+ *  WhirlyGlobe-MaplyComponent
+ *
+ *  Created by Steve Gifford on 9/29/15.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <UIKit/UIKit.h>
+#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
+#import <WhirlyGlobeMaplyComponent/MaplyScreenMarker.h>
+#import <WhirlyGlobeMaplyComponent/MaplyShader.h>
+
+@class MaplyBaseViewController;
+
+/** 
+    Information about the group of objects to cluster.
+    
+    This object is passed in when the developer needs to make an image for a group of objects.
+  */
+@interface MaplyClusterInfo : NSObject
+
+/// Number of objects being clustered
+@property (nonatomic,assign) int numObjects;
+
+/// All the unique IDs from the
+@property (nonatomic,retain) NSArray<NSString *> * __nullable uniqueIDs;
+
+@end
+
+/** 
+    Visual representation for a group of markers.
+    
+    Fill this in when you're implementing a MaplyClusterGenerator.
+  */
+@interface MaplyClusterGroup : NSObject
+
+/// The image to use for the group
+@property (nonatomic,strong) id __nonnull image;
+
+/// Screen size to use for the resulting marker
+@property (nonatomic,assign) CGSize size;
+
+/// Size used for layout.  If it's not set, we use the regular size.
+@property (nonatomic,assign) CGSize layoutSize;
+
+@end
+
+/** 
+    Fill in this protocol to provide images when individual markers/labels are clustered.
+    
+    This is the protocol for marker/label clustering.  You must fill this in and register the cluster
+  */
+@protocol MaplyClusterGenerator <NSObject>
+
+/** 
+    Called at the start of clustering.
+    
+    Called right before we start generating clusters.  Do you setup here if need be.
+  */
+- (void) startClusterGroup;
+
+/** 
+    Generate a cluster group for a given collection of markers.
+    
+    Generate an image and size to represent the number of marker/labels we're consolidating.
+ 
+    @note Will not be called if @c -showMarkerWithHighestImportance returns @c true.
+  */
+- (MaplyClusterGroup *__nonnull) makeClusterGroup:(MaplyClusterInfo *__nonnull)clusterInfo;
+
+/** 
+    Called at the end of clustering.
+    
+    If you were doing optimization (for image reuse, say) clean it up here.
+  */
+- (void) endClusterGroup;
+
+/// Return the cluster number we're covering
+- (int) clusterNumber;
+
+/// The size of the cluster that will be created.
+/// This is the biggest cluster you're likely to create.  We use it to figure overlaps between clusters.
+- (CGSize) clusterLayoutSize;
+
+/// Use appearance and coordinate of cluster group marker with highest importance. If not set then an average of coordinates will be used
+- (bool) showMarkerWithHighestImportance;
+
+/// Set this if you want cluster to be user selectable.  On by default.
+- (bool) selectable;
+
+/// How long to animate markers the join and leave a cluster
+- (double) markerAnimationTime;
+
+/// The shader to use for moving objects around
+/// If you're doing animation from point to cluster you need to provide a suitable shader.
+- (MaplyShader *__nullable) motionShader;
+
+@end
+
+/** 
+    The basic cluster generator installed by default.
+    
+    This cluster generator will make images for grouped clusters of markers/labels.
+  */
+@interface MaplyBasicClusterGenerator : NSObject <MaplyClusterGenerator>
+
+/** 
+    Initialize with a list of colors.
+    
+    Initialize with a list of colors.  Each order of magnitude will use another color.  Must provide at least 1.
+  */
+- (nonnull instancetype)initWithColors:(NSArray *__nonnull)colors clusterNumber:(int)clusterNumber size:(CGSize)markerSize viewC:(NSObject<MaplyRenderControllerProtocol> *__nonnull)viewC;
+
+/// The ID number corresponding to the cluster.  Every marker/label with this cluster ID will be grouped together.
+@property (nonatomic,assign) int clusterNumber;
+
+/// The size of the cluster that will be created.
+/// This is the biggest cluster you're likely to create.  We use it to figure overlaps between clusters.
+@property (nonatomic) CGSize clusterLayoutSize;
+
+/// Set to use appearance and coordinate of cluster group marker with highest importance. Off by default.
+@property (nonatomic) bool showMarkerWithHighestImportance;
+
+/// Set this if you want cluster to be user selectable.  On by default.
+@property (nonatomic) bool selectable;
+
+/// How long to animate markers the join and leave a cluster
+@property (nonatomic) double markerAnimationTime;
+
+/// The shader to use when moving objects around
+/// When warping objects to their new locations we use a motion shader.  Set this if you want to override the default.
+@property (nonatomic,strong) MaplyShader * __nullable motionShader;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyColorRampGenerator.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyColorRampGenerator.h
new file mode 100644
index 0000000..95d2331
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyColorRampGenerator.h
@@ -0,0 +1,42 @@
+//
+//  MaplyColorRampGenerator.h
+//  WhirlyGlobe-MaplyComponent
+//
+//  Created by Steve Gifford on 4/20/16.
+//
+//
+
+#import <UIKit/UIKit.h>
+
+/** The color ramp generator will take a set of color values
+    and generate a linear ramp of those colors in an output
+    image.  You typically feed the color ramp image into a shader.
+  */
+@interface MaplyColorRampGenerator : NSObject
+
+// If set we'll stretch the colors out to the whole image
+// On by default.
+@property (nonatomic,assign) bool stretch;
+
+/// Add a color as a hex value.
+- (void)addHexColor:(int)hexColor;
+
+/// This color has an alpha too
+- (void)addHexColorWithAlpha:(int)hexColor;
+
+/// A color that's present in only one entry
+- (void)addSingleEntryColor:(UIColor *)color;
+
+/// Add a color as a UIColor
+- (void)addColor:(UIColor *)color;
+
+/// Add color with values expressed as integers 0-255
+- (void)addByteRed:(int)red green:(int)green blue:(int)blue alpha:(int)alpha;
+
+/// Generate the image with the color ramp in it
+- (UIImage *)makeImage:(CGSize)size;
+
+/// Get a list of colors (rather than generating an image)
+- (NSArray *)getColors;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyComponent.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyComponent.h
new file mode 100644
index 0000000..8dcb73c
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyComponent.h
@@ -0,0 +1,102 @@
+/*  MaplyComponent.h
+ *  MaplyComponent
+ *
+ *  Created by Steve Gifford on 9/6/12.
+ *  Copyright 2012-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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#import <WhirlyGlobeMaplyComponent/MaplySharedAttributes.h>
+
+#import <WhirlyGlobeMaplyComponent/NSData+Zlib.h>
+#import <WhirlyGlobeMaplyComponent/NSDictionary+StyleRules.h>
+
+#import <WhirlyGlobeMaplyComponent/MaplyGeomBuilder.h>
+#import <WhirlyGlobeMaplyComponent/MaplyIconManager.h>
+#import <WhirlyGlobeMaplyComponent/MaplyLocationTracker.h>
+#import <WhirlyGlobeMaplyComponent/MaplyTextureBuilder.h>
+
+#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
+#import <WhirlyGlobeMaplyComponent/MaplyCoordinateSystem.h>
+#import <WhirlyGlobeMaplyComponent/MaplyMatrix.h>
+
+#import <WhirlyGlobeMaplyComponent/MaplyActiveObject.h>
+#import <WhirlyGlobeMaplyComponent/MaplyAnnotation.h>
+#import <WhirlyGlobeMaplyComponent/MaplyRenderController.h>
+#import <WhirlyGlobeMaplyComponent/MaplyUpdateLayer.h>
+#import <WhirlyGlobeMaplyComponent/MaplyViewTracker.h>
+#import <WhirlyGlobeMaplyComponent/MaplyControllerLayer.h>
+#import <WhirlyGlobeMaplyComponent/MaplyViewController.h>
+#import <WhirlyGlobeMaplyComponent/MaplyBaseViewController.h>
+
+#import <WhirlyGlobeMaplyComponent/MaplyComponentObject.h>
+#import <WhirlyGlobeMaplyComponent/MaplyBillboard.h>
+#import <WhirlyGlobeMaplyComponent/MaplyCluster.h>
+#import <WhirlyGlobeMaplyComponent/MaplyLabel.h>
+#import <WhirlyGlobeMaplyComponent/MaplyGeomModel.h>
+#import <WhirlyGlobeMaplyComponent/MaplyMarker.h>
+#import <WhirlyGlobeMaplyComponent/MaplyMoon.h>
+#import <WhirlyGlobeMaplyComponent/MaplyParticleSystem.h>
+#import <WhirlyGlobeMaplyComponent/MaplyPoints.h>
+#import <WhirlyGlobeMaplyComponent/MaplySticker.h>
+#import <WhirlyGlobeMaplyComponent/MaplyShape.h>
+#import <WhirlyGlobeMaplyComponent/MaplyScreenLabel.h>
+#import <WhirlyGlobeMaplyComponent/MaplySun.h>
+#import <WhirlyGlobeMaplyComponent/MaplyScreenObject.h>
+#import <WhirlyGlobeMaplyComponent/MaplyScreenMarker.h>
+#import <WhirlyGlobeMaplyComponent/MaplyStarsModel.h>
+#import <WhirlyGlobeMaplyComponent/MaplyTexture.h>
+#import <WhirlyGlobeMaplyComponent/MaplyVectorObject.h>
+
+#import <WhirlyGlobeMaplyComponent/MapboxVectorTiles.h>
+#import <WhirlyGlobeMaplyComponent/MapboxVectorInterpreter.h>
+
+#import <WhirlyGlobeMaplyComponent/SLDStyleSet.h>
+#import <WhirlyGlobeMaplyComponent/SLDExpressions.h>
+#import <WhirlyGlobeMaplyComponent/SLDOperators.h>
+#import <WhirlyGlobeMaplyComponent/SLDSymbolizers.h>
+#import <WhirlyGlobeMaplyComponent/SLDWellKnownMarkers.h>
+#import <WhirlyGlobeMaplyComponent/MaplyVectorStyle.h>
+#import <WhirlyGlobeMaplyComponent/MaplyVectorStyleSimple.h>
+#import <WhirlyGlobeMaplyComponent/MaplyVectorTileLineStyle.h>
+#import <WhirlyGlobeMaplyComponent/MaplyVectorTileMarkerStyle.h>
+#import <WhirlyGlobeMaplyComponent/MaplyVectorTilePolygonStyle.h>
+#import <WhirlyGlobeMaplyComponent/MaplyVectorTileStyle.h>
+#import <WhirlyGlobeMaplyComponent/MaplyVectorTileTextStyle.h>
+#import <WhirlyGlobeMaplyComponent/MapboxVectorStyleSet.h>
+#import <WhirlyGlobeMaplyComponent/MapnikStyle.h>
+#import <WhirlyGlobeMaplyComponent/MapnikStyleRule.h>
+#import <WhirlyGlobeMaplyComponent/MapnikStyleSet.h>
+
+#import <WhirlyGlobeMaplyComponent/MaplyQuadLoader.h>
+#import <WhirlyGlobeMaplyComponent/MaplyImageTile.h>
+#import <WhirlyGlobeMaplyComponent/MaplyQuadImageLoader.h>
+#import <WhirlyGlobeMaplyComponent/MaplyQuadImageFrameLoader.h>
+#import <WhirlyGlobeMaplyComponent/MaplyQuadPagingLoader.h>
+#import <WhirlyGlobeMaplyComponent/MaplyTileSourceNew.h>
+#import <WhirlyGlobeMaplyComponent/MaplySimpleTileFetcher.h>
+#import <WhirlyGlobeMaplyComponent/MaplyQuadSampler.h>
+#import <WhirlyGlobeMaplyComponent/MaplyRemoteTileFetcher.h>
+#import <WhirlyGlobeMaplyComponent/GeoJSONSource.h>
+
+#import <WhirlyGlobeMaplyComponent/MaplyWMSTileSource.h>
+#import <WhirlyGlobeMaplyComponent/MaplyMBTileFetcher.h>
+
+#import <WhirlyGlobeMaplyComponent/MaplyVariableTarget.h>
+#import <WhirlyGlobeMaplyComponent/MaplyAtmosphere.h>
+#import <WhirlyGlobeMaplyComponent/MaplyColorRampGenerator.h>
+#import <WhirlyGlobeMaplyComponent/MaplyLight.h>
+#import <WhirlyGlobeMaplyComponent/MaplyRenderTarget.h>
+#import <WhirlyGlobeMaplyComponent/MaplyShader.h>
+#import <WhirlyGlobeMaplyComponent/MaplyVertexAttribute.h>
+
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyComponentObject.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyComponentObject.h
new file mode 100644
index 0000000..59ccde6
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyComponentObject.h
@@ -0,0 +1,37 @@
+/*
+ *  MaplyComponentObject.h
+ *  WhirlyGlobe-MaplyComponent
+ *
+ *  Created by Steve Gifford on 9/18/12.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <Foundation/Foundation.h>
+
+/** 
+    Used to represent the view controller resources attached to one or more visual objects.
+    
+    When you add one or more objects to a view controller, you'll get a component object back. It's an opaque object (seriously, don't look inside) that we use to track various resources within the toolkit.
+    
+    You can keep these around to remove the visual objects you added earlier, but that's about all the interaction you'll have with them.
+  */
+@interface MaplyComponentObject : NSObject
+
+/// Construct with a description.  Uses the kMaplyEnable.
+- (nonnull instancetype)initWithDesc:(NSDictionary *__nonnull)desc;
+
+@end
+
+typedef MaplyComponentObject WGComponentObject;
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyControllerLayer.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyControllerLayer.h
new file mode 100644
index 0000000..d8775d0
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyControllerLayer.h
@@ -0,0 +1,44 @@
+/*
+ *  MaplyControllerLayer.h
+ *  WhirlyGlobe-MaplyComponent
+ *
+ *  Created by Steve Gifford on 10/25/12.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <Foundation/Foundation.h>
+
+/** 
+    The View Controller Layer is a base class for other display layers.
+    
+    You don't create these directly.  This is a base class for other things.  Its hooks into the rest of the system are hidden.
+  */
+@interface MaplyControllerLayer : NSObject
+
+/** 
+    Set the priority for drawing.
+    
+    This is how you control where the geometry produced by this layer shows up with respect to other layers and other geometry.  This must be set immediately after creation.  It will have undefined behavior after the layer has started.
+  */
+@property (nonatomic,assign) int drawPriority;
+
+/** 
+    Set as unique identifier, or group...
+ 
+    use this property in order to localize this layer in the Globe/Map, you use in a predicate to catch as a load layer in Globe...
+ */
+@property (nonatomic, strong) NSString *identifier;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyCoordinate.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyCoordinate.h
new file mode 100644
index 0000000..d1c01e8
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyCoordinate.h
@@ -0,0 +1,342 @@
+/*
+ *  MaplyCoordinate.h
+ *  WhirlyGlobe-MaplyComponent
+ *
+ *  Created by Steve Gifford on 7/21/12.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <Foundation/Foundation.h>
+#import <CoreLocation/CoreLocation.h>
+
+/** 
+    A 2D coordinate representation.
+    
+    The Maply Coordinate is a simple 2 dimensional coordinate
+    passed around to numerous methods.  For geo-coordinates x
+    maps to longitude and y to latitude and the values are
+    in radians.
+  */
+typedef struct
+{
+    float x,y;
+} MaplyCoordinate;
+
+
+static const MaplyCoordinate kMaplyNullCoordinate = {.x = FLT_MIN, .y = FLT_MIN};
+
+
+/** 
+    Double precision version of 2D coordinate.
+    
+    This works the same was as the MaplyCoordinate, but has
+    more precision.
+  */
+typedef struct
+{
+    double x,y;
+} MaplyCoordinateD;
+
+static const MaplyCoordinateD kMaplyNullCoordinateD = {.x = DBL_MIN, .y = DBL_MIN};
+
+
+/** 
+    A 3D coordinate representation.
+    
+    The 3D version of the Maply Coordinate adds a z values, often
+    in meters, but not always.  Consult the appropriate method to
+    be sure.
+  */
+typedef struct
+{
+    float x,y,z;
+} MaplyCoordinate3d;
+
+/** 
+    An NSObject based wrapper for 3D coordinates.
+    
+    This wrapper encapsulates a MaplyCoordinate3d so we can pass them around in NSDictionary objects.
+  */
+@interface MaplyCoordinate3dWrapper : NSObject
+
+/// Initialize with a 3D coordinate
+- (instancetype)initWithCoord:(MaplyCoordinate3d)coord;
+
+/// 3D coordinate
+@property (nonatomic,readonly) MaplyCoordinate3d coord;
+
+@end
+
+typedef struct
+{
+    double x,y,z;
+} MaplyCoordinate3dD;
+
+static const MaplyCoordinate3dD kMaplyNullCoordinate3dD = {.x = DBL_MIN, .y = DBL_MIN, .z = DBL_MIN};
+
+/** 
+    An NSObject based wrapper for 3D coordinates.
+ 
+    This wrapper encapsulates a MaplyCoordinate3d so we can pass them around in NSDictionary objects.
+ */
+@interface MaplyCoordinate3dDWrapper : NSObject
+
+/// Initialize with a 3D coordinate
+- (instancetype)initWithCoord:(MaplyCoordinate3dD)coord;
+
+/// 3D coordinate
+@property (nonatomic,readonly) MaplyCoordinate3dD coord;
+
+@end
+
+/** 
+    Represents a bounding box in a particular coordinate system.
+    
+    ll is the lower left and ur is the upper right.
+  */
+typedef struct
+{
+    MaplyCoordinate ll;
+    MaplyCoordinate ur;
+} MaplyBoundingBox;
+
+static const MaplyBoundingBox kMaplyNullBoundingBox = {
+	.ll = {.x = FLT_MIN, .y = FLT_MIN},
+	.ur = {.x = FLT_MIN, .y = FLT_MIN}
+};
+
+/**
+    A category that uses NSValue to store MaplyCoordinate data
+ */
+@interface NSValue (MaplyCoordinate)
++ (instancetype)valueWithMaplyCoordinate:(MaplyCoordinate)value;
+@property (readonly) MaplyCoordinate maplyCoordinateValue;
+@end
+
+/**
+    A category that uses NSValue to store MaplyCoordinateD data
+ */
+@interface NSValue (MaplyCoordinateD)
++ (instancetype)valueWithMaplyCoordinateD:(MaplyCoordinateD)value;
+@property (readonly) MaplyCoordinateD maplyCoordinateDValue;
+@end
+
+/**
+    A category that uses NSValue to store MaplyBoundingBox data
+ */
+@interface NSValue (MaplyBoundingBox)
++ (instancetype)valueWithMaplyBoundingBox:(MaplyBoundingBox)value;
+@property (readonly) MaplyBoundingBox maplyBoundingBoxValue;
+@end
+
+/** 
+    Represents a bounding box in a particular coordinate system.
+    
+    ll is the lower left and ur is the upper right.
+ */
+typedef struct
+{
+	MaplyCoordinateD ll;
+	MaplyCoordinateD ur;
+} MaplyBoundingBoxD;
+
+static const MaplyBoundingBoxD kMaplyNullBoundingBoxD = {
+	.ll = {.x = DBL_MIN, .y = DBL_MIN},
+	.ur = {.x = DBL_MIN, .y = DBL_MIN}
+};
+
+#if __cplusplus
+extern "C" {
+#endif
+
+/** 
+    Construct a MaplyCoordiante with longitude and latitude values in radians.
+    
+    MaplyCoordinate's are in radians when they represent lon/lat values.  This constructs one with radians as input.
+    
+    @return A 2D MaplyCoordinate in radians (if representing a lon/lat value).
+  */
+MaplyCoordinate MaplyCoordinateMake(float radLon,float radLat);
+
+/** 
+    Construct a MaplyCoordianteD with longitude and latitude values in radians.
+    
+    MaplyCoordinate's are in radians when they represent lon/lat values.  This constructs one with radians as input.
+    
+    @return A 2D MaplyCoordinateD in radians (if representing a lon/lat value).
+    */
+MaplyCoordinateD MaplyCoordinateDMake(double radLon,double radLat);
+    
+/** 
+    Construct a MaplyGeoCoordinate with longitude and latitude values in degrees.
+    
+    MaplyCoordinate's are in radians when they represent lon/lat values.  This function does that conversion for you.
+    
+    @param degLon The longitude value (east to west) in degrees.
+    
+    @param degLat The latitude value (north to south) in degrees.
+    
+    @return A 2D MaplyCoordinate in radians (if representing a lon/lat value).
+  */
+MaplyCoordinate MaplyCoordinateMakeWithDegrees(float degLon,float degLat);
+
+/** 
+    Construct a MaplyGeoCoordinate with longitude and latitude values in degrees.
+ 
+    MaplyCoordinate's are in radians when they represent lon/lat values.  This function does that conversion for you.
+ 
+    @param degLon The longitude value (east to west) in degrees.
+ 
+    @param degLat The latitude value (north to south) in degrees.
+ 
+    @return A 2D MaplyCoordinate in radians (if representing a lon/lat value).
+ */
+MaplyCoordinateD MaplyCoordinateDMakeWithDegrees(double degLon,double degLat);
+
+/** 
+    Construct a MaplyCoordinateD with a MaplyCoordinate.
+    
+    This function constructs a MaplyCoordinateD with the component values of the input MaplyCoordinate.
+    
+    @param c The input MaplyCoordinate value.
+    
+    @return A 2D MaplyCoordinateD in radians (if representing a lon/lat value).
+  */
+MaplyCoordinateD MaplyCoordinateDMakeWithMaplyCoordinate(MaplyCoordinate c);
+
+/**
+    Construct a MaplyCoordinate with a MaplyCoordinateD.
+    
+    This function constructs a MaplyCoordinate with the component values of the input MaplyCoordinateD.
+    
+    @param c The input MaplyCoordinateD value.
+    
+    @return A 2D MaplyCoordinate in radians (if representing a lon/lat value).
+  */
+MaplyCoordinate MaplyCoordinateMakeWithMaplyCoordinateD(MaplyCoordinateD c);
+
+/**
+    Construct a MaplyCoordinat3d from the values given.
+    
+    @param x The x value, or longitude in radians if we're making geo coordinates.
+    
+    @param y The y value, or latitude in radians if we're making geo coordinates.
+    
+    @param z The z value, sometimes this is display coordinates (radius == 1.0 for a sphere)
+              and sometimes this is meters.  It depends on how you're using it.
+    
+    @return A 3D MaplyCoordinate3d in radians + other (if representing a lon/lat value).
+  */
+MaplyCoordinate3d MaplyCoordinate3dMake(float x,float y,float z);
+
+/** 
+    Construct a MaplyCoordinat3d from the values given.
+    
+    @param x The x value, or longitude in radians if we're making geo coordinates.
+    
+    @param y The y value, or latitude in radians if we're making geo coordinates.
+    
+    @param z The z value, sometimes this is display coordinates (radius == 1.0 for a sphere)
+ and sometimes this is meters.  It depends on how you're using it.
+    
+    @return A 3D MaplyCoordinate3d in radians + other (if representing a lon/lat value).
+ */
+MaplyCoordinate3dD MaplyCoordinate3dDMake(double x,double y,double z);
+
+/** 
+    Construct a MaplyBoundingBox from the values given.
+    
+    The inputs are in degrees and the order is longitude *then* latitude.
+    
+    @param degLon0 The left side of the bounding box in degrees.
+    
+    @param degLat0 The bottom of the bounding box in degrees.
+    
+    @param degLon1 The right side of the bounding box in degrees.
+    
+    @param degLat1 The top of the bounding box in degrees.
+    
+    @return A MaplyBoundingBox in radians.
+  */
+MaplyBoundingBox MaplyBoundingBoxMakeWithDegrees(float degLon0,float degLat0,float degLon1,float degLat1);
+
+/** Double version of MaplyBoundingBoxMakeWithDegrees
+  */
+MaplyBoundingBoxD MaplyBoundingBoxDMakeWithDegrees(double degLon0,double degLat0,double degLon1,double degLat1);
+
+/** 
+    Check if two bounding boxes overlap.
+     
+    @return Returns true if they did overlap, false otherwise.
+  */
+bool MaplyBoundingBoxesOverlap(MaplyBoundingBox bbox0,MaplyBoundingBox bbox1);
+    
+/** 
+    Check if a bounding contains a given coordinate.
+     
+    @return Returns true if the bounding box contains the coordinate.
+  */
+bool MaplyBoundingBoxContains(MaplyBoundingBox bbox, MaplyCoordinate c);
+
+/**
+  Set up a bounding box from a list of 2D locations.
+ */
+MaplyBoundingBox MaplyBoundingBoxFromLocations(const CLLocationCoordinate2D locs[], unsigned int numLocs);
+
+/**
+  Set up a bounding box from a list of 2D coordinates
+ */
+MaplyBoundingBox MaplyBoundingBoxFromCoordinates(const MaplyCoordinate coords[], unsigned int numCoords);
+MaplyBoundingBox MaplyBoundingBoxFromCoordinatesD(const MaplyCoordinateD coords[], unsigned int numCoords);
+MaplyBoundingBoxD MaplyBoundingBoxDFromCoordinates(const MaplyCoordinate coords[], unsigned int numCoords);
+MaplyBoundingBoxD MaplyBoundingBoxDFromCoordinatesD(const MaplyCoordinateD coords[], unsigned int numCoords);
+
+/**
+  Expand a bounding box with a list of 2D coordinates
+ */
+MaplyBoundingBox MaplyBoundingBoxAddCoordinates(MaplyBoundingBox box, const MaplyCoordinate coords[], unsigned int numCoords);
+MaplyBoundingBox MaplyBoundingBoxAddCoordinatesD(MaplyBoundingBox box, const MaplyCoordinateD coords[], unsigned int numCoords);
+MaplyBoundingBoxD MaplyBoundingBoxDAddCoordinates(MaplyBoundingBoxD box, const MaplyCoordinate coords[], unsigned int numCoords);
+MaplyBoundingBoxD MaplyBoundingBoxDAddCoordinatesD(MaplyBoundingBoxD box, const MaplyCoordinateD coords[], unsigned int numCoords);
+
+/**
+ Return the intersection of two bounding boxes.
+ */
+MaplyBoundingBox MaplyBoundingBoxIntersection(MaplyBoundingBox bbox0,MaplyBoundingBox bbox1);
+
+/** 
+    Expands a bounding box by a given fraction of its size.
+     
+    @return Returns the expanded bounding box.
+  */
+MaplyBoundingBox MaplyBoundingBoxExpandByFraction(MaplyBoundingBox bbox, float buffer);
+    
+/** 
+    Calculate the great circle distance between two geo coordinates.
+    
+    This calculates the distance on a sphere between one point and another.
+    
+    @param p0 The starting point, lon/lat in radians.
+    
+    @param p1 The end point, lon/lat in radians.
+    
+    @return The distance between p0 and p1 in meters.
+  */
+double MaplyGreatCircleDistance(MaplyCoordinate p0,MaplyCoordinate p1);
+    
+#if __cplusplus
+}
+#endif
+
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyCoordinateSystem.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyCoordinateSystem.h
new file mode 100644
index 0000000..6778bd3
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyCoordinateSystem.h
@@ -0,0 +1,176 @@
+/*  MaplyCoordinateSystem.h
+ *  WhirlyGlobe-MaplyComponent
+ *
+ *  Created by Steve Gifford on 5/13/13.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#import <Foundation/Foundation.h>
+#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
+
+/** 
+    Coordinate system for tiling systems and data sources and such.
+    
+    This object represents the spatial reference system and bounding box for objects like the MaplyTileSource or vectors or other things.  Not all data is in lat/lon geographic (actually MaplyPlateCaree) nor is it always in MaplySphericalMercator.  Sometimes it's in one or the other, or a bit of both.
+    
+    We use this base class to express the coordinate system and we threw in the bounding box, which we will surely come to regret.  Oh well, it's in there.
+    
+    This object gets passed around to tell us what coordinate system data is in or how we're displaying things.  Right now only MaplySphericalMercator and MaplyPlateCarree are represented.  In the future, there will be more.
+   */
+@interface MaplyCoordinateSystem : NSObject
+
+/** 
+    Set the bounding box in the local coordinate system.
+ 
+    This is the bounding box, for things like display coordinates.  If the extents would normally be in degrees, use radians.  Otherwise, the values are in the local system.
+ */
+- (void)setBounds:(MaplyBoundingBox)bounds;
+
+/**
+    Set the bounding box in the local coordinate system.
+ 
+    This is the bounding box, for things like display coordinates.  If the extents would normally be in degrees, use radians.  Otherwise, the values are in the local system.
+ */
+- (void)setBoundsD:(MaplyBoundingBoxD)boundsD;
+
+/** 
+    Set the bounding box in the local coordinate system.
+    
+    This is the bounding box, for things like display coordinates.  If the extents would normally be in degrees, use radians.  Otherwise, the values are in the local system.
+  */
+- (void)setBoundsLL:(MaplyCoordinate * __nonnull)ll ur:(MaplyCoordinate * __nonnull)ll;
+
+/** 
+    Return the bounding box in local coordinates.
+ 
+    This is the bounding box in local coordinates, or if the extents would normally be expressed in degrees, it's radians.
+ */
+- (MaplyBoundingBox)getBounds;
+
+/** 
+    Return the bounding box in local coordinates.
+    
+    This is the bounding box in local coordinates, or if the extents would normally be expressed in degrees, it's radians.
+  */
+- (void)getBoundsLL:(MaplyCoordinate * __nonnull)ret_ll ur:(MaplyCoordinate * __nonnull)ret_ur;
+
+/** 
+    Convert a coordinate from geographic to the local coordinate system.
+    
+    Take a geo coordinate (lon/lat in radians) and convert to the local space.
+  */
+- (MaplyCoordinate)geoToLocal:(MaplyCoordinate)coord;
+
+/** 
+    Convert a coordinate from the local space to geographic.
+    
+    This takes a coordinate in this coordinate system and converts it to geographic (lat/lon in radians).
+  */
+- (MaplyCoordinate)localToGeo:(MaplyCoordinate)coord;
+
+/** 
+    Convert a 3D coordinate from the local space to geocentric.
+    
+    This takes a 3D coordinate (including height) and converts it to geocentric in WGS84.
+  */
+- (MaplyCoordinate3dD)localToGeocentric:(MaplyCoordinate3dD)coord;
+
+/** 
+    Convert a 3D coordinate from geocentric to the local space.
+    
+    This takes a 3D geocentric coordinate (WGS84) and converts it to the local space, including height;
+  */
+- (MaplyCoordinate3dD)geocentricToLocal:(MaplyCoordinate3dD)coord;
+
+/** 
+    Express the coordinate system in an SRS compatible string.
+  */
+- (NSString * __nonnull)getSRS;
+
+/** 
+    Can this coordinate system be expressed in degrees?
+    
+    This is set for coordinate systems that express their extents in degrees.  This is useful for cases where we need to construct some metadata to go along with the system and you'd normally expect it to be in degrees rather than radians.
+  */
+- (bool)canBeDegrees;
+
+@end
+
+/** 
+    Plate Carree is lat/lon stretched out to its full extents.
+    
+    This coordinate system is used when we're tiling things over the whole earth, from -180 to +180 and from -90 to +90.  Use this if you chopped up your data in that way.
+  */
+@interface MaplyPlateCarree : MaplyCoordinateSystem
+
+/// Initialize with Plate Carree covering the whole globe.
+- (nonnull instancetype)init;
+
+/// Initialize with Plate Carree covering the whole globe.
+- (nullable instancetype)initFullCoverage;
+
+/// Initialize with the given bounding box (in radians)
+- (nullable instancetype)initWithBoundingBox:(MaplyBoundingBox)bbox;
+
+/// Initialize with the given bounding box (in radians)
+- (nullable instancetype)initWithBoundingBoxD:(MaplyBoundingBoxD)bbox;
+
+@end
+
+/** 
+    Spherical Mercator is what you'll most commonly see on web maps.
+    
+    The Spherical Mercator system, with web extents is what MapBox, Google, Bing, etc. use for their maps.  If you ever want to annoy a cartographer, suggest that spherical mercator is all you ever really need.
+    
+    The drawback with Spherical Mercator is that it doesn't cover the poles and it distorts (and how) its north and south extents.  Web Standard refers to the extents you'll find in most online maps.  This is probably want you want.
+  */
+@interface MaplySphericalMercator : MaplyCoordinateSystem
+
+/// Initialize with the -85...,+85... extents to match most comm only used online maps
+- (nonnull instancetype)init;
+
+/// Initialize with the -85...,+85... extents to match most commonly used online maps
+- (nonnull instancetype)initWebStandard;
+
+@end
+
+/** 
+    A generic coordinate system wrapper around proj4.
+    
+    You create one of these with a proj4 string.  It'll act like a normal MaplyCoordinateSysterm after that.
+    
+    Be sure to check that the system is valid.  The proj4 string could be wrong.
+  */
+@interface MaplyProj4CoordSystem : MaplyCoordinateSystem
+
+/** 
+    Initialize with a proj4 compatible string
+    
+    Since this is just a proj.4 wrapper, we need an initialization string that it can parse.
+  */
+- (nonnull instancetype)initWithString:(NSString * __nonnull)proj4Str;
+
+/// True if the proj.4 string was valid and the coordinate system can work.
+- (bool)valid;
+
+@end
+
+/** 
+    Generate the correct coordinate system from a standard EPSG.
+    
+    This returns the correct coordinate system from a standard EPSG string.
+    
+    The list of available coordinate systems is very short.
+  */
+MaplyCoordinateSystem * __nullable MaplyCoordinateSystemFromEPSG(NSString * __nonnull crs);
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyDoubleTapDelegate.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyDoubleTapDelegate.h
new file mode 100644
index 0000000..45329e1
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyDoubleTapDelegate.h
@@ -0,0 +1,25 @@
+/*  MaplyDoubleTapDelegate.h
+ *
+ *  Created by Jesse Crocker on 2/3/14.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#import <WhirlyGlobeMaplyComponent/MaplyZoomGestureDelegate.h>
+
+@interface MaplyDoubleTapDelegate : MaplyZoomGestureDelegate
+
+/// How long we animate from starting to end point
+@property (nonatomic) float animTime;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyDoubleTapDragDelegate.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyDoubleTapDragDelegate.h
new file mode 100644
index 0000000..5e55d23
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyDoubleTapDragDelegate.h
@@ -0,0 +1,22 @@
+/*  MaplyDoubleTapDragDelegate.h
+ *
+ *  Created by Steve Gifford on 2/7/14.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#import <WhirlyGlobeMaplyComponent/MaplyZoomGestureDelegate.h>
+
+@interface MaplyDoubleTapDragDelegate : MaplyZoomGestureDelegate
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyGeomBuilder.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyGeomBuilder.h
new file mode 100644
index 0000000..2f05d38
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyGeomBuilder.h
@@ -0,0 +1,301 @@
+/*
+ *  MaplyGeomModelBuilder.h
+ *  WhirlyGlobeComponent
+ *
+ *  Created by Steve Gifford on 1/20/16
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <UIKit/UIKit.h>
+#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
+#import <WhirlyGlobeMaplyComponent/MaplyRenderController.h>
+#import <WhirlyGlobeMaplyComponent/MaplyGeomModel.h>
+
+/** 
+    Geometry State is used to describe the visual look of objects as they're added.
+    
+    Set the various fields in the geometry state to control how geometry looks when you add it.
+            There are defaults for all of these fields.
+  */
+@interface MaplyGeomState : NSObject
+
+/// Color to use for the geometry
+@property (nonatomic,strong) UIColor *color;
+
+/// Background color for text
+@property (nonatomic,strong) UIColor *backColor;
+
+/// UIImage for MaplyTexture to apply to geometry
+@property (nonatomic,strong) id texture;
+
+/// For more than one texture, use addTexture
+- (void)addTexture:(MaplyTexture *)texture;
+
+@end
+
+/** 
+    The geometry builder is used to construct 3D models.
+    
+    You use the geometry builder when you have a custom 3D model to build.  This can include things like airport runways, buildings, or anything else that's particular to a certain location.
+    
+    Start by construting the builder and then adding polygons and strings to it.
+    
+    You can combine multiple geometry builders together to build up repeated portions of a model.
+    
+    The builder has an "immediate mode" where you add points individually to build up polygons and then add those.  This is one of the simpler ways to use the system.
+  */
+@interface MaplyGeomBuilder : NSObject
+
+/// Intialize with the view controller the model will be used in.
+- (id)initWithViewC:(NSObject<MaplyRenderControllerProtocol> *)viewC;
+
+/** 
+    Create a rectangle around the origin.
+    
+    This creates a flat rectangle around the origin (0,0,0) with z = 0.
+    
+    @param size The size of the rectangle (x,y).
+    
+    @param state The visual state to use when creating the geometry.
+  */
+- (void)addRectangleAroundOrigin:(MaplyCoordinateD)size state:(MaplyGeomState *)state;
+
+/** 
+    Create a rectangle around the origin.
+ 
+    This creates a flat rectangle around the origin (0,0,0) with z = 0.
+ 
+    @param x Horizontal size of the rectangle.
+ 
+    @param y Vertical size of the rectangle.
+ 
+    @param state The visual state to use when creating the geometry.
+ */
+- (void)addRectangleAroundOriginX:(double)x y:(double)y state:(MaplyGeomState *)state;
+
+/** 
+    Create a rectangle around the given point.
+ 
+    This creates a flat rectangle around the point x,y with z = 0.
+ 
+    @param x X location around which to create the rectangle.
+ 
+    @param y Y location around which to create the rectangle.
+ 
+    @param width Horizontal size of the rectangle.
+ 
+    @param height Vertical size of the rectangle.
+ 
+    @param state The visual state to use when creating the geometry.
+ */
+- (void)addRectangleAroundX:(double)x y:(double)y width:(double)width height:(double)height state:(MaplyGeomState *)state;
+
+/** 
+    Add an attributed string to the geometry builder.
+    
+    Add an attributed string, which contains information about color and front to the geometry builder.
+    
+    @param str String to add to the geometry.
+    
+    @param state The visual state to use when creating the geometry.
+  */
+- (void)addAttributedString:(NSAttributedString *)str state:(MaplyGeomState *)state;
+
+/** 
+    Add a string to the geometry.
+    
+    Add a string at (0,0) to the geometry with the given font and visual state.  The font determines size.
+    
+    @param str String to add to geometry.
+    
+    @param font Font to use for the string.
+    
+    @param state The visual state to use when creating the geometry.
+  */
+- (void)addString:(NSString *)str font:(UIFont *)font state:(MaplyGeomState *)state;
+
+/** 
+    Add a string to the geometry.
+ 
+    Add a string at (0,0) to the geometry with the given font and visual state.
+ 
+    The string will be scaled to match the width and/or height given.  If one of width or height is 0.0 it will be calculated from the other.
+ 
+    @param str String to add to geometry.
+ 
+    @param width Width of the string in the final geometry.  If set to 0.0, will be calculated.
+ 
+    @param height Height of the string in the final geometry.  If set to 0.0, will be calculated.
+ 
+    @param font Font to use for the string.
+ 
+    @param state The visual state to use when creating the geometry.
+ */
+- (void)addString:(NSString *)str width:(double)width height:(double)height font:(UIFont *)font state:(MaplyGeomState *)state;
+
+/** 
+    Add a polygon with the given visual state.
+    
+    Tesselates the given polygon and adds the resulting triangles to the geometry.
+    
+    @param pts An array of 3D points.
+    
+    @param numPts Number of points in the 3D array.
+    
+    @param state The visual state to use when creating the geometry.
+  */
+- (void)addPolygonWithPts:(MaplyCoordinate3dD *)pts numPts:(int)numPts state:(MaplyGeomState *)state;
+
+/** 
+    Add a polygon with the given visual state.
+ 
+    Tesselates the given polygon and adds the resulting triangles to the geometry.
+ 
+    @param pts An array of 3D points.
+ 
+    @param tex Texture coordinates.  One for each point.
+ 
+    @param norms Normals to go with the points.
+ 
+    @param numPts Number of points in the 3D array.
+ 
+    @param state The visual state to use when creating the geometry.
+ */
+- (void)addPolygonWithPts:(MaplyCoordinate3dD *)pts tex:(MaplyCoordinateD *)tex norms:(MaplyCoordinate3dD *)norms numPts:(int)numPts state:(MaplyGeomState *)state;
+
+/** 
+    Add a point in immediate mode.
+    
+    When in immediate mode points are collected until an addCurPoly call.  This adds a 3D point.
+  */
+- (void)addCurPointX:(double)x y:(double)y z:(double)z;
+
+/** 
+    Add a point in immediate mode
+    
+    When in immediate mode points are collected until an addCurPoly call.  This add a point at (x,y,0).
+  */
+- (void)addCurPointX:(double)x y:(double)y;
+
+/** 
+    Add the current polygon in immediate mode.
+    
+    When in immediate mode points are collected until you call this method.  Then the points will be tesselated into a set of triangles and added to the geometry with the given visual state.
+  */
+- (void)addCurPoly:(MaplyGeomState *)state;
+
+/** 
+    Scale the geometry and strings by this amount.
+    
+    The geometry and strings are scaled by the given amount in each dimension.
+  */
+- (void)scale:(MaplyCoordinate3dD)scale;
+
+/** 
+    Scale the geometry and strings by the given amount.
+    
+    The geometry and strings are scaled by (x,y,z).
+  */
+- (void)scaleX:(double)x y:(double)y z:(double)z;
+
+/** 
+    Translate the geometry and strings by the given amount.
+    
+    The geometry and strings are translated by the given coordinate.
+  */
+- (void)translate:(MaplyCoordinate3dD)trans;
+
+/** 
+    Translate the geometry and strings by the given amount.
+    
+    The geometry and strings are translated by (x,y,z).
+ */
+- (void)translateX:(double)x y:(double)y z:(double)z;
+
+/** 
+    Rotate the geometry around the given axis by the given angle.
+    
+    Roate around the given 3D axis by the number of radians in angle.
+    
+    @param angle The angle in radians to rotate by.
+    
+    @param axis The axis to rotate around.  (0,0,1) would rotate around the Z axis.
+  */
+- (void)rotate:(double)angle around:(MaplyCoordinate3dD)axis;
+
+/** 
+    Rotate the geometry around the given axis by the given angle.
+ 
+    Roate around the given 3D axis by the number of radians in angle.
+ 
+    @param angle The angle in radians to rotate by.
+ 
+    @param x X component of the axis to rotate around.
+ 
+    @param y Y component of the axis to rotate around.
+ 
+    @param z Z component of the axis to rotate around.
+ */
+- (void)rotate:(double)angle aroundX:(double)x y:(double)y z:(double)z;
+
+/** 
+    Apply a transform to the geometry and strings.
+    
+    This applies a general 4x4 transform to the geometry and strings.  You can construct the MaplyMatrix using a number of different options and combine multiple matrices.
+  */
+- (void)transform:(MaplyMatrix *)matrix;
+
+/** 
+    Add the geometry from another builder.
+    
+    Multiple geometry builders can be combined to build complex objects.
+    
+    This method copies geometry and strings, including their transforms to the current builder.
+  */
+- (void)addGeomFromBuilder:(MaplyGeomBuilder *)modelBuilder;
+
+/** 
+    Add the geometry from another builder, applying the given transform.
+    
+    Multiple geometry builders can be combined to build complex objects.
+    
+    This method transform the source geometry and strings and copies them into the current builder.
+  */
+- (void)addGeomFromBuilder:(MaplyGeomBuilder *)modelBuilder transform:(MaplyMatrix *)matrix;
+
+/** 
+    Calculate the bounding box of geometry and strings.
+    
+    Calculates the lower left and upper right corners of a rectangular solid that surrounds the geometry and strings for this builder.
+    
+    This returns false if there is no valid geometry (or strings) and takes transforms into account if there is.
+  */
+- (bool)getSizeLL:(MaplyCoordinate3dD *)ll ur:(MaplyCoordinate3dD *)ur;
+
+/** 
+    Calculate and returns the size of the geometry and strings.
+    
+    Calculates the size of the geometry and strings in the builder, taking transforms into account.
+  */
+- (MaplyCoordinate3dD)getSize;
+
+/** 
+    Generate a valid MaplyGeomModel that can be instanced and used as a 3D model.
+    
+    This call returns a MaplyGeomModel.  You'll need a model to make MaplyGeomModelInstance objects and for the addModelInstances:desc:mode: call to a NSObject<MaplyRenderControllerProtocol> (map or globe).
+  */
+- (MaplyGeomModel *)makeGeomModel:(MaplyThreadMode)threadMode;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyGeomModel.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyGeomModel.h
new file mode 100644
index 0000000..82a3db9
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyGeomModel.h
@@ -0,0 +1,122 @@
+/*
+ *  MaplyGeomModel.h
+ *  WhirlyGlobe-MaplyComponent
+ *
+ *  Created by Steve Gifford on 11/26/14.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <UIKit/UIKit.h>
+#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
+#import <WhirlyGlobeMaplyComponent/MaplyMatrix.h>
+#import <WhirlyGlobeMaplyComponent/MaplyShape.h>
+
+@class MaplyShader;
+
+/** 
+    Contains a big pile of geometry and textures (e.g. a model).
+    
+    The geometry model
+ */
+@interface MaplyGeomModel : NSObject
+
+/** 
+    Initialize with the full path to a Wavefront OBJ model file.
+    
+    This creates a model from a Wavefront OBJ file, a standard, simple file format for models.  You can then instance and place this model where you might like.
+  */
+- (nullable instancetype)initWithObj:(NSString *__nonnull)fullPath;
+
+/** 
+    Initialize with a shape.
+    
+    The given shape will be turned into a geometry model so it can be instanced.
+  */
+- (nonnull instancetype)initWithShape:(MaplyShape *__nonnull)shape;
+
+@end
+
+
+/** 
+    Place a geometry model at a given location
+    
+    Geometry models tend to be expensive so we load and place them in a two step process.  First you create the MaplyGeomModel and then you place it in one or more spots with this MaplyGeomModelInstance.
+  */
+@interface MaplyGeomModelInstance : NSObject
+
+/** 
+    User data object for selection
+ 
+    When the user selects a feature and the developer gets it in their delegate, this is an object they can use to figure out what the model instance means to them.
+ */
+@property (nonatomic,strong,nullable) id userObject;
+
+/// The model to instance
+@property (nonatomic,strong,nullable) MaplyGeomModel *model;
+
+/** 
+    Where we'd like to place the instanced model.
+    
+    This is the center of the object in geographic radians.
+ */
+@property (nonatomic) MaplyCoordinate3d center;
+
+/// Transform used to oriented the model instance
+@property (nonatomic,strong,nullable) MaplyMatrix *transform;
+
+/// Color to force all polygons to use.
+/// If set, this will force all polygons to use this color.  nil by default.
+@property (nonatomic,strong,nullable) UIColor *colorOverride;
+
+/// Set if you want to select these
+@property (nonatomic) bool selectable;
+
+@end
+
+/** 
+    A version of the geometry model instance that moves.
+    
+    This version of the geometry model instance can move in a limited way over time.
+  */
+@interface MaplyMovingGeomModelInstance : MaplyGeomModelInstance
+
+/// The end point for animation
+@property (nonatomic,assign) MaplyCoordinate3d endCenter;
+
+/// How long it will take to get to the endCenter
+@property (nonatomic,assign) NSTimeInterval duration;
+
+@end
+
+/**
+ Sometimes we don't know how many instances there will be of a model until
+ some logic runs on the GPU.  We can then take that number and run that
+ number of instances of the given model.  [Metal only]
+ */
+@interface MaplyGeomModelGPUInstance : NSObject
+
+/// The model to instance
+@property (nonatomic,strong,nullable) MaplyGeomModel *model;
+
+/// Texture to derive the number of instances from (picked out of the highest, smallest level)
+@property (nonatomic,nullable) MaplyTexture *numInstSource;
+
+/// Need a shader to pull the number of instances out of a texture and shove them in the indirect buffer
+@property (nonatomic,nullable) MaplyShader *numInstShader;
+
+/// Shader to run over for this instance
+@property (nonatomic,nullable) MaplyShader *shader;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyGlobeRenderController.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyGlobeRenderController.h
new file mode 100644
index 0000000..95d1b61
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyGlobeRenderController.h
@@ -0,0 +1,115 @@
+/*
+*  MaplyGlobeRenderController.h
+*  WhirlyGlobeComponent
+*
+*  Created by Steve Gifford on 10/23/10.
+*  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.
+*  You may obtain a copy of the License at
+*  http://www.apache.org/licenses/LICENSE-2.0
+*
+*  Unless required by applicable law or agreed to in writing, software
+*  distributed under the License is distributed on an "AS IS" BASIS,
+*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*  See the License for the specific language governing permissions and
+*  limitations under the License.
+*
+*/
+
+#import <UIKit/UIKit.h>
+#import <WhirlyGlobeMaplyComponent/MaplyRenderController.h>
+#import <WhirlyGlobeMaplyComponent/MaplyRemoteTileFetcher.h>
+
+/**
+    Animation State used by the WhirlyGlobeViewControllerAnimationDelegate.
+    
+    You fill out one of these when you're implementing the animation delegate.  Return it and the view controller will set the respective values to match.
+  */
+@interface WhirlyGlobeViewControllerAnimationState : NSObject
+
+/// Heading is calculated from due north
+/// If not set or set to MAXFLOAT, this is ignored
+@property (nonatomic) double heading;
+
+/// Height above the globe
+@property (nonatomic) double height;
+
+/// Tilt as used in the view controller
+/// If not set or set to MAXFLOAT, we calculate tilt the regular way
+@property (nonatomic) double tilt;
+
+/// Roll as used in the view controller
+@property (nonatomic) double roll;
+
+/// Position to move to on the globe
+@property (nonatomic) MaplyCoordinateD pos;
+
+/// If set, this is a point on the screen where pos should be.
+/// By default this is (-1,-1) meaning the screen position is just the middle.  Otherwise, this is where the position should wind up on the screen, if it can.
+@property (nonatomic) CGPoint screenPos;
+
+/// If set, the globe will be centered at this point on the screen
+@property (nonatomic) CGPoint globeCenter;
+
+/**
+    Interpolate a new state between the given states A and B.
+    
+    This does a simple interpolation (lat/lon, not great circle) between the two animation states.
+  */
++ (nonnull WhirlyGlobeViewControllerAnimationState *)Interpolate:(double)t from:(WhirlyGlobeViewControllerAnimationState *__nonnull)stateA to:(WhirlyGlobeViewControllerAnimationState *__nonnull)stateB;
+
+@end
+
+/**
+   The Globe Render Controller is a standalone renderer for the globe.
+      This is separate from the WhirlyGlobeViewController, but performs a similar function for
+    offline rendering.
+ */
+@interface WhirlyGlobeRenderController : MaplyRenderController
+
+/// Initialize with the size of the target rendering buffer
+- (instancetype __nullable) initWithSize:(CGSize)screenSize mode:(MaplyRenderType)renderType;
+
+/// Initialize as an offline renderer of a given target size with default renderer (Metal)
+- (instancetype __nullable)initWithSize:(CGSize)size;
+
+/** Set this if you're doing frame by frame animation.
+    It will move particles along and run any animations you may have going.
+ **/
+@property (nonatomic,assign) NSTimeInterval currentTime;
+
+/**
+    Set the viewing state all at once
+    
+    This sets the position, tilt, height, screen position and heading all at once.
+  */
+- (void)setViewState:(WhirlyGlobeViewControllerAnimationState *__nonnull)viewState;
+
+/**
+    Make a WhirlyGlobeViewControllerAnimationState object from the current view state.
+    
+    This returns the current view parameters in a single WhirlyGlobeViewControllerAnimationState.
+  */
+- (nullable WhirlyGlobeViewControllerAnimationState *)getViewState;
+
+/**
+    Takes a snapshot of the current OpenGL view and returns it.
+  */
+- (UIImage *__nullable)snapshot;
+
+/**
+     This version of snapshot just returns the raw NSData from the "screen".
+ */
+- (NSData *__nullable)snapshotData;
+
+
+/**
+    If set, keep north facing upward on the screen as the user moves around.
+    
+    Off by default.
+  */
+@property(nonatomic,assign) bool keepNorthUp;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyIconManager.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyIconManager.h
new file mode 100644
index 0000000..e6f545a
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyIconManager.h
@@ -0,0 +1,140 @@
+/*
+ *  MaplyIconManager.h
+ *  WhirlyGlobe-MaplyComponent
+ *
+ *  Created by Steve Gifford on 1/11/14.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <UIKit/UIKit.h>
+#import <WhirlyGlobeMaplyComponent/MaplyRenderController.h>
+
+/**
+ Holds info about a single style from the MaplySimpleStyleManager.
+ This is enough to build a marker (or other thing, if you like).
+ */
+@interface MaplySimpleStyle : NSObject
+
+/// If there was a title, this is it
+@property (nonatomic,nullable) NSString *title;
+
+/// If there was a description, this is it
+@property (nonatomic,nullable) NSString *desc;
+
+/// Size (in pixels) of the marker to be built
+@property (nonatomic) CGSize markerSize;
+
+/// How big we consider the marker to be when doing layout.
+/// By default, same as the marker size
+@property (nonatomic) CGSize layoutSize;
+
+/// Offset applied to marker
+@property (nonatomic) CGPoint markerOffset;
+
+/// Texture constructed for this icon, if there was a symbol
+@property (nonatomic,nullable) MaplyTexture *markerTex;
+
+/// If this was 0-9 or a-Z instead, this is that
+@property (nonatomic,nullable) NSString *markerString;
+
+/// Color to set for the markert
+@property (nonatomic,nonnull) UIColor *color;
+
+/// Stroke color if there is one
+@property (nonatomic,nonnull) UIColor *strokeColor;
+
+/// Stroke opacity
+@property (nonatomic) float strokeOpacity;
+
+/// Stroke width, if available.  Takes scale into account.
+@property (nonatomic) float strokeWidth;
+
+/// Fill color if available
+@property (nonatomic,nonnull) UIColor *fillColor;
+
+/// Fill opacity, if available
+@property (nonatomic) float fillOpacity;
+
+@end
+
+/** Used to generate icons and parse styles for the GeoJSON simple Style spec.
+    https://github.com/mapbox/simplestyle-spec
+ 
+    Can also be used to define some very simple icon styles directly.
+ */
+@interface MaplySimpleStyleManager : NSObject
+
+/** Fetch the simple UIImage for the icon with the given name.
+  **/
++ (nullable UIImage *)iconForName:(NSString *__nonnull)name size:(CGSize)size;
+
+/** Slightly more complex icon
+  **/
++ (nullable UIImage *)iconForName:(NSString *__nullable)name size:(CGSize)size color:(UIColor *__nullable)color circleColor:(UIColor *__nullable)circleColor strokeSize:(float)strokeSize strokeColor:(UIColor *__nullable)strokeColor;
+
+/** Clear the cache
+ */
++ (void)clearIconCache;
+
+/**
+ Set up the icon manager this way to build textures associated with a particular view controller.
+ */
+- (nonnull id)initWithViewC:(NSObject<MaplyRenderControllerProtocol> * __nonnull)viewC;
+
+/// Markers can be three different sizes.  These are the actual sizes associated
+@property (nonatomic) CGSize smallSize,medSize,largeSize;
+
+/// Normal scale from device (e.g. 2x for retina and so on)
+@property (nonatomic) CGFloat scale;
+
+/// We normally put a stroke around generated icons
+/// This is the width (in pixels) of that stroek
+@property (nonatomic) CGFloat strokeWidthForIcons;
+
+/// If set (default) we'll center the marker.  If off we'll offset vertically
+@property (nonatomic) bool centerIcon;
+
+/**
+ Mapbox defines a simple style spec that's usually associated with GeoJSON data.  Github is a prominent user.
+
+ Pass in a dictionary parsed from JSON (or just make it up yourself) and this will produce (an optional) icon and parse out the rest.
+ This takes screen scale and such into account.  It will also cache the same description when passed in multiple times.
+*/
+- (MaplySimpleStyle * __nonnull)makeStyle:(NSDictionary *__nonnull)dict;
+
+/**
+ Takes a single vector object.  It will parse out the simple style from the attributes (or provide a default if there is none)
+   and then build the corresponding feature and return a MaplyComponentObject to represent it.
+ 
+ mode controls if this work is done on this thread or another.
+ */
+- (MaplyComponentObject * __nullable)addFeature:(MaplyVectorObject * __nonnull)vecObj mode:(MaplyThreadMode)mode;
+
+/**
+  Takes an array of vector objects and calls addFeature: on each one.
+
+ mode controls if this work is done on this thread or another.
+ */
+- (NSArray<MaplyComponentObject *> * __nonnull)addFeatures:(NSArray<MaplyVectorObject *> * __nonnull)vecObjs mode:(MaplyThreadMode)mode;
+
+/** Clear the icon cache.
+    Any references to the textures should already be cleared.
+ */
+- (void)clearCache;
+
+/// Delete any cached textures and such
+- (void)shutdown;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyImageTile.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyImageTile.h
new file mode 100644
index 0000000..a1a9903
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyImageTile.h
@@ -0,0 +1,113 @@
+/*
+ *  MaplyImageTile.h
+ *  WhirlyGlobe-MaplyComponent
+ *
+ *  Created by Steve Gifford on 10/18/13.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <UIKit/UIKit.h>
+#import <WhirlyGlobeMaplyComponent/MaplyRenderController.h>
+
+@class MaplyElevationChunk;
+
+/** 
+    Describes a single tile worth of data, which may be multiple images.
+    
+    Delegates can pass back a single UIImage or NSData object, but if they want to do anything more complex, they need to do it with this.
+ */
+@interface MaplyImageTile : NSObject
+
+/** 
+    Initialize with an NSData object containing 32 bit pixels.
+    
+    This sets up the tile with an NSData object containing raw pixels.  The pixels are 32 bit RGBA even if you're targeting a smaller pixel format.
+    
+    @param data The NSData object containing 32 bit RGBA pixels.
+    
+    @param width The width of the raw image contained in the data object.
+    
+    @param height The height of the raw image contained in the data object.
+ */
+- (instancetype)initWithRawImage:(NSData *)data width:(int)width height:(int)height viewC:(NSObject<MaplyRenderControllerProtocol> *)viewC;
+
+/**
+ Initialize with an NSData object containing 32 bit pixels.
+ 
+ This sets up the tile with an NSData object containing raw pixels.  The pixels are 32 bit RGBA even if you're targeting a smaller pixel format.
+ 
+ @param data The NSData object containing 32 bit RGBA pixels.
+ 
+ @param width The width of the raw image contained in the data object.
+ 
+ @param height The height of the raw image contained in the data object.
+ 
+ @param comp The number of components (1, 2 or 4)
+ */
+- (instancetype)initWithRawImage:(NSData *)data width:(int)width height:(int)height components:(int)comp viewC:(NSObject<MaplyRenderControllerProtocol> *)viewC;
+
+/**
+Initialize with an NSData object containing pixels of a given format.
+
+This sets up the tile with an NSData object containing raw pixels.  The pixels are defined by the format.
+
+@param data The NSData object containing pixels.
+ 
+@param format The image format the data is already in.
+
+@param width The width of the raw image contained in the data object.
+
+@param height The height of the raw image contained in the data object.
+*/
+- (instancetype)initWithRawImage:(NSData *)data format:(MaplyQuadImageFormat)format width:(int)width height:(int)height viewC:(NSObject<MaplyRenderControllerProtocol> *)viewC;
+
+/** 
+    Initialize with a single UIImage for the tile.
+    
+    This sets up the given UIImage as the return for the given tile.  You can then set targetSize and such.
+ */
+- (instancetype)initWithImage:(UIImage *)image viewC:(NSObject<MaplyRenderControllerProtocol> *)viewC;
+
+/** 
+    Initialize with an NSData object containing PNG or JPEG data that can be interpreted by UIImage.
+    
+    We're expecting PNG, JPEG or another self identified format (e.g. PKM).  These we can interpret ourselves.
+ */
+- (instancetype)initWithPNGorJPEGData:(NSData *)data viewC:(NSObject<MaplyRenderControllerProtocol> *)viewC;
+
+/**
+    Border size that was set on initialization.
+ 
+    If there's a built in border as part of the image data passed in during initialization, set it here.
+    Normally this is 0.
+  */
+@property (nonatomic,assign) int borderSize;
+
+/**
+ Target size for the image(s) represented by this tile.
+ 
+ This instructs the pager to rescale the image(s) to the given target size.  This is probably faster than doing it yourself because we can extract the data and rescale in the same step.
+ */
+@property (nonatomic) CGSize targetSize;
+
+/**
+    Preprocess into a simple texture format.
+ 
+    Extracting from PNG or JPEG or whatever often requires a bit of work.  We'll do that work later,
+    if this isn't called.  But if you do call it here then you can do that work on your own thread.
+  */
+- (void)preprocessTexture;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyLabel.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyLabel.h
new file mode 100644
index 0000000..38af6a7
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyLabel.h
@@ -0,0 +1,101 @@
+/*
+ *  WGLabel.h
+ *  WhirlyGlobeComponent
+ *
+ *  Created by Steve Gifford on 7/24/12.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <UIKit/UIKit.h>
+#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
+
+typedef NS_ENUM(NSInteger, MaplyLabelJustify) {
+	MaplyLabelJustifyLeft,
+	MaplyLabelJustifyMiddle,
+	MaplyLabelJustifyRight
+};
+
+/** 
+    This is a 3D label.
+    
+    The Maply Label is a 3D object that sits on top of the globe (or map) at a specified location.  If you want a 2D label that sits on top of everything else, you want the MaplyScreenLabel.  Seriously, you probably want that.
+  */
+@interface MaplyLabel : NSObject
+
+/** 
+    The location (in geographic) for this label.
+    
+    The Maply Label is a 3D object and this is its location on the globe or map.  The coordinates are in geographic (lon/lat) and the actual layout is controleld by justify.
+  */
+@property (nonatomic,assign) MaplyCoordinate loc;
+
+/** 
+    Size of the label in display units.
+    
+    The Maply Label is a 3D object placed on top of the globe or map. This controls the size of that label in display coordinates.  For the globe display coordinates are based on a radius of 1.0.
+    
+    One or both values of the size can be set.  Typically you want to set the height and let the toolkit calculate the width.
+  */
+@property (nonatomic,assign) CGSize size;
+
+/// The text to display on the globe or map at the given location.
+@property (nonatomic,strong) NSString * __nullable text;
+
+/** 
+    Text can be accompanied by an optional icon image.
+    
+    If set, we'll put this image to the left of the text in the label.  The UIImage (or MaplyTexture) will be tracked by the view controller and reused as needed or disposed of when no longer needed.
+    
+    The name had to change because Apple's private selector search is somewhat weak.
+ */
+@property (nonatomic,strong) id __nullable iconImage2;
+
+/** 
+    An option color override.
+    
+    If set, this color will override the color passed in with the NSDictionary in the view controller's add method.
+ */
+@property (nonatomic,strong) UIColor * __nullable color;
+
+/** 
+    Label selectability.  On by default
+    
+    If set, this label can be selected by the user.  If not set, this label will never appear in selection results.
+ */
+@property (nonatomic,assign) bool selectable;
+
+/** 
+    The text justification based on the location.
+    
+    Text can be placed around the location based on this value.
+ 
+|Justify Value|Description|
+|:------------|:----------|
+|MaplyLabelJustifyLeft|The label will be placed with its left side on the location.|
+|MaplyLabelJustifyMiddle|The label will be centered on the location.|
+|MaplyLabelJustifyRight|The label will be placed with its right side on the location.|
+  */
+@property (nonatomic,assign) MaplyLabelJustify justify;
+
+/** 
+    User data object for selection
+    
+    When the user selects a feature and the developer gets it in their delegate, this is an object they can use to figure out what the label means to them.
+ */
+@property (nonatomic,strong) id __nullable userObject;
+
+@end
+
+typedef MaplyLabel WGLabel;
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyLight.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyLight.h
new file mode 100644
index 0000000..4c83fca
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyLight.h
@@ -0,0 +1,60 @@
+/*  MaplyLight.h
+ *  WhirlyGlobe-MaplyComponent
+ *
+ *  Created by Steve Gifford on 1/30/13.
+ *  Copyright 2012-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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <UIKit/UIKit.h>
+#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
+
+/** 
+    The Light provides a simple interface to basic lighting within the toolkit.
+    
+    You can have up to 8 lights in the current version of the toolkit.  Obviously this is all shader implementation with OpenGL ES 2.0, so you can always just bypass this and do what you like.  However, the default shaders will look for these lights.
+    
+    The lights are very simple, suitable for the globe, and contain a position, a couple of colors, and a view dependent flag.
+  */
+@interface MaplyLight : NSObject
+
+/** 
+    The location of this particular light in display space.
+    
+    This is a single light's location in display space.  Display space for the globe is based on a radius of 1.0.
+  */
+@property (nonatomic,assign) MaplyCoordinate3d pos;
+
+/** 
+    Controls whether the light takes the model matrix into account or not.
+    
+    If set, this light moves with the model (usually the globe).  You'd use this for a real sun position. If not set, the light is static and does not move or rotate.
+  */
+@property (nonatomic,assign) bool viewDependent;
+
+/** 
+    Ambient color for the light.
+    
+    This color will always be added to any given pixel.  It provides a baseline lighting value.
+  */
+@property (nonatomic,strong) UIColor *__nullable ambient;
+
+/** 
+    Diffuse light color.
+    
+    The diffuse color is multiplied by a directional value and so will vary depending on geometry normals.
+  */
+@property (nonatomic,strong) UIColor *__nullable diffuse;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyLocationTracker.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyLocationTracker.h
new file mode 100644
index 0000000..d759183
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyLocationTracker.h
@@ -0,0 +1,174 @@
+/*
+ *  MaplyBaseViewController.h
+ *  MaplyComponent
+ *
+ *  Created by Ranen Ghosh on 11/23/16.
+ *  Copyright 2012-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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <UIKit/UIKit.h>
+#import <CoreLocation/CoreLocation.h>
+#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
+
+#define LOC_TRACKER_POS_MARKER_SIZE 32
+
+@class MaplyBaseViewController;
+
+typedef struct
+{
+    float lonDeg;
+    float latDeg;
+    float headingDeg;
+} MaplyLocationTrackerSimulationPoint;
+
+typedef enum {MaplyLocationLockNone, MaplyLocationLockNorthUp, MaplyLocationLockHeadingUp, MaplyLocationLockHeadingUpOffset} MaplyLocationLockType;
+
+/* 
+    Implement the MaplyLocationTrackerDelegate protocol to receive location services callbacks.
+*/
+@protocol MaplyLocationTrackerDelegate
+
+// This is to handle problems / failures further up the line.
+- (void) locationManager:(CLLocationManager * __nonnull)manager didFailWithError:(NSError * __nonnull)error;
+
+- (void) locationManager:(CLLocationManager * __nonnull)manager didChangeAuthorizationStatus:(CLAuthorizationStatus)status;
+
+@optional
+
+- (void) updateLocation:(CLLocation * __nonnull)location;
+
+@end
+
+/*
+    Implement the MaplyLocationSimulatorDelegate protocol to provide simulated locations
+*/
+@protocol MaplyLocationSimulatorDelegate
+
+- (MaplyLocationTrackerSimulationPoint)getSimulationPoint;
+
+@optional
+
+- (bool)hasValidLocation;
+
+@end
+
+/* 
+    The MaplyLocationTracker class provides support for showing current position and heading on the map or globe.
+   
+    Be sure to set NSLocationWhenInUseUsageDescription in your app's Info.plist before using.
+ */
+@interface MaplyLocationTracker : NSObject <CLLocationManagerDelegate>
+
+/// Exposes MaplyLocationTracker's location manager for use elsewhere
+@property (nonatomic, readonly, nullable) CLLocationManager *locationManager;
+
+/**
+    MaplyLocationTracker constructor
+ 
+    @param viewC The globe or map view controller
+ 
+    @param useHeading Use location services heading information (requires physical magnetometer)
+ 
+    @param useCourse Use location services course information as fallback if heading unavailable
+ */
+- (nonnull instancetype)initWithViewC:(MaplyBaseViewController *__nullable)viewC
+                           useHeading:(bool)useHeading
+                            useCourse:(bool)useCourse;
+
+/** 
+    MaplyLocationTracker constructor
+ 
+    @param viewC The globe or map view controller
+ 
+    @param delegate The MaplyLocationTrackerDelegate for receiving location event callbacks
+ 
+    @param useHeading Use location services heading information (requires physical magnetometer)
+ 
+    @param useCourse Use location services course information as fallback if heading unavailable
+ */
+- (nonnull instancetype)initWithViewC:(MaplyBaseViewController *__nullable)viewC
+                             delegate:(NSObject<MaplyLocationTrackerDelegate> *__nullable)delegate
+                           useHeading:(bool)useHeading
+                            useCourse:(bool)useCourse;
+
+/**
+    MaplyLocationTracker constructor
+ 
+    @param viewC The globe or map view controller
+ 
+    @param delegate The MaplyLocationTrackerDelegate for receiving location event callbacks
+
+    @param simulator  The MaplyLocationSimulatorDelegate for generating simulated locations
+
+    @param useHeading Use location services heading information (requires physical magnetometer)
+ 
+    @param useCourse Use location services course information as fallback if heading unavailable
+ */
+- (nonnull instancetype)initWithViewC:(MaplyBaseViewController *__nullable)viewC
+                             delegate:(NSObject<MaplyLocationTrackerDelegate> *__nullable)delegate
+                            simulator:(NSObject<MaplyLocationSimulatorDelegate> *__nullable)simulator
+                          simInterval:(NSTimeInterval)simInterval
+                           useHeading:(bool)useHeading
+                            useCourse:(bool)useCourse;
+
+/**
+    Min/max visibility for the marker assigned to follow location.
+  */
+@property (nonatomic,assign) float markerMinVis,markerMaxVis;
+
+/**
+    Draw priority for the marker assigned to follow location.
+  */
+@property (nonatomic,assign) int markerDrawPriority;
+
+/** 
+    Change lock type
+ 
+    @param lockType The MaplyLocationLockType value for lock behavior
+ 
+    @param forwardTrackOffset The vertical offset if using MaplyLocationLockHeadingUpOffset (positive values are below the view center)
+ */
+- (void) changeLockType:(MaplyLocationLockType)lockType forwardTrackOffset:(int)forwardTrackOffset;
+
+/** 
+    Stop the MaplyLocationTracker behavior and shut it down.
+ */
+- (void) teardown;
+
+/** 
+    Get the current device location
+ 
+    @return The coordinate if valid, else kMaplyNullCoordinate
+ */
+- (MaplyCoordinate)getLocation;
+
+/**
+    Set the current simulated location.
+ */
+- (void) setLocation:(MaplyLocationTrackerSimulationPoint)point
+            altitude:(double)altitude;
+
+/**
+    Set the current simulated location.
+ */
+- (void) setLocation:(MaplyLocationTrackerSimulationPoint)point
+            altitude:(double)altitude
+  horizontalAccuracy:(double)horizontalAccuracy
+    verticalAccuracy:(double)verticalAccuracy
+               speed:(double)speed;
+;
+
+@end
+
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyMBTileFetcher.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyMBTileFetcher.h
new file mode 100644
index 0000000..84cfab6
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyMBTileFetcher.h
@@ -0,0 +1,46 @@
+/*  MaplyMBTileFetcher.h
+ *  WhirlyGlobe-MaplyComponent
+ *
+ *  Created by Steve Gifford on 9/13/18.
+ *  Copyright 2011-2022 mousebird consulting inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#import <WhirlyGlobeMaplyComponent/MaplyTileSourceNew.h>
+#import <WhirlyGlobeMaplyComponent/MaplySimpleTileFetcher.h>
+#import <WhirlyGlobeMaplyComponent/MaplyCoordinateSystem.h>
+
+/**
+    MBTiles tile fetcher.
+ 
+    This tile fetcher focuses on a single MBTiles file.  You mate this
+    with a QuadImageLoader to do the actual work.
+
+    Will work for image or vector MBTiles files.
+  */
+@interface MaplyMBTileFetcher : MaplySimpleTileFetcher
+
+/// Initialize with the name of the local MBTiles file
+- (nullable instancetype)initWithMBTiles:(NSString *__nonnull)fileName;
+
+/// Initialize with the name of the local MBTiles file and cache size in bytes (rounded up to whole pages)
+- (nullable instancetype)initWithMBTiles:(NSString *__nonnull)fileName
+                               cacheSize:(int)cacheSize;
+
+// Coordinate system (probably Spherical Mercator)
+- (MaplyCoordinateSystem * __nonnull)coordSys;
+
+/// Format directly from the metadata
+@property (nonatomic,nullable) NSString *format;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyMarker.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyMarker.h
new file mode 100644
index 0000000..04d5e59
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyMarker.h
@@ -0,0 +1,85 @@
+/*
+ *  WGMarker.h
+ *  WhirlyGlobeComponent
+ *
+ *  Created by Steve Gifford on 7/24/12.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <UIKit/UIKit.h>
+#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
+
+/** 
+    The Marker places a UIImage on the globe or map at a given location.
+    
+    The Maply Marker takes a location and image, using those to display a textured rectangle on the globe (or map).  Since it's a real 3D object it will get larger and smaller as the user moves around.
+    
+    If you want a screen based object that stays the same size and is displayed on top of everything else, look to the MaplyScreenMarker.
+  */
+@interface MaplyMarker : NSObject
+
+/** 
+    Center of the marker in geographic coordinates (lon/lat in radians).
+    
+    The Maply Marker is a 3D object so this is the center of the marker on the globe or map.
+  */
+@property (nonatomic,assign) MaplyCoordinate loc;
+
+
+/** 
+    Size of the marker in display coordinates.
+    
+    This is the size of the marker in display coordinates.  For the globe display coordinates are based on a radius of 1.0.
+  */
+@property (nonatomic,assign) CGSize size;
+
+/** 
+    Image or MaplyTexture to use for the marker.
+    
+    If set, we'll display a UIImage at the given location of the given size.  If not set, it's just a color rectangle which is not very exciting.  The view controller tracks the UIImage and will reuse it as necessary and release it when finished.
+  */
+@property (nonatomic,strong) id __nullable image;
+
+/** 
+    Images or MaplyTextures to use for the marker.
+    
+    If set we'll animate these images one after the other over the duration.
+  */
+@property (nonatomic,strong) NSArray * __nullable images;
+
+/** 
+    The time we'll take to cycle through all the images for the marker.
+    
+    If images are passed in, this is the time it will take to cycle through them all.  By default this is 5s.
+ */
+@property (nonatomic) double period;
+
+/** 
+    Marker selectability.  On by default
+    
+    If set, this marker can be selected by the user.  If not set, this marker will never appear in selection results.
+ */
+@property (nonatomic,assign) bool selectable;
+
+/** 
+    User data object for selection
+    
+    When the user selects a feature and the developer gets it in their delegate, this is an object they can use to figure out what the label means to them.
+ */
+@property (nonatomic,strong) id  __nullable userObject;
+
+@end
+
+typedef MaplyMarker WGMarker;
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyMatrix.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyMatrix.h
new file mode 100644
index 0000000..646a29b
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyMatrix.h
@@ -0,0 +1,65 @@
+/*
+ *  MaplyMatrix.h
+ *  WhirlyGlobe-MaplyComponent
+ *
+ *  Created by Steve Gifford on 10/16/14.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <Foundation/Foundation.h>
+
+/** 
+    Represents a matrix for position manipulation.
+    
+    Encapsulates a 4x4 matrix used for object placement and other things.  This is more a wrapper than a full service object.
+  */
+@interface MaplyMatrix : NSObject
+
+/** 
+    Construct with yaw, pitch, and roll parameters.
+    
+    Construct the matrix with the standard yaw, pitch, and roll used by aircraft.
+  */
+- (nonnull instancetype)initWithYaw:(double)yaw pitch:(double)pitch roll:(double)roll;
+
+/** 
+    Construct with a consistent scale in each dimension.
+    
+    Construct with the same scale in x,y, and z.
+  */
+- (nonnull instancetype)initWithScale:(double)scale;
+
+/** 
+    Construct with a translation.
+    
+    Construct with a translation in 3D.
+  */
+- (nonnull instancetype)initWithTranslateX:(double)x y:(double)y z:(double)z;
+
+/** 
+    Construct a rotation around the given axis.
+    
+    Build a matrix that rotates the given amount (in radians) around the given axis.
+  */
+- (nonnull instancetype)initWithAngle:(double)ang axisX:(double)x axisY:(double)y axisZ:(double)z;
+
+/** 
+    Multiply the given matrix with this one and return a new one.
+    
+    Multiply the given matrix like so:  ret = this * other.  Return the new one.
+  */
+- (nonnull instancetype)multiplyWith:(MaplyMatrix * __nonnull)other;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyMoon.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyMoon.h
new file mode 100644
index 0000000..f55f616
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyMoon.h
@@ -0,0 +1,50 @@
+/*  MaplyMoon.h
+ *  WhirlyGlobe-MaplyComponent
+ *
+ *  Created by Steve Gifford on 7/2/15.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#import <UIKit/UIKit.h>
+#import <WhirlyGlobeMaplyComponent/MaplyComponentObject.h>
+#import <WhirlyGlobeMaplyComponent/WhirlyGlobeViewController.h>
+#import <WhirlyGlobeMaplyComponent/MaplyLight.h>
+
+/** 
+    Utility for calculating moon position.
+    
+    This is a utility class that figures out where the moon is at a given data and provides the position.
+  */
+@interface MaplyMoon : NSObject
+
+/** 
+    Initialize with a date.
+    
+    Initialize with the given date.  The moon position will correspond to that.  Must be after 2000.
+  */
+- (nonnull instancetype)initWithDate:(NSDate *__nonnull)date;
+
+/// Location on the globe where the moon would land if it fell straight down.  Ouch.
+- (MaplyCoordinate)asCoordinate;
+
+/// Return the location above the globe in lon/lat/distance.  Yay geocentric!
+- (MaplyCoordinate3d)asPosition;
+
+/// Illuminated fraction of the moon
+@property (readonly) double illuminatedFraction;
+
+/// Phase of the moon.
+@property (readonly) double phase;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyPanDelegate.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyPanDelegate.h
new file mode 100644
index 0000000..bf3dc43
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyPanDelegate.h
@@ -0,0 +1,32 @@
+/*  MaplyPanDelegate.h
+ *  WhirlyGlobeLib
+ *
+ *  Created by Steve Gifford on 1/10/12.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#import <UIKit/UIKit.h>
+
+// Custom pan gesture recognizer that plays well with scroll views.
+@interface MinDelay2DPanGestureRecognizer : UIPanGestureRecognizer
+
+- (void)forceEnd;
+
+@end
+
+@interface MaplyPanDelegate : NSObject <UIGestureRecognizerDelegate>
+
+@property (nonatomic,weak) UIGestureRecognizer *gestureRecognizer;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyParticleSystem.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyParticleSystem.h
new file mode 100644
index 0000000..ac92b21
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyParticleSystem.h
@@ -0,0 +1,215 @@
+/*
+ *  MaplyParticleSystem.h
+ *  WhirlyGlobe-MaplyComponent
+ *
+ *  Created by Steve Gifford on 4/26/15.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <UIKit/UIKit.h>
+#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
+#import <WhirlyGlobeMaplyComponent/MaplyShader.h>
+#import <WhirlyGlobeMaplyComponent/MaplyRenderTarget.h>
+
+typedef NS_ENUM(NSInteger, MaplyParticleSystemType) {
+	MaplyParticleSystemTypePoint,
+	MaplyParticleSystemTypeRectangle,
+};
+
+/** 
+    A particle system is used to spawn large numbers of small moving objects.
+    
+    The particle system defines what the objects are and how they're controlled.  Actual data is handled through the MaplyParticleBatch.
+    
+    You set up a particle system and then add MaplyParticleBatches via a view controller.
+  */
+@interface MaplyParticleSystem : NSObject
+
+/** 
+    Name of the particle system.
+    
+    The particle system name is used for performance debugging.
+  */
+@property (nonatomic,strong) NSString * __nullable name;
+
+/** 
+    The type of the particle system.
+    
+    At present particle systems are just point geometry.
+  */
+@property (nonatomic,assign) MaplyParticleSystemType type;
+
+/**
+    Position shader for two stage particles.
+ 
+    If there is a position shader then it is run first and particle data is then
+    shared between this shader and the regular shader.
+  */
+@property (nonatomic,strong) MaplyShader * __nullable positionShader;
+
+/**
+    Shader to use for rendering particles.
+ 
+    This can either be a single stage shader or it can be part of a two stage shader with
+    the positionShader.
+  */
+@property (nonatomic,strong) MaplyShader * __nullable renderShader;
+
+/** 
+    Individual particle lifetime.
+    
+    The created particles will last only a certain amount of time.
+  */
+@property (nonatomic,assign) NSTimeInterval lifetime;
+
+/** 
+    The base that particle time is measured from.
+    
+    Individual particles will measure their own lifetime against this base value.
+  */
+@property (nonatomic,assign) NSTimeInterval baseTime;
+
+/** 
+    Total number of particles to be represented at once.
+    
+    This is the most particles we'll have on the screen at any time.  Space will be allocated for them, so don't overdo it.
+  */
+@property (nonatomic,assign) int totalParticles;
+
+/** 
+    Batch size for MaplyParticleBatch.
+    
+    Particles need to be created in large batches for efficiency.  This is the size of individual batches.
+ 
+    Only for OpenGL ES.  Metal does particles as one big batch.
+  */
+@property (nonatomic,assign) int batchSize;
+
+/**
+   Metal only.
+   Size of a single to be passed in to the calculation and rendering shaders.
+  */
+@property (nonatomic,assign) int vertexSize;
+
+/** 
+    Turn on/off the continuous rendering for particles.
+    
+    Normally particle systems force the renderer to draw every frame.  That's how the particles move.  You can turn that behavior off by setting this to false.
+  */
+@property (nonatomic,assign) bool continuousUpdate;
+
+/** 
+    Initialize a particle system with a name.
+    
+    The particle system needs the name for performance and debugging.  The rest of the values can left to their defaults.
+  */
+- (nonnull instancetype)initWithName:(NSString *__nonnull)name viewC:(NSObject <MaplyRenderControllerProtocol> * __nonnull)viewC;
+
+/** 
+    Add an attribute we'll be expecting in each batch.
+    
+    Adds an attribute name and type which will be present in each batch.
+ 
+    OpenGL ES Only.  Metal handles things as blocks of memory.
+  */
+- (void)addAttribute:(NSString *__nonnull)attrName type:(MaplyShaderAttrType)type;
+
+/**
+    For two stage shaders, these are the varying outputs from one shader to the next.
+ 
+    Two stage shaders run a position shader and then a regular render shader
+    from the position output.  Add any varying values you want to share per
+    vertex from the former to the latter.
+
+    OpenGL ES Only.  Metal does this more simply.
+  */
+- (void)addVarying:(NSString *__nonnull)varyAttrName inputName:(NSString *__nonnull)inputName type:(MaplyShaderAttrType)type;
+
+/**
+ For Metal, we just pass in input and output arrays (at least two) along with the number of entries
+ in those arrays.  The shaders do the rest of the work in Metal.
+ */
+- (void)addCalculationNum:(int)numEntries data:(NSMutableArray<NSData *> * __nonnull)dataEntries;
+
+/** 
+    Add a texture to the particle system.
+    
+    All the textures will be handed over to the shader.
+  */
+- (void)addTexture:(id __nonnull)image;
+
+/**
+    Draw these particles to the given render target.
+ 
+    Rather than being drawn to the screen, these particles will be drawn to the offscreen render target.
+  */
+- (void)setRenderTarget:(MaplyRenderTarget * __nonnull)renderTarget;
+
+@end
+
+
+/** 
+    A particle batch adds a set number of particles to the system.
+    
+    The particle batch holds the number of particles defined in the MaplyParticleSystem batchSize property.  Each attribute array is added individually via an NSData object.  All attributes must be present or the batch is invalid and won't be passed through the system.
+  */
+@interface MaplyParticleBatch : NSObject
+
+/** 
+    The particle system this batch belongs to.
+  */
+@property (nonatomic,weak) MaplyParticleSystem * __nullable partSys;
+
+/** 
+    The current time.
+    
+    This will be set by default.  However, you can control what the time basis for a particle batch is.
+  */
+@property (nonatomic,assign) NSTimeInterval time;
+
+/** 
+    Initialize with the particle system.
+    
+    The batch is initialized with its particle system.  You must then call addAttribute:values: repeatedly with attribute arrays.
+  */
+- (nonnull instancetype)initWithParticleSystem:(MaplyParticleSystem *__nonnull)partSys;
+
+/**
+    OpenGL ES only.
+ 
+    Add an attribute array of the given name.
+    
+    Each attribute in the MaplyParticleSystem must be filled in here.  The name must correspond and the length of the data must match.
+    
+    @return Returns true if the attribute array was valid, false otherwise.
+  */
+- (bool) addAttribute:(NSString *__nonnull)attrName values:(NSData *__nonnull)data;
+
+/**
+   Metal only.
+ 
+   We add the batch as a single blob of data.  Format is up to you and your shader.
+ 
+  */
+- (void) addData:(NSData * __nonnull)data;
+
+/** 
+    Tests if the batch is valid.
+    
+    This checks if all the attribute arrays are present and valid.
+  */
+- (bool) isValid;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyPinchDelegate.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyPinchDelegate.h
new file mode 100644
index 0000000..01c0b9e
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyPinchDelegate.h
@@ -0,0 +1,23 @@
+/*  MaplyPinchDelegate.h
+ *  WhirlyGlobeLib
+ *
+ *  Created by Steve Gifford on 1/10/12.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#import <WhirlyGlobeMaplyComponent/MaplyZoomGestureDelegate.h>
+
+@interface MaplyPinchDelegate : MaplyZoomGestureDelegate
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyPoints.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyPoints.h
new file mode 100644
index 0000000..ee59f35
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyPoints.h
@@ -0,0 +1,84 @@
+/*
+ *  MaplyPoints.h
+ *  WhirlyGlobeComponent
+ *
+ *  Created by Steve Gifford on 10/21/15
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <UIKit/UIKit.h>
+#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
+#import <WhirlyGlobeMaplyComponent/MaplyRenderController.h>
+#import <WhirlyGlobeMaplyComponent/MaplyMatrix.h>
+
+/** 
+    The Maply Points object is used to add a large number of static points to the scene.
+    
+    Rather than add a single 3D point we assume you want to add a lot of them all at once.  This object lets you do that and lets you assign the various data values to input attributes in your custom shader.
+    
+    All the cool kids have custom shaders.
+  */
+@interface MaplyPoints : NSObject
+
+/// Initialie with a hint as to the number of points you'll be adding (not required).
+- (__nonnull id)initWithNumPoints:(int)numPoints;
+
+/// Transform to apply to the point locations.  A center is good.
+@property (nonatomic,strong) MaplyMatrix * __nullable transform;
+
+/// Add a geocoordinate in lon/lat and Z (meters).
+- (void)addGeoCoordLon:(float)x lat:(float)y z:(float)z;
+
+/// Directly add a coordinate in display space.  Remember the globe is a sphere with radius = 1.0.
+- (void)addDispCoordX:(float)x y:(float)y z:(float)z;
+
+/// Add a display space coordinate, but use doubles for precision.
+- (void)addDispCoordDoubleX:(double)x y:(double)y z:(double)z;
+
+/// Add a color, which will be converted to 8 bits before going to the shader.
+- (void)addColorR:(float)r g:(float)g b:(float)b a:(float)a;
+
+/** 
+    Add a new attribute array of the given type.
+    
+    If you have a custom shader, this is a convenient way to pass a large array of attributes to it.  Just specify the name (attribute name in the shader) and the type and then add the appropriate values.  The data will be handed down to the shader at render time.
+    
+    @param attrName The name of the attribute as used by the shader.
+    
+    @param type The data type of the attribute.
+    
+    @return An index (or -1 if invalid) for the attribute.  Use this in the addAttribute calls.
+  */
+- (int)addAttributeType:(NSString *__nonnull)attrName type:(MaplyShaderAttrType)type;
+
+/// Add an integer attribute.
+- (void)addAttribute:(int)whichAttr iVal:(int)val;
+
+/// Add a float attribute.
+- (void)addAttribute:(int)whichAttr fVal:(float)val;
+
+/// Add a two component float attribute.
+- (void)addAttribute:(int)whichAttr fValX:(float)valX fValY:(float)valY;
+
+/// Add a three component float attribute.
+- (void)addAttribute:(int)whichAttr fValX:(float)fValX fValY:(float)valY fValZ:(float)valZ;
+
+/// Add a three component float attribute, but we'll store it at doubles until it gets to the shader.
+- (void)addAttribute:(int)whichAttr valX:(double)valX valY:(double)valY valZ:(double)valZ;
+
+/// Add a four commponent float attribute.
+- (void)addAttribute:(int)whichAttr fValX:(float)valX fValY:(float)valY fValZ:(float)valZ fValW:(float)valW;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyQuadImageFrameLoader.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyQuadImageFrameLoader.h
new file mode 100644
index 0000000..b1da668
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyQuadImageFrameLoader.h
@@ -0,0 +1,191 @@
+/*
+ *  MaplyQuadImageFrameLoader.h
+ *
+ *  Created by Steve Gifford on 9/13/18.
+ *  Copyright 2012-2022 mousebird consulting inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <WhirlyGlobeMaplyComponent/MaplyQuadImageLoader.h>
+#import <WhirlyGlobeMaplyComponent/MaplyActiveObject.h>
+
+@class MaplyQuadImageFrameLoader;
+
+/**
+    Quad Image FrameAnimation runs through the frames in a Quad Image Frame loader over time.
+ 
+    Set this up with a MaplyQuadImageFrameLoader and it'll run through the available frames from start to finish.
+    At the end it will snap back to the beginning.
+  */
+@interface MaplyQuadImageFrameAnimator : MaplyActiveObject
+
+/// Initialize with the image frame loader and view controller
+- (nonnull instancetype)initWithFrameLoader:(MaplyQuadImageFrameLoader * __nonnull)loader viewC:(MaplyBaseViewController * __nonnull)viewC;
+
+/// How long to animate from start to finish.
+@property (nonatomic,assign) NSTimeInterval period;
+
+/// How long to pause at the end of the sequence before starting back
+@property (nonatomic,assign) NSTimeInterval pauseLength;
+
+/// Remove the animator and stop animating
+- (void)shutdown;
+
+@end
+
+/**
+    The Maply Quad Image Frame Loader can generation per-frame stats.  These are them.
+  */
+@interface MaplyQuadImageFrameStats : NSObject
+
+/// Number of tiles this frame is in (loading and loaded)
+@property (nonatomic) int totalTiles;
+
+/// Number of tiles this frame has yet to load
+@property (nonatomic) int tilesToLoad;
+
+@end
+
+/**
+    Stats generated by the Maply Quad Image Frame Loader.
+  */
+@interface MaplyQuadImageFrameLoaderStats : NSObject
+
+/// Total number of tiles managed by the loader
+@property (nonatomic) int numTiles;
+
+/// Per frame stats for current loading state
+@property (nonatomic,nonnull) NSArray<MaplyQuadImageFrameStats *> *frames;
+
+@end
+
+/// How we load frames in the QuadImageFrameLoader
+/// Broad means we load 0 first and the on down
+/// Narrow means we load the frames around the current display first
+typedef NS_ENUM(NSInteger, MaplyLoadFrameMode) {
+    MaplyLoadFrameBroad,
+    MaplyLoadFrameNarrow,
+};
+
+/**
+ The Maply Quad Image Frame Loader is for paging individual frames of image pyramids.
+
+ This works much like the Quad Image Loader, but handles more than one frame.  You can animate
+ between the frames with the QuadImageFrameAnimator
+ */
+@interface MaplyQuadImageFrameLoader : MaplyQuadImageLoaderBase
+
+/**
+ Initialize with multiple tile sources (one per frame).
+ 
+ @param params The sampling parameters describing how to break down the data for projection onto a globe or map.
+ @param tileInfos A list of tile info objects to fetch for each frame.
+ @param viewC the View controller (or renderer) to add objects to.
+ */
+- (nullable instancetype)initWithParams:(MaplySamplingParams *__nonnull)params tileInfos:(NSArray<NSObject<MaplyTileInfoNew> *> *__nonnull)tileInfos viewC:(MaplyBaseViewController * __nonnull)viewC;
+
+/// How frames are loaded (top down vs broad)
+@property (nonatomic,assign) MaplyLoadFrameMode loadFrameMode;
+
+/**
+  Add another rendering focus to the frame loader.
+ 
+  Normally you'd have one point of focus for a frame loader resulting in one image
+  to be displayed.  But if you're using render targets, you may want to have two
+  and combine them in some way yourself.  Or more.  No idea why you'd do that.
+ 
+  If you're going to do this, call addFocus right after you create the FrameLoader.
+  */
+- (void)addFocus;
+
+/**
+  Return the number of focii.  Normally it's 1.
+ 
+  See addFocus for what these are.  You probably don't need to be using them.
+  */
+- (int)getNumFocus;
+
+/**
+  Set the interpolated location within the array of frames.
+ 
+  Each set of frames can be accessed from [0.0,numFrames].  Images will be interpolated between
+  those values and may be snapped if data has not yet loaded.
+ 
+  This value is used once per frame, so feel free to call this as much as you'd like.
+  */
+- (void)setCurrentImage:(double)where;
+
+/**
+  Set the currentImage for the given focus.  See addFocus for what those are.
+  */
+- (void)setFocus:(int)focusID currentImage:(double)where;
+
+/**
+  Return the interpolated location within the array of frames.
+  */
+- (double)getCurrentImage;
+
+/**
+  Return the interpolated location within the array of frames for a given focus.  See addFocus for what that means.
+  */
+- (double)getCurrentImageForFocus:(int)focusID;
+
+/**
+ Set whether we require the top tiles to be loaded before a frame can be displayed.
+ 
+ Normally the system wants all the top level tiles to be loaded (just one at level 0)
+ to be in memory before it will display a frame at all.  You can turn this off.
+ */
+- (void)setRequireTopTiles:(bool)newVal;
+
+/** Number of tile sources passed in as individual frames.
+  */
+- (int)getNumFrames;
+
+/**
+ An optional render target for this loader.
+ 
+ The loader can draw to a render target rather than to the screen.
+ You use this in a multi-pass rendering setup.
+ 
+ This version takes a specific focus.  See addFocus for what that means.
+ */
+- (void)setFocus:(int)focusID renderTarget:(MaplyRenderTarget *__nonnull)renderTarget;
+
+/**
+ Shader to use for rendering the image frames for a particular focus.
+ 
+ Consult addFocus for what this means.
+ */
+- (void)setFocus:(int)focusID shader:(MaplyShader * __nullable)shader;
+
+/**
+  Get the frame stats for what's loaded and what's not.
+  */
+- (MaplyQuadImageFrameLoaderStats * __nonnull)getFrameStats;
+
+/**
+   Change the tile sources and reload all the data.
+   <br>
+   You can change the tile source data is being loaded from.  This will
+   force a reload and everything visual should change as the data comes in.
+  */
+- (void)changeTileInfos:(NSArray<MaplyTileInfoNew> * __nullable)tileInfo;
+
+/** Turn off the image loader and shut things down.
+ This unregisters us with the sampling layer and shuts down the various objects we created.
+ */
+- (void)shutdown;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyQuadImageLoader.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyQuadImageLoader.h
new file mode 100644
index 0000000..b524401
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyQuadImageLoader.h
@@ -0,0 +1,229 @@
+/*
+ *  MaplyQuadImageLoader.h
+ *
+ *  Created by Steve Gifford on 4/10/18.
+ *  Copyright 2012-2022 Saildrone Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <WhirlyGlobeMaplyComponent/MaplyControllerLayer.h>
+#import <WhirlyGlobeMaplyComponent/MaplyCoordinateSystem.h>
+#import <WhirlyGlobeMaplyComponent/MaplyTileSourceNew.h>
+#import <WhirlyGlobeMaplyComponent/MaplyRenderController.h>
+#import <WhirlyGlobeMaplyComponent/MaplyQuadSampler.h>
+#import <WhirlyGlobeMaplyComponent/MaplyRemoteTileFetcher.h>
+#import <WhirlyGlobeMaplyComponent/MaplyQuadLoader.h>
+
+/**
+ This version of the loader return is used by the MaplyImageLoaderInterpreter.
+ 
+ When image tiles load, the interpeter fills in these contents, which can
+ include any sort of ComponentObject and, of course, images.
+ */
+@interface MaplyImageLoaderReturn : MaplyLoaderReturn
+
+/// Initialize with the loader this will be attached to
+- (id __nonnull)initWithLoader:(MaplyQuadLoaderBase * __nonnull)loader;
+
+/// Add an image to this loaded return.
+/// You can add multiple, but the interpreter should be expecting that
+- (void)addImageTile:(MaplyImageTile * __nonnull)image;
+
+/// Add a UIImage to the loader return
+/// This just adds a MaplyImageTile wrapper around the UIImage.
+- (void)addImage:(UIImage * __nonnull)image;
+
+/// Return an array of Images
+- (NSArray<MaplyImageTile *> * __nonnull)getImages;
+
+/// Clear out any images.  Presumably to replace them.
+- (void)clearImages;
+
+/// If any component objects are associated with the tile, these are them.
+/// They need to start disabled.  The system will enable and delete them when it is time.
+- (void)addCompObjs:(NSArray<MaplyComponentObject *> * __nonnull)compObjs;
+
+/// Return the component objects added for this loader return
+- (NSArray<MaplyComponentObject *> *__nonnull)getCompObjs;
+
+/// Clear out any component objects, presumably to replace them
+- (void)clearCompObjs;
+
+/// These component objects are assumed to be overlaid and so only one
+/// set will be displayed at a time.
+- (void)addOvlCompObjs:(NSArray<MaplyComponentObject *> * __nonnull)compObjs;
+
+/// Return the overlay component objects added for this loader return
+- (NSArray<MaplyComponentObject *> *__nonnull)getOvlCompObjs;
+
+/// Clear out any component objects, presumably to replace them
+- (void)clearOvlCompObjs;
+
+@end
+
+/**
+ Image loader intrepreter turns NSData objects into MaplyImageTiles.
+ 
+ This is the default interpreter used by the MaplyQuadImageLoader.
+ */
+@interface MaplyImageLoaderInterpreter : NSObject<MaplyLoaderInterpreter>
+@end
+
+/**
+ This loader interpreter sticks a designator in the middle of tiles
+ and a line around the edge.  Nice for debugging.
+ */
+@interface MaplyOvlDebugImageLoaderInterpreter : MaplyImageLoaderInterpreter
+
+// Intialize with the loader we're using.  Need this for extents of tiles
+- (instancetype __nonnull)initWithViewC:(NSObject<MaplyRenderControllerProtocol> * __nonnull)viewC;
+
+@end
+
+/**
+ This loader interpreter makes up an image for the given frame/tile
+ and returns that.  It doesn't use any returned data.
+ */
+@interface MaplyDebugImageLoaderInterpreter : MaplyImageLoaderInterpreter
+
+- (instancetype __nonnull)initWithViewC:(NSObject<MaplyRenderControllerProtocol> * __nonnull)viewC;
+
+@end
+
+/**
+ This loader interpreter treats input image data objects as PNGs containing raw data.
+ The difference is we'll use a direct PNG reader to tease it out, rather than UIImage.
+ */
+@interface MaplyRawPNGImageLoaderInterpreter : MaplyImageLoaderInterpreter
+
+/// In some cases we just want to pick values out of the input
+- (void)addMappingFrom:(int)inVal to:(int)outVal;
+
+@end
+
+/// Name of the shared MaplyRemoteTileFetcher
+extern NSString * _Nonnull const MaplyQuadImageLoaderFetcherName;
+
+/**
+  Base object for Maply Quad Image loader.
+ 
+  Look to the subclasses for actual functionality.  This holds methods they share.
+  */
+@interface MaplyQuadImageLoaderBase : MaplyQuadLoaderBase
+
+/** Set the base priority values for produced tiles.
+ 
+    The system will use a range of values to deal with overlaps.
+    This is the base value.
+  */
+@property (nonatomic) int baseDrawPriority;
+
+// Offset between levels for a calculated draw priority
+@property (nonatomic) int drawPriorityPerLevel;
+
+// Base color for geometry produced
+@property (nonatomic,retain,nonnull) UIColor *color;
+
+// Write to the z buffer when rendering.  On by default
+@property (nonatomic,assign) bool zBufferWrite;
+
+// Read from the z buffer when rendering.  Off by default
+@property (nonatomic,assign) bool zBufferRead;
+
+// Turn display of loader on or off.  Will still load, though.
+@property bool enable;
+
+/**
+ Shader to use for rendering the image frames.
+ 
+ If not set we'll pick the default visual shader.
+ */
+- (void)setShader:(MaplyShader * __nullable)shader;
+
+/**
+ An optional render target for this loader.
+ 
+ The loader can draw to a render target rather than to the screen.
+ You use this in a multi-pass rendering setup.
+ */
+- (void)setRenderTarget:(MaplyRenderTarget *__nonnull)renderTarget;
+
+/**
+ In special cases we may have tiles that already have borders baked in.  In that case, call this
+ method to set both the total textures size and the number of border pixels around the outside.
+ 
+ By default this functionality is off.
+ */
+- (void)setTextureSize:(int)texSize borderSize:(int)borderSize;
+
+/**
+ Set the image format for internal imagery storage.
+ 
+ OpenGL ES offers us several image formats that are more efficient than 32 bit RGBA, but they're not always appropriate.  This property lets you choose one of them.  The 16 or 8 bit ones can save a huge amount of space and will work well for some imagery, most maps, and a lot of weather overlays.
+ 
+ Be sure to set this at layer creation, it won't do anything later on.
+ 
+ | Image Format | Description |
+ |:-------------|:------------|
+ | MaplyImageIntRGBA | 32 bit RGBA with 8 bits per channel.  The default. |
+ | MaplyImageUShort565 | 16 bits with 5/6/5 for RGB and none for A. |
+ | MaplyImageUShort4444 | 16 bits with 4 bits for each channel. |
+ | MaplyImageUShort5551 | 16 bits with 5/5/5 bits for RGB and 1 bit for A. |
+ | MaplyImageUByteRed | 8 bits, where we choose the R and ignore the rest. |
+ | MaplyImageUByteGreen | 8 bits, where we choose the G and ignore the rest. |
+ | MaplyImageUByteBlue | 8 bits, where we choose the B and ignore the rest. |
+ | MaplyImageUByteAlpha | 8 bits, where we choose the A and ignore the rest. |
+ | MaplyImageUByteRGB | 8 bits, where we average RGB for the value. |
+ | MaplyImage4Layer8Bit | 32 bits, four channels of 8 bits each.  Just like MaplyImageIntRGBA, but a warning not to do anything too clever in sampling. |
+ */
+@property (nonatomic) MaplyQuadImageFormat imageFormat;
+
+@end
+
+/**
+ The Maply Quad Image Loader is for paging image pyramids local or remote.
+ 
+ This layer pages image pyramids.  They can be local or remote, in any coordinate system Maply supports and you provide a MaplyTileInfoNew conformant object to do the actual image tile fetching.
+ 
+ You probably don't have to implement your own tile source.  Go look at the MaplyRemoteTileFetcher and MaplyMBTileFetcher objects.  Those will do remote and local fetching.
+ */
+@interface MaplyQuadImageLoader : MaplyQuadImageLoaderBase
+
+/**
+ Initialize with a single tile info object and the sampling parameters.
+ 
+ @param params The sampling parameters describing how to break down the data for projection onto a globe or map.
+ @param tileInfo A single tile info object describing where the data is and how to get it.
+ @param viewC the View controller (or renderer) to add objects to.
+ */
+- (nullable instancetype)initWithParams:(MaplySamplingParams *__nonnull)params tileInfo:(NSObject<MaplyTileInfoNew> *__nullable)tileInfo viewC:(NSObject<MaplyRenderControllerProtocol> * __nonnull)viewC;
+
+/**
+  Initialize with multiple tile sources and sampling parameters.
+ 
+ @param params The sampling parameters describing how to break down the data for projection onto a globe or map.
+ @param tileInfos A list of tile info objects to fetch for each tile.  If one fails, the tile fails to load.
+ @param viewC the View controller (or renderer) to add objects to.
+  */
+- (nullable instancetype)initWithParams:(MaplySamplingParams *__nonnull)params tileInfos:(NSArray<NSObject<MaplyTileInfoNew> *> *__nonnull)tileInfos viewC:(NSObject<MaplyRenderControllerProtocol> * __nonnull)viewC;
+
+/**
+   Change the tile source and reload all the data.
+   <br>
+   You can change the tile source data is being loaded from.  This will
+   force a reload and everything visual should change as the data comes in.
+  */
+- (void)changeTileInfo:(NSObject<MaplyTileInfoNew> *__nonnull)tileInfo;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyQuadLoader.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyQuadLoader.h
new file mode 100644
index 0000000..3ef22cd
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyQuadLoader.h
@@ -0,0 +1,236 @@
+/*
+ *  MaplyQuadLoader.h
+ *
+ *  Created by Steve Gifford on 2/12/19.
+ *  Copyright 2012-2022 Saildrone Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <Foundation/Foundation.h>
+#import <WhirlyGlobeMaplyComponent/MaplyControllerLayer.h>
+#import <WhirlyGlobeMaplyComponent/MaplyCoordinateSystem.h>
+#import <WhirlyGlobeMaplyComponent/MaplyTileSourceNew.h>
+#import <WhirlyGlobeMaplyComponent/MaplyRenderController.h>
+#import <WhirlyGlobeMaplyComponent/MaplyQuadSampler.h>
+#import <WhirlyGlobeMaplyComponent/MaplyRemoteTileFetcher.h>
+
+@class MaplyQuadLoaderBase;
+
+/**
+ Passed in to and returned by the Loader Interpreter.
+ 
+ We pass this into the interpreter with the unparsed data.  It parses it and passes that
+ data back, possibly with an error.
+ */
+@interface MaplyLoaderReturn : NSObject
+
+/// Initialize with the loader this will be attached to
+- (id __nonnull)initWithLoader:(MaplyQuadLoaderBase * __nonnull)loader;
+
+/// Tile this is the data for
+@property (nonatomic) MaplyTileID tileID;
+
+/// If set, the frame.  -1 by default
+@property (nonatomic,readonly) int frame;
+
+/// Data returned from a tile request.  Unparsed.
+/// You can add multiple of these, but the interpreter should be expecting that
+- (void)addTileData:(id __nonnull) tileData;
+
+/// Return the tile NSData objects as an array
+- (NSArray<id> * __nonnull)getTileData;
+
+/// Return the first data object.  You're probably only expecting the one.
+- (id __nullable)getFirstData;
+
+/// Set when the QuadLoader cancels a tile.  You can check this in your dataForTile:
+- (bool)isCancelled;
+
+/// If this is set, the tile failed to parse
+/// You can set it and the system will deal with the results
+@property (nonatomic,strong) NSError * __nullable error;
+
+@end
+
+/**
+ Loader Interpreter converts raw data into images and objects.
+ 
+ Converts data returned from a remote source (or cache) into images and/or
+ MaplyComponentObjects that have already been added to the view (disabled).
+ */
+@protocol MaplyLoaderInterpreter<NSObject>
+
+/** Set when the loader first starts up.
+ 
+    If you need to tweak loader settings, do it here.
+  */
+- (void)setLoader:(MaplyQuadLoaderBase * __nonnull)loader;
+
+/**
+ Parse the data coming back from a remote request and turn it into something we can use.
+ 
+ Convert the NSData passed in to image and component objects (e.g. add stuff to the view controller).
+ Everything added should be disabled to start.
+ */
+- (void)dataForTile:(MaplyLoaderReturn * __nonnull)loadReturn loader:(MaplyQuadLoaderBase * __nonnull)loader;
+
+/**
+  Notification that the tile was unloaded by the system.  If you're tracking your own resources, you may need this.
+ */
+- (void)tileUnloaded:(MaplyTileID)tileID;
+
+@end
+
+/** Base class for the quad loaders.
+
+    The image, frame, and data paging loaders all share much of the same functionality.
+ */
+@interface MaplyQuadLoaderBase : NSObject
+
+/**
+ Control how tiles are indexed, either from the lower left or the upper left.
+ 
+ If set, we'll use the OSM approach (also Google Maps) to y indexing.  That's that default and it's normally what you're run into.
+ 
+ Strictly speaking, TMS addressing (the standard) is flipped the other way.  So if your tile source looks odd, try setting this to false.
+ 
+ Default value is true.
+ */
+@property (nonatomic) bool flipY;
+
+/// Set for a lot of debugging output
+@property (nonatomic,assign) bool debugMode;
+
+/// View controller this is attached to.
+/// Useful for delegate calls that might not be tracking that.
+@property (nonatomic,readonly,weak,nullable) NSObject<MaplyRenderControllerProtocol> *viewC;
+
+/// If set, we'll call the interpreter on this queue
+@property (nonatomic,nullable,strong) dispatch_queue_t queue;
+
+/// Number of simulataneous tiles we'll parse
+/// This is really just a limit on the number of tiles we'lll parse concurrently to keep memory use under control
+@property (nonatomic) unsigned int numSimultaneousTiles;
+
+// True if the loader is not currently loading anything
+- (bool)isLoading;
+
+/**
+ Calculate the bounding box for a single tile in geographic.
+ 
+ This is a utility method for calculating the extents of a given tile in geographic (e.g. lon/lat).
+ 
+ @param tileID The ID for the tile we're interested in.
+ 
+ @return The lower left and upper right corner of the tile in geographic coordinates. Returns kMaplyNullBoundingBox in case of error
+ */
+- (MaplyBoundingBox)geoBoundsForTile:(MaplyTileID)tileID;
+
+/**
+ Calculate the bounding box for a single tile in geographic using doubles.
+ 
+ This is a utility method for calculating the extents of a given tile in geographic (e.g. lon/lat).
+ 
+ @param tileID The ID for the tile we're interested in.
+ 
+ @return The lower left and upper right corner of the tile in geographic coordinates. Returns kMaplyNullBoundingBoxD in case of error
+ */
+- (MaplyBoundingBoxD)geoBoundsForTileD:(MaplyTileID)tileID;
+
+/**
+ Calculate the bounding box for a single tile in the local coordinate system.
+ 
+ This utility method calculates the bounding box for a tile in the coordinate system used for the layer.
+ 
+ @param tileID The ID for the tile we're interested in.
+ 
+ @return The lower left and upper right corner of the tile in local coordinates.
+ */
+- (MaplyBoundingBox)boundsForTile:(MaplyTileID)tileID;
+
+/**
+ Calculate the bounding box for a single tile in the local coordinate system using doubles.
+ 
+ This utility method calculates the bounding box for a tile in the coordinate system used for the layer.
+ 
+ @param tileID The ID for the tile we're interested in.
+ 
+ @return The lower left and upper right corner of the tile in geographic coordinates.
+ */
+- (MaplyBoundingBoxD)boundsForTileD:(MaplyTileID)tileID;
+
+/**
+ Return the center of the tile in display coordinates.
+ 
+ @param tileID The ID for the tile we're interested in.
+ 
+ @return Return the center in display space for the given tile.
+ */
+- (MaplyCoordinate3d)displayCenterForTile:(MaplyTileID)tileID;
+
+/**
+    Each sampling layer allocates a slot to keep track of continuous zoom levels.
+    Those are passed all the way through to the individual shaders.
+ */
+- (int)getZoomSlot;
+
+/// Use a specific tile fetcher rather than the one shared by everyone else
+- (void)setTileFetcher:(NSObject<MaplyTileFetcher> * __nonnull)tileFetcher;
+
+/// Set the interpreter for the data coming back.  If you're just getting images, don't set this.
+- (void)setInterpreter:(NSObject<MaplyLoaderInterpreter> * __nonnull)interp;
+
+/// Return the current interpreter
+- (NSObject<MaplyLoaderInterpreter> * __nullable)getInterpreter;
+
+/**
+ Change the interpreter and reload all the data.
+ <br>
+ You can change the tile interpreter being used to build objects and images.
+ This will then force a reload of the tiles (hopefully from cache) and the
+ visuals will change as everything comes in.
+ */
+- (void)changeInterpreter:(NSObject<MaplyLoaderInterpreter> *__nonnull)interp;
+
+/**
+  Force a reload of the data.
+  <br>
+  All the current loads will be cancelled, any in flight will be ignored
+  and the loader will ask for a whole new set of data.
+  */
+- (void)reload;
+
+/**
+  Force a reload of the tiles overlapping a bounding box.
+  <br>
+  All the current loads will be cancelled, any in flight will be ignored
+  and the loader will ask for a whole new set of data.
+  */
+- (void)reloadArea:(MaplyBoundingBox)bounds;
+
+
+/**
+  Force a reload of the tiles overlapping a set of bounding boxes
+  <br>
+  All the current loads will be cancelled, any in flight will be ignored
+  and the loader will ask for a whole new set of data.
+  */
+- (void)reloadAreas:(NSArray<NSValue*>* __nullable)bounds;
+
+/** Turn off the loader and shut things down.
+ This unregisters us with the sampling layer and shuts down the various objects we created.
+ */
+- (void)shutdown;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyQuadPagingLoader.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyQuadPagingLoader.h
new file mode 100644
index 0000000..e08a04d
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyQuadPagingLoader.h
@@ -0,0 +1,82 @@
+/*
+ *  MaplyQuadPagingLoader.h
+ *
+ *  Created by Steve Gifford on 2/21/91.
+ *  Copyright 2012-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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <WhirlyGlobeMaplyComponent/MaplyQuadLoader.h>
+
+/**
+ This version of the loader return is used by the MaplyQuadPagingLoader.
+ 
+ The Object pager is only expecting Component Objects and will manage
+ those as things are loaded in and out.
+ */
+@interface MaplyObjectLoaderReturn : MaplyLoaderReturn
+
+/// Initialize with the loader this will be attached to
+- (id __nonnull)initWithLoader:(MaplyQuadLoaderBase *__nonnull)loader;
+
+/// If any component objects are associated with the tile, these are them.
+/// They need to start disabled.  The system will enable and delete them when it is time.
+- (void)addCompObjs:(NSArray<MaplyComponentObject *> * __nonnull)compObjs;
+
+/// Add a component object to the collection if it's non null
+- (void)addCompObj:(MaplyComponentObject * __nullable)compObj;
+
+/// Return an array of component objects that were added to this loader return
+- (NSArray<MaplyComponentObject *> * __nonnull)getCompObjs;
+
+@end
+
+/** General purpose quad paging loader.
+ 
+    This quadtree based paging loader is for fetching and load general geometry.
+    There are other loaders that handle images and image animations.  This one is
+    purely for geometry.
+ 
+    You need to fill in at least a MaplyLoaderInterpreter, which is probably your own
+    implementation.
+ 
+    This replaces the QuadPagingLayer from WhirlyGlobe-Maply 2.x.
+  */
+@interface MaplyQuadPagingLoader : MaplyQuadLoaderBase
+
+/**
+ Initialize with a single tile info object, the interpreter and the sampling parameters.
+ 
+ @param params The sampling parameters describing how to break down the data for projection onto a globe or map.
+ @param tileInfo A optional tile info object describing where the data is and how to get it.
+ @param loadInterp The interpreter makes geometry from the input data.  Or just makes it up if there is no input.
+ @param viewC the View controller (or renderer) to add objects to.
+ */
+- (nullable instancetype)initWithParams:(MaplySamplingParams *__nonnull)params
+                               tileInfo:(NSObject<MaplyTileInfoNew> *__nullable)tileInfo
+                             loadInterp:(NSObject<MaplyLoaderInterpreter> *__nullable)loadInterp
+                                  viewC:(MaplyBaseViewController * __nonnull)viewC;
+
+/**
+  Force a reload of the data.
+  <br>
+  All the current loads will be cancelled, any in flight will be ignored and the loader will ask for a whole new set of data.
+  */
+- (void)reload;
+
+- (void)reloadArea:(MaplyBoundingBox)bound;
+
+- (void)reloadAreas:(NSArray<NSValue*>* __nullable)bounds;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyQuadSampler.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyQuadSampler.h
new file mode 100644
index 0000000..2f9ec39
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyQuadSampler.h
@@ -0,0 +1,103 @@
+/*
+ *  MaplyQuadSampler.h
+ *  WhirlyGlobe-MaplyComponent
+ *
+ *  Created by Steve Gifford on 3/27/18.
+ *  Copyright 2011-2022 Saildrone Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <WhirlyGlobeMaplyComponent/MaplyControllerLayer.h>
+#import <WhirlyGlobeMaplyComponent/MaplyCoordinateSystem.h>
+#import <WhirlyGlobeMaplyComponent/MaplyTileSourceNew.h>
+#import <WhirlyGlobeMaplyComponent/MaplyRenderController.h>
+
+/**
+    Sampling parameters.
+ 
+    These are used to describe how we want to break down the globe or
+    flat projection onto the globe.
+  */
+@interface MaplySamplingParams : NSObject
+
+/// The coordinate system we'll be sampling from.
+@property (nonatomic,nonnull,strong) MaplyCoordinateSystem *coordSys;
+
+/// Min zoom level for sampling.  Don't set this to anything other than 0 or 1
+@property (nonatomic) int minZoom;
+
+/// Max zoom level for sampling
+@property (nonatomic) int maxZoom;
+
+/// We may want to calculate zoom levels beyond what we actually load.
+/// Useful for zoom scaled features and enable/disable based on zoome
+@property (nonatomic) int reportedMaxZoom;
+
+/// Maximum number of tiles to load
+@property (nonatomic) int maxTiles;
+
+/// Cutoff for loading tiles.  This is size in screen space (pixels^2)
+@property (nonatomic) double minImportance;
+
+/// Normally we always load the lowest level
+/// If this is set we only load those lowest level tiles that pass this test
+/// Must be greater than zero and not equal to minImportance to take effect.
+@property (nonatomic) double minImportanceTop;
+
+/// Generate geometry to cover the north and south poles
+/// Only works for world-wide projections
+@property (nonatomic) bool coverPoles;
+
+/// If set, generate skirt geometry to hide the edges between levels
+@property (nonatomic) bool edgeMatching;
+
+/// Tesselation values per level for breaking down the coordinate system (e.g. globe)
+@property (nonatomic) int tessX,tessY;
+
+/// If set, we'll scale the bounding boxes of individual tiles by this before evaluating
+@property (nonatomic) float boundScale;
+
+/// If set, we'll always load the lowest level first and then whatever the target level is
+/// Turn this off to get true single level loading
+/// `forceMinLevelHeight` must be greater than zero for this to have any effect.
+@property (nonatomic) bool forceMinLevel;
+
+/// If set, we'll turn on forceMinLevel and only use it when the viewer is above this height
+@property (nonatomic) double forceMinLevelHeight;
+
+/// If set, we'll try to load a single level
+@property (nonatomic) bool singleLevel;
+
+/// If set, the tiles are clipped to this boundary
+@property (nonatomic) MaplyBoundingBoxD clipBounds;
+@property (nonatomic,readonly) bool hasClipBounds;
+
+/**
+ Detail the levels you want loaded in target level mode.
+ 
+ The layer calculates the optimal target level.  The entries in this array are relative to that level or absolute.  For example [0,-4,-2] means the layer will always try to load levels 0, targetLevel-4 and targetLevel-2, but only the latter two if they make sense.
+ */
+@property (nonatomic,nullable,strong) NSArray *levelLoads;
+
+/**
+ Set the min importance for just one level.
+ 
+ This is useful if you want your lower levels loaded more aggressively.
+ */
+- (void)setMinImportance:(double)minImportance forLevel:(int)level;
+
+/// Decide if these sampling params are the same as others
+- (bool)isEqualTo:(MaplySamplingParams *__nonnull)other;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyRemoteTileFetcher.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyRemoteTileFetcher.h
new file mode 100644
index 0000000..32dba80
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyRemoteTileFetcher.h
@@ -0,0 +1,288 @@
+/*
+ *  MaplyRemoteTileFetcher.h
+ *  WhirlyGlobe-MaplyComponent
+ *
+ *  Created by Steve Gifford on 6/15/18.
+ *  Copyright 2011-2022 Saildrone Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <WhirlyGlobeMaplyComponent/MaplyTileSourceNew.h>
+#import <WhirlyGlobeMaplyComponent/MaplyCoordinateSystem.h>
+
+/**
+ Remote Tile Info Object (New)
+ 
+ Not to be confused with the old one, which works with the older loading subsystem,
+ the new remote tile info object contains min/max zoom, coordinate system and URL
+ information for fetching individual data tiles.
+ */
+@interface MaplyRemoteTileInfoNew : NSObject<MaplyTileInfoNew>
+
+/**
+ Initialize with enough information to fetch remote tiles.
+ 
+ This version of the init method takes all the explicit
+ information needed to fetch remote tiles.  This includes the
+ base URL and min and max zoom levels.
+ 
+ @param baseURL The base URL for fetching TMS tiles.  This is a replacement URL with {x}, {y}, and {z} in the string.
+ 
+ @param minZoom The minimum zoom level to fetch.  This really should be 0.
+ 
+ @param maxZoom The maximum zoom level to fetch.
+ 
+ @return The MaplyRemoteTileInfoNew object or nil on failure.
+ */
+- (nonnull instancetype)initWithBaseURL:(NSString *__nonnull)baseURL minZoom:(int)minZoom maxZoom:(int)maxZoom;
+
+/// Base URL
+@property (nonatomic,readonly,retain,nonnull) NSString *baseURL;
+
+/// Min zoom level
+@property (nonatomic,readonly,assign) int minZoom;
+
+/// Max zoom level
+@property (nonatomic,readonly,assign) int maxZoom;
+
+/**
+ The timeout assigned to the NSMutableURLRequest we're using to fetch tiles.
+ 
+ This is not set by default.  If set, we'll use this value as the timeout on the NSMutableURLRequest we use for fetching tiles.  This lets you extent it where appropriate or shorten it if you like.
+ */
+@property (nonatomic,assign) float timeOut;
+
+/**
+ The cache directory for data tiles.
+ 
+ In general, we want to cache.  The globe, in particular,
+ is going to fetch the same tiles over and over, quite a lot.
+ The cacheing behavior is a little dumb.  It will just write
+ files to the given directory forever.  If you're interacting
+ with a giant image pyramid, that could be problematic.
+ */
+@property (nonatomic, retain,nullable) NSString *cacheDir;
+
+/**
+ Optional headers to add to the NSURLRequest.
+ 
+ These are name/data pairs which will be stuck in the NSURLRequest header.
+ */
+@property (nonatomic, retain) NSDictionary * __nullable headers;
+
+/**
+ Optional coordinate system describing the tile set.
+ 
+ This coordinate system is required if the tile info will need
+ to evaluate valid tiles as defined by the addValidBounds:coordSystem: call.
+ */
+@property (nonatomic, retain) MaplyCoordinateSystem * __nullable coordSys;
+
+/**
+ Add a bounding box that defines validity for any tile before it's fetched.
+ 
+ Not all data sources cover all possible tiles.  If you know your data source does not,
+ you can specify what area is valid ahead of times.  Tiles that do not overlap that area
+ will not be loaded.
+  */
+- (void)addValidBounds:(MaplyBoundingBoxD)bbox coordSystem:(MaplyCoordinateSystem * __nonnull)coordSys;
+
+@end
+
+/**
+    Fetch Info for remote tile fetches.
+ 
+    The URL (required) and cacheFile (optional) for the given fetch.
+    This is the object the RemoteTileFetcher expects for the fetchInfo member of the TileFetchRequest.
+  */
+@interface MaplyRemoteTileFetchInfo : NSObject
+
+/// URL to fetch from
+@property (nonatomic,nonnull,retain) NSURLRequest *urlReq;
+
+/// File name for cached file (if present).  Save it here when fetched if set.
+@property (nonatomic,nullable,retain) NSString *cacheFile;
+
+/// If you're using local storage (separate from the cache) this will be passed on to the MaplyTileLocalStorage manager
+@property (nonatomic,nullable,retain) id localStorageKey;
+
+@end
+
+/**
+    If you provide LocalStore the RemoteTileFetcher will look for data in local storage first,
+    then try the local file cache and lastly go to the network.
+ 
+    You can provide the local storage by filling out this protocol and passing it to the RemoteTileFetcher.
+ 
+    Expect to be called on a random thread and block appropriately.
+ */
+@protocol MaplyTileLocalStorage <NSObject>
+
+/**
+ Return the data for the given tile.  nil means you don't have the tile, so we'll try other sources.
+ fetchInfo is a MaplyRemoteTileFetchInfo describing the rest of the tile characteristics.
+ tileID is the tile in question.
+ */
+- (id __nullable)dataForTile:(MaplyRemoteTileFetchInfo * __nonnull)fetchInfo tileID:(MaplyTileID)tileID;
+
+@end
+
+/**
+    If a tile fetch request fails, this object allows you  second chance to provide the data.
+    Maybe you have an old version in a cache somewhere.  Provide that.  Or fail and
+    the tile fetch will continue to fail.
+ */
+@protocol MaplyTileSecondChance <NSObject>
+
+/**
+ Return data for a tile that's already failed to load from local cache and remote fetch.
+ This might be an old version of the data you have lying around.  It's up to you.
+ Returning nil means the fetch fails as normal.
+ */
+- (id __nullable)dataForTile:(MaplyRemoteTileFetchInfo * __nonnull)fetchInfo tileID:(MaplyTileID)tileID;
+
+@end
+
+@class MaplyRemoteTileFetcherStats;
+@class MaplyRemoteTileFetcherLog;
+
+/**
+  Remote Tile fetcher fetches tiles from remote URLs.
+ 
+  The tile fetcher interacts with loaders that want tiles, as demanded by samplers.
+  It's complicated.  There's a default one of these that will get used if you pass in nil to the MaplyQuadImageLoader.
+  */
+@interface MaplyRemoteTileFetcher : NSObject<MaplyTileFetcher>
+
+/// Initialize with the number of connections the fetcher can have open at once
+- (instancetype __nonnull)initWithName:(NSString * __nonnull)name connections:(int)numConnections;
+
+/// Number of outstanding connections in parallel
+@property (nonatomic) int numConnections;
+
+/// Local storage is for pre-downloaded tiles, rather than a cache.  This is consulted *before* we go out to the network.
+/// If it fails, then we hit the local file cache and then we hit the network
+- (void)setLocalStorage:(NSObject<MaplyTileLocalStorage> * __nullable)localStorage;
+
+/// After a tile fails to load from local storage, local cache and then a remote request, you have one more chance to provide the data
+/// Useful if you've got an old version of the tile lying around you might use in a pinch
+- (void)setSecondChance:(NSObject<MaplyTileSecondChance> * __nullable)secondChance;
+
+/// Return the fetching stats since the beginning or since the last reset
+- (MaplyRemoteTileFetcherStats * __nullable)getStats:(bool)allTime;
+
+/// Reset the counters for one variant of stat
+- (void)resetStats;
+
+/// Reset just the active counters
+- (void)resetActiveStats;
+
+/// Start logging request (and times and such)
+- (void)startLogging;
+
+/// Stop logging and return the log itself
+- (MaplyRemoteTileFetcherLog * __nullable)stopLogging;
+
+// If set, you get way too much debugging output
+@property (nonatomic,assign) bool debugMode;
+
+@end
+
+/// Stats collected by the fetcher
+@interface MaplyRemoteTileFetcherStats : NSObject
+
+@property (nonatomic,readonly,weak,nullable) MaplyRemoteTileFetcher *fetcher;
+
+// Start of stats collection
+@property (nonatomic,nonnull,strong) NSDate *startDate;
+
+// Total requests, remote and cached
+@property (nonatomic) int totalRequests;
+
+// Requests that resulted in a remote HTTP call
+@property (nonatomic) int remoteRequests;
+
+// Total requests cancelled
+@property (nonatomic) int totalCancels;
+
+// Requests failed
+@property (nonatomic) int totalFails;
+
+// Bytes of remote data loaded
+@property (nonatomic) int remoteData;
+
+// Bytes of cached data loaded
+@property (nonatomic) int localData;
+
+// Total time spent waiting for successful remote data requests
+@property (nonatomic) NSTimeInterval totalLatency;
+
+// The maximum number of requests we've had at once (since the last reset)
+@property (nonatomic) int maxActiveRequests;
+
+// Current number of active requests
+@property (nonatomic) int activeRequests;
+
+// Add the given stats to ours
+- (void)addStats:(MaplyRemoteTileFetcherStats * __nonnull)stats;
+
+// Print out the stats
+- (void)dump;
+
+@end
+
+/**
+  Single entry for the logging.  Reports on the status of a specific fetch.
+ */
+@interface MaplyRemoteTileFetcherLogEntry : NSObject
+
+/// URL this is about
+@property (nonatomic,nonnull) NSURLRequest *urlReq;
+
+/// Total size of data
+@property (nonatomic) int size;
+
+/// Did we get it at all?
+@property (nonatomic) bool success;
+
+/// True if it was cached on local storage
+@property (nonatomic) bool wasCached;
+
+/// Time when the request was first presented to the RemotetTileFetcher
+@property (nonatomic) NSTimeInterval queuedTime;
+
+/// Time when the remote request was initiated by the system
+@property (nonatomic) NSTimeInterval startedTime;
+
+/// If successful, when we got the request back
+@property (nonatomic) NSTimeInterval finishedTime;
+
+@end
+
+/// Log of remote fetches, how long they took, their results and so on
+@interface MaplyRemoteTileFetcherLog : NSObject
+
+/// When this log begins
+@property (nonatomic) NSTimeInterval startTime;
+
+/// When the log ends
+@property (nonatomic) NSTimeInterval endTime;
+
+/// Individual log entries sorted by finishedTime (probably)
+- (NSArray<MaplyRemoteTileFetcherLogEntry *> * __nullable)getEntries;
+
+/// Print it all out
+- (NSString * __nonnull)dump;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyRenderController.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyRenderController.h
new file mode 100644
index 0000000..cddd63d
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyRenderController.h
@@ -0,0 +1,1007 @@
+/*
+ *  MaplyRenderController.h
+ *  WhirlyGlobeMaplyComponent
+ *
+ *  Created by Stephen Gifford on 1/19/18.
+ *  Copyright 2012-2022 Saildrone Inc.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
+#import <WhirlyGlobeMaplyComponent/MaplyScreenMarker.h>
+#import <WhirlyGlobeMaplyComponent/MaplyVectorObject.h>
+#import <WhirlyGlobeMaplyComponent/MaplyComponentObject.h>
+#import <WhirlyGlobeMaplyComponent/MaplySharedAttributes.h>
+#import <WhirlyGlobeMaplyComponent/MaplyLight.h>
+#import <WhirlyGlobeMaplyComponent/MaplyShader.h>
+#import <WhirlyGlobeMaplyComponent/MaplyTexture.h>
+#import <WhirlyGlobeMaplyComponent/MaplyParticleSystem.h>
+#import <WhirlyGlobeMaplyComponent/MaplyPoints.h>
+#import <WhirlyGlobeMaplyComponent/MaplyCluster.h>
+#import <WhirlyGlobeMaplyComponent/MaplyRenderTarget.h>
+#import <WhirlyGlobeMaplyComponent/MaplyActiveObject.h>
+#import <WhirlyGlobeMaplyComponent/MaplyControllerLayer.h>
+
+@class MaplyRemoteTileFetcher;
+
+/// Where we'd like an add to be executed.  If you need immediate feedback,
+///  then be on the main thread and use MaplyThreadCurrent.  Any is the default.
+typedef NS_ENUM(NSInteger, MaplyThreadMode) {
+    MaplyThreadCurrent,
+    MaplyThreadAny,
+};
+
+/// The various image formats we support.  RGBA is the default, and most expensive.
+typedef NS_ENUM(NSInteger, MaplyQuadImageFormat) {
+    MaplyImageIntRGBA,
+    MaplyImageUShort565,
+    MaplyImageUShort4444,
+    MaplyImageUShort5551,
+    MaplyImageUByteRed,MaplyImageUByteGreen,MaplyImageUByteBlue,MaplyImageUByteAlpha,
+    MaplyImageUByteRG,
+    MaplyImageUByteRGB,
+    MaplyImageETC2RGB8,MaplyImageETC2RGBA8,MaplyImageETC2RGBPA8,
+    MaplyImageEACR11,MaplyImageEACR11S,MaplyImageEACRG11,MaplyImageEACRG11S,
+    MaplyImage4Layer8Bit,
+    // Metal only
+    MaplyImageSingleFloat16,MaplyImageSingleFloat32,MaplyImageDoubleFloat16,MaplyImageDoubleFloat32,MaplyImageQuadFloat16,MaplyImageQuadFloat32,
+    MaplyImageInt16,MaplyImageUInt32,MaplyImageDoubleUInt32,MaplyImageQuadUInt32
+};
+
+/// Wrap values for certain types of textures
+#define MaplyImageWrapNone (0)
+#define MaplyImageWrapX (1<<0)
+#define MaplyImageWrapY (1<<1)
+
+@class MaplyRenderController;
+
+/// The system can set up as either GL or Metal
+typedef NS_ENUM(NSInteger, MaplyRenderType) {
+//    MaplyRenderGLES,
+    MaplyRenderMetal,
+    MaplyRenderUnknown
+};
+
+/**
+    Render Controller Protocol defines the methods required of a render controller.
+ 
+    The view controllers and offscreen renderers implement this protocol.
+  */
+@protocol MaplyRenderControllerProtocol <NSObject>
+
+/**
+ Set the offset for the screen space objects.
+ 
+ In general you want the screen space objects to appear on top of everything else.  There used to be structural versions for this, but now you can mix and match where everything appears.  This controls the offset that's used to push screen space objects behind everything else in the list (and thus, on top).
+ 
+ If you set this to 0, you can control the ordering of everything more precisely.
+ */
+@property (nonatomic,assign) int screenObjectDrawPriorityOffset;
+
+/**
+ Clear all the currently active lights.
+ 
+ There are a default set of lights, so you'll want to do this before adding your own.
+ */
+- (void)clearLights;
+
+/**
+ Reset the lighting back to its default state at startup.
+ 
+ This clears out all the lights and adds in the default starting light source.
+ */
+- (void)resetLights;
+
+/**
+ Add the given light to the list of active lights.
+ 
+ This method will add the given light to our active lights.  Most shaders will recognize these lights and do the calculations.  If you have a custom shader in place, it may or may not use these.
+ 
+ Triangle shaders use the lights, but line shaders do not.
+ */
+- (void)addLight:(MaplyLight *__nonnull)light;
+
+/// Remove the given light (assuming it's active) from the list of lights.
+- (void)removeLight:(MaplyLight *__nonnull)light;
+
+/**
+ Set the rendering hints to control how the renderer is configured.
+ 
+ This is a bit vestigial, but still has a few important uses.  The hints should be set right after the init call.  Any later and they'll probably be ignored.
+ 
+ The rendering hints are as follows.
+ 
+ |Key|Type|Description|
+ |:--|:---|:----------|
+ |kMaplyRenderHintZBuffer|bool|If set, we'll explicitly turn on the Z buffer.  Normally it's off until a drawable requests it, allowing us to play neat tricks with overlays.  The only time you should be turning this on is if you're doing 3D elevation.  The default is off.|
+ |kMaplyRenderHintCulling|bool|If set, we'll use the internal culling logic.  Texture and drawable atlases have largely made this pointless.  Leave it off unless you have a compelling reason to turn it on.|
+ |kMaplyRendererLightingMode|NSString|This can be set to @"none", in which case we use optimized shaders that do no lighting or "regular".  The latter is the default.|
+ */
+- (void)setHints:(NSDictionary *__nonnull)hintsDict;
+
+/**
+    Add a cluster generator for making clustered marker images on demand.
+    
+    When the layout system clusters a bunch of markers or labels together, it needs new images to represent the cluster.
+    
+    You can provide a custom image for each group of markers by filling in one of these generates and passing it in.
+  */
+- (void)addClusterGenerator:(NSObject <MaplyClusterGenerator> *__nonnull)clusterGen;
+
+/**
+ Add one or more screen markers to the current scene.
+ 
+ This method will add the given MaplyScreenMaker objects to the current scene.  It will use the parameters in the description dictionary and it will do it on the thread specified.
+ 
+ @param markers An NSArray of MaplyScreenMarker objects.
+ 
+ @param desc The desciption dictionary which controls how the markers will be constructed.  It takes the following entries.
+ 
+ |Key|Type|Description|
+ |:--|:---|:----------|
+ |kMaplyColor|UIColor|The color we'll use for the rectangle that makes up a marker. White by default.|
+ |kMaplyMinVis|NSNumber|This is viewer height above the globe or map.  The marker will only be visible if the user is above this height.  Off by default.|
+ |kMaplyMaxVis|NSNumber|This is viewer height above the globe or map.  The marker will only be visible if the user is below this height.  Off by default.|
+ |kMaplyMinViewerDist|NSNumber|Minimum distance from the viewer at which to display object(s).|
+ |kMaplyMaxViewerDist|NSNumber|Maximum distance from the viewer at which to display object(s).|
+ |kMaplyViewableCenterX|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center X coordinate.|
+ |kMaplyViewableCenterY|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center Y coordinate.|
+ |kMaplyViewableCenterZ|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center Z coordinate.|
+ |kMaplyDrawPriority|NSNumber|If set, the markers are sorted by this number.  Larger numbers will be sorted later.|
+ |kMaplyFade|NSNumber|The number of seconds to fade a marker in when it appears and out when it disappears.|
+ |kMaplyFadeIn|NSNumber|The number of seconds to fade a marker in when it appears.  This overrides kMaplyFade.|
+ |kMaplyFadeOut|NSNumber|The number of seconds to fade a marker out when it disappears.  This override kMaplyFade.|
+ |kMaplyFadeOutTime|NSNumber|If you want to create an object, just to have it fade out at a specific time, this is what you set.|
+ |kMaplyShader|NSString|If set, this is the name of the MaplyShader to use when rendering the screen markers.|
+ |kMaplyEnable|NSNumber boolean|On by default, but if off then the feature exists, but is not turned on.  It can be enabled with enableObjects:|
+ |kMaplyEnableStart|NSNumber|If set, this controls when the resulting objects will be activated.|
+ |kMaplyEnableEnd|NSNumber|If set, this controls when the resulting objects will be deactivated.|
+ |kMaplyUUID|NSString|Unique ID to match up alternate representations of the same element.|
+ |kMaplyRepresentation|NSString|Name of the representation presented by this object.|
+ |kMaplyClusterGroup|NSNumber|If set, the screen markers will be clustered together according to the given group ID.  Off by default, but 0 is the default cluster.|
+ 
+ 
+ @param threadMode MaplyThreadAny is preferred and will use another thread, thus not blocking the one you're on.  MaplyThreadCurrent will make the changes immediately, blocking this thread.
+ 
+ 
+ @return Returns a MaplyComponentObject, which can be used to make modifications or delete the objects created.
+ */
+- (MaplyComponentObject *__nullable)addScreenMarkers:(NSArray *__nonnull)markers desc:(NSDictionary *__nullable)desc mode:(MaplyThreadMode)threadMode;
+
+/**
+ Add one or more 3D markers to the current scene.
+ 
+ This method will add the given MaplyMarker objects to the current scene.  It will use the parameters in the description dictionary and it will do it on the thread specified.
+ 
+ @param markers An NSArray of MaplyMarker objects.
+ 
+ @param desc The desciption dictionary which controls how the markers will be constructed.  It takes the following entries.
+ 
+ |Key|Type|Description|
+ |:--|:---|:----------|
+ |kMaplyColor|UIColor|The color we'll use for the rectangle that makes up a marker. White by default.|
+ |kMaplyMinVis|NSNumber|This is viewer height above the globe or map.  The marker will only be visible if the user is above this height.  Off by default.|
+ |kMaplyMaxVis|NSNumber|This is viewer height above the globe or map.  The marker will only be visible if the user is below this height.  Off by default.|
+ |kMaplyMinViewerDist|NSNumber|Minimum distance from the viewer at which to display object(s).|
+ |kMaplyMaxViewerDist|NSNumber|Maximum distance from the viewer at which to display object(s).|
+ |kMaplyViewableCenterX|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center X coordinate.|
+ |kMaplyViewableCenterY|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center Y coordinate.|
+ |kMaplyViewableCenterZ|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center Z coordinate.|
+ |kMaplyFade|NSNumber|The number of seconds to fade a marker in when it appears and out when it disappears.|
+ |kMaplyFadeIn|NSNumber|The number of seconds to fade a marker in when it appears.  This overrides kMaplyFade.|
+ |kMaplyFadeOut|NSNumber|The number of seconds to fade a marker out when it disappears.  This override kMaplyFade.|
+ |kMaplyFadeOutTime|NSNumber|If you want to create an object, just to have it fade out at a specific time, this is what you set.|
+ |kMaplyDrawPriority|NSNumber|Geometry is sorted by this value before being drawn.  This ensures that some objects can come out on top of others.  By default this is kMaplyMarkerDrawPriorityDefault.|
+ |kMaplyZBufferRead|NSNumber boolean|If set this geometry will respect the z buffer.  It's off by default, meaning that the geometry will draw on top of anything (respecting the kMaplyDrawPriority).|
+ |kMaplyZBufferWrite|NSNumber boolean|If set this geometry will write to the z buffer.  That means following geometry that reads the z buffer will be occluded.  This is off by default.|
+ |kMaplyEnable|NSNumber boolean|On by default, but if off then the feature exists, but is not turned on.  It can be enabled with enableObjects:|
+ |kMaplyUUID|NSString|Unique ID to match up alternate representations of the same element.|
+ |kMaplyRepresentation|NSString|Name of the representation presented by this object.|
+ 
+ @param threadMode MaplyThreadAny is preferred and will use another thread, thus not blocking the one you're on.  MaplyThreadCurrent will make the changes immediately, blocking this thread.
+ 
+ 
+ @return Returns a MaplyComponentObject, which can be used to make modifications or delete the objects created.
+ */
+- (MaplyComponentObject *__nullable)addMarkers:(NSArray *__nonnull)markers desc:(NSDictionary *__nullable)desc mode:(MaplyThreadMode)threadMode;
+
+/**
+ Add one or more screen labels to the current scene.
+ 
+ This method will add the given MaplyScreenLabel objects to the current scene.  It will use the parameters in the description dictionary and it will do it on the thread specified.
+ 
+ @param labels An NSArray of MaplyScreenLabel objects.
+ 
+ @param desc The desciption dictionary which controls how the labels will be constructed.  It takes the following entries.
+ 
+ |Key|Type|Description|
+ |:--|:---|:----------|
+ |kMaplyTextColor|UIColor|Color we'll use for the text. Black by default.|
+ |kMaplyBackgroundColor|UIColor|Color we'll use for the rectangle background.  Use clearColor to make this invisible.|
+ |kMaplyFont|UIFont|The font we'll use for the text.|
+ |kMaplyLabelHeight|NSNumber|Height of the text in points.|
+ |kMaplyLabelWidth|NSNumber|Width of the text in points.  It's best to set Height and leave this out.  That way the width will be calculated by the toolkit.|
+ |kMaplyJustify|NSString|This can be set to @"middle", @"left", or @"right" to justify the text around the location.|
+ |kMaplyTextJustify|NSString|This can be kMaplyTextJustifyRight, kMaplyTextJustifyCenter, or kMaplyTextJustifyLeft|
+ |kMaplyShadowSize|NSNumber|If set, we'll draw a shadow with the kMaplyShadowColor offset by this amount.  We recommend using an outline instead.|
+ |kMaplyShadowColor|UIColor|If we're drawing a shadow, this is its color.|
+ |kMaplyTextOutlineSize|NSNumber|If set, we'll draw an outline around the text (really draw it twice).  The outline will be this large.|
+ |kMaplyTextOutlineColor|UIColor|If we're drawing an outline, it's in this color.|
+ |kMaplyMinVis|NSNumber|This is viewer height above the globe or map.  The label will only be visible if the user is above this height.  Off by default.|
+ |kMaplyMaxVis|NSNumber|This is viewer height above the globe or map.  The label will only be visible if the user is below this height.  Off by default.|
+ |kMaplyMinViewerDist|NSNumber|Minimum distance from the viewer at which to display object(s).|
+ |kMaplyMaxViewerDist|NSNumber|Maximum distance from the viewer at which to display object(s).|
+ |kMaplyViewableCenterX|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center X coordinate.|
+ |kMaplyViewableCenterY|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center Y coordinate.|
+ |kMaplyViewableCenterZ|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center Z coordinate.|
+ |kMaplyDrawPriority|NSNumber|If set, the labels are sorted by this number.  Larger numbers will be sorted later.|
+ |kMaplyFade|NSNumber|The number of seconds to fade a screen label in when it appears and out when it disappears.|
+ |kMaplyEnable|NSNumber boolean|On by default, but if off then the feature exists, but is not turned on.  It can be enabled with enableObjects:|
+ |kMaplyEnableStart|NSNumber|If set, this controls when the resulting objects will be activated.|
+ |kMaplyEnableEnd|NSNumber|If set, this controls when the resulting objects will be deactivated.|
+ |kMaplyUUID|NSString|Unique ID to match up alternate representations of the same element.|
+ |kMaplyRepresentation|NSString|Name of the representation presented by this object.|
+ 
+ @param threadMode MaplyThreadAny is preferred and will use another thread, thus not blocking the one you're on.  MaplyThreadCurrent will make the changes immediately, blocking this thread.
+ 
+ 
+ @return Returns a MaplyComponentObject, which can be used to make modifications or delete the objects created.
+ */
+- (MaplyComponentObject *__nullable)addScreenLabels:(NSArray *__nonnull)labels desc:(NSDictionary *__nullable)desc mode:(MaplyThreadMode)threadMode;
+
+/**
+ Add one or more 3D labels to the current scene.
+ 
+ This method will add the given MaplyLabel objects to the current scene.  It will use the parameters in the description dictionary and it will do it on the thread specified.
+ 
+ @param labels An NSArray of MaplyLabel objects.
+ 
+ @param desc The desciption dictionary which controls how the labels will be constructed.  It takes the following entries.
+ 
+ |Key|Type|Description|
+ |:--|:---|:----------|
+ |kMaplyTextColor|UIColor|Color we'll use for the text. Black by default.|
+ |kMaplyBackgroundColor|UIColor|Color we'll use for the rectangle background.  Use clearColor to make this invisible.|
+ |kMaplyFont|UIFont|The font we'll use for the text.|
+ |kMaplyLabelHeight|NSNumber|Height of the text in display coordinates.  For the globe these are based on radius = 1.0.|
+ |kMaplyLabelWidth|NSNumber|Width of the text in display coordinates.  It's best to set Height and leave this out.  That way the width will be calculated by the toolkit.|
+ |kMaplyJustify|NSString|This can be set to @"middle", @"left", or @"right" to justify the text around the location.|
+ |kMaplyShadowSize|NSNumber|If set, we'll draw a shadow with the kMaplyShadowColor offset by this amount.  We recommend using an outline instead.|
+ |kMaplyShadowColor|UIColor|If we're drawing a shadow, this is its color.|
+ |kMaplyMinVis|NSNumber|This is viewer height above the globe or map.  The label will only be visible if the user is above this height.  Off by default.|
+ |kMaplyMaxVis|NSNumber|This is viewer height above the globe or map.  The label will only be visible if the user is below this height.  Off by default.|
+ |kMaplyMinViewerDist|NSNumber|Minimum distance from the viewer at which to display object(s).|
+ |kMaplyMaxViewerDist|NSNumber|Maximum distance from the viewer at which to display object(s).|
+ |kMaplyViewableCenterX|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center X coordinate.|
+ |kMaplyViewableCenterY|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center Y coordinate.|
+ |kMaplyViewableCenterZ|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center Z coordinate.|
+ |kMaplyFade|NSNumber|The number of seconds to fade a label in when it appears and out when it disappears.|
+ |kMaplyDrawPriority|NSNumber|Geometry is sorted by this value before being drawn.  This ensures that some objects can come out on top of others.  By default this is kMaplyLabelDrawPriorityDefault.|
+ |kMaplyZBufferRead|NSNumber boolean|If set this geometry will respect the z buffer.  It's off by default, meaning that the geometry will draw on top of anything (respecting the kMaplyDrawPriority).|
+ |kMaplyZBufferWrite|NSNumber boolean|If set this geometry will write to the z buffer.  That means following geometry that reads the z buffer will be occluded.  This is off by default.|
+ |kMaplyEnable|NSNumber boolean|On by default, but if off then the feature exists, but is not turned on.  It can be enabled with enableObjects:|
+ |kMaplyUUID|NSString|Unique ID to match up alternate representations of the same element.|
+ |kMaplyRepresentation|NSString|Name of the representation presented by this object.|
+
+ @param threadMode MaplyThreadAny is preferred and will use another thread, thus not blocking the one you're on.  MaplyThreadCurrent will make the changes immediately, blocking this thread.
+ 
+ 
+ @return Returns a MaplyComponentObject, which can be used to make modifications or delete the objects created.
+ */
+- (MaplyComponentObject *__nullable)addLabels:(NSArray *__nonnull)labels desc:(NSDictionary *__nullable)desc mode:(MaplyThreadMode)threadMode;
+
+/**
+ Add one or more vectors to the current scene.
+ 
+ This method will add the given MaplyVectorObject objects to the current scene.  It will use the parameters in the description dictionary and it will do it on the thread specified.
+ 
+ @param vectors An NSArray of MaplyVectorObject objects.
+ 
+ @param desc The desciption dictionary which controls how the vectors will look.  It takes the following entries.
+ 
+ |Key|Type|Description|
+ |:--|:---|:----------|
+ |kMaplyColor|UIColor|Color we'll use for the vector features.|
+ |kMaplyVecWidth|NSNumber|If the geometry is not filled, this is the width of the GL lines.|
+ |kMaplyFilled|NSNumber boolean|If set, the areal geometry will be tesselated, taking holes into account.  The resulting triangles will be displayed instead of the vectors.|
+ |kMaplySubdivType|NSString|When present, this requests that the geometry be broken up to follow the globe (really only makes sense there).  It can be set to kMaplySubdivGreatCircle or kMaplySubdivSimple which do a great circle subdivision and a simple 3-space subdivision respectively.  If the key is missing, we do no subdivision at all.|
+ |kMaplySubdivEpsilon|NSNumber|If there's a kMaplySubdivType set this is the epsilon we'll pass into the subdivision routine.  The value is in display coordinates. 0.01 is a reasonable value.  Smaller results in more subdivision.|
+ |kMaplyVecTexture|UIImage|If set and the kMaplyFilled attribute is set, we will apply the given texture across any areal features.  How the texture is applied can be controlled by kMaplyVecTexScaleX, kMaplyVecTexScaleY, kMaplyVecCenterX, kMaplyVecCenterY, and kMaplyVecTextureProjection|
+ |kMaplyVecTexScaleX,kMaplyVecTexScaleY|NSNumber|These control the scale of the texture application.  We'll multiply by these numbers before generating texture coordinates from the vertices.|
+ |kMaplyVecCenterX,kMaplyVecCenterY|NSNumber|These control the center of a texture application.  If not set we'll use the areal's centroid.  If set, we'll use these instead.  They should be in local coordinates (probably geographic radians).|
+ |kMaplyVecTextureProjection|NSString|This controls how a texture is projected onto an areal feature.  By default we just use the geographic coordinates and stretch them out.  This looks odd for very large features.  If you set this to kMaplyProjectionTangentPlane then we'll take the center of the feature, make a tangent plane and then project the coordinates onto that tangent plane to get texture coordinates.  This looks nice at the poles.  If set to kMaplyProjectionScreen the texture is mapped on after screen space projection around the center of the feature.|
+ |kMaplyMinVis|NSNumber|This is viewer height above the globe or map.  The vectors will only be visible if the user is above this height.  Off by default.|
+ |kMaplyMaxVis|NSNumber|This is viewer height above the globe or map.  The vectors will only be visible if the user is below this height.  Off by default.|
+ |kMaplyMinViewerDist|NSNumber|Minimum distance from the viewer at which to display object(s).|
+ |kMaplyMaxViewerDist|NSNumber|Maximum distance from the viewer at which to display object(s).|
+ |kMaplyViewableCenterX|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center X coordinate.|
+ |kMaplyViewableCenterY|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center Y coordinate.|
+ |kMaplyViewableCenterZ|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center Z coordinate.|
+ |kMaplyFade|NSNumber|The number of seconds to fade a vector in when it appears and out when it disappears.|
+ |kMaplyDrawPriority|NSNumber|Geometry is sorted by this value before being drawn.  This ensures that some objects can come out on top of others.  By default this is kMaplyVectorDrawPriorityDefault.|
+ |kMaplyZBufferRead|NSNumber boolean|If set this geometry will respect the z buffer.  It's off by default, meaning that the geometry will draw on top of anything (respecting the kMaplyDrawPriority).|
+ |kMaplyZBufferWrite|NSNumber boolean|If set this geometry will write to the z buffer.  That means following geometry that reads the z buffer will be occluded.  This is off by default.|
+ |kMaplyEnable|NSNumber boolean|On by default, but if off then the feature exists, but is not turned on.  It can be enabled with enableObjects:|
+ |kMaplySelectable|NSNumber boolean|Off by default.  When enabled, the vector feature will be selectable by a user.|
+ |kMaplyUUID|NSString|Unique ID to match up alternate representations of the same element.|
+ |kMaplyRepresentation|NSString|Name of the representation presented by this object.|
+
+ @param threadMode MaplyThreadAny is preferred and will use another thread, thus not blocking the one you're on.  MaplyThreadCurrent will make the changes immediately, blocking this thread.
+ 
+ 
+ @return Returns a MaplyComponentObject, which can be used to make modifications or delete the objects created.
+ */
+- (MaplyComponentObject *__nullable)addVectors:(NSArray *__nonnull)vectors desc:(NSDictionary *__nullable)desc mode:(MaplyThreadMode)threadMode;
+
+/**
+ Make a copy of the base object and apply the attributes given for the new version.
+ 
+ This call makes a cheap copy of the vectors in the given MaplyComponentObject and applies the given description to them.  You can use this to make a wider or thinner version of a set of vectors, or change their color, while continuing to draw the originals.  Or not, as the case may be.
+ 
+ This is useful for vector maps where we tend to reuse the same geometry at multiple levels and with different colors and line widths.
+ 
+ Instancing only works with a handful of visual changes.  For instance, you can't make a filled and non-filled version.
+ 
+ @param baseObj The MaplyComponentObject returned by an addVectors: call.  This only works for vectors.
+ 
+ @param desc The description dictionary with controls how vectors will be displayed.  It takes the following entries.
+ 
+ |Key|Type|Description|
+ |:--|:---|:----------|
+ |kMaplyColor|UIColor|Color we'll use for the vector features.|
+ |kMaplyVecWidth|NSNumber|If the geometry is not filled, this is the width of the GL lines.|
+ |kMaplyMinVis|NSNumber|This is viewer height above the globe or map.  The vectors will only be visible if the user is above this height.  Off by default.|
+ |kMaplyMaxVis|NSNumber|This is viewer height above the globe or map.  The vectors will only be visible if the user is below this height.  Off by default.|
+ |kMaplyMinViewerDist|NSNumber|Minimum distance from the viewer at which to display object(s).|
+ |kMaplyMaxViewerDist|NSNumber|Maximum distance from the viewer at which to display object(s).|
+ |kMaplyViewableCenterX|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center X coordinate.|
+ |kMaplyViewableCenterY|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center Y coordinate.|
+ |kMaplyViewableCenterZ|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center Z coordinate.|
+ |kMaplyDrawPriority|NSNumber|Geometry is sorted by this value before being drawn.  This ensures that some objects can come out on top of others.  By default this is kMaplyVectorDrawPriorityDefault.|
+ |kMaplyEnable|NSNumber boolean|On by default, but if off then the feature exists, but is not turned on.  It can be enabled with enableObjects:|
+ |kMaplyUUID|NSString|Unique ID to match up alternate representations of the same element.|
+ |kMaplyRepresentation|NSString|Name of the representation presented by this object.|
+
+ @param threadMode MaplyThreadAny is preferred and will use another thread, thus not blocking the one you're on.  MaplyThreadCurrent will make the changes immediately, blocking this thread.
+ 
+ 
+ @return Returns a MaplyComponentObject, which can be used to make modifications or delete the objects created.
+ */
+- (MaplyComponentObject *__nullable)instanceVectors:(MaplyComponentObject *__nonnull)baseObj desc:(NSDictionary *__nullable)desc mode:(MaplyThreadMode)threadMode;
+
+/**
+ Add one or more widened vectors to the current scene.
+ 
+ Build widened vectors
+ 
+ 
+ @param desc The description dictionary which controls how vectors will be displayed.  It takes the following entries.
+ 
+ |Key|Type|Description|
+ |:--|:---|:----------|
+ |kMaplyColor|UIColor|Color we'll use for the features.|
+ |kMaplyVecWidth|NSNumber|If the geometry is not filled, this is the width of the lines.|
+ |kMaplyWideVecCoordType|NSNumber|Vectors can be widened in real coordinates (kMaplyWideVecCoordTypeReal) or screen coordinates (kMaplyWideVecCoordTypeScreen).  In the latter case they stay the same size now matter how you zoom.|
+ |kMaplyWideVecJoinType|NSNumber|When lines meet in a join there are several options for representing them.  These include kMaplyWideVecMiterJoin, which is a simple miter join and kMaplyWideVecBevelJoin which is a more complicated bevel.  See http://www.w3.org/TR/SVG/painting.html#StrokeLinejoinProperty for how these look.|
+ |kMaplyWideVecMiterLimit|NSNumber|When using miter joins you can trigger them at a certain threshold.|
+ |kMaplyWideVecTexRepeatLen|NSNumber|This is the repeat size for a texture applied along the widened line.  For kMaplyWideVecCoordTypeScreen this is pixels.|
+ |kMaplyVecTexture|UIImage or MaplyTexture|This the texture to be applied to the widened vector.|
+ |kMaplyMinVis|NSNumber|This is viewer height above the globe or map.  The vectors will only be visible if the user is above this height.  Off by default.|
+ |kMaplyMaxVis|NSNumber|This is viewer height above the globe or map.  The vectors will only be visible if the user is below this height.  Off by default.|
+ |kMaplyMinViewerDist|NSNumber|Minimum distance from the viewer at which to display object(s).|
+ |kMaplyMaxViewerDist|NSNumber|Maximum distance from the viewer at which to display object(s).|
+ |kMaplyViewableCenterX|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center X coordinate.|
+ |kMaplyViewableCenterY|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center Y coordinate.|
+ |kMaplyViewableCenterZ|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center Z coordinate.|
+ |kMaplyDrawPriority|NSNumber|Geometry is sorted by this value before being drawn.  This ensures that some objects can come out on top of others.  By default this is kMaplyVectorDrawPriorityDefault.|
+ |kMaplyEnable|NSNumber boolean|On by default, but if off then the feature exists, but is not turned on.  It can be enabled with enableObjects:|
+ |kMaplyUUID|NSString|Unique ID to match up alternate representations of the same element.|
+ |kMaplyRepresentation|NSString|Name of the representation presented by this object.|
+
+ @param threadMode MaplyThreadAny is preferred and will use another thread, thus not blocking the one you're on.  MaplyThreadCurrent will make the changes immediately, blocking this thread.
+ 
+ 
+ @return Returns a MaplyComponentObject, which can be used to make modifications or delete the objects created.
+ */
+- (MaplyComponentObject *__nullable)addWideVectors:(NSArray *__nonnull)vectors desc:(NSDictionary *__nullable)desc mode:(MaplyThreadMode)threadMode;
+
+/**
+ Add one or more model instances.
+ 
+ Each MaplyGeomInstance points to a MaplyGeomModel.  All those passed in here will be grouped and processed together.
+ 
+ 
+ @param desc The description dictionary which controls how the models are displayed, selected, and so forth.
+ 
+ |Key|Type|Description|
+ |:--|:---|:----------|
+ |kMaplySelectable|NSNumber boolean|Off by default.  When enabled, the vector feature will be selectable by a user.|
+ |kMaplyEnable|NSNumber boolean|On by default, but if off then the feature exists, but is not turned on.  It can be enabled with enableObjects:|
+ |kMaplyUUID|NSString|Unique ID to match up alternate representations of the same element.|
+ |kMaplyRepresentation|NSString|Name of the representation presented by this object.|
+
+ @param threadMode MaplyThreadAny is preferred and will use another thread, thus not blocking the one you're on.  MaplyThreadCurrent will make the changes immediately, blocking this thread.
+ 
+ 
+ @return Returns a MaplyComponentObject, which can be used to make modifications or delete the objects created.
+ */
+- (MaplyComponentObject *__nullable)addModelInstances:(NSArray *__nonnull)modelInstances desc:(NSDictionary *__nullable)desc mode:(MaplyThreadMode)threadMode;
+
+/**
+ Add one or raw geometry models.
+ 
+ Each MaplyGeometryModel holds points and triangles in display space.  These are relatively "raw" geometry and are passed to the geometry manager as is.
+ 
+ 
+ @param desc The description dictionary which controls how the geometry is displayed, selected, and so forth.
+ 
+ |Key|Type|Description|
+ |:--|:---|:----------|
+ |kMaplySelectable|NSNumber boolean|Off by default.  When enabled, the vector feature will be selectable by a user.|
+ |kMaplyEnable|NSNumber boolean|On by default, but if off then the feature exists, but is not turned on.  It can be enabled with enableObjects:|
+ |kMaplyUUID|NSString|Unique ID to match up alternate representations of the same element.|
+ |kMaplyRepresentation|NSString|Name of the representation presented by this object.|
+
+ @param threadMode MaplyThreadAny is preferred and will use another thread, thus not blocking the one you're on.  MaplyThreadCurrent will make the changes immediately, blocking this thread.
+ 
+ 
+ @return Returns a MaplyComponentObject, which can be used to make modifications or delete the objects created.
+ */
+- (MaplyComponentObject *__nullable)addGeometry:(NSArray *__nonnull)geom desc:(NSDictionary *__nullable)desc mode:(MaplyThreadMode)threadMode;
+
+/**
+ Add one or more MaplyShape children to the current scene.
+ 
+ This method will add the given MaplyShape derived objects to the current scene.  It will use the parameters in the description dictionary and it will do it on the thread specified.
+ 
+ @param shapes An NSArray of MaplyShape derived objects.
+ 
+ @param desc The desciption dictionary which controls how the shapes will look.  It takes the following entries.
+ 
+ |Key|Type|Description|
+ |:--|:---|:----------|
+ |kMaplyColor|UIColor|Color we'll use for the shape features.|
+ |kMaplyShapeSampleX|NSNumber|Number of samples to use in one direction when converting to polygons.|
+ |kMaplyShapeSampleY|NSNumber|Number of samples to use in the other direction when converting to polygons.|
+ |kMaplyShapeInsideOut|NSNumber boolean|If set to YES, we'll make the spheres inside out and such.  Set to NO by default.|
+ |kMaplyMinVis|NSNumber|This is viewer height above the globe or map.  The shapes will only be visible if the user is above this height.  Off by default.|
+ |kMaplyMaxVis|NSNumber|This is viewer height above the globe or map.  The shapes will only be visible if the user is below this height.  Off by default.|
+ |kMaplyMinViewerDist|NSNumber|Minimum distance from the viewer at which to display object(s).|
+ |kMaplyMaxViewerDist|NSNumber|Maximum distance from the viewer at which to display object(s).|
+ |kMaplyViewableCenterX|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center X coordinate.|
+ |kMaplyViewableCenterY|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center Y coordinate.|
+ |kMaplyViewableCenterZ|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center Z coordinate.|
+ |kMaplyFade|NSNumber|The number of seconds to fade a shape in when it appears and out when it disappears.|
+ |kMaplyDrawPriority|NSNumber|Geometry is sorted by this value before being drawn.  This ensures that some objects can come out on top of others.  By default this is kMaplyVectorShapePriorityDefault.|
+ |kMaplyZBufferRead|NSNumber boolean|If set this geometry will respect the z buffer.  It's on by default, meaning that the geometry can be occluded by things drawn first.|
+ |kMaplyZBufferWrite|NSNumber boolean|If set this geometry will write to the z buffer.  That means following geometry that reads the z buffer will be occluded.  This is off by default.|
+ |kMaplyEnable|NSNumber boolean|On by default, but if off then the feature exists, but is not turned on.  It can be enabled with enableObjects:|
+ |kMaplyUUID|NSString|Unique ID to match up alternate representations of the same element.|
+ |kMaplyRepresentation|NSString|Name of the representation presented by this object.|
+
+ @param threadMode MaplyThreadAny is preferred and will use another thread, thus not blocking the one you're on.  MaplyThreadCurrent will make the changes immediately, blocking this thread.
+ 
+ 
+ @return Returns a MaplyComponentObject, which can be used to make modifications or delete the objects created.
+ */
+- (MaplyComponentObject *__nullable)addShapes:(NSArray *__nonnull)shapes desc:(NSDictionary *__nullable)desc mode:(MaplyThreadMode)threadMode;
+
+/**
+ Add one or more MaplySticker objects to the current scene.
+ 
+ This method will add the given MaplySticker objects to the current scene.  It will use the parameters in the description dictionary and it will do it on the thread specified.
+ 
+ @param stickers An NSArray of MaplySticker derived objects.
+ 
+ @param desc The desciption dictionary which controls how the stickers will look.  It takes the following entries.
+ 
+ |Key|Type|Description|
+ |:--|:---|:----------|
+ |kMaplyColor|UIColor|Color we'll use for the stickers.|
+ |kMaplyMinVis|NSNumber|This is viewer height above the globe or map.  The stickers will only be visible if the user is above this height.  Off by default.|
+ |kMaplyMaxVis|NSNumber|This is viewer height above the globe or map.  The stickers will only be visible if the user is below this height.  Off by default.|
+ |kMaplyMinViewerDist|NSNumber|Minimum distance from the viewer at which to display object(s).|
+ |kMaplyMaxViewerDist|NSNumber|Maximum distance from the viewer at which to display object(s).|
+ |kMaplyViewableCenterX|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center X coordinate.|
+ |kMaplyViewableCenterY|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center Y coordinate.|
+ |kMaplyViewableCenterZ|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center Z coordinate.|
+ |kMaplyFade|NSNumber|The number of seconds to fade a sticker in when it appears and out when it disappears.|
+ |kMaplySampleX|NSNumber|Stickers are broken up along two dimensions to adhere to the globe.  By default this is done adaptively.  If you want to override it, this is the X dimension for the sticker.|
+ |kMaplySampleY|NSNumber|If you want to override it, this is the Y dimension for the sticker.|
+ |kMaplyDrawPriority|NSNumber|Geometry is sorted by this value before being drawn.  This ensures that some objects can come out on top of others.  By default this is kMaplyVectorShapePriorityDefault.|
+ |kMaplyZBufferRead|NSNumber boolean|If set this geometry will respect the z buffer.  It's off by default, meaning that it will draw on top of things before it..|
+ |kMaplyZBufferWrite|NSNumber boolean|If set this geometry will write to the z buffer.  That means following geometry that reads the z buffer will be occluded.  This is off by default.|
+ |kMaplyEnable|NSNumber boolean|On by default, but if off then the feature exists, but is not turned on.  It can be enabled with enableObjects:|
+ |kMaplyShader|NSString|If set, this is the name of the MaplyShader to use when rendering the sticker(s).|
+ |kMaplyUUID|NSString|Unique ID to match up alternate representations of the same element.|
+ |kMaplyRepresentation|NSString|Name of the representation presented by this object.|
+
+ @param threadMode MaplyThreadAny is preferred and will use another thread, thus not blocking the one you're on.  MaplyThreadCurrent will make the changes immediately, blocking this thread.
+ 
+ 
+ @return Returns a MaplyComponentObject, which can be used to make modifications or delete the objects created.
+ */
+- (MaplyComponentObject *__nullable)addStickers:(NSArray *__nonnull)stickers desc:(NSDictionary *__nullable)desc mode:(MaplyThreadMode)threadMode;
+
+/**
+ Modify an existing sticker.  This only supports changing the active textures.
+ 
+ This method will change attributes of a sticker that's currently in use.  At present that's just the images it's displaying.
+ 
+ @param compObj The component object representing one or more existing stickers.
+ 
+ @param desc The description dictionary for changes we're making to the sticker.
+ 
+ |Key|Type|Description|
+ |:--|:---|:----------|
+ |kMaplyStickerImages|NSARray|The array of images to apply to the sticker.  You can reuse old ones or introduce new ones.|
+ */
+- (void)changeSticker:(MaplyComponentObject *__nonnull)compObj desc:(NSDictionary *__nullable)desc mode:(MaplyThreadMode)threadMode;
+
+/**
+ Add one or more MaplyBillboard objects to the current scene.
+ 
+ This method will add the given MaplyBillboard objects to the current scene.  It will use the parameters in the description dictionary and it will do it on the thread specified.
+ 
+ @param billboards An NSArray of MaplyBillboard objects.
+ 
+ @param desc The description dictionary that controls how the billboards will look.  It takes the following entries.
+ 
+ |Key|Type|Description|
+ |:--|:---|:----------|
+ |kMaplyColor|UIColor|Color we'll use for the billboards.|
+ |kMaplyMinVis|NSNumber|This is viewer height above the globe or map.  The billboards will only be visible if the user is above this height.  Off by default.|
+ |kMaplyMaxVis|NSNumber|This is viewer height above the globe or map.  The billboards will only be visible if the user is below this height.  Off by default.|
+ |kMaplyMinViewerDist|NSNumber|Minimum distance from the viewer at which to display object(s).|
+ |kMaplyMaxViewerDist|NSNumber|Maximum distance from the viewer at which to display object(s).|
+ |kMaplyViewableCenterX|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center X coordinate.|
+ |kMaplyViewableCenterY|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center Y coordinate.|
+ |kMaplyViewableCenterZ|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center Z coordinate.|
+ |kMaplyDrawPriority|NSNumber|Geometry is sorted by this value before being drawn.  This ensures that some objects can come out on top of others.  By default this is kMaplyBillboardDrawPriorityDefault.|
+ |kMaplyBillboardOrient|NSNumber|Controls the billboard orientation.  It's either directly toward the eye with kMaplyBillboardOrientEye or takes the ground into account with kMaplyBillboardOrientGround.  Ground is the default.
+ 
+ 
+ @param threadMode MaplyThreadAny is preferred and will use another thread, thus not blocking the one you're on.  MaplyThreadCurrent will make the changes immediately, blocking this thread.
+ */
+- (MaplyComponentObject *__nullable)addBillboards:(NSArray *__nonnull)billboards desc:(NSDictionary *__nullable)desc mode:(MaplyThreadMode)threadMode;
+
+/**
+    Add a particle system to the scene.
+    
+    This adds a particle system to the scene, but does not kick off any particles.
+    
+    @param partSys The particle system to start.
+    
+    @param desc Any additional standard parameters (none at present).
+    
+    @param threadMode MaplyThreadAny will use another thread, thus not blocking the one you're on.  MaplyThreadCurrent will make the changes immediately, blocking this thread.  For particles, it's best to make a separate thread and use MaplyThreadCurrent.
+  */
+- (MaplyComponentObject *__nullable)addParticleSystem:(MaplyParticleSystem *__nonnull)partSys desc:(NSDictionary *__nullable)desc mode:(MaplyThreadMode)threadMode;
+
+/**
+    Change the render target for a particle system.
+
+    This changes the render target for an existing particle system that's already been created.
+    Can pass in nil, which means the particles are rendered to the screen directly.
+    This change takes place immediately, so call it on the main thread.
+ */
+- (void)changeParticleSystem:(MaplyComponentObject *__nonnull)compObj renderTarget:(MaplyRenderTarget *__nullable)target;
+
+/**
+    Add a batch of particles to the current scene.
+    
+    Particles are short term objects, typically very small.  We create them in large groups for efficience.
+    
+    You'll need to fill out the MaplyParticleSystem initially and then the MaplyParticleBatch to create them.
+    
+    @param batch The batch of particles to add to an active particle system.
+    
+    @param threadMode MaplyThreadAny will use another thread, thus not blocking the one you're on.  MaplyThreadCurrent will make the changes immediately, blocking this thread.  For particles, it's best to make a separate thread and use MaplyThreadCurrent.
+  */
+- (void)addParticleBatch:(MaplyParticleBatch *__nonnull)batch mode:(MaplyThreadMode)threadMode;
+
+/**
+ Change the representation of the given vector features.
+ 
+ This will change how any vector features represented by the compObj look.
+ 
+ You can change kMaplyColor, kMaplyMinVis, kMaplyMaxVis, and kMaplyDrawPriority.
+ 
+ This version takes a thread mode.
+ */
+- (void)changeVector:(MaplyComponentObject *__nonnull)compObj desc:(NSDictionary *__nullable)desc mode:(MaplyThreadMode)threadMode;
+
+/**
+ Adds the MaplyVectorObject's passed in as lofted polygons.
+ 
+ Lofted polygons are filled polygons draped on top of the globe with height.  By using a transparent color, these can be used to represent selection or relative values on the globe (or map).
+ 
+ 
+ @param polys An NSArray of MaplyVectorObject.
+  
+ @param desc The desciption dictionary which controls how the lofted polys will look.  It takes the following entries.
+ 
+ @param threadMode For MaplyThreadAny we'll do the add on another thread.  For MaplyThreadCurrent we'll block the current thread to finish the add.  MaplyThreadAny is preferred.
+ 
+ |Key|Type|Description|
+ |:--|:---|:----------|
+ |kMaplyColor|UIColor|Color we'll use for the lofted polygons.  A bit of alpha looks good.|
+ |kMaplyLoftedPolyHeight|NSNumber|Height of the top of the lofted polygon in display units.  For the globe display units are based on a radius of 1.0.|
+ |kMaplyLoftedPolyBase|NSNumber|If present, we'll start the lofted poly at this height.  The height is in globe units, based on a radius of 1.0.|
+ |kMaplyLoftedPolyTop|NSNumber boolean|If on we'll create the geometry for the top.  On by default.|
+ |kMaplyLoftedPolySide|NSNumber boolean|If on we'll create geometry for the sides.  On by default.|
+ |kMaplyLoftedPolyGridSize|NSNumber|The size of the grid (in degrees) we'll use to chop up the vector features to make them follow the sphere (for a globe).|
+ |kMaplyLoftedPolyOutline|NSNumber boolean|If set to @(YES) this will draw an outline around the top of the lofted poly in lines.|
+ |kMaplyLoftedPolyOutlineBottom|NSNumber boolean|If set to @(YES) this will draw an outline around the bottom of the lofted poly in lines.|
+ |kMaplyLoftedPolyOutlineColor|UIColor|If the outline is one this is the outline's color.|
+ |kMaplyLoftedPolyOutlineWidth|NSNumber|This is the outline's width if it's turned on.|
+ |kMaplyLoftedPolyOutlineDrawPriority|NSNumber|Draw priority of the lines created for the lofted poly outline.|
+ |kMaplyLoftedPolyOutlineSide|NSNumber boolean|If set and we're drawing an outline, this will create lines up the sides.|
+ |kMaplyMinVis|NSNumber|This is viewer height above the globe or map.  The lofted polys will only be visible if the user is above this height.  Off by default.|
+ |kMaplyMaxVis|NSNumber|This is viewer height above the globe or map.  The lofted polys will only be visible if the user is below this height.  Off by default.|
+ |kMaplyMinViewerDist|NSNumber|Minimum distance from the viewer at which to display object(s).|
+ |kMaplyMaxViewerDist|NSNumber|Maximum distance from the viewer at which to display object(s).|
+ |kMaplyViewableCenterX|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center X coordinate.|
+ |kMaplyViewableCenterY|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center Y coordinate.|
+ |kMaplyViewableCenterZ|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center Z coordinate.|
+ |kMaplyFade|NSNumber|The number of seconds to fade a lofted poly in when it appears and out when it disappears.|
+ |kMaplyDrawPriority|NSNumber|Geometry is sorted by this value before being drawn.  This ensures that some objects can come out on top of others.  By default this is kMaplyLoftedPolysShapePriorityDefault.|
+ |kMaplyZBufferRead|NSNumber boolean|If set this geometry will respect the z buffer.  It's on by default, meaning that it can be occluded by geometry coming before it.|
+ |kMaplyZBufferWrite|NSNumber boolean|If set this geometry will write to the z buffer.  That means following geometry that reads the z buffer will be occluded.  This is off by default.|
+ |kMaplyEnable|NSNumber boolean|On by default, but if off then the feature exists, but is not turned on.  It can be enabled with enableObjects:|
+ |kMaplyUUID|NSString|Unique ID to match up alternate representations of the same element.|
+ |kMaplyRepresentation|NSString|Name of the representation presented by this object.|
+
+ @return Returns a MaplyComponentObject, which can be used to make modifications or delete the objects created.
+ */
+- (MaplyComponentObject *__nullable)addLoftedPolys:(NSArray *__nonnull)polys desc:(NSDictionary *__nullable)desc mode:(MaplyThreadMode)threadMode;
+
+/**
+ Add a group of points to the display.
+ 
+ Adds a group of points all at once.  We're assuming you want to draw a lot of points, so you have to group them together into a MaplyPoints.
+ 
+ 
+ @param points The points to add to the scene.
+ 
+ @param desc The desciption dictionary which controls how the points will look.  It takes the following entries.
+ 
+ @param threadMode For MaplyThreadAny we'll do the add on another thread.  For MaplyThreadCurrent we'll block the current thread to finish the add.  MaplyThreadAny is preferred.
+ 
+ |Key|Type|Description|
+ |:--|:---|:----------|
+ |kMaplyColor|UIColor|Color we'll use for the lofted polygons.  A bit of alpha looks good.|
+ |kMaplyMinVis|NSNumber|This is viewer height above the globe or map.  The lofted polys will only be visible if the user is above this height.  Off by default.|
+ |kMaplyMaxVis|NSNumber|This is viewer height above the globe or map.  The lofted polys will only be visible if the user is below this height.  Off by default.|
+ |kMaplyMinViewerDist|NSNumber|Minimum distance from the viewer at which to display object(s).|
+ |kMaplyMaxViewerDist|NSNumber|Maximum distance from the viewer at which to display object(s).|
+ |kMaplyViewableCenterX|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center X coordinate.|
+ |kMaplyViewableCenterY|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center Y coordinate.|
+ |kMaplyViewableCenterZ|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center Z coordinate.|
+ |kMaplyFade|NSNumber|The number of seconds to fade a lofted poly in when it appears and out when it disappears.|
+ |kMaplyDrawPriority|NSNumber|Geometry is sorted by this value before being drawn.  This ensures that some objects can come out on top of others.  By default this is kMaplyLoftedPolysShapePriorityDefault.|
+ |kMaplyZBufferRead|NSNumber boolean|If set this geometry will respect the z buffer.  It's on by default, meaning that it can be occluded by geometry coming before it.|
+ |kMaplyZBufferWrite|NSNumber boolean|If set this geometry will write to the z buffer.  That means following geometry that reads the z buffer will be occluded.  This is off by default.|
+ |kMaplyEnable|NSNumber boolean|On by default, but if off then the feature exists, but is not turned on.  It can be enabled with enableObjects:|
+ |kMaplyUUID|NSString|Unique ID to match up alternate representations of the same element.|
+ |kMaplyRepresentation|NSString|Name of the representation presented by this object.|
+
+ @return Returns a MaplyComponentObject, which can be used to make modifications or delete the objects created.
+ */
+- (MaplyComponentObject *__nullable)addPoints:(NSArray * __nonnull)points desc:(NSDictionary *__nullable)desc mode:(MaplyThreadMode)threadMode;
+
+/**
+ Represent an image as a MaplyTexture.
+ 
+ This version of addTexture: allows more precise control over how the texture is represented.  It replaces the other addTexture: and addTextureToAtlas calls.
+ 
+ @param image The UIImage to add as a texture.
+ 
+ @param desc A description dictionary controlling how the image is converted to a texture and represented in the system.
+ 
+ |Key|Type|Description|
+ |:--|:---|:----------|
+ |kMaplyTexFormat|NSNumber|The texture format to use for the image.  Consult addTexture:imageFormat:wrapFlags:mode: for a list.  Default is MaplyImageIntRGBA.|
+ |kMaplyTexMinFilter|NSNumber|Filter to use for minification.  This can be kMaplyMinFilterNearest or kMaplyMinFilterLinear. Default is kMaplyMinFilterLinear.|
+ |kMaplyTexMagFilter|NSNumber|Filter to use for magnification.  This can be kMaplyMinFilterNearest or kMaplyMinFilterLinear. Default is kMaplyMinFilterLinear.|
+ |kMaplyTexWrapX|NSNumber boolean|Texture wraps in x direction.  Off by default.|
+ |kMaplyTexWrapY|NSNumber boolean|Texture wraps in y direction.  Off by default.|
+ |kMaplyTexAtlas|NSNumber boolean|If set, the texture goes into an appropriate atlas.  If not set, it's a standalone texture (default).|
+ 
+ @param threadMode For MaplyThreadAny we'll do the add on another thread.  For MaplyThreadCurrent we'll block the current thread to finish the add.  MaplyThreadAny is preferred.
+ */
+- (MaplyTexture *__nullable)addTexture:(UIImage *__nonnull)image desc:(NSDictionary *__nullable)desc mode:(MaplyThreadMode)threadMode;
+
+/**
+ Create an empty texture and return it.
+ 
+ Empty textures are used for offscreen rendering and other crazy stuff.  You probably don't want to do this.
+ 
+ @param spec The description dictionary controlling the format and other textures goodies.
+ 
+ |Key|Type|Description|
+ |:--|:---|:----------|
+ |kMaplyTexFormat|NSNumber|The texture format to use for the image.  Consult addTexture:imageFormat:wrapFlags:mode: for a list.  Default is MaplyImageIntRGBA.|
+ |kMaplyTexMinFilter|NSNumber|Filter to use for minification.  This can be kMaplyMinFilterNearest or kMaplyMinFilterLinear. Default is kMaplyMinFilterLinear.|
+ |kMaplyTexMagFilter|NSNumber|Filter to use for magnification.  This can be kMaplyMinFilterNearest or kMaplyMinFilterLinear. Default is kMaplyMinFilterLinear.|
+ |kMaplyTexWrapX|NSNumber boolean|Texture wraps in x direction.  Off by default.|
+ |kMaplyTexWrapY|NSNumber boolean|Texture wraps in y direction.  Off by default.|
+ |kMaplyTexAtlas|NSNumber boolean|If set, the texture goes into an appropriate atlas.  If not set, it's a standalone texture (default).|
+ |kMaplyTexMipmap|NSNumber boolean|If set, we'll create the given texture with mipmap levels.|
+ 
+ @param sizeX The horizontal size of the textures (in pixels).
+ 
+ @param sizeY Vertical size of the texture (in pixels).
+ */
+- (MaplyTexture *__nullable)createTexture:(NSDictionary * _Nullable)spec sizeX:(int)sizeX sizeY:(int)sizeY mode:(MaplyThreadMode)threadMode;
+
+/**
+ Creates a new texture that references part of an existing texture.
+ 
+ @param x Horizontal offset within the existing texture.
+ @param y Vertical offset within the existing texture.
+ @param width Width of the chunk to make a new texture.
+ @param height Height of the chunk to make a new texture.
+ @param threadMode For MaplyThreadAny we'll do the add on another thread.  For MaplyThreadCurrent we'll block the current thread to finish the add.  MaplyThreadAny is preferred if you're on the main thread.
+ */
+- (MaplyTexture *__nullable)addSubTexture:(MaplyTexture *__nonnull)tex xOffset:(int)x yOffset:(int)y width:(int)width height:(int)height mode:(MaplyThreadMode)threadMode;
+
+/**
+ Remove the OpenGL ES textures associated with the given MaplyTextures.
+ 
+ MaplyTextures will remove their associated OpenGL textures when they go out of scope.  This method does it expicitly and clears out the internals of the MaplyTexture.
+ 
+ Only call this if you're managing the texture explicitly and know you're finished with them.
+ */
+- (void)removeTextures:(NSArray *__nonnull)texture mode:(MaplyThreadMode)threadMode;
+
+/**
+ Add a render target to the system
+ 
+ Sets up a render target and will start rendering to it on the next frame.
+ 
+ Keep the render target around so you can remove it later.
+ */
+- (void)addRenderTarget:(MaplyRenderTarget * _Nonnull)renderTarget;
+
+/**
+ Set the texture a given render target is writing to.
+ 
+ Render targets start out with one, but you may wish to change it.
+ */
+- (void)changeRenderTarget:(MaplyRenderTarget * __nonnull)renderTarget tex:(MaplyTexture * __nullable)tex;
+
+/**
+ Remove the given render target from the system.
+ 
+ Ask the system to stop drawing to the given render target.  It will do this on the next frame.
+ */
+- (void)removeRenderTarget:(MaplyRenderTarget * _Nonnull)renderTarget;
+
+/**
+    Set up the the mask render target.  We use it to keep one set of features from render on top of another set.
+ */
+- (void)startMaskTarget:(NSNumber * __nullable)scale;
+
+/**
+    Turn off the render target for masks.
+ */
+- (void)stopMaskTarget;
+
+/**
+    Normally the layout layer runs periodically if you change something or when you move around.
+    You can ask it to run ASAP right here.  Layout runs on its own thread, so there may still be a delay.
+ */
+- (void)runLayout;
+
+/**
+  Request a one time clear for the render target.
+
+  Rather than clearing every frame, you may want to specifically request a clear.  This will
+  be executed at the next frame and then not again.
+*/
+- (void)clearRenderTarget:(MaplyRenderTarget * _Nonnull)renderTarget mode:(MaplyThreadMode)threadMode;
+
+/**
+ Remove all information associated with the given MaplyComponentObject's.
+ 
+ Every add call returns a MaplyComponentObject.  This will remove any visible features, textures, selection data, or anything else associated with it.
+ 
+ @param theObjs The MaplyComponentObject's we wish to remove.
+ 
+ @param threadMode For MaplyThreadAny we'll do the removal on another thread.  For MaplyThreadCurrent we'll block the current thread to finish the removal.  MaplyThreadAny is preferred.
+ */
+- (void)removeObjects:(NSArray *__nonnull)theObjs mode:(MaplyThreadMode)threadMode;
+
+/**
+ Disable a group of MaplyComponentObject's all at once.
+ 
+ By default all of the geometry created for a given object will appear.  If you set kMaplyEnable to @(NO) then it will exist, but not appear.  This has the effect of setting kMaplyEnable to @(NO).
+ 
+ @param theObjs The objects to disable.
+ 
+ @param threadMode For MaplyThreadAny we'll do the disable on another thread.  For MaplyThreadCurrent we'll block the current thread to finish the disable.  MaplyThreadAny is preferred.
+ */
+- (void)disableObjects:(NSArray *__nonnull)theObjs mode:(MaplyThreadMode)threadMode;
+
+/**
+ Enable a group of MaplyComponentObject's all at once.
+ 
+ By default all of the geometry created for a given object will appear.  If you set kMaplyEnable to @(NO) then it will exist, but not appear.  This has the effect of setting kMaplyEnable to @(YES).
+ 
+ @param theObjs The objects to enable.
+ 
+ @param threadMode For MaplyThreadAny we'll do the enable on another thread.  For MaplyThreadCurrent we'll block the current thread to finish the enable.  MaplyThreadAny is preferred.
+ */
+- (void)enableObjects:(NSArray *__nonnull)theObjs mode:(MaplyThreadMode)threadMode;
+
+/**
+    Set the representation to use for one or more UUIDs
+ 
+    @param uuids Array of NSString UUIDs to update
+    @param repName The representation name to apply, nil to return to the default
+    @param threadMode For MaplyThreadAny we'll do the enable on another thread.  For MaplyThreadCurrent we'll block the current thread to finish the enable.  MaplyThreadAny is preferred.
+ */
+- (void)setRepresentation:(NSString *__nullable)repName
+                  ofUUIDs:(NSArray<NSString *> *__nonnull)uuids
+                     mode:(MaplyThreadMode)threadMode;
+
+/**
+    Set the representation to use for one or more UUIDs
+ 
+    @param uuids Array of NSString UUIDs to update
+    @param repName The representation name to apply, nil to return to the default
+    @param fallbackRepName The representation to use of no item with `repName` exists.
+    @param threadMode For MaplyThreadAny we'll do the enable on another thread.  For MaplyThreadCurrent we'll block the current thread to finish the enable.  MaplyThreadAny is preferred.
+ */
+- (void)setRepresentation:(NSString *__nullable)repName
+          fallbackRepName:(NSString *__nullable)fallbackRepName
+                  ofUUIDs:(NSArray<NSString *> *__nonnull)uuids
+                     mode:(MaplyThreadMode)threadMode;
+
+/**
+ Pass a uniform block through to a shader.  Only for Metal.
+ 
+ Custom Metal shaders may have their own uniform blocks associated with a known bufferID.
+ This is how you pass those through for objects you've already created.
+ Useful for things like custom animation.
+ */
+- (void)setUniformBlock:(NSData *__nonnull)uniBlock buffer:(int)bufferID forObjects:(NSArray<MaplyComponentObject *> *__nonnull)compObjs mode:(MaplyThreadMode)threadMode;
+
+/**
+ Call this to start journaling changes for this thread.
+ 
+ Your can collect up your add/remove/enable changes on the current thread.  Call startChanges to start collecting and endChanges to flush the changes.
+ 
+ This has no real meaning on the main thread and don't collect too many changes.  They take memory.
+ */
+- (void)startChanges;
+
+/**
+ Call this to flush your journal changes out ot the scene.
+ 
+ This is the other end of startChanges.
+ */
+- (void)endChanges;
+
+/**
+ Add a compiled shader.  We'll refer to it by the scene name.
+ 
+ Once you've create a MaplyShader, you'll need to add it to the scene to use it.
+ 
+ @param shader The working shader (be sure valid is true) to add to the scene.
+ */
+- (void)addShaderProgram:(MaplyShader *__nonnull)shader;
+
+/**
+ Look for a shader with the given name.
+ 
+ This is the shader's own name as specified in the init call, not the scene name as might be specified in addShaderProgram:sceneName:
+ 
+ @return Returns the registered shader if it found one.
+ */
+- (MaplyShader *__nullable)getShaderByName:(NSString *__nonnull)name;
+
+/**
+ Remove a shader that was added earlier.
+ */
+- (void)removeShaderProgram:(MaplyShader *__nonnull)shader;
+
+/**
+ Return the coordinate system being used for the display.
+ 
+ This returns the local coordinate system, which is used to unroll the earth (for the globe) or via a scaling factor (for the flat map).
+ */
+- (MaplyCoordinateSystem *__nullable)coordSystem;
+
+- (void)setClearColor:(UIColor *__nonnull)clearColor;
+
+/// Return the framebuffer size in pixels (no scale)
+- (CGSize)getFramebufferSize;
+
+// For internal use only
+- (MaplyRenderController * __nullable)getRenderControl;
+
+/// Return the renderer type being used
+- (MaplyRenderType)getRenderType;
+
+/**
+    Add the given active object to the scene.
+    
+    Active objects are used for immediate, frame based updates.  They're fairly expensive, so be careful.  After you create one, you add it to the scene here.
+  */
+- (void)addActiveObject:(MaplyActiveObject *__nonnull)theObj;
+
+/// Remove an active object from the scene.
+- (void)removeActiveObject:(MaplyActiveObject *__nonnull)theObj;
+
+/// Remove an array of active objects from the scene
+- (void)removeActiveObjects:(NSArray *__nonnull)theObjs;
+
+/**
+    Add a MaplyControllerLayer to the globe or map.
+    
+    At present, layers are for paged geometry such as image tiles or vector tiles.  You can create someting like a MaplyQuadImageTilesLayer, set it up and then hand it to addLayer: to add to the scene.
+  */
+- (bool)addLayer:(MaplyControllerLayer *__nonnull)layer;
+
+/// Remove a MaplyControllerLayer from the globe or map.
+- (void)removeLayer:(MaplyControllerLayer *__nonnull)layer;
+
+/// Remove zero or more MaplyControllerLayer objects from the globe or map.
+- (void)removeLayers:(NSArray *__nonnull)layers;
+
+/// Remove all the user created MaplyControllerLayer objects from the globe or map.
+- (void)removeAllLayers;
+
+/// Return a tile fetcher we may share between loaders
+- (MaplyRemoteTileFetcher * __nullable)addTileFetcher:(NSString * __nonnull)name;
+
+/**
+    If in Metal rendering mode, return the Metal device being used.
+  */
+- (id<MTLDevice> __nullable)getMetalDevice;
+
+/**
+   If in Metal rendering mode, return the shader library set up by the toolkit.
+  */
+- (id<MTLLibrary> __nullable)getMetalLibrary;
+
+/**
+ An explicit teardown.  For render controllers you allocate standalone, this is a good idea.
+ */
+- (void)teardown;
+
+@end
+
+/**
+ The Render Controller is a standalone WhirlyGlobe-Maply renderer.
+ 
+ This Render Controller is used for offline rendering.
+ */
+@interface MaplyRenderController : NSObject<MaplyRenderControllerProtocol>
+
+/// Initialize as an offline renderer of a given target size of the given rendering type
+- (instancetype __nullable)initWithSize:(CGSize)size mode:(MaplyRenderType)renderType;
+
+/// Initialize as an offline renderer of a given target size with default renderer (Metal)
+- (instancetype __nullable)initWithSize:(CGSize)size;
+
+/// If set up in offline mode, this is how we draw
+- (UIImage * __nullable)renderToImage;
+
+/// Return the raw RGBA pixels from the rendered image rather than a UIImage
+- (NSData * __nullable)renderToImageData;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyRenderTarget.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyRenderTarget.h
new file mode 100644
index 0000000..82b283f
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyRenderTarget.h
@@ -0,0 +1,119 @@
+/*
+ *  MaplyRenderTarget.h
+ *  WhirlyGlobe-MaplyComponent
+ *
+ *  Created by Steve Gifford on 1/13/17.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <UIKit/UIKit.h>
+#import <WhirlyGlobeMaplyComponent/MaplyTexture.h>
+
+typedef NS_ENUM(NSUInteger,MaplyMipmapType) {
+    /// Don't generate a mipmap
+    MaplyMipmapNone,
+    /// Generate a basic mipmap
+    MaplyMipmapAverage,
+    /// Generate a mipmap using Gauss blurring
+    MaplyMipmapGauss
+};
+
+/** 
+    Represents a render target (other than the screen)
+    
+    Individual objects can ask to be drawn somewhere other than the screen.
+    This is how we do that.
+    
+    A render target is just a link between a render every frame and a MaplyTexture.  To get at the actual image you use the MaplyTexture.
+    
+    At the moment a render target can only draw the full screen, possibly at a lower resolution.
+  */
+@interface MaplyRenderTarget : NSObject
+
+/** 
+    The texture we'll draw into.
+    
+    This is the texture we'll draw into.  Use createTexture to set it up.
+  */
+@property (nonatomic,strong) MaplyTexture *texture;
+
+/**
+    If set, we'll clear the target textures every frame before rendering to it.
+ 
+    If not set, we won't clear the render target texture between frames.
+ 
+    True by default.
+  */
+@property (nonatomic) bool clearEveryFrame;
+
+/**
+    If we're generating a mipmap for the attached texture of a render target, this controls
+        how we do it. The default is none.
+ */
+@property (nonatomic) MaplyMipmapType mipmapType;
+
+/**
+ If set, we'll caclulate the min/max for this render target every frame.
+    This is a GPU based calculation for Metal.
+ */
+@property (nonatomic) bool calculateMinMax;
+
+/**
+    Clear the render target to this color every frame.
+ 
+    Default is clear black.
+  */
+@property (nonatomic,strong) UIColor *clearColor;
+
+
+/**
+    Clear the render target to this value on every frame.
+ 
+    This is for render targets that are not purely color, such as multiple floats.
+  */
+@property (nonatomic,assign) float clearVal;
+
+/**
+    If set, anything rendered to this render target will blend with what's there.
+ 
+    If not set, what's rendered will replace what was there before.
+    This is the way it normally works for screen rendering.
+
+    Set to false by default.
+  */
+@property (nonatomic) bool blend;
+
+/**
+ Retrieves a single data value out of the render target.  Size is the number of components * size of components.
+ It's best to call this in the snapshot callback.  We know the destination isn't being written to at the moment.
+  Metal only.
+ */
+- (NSData *)getValueAtX:(int)x y:(int)y;
+
+/**
+  Returns the whole render target snapshot in the NSData.
+ It's best to call this in the snapshot callback.  We know the destination isn't being written to at the moment.
+ Metal only.
+ */
+- (NSData *)getSnapshot;
+
+/**
+  Retreives the min/max data values if those are being calculated.
+   It's best to call this in the snapshot callback.  We know the destination isn't being written to at the moment.
+ Metal only.
+ */
+- (NSData *)getMinMaxValues;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyRotateDelegate.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyRotateDelegate.h
new file mode 100644
index 0000000..2cb073b
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyRotateDelegate.h
@@ -0,0 +1,29 @@
+/*  MaplyRotateDelegate.h
+ *  WhirlyGlobeLib
+ *
+ *  Created by rghosh0 around 9/26/13.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#import <UIKit/UIKit.h>
+
+@interface MaplyRotateDelegate : NSObject <UIGestureRecognizerDelegate>
+
+//The gesture recognizer
+@property (nonatomic,retain) UIGestureRecognizer* gestureRecognizer;
+
+/// The minimum angle (degrees) that must be subtended before rotation begins
+@property(nonatomic,assign) float rotateThreshold;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyScreenLabel.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyScreenLabel.h
new file mode 100644
index 0000000..3893d2f
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyScreenLabel.h
@@ -0,0 +1,187 @@
+/*
+ *  WGScreenLabel.h
+ *  WhirlyGlobeComponent
+ *
+ *  Created by Steve Gifford on 7/24/12.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <UIKit/UIKit.h>
+#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
+
+@class MaplyVectorObject;
+
+/// Don't move the label at all
+#define kMaplyLayoutNone (1<<0)
+/// Okay to place centered on point
+#define kMaplyLayoutCenter  (1<<1)
+/// Okay to place to the right of a point
+#define kMaplyLayoutRight  (1<<2)
+/// Okay to place it to the left of a point
+#define kMaplyLayoutLeft   (1<<3)
+/// Okay to place on top of a point
+#define kMaplyLayoutAbove  (1<<4)
+/// Okay to place below a point
+#define kMaplyLayoutBelow  (1<<5)
+
+/** 
+    The Screen Label is a 2D label that tracks a given geographic location.
+    
+    This screen label will track the given geographic position.  If it's behind the globe it will disappear.  The label is rendered in a fixed size and will always appear on top of other geometry.
+  */
+@interface MaplyScreenLabel : NSObject
+
+/** 
+    Location of the screen label in geographic (lat/lon) in radians.
+    
+    The screen label will track this position.  If it would be behind the globe (in globe mode), then it will disappear.
+  */
+@property (nonatomic,assign) MaplyCoordinate loc;
+
+/** 
+    An optional rotation to apply to the screen label.
+    
+    This is a rotation we'll apply after the screen position has been calculated.  You can use this to do things like track the orientation of roads.
+    
+    Rotation is in radians counter-clockwise from north.
+  */
+@property (nonatomic,assign) float rotation;
+
+/** 
+    When the screen is rotated, try to keep the label upright.
+    
+    This tells the layout and display engine to keep the label oriented upright no matter what.  In practice this means it will manipulate the rotation by 180 degrees.
+  */
+@property (nonatomic,assign) bool keepUpright;
+
+/** 
+    The actual text to display.
+    
+    This is a simple NSString for the text.  Things like font are set in the NSDictionary passed in to the add call in the view controller.
+  */
+@property (nonatomic,strong) NSString * __nullable text;
+
+/** 
+    Text can be accompanied by an optional icon image.
+    
+    If set, we'll put this image to the left of the text in the screen label.  The UIImage will be tracked by the view controller and reused as needed or disposed of when no longer needed.
+    
+    The name had to change because Apple's private selector search is somewhat weak.
+  */
+@property (nonatomic,strong) UIImage * __nullable iconImage2;
+
+/** 
+    Icon size in points.
+    
+    If there is an icon image, this is how big it is.
+  */
+@property (nonatomic,assign) CGSize iconSize;
+
+/** 
+    An optional offset for the whole screen label.
+    
+    If set, we'll move the screen label around by this amount before rendering it.  These are screen coordinates, not geographic.
+  */
+@property (nonatomic,assign) CGPoint offset;
+
+/** 
+    An optional color override.
+    
+    If set, this color will override the color passed in with the NSDictionary in the view controller's add method.
+  */
+@property (nonatomic,strong) UIColor * __nullable color;
+
+/** 
+    Label selectability.  On by default
+    
+    If set, this label can be selected by the user.  If not set, this screen label will never appear in selection results.
+  */
+@property (nonatomic,assign) bool selectable;
+
+/** 
+    The layout importance compared to other features, 0 by default.
+ 
+    The toolkit has a simple layout engine that runs several times per second.  It controls the placement of all participating screen based features, such as MaplyScreenLabel and MaplyScreenMaker objects.  This value controls the relative importance of this particular object.  By default that importance is 0 so the object must compete with others.  Setting it to MAXFLOAT will bypass the layout engine entirely and the object will always appear.
+ */
+@property (nonatomic,assign) float layoutImportance;
+
+/** 
+    The placement rules for the layout engine to follow.
+    
+    The layout engine isn't the brightest bulb in the string and it needs placement hints.  This value tells the engine where we can move the label around.  These are bit flags, so OR them together as needed.  The default is everything.
+ 
+|Layout Flag|Meaning|
+|:----------|:------|
+|kMaplyLayoutRight|The layout engine can put this label to the right of the location point.|
+|kMaplyLayoutLeft|The layout engine can put this label to the left of the location point.|
+|kMaplyLayoutAbove|The layout engine may put this label above the location point, centered.|
+|kMaplyLayoutBelow|The layout engine may put this albel below the location point, centered.|
+ */
+@property (nonatomic,assign) int layoutPlacement;
+
+/**
+ The size of the label for layout purposes.
+ 
+ If layoutImportance is not set to MAXFLOAT, the screen label will get throw into the mix when doing screen layout.  With this, you can set the size of the label when considering layout.  If you set this to (0,0) the maker will take up no space, but still be considered in the layout.
+ */
+@property (nonatomic,assign) CGSize layoutSize;
+
+/**
+    If this is present, we'll render an ID into the mask layer to be used by other features to mask against.
+ */
+@property (nonatomic,retain,nullable) NSString *maskID;
+
+/**
+    If set, we'll lay out the the text along the given linear or areal feature.
+    Takes the first feature in the vector, if there are multiple.
+ */
+@property (nonatomic,retain,nullable) MaplyVectorObject *layoutVec;
+
+
+/**
+    Used to resolve to resolve labels that show the same thing.
+ 
+    By default this is nil and not used to resolve conflicts.  When you set it to
+    something, such as a string, it will be used to resolve display conflicts.
+    Only one object that has this unique ID (evaluated with isEqualToString:) will be displayed.
+    Importance is evaluated first, so the most important will be placed first.
+  */
+@property (nonatomic,retain,nullable) NSString *uniqueID;
+
+/** 
+    User data object for selection
+    
+    When the user selects a feature and the developer gets it in their delegate, this is an object they can use to figure out what the screen label means to them.
+  */
+@property (nonatomic,strong) id  __nullable userObject;
+
+@end
+
+/** 
+    A version of the maply screen label that moves.
+    
+    This version of the screen label can move in a limited way over time.
+ */
+@interface MaplyMovingScreenLabel : MaplyScreenLabel
+
+/// The end point for animation
+@property (nonatomic,assign) MaplyCoordinate endLoc;
+
+/// How long it will take the screen label to get to endLoc
+@property (nonatomic,assign) NSTimeInterval duration;
+
+@end
+
+typedef MaplyScreenLabel WGScreenLabel;
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyScreenMarker.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyScreenMarker.h
new file mode 100644
index 0000000..3481876
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyScreenMarker.h
@@ -0,0 +1,168 @@
+/*  MaplyScreenMarker.h
+ *  WhirlyGlobeComponent
+ *
+ *  Created by Steve Gifford on 7/21/12.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#import <UIKit/UIKit.h>
+#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
+
+@class MaplyVectorObject;
+
+/** 
+    The Screen Marker is a 2D object that displays an image on the screen tracking a given location.
+    
+    The screen marker will track the given geographic location and display a centered rectangle with the given image.  Essentially it's a free floating icon, similar to the MaplyScreenLabel and it will always be drawn on top of other objects.  If the location would be behind the globe (in globe mode), the marker will disappear.
+    
+    If you're looking for a 3D marker object, that's the MaplyMarker.
+  */
+@interface MaplyScreenMarker : NSObject
+
+/** 
+    The location we're tracking for this particular screen marker.
+    
+    Locations are in geographic (lon/lat in radians).
+  */
+@property (nonatomic,assign) MaplyCoordinate loc;
+
+/** 
+    Screen size in points.
+    
+    The marker will always be this size on the screen.  The size is specified in pixels.
+  */
+@property (nonatomic,assign) CGSize size;
+
+/** 
+    An optional rotation to apply to the screen marker.
+    
+    This is a rotation we'll apply after the screen position has been calculated.  The angle is in radians counter-clockwise from north.
+ */
+@property (nonatomic,assign) double rotation;
+
+/** 
+    Image or texture to use for the marker.
+    
+    If set we'll stretch this UIImage (or MaplyTexture) out over the marker rectangle.  If not set, the marker will just be a colored rectangle.  The view controller tracks this object and will reuse its texture and dispose of it as needed.
+  */
+@property (nonatomic,strong) id  __nullable image;
+
+/** 
+    Images to display on the sticker.
+    
+    If this is set rather than image, we will cycle through these images on the screen marker.  It will take period time to cycle through them all.
+  */
+@property (nonatomic,strong) NSArray * __nullable images;
+
+/** 
+    The time we'll take to cycle through all the images for the marker.
+    
+    If images are passed in, this is the time it will take to cycle through them all.  By default this is 5s.
+  */
+@property (nonatomic) double period;
+
+/** 
+    Color for this particular marker.
+    
+    If set, this the color we'll use for the marker or how we'll tint the image.
+    
+    This overrides the color set in the description dictionary.
+  */
+@property (nonatomic,strong) UIColor * __nullable color;
+
+/** 
+    The layout importance compared to other features, 0 by default.
+    
+    The toolkit has a simple layout engine that runs several times per second.  It controls the placement of all participating screen based features, such as MaplyScreenLabel and MaplyScreenMaker objects.  This value controls the relative importance of this particular object.  By default that importance is 0 so the object must compete with others.  Setting it to MAXFLOAT will bypass the layout engine entirely and the object will always appear.
+ */
+@property (nonatomic,assign) float layoutImportance;
+
+/** 
+    The size of the marker for layout purposes.
+    
+    If layoutImportance is not set to MAXFLOAT, the screen marker will get throw into the mix when doing screen layout.  With this, you can set the size of the marker when considering layout.  If you set this to (0,0) the maker will take up no space, but still be considered in the layout.
+  */
+@property (nonatomic,assign) CGSize layoutSize;
+
+/**
+    Screen markers are usually grouped together for rendering efficiency.  This controls the order of the marker within that grouping.
+    orderBy is less important than drawPriority.
+    Default is 0 and means no ordering.
+ */
+@property (nonatomic,assign) long orderBy;
+
+/** 
+    Offset in screen coordinates.
+    
+    Set to zero by default, this is the offset we'll apply to a given screen marker before it's drawn.  The values are screen points.
+  */
+@property (nonatomic,assign) CGPoint offset;
+
+/** 
+    Vertex attributes to apply to this screen marker.
+    
+    MaplyVertexAttribute objects are passed all the way to the shader.  Read that page for details on what they do.
+    
+    The array of vertex attributes provided here will be copied onto all the vertices we create for the shader.  This means you can use these to do things for a single billboard in your shader.
+ */
+@property (nonatomic,strong) NSArray * __nullable vertexAttributes;
+
+/** 
+    Screen marker selectability.  On by default
+    
+    If set, this marker can be selected by the user.  If not set, this screen marker will never appear in selection results.
+ */
+@property (nonatomic,assign) bool selectable;
+
+/**
+    A unique identifier for the marker that's propagated through the system.
+  */
+@property (nonatomic,retain,nullable) NSString *uniqueID;
+
+/**
+    If this is present, we'll render an ID into the mask layer to be used by other features to mask against.
+ */
+@property (nonatomic,retain,nullable) NSString *maskID;
+
+/**
+    If set, we'll lay out the marker along the given linear or areal feature.
+    Takes the first feature in the vector, if there are multiple.
+ */
+@property (nonatomic,retain,nullable) MaplyVectorObject *layoutVec;
+
+/** 
+    User data object for selection
+ 
+    When the user selects a feature and the developer gets it in their delegate, this is an object they can use to figure out what the screen marker means to them.
+ */
+@property (nonatomic,strong) id  __nullable userObject;
+
+@end
+
+/** 
+    A version of the maply screen marker that moves.
+    
+    This version of the screen marker can move in a limited way over time.
+  */
+@interface MaplyMovingScreenMarker : MaplyScreenMarker
+
+/// The end point for animation
+@property (nonatomic,assign) MaplyCoordinate endLoc;
+
+/// How long it will take the screen marker to get to endLoc
+@property (nonatomic,assign) NSTimeInterval duration;
+
+@end
+
+typedef MaplyScreenMarker WGScreenMarker;
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyScreenObject.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyScreenObject.h
new file mode 100644
index 0000000..48028ae
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyScreenObject.h
@@ -0,0 +1,106 @@
+/*
+ *  MaplyScreenObject
+ *  WhirlyGlobeComponent
+ *
+ *  Created by Steve Gifford on 2/28/15
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <UIKit/UIKit.h>
+#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
+#import <WhirlyGlobeMaplyComponent/MaplyRenderController.h>
+
+/** 
+    The Maply Screen Object is used to build up a more complex screen object from multiple pieces.
+    
+    You can use one or more of these to build up a combination of labels and images that form a single marker, label, or billboard.
+  */
+@interface MaplyScreenObject : NSObject
+
+/** 
+    Add a string to the screen object
+    
+    @param str The string to add
+    
+    @param font The font to use
+    
+    @param color The foreground color of the string.
+  */
+- (void)addString:(NSString *)str font:(UIFont *)font color:(UIColor *)color;
+
+/** 
+    Add an attributed string to the screen object.
+    
+    This adds an annotated string to the screen object.  The size will be based on the length of the string and the font.
+  */
+- (void)addAttributedString:(NSAttributedString *)str;
+
+/** 
+    Add an image scaled to the given size.
+    
+    Adds a UIImage or MaplyTexture object scaled to the given size.
+  */
+- (void)addImage:(id)image color:(UIColor *)color size:(CGSize)size;
+
+/**
+    Add an image scaled to the given size and offset by the given amount.
+ 
+    The other version of this call centers around (0,0) so this lets you nudge it.
+ */
+- (void)addImage:(id)image color:(UIColor *)color size:(CGSize)size offset:(CGPoint)offset;
+
+/** 
+    Calculate and return the current bounding box of the screen object.
+  */
+- (MaplyBoundingBox)getSize;
+
+/** 
+    Apply a scale to all the pieces of the screen object.
+  */
+- (void)scaleX:(double)x y:(double)y;
+
+/** 
+    Apply a translation to all the pieces of the screen object.
+  */
+- (void)translateX:(double)x y:(double)y;
+
+/** 
+    Add the contents of the given screen object to this screen object.
+  */
+- (void)addScreenObject:(MaplyScreenObject *)screenObj;
+
+@end
+
+/**
+ Features missing to replicate ScreenMarker and ScreenLabel.
+    rotation
+    images (for animation)
+    period (for animation)
+    color
+    layoutImportance
+    layoutSize
+    layoutPlacement (right, left, above, below)
+    vertexAttributes
+    keepUpright
+ 
+ ScreenObjectInstance (new object)
+    location
+    endLoc/duration (moving fields)
+    selectable
+    ScreenObject pointer
+    Selected version ScreenObject pointer
+    uniqueID
+    userObject (for selection)
+ */
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyShader.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyShader.h
new file mode 100644
index 0000000..45e309e
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyShader.h
@@ -0,0 +1,174 @@
+/*
+ *  MaplyShader.h
+ *  WhirlyGlobe-MaplyComponent
+ *
+ *  Created by Steve Gifford on 2/7/13.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <Foundation/Foundation.h>
+#import <Metal/Metal.h>
+
+@protocol MaplyRenderControllerProtocol;
+@class MaplyTexture;
+
+/** 
+    The various types of attributes that can be passed in to shaders.
+  */
+typedef NS_ENUM(NSInteger, MaplyShaderAttrType){
+	MaplyShaderAttrTypeInt,
+	MaplyShaderAttrTypeFloat,
+	MaplyShaderAttrTypeFloat2,
+	MaplyShaderAttrTypeFloat3,
+	MaplyShaderAttrTypeFloat4
+};
+
+/** 
+    The shader is a direct interface to OpenGL ES 2.0 shader language.
+    
+    You can set your own shader programs in the toolkit!  Yeah, that's as complex as it sounds.
+    
+    The underyling toolkit makes a distinction between the name of the shader and the scene name.  The scene name is used as a way to replace the default shaders we use for triangles and lines.  This would let you replace the shaders you're already using with your own.  See the addShaderProgram: method in the MaplyBaseViewController.
+    
+    You can also add your own shader and hook it up to any features that can call out a specific shader, such as the MaplyQuadImageTilesLayer.
+    
+    When writing a new shader, go take a look at DefaultShaderPrograms.mm, particularly the vertexShaderTri and fragmentShaderTri.  The documentation here is for the uniforms and attributes the system is going to hook up for you.  All of these are optional, but obviously nothing much will happen if you don't use the vertices.
+ 
+**Uniform Values**
+ 
+These are uniform values provided to each shader, if requested.
+ 
+ |uniform|type|description|
+ |:------|:---|:----------|
+ |u_mvpMatrix|mat4| The model/view/projection matrix.  Shaders typically run vertices through this. |
+ |u_mvMatrix|mat4| The model/view matrix.  Less comonly used. |
+ |u_mvNormalMatrix|mat4| The model/view matrix for normals.  A shader typically uses this when we want view dependent lighting. |
+ |u_fade|float| Available in regular drawables, but not yet in big drawables (e.g. atlases).  This is intended to fade geometry in and out over time. |
+ |u_interp|float| If we're doing multiple textures, this is how to interpolate them. |
+ |u_numLights|int| The number of active lights to use. |
+ |light[8]|directional_light| A data structure for each active light.  See the table below. |
+ |material|material_properties| Material information used to calculate lighting.  See the table below. |
+ |u_hasTexture|bool| True if there's a texture available to fetch data from. |
+ |s_baseMapX|sampler2D| s_baseMap0, s_baseMap1 and so forth are references to texture data. |
+
+**Material properties**
+ 
+These are the fields for the material properties.
+ 
+|field|type|description|
+|:----|:---|:----------|
+|ambient|vec4| The ambient value for the material.  Shaders typically multiply by this value when calculating ambient lighting. |
+|diffuse|vec4| The diffuse value for the material.  Shaders typically multiply by this value when calculating diffuse lighting. |
+|specular|vec4| Not currently used. |
+|specular_exponent|float| Not currently used. |
+ 
+**Light properties**
+
+These are the fields for each individual light.
+ 
+ |field|type|description|
+ |:----|:---|:----------|
+ |direction|vec3| The light's direction, used in diffuse lighting. |
+ |halfplane|vec3| This would be used in specular lighting. |
+ |ambient|vec4| The ambient value of the light. |
+ |diffuse|vec4| The diffuse value of the light. |
+ |specular|vec4| Not currently used. |
+ |viewdepend|float| If greater than 0.0, the shader should run each normal through the u_mvNormalMatrix. |
+ 
+**Attributes**
+ 
+These are the per vertex attributes provided to each vertex shader.
+
+ |field|type|description|
+ |:----|:---|:----------|
+ |a_position|vec3| The position in display space for a vertex.  Shaders typically multiply this by u_mvpMatrix. |
+ |a_texCoord0|vec2| If textures are present, this is the texture coordinate for the first one. |
+ |a_texCoord1|vec2| If two textures are present, this is the texture coordinate for the second. |
+ |a_color|vec4| An RGBA color for the vertex. |
+ |a_normal|vec3| A normal in display space.  This is used purely for lighting and often run through u_mvNormalMatrix. |
+ |a_elev|float| An optional elevation value provided by the MaplyQuadImageTiles layer.  You can use it to do elevation dependent shading. |
+ 
+  */
+@interface MaplyShader : NSObject
+
+/**
+    Initialize with Metal shader functions tied to a particular view controller.  Metal only.
+ 
+    This initializer just ties the given functions to this MaplyShader.  All the real work is
+    done by Metal.
+ 
+     @param name The name of the shader program.  Used for identification and sometimes lookup.
+ 
+     @param vertexFunc The MTLFunction for vertex processing.
+ 
+     @param fragFunc The MTLFunction for fragment processing.
+
+     @param baseViewC The view controller where we'll register the new shader.
+ 
+     @return Returns a shader program if it succeeded.  IT may not work, however, so call valid first.
+  */
+- (nullable instancetype)initMetalWithName:(NSString *__nonnull)name vertex:(id<MTLFunction> __nonnull)vertexFunc fragment:(id<MTLFunction> __nullable)fragFunc viewC:(NSObject<MaplyRenderControllerProtocol> *__nonnull)baseViewC;
+
+/** 
+    Name of the shader program.
+    
+    This is the name passed in to the init call.  You can search by this name in some circumstances.
+  */
+@property (nonatomic,strong) NSString * __nullable name;
+
+/**
+   Present a texture to this shader for use.  Metal Only.
+ 
+   For a Metal shader we can pass in zero or more textures starting at WKSTextureEntryLookup (DefaultShadersMTL.h).
+   This index is offset from there.  Start at 0.
+  */
+- (void)setTexture:(MaplyTexture * __nonnull)tex forIndex:(int)idx viewC:(NSObject<MaplyRenderControllerProtocol> * __nonnull)viewC;
+
+/**
+ Remove a texture we presented to the Shader ealier.  Metal Only.
+ 
+ The texture itself will not be deleted, just the reference to it in the shader.
+ */
+- (void)removeTexture:(MaplyTexture * __nonnull)tex viewC:(NSObject<MaplyRenderControllerProtocol> * __nonnull)viewC;
+
+/**
+    For Metal shaders we don't set the individual uniform values passed in, we set them all together as a block.  These are typically set
+    through the ComponentObject interface, but can be set gobally here.
+ 
+    Metal Only.
+ */
+- (bool)setUniformBlock:(NSData *__nonnull)uniBlock buffer:(int)bufferID;
+
+/**
+   If set, this program is expecting to be called once for each level of a render target's texture.
+ Essentially, it runs a reduce operation, starting from some source and working its way up to the 1x1 texture at the top.
+ */
+- (void)setReduceMode:(bool)reduceMode;
+
+/** 
+    Check if the shader is valid.
+    
+    The shader setup can fail in a number of ways.  Check this after creating the shader to see if it succeded.  If not, look to getError to see why.
+  */
+- (bool)valid;
+
+/** 
+    Return the compilation error if there was one.
+    
+    Shader construction can fail in a number of interesting ways.  Call valid to see if it did fail, and then call this method to see why.
+  */
+- (NSString *__nullable)getError;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyShape.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyShape.h
new file mode 100644
index 0000000..baed55f
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyShape.h
@@ -0,0 +1,318 @@
+/*
+ *  MaplyShape.h
+ *  WhirlyGlobe-MaplyComponent
+ *
+ *  Created by Steve Gifford on 9/28/12.
+ *  Copyright 2012-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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <UIKit/UIKit.h>
+#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
+#import <WhirlyGlobeMaplyComponent/MaplyMatrix.h>
+#import <WhirlyGlobeMaplyComponent/MaplyTexture.h>
+
+/** 
+    Maply Shape is the base class for the actual shape objects.
+    
+    The maply shape is just the base class.  Look to MaplyShapeCircle, MaplyShapeCylinder, MaplyShapeSphere, MaplyShapeGreatCircle, and MaplyShapeLinear.
+  */
+@interface MaplyShape : NSObject
+
+/** 
+    The color of the shape.
+    
+    We can set object color in the NSDictionary passed in with the add method.  We can also override that here.
+ */
+@property (nonatomic,strong) UIColor * __nullable color;
+
+/** 
+    If set, the object is selectable
+ 
+    The object is selectable if this is set when the object is passed in to an add call.  If not set, you'll never see it in selection.
+ */
+@property (nonatomic,assign) bool selectable;
+
+/** 
+    User data object for selection
+ 
+    When the user selects a feature and the developer gets it in their delegate, this is an object they can use to figure out what the shape means to them.
+ */
+@property (nonatomic,strong) id  __nullable userObject;
+
+/** 
+    If set, this shape is in clip coordinates and will not be transformed.
+    
+    Some objects (the rectangle) can be used as overlays in clip coordinates.  This is set if that's the case.
+  */
+@property (nonatomic,assign) bool clipCoords;
+
+@end
+
+/** 
+    Shows a circle at the given location on the globe or map.
+    
+    This object represents a circle at the given geographic location.  It needs a radius (in display coordinates) and can optionally have a height above the globe or map.
+ */
+@interface MaplyShapeCircle : MaplyShape
+
+/** 
+    Center of the circle in local coordinates.
+    
+    This is the center of the circle in geographic.
+  */
+@property (nonatomic,assign) MaplyCoordinate center;
+
+/** 
+    Radius of the circle in display units.
+    
+    This is the radius of the circle, but not in geographic.  It's in display units.  Display units for the globe are based on a radius of 1.0.  Scale accordingly.  For the map, display units typically run from -PI to +PI, depending on the coordinate system.
+  */
+@property (nonatomic,assign) float radius;
+
+/** 
+    Offset height above the globe in display units.
+    
+    This is the height above the globe for the center of the circle.  It's also in display units, like the radius.
+  */
+@property (nonatomic,assign) float height;
+
+@end
+
+typedef MaplyShapeCircle WGShapeCircle;
+
+/** 
+    Display a sphere at the given location with the given radius.
+    
+    This object represents a sphere at the
+  */
+@interface MaplyShapeSphere : MaplyShape
+
+/** 
+    Center of the sphere in local coordinates.
+    
+    The x and y coordinates correspond to longitude and latitude and are in geographic (radians).  The Z value is in display coordinates.  For that globe that's based on a radius of 1.0.  Scale accordingly.
+ */
+@property (nonatomic,assign) MaplyCoordinate center;
+
+/** 
+    Radius of the sphere in display units.
+    
+    This is the radius of the sphere, but not in geographic.  It's in display units.  Display units for the globe are based on a radius of 1.0.  Scale accordingly.  For the map, display units typically run from -PI to +PI, depending on the coordinate system.
+ */
+@property (nonatomic,assign) float radius;
+
+/** 
+    Offset height above the globe in display units.
+    
+    This is the height above the globe for the center of the sphere.  It's also in display units, like the radius.
+ */
+@property (nonatomic,assign) float height;
+
+@end
+
+typedef MaplyShapeSphere WGShapeSphere;
+
+/** 
+    Represent a cyclinder on the globe or map.
+    
+    This object represents a cylinder with it's base tied to the surface of the globe or map and it's top pointed outward (on the globe anyway).  The base can be offset and the overall radius and height are adjustable.
+  */
+@interface MaplyShapeCylinder : MaplyShape
+
+/** 
+    Center of the cylinder's base in geographic.
+    
+    The x and y coordinates correspond to longitude and latitude and are in geographic (radians).
+ */
+@property (nonatomic,assign) MaplyCoordinate baseCenter;
+
+/** 
+    Base height above the globe in display units.
+    
+    This is an optional base offset from the globe or map.  The cylinder will be offset by this amount.  It's also in display units, like the radius.
+ */
+@property (nonatomic,assign) float baseHeight;
+
+/** 
+    Radius of the cylinder in display units.
+    
+    This is the radius of the cylinder, but not in geographic.  It's in display units.  Display units for the globe are based on a radius of 1.0.  Scale accordingly.  For the map, display units typically run from -PI to +PI, depending on the coordinate system.
+ */
+@property (nonatomic,assign) float radius;
+
+/** 
+    Height of the cylinder in display units.
+    
+    This is the height of the cylinder.  The top of the cylinder will be at baseHeight+height.  It's also in display units, like the radius.
+ */
+@property (nonatomic,assign) float height;
+
+@end
+
+typedef MaplyShapeCylinder WGShapeCylinder;
+
+/** 
+    Represents an great circle or great circle with height.
+    
+    Great circles are the shortest distance between two points on a globe.  We extend that a bit here, by adding height.  The result is a curved object that can either sit on top of the globe or rise above it.  In either case it begins and ends at the specified points on the globe.
+ */
+@interface MaplyShapeGreatCircle : MaplyShape
+
+/// Starting point in geographic coordinates.
+@property (nonatomic,assign) MaplyCoordinate startPt;
+
+/// End point in geographic coordinates
+@property (nonatomic,assign) MaplyCoordinate endPt;
+
+/** 
+    Height of the great circle shape right in its middle.
+    
+    This is the height of the great circle right in the middle.  It will built toward that height and then go back down as it reaches the endPt.  The height is in display units.  For the globe that's based on a radius of 1.0.
+ */
+@property (nonatomic,assign) float height;
+
+/** 
+    Line width for the great circle geometry.
+    
+    The great circle is implemented as a set of lines. This is the width, in pixels, of those lines.
+  */
+@property (nonatomic,assign) float lineWidth;
+
+/** 
+    Angle between start and end points in radians
+  */
+- (float)calcAngleBetween;
+
+@end
+
+/** 
+    Represents a simple rectangle in 3D.
+    
+    The rectangle is a 2D object in 3D.  Specify the lower left and upper right coordinates as
+    well as an optional texture.
+  */
+@interface MaplyShapeRectangle : MaplyShape
+
+/// Lower left corner in 3D
+@property (nonatomic,assign) MaplyCoordinate3dD ll;
+
+/// Upper right corner in 3D
+@property (nonatomic,assign) MaplyCoordinate3dD ur;
+
+/// If set, the textures to stretch across the rectangle.
+@property (nonatomic,nullable,strong) NSMutableArray *textures;
+
+/// Add a texture to stretch across the rectangle
+- (void)addTexture:(MaplyTexture * __nonnull)texture;
+
+@end
+
+/** 
+    A linear feature offset from the globe.
+    
+    The main difference between this object and a regular MaplyVectorObject is that you specify coordiantes in 3D.  You can use this to create linear features that are offset from the globe.
+  */
+@interface MaplyShapeLinear : MaplyShape
+
+/** 
+    Line width in pixels
+    
+    The linear is implemented as a set of line segments in OpenGL ES.  This is their line width in pixels.
+  */
+@property (nonatomic,assign) float lineWidth;
+
+/** 
+    Initialize with coordinates and coordinate array size
+    
+    This initializer will make a copy of the coordinates and use them to draw the lines.  The x and y values are in geographic.  The z values are offsets from the globe (or map) and are in display units.  For the globe display units are based on a radius of 1.0.
+  */
+- (nullable instancetype)initWithCoords:(MaplyCoordinate3d * __nonnull)coords numCoords:(int)numCoords;
+
+/** 
+    Return the coordinates for this linear feature.
+    
+    @return Returns the number of coordinates and a pointer to the coordinate array.
+  */
+- (int)getCoords:(MaplyCoordinate3d *__nullable *__nonnull)retCoords;
+
+@end
+
+/** 
+    An extruded shape with an arbitrary outline.
+    
+    This object represents an extruded shape with the given thickness.  It can be oriented according to the pitch, roll, yaw and height.
+  */
+@interface MaplyShapeExtruded : MaplyShape
+
+/** 
+    Construct with the coordinates for the outline to extrude.
+ 
+    Pass in pairs of doubles that correspond to the
+ */
+- (nonnull instancetype)initWithOutline:(NSArray * __nonnull)coords;
+
+/** 
+    Construct with the coordinates for the outline to extrude.
+    
+    Pass in pairs of doubles that correspond to the
+  */
+- (nonnull instancetype)initWithOutline:(double * __nonnull)coords numCoordPairs:(int)numCoordPairs;
+
+/** 
+    Number of coordinate pairs in this shape.
+  */
+@property (nonatomic,readonly) int numCoordPairs;
+
+/** 
+    Array of coordinate values.
+  */
+@property (nonatomic,readonly) double * __nullable coordData;
+
+/** 
+    Where we'd like to place the extruded shape.
+    
+    This is the center of the object in geographic radians.
+  */
+@property (nonatomic) MaplyCoordinate center;
+
+/** 
+    Scale for coordinates.  Set to 1/EarthRadiusInMeters by default.
+    
+    The coordinates will be scaled by this before creating the geometry.  By default this is set to 1/EarthRadius(m) so you can build your shape in meters.  Also applies to thickness and height.
+  */
+@property (nonatomic,assign) double scale;
+
+/** 
+    Thickness for the resulting shape.
+    
+    We build an extruded shape out of this information and this is its thickness.  If this is zero, you just get a double sided polygon.
+  */
+@property (nonatomic,assign) double thickness;
+
+/** 
+    Height to place the resulting shape at.
+    
+    We'll put this shape at the given height above the surface of the globe or map.
+  */
+@property (nonatomic,assign) double height;
+
+/** 
+    The transform to apply to this shape.
+    
+    If set, this transform is applied before placing the feature.  You can set a transform matrix up with roll, pitch, and yaw.
+  */
+@property (nonatomic,strong) MaplyMatrix * __nullable transform;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplySharedAttributes.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplySharedAttributes.h
new file mode 100644
index 0000000..00bd24d
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplySharedAttributes.h
@@ -0,0 +1,406 @@
+/*
+ *  MaplySharedAttributes.h
+ *  WhirlyGlobe-MaplyComponent
+ *
+ *  Created by Steve Gifford on 9/19/12.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <Foundation/Foundation.h>
+
+/// Use this hint to turn the zbuffer on or off.  Pass in an NSNumber boolean.  Takes effect on the next frame.
+extern NSString* const kMaplyRenderHintZBuffer;
+#define kWGRenderHintZBuffer kMaplyRenderHintZBuffer
+/// Use this hint to turn culling optimization on or off.  Pass in an NSNumber boolean.
+extern NSString* const kMaplyRenderHintCulling;
+#define kWGRenderHintCulling kMaplyRenderHintCulling
+/// These are options for lighting modes, basically different default shader programs.  Only works with OpenGL ES 2.0 mode.
+/// Accepted values are: none,regular
+extern NSString* const kMaplyRendererLightingMode;
+#define kWGRendererLightingMode kMaplyRendererLightingMode
+
+/// These are used for all object descriptions.
+
+/// If the z buffer is on, this will let you resolve.  Takes an NSNumber boolean
+extern NSString* const kMaplyDrawOffset;
+#define kWGDrawOffset kMaplyDrawOffset
+/// This helps decide what order things are drawn in.  Useful when the z buffer is off or you're using transparency.
+/// Takes an NSNumber int.
+extern NSString* const kMaplyDrawPriority;
+#define kWGDrawPriority kMaplyDrawPriority
+/// Minimum point at which a feature is visible.  Takes an NSNumber float.  The radius of the globe is 1.0
+extern NSString* const kMaplyMinVis;
+#define kWGMinVis kMaplyMinVis
+/// Maximum point at which a feature is visible.  Takes an NSNumber float.  The radius of the globe is 1.0
+extern NSString* const kMaplyMaxVis;
+#define kWGMaxVis kMaplyMaxVis
+/// Minimum distance from the viewer at which to display geometry.
+extern NSString* const kMaplyViewerMinDist;
+/// Maximum distance from the viewer at which to display geometry.
+extern NSString* const kMaplyViewerMaxDist;
+/// Center to use when evaluating distance to viewable geometry (X)
+extern NSString* const kMaplyViewableCenterX;
+/// Center to use when evaluating distance to viewable geometry (Y)
+extern NSString* const kMaplyViewableCenterY;
+/// Center to use when evaluating distance to viewable geometry (Z)
+extern NSString* const kMaplyViewableCenterZ;
+/// The amount of time for a feature to fade in or out.  Takes an NSNumber float for seconds.
+extern NSString* const kMaplyFade;
+#define kWGFade kMaplyFade
+/// Fade the feature in over time.
+extern NSString* const kMaplyFadeIn;
+/// Fade the feature out over time
+extern NSString* const kMaplyFadeOut;
+/// When to start fading out
+extern NSString* const kMaplyFadeOutTime;
+/// Enable or disable an object.  This can be used to create an object disabled.
+extern NSString* const kMaplyEnable;
+/// If set, we'll enable the objects only between the start and end time
+extern NSString* const kMaplyEnableStart;
+/// If set, we'll enable the objects only between the start and end time
+extern NSString* const kMaplyEnableEnd;
+/// Request a given object take the z buffer into account
+extern NSString* const kMaplyZBufferRead;
+/// Have a given object write itself to the z buffer
+extern NSString* const kMaplyZBufferWrite;
+/// Set the render target if the given geometry type supports it
+extern NSString* const kMaplyRenderTarget;
+/// The the UUID of the object
+extern NSString* const kMaplyUUID;
+/// The representation of the UUID this object embodies
+extern NSString* const kMaplyRepresentation;
+
+/// Assign a shader program to a particular feature.  Use the shader program's name
+extern NSString* const kMaplyShader;
+/// An NSDictionary containing uniforms to apply to a shader before drawing
+extern NSString* const kMaplyShaderUniforms;
+
+/// Keep drawing for this number of frames after we'd normally stop
+extern NSString* const kMaplyExtraFrames;
+
+/// Stars, moon, stars, atmosphere
+extern const int kMaplyStarsDrawPriorityDefault;
+extern const int kMaplySunDrawPriorityDefault;
+extern const int kMaplyMoonDrawPriorityDefault;
+extern const int kMaplyAtmosphereDrawPriorityDefault;
+/// Where we start image layer draw priorities
+extern const int kMaplyImageLayerDrawPriorityDefault;
+/// We'll start filling in features right around here
+extern const int kMaplyFeatureDrawPriorityBase;
+extern const int kMaplyStickerDrawPriorityDefault;
+extern const int kMaplyMarkerDrawPriorityDefault;
+extern const int kMaplyVectorDrawPriorityDefault;
+extern const int kMaplyParticleSystemDrawPriorityDefault ;
+extern const int kMaplyLabelDrawPriorityDefault;
+extern const int kMaplyLoftedPolysDrawPriorityDefault;
+extern const int kMaplyShapeDrawPriorityDefault;
+extern const int kMaplyBillboardDrawPriorityDefault;
+extern const int kMaplyModelDrawPriorityDefault;
+extern const int kMaplyMaxDrawPriorityDefault;
+
+#define kWGMarkerDrawPriorityDefault kMaplyMarkerDrawPriorityDefault
+#define kWGVectorDrawPriorityDefault kMaplyVectorDrawPriorityDefault
+#define kWGStickerDrawPriorityDefault kMaplyStickerDrawPriorityDefault
+
+/// These are used just for the screen and regular labels
+
+/// Color of the text being rendered.  Takes a UIColor.
+extern NSString* const kMaplyTextColor;
+#define kWGTextColor kMaplyTextColor
+/// Background color for the text.  Takes a UIColor.
+extern NSString* const kMaplyBackgroundColor;
+#define kWGBackgroundColor kMaplyBackgroundColor
+/// Font to use in rendering text.  Takes a UIFont.
+extern NSString* const kMaplyFont;
+#define kWGFont kMaplyFont
+/// Default height of the text.  If for screen space, this in points.  If for 3D, remember that
+//   the radius of the globe is 1.0.  Expects an NSNumber float.
+extern NSString* const kMaplyLabelHeight;
+#define kWGLabelHeight kMaplyLabelHeight
+/// Default width of the text.  See height for more info and, in general, use height instead.
+extern NSString* const kMaplyLabelWidth;
+#define kWGLabelWidth kMaplyLabelWidth
+/// Justification for label placement.  This takes an NSString with one of:
+///  middle, left, right
+extern NSString* const kMaplyJustify;
+#define kWGJustify kMaplyJustify
+/// If set, we'll draw a shadow behind each label with this as the stroke size
+extern NSString* const kMaplyShadowSize;
+#define kWGShadowSize kMaplyShadowSize
+/// If shadow size is being used, we can control the shadow color like so
+extern NSString* const kMaplyShadowColor;
+#define kWGShadowColor kMaplyShadowColor
+/// If outline is being used, we can control the color
+extern NSString* const kMaplyTextOutlineSize;
+/// Vertical line spacing.  Defaults to the Font's line spacing
+extern NSString* const kMaplyTextLineSpacing;
+/// If outline is being used, we can control the stroke size
+extern NSString* const kMaplyTextOutlineColor;
+/// When creating textures, we may pass in the size
+extern NSString* const kMaplyTexSizeX;
+/// When creating textures, we may pass in the size
+extern NSString* const kMaplyTexSizeY;
+
+/// How to justify multi-line text
+extern NSString* const kMaplyTextJustify;
+/// Justify text to the right
+extern NSString* const kMaplyTextJustifyRight;
+/// Justify text to the left
+extern NSString* const kMaplyTextJustifyLeft;
+/// Justify text to the center
+extern NSString* const kMaplyTextJustifyCenter;
+
+/// Controls how text is laid out along a line or polygon.  Set a number (- for left or inside, + for right or outside)
+extern NSString* const kMaplyTextLayoutOffset;
+/// If laying out along a line (or polygon), the amount of screen space to leave between labels
+extern NSString* const kMaplyTextLayoutSpacing;
+/// Layout as many labels as possible along a line (or polygon).  Set a number (0 for no repeat, -1 for as many as possible, or a number of instances)
+extern NSString* const kMaplyTextLayoutRepeat;
+/// Turn on debugging lines for the layout engine
+extern NSString* const kMaplyTextLayoutDebug;
+
+/// These are used for screen and regular markers.
+extern NSString* const kMaplyClusterGroup;
+
+/// Color is used for the polygon generated for a marker.  It will combine with the image,
+///  if there is one or it will be visible if there is no texture.  Takes a UIColor
+extern NSString* const kMaplyColor;
+#define kWGColor kMaplyColor
+
+/// Width is used by the vector layer for line widths
+extern NSString* const kMaplyVecWidth;
+#define kWGVecWidth kMaplyVecWidth
+
+/// If filled is set, we draw the areals as filled polygons
+extern NSString* const kMaplyFilled;
+#define kWGFilled kMaplyFilled
+
+/// If set, the texture to apply to the feature
+extern NSString* const kMaplyVecTexture;
+/// The format of the image given by kMaplyVecTexture, default MaplyImage4Layer8Bit
+extern NSString* const kMaplyVecTextureFormat;
+/// X scale for textures applied to vectors
+extern NSString* const kMaplyVecTexScaleX;
+/// Y scale for textures applied to vectors
+extern NSString* const kMaplyVecTexScaleY;
+
+/// The projection to use when generating texture coordinates
+extern NSString* const kMaplyVecTextureProjection;
+/// Tangent plane projection for texture coordinates
+extern NSString* const kMaplyProjectionTangentPlane;
+/// Screen space "projection" for texture coordinates
+extern NSString* const kMaplyProjectionScreen;
+/// No projection for texture coordinates
+extern NSString* const kMaplyProjectionNone;
+
+/// If set to true we'll centered any drawables we create for features
+/// This fixes the jittering problem when zoomed in close
+extern NSString* const kMaplyVecCentered;
+
+/// Center of the feature, to use for texture calculations
+extern NSString* const kMaplyVecCenterX;
+extern NSString* const kMaplyVecCenterY;
+
+/// For wide vectors, we can widen them in screen space or display space
+extern NSString* const kMaplyWideVecCoordType;
+
+/// Widened vectors are widened in real space.  The width is in meters.
+extern NSString* const kMaplyWideVecCoordTypeReal;
+/// Widened vectors are widened in screen space.  The width is in pixels.
+extern NSString* const kMaplyWideVecCoordTypeScreen;
+
+/// Controls the wide vector implementation.  Basic implementation by default.
+extern NSString* const kMaplyWideVecImpl;
+
+/// Default/old implementation of the wide vectors
+extern NSString* const kMaplyWideVecImplDefault;
+
+/// Performance implementation of the wide vectors
+extern NSString* const kMaplyWideVecImplPerf;
+
+/// For wide vectors we can control the line joins
+/// See: http://www.w3.org/TR/SVG/painting.html#StrokeLinejoinProperty
+extern NSString* const kMaplyWideVecJoinType;
+
+/// Widened vectors are joined with miters
+extern NSString* const kMaplyWideVecMiterJoin;
+// Note: Not yet implemented
+/// Widened vectors are joined with a curve
+//extern NSString* const kMaplyWideVecRoundJoin @"round"
+/// Widened vectors are joined with a bevel
+extern NSString* const kMaplyWideVecBevelJoin;
+
+/// Number of pixels to use in blending the edges of the wide vectors
+extern NSString* const kMaplyWideVecEdgeFalloff;
+
+/// For wide vectors we can control the ends
+/// See: http://www.w3.org/TR/SVG/painting.html#StrokeLinecapProperty
+//extern NSString* const kMaplyWideVecLineCapType @"wideveclinecaptype"
+
+// Note: These are not currently implemented
+
+/// Widened vector ends are flush
+//extern NSString* const kMaplyWideVecButtCap;
+/// Widened vector ends are round (e.g. hot dog roads)
+//extern NSString* const kMaplyWideVecRoundCap;
+/// Widened vector ends are extended a bit and then flush
+//extern NSString* const kMaplyWideVecSquareCap;
+
+/// Miter joins will turn to bevel joins past this number of degrees
+extern NSString* const kMaplyWideVecMiterLimit;
+
+/// This is the length you'd like the texture to start repeating after.
+/// It's real world coordinates for kMaplyWideVecCoordTypeReal and pixel size for kMaplyWideVecCoordTypeScreen
+extern NSString* const kMaplyWideVecTexRepeatLen;
+
+/// Offset to left (negative) or right (positive) of the centerline
+extern NSString* const kMaplyWideVecOffset;
+
+/// Close any un-closed areal features when drawing lines for them
+extern NSString* const kMaplyVecCloseAreals;
+
+/// If set we'll break up a vector feature to the given epsilon on a globe surface
+extern NSString* const kMaplySubdivEpsilon;
+/// If subdiv epsilon is set we'll look for a subdivision type. Default is simple.
+extern NSString* const kMaplySubdivType;
+/// Subdivide the vector edges along a great circle
+extern NSString* const kMaplySubdivGreatCircle;
+/// Subdivide the vector edges along a great circle with ellipsoidal math
+extern NSString* const kMaplySubdivGreatCirclePrecise;
+/// Subdivide into a fixed number of segmenets
+extern NSString* const kMaplySubdivStatic;
+/// Subdivide the vectors edges along lat/lon
+extern NSString* const kMaplySubdivSimple;
+/// Clip features along a grid of the given size
+extern NSString* const kMaplySubdivGrid;
+/// Used to turn off selection in vectors
+extern NSString* const kMaplySelectable;
+
+/// These are used for stickers
+
+/// Sampling size along one dimension
+extern NSString* const kMaplySampleX;
+#define kWGSampleX kMaplySampleX
+/// Sampling size along one dimension
+extern NSString* const kMaplySampleY;
+#define kWGSampleY kMaplySampleY
+/// Images to use when changing a sticker
+extern NSString* const kMaplyStickerImages;
+/// Image format to use for the new images
+extern NSString* const kMaplyStickerImageFormat;
+
+/// These are used for billboards
+
+/// Billboard orientation
+extern NSString* const kMaplyBillboardOrient;
+/// Billboards are oriented toward the eye, but rotate on the ground
+extern NSString* const kMaplyBillboardOrientGround;
+/// Billboards are oriented only towards the eye
+extern NSString* const kMaplyBillboardOrientEye;
+
+/// These are used for lofted polygons
+
+/// Height above the ground
+extern NSString* const kMaplyLoftedPolyHeight;
+/// Boolean that turns on/off top (on by default)
+extern NSString* const kMaplyLoftedPolyTop;
+/// Boolean that turns on/off sides (on by default)
+extern NSString* const kMaplyLoftedPolySide;
+/// If present, we'll start the lofted poly above 0 height
+extern NSString* const kMaplyLoftedPolyBase;
+/// Grid size we used to chop the lofted polygons up (10 degress by default)
+extern NSString* const kMaplyLoftedPolyGridSize;
+/// If set to @(YES) this will draw an outline around the top of the lofted poly in lines
+extern NSString* const kMaplyLoftedPolyOutline;
+/// If set to @(YES) this will draw an outline around the bottom of the lofted poly in lines
+extern NSString* const kMaplyLoftedPolyOutlineBottom;
+/// If the outline is one this is the outline's color
+extern NSString* const kMaplyLoftedPolyOutlineColor;
+/// This is the outline's width if it's turned on
+extern NSString* const kMaplyLoftedPolyOutlineWidth;
+/// Draw priority of the lines created for the lofted poly outline
+extern NSString* const kMaplyLoftedPolyOutlineDrawPriority;
+/// If set and we're drawing an outline, this will create lines up the sides
+extern NSString* const kMaplyLoftedPolyOutlineSide;
+
+/// These are used for shapes
+
+/// Samples (x) to use when converting shape to polygons
+extern NSString* const kMaplyShapeSampleX;
+/// Samples (y) to use when converting shape to polygons
+extern NSString* const kMaplyShapeSampleY;
+/// If set to true, we'll tessellate a shape using the opposite vertex ordering
+extern NSString* const kMaplyShapeInsideOut;
+/// Center for the shape geometry
+extern NSString* const kMaplyShapeCenterX;
+extern NSString* const kMaplyShapeCenterY;
+extern NSString* const kMaplyShapeCenterZ;
+
+/// These are used by active vector objects
+extern NSString* const kMaplyVecHeight;
+extern NSString* const kMaplyVecMinSample;
+
+/// These are used by the particle systems
+extern NSString* const kMaplyPointSize;
+extern const float kMaplyPointSizeDefault;
+
+/// These are used by the texture
+extern NSString* const kMaplyTexFormat;
+extern NSString* const kMaplyTexMinFilter;
+extern NSString* const kMaplyTexMagFilter;
+extern NSString* const kMaplyMinFilterNearest;
+extern NSString* const kMaplyMinFilterLinear;
+extern NSString* const kMaplyTexAtlas;
+extern NSString* const kMaplyTexWrapX;
+extern NSString* const kMaplyTexWrapY;
+extern NSString* const kMaplyTexMipmap;
+
+/// These are the various shader programs we set up by default
+extern NSString* const kMaplyShaderDefaultTri;
+extern NSString* const kMaplyDefaultTriangleShader;
+extern NSString* const kMaplyShaderTriExp;
+
+extern NSString* const kMaplyShaderDefaultModelTri;
+
+extern NSString* const kMaplyShaderDefaultTriNoLighting;
+extern NSString* const kMaplyNoLightTriangleShader;
+extern NSString* const kMaplyShaderNoLightTriangleExp;
+extern NSString* const kMaplyShaderDefaultMarker;
+
+extern NSString* const kMaplyShaderDefaultTriScreenTex;
+
+extern NSString* const kMaplyShaderDefaultTriMultiTex;
+extern NSString* const kMaplyShaderDefaultTriMultiTexRamp;
+extern NSString* const kMaplyShaderDefaultTriNightDay;
+
+extern NSString* const kMaplyShaderDefaultLine;
+extern NSString* const kMaplyDefaultLineShader;
+
+extern NSString* const kMaplyShaderDefaultLineNoBackface;
+extern NSString* const kMaplyNoBackfaceLineShader;
+
+extern NSString* const kMaplyShaderBillboardGround;
+extern NSString* const kMaplyShaderBillboardEye;
+
+extern NSString* const kMaplyShaderDefaultWideVector;
+extern NSString* const kMaplyShaderWideVectorPerformance;
+extern NSString* const kMaplyShaderWideVectorExp;
+
+extern NSString* const kMaplyScreenSpaceDefaultMotionProgram;
+extern NSString* const kMaplyScreenSpaceDefaultProgram;
+extern NSString* const kMaplyScreenSpaceMaskProgram;
+extern NSString* const kMaplyScreenSpaceExpProgram;
+
+extern NSString* const kMaplyShaderParticleSystemPointDefault;
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplySimpleTileFetcher.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplySimpleTileFetcher.h
new file mode 100644
index 0000000..f500c68
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplySimpleTileFetcher.h
@@ -0,0 +1,88 @@
+/*
+ *  MaplySimpleTileFetcher.h
+ *  WhirlyGlobe-MaplyComponent
+ *
+ *  Created by Steve Gifford on 5/31/19.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <WhirlyGlobeMaplyComponent/MaplyTileSourceNew.h>
+
+/** Simple Tile Fetcher is meant for sub classing.
+ 
+    Some data sources aren't all that complex.  You read from a local source,
+    you return the data.  Something else turns it into visible objects.  Simple.
+ 
+    To implement one of those, subclass the Simple Tile Fetcher and let it do the
+    tricky bits.
+  */
+@interface MaplySimpleTileFetcher : NSObject<MaplyTileFetcher>
+
+/// Your Subclass must call this init method
+- (nullable instancetype)initWithName:(NSString * __nonnull)name minZoom:(int)minZoom maxZoom:(int)maxZoom;
+
+/// The quad paging loader variants need a TileInfo object, even if it's very simple
+- (nullable NSObject<MaplyTileInfoNew> *)tileInfo;
+
+/// Dispatch queue the data fetcher is doing its work on
+@property (nonnull) dispatch_queue_t queue;
+
+/// Set by default.  We won't every return an error on failing to load.  Useful for sparse data sets
+@property bool neverFail;
+
+/// Name used for debugging
+@property NSString * __nonnull name;
+
+/// Min zoom level
+- (int)minZoom;
+
+/// Max zoom level
+- (int)maxZoom;
+
+/** Override dataForTile:tileID: to return your own data for a given tile.
+    The fetchInfo can be a custom object (if you set it up that way) or
+    you can just use the tileID argument.
+ 
+    You'll be called on the dispatch queue.
+ 
+    You can return either an NSData or a MaplyLoaderReturn
+  */
+- (id __nullable)dataForTile:(id __nonnull)fetchInfo tileID:(MaplyTileID)tileID;
+
+/** Override the shutdown method.
+ 
+    Call the superclass shutdown method *first* and then run your own shutdown.
+  */
+- (void)shutdown;
+
+@end
+
+// Internal object used by the QuadImageLoader to generate tile load info
+@interface MaplySimpleTileInfo : NSObject<MaplyTileInfoNew>
+
+// Initialize with a min/max zoom
+- (instancetype __nonnull)initWithMinZoom:(int)inMinZoom maxZoom:(int)inMaxZoom;
+
+@end
+
+
+// Encapsulates a single tile load request
+@interface MaplySimpleTileFetchInfo : NSObject
+
+@property (nonatomic,assign) int x;
+@property (nonatomic,assign) int y;
+@property (nonatomic,assign) int level;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyStarsModel.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyStarsModel.h
new file mode 100644
index 0000000..951afbc
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyStarsModel.h
@@ -0,0 +1,59 @@
+/*  MaplyStarsModel.h
+ *  WhirlyGlobe-MaplyComponent
+ *
+ *  Created by Steve Gifford on 6/4/15.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#import <UIKit/UIKit.h>
+#import <WhirlyGlobeMaplyComponent/MaplyComponentObject.h>
+#import <WhirlyGlobeMaplyComponent/WhirlyGlobeViewController.h>
+
+/** 
+    The Stars Model parses and then displays a star field.
+    
+     This is used to display a star field around the earth.
+  */
+@interface MaplyStarsModel : NSObject
+
+/// Read stars from the given file
+- (nullable instancetype)initWithFileName:(NSString *__nonnull)fileName;
+
+/// Use the given image for each point.
+/// The given image will be sampled for individual points.
+- (void)setImage:(UIImage *__nonnull)image;
+
+/** 
+    Add stars to the given view controller
+    
+    Turn the star positions into geometry to display.  This object will track the resulting geometry objects.
+    
+    @param viewC The view controller to add the start geometry to.
+    
+    @param date The date for the 
+    
+    @param desc Additional parameters that may related to the geometry.
+    
+    @param mode Thread mode to use when adding the geometry.
+  */
+- (bool)addToViewC:(WhirlyGlobeViewController *__nonnull)viewC date:(NSDate *__nonnull)date desc:(NSDictionary *__nullable)desc mode:(MaplyThreadMode)mode;
+
+/** 
+    Remove star geometry from the registered view controller.
+    
+    Removes any objects created for the star geometry.
+  */
+- (void)removeFromViewC;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplySticker.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplySticker.h
new file mode 100644
index 0000000..91e886b
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplySticker.h
@@ -0,0 +1,85 @@
+/*
+ *  MaplySticker.h
+ *  WhirlyGlobeComponent
+ *
+ *  Created by Steve Gifford on 11/27/12.
+ *  Copyright 2012-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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <UIKit/UIKit.h>
+#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
+#import <WhirlyGlobeMaplyComponent/MaplyRenderController.h>
+
+/** 
+    Stickers are rectangles placed on the globe with an image.
+    
+    The Maply Sticker will stretch a rectangle (in geographic) over the given extents and tack the given image on top of it.  Stickers differ from MaplyMarker objects in that they're big.  They can stretch over a larger are and need to be subdivided as such.
+  */
+@interface MaplySticker : NSObject
+
+/// The lower left corner (in geographic) of the sticker
+@property (nonatomic,assign) MaplyCoordinate ll;
+
+/// The upper right corner (in geographic) of the sticker
+@property (nonatomic,assign) MaplyCoordinate ur;
+
+/// Angle of rotation around center
+@property (nonatomic,assign) float rotation;
+
+/** 
+    If present, this is the coordinate system the sticker is represented in.
+    
+    By default the coordinates are in geographic.  If this is present, the coordinates are in this system.
+  */
+@property (nonatomic,strong) MaplyCoordinateSystem * __nullable coordSys;
+
+/** 
+    Image (or MaplyTexture) to stretch over the sticker.
+    
+    The UIImage (or MaplyTexture) is cached in the view controller, so multiple references will result in the same texture being used.  The view controller also cleans up the images when it's done with it.
+  */
+@property (nonatomic,strong) id __nullable image;
+
+/** 
+    Images to stretch over the sticker.
+    
+    This is an NSArray of UIImages (or MaplyTextures).  The images will be cached in the view controller, so multiple references will result in the same texture being used.  The view controller also cleans up the images when it's done with them.
+    
+    All the images passed in here will be presented to the shader program, if it has variables for them.  It's up to you to do something with them in the shader.
+  */
+@property (nonatomic,strong) NSArray * __nullable images;
+
+/** 
+    Set the image format for the created textures.
+    
+    OpenGL ES offers us several image formats that are more efficient than 32 bit RGBA, but they're not always appropriate.  This property lets you choose one of them.  The 16 or 8 bit ones can save a huge amount of space and will work well for some imagery, most maps, and a lot of weather overlays.
+ 
+ | Image Format | Description |
+ |:-------------|:------------|
+ | MaplyImageIntRGBA | 32 bit RGBA with 8 bits per channel.  The default. |
+ | MaplyImageUShort565 | 16 bits with 5/6/5 for RGB and none for A. |
+ | MaplyImageUShort4444 | 16 bits with 4 bits for each channel. |
+ | MaplyImageUShort5551 | 16 bits with 5/5/5 bits for RGB and 1 bit for A. |
+ | MaplyImageUByteRed | 8 bits, where we choose the R and ignore the rest. |
+ | MaplyImageUByteGreen | 8 bits, where we choose the G and ignore the rest. |
+ | MaplyImageUByteBlue | 8 bits, where we choose the B and ignore the rest. |
+ | MaplyImageUByteAlpha | 8 bits, where we choose the A and ignore the rest. |
+ | MaplyImageUByteRGB | 8 bits, where we average RGB for the value. |
+ | MaplyImage4Layer8Bit | 32 bits, four channels of 8 bits each.  Just like MaplyImageIntRGBA, but a warning not to do anything too clever in sampling. |
+ */
+@property (nonatomic) MaplyQuadImageFormat imageFormat;
+
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplySun.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplySun.h
new file mode 100644
index 0000000..c106a09
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplySun.h
@@ -0,0 +1,47 @@
+/*  MaplySun.h
+ *  WhirlyGlobe-MaplyComponent
+ *
+ *  Created by Steve Gifford on 6/24/15.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#import <UIKit/UIKit.h>
+#import <WhirlyGlobeMaplyComponent/MaplyComponentObject.h>
+#import <WhirlyGlobeMaplyComponent/WhirlyGlobeViewController.h>
+#import <WhirlyGlobeMaplyComponent/MaplyLight.h>
+
+/** 
+    Utility for calculating sun position and shading info.
+    
+    This is a utility class that figures out where the sun is at a given date and provides positional information for lighting calculations.
+  */
+@interface MaplySun : NSObject
+
+/** 
+    Initialize with a date.
+    
+    Initialize with the given date.  The sun position will correspond to that.
+  */
+- (nonnull instancetype)initWithDate:(NSDate *__nonnull)date;
+
+/// Return the vector corresponding to the sun location from the earth.
+- (MaplyCoordinate3d)getDirection;
+
+/// Makes up a light that corresponds to the sun's location at a given time
+- (nonnull MaplyLight *)makeLight;
+
+/// Returns the location above the globe in lon/lat.  Yay geocentrism!
+- (MaplyCoordinate3d)asPosition;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyTapDelegate.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyTapDelegate.h
new file mode 100644
index 0000000..34589f1
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyTapDelegate.h
@@ -0,0 +1,30 @@
+/*  MaplyTapDelegate.h
+ *  WhirlyGlobeLib
+ *
+ *  Created by Steve Gifford on 1/20/12.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#import <UIKit/UIKit.h>
+#import <WhirlyGlobeMaplyComponent/MaplyTapMessage.h>
+
+/** Maply tap gesture delegate responds to a tap
+ by sending out a notification.
+ */
+@interface MaplyTapDelegate : NSObject <UIGestureRecognizerDelegate>
+
+/// Gesture recognizer created for the delegate
+@property (nonatomic,weak) UITapGestureRecognizer *gestureRecognizer;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyTapMessage.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyTapMessage.h
new file mode 100644
index 0000000..6500e2f
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyTapMessage.h
@@ -0,0 +1,35 @@
+/*  MaplyTapMessage.h
+ *  WhirlyGlobeLib
+ *
+ *  Created by Steve Gifford on 9/19/11.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <UIKit/UIKit.h>
+
+/** Tap Message is an
+	indication that the user tapped on the map.
+	It's passed as the object in a notification.
+ */
+@interface MaplyTapMessage : NSObject
+
+/// View that was touched
+@property (nonatomic,retain) UIView *view;
+//// Touch location on view in 2D
+@property (nonatomic,assign) CGPoint touchLoc;
+/// Where the eye was.
+@property (nonatomic,assign) float heightAboveSurface;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyTexture.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyTexture.h
new file mode 100644
index 0000000..d9eb9df
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyTexture.h
@@ -0,0 +1,31 @@
+/*
+ *  MaplyTexture.h
+ *  WhirlyGlobe-MaplyComponent
+ *
+ *  Created by Steve Gifford on 10/25/13.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <Foundation/Foundation.h>
+
+/** 
+    Represents an OpenGL texture.
+    
+    The MaplyTexture is an opaque object used to track OpenGL ES textures.  You create one from the MaplyBaseViewController's addImage call.  Then that texture will live until this object is released.
+    
+    These can be used in place of UIImages in the various objects (e.g. MaplyScreenMarker).
+  */
+@interface MaplyTexture : NSObject
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyTextureBuilder.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyTextureBuilder.h
new file mode 100644
index 0000000..74d842c
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyTextureBuilder.h
@@ -0,0 +1,47 @@
+/*
+ *  MaplyTextureBuilder.h
+ *  WhirlyGlobe-MaplyComponent
+ *
+ *  Created by Steve Gifford on 5/30/14.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <UIKit/UIKit.h>
+
+/** 
+    The Maply Linear Texture Builder is used to construct linear textures
+    for use on widened vectors.
+    
+    Linear textures of this type are used to represent dotted and dashed lines.  These may come from Mapnik configuration files or you can just make them up yourself.
+    
+    After creating an image with this object, you'll want to pass it as a parameter to the widened vector add method.
+  */
+@interface MaplyLinearTextureBuilder : NSObject
+
+/** 
+    Set the pattern of dots and empty spaces.
+    
+    This is an array of NSNumbers (treated as integers) that specify how big an element in the given pattern is.  The first element is on, the next off and so forth.
+  */
+- (void)setPattern:(NSArray *)elements;
+
+/** 
+    Build the image from the size and elements specified.
+    
+    If you've set a reasonable size and added a pattern, this will render the pattern into the image and return it.  If the size of the image differs from the size of the elements, they will be scaled to the image.
+  */
+- (UIImage *)makeImage;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyTileSourceNew.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyTileSourceNew.h
new file mode 100644
index 0000000..8100007
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyTileSourceNew.h
@@ -0,0 +1,161 @@
+/*
+ *  MaplyTileSourceNew.h
+ *  WhirlyGlobe-MaplyComponent
+ *
+ *  Created by Steve Gifford on 9/13/18.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <UIKit/UIKit.h>
+#import <WhirlyGlobeMaplyComponent/MaplyImageTile.h>
+#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
+#import <WhirlyGlobeMaplyComponent/MaplyCoordinateSystem.h>
+
+/**
+ This represents the indentifier for a unique tile in the pyramid.
+ 
+ Each tile in an image (or vector tile) pyramid can be uniquely
+ identified by an x, y, and level.  The levels start at zero and run to
+ a maximum.  x and y also start at zero and run to 2^level-1.
+ 
+ 
+ How these are interpreted is up to the tile source itself.  For example, some tile sources start at the lower left for (0,0) and run to the upper left.  Others do it the opposite way.  There's a flipY option in the MaplyQuadImageTileLayer to deal with this, but the system doesn't care all that much as long as you are consistent.
+ @see MaplyTileSource
+ @see MaplyQuadPagingLayer
+ @see MaplyQuadImageTilesLayer
+ */
+typedef struct
+{
+    int x, y, level;
+} MaplyTileID;
+
+/// Convert a MaplyTileID to an NSString
+NSString *__nonnull MaplyTileIDString(MaplyTileID tileID);
+
+/**
+    Tile Info Protocol.
+ 
+    This describes a single source of data tiles.  A uses these to
+    figure out what to load when and where.  The loader passes the result of
+    fetchInfoForTile to a MaplyTileFetcher to get the data it wants.
+  */
+@protocol MaplyTileInfoNew<NSObject>
+
+/**
+ The minimum zoom level available.
+ 
+ This is the lowest level we'll try to fetch.  Any levels below that will be filled in with placeholders.  Those are empty, but they allow us to load tiles beneath.
+ */
+- (int)minZoom;
+
+/**
+ The maximum zoom level available.
+ 
+ This is the highest level (e.g. largest) that we'll
+ fetch for a given pyramid tile source.  The source can sparse,
+ so you are not required to have these tiles available, but this
+ is as high as the loader will fetch.
+ */
+- (int)maxZoom;
+
+/**
+  FetchInfo object for a given tile.
+ 
+  The FetchInfo object is specific to the type of TileFetcher you're using and
+  tells the fetcher how to get the data you wawnt.
+  RemoteTileFetchers want a RemoteTileInfoNew object.
+ */
+- (id __nullable)fetchInfoForTile:(MaplyTileID)tileID flipY:(bool)flipY;
+
+@end
+
+/**
+  A tile source that just returns nil.  You can use this like a tile source where you need one that doesn't do anything.
+ */
+@interface MaplyTileInfoNone : NSObject<MaplyTileInfoNew>
+@end
+
+
+
+/**
+ Generic Tile fetcher request.
+ 
+ A single request for a single tile of data from a single source.
+ The tile fetcher will... fetch this and call the success or failure callback.
+ */
+@interface MaplyTileFetchRequest : NSObject
+
+/// Priority before importance.  Less is more important.
+@property (nonatomic) int priority;
+/// How important this is to us.  Probably screen space.
+@property (nonatomic) float importance;
+/// If all other values are equal, sort by this.
+/// It keeps requests we're waiting for grouped together
+@property (nonatomic) int group;
+
+/// Tile ID for this tile
+@property (nonatomic,assign) MaplyTileID tileID;
+
+/// An object representing the tile source.  Used for sorting.  Not accessed by the fetcher.
+@property (nonatomic,weak,nullable) id tileSource;
+
+/** This is requested from a TileInfo object by a loader and then passed
+ along to the TileFetcher.  TileFetchers expect certain objects.
+ The RemoteTileFetcher wants a RemoteFetchInfo object and will check.
+ Other fetchers will want other things.
+ */
+@property (nonatomic,nonnull,strong) id fetchInfo;
+
+/**
+ Tile Fetcher success callback.
+ 
+ Called on a new dispatch queue and won't be marked as loaded until it returns.
+ This is a good way to limit how many things are loading/parsing at the same time.
+ */
+@property (nonatomic,nullable) void (^success)(MaplyTileFetchRequest * __nonnull,id __nonnull);
+
+/**
+ Tile Fetcher failure callback.
+ */
+@property (nonatomic,nullable) void (^failure)(MaplyTileFetchRequest * __nonnull,NSError * __nonnull);
+
+@end
+
+/**
+    Tile Fetcher protocol.
+ 
+    The tile fetcher interacts with loaders that want tiles, as demanded by samplers.
+    A given data source (e.g. remote URL, MBTiles) needs one of these to fetch and return data.
+  */
+@protocol MaplyTileFetcher<NSObject>
+
+/// Add a whole group of requests at once.
+/// This is useful if we want to avoid low priority tiles grabbing the slots first
+- (void)startTileFetches:(NSArray<MaplyTileFetchRequest *> *__nonnull)requests;
+
+/// Update an active request with a new priority and importance
+- (id __nullable)updateTileFetch:(id __nonnull)fetchID priority:(int)priority importance:(double)importance;
+
+/// Name of this tile fetcher.  Used for coordinating tile sources.
+- (NSString * __nonnull)name;
+
+/// Cancel a group of requests at once
+/// Use the object returned by the startTileFetch call (which is just a Request object)
+- (void)cancelTileFetches:(NSArray * __nonnull)requestRets;
+
+/// Kill all outstanding connections and clean up
+- (void)shutdown;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyTouchCancelAnimationDelegate.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyTouchCancelAnimationDelegate.h
new file mode 100644
index 0000000..74c1391
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyTouchCancelAnimationDelegate.h
@@ -0,0 +1,26 @@
+/*  MaplyTouchCancelAnimationDelegate.h
+ *  WhirlyGlobeLib
+ *
+ *  Created by Jesse Crocker on 7/15/14.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#import <UIKit/UIKit.h>
+
+@interface MaplyTouchCancelAnimationDelegate : NSObject <UIGestureRecognizerDelegate>
+
+/// The gesture recognizer
+@property (nonatomic,strong) UIGestureRecognizer *gestureRecognizer;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyTwoFingerTapDelegate.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyTwoFingerTapDelegate.h
new file mode 100644
index 0000000..ad373c8
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyTwoFingerTapDelegate.h
@@ -0,0 +1,25 @@
+/*  MaplyTwoFingerTapDelegate.h
+ *
+ *  Created by Jesse Crocker on 2/4/14.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#import <WhirlyGlobeMaplyComponent/MaplyZoomGestureDelegate.h>
+
+@interface MaplyTwoFingerTapDelegate : MaplyZoomGestureDelegate
+
+// How long we animate from one place to the next
+@property (nonatomic) float animTime;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyUpdateLayer.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyUpdateLayer.h
new file mode 100644
index 0000000..4ff9ede
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyUpdateLayer.h
@@ -0,0 +1,100 @@
+/*
+ *  MaplyUpdateLayer.h
+ *  WhirlyGlobe-MaplyComponent
+ *
+ *  Created by Steve Gifford on 4/13/15.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <WhirlyGlobeMaplyComponent/MaplyComponentObject.h>
+#import <WhirlyGlobeMaplyComponent/MaplyControllerLayer.h>
+#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
+#import <WhirlyGlobeMaplyComponent/MaplyCoordinateSystem.h>
+#import <WhirlyGlobeMaplyComponent/MaplyTileSourceNew.h>
+#import <WhirlyGlobeMaplyComponent/MaplyRenderController.h>
+
+@class MaplyUpdateLayer;
+
+/** 
+    An encapsulation of where the viewer is and what they're looking at.
+    
+    This wraps information about where the viewer is currently looking from and at.
+  */
+@interface MaplyViewerState : NSObject
+
+/// Position of the viewer
+- (MaplyCoordinate3d) eyePos;
+
+@end
+
+
+/** 
+    The update delegate is called if the viewer moves, but not too often.
+    
+    Use this delegate to generate features around the viewer when they move.  You can control how far they have to move (in display coordinates) and how often you'll receive updates.
+  */
+@protocol MaplyUpdateDelegate
+
+/** 
+    Called when the MaplyUpdateLayer is initialized.
+    
+    This is called after things are set up.  You'll be on the layer thread here.
+  */
+- (void)start:(MaplyUpdateLayer *__nonnull)layer;
+
+/** 
+    Called when the viewer moves.
+    
+    You'll be called on the layer thread when the viewer moves more than your moveDist, subject to calls no more frequent than the minTime.
+  */
+- (void)viewerMovedTo:(MaplyViewerState *__nonnull)viewState layer:(MaplyUpdateLayer *__nonnull)layer;
+
+/** 
+    Called when the update layer is shutting down.
+    
+    Clean up your own data here.
+  */
+- (void)teardown:(MaplyUpdateLayer *__nonnull)layer;
+
+@end
+
+/** 
+    This layer will call a delegate as the user moves around, but constrained to distance and time.
+    
+    This layer is responsible for calling a delegate you provide as the user moves their viewpoint around.  You'll be called if they move from than a certain amount, but not more often than the minimum time.
+  */
+@interface MaplyUpdateLayer : MaplyControllerLayer
+
+/// The minimum distance that will trigger a delegate call.  Distance is in display units (radius of the earth = 1.0).
+@property (nonatomic,readonly) double moveDist;
+
+/// The delegate will be called no more often than this amount (in seconds).
+@property (nonatomic,readonly) double minTime;
+
+/// Maximum time to go without getting an update (if things are moving)
+@property (nonatomic) double maxLag;
+
+/** 
+    Initalize the update layer with a delegate and parameters.
+    
+    @param delegate The delegate that will be called every time the user moves, subject to the values.
+    
+    @param moveDist The minimum distance that will trigger a delegate call.  Distance is in display units (radius of the earth = 1.0).
+    
+    @param minTime The delegate will be called no more often than this amount (in seconds).
+  */
+- (nonnull instancetype)initWithDelegate:(NSObject<MaplyUpdateDelegate> *__nullable)delegate moveDist:(double)moveDist minTime:(double)minTime;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVariableTarget.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVariableTarget.h
new file mode 100644
index 0000000..d6ba490
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVariableTarget.h
@@ -0,0 +1,88 @@
+/*
+ *  MaplyVariableTarget.h
+ *  WhirlyGlobe-MaplyComponent
+ *
+ *  Created by Steve Gifford on 9/18/18.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <UIKit/UIKit.h>
+#import <WhirlyGlobeMaplyComponent/MaplyTexture.h>
+#import <WhirlyGlobeMaplyComponent/MaplyRenderTarget.h>
+#import <WhirlyGlobeMaplyComponent/MaplyRenderController.h>
+
+/**
+    A variable target manages two pass rendering for one type of variable.
+ 
+    Set up the variable target
+  */
+@interface MaplyVariableTarget : NSObject
+
+/// Initialize with the variable type and view controller
+- (nonnull instancetype)initWithType:(MaplyQuadImageFormat)type viewC:(NSObject<MaplyRenderControllerProtocol> * __nonnull)viewC;
+
+/// Render target created for this variable target
+@property (nonatomic,readonly,strong,nonnull) MaplyRenderTarget *renderTarget;
+
+/// Scale the screen by this amount for the render target
+- (void)setScale:(double)scale;
+
+/// Color of the rectangle used to draw the render target
+@property (nonatomic,strong,nonnull) UIColor *color;
+
+/// Draw priority of the rectangle we'll use to draw the render target to the screen
+@property (nonatomic,assign) int drawPriority;
+
+/// If set (by default), then we clear out the render target every frame
+@property (nonatomic,assign) bool clearEveryFrame;
+
+/// When we're clearing, use this value.  0 by default
+@property (nonatomic,assign) float clearVal;
+
+/// Shader used to draw the render target to the screen.
+/// Leave this empty and we'll provide our own
+@property (nonatomic,strong,nullable) MaplyShader *shader;
+
+/// By default we'll build a rectangle to display the target
+@property (nonatomic,assign) bool buildRectangle;
+
+/// If set, the rectangle rendered to the screen will read from the z Buffer
+/// Useful, when doing depth comparisons
+@property (nonatomic,assign) bool zBuffer;
+
+/// Rectangle created to show the variable target (if that's set)
+@property (nonatomic,readonly,nullable) MaplyComponentObject *rectObj;
+
+/// Size of the texture in pixels for the render target
+@property (nonatomic,readonly) CGSize texSize;
+
+/// The texture we're rendering to (as part of the render target)
+@property (nonatomic,readonly,strong,nullable) MaplyTexture *renderTex;
+
+/// Passing in another variable target will let us assign that target to the
+/// rectangle used to render this variable target's data.  This is used if
+/// you need the contents of more than one target in a shader.
+- (void)addVariableTarget:(MaplyVariableTarget * __nonnull)target;
+
+// Pass this uniform block to the geometry we create for rendering (if it was created)
+- (void)setUniformBlock:(NSData *__nonnull)uniBlock buffer:(int)bufferID;
+
+/// Clear the target for the next frame
+- (void)clear;
+
+/// Stop rendering to the target and release everything
+- (void)shutdown;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVectorObject.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVectorObject.h
new file mode 100644
index 0000000..e85aeb4
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVectorObject.h
@@ -0,0 +1,562 @@
+/*  MaplyVectorObject.h
+ *  WhirlyGlobeComponent
+ *
+ *  Created by Steve Gifford on 8/2/12.
+ *  Copyright 2012-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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
+#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
+#import <WhirlyGlobeMaplyComponent/MaplyCoordinateSystem.h>
+
+@class MaplyBaseViewController;
+
+/// Data type for the vector.  Multi means it contains multiple types
+typedef NS_ENUM(NSInteger, MaplyVectorObjectType) {
+	MaplyVectorNoneType,
+	MaplyVectorPointType,
+    MaplyVectorLinearType,
+    MaplyVectorLinear3dType,
+	MaplyVectorArealType,
+	MaplyVectorMultiType,
+};
+
+
+/** 
+    Maply Vector Object represents zero or more vector features.
+    
+    The Vector Object can hold several vector features of the same or different types.  It's meant to be a fairly opaque structure, often read from GeoJSON or Shapefiles.  It's less opaque than originally planned, however, and sports a number of specific methods.
+    
+    If you're doing real vector manipulation, it's best to do it somewhere else and then create one of these as needed for display.
+    
+    Vector Objects can be created directly or read from a MaplyVectorDatabase.  They are typically then displayed on top of a MaplyViewController or WhirlyGlobeViewController as vectors.
+    
+    Vector Objects vertices are always in geographic, with longitude = x and latitude = y.
+  */
+@interface MaplyVectorObject : NSObject
+
+/// Turn this off to make this vector invisible to selection.
+/// On by default.
+@property (nonatomic,assign) bool selectable;
+
+/** 
+    Return the attributes for the vector object.
+    
+    All vectors should have some set of attribution.  If there's more than one vector feature here, we'll return the attributes on the first one.
+    
+    The attribution is returned as an NSDictionary and, though you can modify it, you probably shouldn't.
+  */
+@property (nonatomic,readonly) NSMutableDictionary *__nullable attributes;
+
+/** 
+    Parse vector data from geoJSON.
+    
+    Returns one object to represent the whole thing, which might include multiple different vectors.  This version uses the faster JSON parser.
+    
+    We assume the geoJSON is all in decimal degrees in WGS84.
+  */
++ (MaplyVectorObject *__nullable)VectorObjectFromGeoJSON:(NSData *__nonnull)geoJSON;
+
+/** 
+    Parse vector data from geoJSON.
+    
+    Returns one object to represent the whole thing, which might include multiple different vectors.  This version uses slower JSON parser.
+    
+    We assume the geoJSON is all in decimal degrees in WGS84.
+*/
++ (MaplyVectorObject *__nullable)VectorObjectFromGeoJSONApple:(NSData *__nonnull)geoJSON;
+
+/** 
+    Parse vector data from geoJSON.
+    
+    Returns one object to represent the whole thing, which might include multiple different vectors.  This version parses its data from an NSDictionary, which had to be parsed from JSON at some point.  Probably the slower path.
+    
+    We assume the geoJSON is all in decimal degrees in WGS84.
+ */
++ (MaplyVectorObject *__nullable)VectorObjectFromGeoJSONDictionary:(NSDictionary *__nonnull)geoJSON;
+
+// Note: Reader turned off
+#if 0
+/** 
+    Read vector objects from the given cache file.
+    
+    MaplyVectorObject's can be written and read from a binary file.  We use this for caching data locally on the device.
+    
+    @param fileName Name of the binary vector file.
+    
+    @return The vector object(s) read from the file or nil on failure.
+  */
++ (MaplyVectorObject *__nullable)VectorObjectFromFile:(NSString *__nonnull)fileName;
+#endif
+
+/** 
+    Read vector objects from the given shapefile.
+    
+    This will read all the shapes in the given shapefile into memory and return them as one MaplyVectorObject.
+    
+    @param fileName The basename of the shape file.  Don't include the extension.
+    
+    @return The vector object(s) read from the file or nil on failure.
+  */
++ (MaplyVectorObject *__nullable)VectorObjectFromShapeFile:(NSString *__nonnull)fileName;
+
+/** 
+    Parse vector objects from a JSON assembly.
+    
+    This version can deal with non-compliant assemblies returned by the experimental OSM server
+  */
++ (NSDictionary *__nullable)VectorObjectsFromGeoJSONAssembly:(NSData *__nonnull)geoJSON;
+
+/** 
+    Initialize with a single data point and attribution.
+ 
+    This version takes a single coordinate and the attributes to go with it.
+ */
+- (nonnull instancetype)initWithPoint:(MaplyCoordinate)coord attributes:(NSDictionary *__nullable)attr;
+
+/** 
+    Initialize with a single data point and attribution.
+    
+    This version takes a single coordinate and the attributes to go with it.
+  */
+- (nonnull instancetype)initWithPointRef:(const MaplyCoordinate *__nonnull)coord attributes:(NSDictionary *__nullable)attr;
+
+/** 
+    Initialize with a linear feature.
+ 
+    This version takes an array of coordinates (2 `NSNumber`s per coordinate, in degrees) and the attribution.
+    With this it will make a linear feature.
+    Prefer the `inDegrees:` overload to reduce ambiguity.
+    Returns nil if the coordinate array contains an odd number of values.
+ */
+- (nullable instancetype)initWithLineString:(const NSArray<NSNumber*> *__nonnull)coords
+                                attributes:(NSDictionary *__nullable)attr;
+
+/**
+    Initialize with a linear feature.
+ 
+    This version takes an array of coordinate pairs (as NSNumber) and the attribution.  With this it will make a linear feature.
+    Returns nil if the coordinate array contains an odd number of values.
+ */
+- (nullable instancetype)initWithLineString:(const NSArray<NSNumber*> *__nonnull)coords
+                                attributes:(NSDictionary *__nullable)attr
+                                 inDegrees:(bool)inDegrees;
+
+/** 
+    Initialize with a linear feature.
+ 
+    This version takes an array of coordinates, the size of that array and the attribution.  With this it will make a linear feature.
+  */
+- (nonnull instancetype)initWithLineString:(const MaplyCoordinate *__nonnull)coords
+                                 numCoords:(int)numCoords
+                                attributes:(NSDictionary *__nullable)attr;
+
+/** 
+    Inintialize as an areal feature.
+ 
+    This version takes an array of coordinates, the size of that array and the attribution.
+    With this it will make a single area feature with one (exterior) loop.  To add loops, call `addHole:numCoords:`
+  */
+- (nonnull instancetype)initWithAreal:(const MaplyCoordinate *__nonnull)coords
+                            numCoords:(int)numCoords
+                           attributes:(NSDictionary *__nullable)attr;
+
+/**
+  Inintialize as an areal feature.
+ 
+    This version takes an array of coordinates (2 `NSNumber`s per coordinate, in radians).
+    With this it will make a single area feature with one (exterior) loop.  To add loops, call addHole:numCoords:
+    Prefer the `inDegrees:` overload to reduce ambiguity.
+    Returns nil if the coordinate array contains an odd number of values.
+*/
+- (nullable instancetype)initWithArealArray:(const NSArray<NSNumber *> *__nonnull)coords
+                                 attributes:(NSDictionary *__nullable)attr;
+
+/**
+    Inintialize as an areal feature.
+ 
+    This version takes an array of coordinates (2 `NSNumber`s per coordinate, in radians).
+    With this it will make a single area feature with one (exterior) loop.  To add loops, call `addHole:numCoords:`
+    Returns nil if the coordinate array contains an odd number of values.
+*/
+- (nullable instancetype)initWithArealArray:(const NSArray<NSNumber *> *__nonnull)coords
+                                 attributes:(NSDictionary *__nullable)attr
+                                  inDegrees:(bool)inDegrees;
+
+/** 
+    Initializes with vectors parsed from geoJSON.
+	
+    Returns one object to represent the whole thing, which might include multiple different vectors.  This version uses the faster JSON parser.
+    
+    We assume the geoJSON is all in decimal degrees in WGS84.
+ */
+- (nullable instancetype)initWithGeoJSON:(NSData *__nonnull)geoJSON;
+
+/** 
+    Initializes with vector parsed from geoJSON.
+	
+    Returns one object to represent the whole thing, which might include multiple different vectors.  This version uses slower JSON parser.
+	
+    We assume the geoJSON is all in decimal degrees in WGS84.
+ */
+- (nullable instancetype)initWithGeoJSONApple:(NSData *__nonnull)geoJSON;
+
+/** 
+    Initializes with vector parsed from geoJSON.
+	
+    Returns one object to represent the whole thing, which might include multiple different vectors.  This version parses its data from an NSDictionary, which had to be parsed from JSON at some point.  Probably the slower path.
+	
+    We assume the geoJSON is all in decimal degrees in WGS84.
+ */
+- (nullable instancetype)initWithGeoJSONDictionary:(NSDictionary *__nonnull)geoJSON;
+
+// Note: Turned off with reading
+#if 0
+/** 
+    Initializes with vectors read from the given cache file.
+	
+    MaplyVectorObject's can be written and read from a binary file.  We use this for caching data locally on the device.
+	
+    @param fileName Name of the binary vector file.
+	
+    @return The vector object(s) read from the file or nil on failure.
+ */
+- (nullable instancetype)initWithFile:(NSString *__nonnull)fileName;
+#endif
+
+/** 
+    Initializes with vectors read from the given shapefile.
+	
+    This will read all the shapes in the given shapefile into memory and return them as one MaplyVectorObject.
+	
+    @param fileName The basename of the shape file.  Don't include the extension.
+	
+    @return The vector object(s) read from the file or nil on failure.
+ */
+- (nullable instancetype)initWithShapeFile:(NSString *__nonnull)fileName;
+
+
+// Note: Vector writing turned off
+#if 0
+/** 
+    Write the vector object to the given file on the device.
+    
+    We support a binary format for caching vector data.  Typically you write these files on the device or in the simulator and then put them in a place you can easily find them when needed.
+    
+    @param fileName The file to read the vector data from.
+    
+    @return Returns true on succes, false on failure.
+  */
+- (bool)writeToFile:(NSString *__nonnull)fileName;
+#endif
+
+/** 
+    Make a deep copy of the vector object and return it.
+    
+    This makes a complete copy of the vector object, with all features and nothing shared.
+    
+    Had to rename this because Apple's private method scanner is dumb.
+  */
+- (MaplyVectorObject *__nonnull)deepCopy2;
+
+/** 
+    Reproject from one coordinate system to another.
+    
+    This reprojects every single point in the points, linears, and areals (and mesh) from the source coordinate system to the destionation.
+    
+    Typically, you'll want Plate Carree for display, the destSystem is probably that.
+    
+    For various reasons (e.g. scale), this will probably not work right for you.
+    
+    @param srcSystem The source coordinate system.  The data is already in this sytem.
+    
+    @param destSystem The destination coordinate system.  The data will be in this system on return.
+  */
+- (void)reprojectFrom:(MaplyCoordinateSystem *__nonnull)srcSystem to:(MaplyCoordinateSystem *__nonnull)destSystem;
+
+/** 
+    Dump the feature(s) out as text
+    
+    This will write each feature out as text for debugging.
+  */
+- (NSString *__nonnull)log;
+
+/** 
+    Add a hole to an existing feature.
+    
+    This method is expecting to find exactly one areal feature.  If it finds one, it will add the given hole as a loop on the end of the list of loops.
+  */
+- (void)addHole:(const MaplyCoordinate *__nonnull)coords numCoords:(int)numCoords;
+
+/** 
+    Returns the type of the vector feature.
+    
+    This method returns the type of the vector.  Since vector objects can contain multiple types of vectors at once, this is somewhat complicated.
+ 
+|Type | Description |
+|:----|:-----------:|
+|MaplyVectorNoneType | There are no features in this object. |
+|MaplyVectorPointType | There are only points (and multi-points) in the object. |
+|MaplyVectorLinearType | There are only linear features in the object. |
+|MaplyVectorLinear3dType | There are only linear features with Z values in the object. |
+|MaplyVectorArealType | There are only areal features in the object. |
+|MaplyVectorMultiType | There are multiple features of different types in the object. |
+  */
+- (MaplyVectorObjectType)vectorType;
+
+/** 
+    Run a point in polygon test on all the areal features within the object.
+    
+    We'll run a point in polygon test on all the areal features within the vector object.  If the point is within one of them, we return true, otherwise false.
+  */
+- (bool)pointInAreal:(MaplyCoordinate)coord;
+
+/**
+    Test if any linear feature is within distance of coord
+ */
+- (bool)pointNearLinear:(MaplyCoordinate)coord distance:(float)maxDistance inViewController:(MaplyBaseViewController *__nonnull)vc;
+
+/** 
+    Calculate the center of the entire set of vectors in this object.
+  */
+- (MaplyCoordinate)center;
+
+/** 
+    Copy the vectors in the given vector object into this one.
+  */
+- (void)mergeVectorsFrom:(MaplyVectorObject *__nonnull)otherVec;
+
+/** 
+    For a linear feature, calculate the mid oint and rotation at that point.
+    
+    The vector object contains a number of half baked geometric queries, this being one of them.
+    
+    This finds the middle (as measured by distance) of a linear feature and then calculations an angle corresponding to the line segment that middle sits in.
+    
+    Why?  Think label road placement.
+  */
+- (bool)linearMiddle:(MaplyCoordinate *__nonnull)middle rot:(double *__nonnull)rot;
+
+- (bool)linearMiddle:(MaplyCoordinate *__nullable)middle rot:(double *__nullable)rot displayCoordSys:(MaplyCoordinateSystem *__nonnull)coordSys;
+
+/** 
+    For a linear feature, calculate the mid point.
+ 
+    This is a convenience method to be called without pointers (Swift)
+ 
+    If you need both the mid point and the rotation, this method is less efficient than the method with pointers.
+ 
+    @return kMaplyNullCoordinate in case of error
+
+ */
+- (MaplyCoordinate)linearMiddle:(MaplyCoordinateSystem *__nonnull)coordSys;
+
+/** 
+    For a linear feature, calculate the mid point and returns the rotation at that point.
+ 
+    This is a convenience method to be called without pointers (Swift)
+ 
+    If you need both the mid point and the rotation, this method is less efficient than the method with pointers.
+ 
+    @return DBL_MIN in case of error
+ */
+- (double)linearMiddleRotation:(MaplyCoordinateSystem *__nonnull)coordSys;
+
+/** 
+    return the middle coordinate in a line feature
+    
+    @return kMaplyNullCoordinate in case of error
+ */
+- (MaplyCoordinate)middleCoordinate;
+
+/** 
+    return the middle coordinate in a line feature.
+ */
+- (bool)middleCoordinate:(MaplyCoordinate *__nonnull)middle;
+
+/** 
+    Calculate the center and extents of the largest loop in an areal feature.
+    
+    The vector object contains a number of half baked geometric queries, this being one of them.
+    
+    If this vector contains at least one areal feature, we'll determine which loop is the largest and return the center of that loop, as well as its bounding box.
+    
+    Why?  Think label placement on an areal feature.
+    
+    @return Returns false if there was no loop (i.e. probably isn't an areal)
+  */
+- (bool)largestLoopCenter:(MaplyCoordinate *__nullable)center mbrLL:(MaplyCoordinate *__nullable)ll mbrUR:(MaplyCoordinate *__nullable)ur;
+
+/** 
+    Calculate the centroid of the largest loop in the areal feature.
+ 
+    The centroid is a better center for label placement than the middle of the largest loop as calculated by largestLoopCenter:mbrLL:mbrUR:
+ 
+    @return Returns the centroid structure. If there was no loop (i.e. probably isn't an areal), the result will be kMaplyNullCoordinate
+ */
+- (MaplyCoordinate)centroid;
+
+/** 
+    Calculate the centroid of the largest loop in the areal feature.
+    
+    The centroid is a better center for label placement than the middle of the largest loop as calculated by largestLoopCenter:mbrLL:mbrUR:
+    
+    @return Returns false if there was no loop (probably wasn't an areal).
+  */
+- (bool)centroid:(MaplyCoordinate *__nonnull)centroid;
+
+/** 
+    Calculate the bounding box of all the features in this vector object.
+ 
+    @return kMaplyNullBoundingBox in case of error
+ */
+- (MaplyBoundingBox)boundingBox;
+
+/** 
+    Calculate the bounding box of all the features in this vector object.
+  */
+- (bool)boundingBoxLL:(MaplyCoordinate *__nonnull)ll ur:(MaplyCoordinate *__nonnull)ur;
+
+/** 
+    Calculate the area of the outer loops.
+    
+    This returns the area of the outer loops of any areal features in the VectorObject.
+  */
+- (double)areaOfOuterLoops;
+
+/** 
+    Convert any linear features into areal features.
+    
+    Convert linear features to areal features by closing each one individually.
+  */
+- (MaplyVectorObject * _Nonnull )linearsToAreals;
+
+/**
+    Convert any areal features into outlines.
+  */
+- (MaplyVectorObject * __nonnull)arealsToLinears;
+
+/**
+    Reverse the direction of areal loops in-place
+ */
+- (void)reverseAreals;
+
+/**
+    Return a copy with the areal loops reversed
+ */
+- (MaplyVectorObject * __nonnull)reversedAreals;
+
+/**
+    Filter out edges created from clipping areal features on the server.
+ 
+    In some very specific cases (OSM water) we get polygons that are obviously clipped
+    along internal boundaries.  We can clear this up with some very, very specific logic.
+ 
+    Input must be closed areals and output is linears.
+  */
+- (MaplyVectorObject *__nonnull)filterClippedEdges;
+
+/** 
+    Convert a feature to an NSArray of NSArrays of CLLocation points.
+    
+    This is intended for areal features.  It will convert those coordinates to CLLocation values and return them.  Obviously this is intended for things that need CLLocation values.
+    
+    @return Returns an NSArray of NSArray's which then contain CLLocation points.
+  */
+- (NSArray *__nullable)asCLLocationArrays;
+
+/** 
+    Return the data as an NSArray of NSNumbers.
+    
+    If this is a linear, we'll return the points as an NSArray of NSNumbers.
+  */
+- (NSArray *__nullable)asNumbers;
+
+/** 
+    Split up this feature into individual features and return an array of them.
+    
+    A vector object can represent multiple features with no real rhyme or reason to it.  This method will make one vector object per feature, allowing you to operate on those individually.
+    
+    @return An NSArray of MaplyVectorObject.
+  */
+- (NSArray<MaplyVectorObject *> *__nonnull)splitVectors;
+
+/** 
+    Subdivide the edges in this feature to a given tolerance.
+    
+    This will break up long edges in a vector until they lie flat on a globe to a given epsilon.  The epislon is in display coordinates (radius = 1.0). This routine breaks this up along geographic boundaries.
+  */
+- (void)subdivideToGlobe:(float)epsilon;
+
+/** 
+    Subdivide the edges in this feature to a given tolerance, using great circle math.
+    
+    This will break up long edges in a vector until they lie flat on a globe to a given epsilon using a great circle route.  The epsilon is in display coordinates (radius = 1.0).
+  */
+- (void)subdivideToGlobeGreatCircle:(float)epsilon;
+
+/** 
+    Subdivide the edges in this feature to a given tolerance, using great circle math.
+ 
+    This version samples a great circle to display on a flat map.
+ */
+- (void)subdivideToFlatGreatCircle:(float)epsilon;
+
+
+/**
+    Subdivide the edges in this feature to a given tolerance, using ellipsoidal great circle math.
+    
+    This will break up long edges in a vector until they lie flat on a globe to a given epsilon using a great circle route.  The epsilon is in display coordinates (radius = 1.0).
+  */
+- (void)subdivideToGlobeGreatCirclePrecise:(float)epsilon;
+
+/**
+    Subdivide the edges in this feature to a given tolerance, using ellipsoidal  great circle math.
+ 
+    This version samples a great circle to display on a flat map.
+ */
+- (void)subdivideToFlatGreatCirclePrecise:(float)epsilon;
+
+/** 
+    Tesselate the areal geometry in this vector object and return triangles.
+    
+    This will attempt to tesselate the areals (with holes) and turn them into triangles.  No attribution will be assigned to the new triangles, so be aware.  The tesselator is the GLU based one and does a decent job.  Odds are if there's something wrong it's in the input data.
+  */
+- (MaplyVectorObject *__nonnull)tesselate;
+
+/** 
+    Clip the given (presumably areal) feature(s) to a grid in radians of the given size.
+    
+    This will run through the loops in the input vectors and clip them against a grid.  The grid size is given in radians.
+    
+    @return New areal features broken up along the grid.
+  */
+- (MaplyVectorObject *__nullable)clipToGrid:(CGSize)gridSize;
+
+/**
+    
+    Clip the given (probably areal) features to the given bounding box.
+    
+    This will run through the loops of the areal features and clip them against a bounding box.
+    
+    The bounding box should be in the same coordinate system as the grid, probably radians.
+    
+    @return The new areal features will be clipped along the bounding box.
+  */
+- (MaplyVectorObject *__nullable)clipToMbr:(MaplyCoordinate)ll upperRight:(MaplyCoordinate)ur;
+
+@end
+
+typedef MaplyVectorObject WGVectorObject;
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVectorStyle.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVectorStyle.h
new file mode 100644
index 0000000..cecf6d9
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVectorStyle.h
@@ -0,0 +1,214 @@
+/*  MaplyVectorStyle.h
+ *  WhirlyGlobe-MaplyComponent
+ *
+ *  Created by Steve Gifford on 1/3/14.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#import <UIKit/UIKit.h>
+#import <WhirlyGlobeMaplyComponent/MaplyTileSourceNew.h>
+#import <WhirlyGlobeMaplyComponent/MaplyBaseViewController.h>
+
+@class MaplyVectorTileData;
+
+/** 
+    Settings that control how vector tiles look in relation to their styles.
+    
+    These are set based on the sort of device we're on, particularly retina vs. non-retina.  They can be manipulated directly as well for your needs.
+  */
+@interface MaplyVectorStyleSettings : NSObject
+
+/// Initialize with the (presumably) retina scale
+- (instancetype __nonnull)initWithScale:(CGFloat)scale;
+
+/// Line widths will be scaled by this amount before display.
+@property (nonatomic) float lineScale;
+/// Text sizes will be scaled by this amount before display.
+@property (nonatomic) float textScale;
+/// Markers (symbols+circles) will be scaled by this amount before display.
+@property (nonatomic) float markerScale;
+/// Symbols will be scaled by this amount before display.
+@property (nonatomic) float symbolScale;
+/// Circles will be scaled by this amount before display.
+@property (nonatomic) float circleScale;
+/// Importance for markers in the layout engine
+@property (nonatomic) float markerImportance;
+/// Default marker size when none is specified
+@property (nonatomic) float markerSize;
+/// Importance for labels in the layout engine
+@property (nonatomic) float labelImportance;
+/// If set we'll use the zoom levels defined in the style
+@property (nonatomic) bool useZoomLevels;
+
+/// For symbols we'll try to pull a UUID out of this field to stick in the marker and label uniqueID
+@property (nonatomic,nullable) NSString *uuidField;
+
+/// Draw priority calculated as offset from here
+@property (nonatomic) int baseDrawPriority;
+
+/// Offset between levels
+@property (nonatomic) int drawPriorityPerLevel;
+
+/** 
+    The overall map scale calculations will be scaled by this amount.
+    
+    We use the map scale calculations to figure out what is dispalyed and when.  Not what to load in, mind you, that's a separate, but related calculation.  This controls the scaling of those calculations.  Scale it down to load things in later, up to load them in sooner.
+  */
+@property (nonatomic) float mapScaleScale;
+
+/// Dashed lines will be scaled by this amount before display.
+@property (nonatomic) float dashPatternScale;
+
+/// Use widened vectors (which do anti-aliasing and such)
+@property (nonatomic) bool useWideVectors;
+
+/// Where we're using old vectors (e.g. not wide) scale them by this amount
+@property (nonatomic) float oldVecWidthScale;
+
+/// If we're using widened vectors, only activate them for strokes wider than this.  Defaults to zero.
+@property (nonatomic) float wideVecCuttoff;
+
+/// If set, this is the shader we'll use on the areal features.
+@property (nonatomic,strong) NSString * _Nullable arealShaderName;
+
+/// If set, we'll make all the features selectable.  If not, we won't.
+@property (nonatomic) bool selectable;
+
+/// If set, icons will be loaded from this directory
+@property (nonatomic, strong) NSString * _Nullable iconDirectory;
+
+/// The default font family for all text
+@property (nonatomic,strong) NSString * _Nullable fontName;
+
+@end
+
+@protocol MaplyVectorStyle;
+
+/** 
+    Protocol for styling the vectors.
+ 
+    You pass in an object which adheres to this protocol and will style
+ the vectors read by a MaplyMapnikVectorTiles object.  In general, this will be
+ a parsed Mapnik vector file, but you can substitute your own logic as well.
+ */
+@protocol MaplyVectorStyleDelegate <NSObject>
+
+/** 
+    Return the styles that apply to the given feature (attributes).
+ */
+- (nullable NSArray *)stylesForFeatureWithAttributes:(NSDictionary *__nonnull)attributes
+                                              onTile:(MaplyTileID)tileID
+                                             inLayer:(NSString *__nonnull)layer
+                                               viewC:(NSObject<MaplyRenderControllerProtocol> *__nonnull)viewC;
+
+/// Return true if the given layer is meant to display for the given tile (zoom level)
+- (BOOL)layerShouldDisplay:(NSString *__nonnull)layer tile:(MaplyTileID)tileID;
+
+/// Return the style associated with the given UUID.
+- (nullable NSObject<MaplyVectorStyle> *)styleForUUID:(long long)uiid viewC:(NSObject<MaplyRenderControllerProtocol> *__nonnull)viewC;
+
+/// Return the style for the background
+- (nullable NSObject<MaplyVectorStyle> *)backgroundStyleViewC:(NSObject<MaplyRenderControllerProtocol> *__nonnull)viewC;
+
+// Return a list of all the styles in no particular order.  Needed for categories and indexing
+- (NSArray * __nonnull)allStyles;
+
+@end
+
+/** 
+    Base protocol for the vector styles.
+    
+    Maply Vector Style is the protocol the your vector style needs to
+    implement for the vector tile parsers to recognize it.
+  */
+@protocol MaplyVectorStyle<NSObject>
+
+/// Unique Identifier for this style
+- (long long) uuid;
+
+/// Category used for sorting
+- (NSString * _Nullable) getCategory;
+
+/// Set if this geometry is additive (e.g. sticks around) rather than replacement
+- (bool) geomAdditive;
+
+/// Construct objects related to this style based on the input data.
+- (void)buildObjects:(NSArray * _Nonnull)vecObjs
+             forTile:(MaplyVectorTileData * __nonnull)tileData
+               viewC:(NSObject<MaplyRenderControllerProtocol> * _Nonnull)viewC
+                desc:(NSDictionary * _Nullable)desc;
+
+/// Construct objects related to this style based on the input data.
+- (void)buildObjects:(NSArray * _Nonnull)vecObjs
+             forTile:(MaplyVectorTileData * __nonnull)tileData
+               viewC:(NSObject<MaplyRenderControllerProtocol> * _Nonnull)viewC
+                desc:(NSDictionary * _Nullable)desc
+            cancelFn:(bool(^__nullable)(void))cancelFn;
+
+@end
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+/** 
+    Use a style delegate to interpret vector data.
+ 
+    Run the style delegate against the given vectors.  The resulting features are added to the
+ given view controller using the thread mode specified.
+ 
+    @param vecObjs An array of MaplyVectorObject.
+ 
+    @param styleDelegate The style delegate that controls how the vectors will look.
+ 
+    @param viewC View controller to add the geometry to.
+ 
+    @param threadMode MaplyThreadCurrent will block until all the features are added.  MaplyThreadAny will do some of the work on another thread.
+ */
+NSArray<MaplyComponentObject*> * _Nonnull AddMaplyVectorsUsingStyle(NSArray<MaplyVectorObject*> * _Nonnull vecObjs,
+                                                                    NSObject<MaplyVectorStyleDelegate> * _Nonnull styleDelegate,
+                                                                    NSObject<MaplyRenderControllerProtocol> * _Nonnull viewC,
+                                                                    MaplyThreadMode threadMode);
+
+/**
+    Use a style delegate to interpret vector data.
+ 
+    Run the style delegate against the given vectors.  The resulting features are added to the
+ given view controller using the thread mode specified.
+ 
+    @param vecObjs An array of MaplyVectorObject.
+ 
+    @param styleDelegate The style delegate that controls how the vectors will look.
+ 
+    @param viewC View controller to add the geometry to.
+
+    @param tileId The tile where the feature originates.
+ 
+    @param enable Automatically enable the generated objects
+ 
+    @param threadMode MaplyThreadCurrent will block until all the features are added.  MaplyThreadAny will do some of the work on another thread.
+ 
+    @param desc Additional attributes to include with the generated component objects
+ */
+NSArray<MaplyComponentObject*> * _Nonnull AddMaplyVectorsUsingStyleAndAttributes(
+    NSArray<MaplyVectorObject*> * _Nonnull vecObjs,
+    NSObject<MaplyVectorStyleDelegate> * _Nonnull styleDelegate,
+    NSObject<MaplyRenderControllerProtocol> * _Nonnull viewC,
+    MaplyTileID tileId,
+    bool enable,
+    MaplyThreadMode threadMode,
+    NSDictionary * _Nullable desc);
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVectorStyleSimple.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVectorStyleSimple.h
new file mode 100644
index 0000000..3543e30
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVectorStyleSimple.h
@@ -0,0 +1,85 @@
+/*  MaplyVectorStyleSimple.m
+ *  WhirlyGlobe-MaplyComponent
+ *
+ *  Created by Steve Gifford on 3/15/16.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#import <Foundation/Foundation.h>
+#import <WhirlyGlobeMaplyComponent/MapboxVectorTiles.h>
+
+/** 
+    Simple default style to see something in vector tile data.
+    
+    A simple vector style that displays each layer in a random color.
+    Use this as a starting point for your own style.
+  */
+@interface MaplyVectorStyleSimpleGenerator : NSObject<MaplyVectorStyleDelegate>
+
+@property (nonatomic,weak) NSObject<MaplyRenderControllerProtocol> *viewC;
+
+/// Initialize with a map view controller
+- (id)initWithViewC:(NSObject<MaplyRenderControllerProtocol> *)viewC;
+
+/// uuid for the styles
+- (long long)generateID;
+
+@end
+
+/** 
+    Base class for the simple vector style.
+  */
+@interface MaplyVectorStyleSimple : NSObject<MaplyVectorStyle>
+
+/// Unique Identifier for this style
+@property (nonatomic) long long uuid;
+
+/// Set if this geometry is additive (e.g. sticks around) rather than replacement
+@property (nonatomic) bool geomAdditive;
+
+/// Priority for sorting among layers
+@property (nonatomic) int drawPriority;
+
+@property (nonatomic,weak) NSObject<MaplyRenderControllerProtocol> *viewC;
+
+- (id)initWithGen:(MaplyVectorStyleSimpleGenerator *)gen viewC:(NSObject<MaplyRenderControllerProtocol> *)viewC;
+
+@end
+
+/** 
+    Simple filled polygon with a random color.
+  */
+@interface MaplyVectorStyleSimplePolygon : MaplyVectorStyleSimple
+
+@property (nonatomic,strong) UIColor *color;
+
+@end
+
+/** 
+    Simple point we'll convert to a label.
+  */
+@interface MaplyVectorStyleSimplePoint : MaplyVectorStyleSimple
+
+@property (nonatomic,strong) UIFont *font;
+
+@end
+
+/** 
+    Simple linear with a random color.
+  */
+@interface MaplyVectorStyleSimpleLinear : MaplyVectorStyleSimple
+
+@property (nonatomic,strong) UIColor *color;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVectorTileLineStyle.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVectorTileLineStyle.h
new file mode 100644
index 0000000..ce3984a
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVectorTileLineStyle.h
@@ -0,0 +1,29 @@
+/*  MaplyVectorLineStyle.h
+ *  WhirlyGlobe-MaplyComponent
+ *
+ *  Created by Steve Gifford on 1/3/14.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#import <WhirlyGlobeMaplyComponent/MaplyVectorStyle.h>
+#import <WhirlyGlobeMaplyComponent/MaplyVectorTileStyle.h>
+
+/** 
+    Implementation of the line style symbolizer for Maply Vector Tiles.
+  */
+@interface MaplyVectorTileStyleLine : MaplyVectorTileStyle
+
+- (instancetype)initWithStyleEntry:(NSDictionary *)styleEntry settings:(MaplyVectorStyleSettings *)settings viewC:(NSObject<MaplyRenderControllerProtocol> *)viewC;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVectorTileMarkerStyle.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVectorTileMarkerStyle.h
new file mode 100644
index 0000000..9dac65a
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVectorTileMarkerStyle.h
@@ -0,0 +1,29 @@
+/*  MaplyVectorMarkerStyle.h
+ *  WhirlyGlobe-MaplyComponent
+ *
+ *  Created by Steve Gifford on 1/3/14.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#import <WhirlyGlobeMaplyComponent/MaplyVectorStyle.h>
+#import <WhirlyGlobeMaplyComponent/MaplyVectorTileStyle.h>
+
+/** 
+    Implementation of the marker style symbolizer for Maply Vector Tiles.
+ */
+@interface MaplyVectorTileStyleMarker : MaplyVectorTileStyle
+
+- (instancetype)initWithStyleEntry:(NSDictionary *)styleEntry settings:(MaplyVectorStyleSettings *)settings viewC:(NSObject<MaplyRenderControllerProtocol> *)viewC;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVectorTilePolygonStyle.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVectorTilePolygonStyle.h
new file mode 100644
index 0000000..509916a
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVectorTilePolygonStyle.h
@@ -0,0 +1,29 @@
+/*  MaplyVectorPolygonStyle.h
+ *  WhirlyGlobe-MaplyComponent
+ *
+ *  Created by Steve Gifford on 1/3/14.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#import <WhirlyGlobeMaplyComponent/MaplyVectorStyle.h>
+#import <WhirlyGlobeMaplyComponent/MaplyVectorTileStyle.h>
+
+/** 
+    Implementation of the polygon style symbolizer for Maply Vector Tiles.
+ */
+@interface MaplyVectorTileStylePolygon : MaplyVectorTileStyle
+
+- (instancetype)initWithStyleEntry:(NSDictionary *)styleEntry settings:(MaplyVectorStyleSettings *)settings viewC:(NSObject<MaplyRenderControllerProtocol> *)viewC;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVectorTileStyle.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVectorTileStyle.h
new file mode 100644
index 0000000..c917859
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVectorTileStyle.h
@@ -0,0 +1,60 @@
+/*  MaplyVectorTileStyle.h
+ *  WhirlyGlobe-MaplyComponent
+ *
+ *  Created by Steve Gifford on 1/3/14.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#import <UIKit/UIKit.h>
+#import <WhirlyGlobeMaplyComponent/MaplyVectorStyle.h>
+
+/** The Maply Vector Tile Style is an internal representation of the style JSON coming out
+    of a Maply Vector Tile database.
+  */
+@interface MaplyVectorTileStyle : NSObject<MaplyVectorStyle>
+
+/** 
+    Construct a style entry from an NSDictionary.
+  */
++ (id)styleFromStyleEntry:(NSDictionary *)styleEntry settings:(MaplyVectorStyleSettings *)settings viewC:(NSObject<MaplyRenderControllerProtocol> *)viewC;
+
+/// Unique Identifier for this style
+@property (nonatomic) long long uuid;
+
+/// Set if this geometry is additive (e.g. sticks around) rather than replacement
+@property (nonatomic) bool geomAdditive;
+
+/// Construct a style entry from an NSDictionary
+- (instancetype)initWithStyleEntry:(NSDictionary *)styleEntry viewC:(NSObject<MaplyRenderControllerProtocol> *)viewC;
+
+/// Turn the min/maxscaledenom into height ranges for minVis/maxVis
+- (void)resolveVisibility:(NSDictionary *)styleEntry settings:(MaplyVectorStyleSettings *)settings desc:(NSMutableDictionary *)desc;
+
+/// parse a mapnik style template string
+- (NSString*)formatText:(NSString*)formatString forObject:(MaplyVectorObject*)vec;
+
+/// The view controller we're constructing objects in
+@property (nonatomic,weak) NSObject<MaplyRenderControllerProtocol> *viewC;
+
+/// If set, we create selectable objects
+/// This controls whether the objects we create are selectable.  Off by default.
+@property (nonatomic) bool selectable;
+
+/// Parse the various types of color strings
++ (UIColor *) ParseColor:(NSString *)colorStr;
+
+/// Parse an RGB color and fill in the alpha
++ (UIColor *) ParseColor:(NSString *)colorStr alpha:(CGFloat)alpha;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVectorTileTextStyle.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVectorTileTextStyle.h
new file mode 100644
index 0000000..b69b826
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVectorTileTextStyle.h
@@ -0,0 +1,29 @@
+/*  MaplyVectorTextStyle.h
+ *  WhirlyGlobe-MaplyComponent
+ *
+ *  Created by Steve Gifford on 1/3/14.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#import <WhirlyGlobeMaplyComponent/MaplyVectorStyle.h>
+#import <WhirlyGlobeMaplyComponent/MaplyVectorTileStyle.h>
+
+/** 
+    Implementation of the text style symbolizer for Maply Vector Tiles.
+ */
+@interface MaplyVectorTileStyleText : MaplyVectorTileStyle
+
+- (instancetype _Nullable)initWithStyleEntry:(NSDictionary * _Nonnull)styleEntry settings:(MaplyVectorStyleSettings * _Nonnull)settings viewC:(NSObject<MaplyRenderControllerProtocol> * _Nonnull)viewC;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVertexAttribute.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVertexAttribute.h
new file mode 100644
index 0000000..07e220a
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVertexAttribute.h
@@ -0,0 +1,49 @@
+/*
+ *  MaplyVertexAttribute.h
+ *  WhirlyGlobe-MaplyComponent
+ *
+ *  Created by Steve Gifford on 11/29/13.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <UIKit/UIKit.h>
+
+/** 
+    Vertex Attributes are passed all the way though on objects to shaders.
+    
+    If you have your own custom shader, you often need a way to feed it data.  The toolkit will set up the standard data, like vertices, texture coordinates and normals, but sometimes you need something custom.
+    
+    Vertex attributes are the mechanism you use to pass that custom data all the way down to the shader.
+    
+    How the vertex attributes are used depends on the data type, so consult the appropriate object.
+  */
+@interface MaplyVertexAttribute : NSObject
+
+/// Construct a vertex attribute as a single float
+- (nonnull instancetype)initWithName:(NSString * __nonnull)name slot:(int)slot float:(float)val;
+
+/// Construct a vertex attribute as two floats
+- (nonnull instancetype)initWithName:(NSString * __nonnull)name slot:(int)slot floatX:(float)x y:(float)y;
+
+/// Construct a vertex attribute as three flaots
+- (nonnull instancetype)initWithName:(NSString * __nonnull)name slot:(int)slot floatX:(float)x y:(float)y z:(float)z;
+
+/// Construct a vertex attribute as an RGBA value
+- (nonnull instancetype)initWithName:(NSString * __nonnull)name slot:(int)slot color:(UIColor * __nonnull)color;
+
+/// Construct a vertex attribute as an int
+- (nonnull instancetype)initWithName:(NSString * __nonnull)name slot:(int)slot int:(int)val;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyViewController.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyViewController.h
new file mode 100644
index 0000000..fc5b2eb
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyViewController.h
@@ -0,0 +1,651 @@
+/*  MaplyViewController.h
+ *  MaplyComponent
+ *
+ *  Created by Steve Gifford on 9/6/12.
+ *  Copyright 2012-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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#import <UIKit/UIKit.h>
+#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
+#import <WhirlyGlobeMaplyComponent/MaplyScreenMarker.h>
+#import <WhirlyGlobeMaplyComponent/MaplyVectorObject.h>
+#import <WhirlyGlobeMaplyComponent/MaplyViewTracker.h>
+#import <WhirlyGlobeMaplyComponent/MaplyComponentObject.h>
+#import <WhirlyGlobeMaplyComponent/MaplySharedAttributes.h>
+#import <WhirlyGlobeMaplyComponent/MaplyBaseViewController.h>
+
+@class MaplyControllerLayer;
+@class MaplyViewController;
+
+
+/** 
+    Animation State used by the MaplyViewControllerAnimationDelegate.
+ 
+    You fill out one of these when you're implementing the animation delegate.  Return it and the view controller will set the respective values to match.
+ */
+@interface MaplyViewControllerAnimationState : NSObject
+
+/// Heading is calculated from due north
+/// If not set or set to MAXFLOAT, this is ignored
+@property (nonatomic) double heading;
+
+/// Height above the map
+@property (nonatomic) double height;
+
+/// Position to move to on the map
+@property (nonatomic) MaplyCoordinateD pos;
+
+/// If set, this is a point on the screen where pos should be.
+/// By default this is (-1,-1) meaning the screen position is just the middle.  Otherwise, this is where the position should wind up on the screen, if it can.
+@property (nonatomic) CGPoint screenPos;
+
+/** 
+    Interpolate a new state between the given states A and B.
+ 
+    This does a simple interpolation (lat/lon, not great circle) between the two animation states.
+ */
++ (nonnull MaplyViewControllerAnimationState *)Interpolate:(double)t from:(MaplyViewControllerAnimationState *__nonnull)stateA to:(MaplyViewControllerAnimationState *__nonnull)stateB;
+
+@end
+
+/** 
+    An animation delegate that can be set on a MaplyViewController to control the view over time.
+ 
+    Filling out these methods will get you animation callbacks at the proper time to control position, heading and height on a frame basis.
+ 
+    You pass the resulting object in to
+ */
+@protocol MaplyViewControllerAnimationDelegate <NSObject>
+
+/** 
+    This method is called when the animation starts.
+ 
+    At the animation start we collect up the various parameters of the current visual view state and pas them in via the startState.  You probably want to keep track of this for later.
+ 
+    @param viewC The view controller doing the animation.
+ 
+    @param startState The starting point for the visual view animation.  Cache this somewhere for your own interpolation.
+ 
+    @param startTime When the animation starts (e.g. now)
+ 
+    @param endTime When the animation ends.  This is an absolute value.
+ */
+- (void)mapViewController:(MaplyViewController *__nonnull)viewC startState:(MaplyViewControllerAnimationState *__nonnull)startState startTime:(NSTimeInterval)startTime endTime:(NSTimeInterval)endTime;
+
+/** 
+    This method is called at the beginning of every frame draw to position the viewer.
+ 
+    This is the method that does all the work.  You need to fill out the returned MaplyViewControllerAnimationState according to whatever interpolation your'e doing based on the currentTime.
+ 
+    @param viewC The view controller doing the animation.
+ 
+    @param currentTime The time for this frame.  Use this rather than calculating the time yourself.
+ 
+    @return The MaplyViewControllerAnimationState expressing where you want the viewer to be and where they are looking.
+ */
+- (nonnull MaplyViewControllerAnimationState *)mapViewController:(MaplyViewController *__nonnull)viewC stateForTime:(NSTimeInterval)currentTime;
+
+@optional
+
+/** 
+    This method is called at the end of the animation.
+ 
+    The map view controller calls this method when the animation is finished.  Do your cleanup here if need be.
+ 
+    @param viewC The map view controller.
+ */
+- (void)mapViewControllerDidFinishAnimation:(MaplyViewController *__nonnull)viewC;
+
+@end
+
+/** 
+    A simple animation delegate for moving the map around.
+ 
+    The animation delegate support provides a lot of flexibility.  This version just provides all the standard fields and interpolates from beginning to end.
+ */
+@interface MaplyViewControllerSimpleAnimationDelegate : NSObject <MaplyViewControllerAnimationDelegate>
+
+/// Initialize with an animation state to copy
+- (nonnull instancetype)initWithState:(MaplyViewControllerAnimationState *__nonnull)endState;
+
+/// Location at the end of the animation
+@property (nonatomic) MaplyCoordinateD loc;
+
+/// Heading at the end of the animation
+@property (nonatomic) double heading;
+
+/// Height at the end of the animation
+@property (nonatomic) double height;
+
+/// Custom easing
+@property (readwrite,copy) ZoomEasingBlock _Nullable zoomEasing;
+
+@end
+
+/** 
+    A protocol to fill out for selection and tap messages from the MaplyViewController.
+    
+    Fill out the protocol when you want to get back selection and tap messages.  All the methods are optional.
+  */
+@protocol MaplyViewControllerDelegate <NSObject>
+
+@optional
+
+/** 
+    Called when the user taps on or near an object.
+    
+    You're given the object you passed in originally, such as a MaplyScreenMarker.  You can set a userObject on most of these to put your own data in there for tracking.
+  */
+- (void)maplyViewController:(MaplyViewController *__nonnull)viewC didSelect:(NSObject *__nonnull)selectedObj;
+
+/** 
+    User selected a given object and tapped at a given location.
+    
+    This is called when the user selects an object.  It differs from maplyViewController:didSelect: in that it passes on the location (in the local coordinate system) and the position on screen.
+    
+    @param viewC View Controller that saw the selection.
+    
+    @param selectedObj The object selected.  Probably one of MaplyVectorObject or MaplyScreenLabel or so on.
+    
+    @param coord Location in the local coordinate system where the user tapped.
+    
+    @param screenPt Location on screen where the user tapped.
+ */
+- (void)maplyViewController:(MaplyViewController *__nonnull)viewC didSelect:(NSObject *__nonnull)selectedObj atLoc:(MaplyCoordinate)coord onScreen:(CGPoint)screenPt;
+
+/** 
+    User selected one or more objects at a given location.
+    
+    @param viewC View Controller that saw the selection(s).
+    
+    @param selectedObjs The object(s) selected.  Probably one of MaplyVectorObject or MaplyScreenLabel or so on.
+    
+    @param coord Location in the local coordinate system where the user tapped.
+    
+    @param screenPt Location on screen where the user tapped.
+  */
+- (void)maplyViewController:(MaplyViewController *__nonnull)viewC allSelect:(NSArray *__nonnull)selectedObjs atLoc:(MaplyCoordinate)coord onScreen:(CGPoint)screenPt;
+
+/** 
+    User tapped at a given location.
+    
+    This is a tap at a specific location on the map.  This won't be called if they tapped and selected, just for taps.
+  */
+- (void)maplyViewController:(MaplyViewController *__nonnull)viewC didTapAt:(MaplyCoordinate)coord;
+
+/** 
+    Called when the map starts moving.
+ 
+    @param viewC The map view controller.
+ 
+    @param userMotion Set if this is motion being caused by the user, rather than a call to set location.
+ 
+    This is called when something (probably the user) starts moving the map.
+ */
+- (void)maplyViewControllerDidStartMoving:(MaplyViewController *__nonnull)viewC userMotion:(bool)userMotion;
+
+/** 
+    Called when the map stops moving.
+ 
+    This is called when the map stops moving.  It passes in the corners of the current viewspace.
+ 
+    @param viewC The globe view controller.
+ 
+    @param userMotion Set if this is motion being caused by the user, rather than a call to set location.
+ 
+    @param corners An array of length 4 containing the corners of the view space (lower left, lower right, upper right, upper left).  If any of those corners does not intersect the map (think zoomed out), its values are set to MAXFLOAT.
+ */
+- (void)maplyViewController:(MaplyViewController *__nonnull)viewC didStopMoving:(MaplyCoordinate *__nonnull)corners userMotion:(bool)userMotion;
+
+/** 
+    Called whenever the viewpoint moves.
+ 
+    This is called whenever the viewpoint moves.  That includes user motion as well as animations.
+ 
+    It may be triggered as often as every frame.  If that's a problem, use one of the other variants.
+ 
+    @param viewC The map view controller.
+ 
+    @param corners An array of length 4 containing the corners of the view space (lower left, lower right, upper right, upper left).  If any of those corners does not intersect the globe (think zoomed out), its values are set to MAXFLOAT.
+ */
+- (void)maplyViewController:(MaplyViewController *__nonnull)viewC didMove:(MaplyCoordinate *__nonnull)corners;
+
+
+/** 
+    Called when the user taps on one of your annotations.
+    
+    This is called when the user taps on an annotation.
+    
+    @param annotation Which annotation they tapped on.
+  */
+- (void)maplyViewController:(MaplyViewController *__nonnull)viewC didTapAnnotation:(MaplyAnnotation*__nonnull)annotation;
+
+/// Old version for compatibility.  Use tap instead.
+- (void)maplyViewController:(MaplyViewController *__nonnull)viewC didClickAnnotation:(MaplyAnnotation*__nonnull)annotation __deprecated;
+
+@end
+
+
+typedef NS_ENUM(NSInteger, MaplyMapType) {
+	MaplyMapType3D,
+	MaplyMapTypeFlat,
+};
+
+/** 
+    This view controller implements a map.
+    
+    This is the main entry point for displaying a 2D or 3D map.  Create one of these, fill it with data and let your users mess around with it.
+    
+    You can display a variety of features on the map, including tile base maps (MaplyQuadImageTilesLayer), vectors (MaplyVectorObject), shapes (MaplyShape), and others.  Check out the add calls in the MaplyBaseViewController for details.
+    
+    The Maply View Controller can be initialized in 3D map, 2D map mode.  The 2D mode can be tethered to a UIScrollView if you want to handle gestures that way.  That mode is very specific at the moment.
+    
+    To get selection and tap callbacks, fill out the MaplyViewControllerDelegate and assign the delegate.
+    
+    Most of the functionality is shared with MaplyBaseViewController.  Be sure to look in there first.
+  */
+@interface MaplyViewController : MaplyBaseViewController
+
+/// Initialize as a flat or 3D map.
+- (nonnull instancetype)initWithMapType:(MaplyMapType)mapType;
+
+/// Initialize as a 2D map.
+- (nonnull instancetype)init;
+
+/// Set the coordinate system to use in display.
+/// The coordinate system needs to be valid in flat mode.  The extents, if present, will be used to define the coordinate system origin.
+/// nil is the default and will result in a full web style Spherical Mercator.
+@property(nonatomic,strong) MaplyCoordinateSystem *__nullable coordSys;
+
+/** 
+    Set the center of the display coordinate system.
+    
+    This is (0,0,0) by default.  If you set it to something else all display coordinates will be offset from that origin.
+    
+    The option is useful when displaying small maps (of a city, say) at very high resolution.
+  */
+@property(nonatomic) MaplyCoordinate3d displayCenter;
+
+/** 
+    Turn the pinch (zoom) gesture recognizer on and off
+    
+    On by default.
+  */
+@property(nonatomic,assign) bool pinchGesture;
+
+/** 
+    Turn the rotate gesture recognizer on and off
+    
+    On by default.
+ */
+@property(nonatomic,assign) bool rotateGesture;
+
+/** 
+    Turn the pan gesture on and off
+    
+    Pan gesture is on by default
+  */
+@property(nonatomic,assign) bool panGesture;
+
+/** 
+    Turn the double tap to zoom gesture recognizer on and off
+    
+    On by default.
+ */
+@property(nonatomic,assign) bool doubleTapZoomGesture;
+
+/** 
+    Turn the 2 finger tap to zoom out gesture recognizer on and off
+    
+    On by default.
+ */
+@property(nonatomic,assign) bool twoFingerTapGesture;
+
+/** 
+    Turn on the double tap and drag gesture to zoom in and out.
+    
+    On by default.
+  */
+@property(nonatomic,assign) bool doubleTapDragGesture;
+
+/** 
+    If set, we use a modified pan gesture recognizer to play nice
+ with the scroll view.  For the UIScrollView object, set clipsToBounds,
+ pagingEnabled, and delaysContentTouches to YES, and set scrollEnabled
+ and canCancelContentTouches to NO.  Add swipe gesture recognizers
+ to the scroll view to control paging, and call
+ requirePanGestureRecognizerToFailForGesture: for each.
+ 
+    Off by default.
+ */
+@property(nonatomic,assign) bool inScrollView;
+
+/** 
+    turn the touch to cancel animation gesture on and off
+    
+    off by default
+ */
+@property(nonatomic,assign) bool cancelAnimationOnTouch;
+
+/** 
+    The current rotation away from north.
+ */
+@property(nonatomic,assign) float heading;
+
+/**
+    The minimum angle, in degrees, which a rotate gesture must subtend before rotation begins.
+        i.e., larger values are "stickier"
+        default is zero, causing rotation to begin immediately
+ */
+@property(nonatomic,assign) float rotateGestureThreshold;
+
+/** 
+    If set, we'll automatically move to wherever the user tapped.
+    
+    When on we'll move the current location to wherever the user tapped if they tapped the globe.  That's true for selection as well.  On by default.
+ */
+@property(nonatomic,assign) bool autoMoveToTap;
+
+/** 
+    Delegate for selection and location tapping.
+    
+    Fill in the MaplyViewControllerDelegate and assign it here to get callbacks for object selection and tapping.
+  */
+@property(nonatomic,weak) NSObject<MaplyViewControllerDelegate> *__nullable delegate;
+
+/** 
+    Current height above terrain.
+    
+    In 3D map mode this is the height from which the user is viewing the map.  Maps are usually -PI to +PI along their horizontal edges.
+  */
+@property (nonatomic,assign) float height;
+
+/** 
+    2D visual views can do some simple wrapping.  This turns that on and off (off by default).
+    
+    On some 2D visual views we're allowed to wrap across the edge of the world.  This will attempt to do that.
+  */
+@property (nonatomic,assign) bool viewWrap;
+
+/** 
+    The box the view point can be in.
+ 
+    This is the box the view point is allowed to be within.  The view controller will constrain it to be within that box.  Coordinates are in geographic (radians).
+ */
+- (MaplyBoundingBox)getViewExtents;
+
+/** 
+    The box the view point can be in.
+    
+    This is the box the view point is allowed to be within.  The view controller will constrain it to be within that box.  Coordinates are in geographic (radians).
+  */
+- (void)getViewExtentsLL:(MaplyCoordinate *__nonnull)ll ur:(MaplyCoordinate *__nonnull)ur;
+
+/** 
+    The box the view point can be in.
+ 
+    This is the box the view point is allowed to be within.  The view controller will constrain it to be within that box. Coordinates are in geographic (radians).
+ */
+- (void)setViewExtents:(MaplyBoundingBox)box;
+
+/** 
+    The box the view point can be in.
+    
+    This is the box the view point is allowed to be within.  The view controller will constrain it to be within that box. Coordinates are in geographic (radians).
+ */
+- (void)setViewExtentsLL:(MaplyCoordinate)ll ur:(MaplyCoordinate)ur;
+
+/** 
+    Animate to the given position over time.
+    
+    @param newPos A coordinate in geographic (lon/lat radians)
+    
+    @param howLong A time in seconds.
+  */
+- (void)animateToPosition:(MaplyCoordinate)newPos time:(NSTimeInterval)howLong;
+
+/** 
+    Animate the given position to the screen position over time.
+    
+    This is similar to animateToPosition:time: except that it will attempt to match up the screen position and the geographic position.  This is how you offset the location you're looking at.
+    
+    If it's impossible to move newPos to loc, then nothing happens.
+    
+    @param newPos The geographic position (lon/lat in radians) to move to.
+    
+    @param loc The location on the screen where we'd like it to go.
+    
+    @param howLong How long in seconds to take getting there.
+  */
+- (bool)animateToPosition:(MaplyCoordinate)newPos onScreen:(CGPoint)loc time:(NSTimeInterval)howLong;
+
+/** 
+    Animate the given position and height to the screen position over time.
+ 
+    This is similar to animateToPosition:time: but it also takes a height paramater
+ 
+    @param newPos The geographic position (lon/lat in radians) to move to.
+ 
+    @param newHeight  the view point height above the map.
+ 
+    @param howLong How long in seconds to take getting there.
+ */
+- (void)animateToPosition:(MaplyCoordinate)newPos height:(float)newHeight time:(NSTimeInterval)howLong;
+
+/** 
+    Animate to the given position, heading and height over time.
+ 
+    @param newPos A coordinate in geographic (lon/lat radians)
+ 
+    @param newHeight New height to animate to.
+ 
+    @param newHeading New heading to finish on.
+ 
+    @param howLong A time interval in seconds.
+ */
+- (bool)animateToPosition:(MaplyCoordinate)newPos height:(float)newHeight heading:(float)newHeading time:(NSTimeInterval)howLong;
+
+/** 
+    Animate to the given position, heading and height over time.
+ 
+    @param newPos A coordinate in geographic (lon/lat radians) (double precision)
+ 
+    @param newHeight New height to animate to. (double)
+ 
+    @param newHeading New heading to finish on. (double)
+ 
+    @param howLong A time interval in seconds.
+ */
+- (bool)animateToPositionD:(MaplyCoordinateD)newPos height:(double)newHeight heading:(double)newHeading time:(NSTimeInterval)howLong;
+
+/** 
+    Animate to the given position, screen position, heading and height over time.
+ 
+    If it's impossible to move newPos to loc, then nothing happens.
+ 
+    @param newPos A coordinate in geographic (lon/lat radians)
+ 
+    @param loc The location on the screen where we'd like it to go.
+ 
+    @param newHeight New height to animate to.
+ 
+    @param newHeading New heading to finish on.
+ 
+    @param howLong A time interval in seconds.
+ */
+- (bool)animateToPosition:(MaplyCoordinate)newPos onScreen:(CGPoint)loc height:(float)newHeight heading:(float)newHeading time:(NSTimeInterval)howLong;
+
+/** 
+    Set the center of the screen to the given position immediately.
+    
+    @param newPos The geographic position (lon/lat in radians) to move to.
+  */
+- (void)setPosition:(MaplyCoordinate)newPos;
+
+/** 
+    Set the center of the screen and the height offset immediately.
+    
+    @param newPos The geographic position (lon/lat in radians) to move to.
+    
+    @param height Height the view point above the map.
+  */
+- (void)setPosition:(MaplyCoordinate)newPos height:(float)height;
+
+/** 
+    Return the current center position
+ */
+- (MaplyCoordinate)getPosition;
+
+/** 
+    Return the current view point's height above the map.
+ */
+- (float)getHeight;
+
+/** 
+    Return the current center position and height.
+    
+    @param pos The center of the screen in geographic (lon/lat in radians).
+    
+    @param height The current view point's height above the map.
+  */
+- (void)getPosition:(MaplyCoordinate *__nonnull)pos height:(float *__nonnull)height;
+
+
+/** 
+    Set the viewing state all at once
+ 
+    This sets the position, height, screen position and heading all at once.
+ */
+- (void)setViewState:(MaplyViewControllerAnimationState *__nonnull)viewState;
+
+/** 
+    Make a MaplyViewControllerAnimationState object from the current view state.
+ 
+    This returns the current view parameters in a single MaplyViewControllerAnimationState.
+ */
+- (nullable MaplyViewControllerAnimationState *)getViewState;
+
+/** 
+    Return the closest a viewer is allowed to get to the map surface.
+ 
+    @return FLT_MIN if there's no pitchDelegate set
+ */
+- (float)getMinZoom;
+
+/** 
+    Return the farthest away a viewer is allowed to get from the map surface
+ 
+    @return FLT_MIN if there's no pitchDelegate set
+ */
+- (float)getMaxZoom;
+
+/** 
+    Return the zoom limits for 3D map mode.
+    
+    @param minHeight The closest a viewer is allowed to get to the map surface.
+    
+    @param maxHeight The farthest away a viewer is allowed to get from the map surface.
+  */
+- (void)getZoomLimitsMin:(float *__nonnull)minHeight max:(float *__nonnull)maxHeight;
+
+/** 
+    Set the zoom limits for 3D map mode.
+    
+    @param minHeight The closest a viewer is allowed to get to the map surface.
+    
+    @param maxHeight The farthest away a viewer is allowed to get from the map surface.
+ */
+- (void)setZoomLimitsMin:(float)minHeight max:(float)maxHeight;
+
+/** 
+    Return the geographic (lon/lat radians) coordinate in radians for a given screen point.
+    
+    @return Returns the geo coordinate corresponding to a given screen point in radians.
+ */
+- (MaplyCoordinate)geoFromScreenPoint:(CGPoint)point;
+
+/** 
+    Find a height that shows the given bounding box.
+    
+    This method will search for a height that shows the given bounding box within the view.  The search is inefficient, so don't call this a lot.
+    
+    @param bbox The bounding box (in radians) we're trying to view.
+    
+    @param pos Where the view will be looking.
+  */
+- (float)findHeightToViewBounds:(MaplyBoundingBox)bbox
+                            pos:(MaplyCoordinate)pos;
+
+/** 
+    Find a height that shows the given bounding box.
+    This method will search for a height that shows the given bounding box within the view.  The search is inefficient, so don't call this a lot.
+
+    This version takes a margin to add around the outside of the area.  Positive margins increase the screen area considered, making the
+    given area larger.  Negative margins make the specified area smaller.
+ 
+    @param bbox The bounding box (in radians) we're trying to view.
+    @param pos Where the view will be looking.
+    @param marginX Horizontal boundary around the area
+    @param marginY Vertical boundary around the area
+ */
+- (float)findHeightToViewBounds:(MaplyBoundingBox)bbox
+                            pos:(MaplyCoordinate)pos
+                        marginX:(double)marginX
+                        marginY:(double)marginY;
+
+/**
+    Find a height that shows the given bounding box.
+    This method will search for a height that shows the given bounding box within the view.  The search is inefficient, so don't call this a lot.
+
+    This version takes a margin to add around the outside of the area.  Positive margins increase the screen area considered, making the
+    given area larger.  Negative margins make the specified area smaller.
+
+    This version attempts to place the given bounds within a rectangle other than the whole view frame.
+
+    @param bbox The bounding box (in radians) we're trying to view.
+    @param pos Where the view will be looking.
+    @param frame The screen area to consider.
+    @param newPos (out,optional) The center location needed to place \c pos at the center of \c frame
+    @param marginX Horizontal boundary around the area
+    @param marginY Vertical boundary around the area
+ */
+- (float)findHeightToViewBounds:(MaplyBoundingBox)bbox
+                            pos:(MaplyCoordinate)pos
+                          frame:(CGRect)frame
+                         newPos:(MaplyCoordinate *_Nullable)newPos
+                        marginX:(double)marginX
+                        marginY:(double)marginY;
+
+/**
+ 
+    Return the extents of the current view
+ 
+    @return Returns the Bounding Box (in radians) corresponding to the current view
+ */
+- (MaplyBoundingBox)getCurrentExtents;
+
+/**
+ 
+    Make a gesture recognizer's success depend on the pan gesture
+ recognizer's failure.
+ 
+    When using the map view within a scroll view, add swipe gesture
+ recognizers to the scroll view to control paging, and call this method
+ for each.  See also the inScrollView property and its comment.
+ 
+    @param other The other, subordinate gesture recognizer.
+ */
+- (void)requirePanGestureRecognizerToFailForGesture:(UIGestureRecognizer *__nullable)other;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyViewTracker.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyViewTracker.h
new file mode 100644
index 0000000..b54b45c
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyViewTracker.h
@@ -0,0 +1,68 @@
+/*
+ *  WGViewTracker.h
+ *  WhirlyGlobeComponent
+ *
+ *  Created by Steve Gifford on 7/26/12.
+ *  Copyright 2012-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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <UIKit/UIKit.h>
+#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
+
+/** 
+    The View Tracker associates a view with a geographic location.
+    
+    The Maply View Tracker will move a UIView around to keep track of a geographic location.  This is basically used for popups.  The system will move the view around at the end of the frame render.  It will hide the UIView if needed or make it reappear.  The UIView should be a child of view controller's view.
+  */
+@interface MaplyViewTracker : NSObject
+
+/** 
+    The UIView we want moved around.
+    
+    This is the UIView we'll tie to the geographic location.  If you want to center it, use offsets within the UIView.
+  */
+@property (nonatomic,strong) UIView *__nullable view;
+
+/** 
+    The geographic location where we want to place the UIView.
+    
+    This is the location (lon/lat in radians) where we want to stick the UIView.  The location on screen will be updated as the user manipulates the map or globe.
+  */
+@property (nonatomic,assign) MaplyCoordinate loc;
+
+/** 
+    An offset in screen space for the view tracker.
+    
+    This offset is added to the location after it's projected into screen space.
+ */
+@property (nonatomic, assign) CGPoint offset;
+
+/** 
+    The lowest height at which we'll see the view tracker.
+    
+    This value is in display coordinates.
+  */
+@property (nonatomic,assign) float minVis;
+
+/** 
+    the maximum height at which we'll see the view being tracked.
+    
+    This value is in display coordinates.
+  */
+@property (nonatomic,assign) float maxVis;
+
+@end
+
+typedef MaplyViewTracker WGViewTracker;
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyWMSTileSource.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyWMSTileSource.h
new file mode 100644
index 0000000..0c25ea3
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyWMSTileSource.h
@@ -0,0 +1,183 @@
+/*  MaplyWMSTileSource.h
+ *  WhirlyGlobe-MaplyComponent
+ *
+ *  Created by Steve Gifford on 7/25/13.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#import <WhirlyGlobeMaplyComponent/MaplyTileSourceNew.h>
+#import <WhirlyGlobeMaplyComponent/MaplyCoordinateSystem.h>
+
+/** A bounding box for a specific CRS in that coordinate
+    system.  This is part of the Web Map Server parser.
+  */
+@interface MaplyWMSLayerBoundingBox : NSObject
+
+/// Coordinate Reference System
+@property (nonatomic,strong,nullable) NSString *crs;
+
+/// Left side of the bounding box
+@property (nonatomic) double minx;
+/// Bottom of the bounding box
+@property (nonatomic) double miny;
+/// Right side of the bounding box
+@property (nonatomic) double maxx;
+/// Top of the bounding box
+@property (nonatomic) double maxy;
+
+/// Generate the coordinate system, if we can
+- (nullable MaplyCoordinateSystem *)buildCoordinateSystem;
+
+@end
+
+/** Style of a WMS layer as returned by GetCapabilities.
+    This is part of the Web Map Service parser.
+  */
+@interface MaplyWMSStyle : NSObject
+
+/// The name as returned by the service
+@property (nonatomic,strong,nullable) NSString *name;
+/// The title as returned by the service
+@property (nonatomic,strong,nullable) NSString *title;
+
+@end
+
+/** Description of a WMS layer as returned by a GetCapabilities call.
+    This is part of the Web Map Service parser.
+  */
+@interface MaplyWMSLayer : NSObject
+
+/// The name as returned by the service
+@property (nonatomic,strong,nullable) NSString *name;
+/// The title as returned by the service
+@property (nonatomic,strong,nullable) NSString *title;
+/// The abstract as returned by the service
+@property (nonatomic,strong,nullable) NSString *abstract;
+
+/// Coordinate reference systems supported by the layer
+@property (nonatomic,strong,nullable) NSArray *coordRefSystems;
+
+/// Styles we can choose
+@property (nonatomic,strong,nullable) NSArray *styles;
+
+/// Bounding boxes for zero or more of the CRS'
+@property (nonatomic,strong,nullable) NSArray *boundingBoxes;
+
+/// Lower left corner in longitude/latitude
+@property (nonatomic) MaplyCoordinate ll;
+/// Upper right corner in longitude/latitude
+@property (nonatomic) MaplyCoordinate ur;
+
+/// Try to build a coordinate system we understand
+- (nullable MaplyCoordinateSystem *)buildCoordSystem;
+
+/// Find the style with the given name
+- (nullable MaplyWMSStyle *)findStyle:(NSString *__nonnull)styleName;
+
+@end
+
+@class DDXMLDocument;
+
+/** Encapsulates the capabilities coming back from a WMS server.
+    We can query this to see what layers and coordinate systems are available.
+    Part of the Web Map Service parser.
+  */
+@interface MaplyWMSCapabilities : NSObject
+
+/// We can fetch the capabilities from this URL
++ (nonnull NSString *)CapabilitiesURLFor:(NSString *__nonnull)baseURL;
+
+/// The name as returned by the service
+@property (nonatomic,strong,nullable) NSString *name;
+/// The title as returned by the service
+@property (nonatomic,strong,nullable) NSString *title;
+
+/// Available formats (strings)
+@property (nonatomic,strong,nullable) NSArray *formats;
+
+/// Layers we can fetch from
+@property (nonatomic,strong,nullable) NSArray *layers;
+
+/// This constructor will initialize with an XML document that
+///  we've fetched from the server, presumably.
+- (nullable instancetype)initWithXML:(DDXMLDocument *__nonnull)xmlDoc;
+
+/// Look for a layer with the given name.
+- (nullable MaplyWMSLayer *)findLayer:(NSString *__nonnull)name;
+
+@end
+
+/** This is a MaplyTileSource that works with a remote
+    Web Map Service implementation.  WMS is not the most
+    efficient way to access remote image data, but there
+    are still a few places that use it.
+  */
+@interface MaplyWMSTileSource : NSObject<MaplyTileInfoNew>
+
+/// Base URL for the Map Service
+@property (nonatomic,strong,nullable) NSString *baseURL;
+
+/// Capabilities describing the service
+@property (nonatomic,strong,nullable) MaplyWMSCapabilities *capabilities;
+
+/// Image type to request
+@property (nonatomic,strong,nullable) NSString *imageType;
+
+/// Layer we're grabbing
+@property (nonatomic,strong,nonnull) MaplyWMSLayer *layer;
+
+/// Optional style we're using
+@property (nonatomic,strong,nonnull) MaplyWMSStyle *style;
+
+/// Minimum zoom level we'll expect
+@property (nonatomic,readonly) int minZoom;
+/// Maximum zoom level we'll expect
+@property (nonatomic,readonly) int maxZoom;
+
+/// Tile size provided to caller
+@property (nonatomic,readonly) int tileSize;
+
+/// If set we'll ask for a transparent background from the server
+@property (nonatomic) bool transparent;
+
+/// Coordinate system (used to build URLs)
+@property (nonatomic,readonly,nonnull) MaplyCoordinateSystem *coordSys;
+
+/// If set, we'll cache the images locally (a good idea with WMS)
+@property (nonatomic,strong,nullable) NSString *cacheDir;
+
+/** Initialize with the parameters the WMS server is going to want.
+    
+    @param baseURL The main URL we'll use to construct queries.
+    
+    @param cap The capabilities as parsed from the service.
+    
+    @param layer The layer we'll access.  There can be multiple and it's
+            up to you to pick one.
+    
+    @param style The style variant of the layer we want.  Again there can
+            be multiple and it's up to you to pick.
+    
+    @param coordSys The coordinate system we're expecting to work in.
+    
+    @param minZoom The min zoom level we want.  Note that WMS doesn't handle
+            this directly.  Our tile source just controls what areas it
+            asks for based on the overall extents and the zoom levels.
+    
+    @param maxZoom The max zoom level we'll query.
+  */
+- (nullable instancetype)initWithBaseURL:(NSString *__nonnull)baseURL capabilities:(MaplyWMSCapabilities *__nullable)cap layer:(MaplyWMSLayer *__nonnull)layer style:(MaplyWMSStyle *__nonnull)style coordSys:(MaplyCoordinateSystem *__nonnull)coordSys minZoom:(int)minZoom maxZoom:(int)maxZoom tileSize:(int)tileSize;
+
+@end
+
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyZoomGestureDelegate.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyZoomGestureDelegate.h
new file mode 100644
index 0000000..442a976
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyZoomGestureDelegate.h
@@ -0,0 +1,31 @@
+/*  MaplyZoomGestureDelegate.h
+ *
+ *  Created by Jesse Crocker on 2/4/14.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#import <UIKit/UIKit.h>
+
+@interface MaplyZoomGestureDelegate : NSObject <UIGestureRecognizerDelegate>
+
+/// Minimum allowable zoom level
+@property (nonatomic,assign) float minZoom;
+/// Maximum allowable zoom level
+
+@property (nonatomic,assign) float maxZoom;
+
+//The gesture recognizer
+@property (nonatomic,strong) UIGestureRecognizer *gestureRecognizer;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MapnikStyle.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MapnikStyle.h
new file mode 100644
index 0000000..3f489ef
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MapnikStyle.h
@@ -0,0 +1,33 @@
+/*
+ *  MapnikStyle.h
+ *  WhirlyGlobe-MaplyComponent
+ *
+ *  Created by Jesse Crocker, Trailbehind inc. on 3/31/14.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <Foundation/Foundation.h>
+#import <WhirlyGlobeMaplyComponent/MapnikStyleRule.h>
+
+@interface MapnikStyle : NSObject
+
+@property (nonatomic, readonly) NSMutableArray *rules;
+@property (nonatomic, strong) NSString *name;
+@property (nonatomic, assign) BOOL filterModeFirst;
+@property (nonatomic, assign) float opacity;
+
+- (void)addRule:(MapnikStyleRule*)rule;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MapnikStyleRule.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MapnikStyleRule.h
new file mode 100644
index 0000000..f462857
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MapnikStyleRule.h
@@ -0,0 +1,36 @@
+/*
+ *  MapnikStyleRule.h
+ *  WhirlyGlobe-MaplyComponent
+ *
+ *  Created by Jesse Crocker, Trailbehind inc. on 3/31/14.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <Foundation/Foundation.h>
+
+@interface MapnikStyleRule : NSObject
+
+@property (nonatomic, strong) NSPredicate *filterPredicate;
+
+@property (nonatomic, assign) NSUInteger minScaleDenominator;
+@property (nonatomic, assign) NSUInteger maxScaleDenomitator;
+@property (nonatomic, assign) NSUInteger minZoom;
+@property (nonatomic, assign) NSUInteger maxZoom;
+
+@property (nonatomic, readonly) NSMutableArray *symbolizers;
+
+- (void)setFilter:(NSString*)filterExpression;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MapnikStyleSet.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MapnikStyleSet.h
new file mode 100644
index 0000000..0d615f5
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MapnikStyleSet.h
@@ -0,0 +1,47 @@
+/*
+ *  MapnikXmlStyle.h
+ *  WhirlyGlobe-MaplyComponent
+ *
+ *  Created by Jesse Crocker, Trailbehind inc. on 3/31/14.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+
+#import <Foundation/Foundation.h>
+#import <WhirlyGlobeMaplyComponent/MapboxVectorTiles.h>
+
+@class MaplyVectorStyleSettings;
+
+@interface MapnikStyleSet : NSObject <NSXMLParserDelegate, MaplyVectorStyleDelegate>
+
+@property (nonatomic, strong, nullable) MaplyVectorStyleSettings *tileStyleSettings;
+@property (nonatomic, strong, nullable) NSMutableDictionary *styleDictionary;
+@property (nonatomic, weak, nullable) NSObject<MaplyRenderControllerProtocol> *viewC;
+@property (nonatomic, readonly) BOOL parsing;
+@property (nonatomic, strong, nullable) UIColor *backgroundColor;
+@property (nonatomic, assign) NSInteger tileMaxZoom;
+@property (nonatomic, assign) NSInteger drawPriorityOffset;
+@property (nonatomic, assign) CGFloat alpha;
+
+- (nonnull instancetype)initForViewC:(NSObject<MaplyRenderControllerProtocol> *__nonnull)viewC;
+
+- (void)loadXmlFile:(NSString *__nonnull)filePath;
+- (void)loadXmlData:(NSData *__nonnull)docData;
+- (void)loadJsonData:(NSData *__nonnull)jsonData;
+- (void)loadJsonFile:(NSString*__nonnull)filePath;
+- (void)saveAsJSON:(NSString *__nonnull)filePath;
+- (void)generateStyles;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/NSData+Zlib.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/NSData+Zlib.h
new file mode 100644
index 0000000..4a28f18
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/NSData+Zlib.h
@@ -0,0 +1,37 @@
+/*
+ *  NSData+Zlib.h
+ *  WhirlyGlobe-MaplyComponent
+ *
+ *  Created by Steve Gifford on 9/7/13.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <Foundation/Foundation.h>
+
+/** The NSData zlib category adds compress and uncompress methods to
+    NSData.
+  */
+@interface NSData(zlib)
+
+/// Return a compressed version of the data.
+- (NSData *) compressData;
+
+/// Return an uncompressed verison of the given data
+- (NSData *) uncompressGZip;
+
+/// Returns true if the data is zlib compressed
+- (BOOL)isCompressed;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/NSDictionary+StyleRules.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/NSDictionary+StyleRules.h
new file mode 100644
index 0000000..9c4ab96
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/NSDictionary+StyleRules.h
@@ -0,0 +1,33 @@
+//
+//  NSDictionary+StyleRules.h
+//  WhirlyGlobe-MaplyComponent
+//
+//  Created by Jesse Crocker on 4/9/14.
+//
+//
+
+#import <Foundation/Foundation.h>
+
+@interface NSMutableDictionary (StyleRules)
+
+- (NSMutableArray*)styles;
+- (NSMutableArray*)rules;
+- (NSMutableArray*)symbolizers;
+- (NSMutableArray*)layers;
+- (NSString*)filter;
+- (void)setFilter:(NSString*)filter;
+- (NSString*)name;
+
+- (NSNumber*)minScaleDenom;
+- (void)setMinScaleDenom:(NSNumber*)num;
+- (NSNumber*)maxScaleDenom;
+- (void)setMaxScaleDenom:(NSNumber*)num;
+- (NSMutableDictionary*)parameters;
+
+@end
+
+// A function we can call to force the linker to bring in categories
+#ifdef __cplusplus
+extern "C"
+#endif
+void NSDictionaryStyleDummyFunc(void);
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/SLDExpressions.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/SLDExpressions.h
new file mode 100644
index 0000000..43a042d
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/SLDExpressions.h
@@ -0,0 +1,55 @@
+//
+//  SLDExpressions.h
+//  SLDTest
+//
+//  Created by Ranen Ghosh on 2016-08-12.
+//  Copyright 2016-2019 mousebird consulting.
+//
+
+#import <Foundation/Foundation.h>
+@class DDXMLNode;
+@class DDXMLElement;
+
+/** @brief Base class for elements derived from the ogc:expression abstract element.
+ @see http://schemas.opengis.net/filter/1.1.0/expr.xsd for SLD v1.1.0
+ @see http://schemas.opengis.net/filter/1.0.0/expr.xsd for SLD v1.0.0
+ */
+@interface SLDExpression : NSObject
+@property (nonatomic, strong) NSExpression * _Nonnull expression;
++ (BOOL)matchesElementNamed:(NSString * _Nonnull)elementName;
++ (SLDExpression * _Nullable)expressionForNode:(DDXMLNode * _Nonnull )node;
+@end
+
+
+/** @brief Class corresponding to the ogc:PropertyName element
+ @see http://schemas.opengis.net/filter/1.1.0/expr.xsd for SLD v1.1.0
+ @see http://schemas.opengis.net/filter/1.0.0/expr.xsd for SLD v1.0.0
+ */
+@interface SLDPropertyNameExpression : SLDExpression
+@property (nonatomic, strong) NSString * _Nonnull propertyName;
+- (_Nullable id)initWithElement:(DDXMLElement * _Nonnull)element;
+@end
+
+/** @brief Class corresponding to the ogc:Literal element
+ @see http://schemas.opengis.net/filter/1.1.0/expr.xsd for SLD v1.1.0
+ @see http://schemas.opengis.net/filter/1.0.0/expr.xsd for SLD v1.0.0
+ */
+@interface SLDLiteralExpression : SLDExpression
+@property (nonatomic, strong) id _Nonnull literal;
+- (_Nullable id)initWithElement:(DDXMLElement * _Nonnull)element;
+@end
+
+/** @brief Class corresponding to the ogc:BinaryOperatorType elements
+ @see http://schemas.opengis.net/filter/1.1.0/expr.xsd for SLD v1.1.0
+ @see http://schemas.opengis.net/filter/1.0.0/expr.xsd for SLD v1.0.0
+ */
+@interface SLDBinaryOperatorExpression : SLDExpression
+
+@property (nonatomic, strong) NSString * _Nonnull elementName;
+
+@property (nonatomic, strong) SLDExpression * _Nonnull leftExpression;
+@property (nonatomic, strong) SLDExpression * _Nonnull rightExpression;
+
+- (_Nullable id)initWithElement:(DDXMLElement * _Nonnull)element;
+@end
+
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/SLDOperators.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/SLDOperators.h
new file mode 100644
index 0000000..2457979
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/SLDOperators.h
@@ -0,0 +1,101 @@
+//
+//  SLDOperators.h
+//  SLDTest
+//
+//  Created by Ranen Ghosh on 2016-08-12.
+//  Copyright 2016-2019 mousebird consulting.
+//
+
+#import <Foundation/Foundation.h>
+#import <WhirlyGlobeMaplyComponent/SLDExpressions.h>
+
+/** @brief Base class for elements of ogc:comparisonOps or ogc:logicOps.
+ 
+    Elements of ogc:spatialOps are not supported.
+ @see http://schemas.opengis.net/filter/1.1.0/filter.xsd for SLD v1.1.0
+ @see http://schemas.opengis.net/filter/1.0.0/filter.xsd for SLD v1.0.0
+ */
+@interface SLDOperator : NSObject
+@property (nonatomic, strong) NSPredicate * _Nonnull predicate;
++ (BOOL)matchesElementNamed:(NSString * _Nonnull)elementName;
++ (SLDOperator * _Nullable)operatorForNode:(DDXMLNode * _Nonnull )node;
+@end
+
+
+/** @brief Class corresponding to the ogc:BinaryComparisonOpType elements
+ @see http://schemas.opengis.net/filter/1.1.0/expr.xsd for SLD v1.1.0
+ @see http://schemas.opengis.net/filter/1.0.0/expr.xsd for SLD v1.0.0
+ */
+@interface SLDBinaryComparisonOperator : SLDOperator
+
+@property (nonatomic, assign) BOOL matchCase;
+@property (nonatomic, strong) NSString * _Nonnull elementName;
+
+@property (nonatomic, strong) SLDExpression * _Nonnull leftExpression;
+@property (nonatomic, strong) SLDExpression * _Nonnull rightExpression;
+
+
+- (_Nullable id)initWithElement:(DDXMLElement * _Nonnull)element;
+
+@end
+
+
+@interface SLDIsNullOperator : SLDOperator
+
+@property (nonatomic, strong) SLDExpression * _Nonnull subExpression;
+
+- (_Nullable id)initWithElement:(DDXMLElement * _Nonnull)element;
+
+@end
+
+
+@interface SLDIsLikeOperator : SLDOperator
+
+@property (nonatomic, strong, nullable) NSString *wildCardStr;
+@property (nonatomic, strong, nullable) NSString *singleCharStr;
+@property (nonatomic, strong, nullable) NSString *escapeCharStr;
+@property (nonatomic, assign) BOOL matchCase;
+@property (nonatomic, strong) SLDPropertyNameExpression * _Nonnull propertyExpression;
+@property (nonatomic, strong) SLDLiteralExpression * _Nonnull literalExpression;
+
+- (_Nullable id)initWithElement:(DDXMLElement * _Nonnull)element;
+
+@end
+
+@interface SLDIsBetweenOperator : SLDOperator
+
+@property (nonatomic, strong) SLDExpression * _Nonnull subExpression;
+@property (nonatomic, strong) SLDExpression * _Nonnull lowerBoundaryExpression;
+@property (nonatomic, strong) SLDExpression * _Nonnull upperBoundaryExpression;
+
+- (_Nullable id)initWithElement:(DDXMLElement * _Nonnull)element;
+
+@end
+
+
+
+/** @brief Class corresponding to the ogc:Not element
+ @see http://schemas.opengis.net/filter/1.1.0/expr.xsd for SLD v1.1.0
+ @see http://schemas.opengis.net/filter/1.0.0/expr.xsd for SLD v1.0.0
+ */
+@interface SLDNotOperator : SLDOperator
+
+@property (nonatomic, strong) SLDOperator * _Nonnull subOperator;
+
+- (_Nullable id)initWithElement:(DDXMLElement * _Nonnull)element;
+
+@end
+
+/** @brief Class corresponding to the ogc:BinaryLogicOpType elements
+ @see http://schemas.opengis.net/filter/1.1.0/expr.xsd for SLD v1.1.0
+ @see http://schemas.opengis.net/filter/1.0.0/expr.xsd for SLD v1.0.0
+ */
+@interface SLDLogicalOperator : SLDOperator
+
+@property (nonatomic, strong) NSString * _Nonnull elementName;
+@property (nonatomic, strong) NSArray<SLDOperator *> * _Nonnull subOperators;
+
+- (_Nullable id)initWithElement:(DDXMLElement * _Nonnull)element;
+
+@end
+
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/SLDStyleSet.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/SLDStyleSet.h
new file mode 100644
index 0000000..2000b20
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/SLDStyleSet.h
@@ -0,0 +1,119 @@
+//
+//  SLDStyleSet.h
+//  SLDTest
+//
+//  Created by Ranen Ghosh on 2016-08-12.
+//  Copyright 2016-2019 mousebird consulting.
+//
+
+#import <Foundation/Foundation.h>
+#import <WhirlyGlobeMaplyComponent/MapboxVectorTiles.h>
+
+/** @brief Class corresponding to the sld:NamedLayer element
+ @see http://schemas.opengis.net/sld/1.1.0/StyledLayerDescriptor.xsd for SLD v1.1.0
+ @see http://schemas.opengis.net/sld/1.0.0/StyledLayerDescriptor.xsd for SLD v1.0.0
+ */
+@interface SLDNamedLayer : NSObject
+
+@property (nonatomic, strong) NSString * _Nullable name;
+@property (nonatomic, strong) NSArray * _Nullable userStyles;
+
+@end
+
+/** @brief Class corresponding to the sld:UserStyle element
+ @see http://schemas.opengis.net/sld/1.1.0/StyledLayerDescriptor.xsd for SLD v1.1.0
+ @see http://schemas.opengis.net/sld/1.0.0/StyledLayerDescriptor.xsd for SLD v1.0.0
+ */
+@interface SLDUserStyle : NSObject
+
+@property (nonatomic, strong) NSString * _Nullable name;
+@property (nonatomic, strong) NSArray * _Nullable featureTypeStyles;
+
+@end
+
+/** @brief Class corresponding to the se:FeatureTypeStyle element
+ @see http://schemas.opengis.net/se/1.1.0/FeatureStyle.xsd for SLD v1.1.0
+ @see http://schemas.opengis.net/sld/1.0.0/StyledLayerDescriptor.xsd for SLD v1.0.0
+ */
+@interface SLDFeatureTypeStyle : NSObject
+
+@property (nonatomic, strong) NSArray * _Nullable rules;
+
+@end
+
+/** @brief Class corresponding to the se:Rule element
+ @see http://schemas.opengis.net/se/1.1.0/FeatureStyle.xsd for SLD v1.1.0
+ @see http://schemas.opengis.net/sld/1.0.0/StyledLayerDescriptor.xsd for SLD v1.0.0
+ */
+@interface SLDRule : NSObject
+
+@property (nonatomic, strong) NSArray * _Nullable filters;
+@property (nonatomic, strong) NSArray * _Nullable elseFilters;
+
+@property (nonatomic, strong) NSNumber * _Nullable minScaleDenominator;
+@property (nonatomic, strong) NSNumber * _Nullable maxScaleDenominator;
+@property (nonatomic, strong) NSNumber * _Nullable relativeDrawPriority;
+
+@property (nonatomic, strong) NSMutableArray * _Nullable symbolizers;
+
+@end
+
+
+
+@class SLDOperator;
+@class SLDExpression;
+
+/** @brief Class corresponding to the ogc:Filter element
+ @see http://schemas.opengis.net/filter/1.1.0/filter.xsd for SLD v1.1.0
+ @see http://schemas.opengis.net/filter/1.0.0/filter.xsd for SLD v1.0.0
+ */
+@interface SLDFilter : NSObject
+
+@property (nonatomic, strong) SLDOperator * _Nonnull sldOperator;
+
+@end
+
+/** @brief Class corresponding to the sld:StyledLayerDescriptor element
+ 
+    The sld:StyledLayerDescriptor element is the root element of the Styled Layer Descriptor document.
+ 
+    Implements the MaplyVectorStyleDelegate protocol for matching and applying styles to vector objects.
+ @see http://schemas.opengis.net/sld/1.1.0/StyledLayerDescriptor.xsd for SLD v1.1.0
+ @see http://schemas.opengis.net/sld/1.0.0/StyledLayerDescriptor.xsd for SLD v1.0.0
+ @see MaplyVectorStyleDelegate
+ */
+@interface SLDStyleSet : NSObject <MaplyVectorStyleDelegate>
+
+@property (nonatomic, assign) BOOL useLayerNames;
+@property (nonatomic, weak, nullable) NSObject<MaplyRenderControllerProtocol> *viewC;
+@property (nonatomic, strong, nullable) MaplyVectorStyleSettings *tileStyleSettings;
+
+/** 
+    Constructs a SLDStyleSet object.
+ 
+    After constructing the SLDStyleSet object, call loadSldURL: or loadSldData:baseURL: to parse the desired SLD document tree and create the corresponding symbolizers.
+ 
+    @param viewC The map or globe view controller.
+ 
+    @param useLayerNames Whether to use names of NamedLayer elements as a criteria in matching styles.
+ 
+    @param relativeDrawPriority The z-order relative to other vector features. This will be incremented internally for each style rule, so if you have multiple SLDStyleSets, leave some space between the relativeDrawPriority of each.
+ */
+- (id _Nullable)initWithViewC:(NSObject<MaplyRenderControllerProtocol> * _Nonnull)viewC useLayerNames:(BOOL)useLayerNames relativeDrawPriority:(int)relativeDrawPriority;
+
+- (void)loadSldURL:(NSURL *__nullable)url;
+- (void)loadSldData:(NSData *__nonnull)sldData baseURL:(NSURL *__nonnull)baseURL;
+
+@end
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/SLDSymbolizers.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/SLDSymbolizers.h
new file mode 100644
index 0000000..4eb7151
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/SLDSymbolizers.h
@@ -0,0 +1,82 @@
+//
+//  SLDSymbolizers.h
+//  SLDTest
+//
+//  Created by Ranen Ghosh on 2016-08-12.
+//  Copyright 2016-2019 mousebird consulting.
+//
+
+#import <Foundation/Foundation.h>
+@class DDXMLNode;
+@class DDXMLElement;
+#import <WhirlyGlobeMaplyComponent/MaplyVectorTileStyle.h>
+
+/** @brief Base class for Symbolizer elements
+ @see http://schemas.opengis.net/se/1.1.0/Symbolizer.xsd for SLD v1.1.0
+ @see http://schemas.opengis.net/sld/1.0.0/StyledLayerDescriptor.xsd for SLD v1.0.0
+ */
+@interface SLDSymbolizer : NSObject
+
+/** 
+    Returns whether this class can parse the symbolizer corresponding to the provided element name.
+ 
+    Each subclass matches different symbolizer elements.
+ */
++ (BOOL)matchesSymbolizerNamed:(NSString * _Nonnull)symbolizerName;
+
+/** 
+    Produces MaplyVectorTileStyle objects for an SLD Symbolizer element
+ 
+    Parses the XML subtree and returns an array of corresponding MaplyVectorTileStyle objects.
+ 
+    @param element The XML element corresponding to a symbolizer
+ 
+    @param tileStyleSettings The base MaplyVectorStyleSettings settings to apply.
+ 
+    @param viewC The map or globe view controller.
+ 
+    @param minScaleDenom If non-null, the minimum map scale at which to apply any constructed symbolizer.
+ 
+    @param maxScaleDenom If non-null, the maximum map scale at which to apply any constructed symbolizer.
+ 
+    @param relativeDrawPriority The z-order relative to other vector features.
+ 
+    @param baseURL The base URL from which external resources (e.g. images) will be located.
+ 
+    @return An array of MaplyVectorTileStyle objects corresponding to the particular XML element.
+ @see MaplyVectorTileStyle
+ @see MaplyVectorStyleSettings
+ */
++ (NSArray<MaplyVectorTileStyle *> * _Nullable) maplyVectorTileStyleWithElement:(DDXMLElement * _Nonnull)element tileStyleSettings:(MaplyVectorStyleSettings * _Nonnull)tileStyleSettings viewC:(NSObject<MaplyRenderControllerProtocol> * _Nonnull)viewC minScaleDenom:(NSNumber * _Nonnull)minScaleDenom maxScaleDenom:(NSNumber * _Nonnull)maxScaleDenom relativeDrawPriority:(int)relativeDrawPriority crossSymbolizerParams:(NSMutableDictionary * _Nonnull)crossSymbolizerParams baseURL:(NSURL * _Nonnull)baseURL;
+@end
+
+/** @brief Class corresponding to the LineSymbolizer element
+ @see http://schemas.opengis.net/se/1.1.0/Symbolizer.xsd for SLD v1.1.0
+ @see http://schemas.opengis.net/sld/1.0.0/StyledLayerDescriptor.xsd for SLD v1.0.0
+ */
+@interface SLDLineSymbolizer : SLDSymbolizer
+@end
+
+/** @brief Class corresponding to the PolygonSymbolizer element
+ @see http://schemas.opengis.net/se/1.1.0/Symbolizer.xsd for SLD v1.1.0
+ @see http://schemas.opengis.net/sld/1.0.0/StyledLayerDescriptor.xsd for SLD v1.0.0
+ */
+@interface SLDPolygonSymbolizer : SLDSymbolizer
+@end
+
+/** @brief Class corresponding to the PointSymbolizer element
+ @see http://schemas.opengis.net/se/1.1.0/Symbolizer.xsd for SLD v1.1.0
+ @see http://schemas.opengis.net/sld/1.0.0/StyledLayerDescriptor.xsd for SLD v1.0.0
+ */
+@interface SLDPointSymbolizer : SLDSymbolizer
+@end
+
+/** @brief Class corresponding to the TextSymbolizer element
+ @see http://schemas.opengis.net/se/1.1.0/Symbolizer.xsd for SLD v1.1.0
+ @see http://schemas.opengis.net/sld/1.0.0/StyledLayerDescriptor.xsd for SLD v1.0.0
+ */
+@interface SLDTextSymbolizer : SLDSymbolizer
+@end
+
+
+
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/SLDWellKnownMarkers.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/SLDWellKnownMarkers.h
new file mode 100644
index 0000000..cdb4cc8
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/SLDWellKnownMarkers.h
@@ -0,0 +1,23 @@
+//
+//  SLDWellKnownMarkers.h
+//  SLDTest
+//
+//  Created by Ranen Ghosh on 2016-08-23.
+//  Copyright 2016-2019 mousebird consulting.
+//
+
+#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
+
+/** 
+    Class for generating images corresponding to WellKnownName elements.
+ 
+    Each static method uses low-level Core Graphics calls to generate an appropriate UIImage object.
+ @see http://schemas.opengis.net/se/1.1.0/Symbolizer.xsd for SLD v1.1.0
+ @see http://schemas.opengis.net/sld/1.0.0/StyledLayerDescriptor.xsd for SLD v1.0.0
+*/
+@interface SLDWellKnownMarkers : NSObject
+
++ (UIImage *)imageWithName:(NSString *)wellKnownName strokeColor:(UIColor *)strokeColor fillColor:(UIColor *)fillColor size:(int)size;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/WGCoordinate.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/WGCoordinate.h
new file mode 100644
index 0000000..39b882f
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/WGCoordinate.h
@@ -0,0 +1,34 @@
+/*
+ *  WGCoordinate.h
+ *  WhirlyGlobe-MaplyComponent
+ *
+ *  Created by Steve Gifford on 9/17/12.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
+
+/// WhirlyGlobe just takes geo coordinates.
+/// This contains lon and lat values in the x and y fields.
+typedef MaplyCoordinate WGCoordinate;
+
+/// Construct a WGCoordinate with longitude and latitude values in degrees
+#if __cplusplus
+extern "C" {
+#endif
+    WGCoordinate WGCoordinateMakeWithDegrees(float degLon,float degLat);
+#if __cplusplus
+}
+#endif
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/WhirlyGlobeComponent.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/WhirlyGlobeComponent.h
new file mode 100644
index 0000000..5142734
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/WhirlyGlobeComponent.h
@@ -0,0 +1,23 @@
+/*
+ *  WhirlyGlobeComponent.h
+ *  WhirlyGlobeComponent
+ *
+ *  Created by Steve Gifford on 7/21/12.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <WhirlyGlobeMaplyComponent/MaplyComponent.h>
+#import <WhirlyGlobeMaplyComponent/MaplyGlobeRenderController.h>
+#import <WhirlyGlobeMaplyComponent/WhirlyGlobeViewController.h>
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/WhirlyGlobeMaplyComponent.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/WhirlyGlobeMaplyComponent.h
new file mode 100644
index 0000000..e15c8e8
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/WhirlyGlobeMaplyComponent.h
@@ -0,0 +1,121 @@
+//
+//  WhirlyGlobeMaplyComponent.h
+//  WhirlyGlobeMaplyComponent
+//
+//  Created by Steve Gifford on 6/29/16.
+//  Copyright © 2016-2019 mousebird consulting.
+//
+
+#import <UIKit/UIKit.h>
+
+//! Project version number for WhirlyGlobeMaplyComponent.
+FOUNDATION_EXPORT double WhirlyGlobeMaplyComponentVersionNumber;
+
+//! Project version string for WhirlyGlobeMaplyComponent.
+FOUNDATION_EXPORT const unsigned char WhirlyGlobeMaplyComponentVersionString[];
+
+// In this header, you should import all the public headers of your framework using statements like #import <WhirlyGlobeMaplyComponent/PublicHeader.h>
+
+#import <WhirlyGlobeMaplyComponent/GeographicLib_ObjC.h>
+#import <WhirlyGlobeMaplyComponent/GeoJSONSource.h>
+#import <WhirlyGlobeMaplyComponent/GlobeDoubleTapDelegate.h>
+#import <WhirlyGlobeMaplyComponent/GlobeDoubleTapDragDelegate.h>
+#import <WhirlyGlobeMaplyComponent/GlobePanDelegate.h>
+#import <WhirlyGlobeMaplyComponent/GlobePinchDelegate.h>
+#import <WhirlyGlobeMaplyComponent/GlobeRotateDelegate.h>
+#import <WhirlyGlobeMaplyComponent/GlobeTapDelegate.h>
+#import <WhirlyGlobeMaplyComponent/GlobeTiltDelegate.h>
+#import <WhirlyGlobeMaplyComponent/GlobeTwoFingerTapDelegate.h>
+#import <WhirlyGlobeMaplyComponent/MapboxVectorInterpreter.h>
+#import <WhirlyGlobeMaplyComponent/MapboxVectorStyleSet.h>
+#import <WhirlyGlobeMaplyComponent/MapboxVectorTiles.h>
+#import <WhirlyGlobeMaplyComponent/Maply3DTouchPreviewDatasource.h>
+#import <WhirlyGlobeMaplyComponent/Maply3dTouchPreviewDelegate.h>
+#import <WhirlyGlobeMaplyComponent/MaplyActiveObject.h>
+#import <WhirlyGlobeMaplyComponent/MaplyAnnotation.h>
+#import <WhirlyGlobeMaplyComponent/MaplyAtmosphere.h>
+#import <WhirlyGlobeMaplyComponent/MaplyBaseViewController.h>
+#import <WhirlyGlobeMaplyComponent/MaplyBillboard.h>
+#import <WhirlyGlobeMaplyComponent/MaplyBridge.h>
+#import <WhirlyGlobeMaplyComponent/MaplyBridge.h>
+#import <WhirlyGlobeMaplyComponent/MaplyCluster.h>
+#import <WhirlyGlobeMaplyComponent/MaplyColorRampGenerator.h>
+#import <WhirlyGlobeMaplyComponent/MaplyComponent.h>
+#import <WhirlyGlobeMaplyComponent/MaplyComponent.h>
+#import <WhirlyGlobeMaplyComponent/MaplyComponentObject.h>
+#import <WhirlyGlobeMaplyComponent/MaplyControllerLayer.h>
+#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
+#import <WhirlyGlobeMaplyComponent/MaplyCoordinateSystem.h>
+#import <WhirlyGlobeMaplyComponent/MaplyDoubleTapDelegate.h>
+#import <WhirlyGlobeMaplyComponent/MaplyDoubleTapDragDelegate.h>
+#import <WhirlyGlobeMaplyComponent/MaplyGeomBuilder.h>
+#import <WhirlyGlobeMaplyComponent/MaplyGeomModel.h>
+#import <WhirlyGlobeMaplyComponent/MaplyGlobeRenderController.h>
+#import <WhirlyGlobeMaplyComponent/MaplyIconManager.h>
+#import <WhirlyGlobeMaplyComponent/MaplyImageTile.h>
+#import <WhirlyGlobeMaplyComponent/MaplyLabel.h>
+#import <WhirlyGlobeMaplyComponent/MaplyLight.h>
+#import <WhirlyGlobeMaplyComponent/MaplyLocationTracker.h>
+#import <WhirlyGlobeMaplyComponent/MaplyMarker.h>
+#import <WhirlyGlobeMaplyComponent/MaplyMatrix.h>
+#import <WhirlyGlobeMaplyComponent/MaplyMBTileFetcher.h>
+#import <WhirlyGlobeMaplyComponent/MaplyMoon.h>
+#import <WhirlyGlobeMaplyComponent/MaplyPanDelegate.h>
+#import <WhirlyGlobeMaplyComponent/MaplyParticleSystem.h>
+#import <WhirlyGlobeMaplyComponent/MaplyPinchDelegate.h>
+#import <WhirlyGlobeMaplyComponent/MaplyPoints.h>
+#import <WhirlyGlobeMaplyComponent/MaplyQuadImageFrameLoader.h>
+#import <WhirlyGlobeMaplyComponent/MaplyQuadImageLoader.h>
+#import <WhirlyGlobeMaplyComponent/MaplyQuadLoader.h>
+#import <WhirlyGlobeMaplyComponent/MaplyQuadPagingLoader.h>
+#import <WhirlyGlobeMaplyComponent/MaplyQuadSampler.h>
+#import <WhirlyGlobeMaplyComponent/MaplyRemoteTileFetcher.h>
+#import <WhirlyGlobeMaplyComponent/MaplyRenderController.h>
+#import <WhirlyGlobeMaplyComponent/MaplyRenderTarget.h>
+#import <WhirlyGlobeMaplyComponent/MaplyRotateDelegate.h>
+#import <WhirlyGlobeMaplyComponent/MaplyScreenLabel.h>
+#import <WhirlyGlobeMaplyComponent/MaplyScreenMarker.h>
+#import <WhirlyGlobeMaplyComponent/MaplyScreenObject.h>
+#import <WhirlyGlobeMaplyComponent/MaplyShader.h>
+#import <WhirlyGlobeMaplyComponent/MaplyShape.h>
+#import <WhirlyGlobeMaplyComponent/MaplySharedAttributes.h>
+#import <WhirlyGlobeMaplyComponent/MaplySimpleTileFetcher.h>
+#import <WhirlyGlobeMaplyComponent/MaplyStarsModel.h>
+#import <WhirlyGlobeMaplyComponent/MaplySticker.h>
+#import <WhirlyGlobeMaplyComponent/MaplySun.h>
+#import <WhirlyGlobeMaplyComponent/MaplyTapDelegate.h>
+#import <WhirlyGlobeMaplyComponent/MaplyTapMessage.h>
+#import <WhirlyGlobeMaplyComponent/MaplyTexture.h>
+#import <WhirlyGlobeMaplyComponent/MaplyTextureBuilder.h>
+#import <WhirlyGlobeMaplyComponent/MaplyTileSourceNew.h>
+#import <WhirlyGlobeMaplyComponent/MaplyTouchCancelAnimationDelegate.h>
+#import <WhirlyGlobeMaplyComponent/MaplyTwoFingerTapDelegate.h>
+#import <WhirlyGlobeMaplyComponent/MaplyUpdateLayer.h>
+#import <WhirlyGlobeMaplyComponent/MaplyVariableTarget.h>
+#import <WhirlyGlobeMaplyComponent/MaplyVectorObject.h>
+#import <WhirlyGlobeMaplyComponent/MaplyVectorStyle.h>
+#import <WhirlyGlobeMaplyComponent/MaplyVectorStyleSimple.h>
+#import <WhirlyGlobeMaplyComponent/MaplyVectorTileLineStyle.h>
+#import <WhirlyGlobeMaplyComponent/MaplyVectorTileMarkerStyle.h>
+#import <WhirlyGlobeMaplyComponent/MaplyVectorTilePolygonStyle.h>
+#import <WhirlyGlobeMaplyComponent/MaplyVectorTileStyle.h>
+#import <WhirlyGlobeMaplyComponent/MaplyVectorTileTextStyle.h>
+#import <WhirlyGlobeMaplyComponent/MaplyVertexAttribute.h>
+#import <WhirlyGlobeMaplyComponent/MaplyViewController.h>
+#import <WhirlyGlobeMaplyComponent/MaplyViewTracker.h>
+#import <WhirlyGlobeMaplyComponent/MaplyWMSTileSource.h>
+#import <WhirlyGlobeMaplyComponent/MaplyZoomGestureDelegate.h>
+#import <WhirlyGlobeMaplyComponent/MapnikStyle.h>
+#import <WhirlyGlobeMaplyComponent/MapnikStyleRule.h>
+#import <WhirlyGlobeMaplyComponent/MapnikStyleSet.h>
+#import <WhirlyGlobeMaplyComponent/NSData+Zlib.h>
+#import <WhirlyGlobeMaplyComponent/NSDictionary+StyleRules.h>
+#import <WhirlyGlobeMaplyComponent/SLDExpressions.h>
+#import <WhirlyGlobeMaplyComponent/SLDOperators.h>
+#import <WhirlyGlobeMaplyComponent/SLDStyleSet.h>
+#import <WhirlyGlobeMaplyComponent/SLDSymbolizers.h>
+#import <WhirlyGlobeMaplyComponent/SLDWellKnownMarkers.h>
+#import <WhirlyGlobeMaplyComponent/WGCoordinate.h>
+#import <WhirlyGlobeMaplyComponent/WhirlyGlobeComponent.h>
+#import <WhirlyGlobeMaplyComponent/WhirlyGlobeComponent.h>
+#import <WhirlyGlobeMaplyComponent/WhirlyGlobeViewController.h>
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/WhirlyGlobeViewController.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/WhirlyGlobeViewController.h
new file mode 100644
index 0000000..ae3c444
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/WhirlyGlobeViewController.h
@@ -0,0 +1,809 @@
+/*
+ *  WhirlyGlobeViewController.h
+ *  WhirlyGlobeComponent
+ *
+ *  Created by Steve Gifford on 7/21/12.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <UIKit/UIKit.h>
+#import <WhirlyGlobeMaplyComponent/MaplyGlobeRenderController.h>
+#import <WhirlyGlobeMaplyComponent/MaplyBaseViewController.h>
+
+@class WGViewControllerLayer;
+@class WhirlyGlobeViewController;
+
+/**
+    An animation delegate that can be set on a WhirlyGlobeViewController to control the view over time.
+    
+    Filling out these methods will get you animation callbacks at the proper time to control position, heading, tilt, and height on a frame basis.
+    
+    You pass the resulting object in to
+  */
+@protocol WhirlyGlobeViewControllerAnimationDelegate <NSObject>
+
+/**
+    This method is called when the animation starts.
+    
+    At the animation start we collect up the various parameters of the current visual view state and pas them in via the startState.  You probably want to keep track of this for later.
+    
+    @param viewC The view controller doing the animation.
+    
+    @param startState The starting point for the visual view animation.  Cache this somewhere for your own interpolation.
+    
+    @param startTime When the animation starts (e.g. now)
+    
+    @param endTime When the animation ends.  This is an absolute value.
+  */
+- (void)globeViewController:(WhirlyGlobeViewController *__nonnull)viewC startState:(WhirlyGlobeViewControllerAnimationState *__nonnull)startState startTime:(NSTimeInterval)startTime endTime:(NSTimeInterval)endTime;
+
+/**
+    This method is called at the beginning of every frame draw to position the viewer.
+    
+    This is the method that does all the work.  You need to fill out the returned WhirlyGlobeViewControllerAnimationState according to whatever interpolation your'e doing based on the currentTime.
+    
+    @param viewC The view controller doing the animation.
+    
+    @param currentTime The time for this frame.  Use this rather than calculating the time yourself.
+    
+    @return The WhirlyGlobeViewControllerAnimationState expressing where you want the viewer to be and where they are looking.
+  */
+- (nonnull WhirlyGlobeViewControllerAnimationState *)globeViewController:(WhirlyGlobeViewController *__nonnull)viewC stateForTime:(NSTimeInterval)currentTime;
+
+@optional
+
+/**
+    This method is called at the end of the animation.
+    
+    The globe view controller calls this method when the animation is finished.  Do your cleanup here if need be.
+    
+    @param viewC The globe view controller.
+  */
+- (void)globeViewControllerDidFinishAnimation:(WhirlyGlobeViewController *__nonnull)viewC;
+
+@end
+
+/**
+    A simple animation delegate for moving the globe around.
+    
+    The animation delegate support provides a lot of flexibility.  This version just provides all the standard fields and interpolates from beginning to end.
+  */
+@interface WhirlyGlobeViewControllerSimpleAnimationDelegate : NSObject <WhirlyGlobeViewControllerAnimationDelegate>
+
+/// Initialize with an animation state to copy
+- (nonnull instancetype)initWithState:(WhirlyGlobeViewControllerAnimationState *__nonnull)endState;
+
+/// Location at the end of the animation
+@property (nonatomic) MaplyCoordinateD loc;
+
+/// Heading at the end of the animation
+@property (nonatomic) double heading;
+
+/// Height at the end of the animation
+@property (nonatomic) double height;
+
+/// Tilt at the end of the animation
+@property (nonatomic) double tilt;
+
+/// Roll at the end of the animation
+@property (nonatomic) double roll;
+
+/// Globe center at the end of the animation
+@property (nonatomic) CGPoint globeCenter;
+
+/// Custom easing
+@property (readwrite,copy) ZoomEasingBlock _Nullable zoomEasing;
+
+@end
+
+/** 
+    Globe View Controller Delegate protocol for getting back selection and tap events.
+    
+    Fill out the methods in this protocol and assign yourself as a delegate in the WhirlyGlobeViewController to get selection and tap events.
+  */
+@protocol WhirlyGlobeViewControllerDelegate <NSObject>
+
+@optional
+/** 
+    Called when the user taps on or near an object.
+    
+    You're given the object you passed in originally, such as a MaplyScreenMarker.  Most of those objects have userObject properties, which is a good place to stash your own data.
+    
+    @param viewC The view controller where the user selected something.
+    
+    @param selectedObj The Maply object they selected.
+  */
+- (void)globeViewController:(WhirlyGlobeViewController *__nonnull)viewC didSelect:(NSObject *__nonnull)selectedObj;
+
+/** 
+    Called when the user taps on or near an object.
+    
+    This will call back with the closest object it finds near (or on) where the user tapped.
+    
+    You're given the object you passed in originally, such as a MaplyScreenMarker.
+    
+    This version is called preferentially if it exists.  Otherwise globeViewController:didSelect: is called if it exists.
+    
+    @param viewC The view controller where the user selected something.
+    
+    @param selectedObj The Maply object they selected.
+    
+    @param coord The location (geographic lon/lat in radians) where the user tapped.
+    
+    @param screenPt The location on screen where the user tapped.
+  */
+- (void)globeViewController:(WhirlyGlobeViewController *__nonnull)viewC didSelect:(NSObject *__nonnull)selectedObj atLoc:(MaplyCoordinate)coord onScreen:(CGPoint)screenPt;
+
+/** 
+    Called when the user taps on or near one or more objects.  Returns them all.
+    
+    This method is called when the
+    
+    @param viewC The view controller where the user selected something.
+    
+    @param selectedObjs A list of
+    
+    @param coord The location (geographic lon/lat in radians) where the user tapped.
+    
+    @param screenPt The location on screen where the user tapped.
+  */
+- (void)globeViewController:(WhirlyGlobeViewController *__nonnull)viewC allSelect:(NSArray *__nonnull)selectedObjs atLoc:(MaplyCoordinate)coord onScreen:(CGPoint)screenPt;
+
+/** 
+    Called when the user taps outside the globe.
+  */
+- (void)globeViewControllerDidTapOutside:(WhirlyGlobeViewController *__nonnull)viewC;
+
+/** 
+    Called when the user taps the globe but doesn't select anything.
+    
+    @param viewC The view controller where the user selected something.
+    
+    @param coord The location (geographic lon/lat in radians) where the user tapped.
+  */
+- (void)globeViewController:(WhirlyGlobeViewController *__nonnull)viewC didTapAt:(MaplyCoordinate)coord;
+
+/** 
+    This is an older method called when some layers load.
+    
+    Certain image layers call this method when they finish loading.  More modern layers don't, so don't rely on this.
+  */
+- (void)globeViewController:(WhirlyGlobeViewController *__nonnull)viewC layerDidLoad:(WGViewControllerLayer *__nonnull)layer;
+
+/** 
+    Called when the globe starts moving.
+    
+    @param viewC The globe view controller.
+    
+    @param userMotion Set if this is motion being caused by the user, rather than a call to set location.
+    
+    This is called when something (probably the user) starts moving the globe.
+  */
+- (void)globeViewControllerDidStartMoving:(WhirlyGlobeViewController *__nonnull)viewC userMotion:(bool)userMotion;
+
+/** 
+    Called when the globe stops moving.
+    
+    This is called when the globe stops moving.  It passes in the corners of the current viewspace.
+    
+    @param viewC The globe view controller.
+    
+    @param userMotion Set if this is motion being caused by the user, rather than a call to set location.
+    
+    @param corners An array of length 4 containing the corners of the view space (lower left, lower right, upper right, upper left).  If any of those corners does not intersect the globe (think zoomed out), its values are set to MAXFLOAT.
+  */
+- (void)globeViewController:(WhirlyGlobeViewController *__nonnull)viewC didStopMoving:(MaplyCoordinate *__nonnull)corners userMotion:(bool)userMotion;
+
+/** 
+    Called when an animation that knows where it's going to stop start ups.
+    
+    This is called when we know where the globe will stop.  It passes in the corners of that future viewspace.
+    
+    @param viewC The globe view controller.
+    
+    @param corners An array of length 4 containing the corners of the view space (lower left, lower right, upper right, upper left).  If any of those corners does not intersect the globe (think zoomed out), its values are set to MAXFLOAT.
+    
+    @param userMotion Set if this is motion being caused by the user, rather than a call to set location.
+ */
+- (void)globeViewController:(WhirlyGlobeViewController *__nonnull)viewC willStopMoving:(MaplyCoordinate *__nonnull)corners userMotion:(bool)userMotion;
+
+/** 
+    Called whenever the viewpoint moves.
+    
+    This is called whenever the viewpoint moves.  That includes user motion as well as animations.
+    
+    It may be triggered as often as every frame.  If that's a problem, use the globeViewController:didStopMoving:userMotion: or globeViewController:willStopMoving:userMotion: calls.
+    
+    @param viewC The globe view controller.
+    
+    @param corners An array of length 4 containing the corners of the view space (lower left, lower right, upper right, upper left).  If any of those corners does not intersect the globe (think zoomed out), its values are set to MAXFLOAT.
+  */
+- (void)globeViewController:(WhirlyGlobeViewController *__nonnull)viewC didMove:(MaplyCoordinate *__nonnull)corners;
+
+@end
+
+/** 
+    This view controller implements a 3D interactive globe.
+    
+    This is the main entry point for displaying a globe.  Create one of these, fill it with data and let your users mess around with it.
+    
+    You can display a variety of features on the globe, including tiled base maps (MaplyQuadImageTilesLayer), vectors (MaplyVectorObject), shapes (MaplyShape), and others.  Check out the add calls in the MaplyBaseViewController for details.
+    
+    To get selection and tap callbacks, fill out the WhirlyGlobeViewControllerDelegate and assign the delegate.
+    
+    Most of the functionality is shared with MaplyBaseViewController.  Be sure to look in there first.
+ */
+@interface WhirlyGlobeViewController : MaplyBaseViewController
+
+/** 
+    If set, keep north facing upward on the screen as the user moves around.
+    
+    Off by default.
+  */
+@property(nonatomic,assign) bool keepNorthUp;
+
+/** 
+    Turn the pan gesture recognizer on and off
+ 
+    On by default.
+ */
+@property(nonatomic,assign) bool panGesture;
+
+/** 
+    Turn the pinch (zoom) gesture recognizer on and off
+    
+    On by default.
+ */
+@property(nonatomic,assign) bool pinchGesture;
+
+/**
+ Turn the rotate globe functionality for pinch gesture gesture recognizer on and off
+ 
+ On by default.
+ */
+@property(nonatomic,assign) bool zoomAroundPinch;
+
+/** 
+    Turn the rotate gesture recognizer on and off
+    
+    On by default.
+ */
+@property(nonatomic,assign) bool rotateGesture;
+
+/** 
+    Turn the tilt gesture recognizer on and off
+    
+    Off by default.
+ */
+@property(nonatomic,assign) bool tiltGesture;
+
+/** 
+    Turn the double tap to zoom gesture recognizer on and off
+ 
+    On by default.
+ */
+@property(nonatomic,assign) bool doubleTapZoomGesture;
+
+/** 
+    Turn the 2 finger tap to zoom out gesture recognizer on and off
+ 
+    On by default.
+ */
+@property(nonatomic,assign) bool twoFingerTapGesture;
+
+/** 
+    Turn on the double tap and drag gesture to zoom in and out.
+ 
+    On by default.
+ */
+@property(nonatomic,assign) bool doubleTapDragGesture;
+
+/** 
+    If set, we use a modified pan gesture recognizer to play nice
+        with the scroll view.  For the UIScrollView object, set clipsToBounds,
+        pagingEnabled, and delaysContentTouches to YES, and set scrollEnabled
+        and canCancelContentTouches to NO.  Add swipe gesture recognizers
+        to the scroll view to control paging, and call
+        requirePanGestureRecognizerToFailForGesture: for each.
+ 
+    Off by default.
+ */
+@property(nonatomic,assign) bool inScrollView;
+
+
+/** 
+    If set, we'll automatically move to wherever the user tapped.
+    
+    When on we'll move the current location to wherever the user tapped if they tapped the globe.  That's true for selection as well.  On by default.
+  */
+@property(nonatomic,assign) bool autoMoveToTap;
+
+/** 
+    Delegate for the selection and tap events.
+    
+    Fill in the WhirlyGlobeViewControllerDelegate protocol, assign the object here and you'll get selection and tap events.
+  */
+@property(nonatomic,weak,nullable) NSObject<WhirlyGlobeViewControllerDelegate> *delegate;
+
+/** 
+    Current viewer height above terrain.
+    
+    This is the height from with the viewer is viewing the globe.  Values range from minHeight to maxHeight.  Smaller is closer.  See getZoomLimitsMin:max: for values.  The display units are based on a globe with a radius of 1.0.
+ */
+@property (nonatomic,assign) float height;
+
+/** 
+    Tilt in radians.  0 is looking straight down (the default).  PI/2 is looking toward the horizon.
+  */
+@property(nonatomic,assign) float tilt;
+
+/**
+    If set, the globe will be centered to this point on the screen.
+ */
+@property(nonatomic,assign) CGPoint globeCenter;
+
+/** 
+    The current rotation away from north.
+    
+    If keepNorthUp is set this is always 0.
+  */
+@property(nonatomic,assign) float heading;
+
+/**
+    The current roll around the axis pointed out of the user's nose.
+    */
+@property (nonatomic,assign) double roll;
+
+/** 
+    Returns the closest a viewer is allowed to get to the map surface.
+ 
+    @return FLT_MIN if there's no pinchDelegate set
+ */
+- (float)getZoomLimitsMin;
+
+/** 
+    Returns the farthest away a viewer is allowed to get from the map surface
+ 
+    @return FLT_MIN if there's no pinchDelegate set
+ */
+- (float)getZoomLimitsMax;
+
+/** 
+    Return the zoom limits for the globe.
+    
+    @param minHeight The closest a viewer is allowed to get to the globe surface.
+    
+    @param maxHeight The farthest away a viewer is allowed to get from the globe surface.
+ */
+- (void)getZoomLimitsMin:(float *__nonnull)minHeight max:(float *__nonnull)maxHeight;
+
+/** 
+    Set the zoom limits for the globe.
+    
+    @param minHeight The closest a viewer is allowed to get to the globe surface.
+    
+    @param maxHeight The farthest away a viewer is allowed to get from the globe surface.
+ */
+- (void)setZoomLimitsMin:(float)minHeight max:(float)maxHeight;
+
+/** 
+    How much we zoom in or out by when the user double taps or two finger taps.
+    
+    This sets the factor we'll use to zoom in by (e.g. *2.0) when the user double taps.  It also sets how much we zoom out by when the user two finger taps.  This will only have an effect if those gestures are active.
+  */
+@property (nonatomic) float zoomTapFactor;
+
+/** 
+    How long we take to zoom in or out when the user double taps or two finger taps.
+    
+    This controls the duration of the zoom animation.  You can set it to zero to avoid the animation entirely.
+  */
+@property (nonatomic) float zoomTapAnimationDuration;
+
+/** 
+    Reset the far clipping plane.
+    
+    This is advanced functionality.  Make sure you actually need to do this before you do it.
+    
+    The far clipping plane is usually set to something like 4.0.
+  */
+- (void)setFarClipPlane:(double)farClipPlane;
+
+/** 
+    Set the simplified tilt mode.  We'll tilt toward the horizon as the user gets closer to the ground.
+    
+    This implements a simplified mode for tilting.  As the user gets closer to the ground we tilt more toward the horizon.
+    
+    @param minHeight The minimum height corresponding to minTilt.
+    
+    @param maxHeight The height at which to start interoplating tilt.
+    
+    @param minTilt The most tilt toward the horizon.  Invoked when the user is at minHeight or below.
+    
+    @param maxTilt The tilt at the maximum height and over.  The tilt will never be less than this, so typically 0.
+  */
+- (void)setTiltMinHeight:(float)minHeight maxHeight:(float)maxHeight minTilt:(float)minTilt maxTilt:(float)maxTilt;
+
+/// Turn off the varying tilt set up by setTiltMinHeight:maxHeight:minTilt:maxTilt:
+- (void)clearTiltHeight;
+
+/** 
+    Turn on autorotate to rotate by the given amount every second.
+    
+    This turns on an auto-rotate mode.  The globe will start rotating after a delay by the given number of degrees per second.  Very pleasant.
+    
+    @param autoRotateInterval Wait this number of seconds after user interaction to auto rotate.
+    
+    @param autoRotateDegrees Rotate this number of degrees (not radians) per second.
+  */
+- (void)setAutoRotateInterval:(float)autoRotateInterval degrees:(float)autoRotateDegrees;
+
+/** 
+    Animate to the given position over time.
+    
+    @param newPos A coordinate in geographic (lon/lat radians)
+    
+    @param howLong A time interval in seconds.
+ */
+- (void)animateToPosition:(MaplyCoordinate)newPos time:(NSTimeInterval)howLong;
+
+/** 
+    Animate the given position to the screen position over time.
+    
+    This is similar to animateToPosition:time: except that it will attempt to match up the screen position and the geographic position.  This is how you offset the location you're looking at.
+    
+    If it's impossible to move newPos to loc, then nothing happens.
+    
+    @param newPos The geographic position (lon/lat in radians) to move to.
+    
+    @param loc The location on the screen where we'd like it to go.
+    
+    @param howLong How long in seconds to take getting there.
+ */
+- (bool)animateToPosition:(MaplyCoordinate)newPos onScreen:(CGPoint)loc time:(NSTimeInterval)howLong;
+
+/** 
+    Animate to the given position, heading and height over time.
+    
+    @param newPos A coordinate in geographic (lon/lat radians)
+    
+    @param newHeight New height to animate to.
+    
+    @param newHeading New heading to finish on.
+    
+    @param howLong A time interval in seconds.
+ */
+- (bool)animateToPosition:(MaplyCoordinate)newPos height:(float)newHeight heading:(float)newHeading time:(NSTimeInterval)howLong;
+
+/** 
+    Animate to the given position, heading and height over time.
+    
+    @param newPos A coordinate in geographic (lon/lat radians) (double precision)
+    
+    @param newHeight New height to animate to. (double)
+    
+    @param newHeading New heading to finish on. (double)
+    
+    @param howLong A time interval in seconds.
+ */
+- (bool)animateToPositionD:(MaplyCoordinateD)newPos height:(double)newHeight heading:(double)newHeading time:(NSTimeInterval)howLong;
+
+/** 
+    Animate to the given position, screen position, heading and height over time.
+    
+    If it's impossible to move newPos to loc, then nothing happens. 
+    
+    @param newPos A coordinate in geographic (lon/lat radians)
+    
+    @param loc The location on the screen where we'd like it to go.
+    
+    @param newHeight New height to animate to.
+    
+    @param newHeading New heading to finish on.
+    
+    @param howLong A time interval in seconds.
+ */
+- (bool)animateToPosition:(MaplyCoordinate)newPos onScreen:(CGPoint)loc height:(float)newHeight heading:(float)newHeading time:(NSTimeInterval)howLong;
+
+/** 
+    Animate with a delegate over time.
+    
+    Fill in the WhirlyGlobeViewControllerAnimationDelegate and you can control the visual view on a frame by frame basis.  You'll get called back at the appropriate time on the main thread over the time period.
+    
+    You'll also be called one at the end of the animation to establish the final position.
+    
+    @param animationDelegate The objects that implements the WhirlyGlobeViewControllerAnimationDelegate protocol.
+    
+    @param howLong How long the animation will run from the present time.
+  */
+- (void)animateWithDelegate:(NSObject<WhirlyGlobeViewControllerAnimationDelegate> *__nonnull)animationDelegate time:(NSTimeInterval)howLong;
+
+/** 
+    Set the center of the screen to the given position immediately.
+    
+    @param newPos The geographic position (lon/lat in radians) to move to.
+ */
+- (void)setPosition:(MaplyCoordinate)newPos;
+
+/** 
+    Set the center of the screen and the height offset immediately.
+    
+    @param newPos The geographic position (lon/lat in radians) to move to.
+    
+    @param height Height the view point above the globe.
+ */
+- (void)setPosition:(MaplyCoordinate)newPos height:(float)height;
+
+/** 
+    Returns the center of the screen in geographic (lon/lat in radians).
+ */
+- (MaplyCoordinate)getPosition;
+
+/** 
+    Returns the center of the screen in geographic (lon/lat in radians as doubles).
+ */
+- (MaplyCoordinateD)getPositionD;
+
+/** 
+    Returns the current view point's height above the globe.
+ */
+- (double)getHeight;
+
+/** 
+    Set the center of the screen and the height offset immediately.
+    
+    Set the center and height using double.s
+    
+    @param newPos The geographic position (lon/lat in radians) to move to.
+    
+    @param height Height the view point above the globe.
+ */
+- (void)setPositionD:(MaplyCoordinateD)newPos height:(double)height;
+
+/** 
+    Return the current center position and height.
+    
+    @param pos The center of the screen in geographic (lon/lat in radians).
+    
+    @param height The current view point's height above the globe.
+ */
+- (void)getPosition:(MaplyCoordinate *__nonnull)pos height:(float *__nonnull)height;
+
+/** 
+    Return the current center position and height in doubles.
+    
+    @param pos The center of the screen in geographic (lon/lat in radians).
+    
+    @param height The current view point's height above the globe.
+ */
+- (void)getPositionD:(MaplyCoordinateD *__nonnull)pos height:(double *__nonnull)height;
+
+/** 
+    Set the viewing state all at once
+    
+    This sets the position, tilt, height, screen position and heading all at once.
+  */
+- (void)setViewState:(WhirlyGlobeViewControllerAnimationState *__nonnull)viewState;
+
+/** 
+    Make a WhirlyGlobeViewControllerAnimationState object from the current view state.
+    
+    This returns the current view parameters in a single WhirlyGlobeViewControllerAnimationState.
+  */
+- (nullable WhirlyGlobeViewControllerAnimationState *)getViewState;
+
+/** 
+    Return a view state looking at the given location.
+    
+    Creates a view state that looks at the given location, taking tilt and heading into account.
+    
+    @param coord The location the user will be looking at.
+    
+    @param tilt Tilt off of vertical.
+    
+    @param heading Heading calculated from due north.
+    
+    @param alt Altitude of the point the user will be looking at (0, is a good value).
+    
+    @param range How far the user will be from the location they're looking at.
+    
+    @return The view state encapsulating the user location.  Will be nil if the parameters weren't valid.
+  */
+- (nullable WhirlyGlobeViewControllerAnimationState *)viewStateForLookAt:(MaplyCoordinate)coord tilt:(float)tilt heading:(float)heading altitude:(float)alt range:(float)range;
+
+/** 
+    Apply viewing constraints to the given view state.
+    
+    This applies active viewing constraints, such as min and max height and calculated tilt, if it's on to the given view state. This is particularly useful when controlled tilt is on.
+  */
+- (void)applyConstraintsToViewState:(WhirlyGlobeViewControllerAnimationState *__nonnull)viewState;
+
+/** 
+    Find a selectable object at or near the given location.
+    
+    This runs immediately and looks for a Maply object at the given location.  It differs from the WhirlyGlobeViewControllerDelegate in that it doesn't require user interaction.
+    
+    @param screenPt The location on screen where we're looking for an object.
+    
+    @return Returns a Maply object such as MaplyScreenLabel or MaplyShape or nil if it failed to find anything.
+  */
+- (nullable id)findObjectAtLocation:(CGPoint)screenPt;
+
+/** 
+    Return a location on the screen for a given geographic coordinate or CGPointZero if it's not on the screen.
+ 
+    @param geoCoord Point on the earth in lat/lon radians you want a screen position for.
+ 
+    @return the point or CGPointZero
+ */
+- (CGPoint)screenPointFromGeo:(MaplyCoordinate)geoCoord;
+
+/** 
+    Return a location on the screen for a given geographic coordinate or false if it's not on the screen.
+    
+    @param geoCoord Point on the earth in lat/lon radians you want a screen position for.
+    
+    @param screenPt Location on the screen.
+    
+    @return True if the geo coord was on the screen, false otherwise.
+  */
+- (bool)screenPointFromGeo:(MaplyCoordinate)geoCoord screenPt:(CGPoint *__nonnull)screenPt;
+
+/** 
+    Calculate a geo coordinate from a point on the screen.
+    
+    @param screenPt Location on the screen.
+    
+    @param geoCoord Point on the earth in lat/lon radians.
+    
+    @return True if the point was on the globe, false otherwise.
+  */
+- (bool)geoPointFromScreen:(CGPoint)screenPt geoCoord:(MaplyCoordinate *__nonnull)geoCoord;
+
+/**
+    Calculate a geo coordinate from a point on the screen.
+    
+    @param screenPt Location on the screen.
+    
+    @return The corresponding MaplyCoordinate wrapped in an NSValue  if the point was on the globe, nil otherwise.
+  */
+- (nullable NSValue *)geoPointFromScreen:(CGPoint)screenPt;
+
+/** 
+    Calculate a geocentric coordinate from a point on the screen.
+ 
+    @param screenPt Location on the screen.
+ 
+    @return An array of 3 NSNumber (with doubles). If the point wasn't on the globe, returns nil
+ */
+- (nullable NSArray *)geocPointFromScreen:(CGPoint)screenPt;
+
+/** 
+    Calculate a geocentric coordinate from a point on the screen.
+    
+    @param screenPt Location on the screen.
+    
+    @param retCoords An array of 3 doubles.  The geocentric coordinate will be returned here.
+    
+    @return True if the point was on the globe, false otherwise.
+ */
+- (bool)geocPointFromScreen:(CGPoint)screenPt geocCoord:(double *__nonnull)retCoords;
+
+/**
+    Calculate a size in meters by projecting the two screen points onto the globe.
+    Return -1, -1 if the points weren't on the globe.
+  */
+- (CGSize)realWorldSizeFromScreenPt0:(CGPoint)pt0 pt1:(CGPoint)pt1;
+
+/** 
+    Find a height that shows the given bounding box.
+    
+    This method will search for a height that shows the given bounding box within the view.  The search is inefficient, so don't call this a lot.
+    
+    @param bbox The bounding box (in radians) we're trying to view.
+    
+    @param pos The position the viewer will be at.
+ */
+- (float)findHeightToViewBounds:(MaplyBoundingBox)bbox pos:(MaplyCoordinate)pos;
+
+/**
+    Find a height that shows the given bounding box.
+    This method will search for a height that shows the given bounding box within the view.  The search is inefficient, so don't call this a lot.
+
+    This version takes a margin to add around the outside of the area.  Positive margins increase the screen area considered, making the
+    given area larger.  Negative margins make the specified area smaller.
+
+    @param bbox The bounding box (in radians) we're trying to view.
+    @param pos Where the view will be looking.
+    @param marginX Horizontal boundary around the area
+    @param marginY Vertical boundary around the area
+ */
+- (float)findHeightToViewBounds:(MaplyBoundingBox)bbox
+                            pos:(MaplyCoordinate)pos
+                        marginX:(double)marginX
+                        marginY:(double)marginY;
+
+/**
+    Find a height that shows the given bounding box.
+    This method will search for a height that shows the given bounding box within the view.  The search is inefficient, so don't call this a lot.
+
+    This version takes a margin to add around the outside of the area.  Positive margins increase the screen area considered, making the
+    given area larger.  Negative margins make the specified area smaller.
+ 
+    This version attempts to place the given bounds within a rectangle other than the whole view frame.
+    Note that this doesn't work well when the bounds are very large.
+
+    @param bbox The bounding box (in radians) we're trying to view.
+    @param pos Where the view will be looking.
+    @param frame The screen area to consider.
+    @param newPos (out,optional) The center location needed to place \c pos at the center of \c frame
+    @param marginX Horizontal boundary around the area
+    @param marginY Vertical boundary around the area
+ */
+- (float)findHeightToViewBounds:(MaplyBoundingBox)bbox
+                            pos:(MaplyCoordinate)pos
+                          frame:(CGRect)frame
+                         newPos:(MaplyCoordinate *_Nullable)newPos
+                        marginX:(double)marginX
+                        marginY:(double)marginY;
+
+/**
+ 
+    Return the extents of the current view.
+ 
+    When we're dealing with a globe the corners could be outside of the globe, in this case kMaplyNullBoundingBox is returned.
+ 
+    @return Returns the bounding box if exists a bounding bbox for the current view, otherwise returns kMaplyNullBoundingBox.
+ */
+- (MaplyBoundingBox)getCurrentExtents;
+
+/**
+ 
+    Return the extents of the current view.
+ 
+    When we're dealing with a globe the corners could be outside of the globe, in this case false is returned.
+ 
+    @param bbox The bbox will be returned here.
+ 
+    @return Returns true if exists a bounding bbox for the current view, otherwise returns false
+ */
+- (bool)getCurrentExtents:(MaplyBoundingBox *__nonnull)bbox;
+
+/**
+  
+    From the current view figure out a usable geo bounding box.
+  
+    This is similar to the WhirlyGlobeViewControllerDelegate methods and getCurrentExtents except that it goes a little deeper.  It starts with the four corners of the screen and then tries to take tilt and orientation into account.  Ideally it produces a bounding box that covers everything the user is looking at as opposed to where the four corners are.
+ 
+    @param bboxes The bounding boxes to fill in.  Pass in two.
+ 
+    @param visualBoxes If set, we'll build bounding boxes you can display.  If not set, we'll build a single bounding box usable for math.
+  */
+- (int)getUsableGeoBoundsForView:(MaplyBoundingBox *__nonnull)bboxes visual:(bool)visualBoxes;
+
+/**
+ 
+    Make a gesture recognizer's success depend on the pan gesture
+      recognizer's failure.
+ 
+    When using the globe view within a scroll view, add swipe gesture
+      recognizers to the scroll view to control paging, and call this method
+      for each.  See also the inScrollView property and its comment.
+ 
+    @param other The other, subordinate gesture recognizer.
+ */
+- (void)requirePanGestureRecognizerToFailForGesture:(UIGestureRecognizer *__nullable)other;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Info.plist b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Info.plist
new file mode 100644
index 0000000..2ff1ea4
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Info.plist
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Modules/module.modulemap b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Modules/module.modulemap
new file mode 100644
index 0000000..85d15cc
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Modules/module.modulemap
@@ -0,0 +1,6 @@
+framework module WhirlyGlobeMaplyComponent {
+  umbrella header "WhirlyGlobeMaplyComponent.h"
+
+  export *
+  module * { export * }
+}
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/WhirlyGlobeMaplyComponent b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/WhirlyGlobeMaplyComponent
new file mode 100755
index 0000000..88108b7
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/WhirlyGlobeMaplyComponent
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/default.metallib b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/default.metallib
new file mode 100644
index 0000000..5d85be9
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/default.metallib
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Config-ac.h.in b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Config-ac.h.in
new file mode 100644
index 0000000..ac3ba0b
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Config-ac.h.in
@@ -0,0 +1,91 @@
+/* include/GeographicLib/Config-ac.h.in.  Generated from configure.ac by autoheader.  */
+
+/* Define if building universal (internal helper macro) */
+#undef AC_APPLE_UNIVERSAL_BUILD
+
+/* major version number */
+#undef GEOGRAPHICLIB_VERSION_MAJOR
+
+/* minor version number */
+#undef GEOGRAPHICLIB_VERSION_MINOR
+
+/* patch number */
+#undef GEOGRAPHICLIB_VERSION_PATCH
+
+/* define if the compiler supports basic C++11 syntax */
+#undef HAVE_CXX11
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#undef HAVE_DLFCN_H
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define to 1 if the system has the type `long double'. */
+#undef HAVE_LONG_DOUBLE
+
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
+
+/* Define to the sub-directory where libtool stores uninstalled libraries. */
+#undef LT_OBJDIR
+
+/* Name of package */
+#undef PACKAGE
+
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
+/* Version number of package */
+#undef VERSION
+
+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+   significant byte first (like Motorola and SPARC, unlike Intel). */
+#if defined AC_APPLE_UNIVERSAL_BUILD
+# if defined __BIG_ENDIAN__
+#  define WORDS_BIGENDIAN 1
+# endif
+#else
+# ifndef WORDS_BIGENDIAN
+#  undef WORDS_BIGENDIAN
+# endif
+#endif
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/GeoJSONSource.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/GeoJSONSource.h
new file mode 100644
index 0000000..55c1446
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/GeoJSONSource.h
@@ -0,0 +1,40 @@
+/*  GeoJSONSource.mm
+ *  WhirlyGlobe-MaplyComponent
+ *
+ *  Created by Ranen Ghosh on 2016-11-18.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#import <UIKit/UIKit.h>
+#import <WhirlyGlobeMaplyComponent/MaplyBaseViewController.h>
+
+#define GEOJSON_MAX_POINTS 4096
+
+/**
+ This class will read GeoJSON via URL with an associated Styled Layer Descriptor via URL.  It will then
+  parse both of them and apply the SLD style to the GeoJSON data.  This results in visual data in
+ much the same way as loading vector tiles would.
+ */
+@interface GeoJSONSource : NSObject
+
+- (id _Nullable)initWithViewC:(NSObject<MaplyRenderControllerProtocol> * _Nonnull)baseVC GeoJSONURL:(NSURL * _Nonnull)geoJSONURL sldURL:(NSURL * _Nonnull)sldURL relativeDrawPriority:(int)relativeDrawPriority ;
+
+- (void)startParseWithCompletion:(nonnull void (^)(void)) completionBlock;
+
+- (void)startParse;
+
+@property (nonatomic, readonly) bool loaded;
+@property (nonatomic, assign) bool enabled;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/GeographicLib_ObjC.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/GeographicLib_ObjC.h
new file mode 100644
index 0000000..e57a3d2
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/GeographicLib_ObjC.h
@@ -0,0 +1,100 @@
+//
+//  geowrap.h
+//  WhirlyGlobeLib
+//
+//  Created by Tim Sylvester on 12/14/20.
+//  Copyright 2020 mousebird consulting. All rights reserved.
+//
+
+#ifndef GeographicLib_Wrapper_h
+#define GeographicLib_Wrapper_h
+
+#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
+
+typedef struct GeoLibInv_t {
+    double distance;    // meters
+    double azimuth1;    // radians
+    double azimuth2;    // radians
+} GeoLibInv;
+
+typedef struct GeoLibInt_t {
+    MaplyCoordinateD intersection;
+    bool intersects;
+} GeoLibInt;
+
+typedef struct GeoLibIntPair_t {
+    MaplyCoordinateD intersections[2];
+    double distances[2];
+    unsigned int count;
+} GeoLibIntPair;
+
+typedef struct GeoLibOrthoDist_t {
+    double downtrackDistance;
+    double crosstrackDistance;
+    double segmentLength;
+} GeoLibOrthoDist;
+
+#if defined __cplusplus
+extern "C" {
+#endif
+
+/// Solve the direct geodesic problem where the length of the geodesic is specified in terms of distance.
+/// azimuth in radians, distance in meters
+MaplyCoordinate GeoLibCalcDirectF(MaplyCoordinate origin, double azimuth, double distance);
+MaplyCoordinateD GeoLibCalcDirectD(MaplyCoordinateD origin, double azimuth, double distance);
+
+// Solve the inverse geodesic problem
+GeoLibInv GeoLibCalcInverseF(MaplyCoordinate p1, MaplyCoordinate p2);
+GeoLibInv GeoLibCalcInverseD(MaplyCoordinateD p1, MaplyCoordinateD p2);
+
+// Test for a point lying inside the specified polygon
+bool MaplyCoordinateInPolygon(MaplyCoordinate p, const MaplyCoordinate polygon[], unsigned count);
+bool MaplyCoordinateDInPolygon(MaplyCoordinateD p, const MaplyCoordinate polygon[], unsigned count);
+bool MaplyCoordinateInPolygonD(MaplyCoordinate p, const MaplyCoordinateD polygon[], unsigned count);
+bool MaplyCoordinateDInPolygonD(MaplyCoordinateD p, const MaplyCoordinateD polygon[], unsigned count);
+
+double GeoLibDistanceD(MaplyCoordinateD startPt, MaplyCoordinateD endPt);
+
+// Test for a segment intersecting a polygon.
+// Note that if the line is completely within the polygon the result is false.
+bool GeoLibLineDIntersectsPolygonD(MaplyCoordinateD startPt, MaplyCoordinateD endPt, const MaplyCoordinateD[], unsigned count);
+
+// Compute the intersection point of two geodesic segments
+GeoLibInt GeoLibIntersectD(MaplyCoordinateD a, MaplyCoordinateD b, MaplyCoordinateD c, MaplyCoordinateD d);
+
+// Determine where a great circle intersects a small circle
+GeoLibIntPair GeoLibLineDIntersectCircleD(MaplyCoordinateD startPt, MaplyCoordinateD endPt, MaplyCoordinateD center, double radiusMeters);
+
+// Determine whether there's an intersection without bothering to compute its location
+bool GeoLibLineDIntersectsCircleD(MaplyCoordinateD startPt, MaplyCoordinateD endPt, MaplyCoordinateD center, double radiusMeters);
+
+// Compute the orthogonal distances for a point.
+//
+// Given a segment and a point, find the perpendicular intersection point (the closest point along the
+// segment) and compute the distance from that point to the segment starting point (down-track) and
+// to the specified point (cross-track).
+//
+//  negative down-track distance          C
+//                             v          |    <- negative cross-track distance
+//                         - - - - - A--------B
+//                         |              |    <- positive cross-track distance
+//                         C              C
+//                                    ----
+//                                     ^ positive down-track-distance
+//
+// If the point lies "before" the segment start point, the down-track distance will be negative.
+// If the point lies "after" the segment end point, the down-track distance will be greater than the segment length.
+// If the point lies to the right of the segment, the cross-track distance will be positive.
+// If the point lies to the left of the segment, the cross-track distance will be negative.
+GeoLibOrthoDist GeoLibOrthoDistD(MaplyCoordinateD a, MaplyCoordinateD b, MaplyCoordinateD c);
+
+// Generate points along an arc
+double GeoLibSampleArcD(MaplyCoordinateD center, double radiusMeters,
+                        double beginAzimuthRad, double endAziumthRad, bool clockwise,
+                        MaplyCoordinateD points[], unsigned count);
+
+#if defined __cplusplus
+}   // extern "C"
+#endif
+
+#endif /* GeographicLib_Wrapper_h */
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/GlobeDoubleTapDelegate.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/GlobeDoubleTapDelegate.h
new file mode 100644
index 0000000..ea1b934
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/GlobeDoubleTapDelegate.h
@@ -0,0 +1,34 @@
+/*  GlobeDoubleTapDelegate.h
+ *
+ *  Created by Steve Gifford on 2/7/14.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
+
+@interface WhirlyGlobeDoubleTapDelegate : NSObject<UIGestureRecognizerDelegate>
+
+@property (nonatomic,weak) UIGestureRecognizer *gestureRecognizer;
+
+// How much we zoom in by
+@property (nonatomic) float zoomTapFactor;
+
+// How long the zoom animation takes
+@property (nonatomic) float zoomAnimationDuration;
+
+/// Zoom limits
+@property (nonatomic) float minZoom,maxZoom;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/GlobeDoubleTapDragDelegate.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/GlobeDoubleTapDragDelegate.h
new file mode 100644
index 0000000..7df7f12
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/GlobeDoubleTapDragDelegate.h
@@ -0,0 +1,33 @@
+/*  GlobeDoubleTapDragDelegate.h
+ *
+ *  Created by Steve Gifford on 2/7/14.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#import <Foundation/Foundation.h>
+#import <WhirlyGlobeMaplyComponent/GlobePinchDelegate.h>
+
+// Sent out when the double tap delegate takes control
+#define kGlobeDoubleTapDragDidStart @"WKGlobeDoubleTapDragStarted"
+// Sent out when the double tap delegate finished (but hands off to momentum)
+#define kGlobeDoubleTapDragDidEnd @"WKGlobeDoubleTapDragEnded"
+
+@interface WhirlyGlobeDoubleTapDragDelegate : NSObject<UIGestureRecognizerDelegate>
+
+@property (nonatomic,weak) UIGestureRecognizer *gestureRecognizer;
+
+/// Zoom limits
+@property (nonatomic) float minZoom,maxZoom;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/GlobePanDelegate.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/GlobePanDelegate.h
new file mode 100644
index 0000000..02d2249
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/GlobePanDelegate.h
@@ -0,0 +1,48 @@
+/*
+ *  GlobePanDelegate.h
+ *  WhirlyGlobeApp
+ *
+ *  Created by Stephen Gifford on 4/28/11.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <UIKit/UIKit.h>
+
+// Sent out when the pan delegate takes control
+#define kPanDelegateDidStart @"WKPanDelegateStarted"
+// Sent out when the pan delegate finished (but hands off to momentum)
+#define kPanDelegateDidEnd @"WKPanDelegateEnded"
+
+#define kPanDelegateMinTime 0.1
+
+// Custom pan gesture recognizer that plays well with scroll views.
+@interface MinDelayPanGestureRecognizer : UIPanGestureRecognizer {
+    // time of start of gesture
+    CFTimeInterval startTime;
+}
+
+- (void)forceEnd;
+
+@end
+
+
+// The pan delegate handles panning and rotates the globe accordingly
+@interface WhirlyGlobePanDelegate : NSObject<UIGestureRecognizerDelegate>
+
+@property(nonatomic,assign) bool northUp;
+
+@property (nonatomic,weak) UIGestureRecognizer *gestureRecognizer;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/GlobePinchDelegate.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/GlobePinchDelegate.h
new file mode 100644
index 0000000..35d40d8
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/GlobePinchDelegate.h
@@ -0,0 +1,61 @@
+/*  GlobePinchDelegate.h
+ *  WhirlyGlobeLib
+ *
+ *  Created by Steve Gifford on 8/22/12.
+ *  Copyright 2012-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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#import <UIKit/UIKit.h>
+
+@class WhirlyGlobeRotateDelegate;
+
+// Sent out when the pinch delegate takes control
+#define kPinchDelegateDidStart @"WKPinchDelegateStarted"
+// Sent out when the pinch delegate finished (but hands off to momentum)
+#define kPinchDelegateDidEnd @"WKPinchDelegateEnded"
+
+/** WhirlyGlobe Pinch Gesture Delegate
+ Responds to pinches on a UIView and manipulates the globe view
+ accordingly.
+ */
+@interface WhirlyGlobePinchDelegate : NSObject <UIGestureRecognizerDelegate>
+
+/// Min and max height to allow the user to change
+@property (nonatomic,assign) float minHeight,maxHeight;
+
+/// If set we're cooperating with the rotation delegate (HACK!)
+@property (nonatomic,weak) WhirlyGlobeRotateDelegate *rotateDelegate;
+
+/// If set, we'll zoom around the pinch, rather than the center of the view
+@property (nonatomic,assign) bool zoomAroundPinch;
+
+/// If set, we'll rotate around the pinch
+@property (nonatomic,assign) bool doRotation;
+
+/// If set, we'll pan around the center point.  If not, we just zoom.
+@property (nonatomic,assign) bool allowPan;
+
+/// If set, we'll maintain north as up
+@property (nonatomic,assign) bool northUp;
+
+@property (nonatomic,weak) UIGestureRecognizer *gestureRecognizer;
+
+// If set, we'll keep track up rather than north up
+- (void)setTrackUp:(double)trackUp;
+
+// Turn track up back off
+- (void)clearTrackUp;
+
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/GlobeRotateDelegate.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/GlobeRotateDelegate.h
new file mode 100644
index 0000000..9e57c3a
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/GlobeRotateDelegate.h
@@ -0,0 +1,37 @@
+/*  GlobeRotateDelegate.h
+ *  WhirlyGlobeLib
+ *
+ *  Created by Steve Gifford on 6/10/11.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#import <UIKit/UIKit.h>
+
+@protocol WhirlyKitViewWrapper;
+
+/** Rotation delegate 
+    is for two fingered rotation around the axis at the middle of the screen
+ */
+@interface WhirlyGlobeRotateDelegate : NSObject <UIGestureRecognizerDelegate> 
+
+/// If set, the rotation will occur around the center between the two fingers rather than the current viewpoint
+@property (nonatomic) bool rotateAroundCenter;
+
+/// Gesture recognizer attached to this delegate (or vice versa, actually)
+@property (nonatomic,weak) UIGestureRecognizer *gestureRecognizer;
+
+/// Can be called by a cooperating delegate (which is also messing with rotation) (HACK!)
+- (void)updateWithCenter:(CGPoint)center touch:(CGPoint)touch wrapView:(UIView<WhirlyKitViewWrapper> *)glView;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/GlobeTapDelegate.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/GlobeTapDelegate.h
new file mode 100644
index 0000000..61e3492
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/GlobeTapDelegate.h
@@ -0,0 +1,29 @@
+/*  GlobeTapDelegate.h
+ *  WhirlyGlobeLib
+ *
+ *  Created by Steve Gifford on 2/3/11.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <UIKit/UIKit.h>
+
+/** WhirlyGlobe tap gesture delegate
+	responds to taps by blasting out a notification.
+ */
+@interface WhirlyGlobeTapDelegate : NSObject <UIGestureRecognizerDelegate>
+
+@property (nonatomic,weak) UIGestureRecognizer *gestureRecognizer;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/GlobeTiltDelegate.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/GlobeTiltDelegate.h
new file mode 100644
index 0000000..f326c3e
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/GlobeTiltDelegate.h
@@ -0,0 +1,28 @@
+/*  GlobeTiltDelegate.h
+ *
+ *  Created by Stephen Gifford on 1/5/15.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#import <WhirlyGlobeMaplyComponent/GlobePinchDelegate.h>
+
+// The tilt delegate handle the 3D camera tilt
+@interface WhirlyGlobeTiltDelegate : NSObject<UIGestureRecognizerDelegate>
+
+@property (nonatomic,weak) UIGestureRecognizer *gestureRecognizer;
+
+// Set so we can turn off the pinch delegate when we're working
+@property (nonatomic,weak) WhirlyGlobePinchDelegate *pinchDelegate;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/GlobeTwoFingerTapDelegate.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/GlobeTwoFingerTapDelegate.h
new file mode 100644
index 0000000..93bea5e
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/GlobeTwoFingerTapDelegate.h
@@ -0,0 +1,34 @@
+/*  GlobeTwoFingerTapDelegate.h
+ *
+ *  Created by Steve Gifford on 2/7/14.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
+
+@interface WhirlyGlobeTwoFingerTapDelegate : NSObject<UIGestureRecognizerDelegate>
+
+@property (nonatomic,weak) UIGestureRecognizer *gestureRecognizer;
+
+// How much we zoom in by
+@property (nonatomic) float zoomTapFactor;
+
+// How long the zoom animation takes
+@property (nonatomic) float zoomAnimationDuration;
+
+/// Zoom limits
+@property (nonatomic) float minZoom,maxZoom;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MapboxVectorInterpreter.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MapboxVectorInterpreter.h
new file mode 100644
index 0000000..6229604
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MapboxVectorInterpreter.h
@@ -0,0 +1,65 @@
+/*
+ *  MapboxVectorTilesImageDelegate.h
+ *  WhirlyGlobe-MaplyComponent
+ *
+ *  Created by Steve Gifford on January 24 2018
+ *  Copyright 2011-2022 Saildrone
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+
+#import <Foundation/Foundation.h>
+#import <WhirlyGlobeMaplyComponent/MaplyTileSourceNew.h>
+#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
+#import <WhirlyGlobeMaplyComponent/MaplyVectorStyle.h>
+#import <WhirlyGlobeMaplyComponent/MapboxVectorTiles.h>
+#import <WhirlyGlobeMaplyComponent/MaplyQuadImageFrameLoader.h>
+
+@class MapboxVectorStyleSet;
+
+/**
+ An interpreter for Mapbox Vector Tiles.
+ 
+ This will turn vector tiles into images, visual objects, or a combination of the two.  Loader interpreters like
+    this one can be used by Loaders that talk to ondevice objects (such as MBTiles files) or remote tile
+    sources.
+ */
+@interface MapboxVectorInterpreter : NSObject<MaplyLoaderInterpreter>
+
+/** This version of the init takes an image style set, a vector style set,
+    and an offline renderer to build the image tiles.
+ 
+    Image tiles will be used as a background and vectors put on top of them.
+    This is very nice for the globe, but requires specialized style sheets.
+  */
+- (instancetype _Nullable ) initWithImageStyle:(NSObject<MaplyVectorStyleDelegate> *__nonnull)imageStyle
+                         offlineRender:(MaplyRenderController *__nonnull)renderControl
+                           vectorStyle:(NSObject<MaplyVectorStyleDelegate> *__nonnull)vectorStyle
+                                 viewC:(NSObject<MaplyRenderControllerProtocol> *__nonnull)viewC;
+
+/** This version of the init builds visual features for vector tiles.
+ 
+    This interpreter can be used as overlay data or a full map, depending
+    on how your style is configured.
+  */
+- (instancetype __nullable) initWithVectorStyle:(NSObject<MaplyVectorStyleDelegate> *__nonnull)vectorStyle
+                                          viewC:(NSObject<MaplyRenderControllerProtocol> *__nonnull)viewC;
+
+/**
+ Set an optional list of unique features we'll filter on.
+ Any feature we want to pass through must have the given attribute name and one of the values.
+ */
+- (void)setUUIDName:(NSString * __nonnull)uuidName uuidValues:(NSArray<NSString *> * __nonnull)uuids;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MapboxVectorStyleSet.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MapboxVectorStyleSet.h
new file mode 100644
index 0000000..acf5d30
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MapboxVectorStyleSet.h
@@ -0,0 +1,139 @@
+/*
+ *  MapboxVectorStyleSet.h
+ *  WhirlyGlobe-MaplyComponent
+ *
+ *  Created by Steve Gifford on 2/16/15.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <Foundation/Foundation.h>
+#import <WhirlyGlobeMaplyComponent/MaplyVectorStyle.h>
+#import <WhirlyGlobeMaplyComponent/MapboxVectorTiles.h>
+
+typedef NS_ENUM(NSUInteger,MapboxLayerType) {
+    MapboxLayerTypeBackground,
+    MapboxLayerTypeCircle,
+    MapboxLayerTypeFill,
+    MapboxLayerTypeLine,
+    MapboxLayerTypeRaster,
+    MapboxLayerTypeSymbol,
+    MapboxLayerTypeUnknown
+};
+
+/**
+ A single entry in the legend array returned by
+ */
+@interface MaplyLegendEntry : NSObject
+
+/// Name of this entry
+@property (nonatomic,nonnull) NSString *name;
+
+/// Image for this entry, if this is a single entry
+@property (nonatomic,nullable) UIImage *image;
+
+/// Array of entries if this is a group
+@property (nonatomic,nullable) NSMutableArray<MaplyLegendEntry *> *entries;
+
+@end
+
+/** @brief The Mapbox Vector Style Set parses Mapbox GL Style sheets and turns them into Maply compatible styles.
+    @details A style delegate is required by the Mapnik parser to build geometry out of Mapnik vector tiles.  This style delegate can read a Mapbox GL Style sheet and produce compatible styles.
+ */
+@interface MapboxVectorStyleSet : NSObject<MaplyVectorStyleDelegate>
+
+/// @brief Initialize with the style dictionary alreayd parsed from JSON
+/// @details We'll parse the style JSON passed in and return nil on failure.
+/// @details The optional filter can be used to reject layers we won't use
+- (id __nullable)initWithDict:(NSDictionary * __nonnull)styleDict
+                     settings:(MaplyVectorStyleSettings * __nonnull)settings
+                        viewC:(NSObject<MaplyRenderControllerProtocol> * __nonnull)viewC;
+
+/// @brief Initialize with the style JSON and the view controller
+/// @details We'll parse the style JSON passed in and return nil on failure.
+/// @details The optional filter can be used to reject layers we won't use
+- (id __nullable)initWithJSON:(NSData * __nonnull)styleJSON
+                     settings:(MaplyVectorStyleSettings * __nonnull)settings
+                        viewC:(NSObject<MaplyRenderControllerProtocol> * __nonnull)viewC;
+
+/// @brief Where we can fetch the sprites
+@property (nonatomic, strong, nullable) NSString *spriteURL;
+
+/// Tile sources
+@property (nonatomic, strong, nonnull) NSArray *sources;
+
+/// All the layer names
+@property (nonatomic) NSArray<NSString *> * __nonnull layerNames;
+
+/// Type of the given layer
+- (MapboxLayerType) layerType:(NSString * __nonnull)layerName;
+
+/// Add the sprint sheet for use in symbols.  Return false on failures.
+- (bool)addSprites:(NSDictionary * __nonnull)spriteDict image:(UIImage * __nonnull)image;
+
+/**
+ This method will poke around in the given layer to determine a distinc color for it.
+ For circle layers, you get the circle color.  For fill and line layers, it's the paint color.
+ For symbols, you get the text color.
+ This is useful for visualizing layers, it has nothing to do with rendering them.
+ */
+- (UIColor * __nullable) colorForLayer:(NSString *__nonnull)layerName;
+
+/// If there is a background layer, calculate the color for a given zoom level.
+/// Otherwise return nil
+- (UIColor * __nullable)backgroundColorForZoom:(double)zoom;
+
+/// Make a layer visible/invisible
+- (void)setLayerVisible:(NSString *__nonnull)layerName visible:(bool)visible;
+
+/// Slot for continuous zoom levels.  If not set, we won't use those.
+- (void)setZoomSlot:(int)zoomSlot;
+
+/**
+ Returns a dictionary containing a flexible legend for the layers contained in this style.
+ Each layer is rendered as a representative image at the given size.
+ Layer names that start with the same "<name>_" will be grouped together in the hiearchy if
+  the group parameter is set.  Otherwise they'll be flat.
+ */
+- (NSArray<MaplyLegendEntry *> * __nonnull)layerLegend:(CGSize)imageSize group:(bool)useGroups;
+
+@property (nonatomic, weak, nullable) NSObject<MaplyRenderControllerProtocol> *viewC;
+
+@end
+
+typedef enum : NSUInteger {
+    MapboxSourceVector,
+    MapboxSourceRaster,
+    // TODO: Support the rest of these eventually
+} MapboxSourceType;
+
+// Sources are called out individually
+@interface MaplyMapboxVectorStyleSource : NSObject
+
+// Name of the source
+@property (nonatomic,nullable) NSString *name;
+
+// Vector and raster sources supported for now
+@property (nonatomic) MapboxSourceType type;
+
+// TileJSON URL, if present
+@property (nonatomic,nullable) NSString *url;
+
+// If the TileJSON spec is inline, this is it
+@property (nonatomic,nullable) NSDictionary *tileSpec;
+
+// Initialize with the entry in the style file
+- (id __nullable)initWithName:(NSString *__nonnull)name styleEntry:(NSDictionary * __nonnull)styleEntry styleSet:(MapboxVectorStyleSet * __nonnull)styleSet viewC:(NSObject<MaplyRenderControllerProtocol> * __nonnull)viewC;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MapboxVectorTiles.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MapboxVectorTiles.h
new file mode 100644
index 0000000..b52cd5b
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MapboxVectorTiles.h
@@ -0,0 +1,65 @@
+/*
+ *  MapboxVectorTiles.h
+ *  WhirlyGlobeLib
+ *
+ *  Created by Steve Gifford on 4/10/19.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <WhirlyGlobeMaplyComponent/MaplyVectorTileStyle.h>
+#import <WhirlyGlobeMaplyComponent/MaplyTileSourceNew.h>
+#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
+#import <WhirlyGlobeMaplyComponent/MaplyVectorStyle.h>
+
+typedef NS_ENUM(NSInteger,MapboxGeometryType)
+{
+    GeomTypeUnknown = 0,
+    GeomTypePoint = 1,
+    GeomTypeLineString = 2,
+    GeomTypePolygon = 3
+};
+
+
+/**
+  Container for data parsed out of a Mapbox Vector Tile stream.
+ 
+  This holds the parsed data as well as post-constructed data.  You will likely be handed one of these
+    if you see it at all.  There are few cases where you might construct one.
+  */
+@interface MaplyVectorTileData : NSObject
+
+/// Initialize with tile and bounds, both local coordinates and geographic
+- (id)initWithID:(MaplyTileID)tileID bbox:(MaplyBoundingBoxD)bbox geoBBox:(MaplyBoundingBoxD)geoBBox;
+
+/// Tile ID for the tile being built
+@property (readonly) MaplyTileID tileID;
+
+/// Bounding box in local coordinates
+@property (readonly) MaplyBoundingBoxD bounds;
+
+/// Bounding box in geographic
+@property (readonly) MaplyBoundingBoxD geoBounds;
+
+/// Add a single component object for tracking
+- (void)addComponentObject:(MaplyComponentObject *)compObj;
+
+/// When a style builds a component object, it needs to add it here
+///  for tracking.  This lets us delete it later.
+- (void)addComponentObjects:(NSArray *)compObjs;
+
+/// Return all the component objects thus collected
+- (NSArray *)componentObjects;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/Maply3DTouchPreviewDatasource.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/Maply3DTouchPreviewDatasource.h
new file mode 100644
index 0000000..ef42bf5
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/Maply3DTouchPreviewDatasource.h
@@ -0,0 +1,38 @@
+//
+//  Maply3DTouchPreviewDatasource.h
+//  WhirlyGlobe-MaplyComponent
+//
+//  Created by Jesse Crocker on 10/4/15.
+//
+//
+
+@class MaplyBaseViewController;
+
+@protocol Maply3dTouchPreviewDatasource <NSObject>
+
+@required
+/** 
+    Asks the data source for a view controller to display as a preview for a selected object
+ 
+    @param viewC the map requesting the view controller;
+ 
+    @param selectedObj The object a preview is being requested for.
+ 
+    @return a UIViewController, or nil if no preview should be displayed.
+ */
+- (UIViewController * _Nullable)maplyViewController:(MaplyBaseViewController * _Nonnull)viewC
+                  previewViewControllerForSelection:(NSObject * _Nonnull)selectedObj;
+
+/** 
+    Asks the data source to present a preview view controller.
+ 
+    the most likely implementation of this is [self show:previewViewC sender:self];
+ 
+    @param viewC the map requesting the view controller;
+ 
+    @param previewViewC the view controller to present.
+ */
+- (void)maplyViewController:(MaplyBaseViewController * _Nonnull)viewC
+  showPreviewViewController:(UIViewController * _Nonnull)previewViewC;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/Maply3dTouchPreviewDelegate.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/Maply3dTouchPreviewDelegate.h
new file mode 100644
index 0000000..5986f38
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/Maply3dTouchPreviewDelegate.h
@@ -0,0 +1,26 @@
+//
+//  Maply3dTouchDelegate.h
+//  WhirlyGlobeLib
+//
+//  Created by Jesse Crocker on 10/4/15.
+//
+//
+
+#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
+#import <WhirlyGlobeMaplyComponent/Maply3DTouchPreviewDatasource.h>
+
+@class MaplyBaseInteractionLayer;
+@class MaplyBaseViewController;
+
+@interface Maply3dTouchPreviewDelegate : NSObject <UIViewControllerPreviewingDelegate>
+
+@property (nonatomic, strong) NSObject<Maply3dTouchPreviewDatasource> * _Nonnull datasource;
+
+/// Create and configure new Maply3dTouchPreviewDelegate, but it is not activated.
++ (Maply3dTouchPreviewDelegate * _Nonnull)touchDelegate:(MaplyBaseViewController * _Nonnull)maplyViewC
+                                  interactLayer:( MaplyBaseInteractionLayer* _Nonnull)interactLayer
+                             datasource:(NSObject<Maply3dTouchPreviewDatasource>* _Nonnull)datasource;
+
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyActiveObject.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyActiveObject.h
new file mode 100644
index 0000000..864e853
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyActiveObject.h
@@ -0,0 +1,70 @@
+/*
+ *  MaplyActiveObject.h
+ *  WhirlyGlobe-MaplyComponent
+ *
+ *  Created by Steve Gifford on 4/3/13.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <Foundation/Foundation.h>
+
+@class MaplyBaseViewController;
+@protocol MaplyRenderControllerProtocol;
+
+/** 
+    Active Objects are used implement animation.
+    
+    Active Objects work in conjuction with the renderer to make updates on the main thread.  The way they work is this.  They're called right at the beginning of a frame draw.  They can make updates to regular Maply objects via the MaplyBaseViewController add and remove calls with the MaplyThreadMode set to MaplyThreadCurrent.  This forces the changes to happen immediately on the current (main) thread.
+
+    Fill in at least the hasUpdate and updateForFrameMethods.
+ 
+    Active Objects are run on the main thread and you're probably going to be asking the view controller to add and remove objects on the main thread.  As such, this can be slow.  Be sure to precalculate whatever you might need to make this run faster.  Also consider implementing your changes another way.  If it can be done on another thread, do it on another thread.
+ 
+ */
+@interface MaplyActiveObject : NSObject
+
+/** 
+    Initialize with a view controller
+    
+    The default initializer just takes a view controller.  If you replace this with your own, be sure to pass in what you need.
+  */
+- (nonnull instancetype)initWithViewController:(NSObject<MaplyRenderControllerProtocol> *__nonnull)viewC;
+
+/// The view controller this active object is associated with
+@property (nonatomic,weak,readonly) NSObject<MaplyRenderControllerProtocol> *__nullable viewC;
+
+/** Has Update
+ 
+    This is called every frame to determine if the active model has an update.
+    If it doesn't, we may not need to render.  So use this judiciously.
+  */
+- (bool)hasUpdate;
+
+/** Update for the current frame.
+ 
+    Run the update right now.  This should not take too long, as it's holding up
+    the renderer.
+ 
+    The frameInfo object is undefined at this point.
+  */
+- (void)updateForFrame:(void * __nonnull)frameInfo;
+
+/** Teardown active model.
+ 
+    The active model will no longer be run.  Get rid of your internal state.
+  */
+- (void)teardown;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyAnnotation.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyAnnotation.h
new file mode 100644
index 0000000..0a30524
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyAnnotation.h
@@ -0,0 +1,71 @@
+/*
+ *  MaplyAnnotation.h
+ *  WhirlyGlobe-MaplyComponent
+ *
+ *  Created by Steve Gifford on 12/13/13.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <UIKit/UIKit.h>
+#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
+
+/** 
+    This object displays an annotation at a particular point and will track that point as the map or globe moves.
+    
+    An annotation is used to point out some feature on the globe or map, typically that the user has tapped on.  It's a multi-part beast that may contain titles, subtitles, images, background views and such.
+    
+    To add one, create the MaplyAnnotation and then call addAnnotation:forPoint:offset: on the MaplyBaseViewController.
+    
+    The MaplyAnnotation is a wrapper around the SMCalloutView by Nick Farina.  It exposes much of the functionality, but sets things up correctly and deals with moving the annotation around.
+  */
+@interface MaplyAnnotation : NSObject
+
+/// The minimum viewer height this annotation is visible at.
+/// This is viewer height above the globe or map.  The annotation will only be visible if the user is above this height.
+@property (nonatomic,assign) float minVis;
+
+/// The maximum viewer height this annotation is visible at.
+/// This is viewer height above the globe or map.  The annotation will only be visible if the user is below this height.
+@property (nonatomic,assign) float maxVis;
+
+/// Set the popup's title
+@property (nonatomic,strong) NSString *title;
+
+/// Set the popup's subtitle
+@property (nonatomic,strong) NSString *subTitle;
+
+/// If set, the (optional) accessory view on the left
+@property (nonatomic,strong) UIView *leftAccessoryView;
+
+/// If set, the (optional) accessory view on the right
+@property (nonatomic,strong) UIView *rightAccessoryView;
+
+/// If set, the custom title view containing whatever you like.
+@property (nonatomic,strong) UIView *titleView;
+
+/// If set, the custom subtitle view containing whatever you put in there.
+@property (nonatomic,strong) UIView *subtitleView;
+
+/// If set, a custom content view.  Title, subtitle and views are ignored.
+@property (nonatomic,strong) UIView *contentView;
+
+/// The location of the annotation
+@property (nonatomic,readonly) MaplyCoordinate loc;
+
+/// If set, we'll reposition the globe or map to make the annotation visible.
+/// If the annotation would be off screen we would normally reposition the globe or map to make it visible.  If this is et to false, we won't.
+@property (nonatomic) bool repositionForVisibility;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyAtmosphere.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyAtmosphere.h
new file mode 100644
index 0000000..3af444f
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyAtmosphere.h
@@ -0,0 +1,81 @@
+/*
+ *  MaplyAtmosphere.h
+ *  WhirlyGlobe-MaplyComponent
+ *
+ *  Created by Steve Gifford on 6/30/15.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <UIKit/UIKit.h>
+#import <WhirlyGlobeMaplyComponent/MaplyComponentObject.h>
+#import <WhirlyGlobeMaplyComponent/WhirlyGlobeViewController.h>
+#import <WhirlyGlobeMaplyComponent/MaplyLight.h>
+
+/** 
+    Sets up the objects and shaders to implement an atmosphere.
+    
+    This object sets up a shader implementation of the simple atmosphere from GPU Gems 2  http://http.developer.nvidia.com/GPUGems2/gpugems2_chapter16.html
+  */
+@interface MaplyAtmosphere : NSObject
+
+/// Initialize the view controller.  Will place objects in that view controller.
+- (nullable instancetype)initWithViewC:(WhirlyGlobeViewController *__nonnull)viewC;
+
+/// Rayleigh scattering constant (0.0025 by default)
+@property (nonatomic) float Kr;
+
+/// Mie scattering constant (0.0010 by default)
+@property (nonatomic) float Km;
+
+/// Brightness of the sun (20.0 by default)
+@property (nonatomic) float ESun;
+
+/// Number of samples for the ray through the atmosphere (3 by default)
+@property (nonatomic) int numSamples;
+
+/// Outer radius of the atmosphere (1.05 by default).  Earth is radius 1.0.
+@property (nonatomic) float outerRadius;
+
+/// Constant used in the fragment shader.  Default is -0.95.
+@property (nonatomic) float g;
+
+/// Exposure constant in fragment shader.  Default is 2.0.
+@property (nonatomic) float exposure;
+
+/// The ground shader we set up.  You need to apply it yourself.
+@property (nonatomic,nullable,strong) MaplyShader *groundShader;
+
+/// If set we'll lock the sun direction to the camera position.  Permanent daylight.
+@property (nonatomic) bool lockToCamera;
+
+/// Wavelengths of the light (RGB).  Three floats, defaults are: 0.650, 0.570, 0.475
+- (void)setWavelength:(float *__nonnull)wavelength;
+
+/// Wavelengths of the light (RGB).  Defaults are: 0.650, 0.570, 0.475
+- (void)setWavelengthRed:(float) redWavelength green:(float)greenWavelength blue:(float)blueWavelength;
+
+/// Return the current wavelength settings (RGB)
+- (void)getWavelength:(float *__nonnull)wavelength;
+
+/// Return the current wavelength settings (RGB). The component is 0 for red, 1 for green and  2 for blue
+- (float)getWavelengthForComponent:(short)component;
+
+/// Set the sun's position relative to the earth.  This is what comes out of MaplySun.
+- (void)setSunPosition:(MaplyCoordinate3d)sunDir;
+
+/// Remove objects from the view controller we set it up in.
+- (void)removeFromViewC;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyBaseViewController.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyBaseViewController.h
new file mode 100644
index 0000000..9d5715b
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyBaseViewController.h
@@ -0,0 +1,1575 @@
+/*  MaplyBaseViewController.h
+ *  MaplyComponent
+ *
+ *  Created by Steve Gifford on 12/14/12.
+ *  Copyright 2012-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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#import <UIKit/UIKit.h>
+#import <Metal/Metal.h>
+#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
+#import <WhirlyGlobeMaplyComponent/MaplyScreenMarker.h>
+#import <WhirlyGlobeMaplyComponent/MaplyVectorObject.h>
+#import <WhirlyGlobeMaplyComponent/MaplyViewTracker.h>
+#import <WhirlyGlobeMaplyComponent/MaplyComponentObject.h>
+#import <WhirlyGlobeMaplyComponent/MaplySharedAttributes.h>
+#import <WhirlyGlobeMaplyComponent/MaplyControllerLayer.h>
+#import <WhirlyGlobeMaplyComponent/MaplyLight.h>
+#import <WhirlyGlobeMaplyComponent/MaplyShader.h>
+#import <WhirlyGlobeMaplyComponent/MaplyActiveObject.h>
+#import <WhirlyGlobeMaplyComponent/MaplyTexture.h>
+#import <WhirlyGlobeMaplyComponent/MaplyAnnotation.h>
+#import <WhirlyGlobeMaplyComponent/MaplyParticleSystem.h>
+#import <WhirlyGlobeMaplyComponent/MaplyPoints.h>
+#import <WhirlyGlobeMaplyComponent/MaplyCluster.h>
+#import <WhirlyGlobeMaplyComponent/Maply3DTouchPreviewDatasource.h>
+#import <WhirlyGlobeMaplyComponent/MaplyLocationTracker.h>
+#import <WhirlyGlobeMaplyComponent/MaplyRenderTarget.h>
+#import <WhirlyGlobeMaplyComponent/MaplyRenderController.h>
+#import <WhirlyGlobeMaplyComponent/MaplyRemoteTileFetcher.h>
+#import <WhirlyGlobeMaplyComponent/MaplyVertexAttribute.h>
+
+typedef double (^ZoomEasingBlock)(double z0,double z1,double t);
+
+/** 
+    When selecting multiple objects, one or more of these is returned.
+    
+    When you implement one of the selection delegates that takes multiple objects, you'll get an NSArray of these things.
+  */
+@interface MaplySelectedObject : NSObject
+
+/// Object the user selected
+/// This is the original object the user passed in when adding it to the globe or map.
+@property (nonatomic) id __nullable selectedObj;
+
+/// Distance from where the user tapped to the closest part of the object on the screen
+@property double screenDist;
+
+/// Distance from the user's viewpoint to the center of the object in 3-space.  Use this for sorting.
+@property double zDist;
+
+/// Set if this was part of a cluster
+@property bool cluster;
+
+@end
+
+/** Snapshot Delegate
+ 
+    Snapshots can be run as callbacks after the rendering.  If you keep your area
+    small enough you can even do it every frame.  This is the protocol for
+    snapshot delegates.
+  */
+@protocol MaplySnapshotDelegate
+
+/// Return true if you want a snapshot for this frame
+- (bool)needSnapshot:(NSTimeInterval)now viewC:(MaplyBaseViewController * __nonnull)viewC;
+
+/// If you want the whole thing return CGRectZero, otherwise return the rectangle you want based
+///  on the number of pixels.  So multiply by the scale first.
+- (CGRect)snapshotRect;
+
+/// Here's your snapshot data.  Do what you will, but do it quickly.  You can hold onto the NSData.
+- (void)snapshot:(NSData * __nonnull)snapshotData;
+
+/// If you want a specific render target, return it.  Otherwise nil for the screen.
+- (MaplyRenderTarget * __nullable)renderTarget;
+
+@optional
+/// If a render target calculates the min/max values after rendering, this snapshot callback will be called as well
+- (void)snapshotMinMax:(NSData * __nonnull)snapshotData;
+
+@end
+
+
+@protocol MaplyLocationTrackerDelegate;
+
+/** 
+    Base class for the Maply and WhirlyGlobe view controllers.
+    
+    The Maply Base View Controller is where most of the functionality lives.  For the most part Maply and WhirlyGlobe share methods and data structures.  This view controller sets up the rendering, the threading, basically everything that makes WhirlyGlobe-Maply work.
+    
+    Don't create one of these directly, instead use the MaplyViewController or the WhirlyGlobeViewController.
+ */
+@interface MaplyBaseViewController : UIViewController <MaplyRenderControllerProtocol>
+
+/** 
+    Turn selection on or off globally.
+    
+    If on we'll forward selected features on to the delegate.  When off, we don't do that.  On by default.
+  */
+@property(nonatomic,assign) bool selection;
+
+/** 
+    Set the globe (not the UIView's) background color.
+    
+    This property sets the clear color used by OpenGL.  By default it's black.
+  */
+@property (nonatomic,strong) UIColor * __nullable clearColor;
+
+/** 
+    Set the frame interval passed to the CADisplayLink.
+    
+    This sets the frame rate the renderer will attempt to achieve.
+ 
+ |value|frames per second|
+ |:----|:----------------|
+ |1|60fps|
+ |2|30fps|
+ |3|20fps|
+ |4|15fps|
+ |5|12fps|
+ |6|Really?  No, you can do better.|
+  */
+@property (nonatomic,assign) int frameInterval;
+
+///** 
+//    The elevation delegate that will provide elevation data per tile.
+//    
+//    We break the image tiles out from the elevation tiles.  The data is often coming from different sources, but in the end this is a probably a hack.  It's a hack that's going to be in place for a while.
+//    
+//    To provide elevation for your compatible MaplyTileSource objects, you fill out the MaplyElevationSourceDelegate protocol and assign the resulting object here.  When an image layer needs elevation, it will check for the delegate and then query for the respective file.
+//    
+//    At present there is no checking for coordinate system compatibility, so be aware.
+//  */
+//@property (nonatomic,weak) NSObject<MaplyElevationSourceDelegate> *__nullable elevDelegate;
+
+/** 
+    Set the offset for the screen space objects.
+    
+    In general you want the screen space objects to appear on top of everything else.  There used to be structural reasons for this, but now you can mix and match where everything appears.  This controls the offset that's used to push screen space objects behind everything else in the list (and thus, on top).
+    
+    If you set this to 0, you can control the ordering of everything more precisely.
+ */
+@property (nonatomic,assign) int screenObjectDrawPriorityOffset;
+
+/**
+    Controls whether objects with unique IDs fade in and out when added or removed from the layout manager
+ */
+@property (nonatomic,assign) bool layoutFade;
+
+/**
+    Controls the way height changes while animating the view
+    For simple, linear zoom use:
+
+        zoomEasing = ^(double z0,double z1,double t) { return z0 + (z1 - z0) * t; };
+ */
+@property (readwrite,copy) ZoomEasingBlock _Nullable animationZoomEasing;
+
+
+/**
+    If in Metal rendering mode, return the Metal device being used.
+  */
+- (id<MTLDevice> __nullable)getMetalDevice;
+
+/**
+   If in Metal rendering mode, return the shader library set up by the toolkit.
+  */
+- (id<MTLLibrary> __nullable)getMetalLibrary;
+
+/** 
+    Clear all the currently active lights.
+    
+    There are a default set of lights, so you'll want to do this before adding your own.
+  */
+- (void)clearLights;
+
+/** 
+    Reset the lighting back to its default state at startup.
+    
+    This clears out all the lights and adds in the default starting light source.
+ */
+- (void)resetLights;
+
+/** 
+    Add the given light to the list of active lights.
+    
+    This method will add the given light to our active lights.  Most shaders will recognize these lights and do the calculations.  If you have a custom shader in place, it may or may not use these.
+    
+    Triangle shaders use the lights, but line shaders do not.
+  */
+- (void)addLight:(MaplyLight *__nonnull)light;
+
+/// Remove the given light (assuming it's active) from the list of lights.
+- (void)removeLight:(MaplyLight *__nonnull)light;
+
+/** 
+    Set the rendering hints to control how the renderer is configured.
+    
+    This is a bit vestigial, but still has a few important uses.  The hints should be set right after the init call.  Any later and they'll probably be ignored.
+    
+    The rendering hints are as follows.
+ 
+ |Key|Type|Description|
+ |:--|:---|:----------|
+ |kMaplyRenderHintZBuffer|bool|If set, we'll explicitly turn on the Z buffer.  Normally it's off until a drawable requests it, allowing us to play neat tricks with overlays.  The only time you should be turning this on is if you're doing 3D elevation.  The default is off.|
+ |kMaplyRenderHintCulling|bool|If set, we'll use the internal culling logic.  Texture and drawable atlases have largely made this pointless.  Leave it off unless you have a compelling reason to turn it on.|
+ |kMaplyRendererLightingMode|NSString|This can be set to @"none", in which case we use optimized shaders that do no lighting or "regular".  The latter is the default.|
+  */
+- (void)setHints:(NSDictionary *__nonnull)hintsDict;
+
+/// This calls addScreenMarkers:desc:mode: with mode set to MaplyThreadAny
+- (MaplyComponentObject *__nullable)addScreenMarkers:(NSArray *__nonnull)markers desc:(NSDictionary *__nullable)desc;
+
+/** 
+    Add one or more screen markers to the current scene.
+    
+    This method will add the given MaplyScreenMaker objects to the current scene.  It will use the parameters in the description dictionary and it will do it on the thread specified.
+    
+    @param markers An NSArray of MaplyScreenMarker objects.
+    
+    @param desc The desciption dictionary which controls how the markers will be constructed.  It takes the following entries.
+ 
+ |Key|Type|Description|
+ |:--|:---|:----------|
+ |kMaplyColor|UIColor|The color we'll use for the rectangle that makes up a marker. White by default.|
+ |kMaplyMinVis|NSNumber|This is viewer height above the globe or map.  The marker will only be visible if the user is above this height.  Off by default.|
+ |kMaplyMaxVis|NSNumber|This is viewer height above the globe or map.  The marker will only be visible if the user is below this height.  Off by default.|
+ |kMaplyMinViewerDist|NSNumber|Minimum distance from the viewer at which to display object(s).|
+ |kMaplyMaxViewerDist|NSNumber|Maximum distance from the viewer at which to display object(s).|
+ |kMaplyViewableCenterX|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center X coordinate.|
+ |kMaplyViewableCenterY|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center Y coordinate.|
+ |kMaplyViewableCenterZ|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center Z coordinate.|
+ |kMaplyDrawPriority|NSNumber|If set, the markers are sorted by this number.  Larger numbers will be sorted later.|
+ |kMaplyFade|NSNumber|The number of seconds to fade a marker in when it appears and out when it disappears.|
+ |kMaplyFadeIn|NSNumber|The number of seconds to fade a marker in when it appears.  This overrides kMaplyFade.|
+ |kMaplyFadeOut|NSNumber|The number of seconds to fade a marker out when it disappears.  This override kMaplyFade.|
+ |kMaplyFadeOutTime|NSNumber|If you want to create an object, just to have it fade out at a specific time, this is what you set.|
+ |kMaplyShader|NSString|If set, this is the name of the MaplyShader to use when rendering the screen markers.|
+ |kMaplyEnable|NSNumber boolean|On by default, but if off then the feature exists, but is not turned on.  It can be enabled with enableObjects:|
+ |kMaplyEnableStart|NSNumber|If set, this controls when the resulting objects will be activated.|
+ |kMaplyEnableEnd|NSNumber|If set, this controls when the resulting objects will be deactivated.|
+ |kMaplyUUID|NSString|Unique ID to match up alternate representations of the same element.|
+ |kMaplyRepresentation|NSString|Name of the representation presented by this object.|
+ |kMaplyClusterGroup|NSNumber|If set, the screen markers will be clustered together according to the given group ID.  Off by default, but 0 is the default cluster.|
+
+    
+    @param threadMode MaplyThreadAny is preferred and will use another thread, thus not blocking the one you're on.  MaplyThreadCurrent will make the changes immediately, blocking this thread.
+ 
+    
+    @return Returns a MaplyComponentObject, which can be used to make modifications or delete the objects created.
+  */
+- (MaplyComponentObject *__nullable)addScreenMarkers:(NSArray *__nonnull)markers desc:(NSDictionary *__nullable)desc mode:(MaplyThreadMode)threadMode;
+
+/** 
+    Add a cluster generator for making clustered marker images on demand.
+    
+    When the layout system clusters a bunch of markers or labels together, it needs new images to represent the cluster.
+    
+    You can provide a custom image for each group of markers by filling in one of these generates and passing it in.
+  */
+- (void)addClusterGenerator:(NSObject <MaplyClusterGenerator> *__nonnull)clusterGen;
+
+/// This calls addMarkers:desc:mode: with mode set to MaplyThreadAny
+- (MaplyComponentObject *__nullable)addMarkers:(NSArray *__nonnull)markers desc:(NSDictionary *__nullable)desc;
+
+/** 
+    Add one or more 3D markers to the current scene.
+    
+    This method will add the given MaplyMarker objects to the current scene.  It will use the parameters in the description dictionary and it will do it on the thread specified.
+    
+    @param markers An NSArray of MaplyMarker objects.
+    
+    @param desc The desciption dictionary which controls how the markers will be constructed.  It takes the following entries.
+ 
+ |Key|Type|Description|
+ |:--|:---|:----------|
+ |kMaplyColor|UIColor|The color we'll use for the rectangle that makes up a marker. White by default.|
+ |kMaplyMinVis|NSNumber|This is viewer height above the globe or map.  The marker will only be visible if the user is above this height.  Off by default.|
+ |kMaplyMaxVis|NSNumber|This is viewer height above the globe or map.  The marker will only be visible if the user is below this height.  Off by default.|
+ |kMaplyMinViewerDist|NSNumber|Minimum distance from the viewer at which to display object(s).|
+ |kMaplyMaxViewerDist|NSNumber|Maximum distance from the viewer at which to display object(s).|
+ |kMaplyViewableCenterX|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center X coordinate.|
+ |kMaplyViewableCenterY|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center Y coordinate.|
+ |kMaplyViewableCenterZ|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center Z coordinate.|
+ |kMaplyFade|NSNumber|The number of seconds to fade a marker in when it appears and out when it disappears.|
+ |kMaplyFadeIn|NSNumber|The number of seconds to fade a marker in when it appears.  This overrides kMaplyFade.|
+ |kMaplyFadeOut|NSNumber|The number of seconds to fade a marker out when it disappears.  This override kMaplyFade.|
+ |kMaplyFadeOutTime|NSNumber|If you want to create an object, just to have it fade out at a specific time, this is what you set.|
+ |kMaplyDrawPriority|NSNumber|Geometry is sorted by this value before being drawn.  This ensures that some objects can come out on top of others.  By default this is kMaplyMarkerDrawPriorityDefault.|
+ |kMaplyZBufferRead|NSNumber boolean|If set this geometry will respect the z buffer.  It's off by default, meaning that the geometry will draw on top of anything (respecting the kMaplyDrawPriority).|
+ |kMaplyZBufferWrite|NSNumber boolean|If set this geometry will write to the z buffer.  That means following geometry that reads the z buffer will be occluded.  This is off by default.|
+ |kMaplyEnable|NSNumber boolean|On by default, but if off then the feature exists, but is not turned on.  It can be enabled with enableObjects:|
+ |kMaplyUUID|NSString|Unique ID to match up alternate representations of the same element.|
+ |kMaplyRepresentation|NSString|Name of the representation presented by this object.|
+
+ 
+    @param threadMode MaplyThreadAny is preferred and will use another thread, thus not blocking the one you're on.  MaplyThreadCurrent will make the changes immediately, blocking this thread.
+ 
+ 
+    @return Returns a MaplyComponentObject, which can be used to make modifications or delete the objects created.
+ */
+- (MaplyComponentObject *__nullable)addMarkers:(NSArray *__nonnull)markers desc:(NSDictionary *__nullable)desc mode:(MaplyThreadMode)threadMode;
+
+/// This calls addScreenLabels:desc:mode: with mode set to MaplyThreadAny
+- (MaplyComponentObject *__nullable)addScreenLabels:(NSArray *__nonnull)labels desc:(NSDictionary *__nullable)desc;
+
+/** 
+    Add one or more screen labels to the current scene.
+    
+    This method will add the given MaplyScreenLabel objects to the current scene.  It will use the parameters in the description dictionary and it will do it on the thread specified.
+    
+    @param labels An NSArray of MaplyScreenLabel objects.
+    
+    @param desc The desciption dictionary which controls how the labels will be constructed.  It takes the following entries.
+ 
+ |Key|Type|Description|
+ |:--|:---|:----------|
+ |kMaplyTextColor|UIColor|Color we'll use for the text. Black by default.|
+ |kMaplyBackgroundColor|UIColor|Color we'll use for the rectangle background.  Use clearColor to make this invisible.|
+ |kMaplyFont|UIFont|The font we'll use for the text.|
+ |kMaplyLabelHeight|NSNumber|Height of the text in points.|
+ |kMaplyLabelWidth|NSNumber|Width of the text in points.  It's best to set Height and leave this out.  That way the width will be calculated by the toolkit.|
+ |kMaplyJustify|NSString|This can be set to @"middle", @"left", or @"right" to justify the text around the location.|
+ |kMaplyTextJustify|NSString|This can be kMaplyTextJustifyRight, kMaplyTextJustifyCenter, or kMaplyTextJustifyLeft|
+ |kMaplyShadowSize|NSNumber|If set, we'll draw a shadow with the kMaplyShadowColor offset by this amount.  We recommend using an outline instead.|
+ |kMaplyShadowColor|UIColor|If we're drawing a shadow, this is its color.|
+ |kMaplyTextOutlineSize|NSNumber|If set, we'll draw an outline around the text (really draw it twice).  The outline will be this large.|
+ |kMaplyTextOutlineColor|UIColor|If we're drawing an outline, it's in this color.|
+ |kMaplyMinVis|NSNumber|This is viewer height above the globe or map.  The label will only be visible if the user is above this height.  Off by default.|
+ |kMaplyMaxVis|NSNumber|This is viewer height above the globe or map.  The label will only be visible if the user is below this height.  Off by default.|
+ |kMaplyMinViewerDist|NSNumber|Minimum distance from the viewer at which to display object(s).|
+ |kMaplyMaxViewerDist|NSNumber|Maximum distance from the viewer at which to display object(s).|
+ |kMaplyViewableCenterX|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center X coordinate.|
+ |kMaplyViewableCenterY|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center Y coordinate.|
+ |kMaplyViewableCenterZ|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center Z coordinate.|
+ |kMaplyDrawPriority|NSNumber|If set, the labels are sorted by this number.  Larger numbers will be sorted later.|
+ |kMaplyFade|NSNumber|The number of seconds to fade a screen label in when it appears and out when it disappears.|
+ |kMaplyEnable|NSNumber boolean|On by default, but if off then the feature exists, but is not turned on.  It can be enabled with enableObjects:|
+ |kMaplyEnableStart|NSNumber|If set, this controls when the resulting objects will be activated.|
+ |kMaplyEnableEnd|NSNumber|If set, this controls when the resulting objects will be deactivated.|
+ |kMaplyUUID|NSString|Unique ID to match up alternate representations of the same element.|
+ |kMaplyRepresentation|NSString|Name of the representation presented by this object.|
+
+    
+    @param threadMode MaplyThreadAny is preferred and will use another thread, thus not blocking the one you're on.  MaplyThreadCurrent will make the changes immediately, blocking this thread.
+ 
+    
+    @return Returns a MaplyComponentObject, which can be used to make modifications or delete the objects created.
+ */
+- (MaplyComponentObject *__nullable)addScreenLabels:(NSArray *__nonnull)labels desc:(NSDictionary *__nullable)desc mode:(MaplyThreadMode)threadMode;
+
+/// This calls addLabels:desc:mode: with mode set to MaplyThreadAny
+- (MaplyComponentObject *__nullable)addLabels:(NSArray *__nonnull)labels desc:(NSDictionary *__nullable)desc;
+
+/** 
+    Add one or more 3D labels to the current scene.
+    
+    This method will add the given MaplyLabel objects to the current scene.  It will use the parameters in the description dictionary and it will do it on the thread specified.
+    
+    @param labels An NSArray of MaplyLabel objects.
+    
+    @param desc The desciption dictionary which controls how the labels will be constructed.  It takes the following entries.
+ 
+ |Key|Type|Description|
+ |:--|:---|:----------|
+ |kMaplyTextColor|UIColor|Color we'll use for the text. Black by default.|
+ |kMaplyBackgroundColor|UIColor|Color we'll use for the rectangle background.  Use clearColor to make this invisible.|
+ |kMaplyFont|UIFont|The font we'll use for the text.|
+ |kMaplyLabelHeight|NSNumber|Height of the text in display coordinates.  For the globe these are based on radius = 1.0.|
+ |kMaplyLabelWidth|NSNumber|Width of the text in display coordinates.  It's best to set Height and leave this out.  That way the width will be calculated by the toolkit.|
+ |kMaplyJustify|NSString|This can be set to @"middle", @"left", or @"right" to justify the text around the location.|
+ |kMaplyShadowSize|NSNumber|If set, we'll draw a shadow with the kMaplyShadowColor offset by this amount.  We recommend using an outline instead.|
+ |kMaplyShadowColor|UIColor|If we're drawing a shadow, this is its color.|
+ |kMaplyMinVis|NSNumber|This is viewer height above the globe or map.  The label will only be visible if the user is above this height.  Off by default.|
+ |kMaplyMaxVis|NSNumber|This is viewer height above the globe or map.  The label will only be visible if the user is below this height.  Off by default.|
+ |kMaplyMinViewerDist|NSNumber|Minimum distance from the viewer at which to display object(s).|
+ |kMaplyMaxViewerDist|NSNumber|Maximum distance from the viewer at which to display object(s).|
+ |kMaplyViewableCenterX|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center X coordinate.|
+ |kMaplyViewableCenterY|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center Y coordinate.|
+ |kMaplyViewableCenterZ|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center Z coordinate.|
+ |kMaplyFade|NSNumber|The number of seconds to fade a label in when it appears and out when it disappears.|
+ |kMaplyDrawPriority|NSNumber|Geometry is sorted by this value before being drawn.  This ensures that some objects can come out on top of others.  By default this is kMaplyLabelDrawPriorityDefault.|
+ |kMaplyZBufferRead|NSNumber boolean|If set this geometry will respect the z buffer.  It's off by default, meaning that the geometry will draw on top of anything (respecting the kMaplyDrawPriority).|
+ |kMaplyZBufferWrite|NSNumber boolean|If set this geometry will write to the z buffer.  That means following geometry that reads the z buffer will be occluded.  This is off by default.|
+ |kMaplyEnable|NSNumber boolean|On by default, but if off then the feature exists, but is not turned on.  It can be enabled with enableObjects:|
+ |kMaplyUUID|NSString|Unique ID to match up alternate representations of the same element.|
+ |kMaplyRepresentation|NSString|Name of the representation presented by this object.|
+
+    @param threadMode MaplyThreadAny is preferred and will use another thread, thus not blocking the one you're on.  MaplyThreadCurrent will make the changes immediately, blocking this thread.
+ 
+ 
+    @return Returns a MaplyComponentObject, which can be used to make modifications or delete the objects created.
+ */
+- (MaplyComponentObject *__nullable)addLabels:(NSArray *__nonnull)labels desc:(NSDictionary *__nullable)desc mode:(MaplyThreadMode)threadMode;
+
+/// This calls addVectors:desc:mode: with mode set to MaplyThreadAny
+- (MaplyComponentObject *__nullable)addVectors:(NSArray *__nonnull)vectors desc:(NSDictionary *__nullable)desc;
+
+/** 
+    Add one or more vectors to the current scene.
+   
+    This method will add the given MaplyVectorObject objects to the current scene.  It will use the parameters in the description dictionary and it will do it on the thread specified.
+   
+    @param vectors An NSArray of MaplyVectorObject objects.
+   
+    @param desc The desciption dictionary which controls how the vectors will look.  It takes the following entries.
+ 
+ |Key|Type|Description|
+ |:--|:---|:----------|
+ |kMaplyColor|UIColor|Color we'll use for the vector features.|
+ |kMaplyVecWidth|NSNumber|If the geometry is not filled, this is the width of the GL lines.|
+ |kMaplyFilled|NSNumber boolean|If set, the areal geometry will be tesselated, taking holes into account.  The resulting triangles will be displayed instead of the vectors.|
+ |kMaplySubdivType|NSString|When present, this requests that the geometry be broken up to follow the globe (really only makes sense there).  It can be set to kMaplySubdivGreatCircle or kMaplySubdivSimple which do a great circle subdivision and a simple 3-space subdivision respectively.  If the key is missing, we do no subdivision at all.|
+ |kMaplySubdivEpsilon|NSNumber|If there's a kMaplySubdivType set this is the epsilon we'll pass into the subdivision routine.  The value is in display coordinates. 0.01 is a reasonable value.  Smaller results in more subdivision.|
+ |kMaplyVecTexture|UIImage|If set and the kMaplyFilled attribute is set, we will apply the given texture across any areal features.  How the texture is applied can be controlled by kMaplyVecTexScaleX, kMaplyVecTexScaleY, kMaplyVecCenterX, kMaplyVecCenterY, and kMaplyVecTextureProjection|
+ |kMaplyVecTexScaleX,kMaplyVecTexScaleY|NSNumber|These control the scale of the texture application.  We'll multiply by these numbers before generating texture coordinates from the vertices.|
+ |kMaplyVecCenterX,kMaplyVecCenterY|NSNumber|These control the center of a texture application.  If not set we'll use the areal's centroid.  If set, we'll use these instead.  They should be in local coordinates (probably geographic radians).|
+ |kMaplyVecTextureProjection|NSString|This controls how a texture is projected onto an areal feature.  By default we just use the geographic coordinates and stretch them out.  This looks odd for very large features.  If you set this to kMaplyProjectionTangentPlane then we'll take the center of the feature, make a tangent plane and then project the coordinates onto that tangent plane to get texture coordinates.  This looks nice at the poles.  If set to kMaplyProjectionScreen the texture is mapped on after screen space projection around the center of the feature.|
+ |kMaplyMinVis|NSNumber|This is viewer height above the globe or map.  The vectors will only be visible if the user is above this height.  Off by default.|
+ |kMaplyMaxVis|NSNumber|This is viewer height above the globe or map.  The vectors will only be visible if the user is below this height.  Off by default.|
+ |kMaplyMinViewerDist|NSNumber|Minimum distance from the viewer at which to display object(s).|
+ |kMaplyMaxViewerDist|NSNumber|Maximum distance from the viewer at which to display object(s).|
+ |kMaplyViewableCenterX|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center X coordinate.|
+ |kMaplyViewableCenterY|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center Y coordinate.|
+ |kMaplyViewableCenterZ|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center Z coordinate.|
+ |kMaplyFade|NSNumber|The number of seconds to fade a vector in when it appears and out when it disappears.|
+ |kMaplyDrawPriority|NSNumber|Geometry is sorted by this value before being drawn.  This ensures that some objects can come out on top of others.  By default this is kMaplyVectorDrawPriorityDefault.|
+ |kMaplyZBufferRead|NSNumber boolean|If set this geometry will respect the z buffer.  It's off by default, meaning that the geometry will draw on top of anything (respecting the kMaplyDrawPriority).|
+ |kMaplyZBufferWrite|NSNumber boolean|If set this geometry will write to the z buffer.  That means following geometry that reads the z buffer will be occluded.  This is off by default.|
+ |kMaplyEnable|NSNumber boolean|On by default, but if off then the feature exists, but is not turned on.  It can be enabled with enableObjects:|
+ |kMaplySelectable|NSNumber boolean|Off by default.  When enabled, the vector feature will be selectable by a user.|
+ |kMaplyUUID|NSString|Unique ID to match up alternate representations of the same element.|
+ |kMaplyRepresentation|NSString|Name of the representation presented by this object.|
+
+    @param threadMode MaplyThreadAny is preferred and will use another thread, thus not blocking the one you're on.  MaplyThreadCurrent will make the changes immediately, blocking this thread.
+ 
+ 
+    @return Returns a MaplyComponentObject, which can be used to make modifications or delete the objects created.
+ */
+- (MaplyComponentObject *__nullable)addVectors:(NSArray *__nonnull)vectors desc:(NSDictionary *__nullable)desc mode:(MaplyThreadMode)threadMode;
+
+/** 
+    Make a copy of the base object and apply the attributes given for the new version.
+ 
+    This call makes a cheap copy of the vectors in the given MaplyComponentObject and applies the given description to them.  You can use this to make a wider or thinner version of a set of vectors, or change their color, while continuing to draw the originals.  Or not, as the case may be.
+ 
+    This is useful for vector maps where we tend to reuse the same geometry at multiple levels and with different colors and line widths.
+ 
+    Instancing only works with a handful of visual changes.  For instance, you can't make a filled and non-filled version.
+ 
+    @param baseObj The MaplyComponentObject returned by an addVectors: call.  This only works for vectors.
+ 
+    @param desc The description dictionary with controls how vectors will be displayed.  It takes the following entries.
+
+ |Key|Type|Description|
+ |:--|:---|:----------|
+ |kMaplyColor|UIColor|Color we'll use for the vector features.|
+ |kMaplyVecWidth|NSNumber|If the geometry is not filled, this is the width of the GL lines.|
+ |kMaplyMinVis|NSNumber|This is viewer height above the globe or map.  The vectors will only be visible if the user is above this height.  Off by default.|
+ |kMaplyMaxVis|NSNumber|This is viewer height above the globe or map.  The vectors will only be visible if the user is below this height.  Off by default.|
+ |kMaplyMinViewerDist|NSNumber|Minimum distance from the viewer at which to display object(s).|
+ |kMaplyMaxViewerDist|NSNumber|Maximum distance from the viewer at which to display object(s).|
+ |kMaplyViewableCenterX|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center X coordinate.|
+ |kMaplyViewableCenterY|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center Y coordinate.|
+ |kMaplyViewableCenterZ|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center Z coordinate.|
+ |kMaplyDrawPriority|NSNumber|Geometry is sorted by this value before being drawn.  This ensures that some objects can come out on top of others.  By default this is kMaplyVectorDrawPriorityDefault.|
+ |kMaplyEnable|NSNumber boolean|On by default, but if off then the feature exists, but is not turned on.  It can be enabled with enableObjects:|
+ |kMaplyUUID|NSString|Unique ID to match up alternate representations of the same element.|
+ |kMaplyRepresentation|NSString|Name of the representation presented by this object.|
+
+    @param threadMode MaplyThreadAny is preferred and will use another thread, thus not blocking the one you're on.  MaplyThreadCurrent will make the changes immediately, blocking this thread.
+ 
+ 
+    @return Returns a MaplyComponentObject, which can be used to make modifications or delete the objects created.
+ */
+- (MaplyComponentObject *__nullable)instanceVectors:(MaplyComponentObject *__nonnull)baseObj desc:(NSDictionary *__nullable)desc mode:(MaplyThreadMode)threadMode;
+
+/** 
+    Add one or more widened vectors to the current scene.
+    
+    Build widened vectors
+
+ 
+    @param desc The description dictionary which controls how vectors will be displayed.  It takes the following entries.
+
+ |Key|Type|Description|
+ |:--|:---|:----------|
+ |kMaplyColor|UIColor|Color we'll use for the features.|
+ |kMaplyVecWidth|NSNumber|If the geometry is not filled, this is the width of the lines.|
+ |kMaplyWideVecCoordType|NSNumber|Vectors can be widened in real coordinates (kMaplyWideVecCoordTypeReal) or screen coordinates (kMaplyWideVecCoordTypeScreen).  In the latter case they stay the same size now matter how you zoom.|
+ |kMaplyWideVecJoinType|NSNumber|When lines meet in a join there are several options for representing them.  These include kMaplyWideVecMiterJoin, which is a simple miter join and kMaplyWideVecBevelJoin which is a more complicated bevel.  See http://www.w3.org/TR/SVG/painting.html#StrokeLinejoinProperty for how these look.|
+ |kMaplyWideVecMiterLimit|NSNumber|When using miter joins you can trigger them at a certain threshold.|
+ |kMaplyWideVecTexRepeatLen|NSNumber|This is the repeat size for a texture applied along the widened line.  For kMaplyWideVecCoordTypeScreen this is pixels.|
+ |kMaplyVecTexture|UIImage or MaplyTexture|This the texture to be applied to the widened vector.|
+ |kMaplyMinVis|NSNumber|This is viewer height above the globe or map.  The vectors will only be visible if the user is above this height.  Off by default.|
+ |kMaplyMaxVis|NSNumber|This is viewer height above the globe or map.  The vectors will only be visible if the user is below this height.  Off by default.|
+ |kMaplyMinViewerDist|NSNumber|Minimum distance from the viewer at which to display object(s).|
+ |kMaplyMaxViewerDist|NSNumber|Maximum distance from the viewer at which to display object(s).|
+ |kMaplyViewableCenterX|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center X coordinate.|
+ |kMaplyViewableCenterY|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center Y coordinate.|
+ |kMaplyViewableCenterZ|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center Z coordinate.|
+ |kMaplyDrawPriority|NSNumber|Geometry is sorted by this value before being drawn.  This ensures that some objects can come out on top of others.  By default this is kMaplyVectorDrawPriorityDefault.|
+ |kMaplyEnable|NSNumber boolean|On by default, but if off then the feature exists, but is not turned on.  It can be enabled with enableObjects:|
+ |kMaplyUUID|NSString|Unique ID to match up alternate representations of the same element.|
+ |kMaplyRepresentation|NSString|Name of the representation presented by this object.|
+
+    @param threadMode MaplyThreadAny is preferred and will use another thread, thus not blocking the one you're on.  MaplyThreadCurrent will make the changes immediately, blocking this thread.
+ 
+ 
+    @return Returns a MaplyComponentObject, which can be used to make modifications or delete the objects created.
+ */
+- (MaplyComponentObject *__nullable)addWideVectors:(NSArray *__nonnull)vectors desc:(NSDictionary *__nullable)desc mode:(MaplyThreadMode)threadMode;
+
+/// This calls addWideVectors:desc:mode: with mode set to MaplyThreadAny
+- (MaplyComponentObject *__nullable)addWideVectors:(NSArray *__nonnull)vectors desc:(NSDictionary *__nullable)desc;
+
+
+/// This calls addShapes:desc:mode: with mode set to MaplyThreadAny
+- (MaplyComponentObject *__nullable)addShapes:(NSArray *__nonnull)shapes desc:(NSDictionary *__nullable)desc;
+
+/** 
+    Add one or more model instances.
+    
+    Each MaplyGeomInstance points to a MaplyGeomModel.  All those passed in here will be grouped and processed together.
+ 
+ 
+    @param desc The description dictionary which controls how the models are displayed, selected, and so forth.
+ 
+ |Key|Type|Description|
+ |:--|:---|:----------|
+ |kMaplySelectable|NSNumber boolean|Off by default.  When enabled, the vector feature will be selectable by a user.|
+ |kMaplyEnable|NSNumber boolean|On by default, but if off then the feature exists, but is not turned on.  It can be enabled with enableObjects:|
+ |kMaplyUUID|NSString|Unique ID to match up alternate representations of the same element.|
+ |kMaplyRepresentation|NSString|Name of the representation presented by this object.|
+
+    @param threadMode MaplyThreadAny is preferred and will use another thread, thus not blocking the one you're on.  MaplyThreadCurrent will make the changes immediately, blocking this thread.
+ 
+ 
+    @return Returns a MaplyComponentObject, which can be used to make modifications or delete the objects created.
+  */
+- (MaplyComponentObject *__nullable)addModelInstances:(NSArray *__nonnull)modelInstances desc:(NSDictionary *__nullable)desc mode:(MaplyThreadMode)threadMode;
+
+/** 
+    Add one or raw geometry models.
+    
+    Each MaplyGeometryModel holds points and triangles in display space.  These are relatively "raw" geometry and are passed to the geometry manager as is.
+ 
+ 
+    @param desc The description dictionary which controls how the geometry is displayed, selected, and so forth.
+ 
+ |Key|Type|Description|
+ |:--|:---|:----------|
+ |kMaplySelectable|NSNumber boolean|Off by default.  When enabled, the vector feature will be selectable by a user.|
+ |kMaplyEnable|NSNumber boolean|On by default, but if off then the feature exists, but is not turned on.  It can be enabled with enableObjects:|
+ |kMaplyUUID|NSString|Unique ID to match up alternate representations of the same element.|
+ |kMaplyRepresentation|NSString|Name of the representation presented by this object.|
+
+    @param threadMode MaplyThreadAny is preferred and will use another thread, thus not blocking the one you're on.  MaplyThreadCurrent will make the changes immediately, blocking this thread.
+ 
+ 
+    @return Returns a MaplyComponentObject, which can be used to make modifications or delete the objects created.
+ */
+- (MaplyComponentObject *__nullable)addGeometry:(NSArray *__nonnull)geom desc:(NSDictionary *__nullable)desc mode:(MaplyThreadMode)threadMode;
+
+/** 
+    Add one or more MaplyShape children to the current scene.
+    
+    This method will add the given MaplyShape derived objects to the current scene.  It will use the parameters in the description dictionary and it will do it on the thread specified.
+    
+    @param shapes An NSArray of MaplyShape derived objects.
+    
+    @param desc The desciption dictionary which controls how the shapes will look.  It takes the following entries.
+ 
+ |Key|Type|Description|
+ |:--|:---|:----------|
+ |kMaplyColor|UIColor|Color we'll use for the shape features.|
+ |kMaplyShapeSampleX|NSNumber|Number of samples to use in one direction when converting to polygons.|
+ |kMaplyShapeSampleY|NSNumber|Number of samples to use in the other direction when converting to polygons.|
+ |kMaplyShapeInsideOut|NSNumber boolean|If set to YES, we'll make the spheres inside out and such.  Set to NO by default.|
+ |kMaplyMinVis|NSNumber|This is viewer height above the globe or map.  The shapes will only be visible if the user is above this height.  Off by default.|
+ |kMaplyMaxVis|NSNumber|This is viewer height above the globe or map.  The shapes will only be visible if the user is below this height.  Off by default.|
+ |kMaplyMinViewerDist|NSNumber|Minimum distance from the viewer at which to display object(s).|
+ |kMaplyMaxViewerDist|NSNumber|Maximum distance from the viewer at which to display object(s).|
+ |kMaplyViewableCenterX|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center X coordinate.|
+ |kMaplyViewableCenterY|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center Y coordinate.|
+ |kMaplyViewableCenterZ|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center Z coordinate.|
+ |kMaplyFade|NSNumber|The number of seconds to fade a shape in when it appears and out when it disappears.|
+ |kMaplyDrawPriority|NSNumber|Geometry is sorted by this value before being drawn.  This ensures that some objects can come out on top of others.  By default this is kMaplyVectorShapePriorityDefault.|
+ |kMaplyZBufferRead|NSNumber boolean|If set this geometry will respect the z buffer.  It's on by default, meaning that the geometry can be occluded by things drawn first.|
+ |kMaplyZBufferWrite|NSNumber boolean|If set this geometry will write to the z buffer.  That means following geometry that reads the z buffer will be occluded.  This is off by default.|
+ |kMaplyEnable|NSNumber boolean|On by default, but if off then the feature exists, but is not turned on.  It can be enabled with enableObjects:|
+ |kMaplyUUID|NSString|Unique ID to match up alternate representations of the same element.|
+ |kMaplyRepresentation|NSString|Name of the representation presented by this object.|
+
+    @param threadMode MaplyThreadAny is preferred and will use another thread, thus not blocking the one you're on.  MaplyThreadCurrent will make the changes immediately, blocking this thread.
+ 
+ 
+    @return Returns a MaplyComponentObject, which can be used to make modifications or delete the objects created.
+ */
+- (MaplyComponentObject *__nullable)addShapes:(NSArray *__nonnull)shapes desc:(NSDictionary *__nullable)desc mode:(MaplyThreadMode)threadMode;
+
+/// This calls addStickers:desc:mode: with mode set to MaplyThreadAny
+- (MaplyComponentObject *__nullable)addStickers:(NSArray *__nonnull)stickers desc:(NSDictionary *__nullable)desc;
+
+/** 
+    Add one or more MaplySticker objects to the current scene.
+    
+    This method will add the given MaplySticker objects to the current scene.  It will use the parameters in the description dictionary and it will do it on the thread specified.
+    
+    @param stickers An NSArray of MaplySticker derived objects.
+    
+    @param desc The desciption dictionary which controls how the stickers will look.  It takes the following entries.
+ 
+ |Key|Type|Description|
+ |:--|:---|:----------|
+ |kMaplyColor|UIColor|Color we'll use for the stickers.|
+ |kMaplyMinVis|NSNumber|This is viewer height above the globe or map.  The stickers will only be visible if the user is above this height.  Off by default.|
+ |kMaplyMaxVis|NSNumber|This is viewer height above the globe or map.  The stickers will only be visible if the user is below this height.  Off by default.|
+ |kMaplyMinViewerDist|NSNumber|Minimum distance from the viewer at which to display object(s).|
+ |kMaplyMaxViewerDist|NSNumber|Maximum distance from the viewer at which to display object(s).|
+ |kMaplyViewableCenterX|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center X coordinate.|
+ |kMaplyViewableCenterY|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center Y coordinate.|
+ |kMaplyViewableCenterZ|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center Z coordinate.|
+ |kMaplyFade|NSNumber|The number of seconds to fade a sticker in when it appears and out when it disappears.|
+ |kMaplySampleX|NSNumber|Stickers are broken up along two dimensions to adhere to the globe.  By default this is done adaptively.  If you want to override it, this is the X dimension for the sticker.|
+ |kMaplySampleY|NSNumber|If you want to override it, this is the Y dimension for the sticker.|
+ |kMaplyDrawPriority|NSNumber|Geometry is sorted by this value before being drawn.  This ensures that some objects can come out on top of others.  By default this is kMaplyVectorShapePriorityDefault.|
+ |kMaplyZBufferRead|NSNumber boolean|If set this geometry will respect the z buffer.  It's off by default, meaning that it will draw on top of things before it..|
+ |kMaplyZBufferWrite|NSNumber boolean|If set this geometry will write to the z buffer.  That means following geometry that reads the z buffer will be occluded.  This is off by default.|
+ |kMaplyEnable|NSNumber boolean|On by default, but if off then the feature exists, but is not turned on.  It can be enabled with enableObjects:|
+ |kMaplyShader|NSString|If set, this is the name of the MaplyShader to use when rendering the sticker(s).|
+ |kMaplyUUID|NSString|Unique ID to match up alternate representations of the same element.|
+ |kMaplyRepresentation|NSString|Name of the representation presented by this object.|
+
+    @param threadMode MaplyThreadAny is preferred and will use another thread, thus not blocking the one you're on.  MaplyThreadCurrent will make the changes immediately, blocking this thread.
+ 
+ 
+    @return Returns a MaplyComponentObject, which can be used to make modifications or delete the objects created.
+ */
+- (MaplyComponentObject *__nullable)addStickers:(NSArray *__nonnull)stickers desc:(NSDictionary *__nullable)desc mode:(MaplyThreadMode)threadMode;
+
+/** 
+    Modify an existing sticker.  This only supports changing the active textures.
+    
+    This method will change attributes of a sticker that's currently in use.  At present that's just the images it's displaying.  
+    
+    @param compObj The component object representing one or more existing stickers.
+    
+    @param desc The description dictionary for changes we're making to the sticker.
+ 
+ |Key|Type|Description|
+ |:--|:---|:----------|
+ |kMaplyStickerImages|NSARray|The array of images to apply to the sticker.  You can reuse old ones or introduce new ones.|
+  */
+- (void)changeSticker:(MaplyComponentObject *__nonnull)compObj desc:(NSDictionary *__nullable)desc mode:(MaplyThreadMode)threadMode;
+
+/** 
+    Add one or more MaplyBillboard objects to the current scene.
+    
+    This method will add the given MaplyBillboard objects to the current scene.  It will use the parameters in the description dictionary and it will do it on the thread specified.
+    
+    @param billboards An NSArray of MaplyBillboard objects.
+    
+    @param desc The description dictionary that controls how the billboards will look.  It takes the following entries.
+ 
+ |Key|Type|Description|
+ |:--|:---|:----------|
+ |kMaplyColor|UIColor|Color we'll use for the billboards.|
+ |kMaplyMinVis|NSNumber|This is viewer height above the globe or map.  The billboards will only be visible if the user is above this height.  Off by default.|
+ |kMaplyMaxVis|NSNumber|This is viewer height above the globe or map.  The billboards will only be visible if the user is below this height.  Off by default.|
+ |kMaplyMinViewerDist|NSNumber|Minimum distance from the viewer at which to display object(s).|
+ |kMaplyMaxViewerDist|NSNumber|Maximum distance from the viewer at which to display object(s).|
+ |kMaplyViewableCenterX|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center X coordinate.|
+ |kMaplyViewableCenterY|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center Y coordinate.|
+ |kMaplyViewableCenterZ|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center Z coordinate.|
+ |kMaplyDrawPriority|NSNumber|Geometry is sorted by this value before being drawn.  This ensures that some objects can come out on top of others.  By default this is kMaplyBillboardDrawPriorityDefault.|
+ |kMaplyBillboardOrient|NSNumber|Controls the billboard orientation.  It's either directly toward the eye with kMaplyBillboardOrientEye or takes the ground into account with kMaplyBillboardOrientGround.  Ground is the default.
+
+    
+    @param threadMode MaplyThreadAny is preferred and will use another thread, thus not blocking the one you're on.  MaplyThreadCurrent will make the changes immediately, blocking this thread.
+  */
+- (MaplyComponentObject *__nullable)addBillboards:(NSArray *__nonnull)billboards desc:(NSDictionary *__nullable)desc mode:(MaplyThreadMode)threadMode;
+
+/** 
+    Add a particle system to the scene.
+    
+    This adds a particle system to the scene, but does not kick off any particles.
+    
+    @param partSys The particle system to start.
+    
+    @param desc Any additional standard parameters (none at present).
+    
+    @param threadMode MaplyThreadAny will use another thread, thus not blocking the one you're on.  MaplyThreadCurrent will make the changes immediately, blocking this thread.  For particles, it's best to make a separate thread and use MaplyThreadCurrent.
+  */
+- (MaplyComponentObject *__nullable)addParticleSystem:(MaplyParticleSystem *__nonnull)partSys desc:(NSDictionary *__nullable)desc mode:(MaplyThreadMode)threadMode;
+
+/**
+    Change the render target for a particle system.
+
+    This changes the render target for an existing particle system that's already been created.
+    Can pass in nil, which means the particles are rendered to the screen directly.
+    This change takes place immediately, so call it on the main thread.
+ */
+- (void)changeParticleSystem:(MaplyComponentObject *__nonnull)compObj renderTarget:(MaplyRenderTarget *__nullable)target;
+
+/** 
+    Add a batch of particles to the current scene.
+    
+    Particles are short term objects, typically very small.  We create them in large groups for efficience.
+    
+    You'll need to fill out the MaplyParticleSystem initially and then the MaplyParticleBatch to create them.
+    
+    @param batch The batch of particles to add to an active particle system.
+    
+    @param threadMode MaplyThreadAny will use another thread, thus not blocking the one you're on.  MaplyThreadCurrent will make the changes immediately, blocking this thread.  For particles, it's best to make a separate thread and use MaplyThreadCurrent.
+  */
+- (void)addParticleBatch:(MaplyParticleBatch *__nonnull)batch mode:(MaplyThreadMode)threadMode;
+
+/** 
+    Add vectors that can be used for selections.
+    
+    These are MaplyVectorObject's that will show up in user selection, but won't be visible.  So if a user taps on one, you get the vector in your delegate.  Otherwise, no one will know it's there.
+    
+    @return Returns a MaplyComponentObject, which can be used to make modifications or delete the objects created.
+  */
+- (MaplyComponentObject *__nullable)addSelectionVectors:(NSArray *__nonnull)vectors;
+
+/** 
+    Change the representation of the given vector features.
+    
+    This will change how any vector features represented by the compObj look.
+    
+    You can change kMaplyColor, kMaplyMinVis, kMaplyMaxVis, and kMaplyDrawPriority.
+  */
+- (void)changeVector:(MaplyComponentObject *__nonnull)compObj desc:(NSDictionary *__nullable)desc;
+
+/** 
+    Change the representation of the given vector features.
+ 
+    This will change how any vector features represented by the compObj look.
+ 
+    You can change kMaplyColor, kMaplyMinVis, kMaplyMaxVis, and kMaplyDrawPriority.
+ 
+    This version takes a thread mode.
+ */
+- (void)changeVector:(MaplyComponentObject *__nonnull)compObj desc:(NSDictionary *__nullable)desc mode:(MaplyThreadMode)threadMode;
+
+/** 
+    Adds the MaplyVectorObject's passed in as lofted polygons.
+    
+    Lofted polygons are filled polygons draped on top of the globe with height.  By using a transparent color, these can be used to represent selection or relative values on the globe (or map).
+ 
+    
+    @param polys An NSArray of MaplyVectorObject.
+ 
+    @param desc The desciption dictionary which controls how the lofted polys will look.  It takes the following entries.
+    
+    @param threadMode For MaplyThreadAny we'll do the add on another thread.  For MaplyThreadCurrent we'll block the current thread to finish the add.  MaplyThreadAny is preferred.
+
+ |Key|Type|Description|
+ |:--|:---|:----------|
+ |kMaplyColor|UIColor|Color we'll use for the lofted polygons.  A bit of alpha looks good.|
+ |kMaplyLoftedPolyHeight|NSNumber|Height of the top of the lofted polygon in display units.  For the globe display units are based on a radius of 1.0.|
+ |kMaplyLoftedPolyBase|NSNumber|If present, we'll start the lofted poly at this height.  The height is in globe units, based on a radius of 1.0.|
+ |kMaplyLoftedPolyTop|NSNumber boolean|If on we'll create the geometry for the top.  On by default.|
+ |kMaplyLoftedPolySide|NSNumber boolean|If on we'll create geometry for the sides.  On by default.|
+ |kMaplyLoftedPolyGridSize|NSNumber|The size of the grid (in radians) we'll use to chop up the vector features to make them follow the sphere (for a globe).|
+ |kMaplyLoftedPolyOutline|NSNumber boolean|If set to @(YES) this will draw an outline around the top of the lofted poly in lines.|
+ |kMaplyLoftedPolyOutlineBottom|NSNumber boolean|If set to @(YES) this will draw an outline around the bottom of the lofted poly in lines.|
+ |kMaplyLoftedPolyOutlineColor|UIColor|If the outline is on this is the outline's color.|
+ |kMaplyLoftedPolyOutlineWidth|NSNumber|This is the outline's width if it's turned on.|
+ |kMaplyLoftedPolyOutlineDrawPriority|NSNumber|Draw priority of the lines created for the lofted poly outline.|
+ |kMaplyLoftedPolyOutlineSide|NSNumber boolean|If set and we're drawing an outline, this will create lines up the sides.|
+ |kMaplyMinVis|NSNumber|This is viewer height above the globe or map.  The lofted polys will only be visible if the user is above this height.  Off by default.|
+ |kMaplyMaxVis|NSNumber|This is viewer height above the globe or map.  The lofted polys will only be visible if the user is below this height.  Off by default.|
+ |kMaplyMinViewerDist|NSNumber|Minimum distance from the viewer at which to display object(s).|
+ |kMaplyMaxViewerDist|NSNumber|Maximum distance from the viewer at which to display object(s).|
+ |kMaplyViewableCenterX|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center X coordinate.|
+ |kMaplyViewableCenterY|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center Y coordinate.|
+ |kMaplyViewableCenterZ|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center Z coordinate.|
+ |kMaplyFade|NSNumber|The number of seconds to fade a lofted poly in when it appears and out when it disappears.|
+ |kMaplyDrawPriority|NSNumber|Geometry is sorted by this value before being drawn.  This ensures that some objects can come out on top of others.  By default this is kMaplyLoftedPolysShapePriorityDefault.|
+ |kMaplyZBufferRead|NSNumber boolean|If set this geometry will respect the z buffer.  It's on by default, meaning that it can be occluded by geometry coming before it.|
+ |kMaplyZBufferWrite|NSNumber boolean|If set this geometry will write to the z buffer.  That means following geometry that reads the z buffer will be occluded.  This is off by default.|
+ |kMaplyEnable|NSNumber boolean|On by default, but if off then the feature exists, but is not turned on.  It can be enabled with enableObjects:|
+ |kMaplyUUID|NSString|Unique ID to match up alternate representations of the same element.|
+ |kMaplyRepresentation|NSString|Name of the representation presented by this object.|
+
+    @return Returns a MaplyComponentObject, which can be used to make modifications or delete the objects created.
+  */
+- (MaplyComponentObject *__nullable)addLoftedPolys:(NSArray *__nonnull)polys desc:(NSDictionary *__nullable)desc mode:(MaplyThreadMode)threadMode;
+
+/** 
+    Add a group of points to the display.
+    
+    Adds a group of points all at once.  We're assuming you want to draw a lot of points, so you have to group them together into a MaplyPoints.
+
+    
+    @param points The points to add to the scene.
+    
+    @param desc The desciption dictionary which controls how the points will look.  It takes the following entries.
+    
+    @param threadMode For MaplyThreadAny we'll do the add on another thread.  For MaplyThreadCurrent we'll block the current thread to finish the add.  MaplyThreadAny is preferred.
+ 
+ |Key|Type|Description|
+ |:--|:---|:----------|
+ |kMaplyColor|UIColor|Color we'll use for the lofted polygons.  A bit of alpha looks good.|
+ |kMaplyMinVis|NSNumber|This is viewer height above the globe or map.  The lofted polys will only be visible if the user is above this height.  Off by default.|
+ |kMaplyMaxVis|NSNumber|This is viewer height above the globe or map.  The lofted polys will only be visible if the user is below this height.  Off by default.|
+ |kMaplyMinViewerDist|NSNumber|Minimum distance from the viewer at which to display object(s).|
+ |kMaplyMaxViewerDist|NSNumber|Maximum distance from the viewer at which to display object(s).|
+ |kMaplyViewableCenterX|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center X coordinate.|
+ |kMaplyViewableCenterY|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center Y coordinate.|
+ |kMaplyViewableCenterZ|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center Z coordinate.|
+ |kMaplyFade|NSNumber|The number of seconds to fade a lofted poly in when it appears and out when it disappears.|
+ |kMaplyDrawPriority|NSNumber|Geometry is sorted by this value before being drawn.  This ensures that some objects can come out on top of others.  By default this is kMaplyLoftedPolysShapePriorityDefault.|
+ |kMaplyZBufferRead|NSNumber boolean|If set this geometry will respect the z buffer.  It's on by default, meaning that it can be occluded by geometry coming before it.|
+ |kMaplyZBufferWrite|NSNumber boolean|If set this geometry will write to the z buffer.  That means following geometry that reads the z buffer will be occluded.  This is off by default.|
+ |kMaplyEnable|NSNumber boolean|On by default, but if off then the feature exists, but is not turned on.  It can be enabled with enableObjects:|
+ |kMaplyUUID|NSString|Unique ID to match up alternate representations of the same element.|
+ |kMaplyRepresentation|NSString|Name of the representation presented by this object.|
+
+    @return Returns a MaplyComponentObject, which can be used to make modifications or delete the objects created.
+  */
+- (MaplyComponentObject *__nullable)addPoints:(NSArray * __nonnull)points desc:(NSDictionary *__nullable)desc mode:(MaplyThreadMode)threadMode;
+
+/// Add a view tracker to move a UIView around based on a geographic location.
+- (void)addViewTracker:(MaplyViewTracker *__nonnull)viewTrack;
+
+/// Move an existing view tracker to a new location
+- (void)moveViewTracker:(MaplyViewTracker *__nonnull)viewTrack moveTo:(MaplyCoordinate)newPos;
+
+/** 
+    Add a single annotation which will track the given point.
+    
+    This adds a MaplyAnnotation that will follow the given geo coordinate, applying the screen offset as given.
+    
+    @param annotate The annotation we want to track a given point.
+    
+    @param coord The location on the map (or globe) we'd like to track.
+    
+    @param offset The screen offset for the annotation UIView.  You use this to put the annotation above or below objects.
+  */
+- (void)addAnnotation:(MaplyAnnotation *__nonnull)annotate forPoint:(MaplyCoordinate)coord offset:(CGPoint)offset;
+
+/** 
+    Remove the given annotation from the UIView.
+    
+    This will dismiss the given annotation with its animation.
+  */
+- (void)removeAnnotation:(MaplyAnnotation *__nonnull)annotate;
+
+/** 
+    Make the annotation stop moving.
+    
+    If you have controls in your annotation you may need to make the annotation stop moving while the user manipulates them.  Call this method to freeze the annotation while this happens.
+  */
+- (void)freezeAnnotation:(MaplyAnnotation *__nonnull)annotate;
+
+/** 
+    Call this to start an annotation following its location again after being frozen.
+  */
+- (void)unfreezeAnnotation:(MaplyAnnotation *__nonnull)annotate;
+
+/** 
+    Calls removeAnnotation: on all outstanding annotations.
+  */
+- (void)clearAnnotations;
+
+/** 
+    Return an array of active annotations.  Don't modify these.
+  */
+- (NSArray *__nullable)annotations;
+
+/// Remove an existing view tracker.
+- (void)removeViewTrackForView:(UIView *__nonnull)view;
+
+/** 
+    Return the location on screen for a given geographic (lon/lat radians) coordinate.
+    
+    @return Returns the screen point corresponding to a given geo coordinate.
+ */
+- (CGPoint)screenPointFromGeo:(MaplyCoordinate)geoCoord;
+
+/** 
+    Animate the given position to the screen position over time.
+ 
+    This is similar to animateToPosition:time: except that it will attempt to match up the screen position and the geographic position.  This is how you offset the location you're looking at.
+ 
+    If it's impossible to move newPos to loc, then nothing happens.
+ 
+    @param newPos The geographic position (lon/lat in radians) to move to.
+ 
+    @param loc The location on the screen where we'd like it to go.
+ 
+    @param howLong How long in seconds to take getting there.
+ */
+- (bool)animateToPosition:(MaplyCoordinate)newPos onScreen:(CGPoint)loc time:(NSTimeInterval)howLong;
+
+/** 
+    Add an image as a texture and return a MaplyTexture to track it.
+    
+    We reference count UIImages attached to Maply objects, but that has a couple of drawbacks.  First, it retains the UIImage and if that's large, that's a waste of memory.  Second, if you're adding and removing Maply objects you may repeatedly create and delete the same UIImage, which is a waste of CPU.
+    
+    This method solves the problem by letting you create the texture associated with the UIImage and use it where you like.  You can assign these in any place a UIImage is accepted on Maply objects.
+    
+    You don't have call this before using a UIImage in a MaplyScreenMarker or other object.  The system takes care of it for you.  This is purely for optimization.
+    
+    @param image The image we wish to retain the texture for.
+    
+    @param imageFormat If we create this image, this is the texture format we want it to use.
+ 
+ | Image Format | Description |
+ |:-------------|:------------|
+ | MaplyImageIntRGBA | 32 bit RGBA with 8 bits per channel.  The default. |
+ | MaplyImageUShort565 | 16 bits with 5/6/5 for RGB and none for A. |
+ | MaplyImageUShort4444 | 16 bits with 4 bits for each channel. |
+ | MaplyImageUShort5551 | 16 bits with 5/5/5 bits for RGB and 1 bit for A. |
+ | MaplyImageUByteRed | 8 bits, where we choose the R and ignore the rest. |
+ | MaplyImageUByteGreen | 8 bits, where we choose the G and ignore the rest. |
+ | MaplyImageUByteBlue | 8 bits, where we choose the B and ignore the rest. |
+ | MaplyImageUByteAlpha | 8 bits, where we choose the A and ignore the rest. |
+ | MaplyImageUByteRGB | 8 bits, where we average RGB for the value. |
+ | MaplyImage4Layer8Bit | 32 bits, four channels of 8 bits each.  Just like MaplyImageIntRGBA, but a warning not to do anything too clever in sampling. |
+
+    
+    @param wrapFlags These can be MaplyImageWrapX, MaplyImageWrapY, both or none.
+ 
+    
+    @param threadMode For MaplyThreadAny we'll do the add on another thread.  For MaplyThreadCurrent we'll block the current thread to finish the add.  MaplyThreadAny is preferred.
+ 
+    
+    @return A MaplyTexture you'll want to keep track of.  It goes out of scope, the OpenGL ES texture will be deleted.
+ */
+- (MaplyTexture *__nullable)addTexture:(UIImage *__nonnull)image imageFormat:(MaplyQuadImageFormat)imageFormat wrapFlags:(int)wrapFlags mode:(MaplyThreadMode)threadMode;
+
+/** 
+    Represent an image as a MaplyTexture.
+    
+    This version of addTexture: allows more precise control over how the texture is represented.  It replaces the other addTexture: and addTextureToAtlas calls.
+    
+    @param image The UIImage to add as a texture.
+    
+    @param desc A description dictionary controlling how the image is converted to a texture and represented in the system.
+
+ |Key|Type|Description|
+ |:--|:---|:----------|
+ |kMaplyTexFormat|NSNumber|The texture format to use for the image.  Consult addTexture:imageFormat:wrapFlags:mode: for a list.  Default is MaplyImageIntRGBA.|
+ |kMaplyTexMinFilter|NSNumber|Filter to use for minification.  This can be kMaplyMinFilterNearest or kMaplyMinFilterLinear. Default is kMaplyMinFilterLinear.|
+ |kMaplyTexMagFilter|NSNumber|Filter to use for magnification.  This can be kMaplyMinFilterNearest or kMaplyMinFilterLinear. Default is kMaplyMinFilterLinear.|
+ |kMaplyTexWrapX|NSNumber boolean|Texture wraps in x direction.  Off by default.|
+ |kMaplyTexWrapY|NSNumber boolean|Texture wraps in y direction.  Off by default.|
+ |kMaplyTexAtlas|NSNumber boolean|If set, the texture goes into an appropriate atlas.  If not set, it's a standalone texture (default).|
+ 
+    
+    @param threadMode For MaplyThreadAny we'll do the add on another thread.  For MaplyThreadCurrent we'll block the current thread to finish the add.  MaplyThreadAny is preferred.
+  */
+- (MaplyTexture *__nullable)addTexture:(UIImage *__nonnull)image desc:(NSDictionary *__nullable)desc mode:(MaplyThreadMode)threadMode;
+
+/** 
+    Create an empty texture and return it.
+    
+    Empty textures are used for offscreen rendering and other crazy stuff.  You probably don't want to do this.
+    
+    @param spec The description dictionary controlling the format and other textures goodies.
+
+ |Key|Type|Description|
+ |:--|:---|:----------|
+ |kMaplyTexFormat|NSNumber|The texture format to use for the image.  Consult addTexture:imageFormat:wrapFlags:mode: for a list.  Default is MaplyImageIntRGBA.|
+ |kMaplyTexMinFilter|NSNumber|Filter to use for minification.  This can be kMaplyMinFilterNearest or kMaplyMinFilterLinear. Default is kMaplyMinFilterLinear.|
+ |kMaplyTexMagFilter|NSNumber|Filter to use for magnification.  This can be kMaplyMinFilterNearest or kMaplyMinFilterLinear. Default is kMaplyMinFilterLinear.|
+ |kMaplyTexWrapX|NSNumber boolean|Texture wraps in x direction.  Off by default.|
+ |kMaplyTexWrapY|NSNumber boolean|Texture wraps in y direction.  Off by default.|
+ |kMaplyTexAtlas|NSNumber boolean|If set, the texture goes into an appropriate atlas.  If not set, it's a standalone texture (default).|
+ 
+    
+    @param sizeX The horizontal size of the textures (in pixels).
+    
+    @param sizeY Vertical size of the texture (in pixels).
+ */
+- (MaplyTexture *__nullable)createTexture:(NSDictionary * _Nullable)spec sizeX:(int)sizeX sizeY:(int)sizeY mode:(MaplyThreadMode)threadMode;
+
+/** 
+    Add an image as a texture, but put it in a texture atlas.  Return a
+ 
+    Texture atlases consolidate a number of compatible textures, speeding up rendering of any geometry they're used on.  If you know you're going to be using a UIImage with a lot of other images in, say, a group of markers, it's wise to add it here first.
+ 
+    The entry in a texture atlas will be released when the MaplyTexture is released.  So keep a copy of it around if you're going to use it.
+ 
+    @param image The image we're going to put in the texture.
+ 
+    @param threadMode For MaplyThreadAny we'll do the add on another thread.  For MaplyThreadCurrent we'll block the current thread to finish the add.  MaplyThreadAny is preferred if you're on the main thread.
+ 
+    @return A MaplyTexture you'll want to keep track of.  It goes out of scope, the entry in the texture atlas will be cleared.
+ */
+- (MaplyTexture *__nullable)addTextureToAtlas:(UIImage *__nonnull)image mode:(MaplyThreadMode)threadMode;
+
+/** 
+    Add an image as a texture, but put it in a texture atlas and return a MaplyTexture to track it.
+    
+    Texture atlases consolidate a number of compatible textures, speeding up rendering of any geometry they're used on.  If you know you're going to be using a UIImage with a lot of other images in, say, a group of markers, it's wise to add it here first.
+    
+    The entry in a texture atlas will be released when the MaplyTexture is released.  So keep a copy of it around if you're going to use it.
+ 
+    @param image The image we're going to put in the texture.
+ 
+    @param imageFormat If we create this image, this is the texture format we want it to use.
+ 
+ | Image Format | Description |
+ |:-------------|:------------|
+ | MaplyImageIntRGBA | 32 bit RGBA with 8 bits per channel.  The default. |
+ | MaplyImageUShort565 | 16 bits with 5/6/5 for RGB and none for A. |
+ | MaplyImageUShort4444 | 16 bits with 4 bits for each channel. |
+ | MaplyImageUShort5551 | 16 bits with 5/5/5 bits for RGB and 1 bit for A. |
+ | MaplyImageUByteRed | 8 bits, where we choose the R and ignore the rest. |
+ | MaplyImageUByteGreen | 8 bits, where we choose the G and ignore the rest. |
+ | MaplyImageUByteBlue | 8 bits, where we choose the B and ignore the rest. |
+ | MaplyImageUByteAlpha | 8 bits, where we choose the A and ignore the rest. |
+ | MaplyImageUByteRGB | 8 bits, where we average RGB for the value. |
+ | MaplyImage4Layer8Bit | 32 bits, four channels of 8 bits each.  Just like MaplyImageIntRGBA, but a warning not to do anything too clever in sampling. |
+
+ 
+    @param wrapFlags These can be MaplyImageWrapX, MaplyImageWrapY, both or none.
+
+ 
+    @param threadMode For MaplyThreadAny we'll do the add on another thread.  For MaplyThreadCurrent we'll block the current thread to finish the add.  MaplyThreadAny is preferred if you're on the main thread.
+ 
+    @return A MaplyTexture you'll want to keep track of.  It goes out of scope, the entry in the texture atlas will be cleared.
+  */
+- (MaplyTexture *__nullable)addTextureToAtlas:(UIImage *__nonnull)image imageFormat:(MaplyQuadImageFormat)imageFormat wrapFlags:(int)wrapFlags mode:(MaplyThreadMode)threadMode;
+
+/**
+   Creates a new texture that references part of an existing texture.
+ 
+   @param x Horizontal offset within the existing texture.
+   @param y Vertical offset within the existing texture.
+   @param width Width of the chunk to make a new texture.
+   @param height Height of the chunk to make a new texture.
+   @param threadMode For MaplyThreadAny we'll do the add on another thread.  For MaplyThreadCurrent we'll block the current thread to finish the add.  MaplyThreadAny is preferred if you're on the main thread.
+  */
+- (MaplyTexture *__nullable)addSubTexture:(MaplyTexture *__nonnull)tex xOffset:(int)x yOffset:(int)y width:(int)width height:(int)height mode:(MaplyThreadMode)threadMode;
+
+/** 
+    Remove the OpenGL ES texture associated with the given MaplyTexture.
+    
+    MaplyTexture's will remove their associated OpenGL textures when they go out of scope.  This method does it expicitly and clears out the internals of the MaplyTexture.
+    
+    Only call this if you're managing the texture explicitly and know you're finished with them.
+  */
+- (void)removeTexture:(MaplyTexture *__nonnull)image mode:(MaplyThreadMode)threadMode;
+
+/** 
+    Remove the OpenGL ES textures associated with the given MaplyTextures.
+    
+    MaplyTextures will remove their associated OpenGL textures when they go out of scope.  This method does it expicitly and clears out the internals of the MaplyTexture.
+    
+    Only call this if you're managing the texture explicitly and know you're finished with them.
+ */
+- (void)removeTextures:(NSArray *__nonnull)texture mode:(MaplyThreadMode)threadMode;
+
+/** 
+    Add a render target to the system
+    
+    Sets up a render target and will start rendering to it on the next frame.
+    
+    Keep the render target around so you can remove it later.
+  */
+- (void)addRenderTarget:(MaplyRenderTarget * _Nonnull)renderTarget;
+
+/**
+    Set the texture a given render target is writing to.
+ 
+    Render targets start out with one, but you may wish to change it.
+  */
+- (void)changeRenderTarget:(MaplyRenderTarget * __nonnull)renderTarget tex:(MaplyTexture * __nullable)tex;
+
+/**
+    Request a one time clear for the render target.
+
+    Rather than clearing every frame, you may want to specifically request a clear.  This will
+    be executed at the next frame and then not again.
+  */
+- (void)clearRenderTarget:(MaplyRenderTarget * __nonnull)renderTarget mode:(MaplyThreadMode)threadMode;
+
+/** 
+    Remove the given render target from the system.
+    
+    Ask the system to stop drawing to the given render target.  It will do this on the next frame.
+  */
+- (void)removeRenderTarget:(MaplyRenderTarget * _Nonnull)renderTarget;
+
+/** 
+    Set the max number of objects for the layout engine to display.
+    
+    The layout engine works with screen objects, such MaplyScreenLabel and MaplyScreenMaker.  If those have layoutImportance set, this will control the maximum number we can display.
+  */
+- (void)setMaxLayoutObjects:(int)maxLayoutObjects;
+
+/**
+ Screen markers and labels can have uniqueIDs.  We use these to ensure we're only displaying one version of an object with, say, vector tiles
+ that load multiple levels.
+ 
+ Now let's say you want to select some objects.  This will let you pull them out of the usual layout logic so they'll always be displayed.
+ */
+- (void)setLayoutOverrideIDs:(NSArray *__nullable)uuids;
+
+
+
+/**
+    Normally the layout layer runs periodically if you change something or when you move around.
+    You can ask it to run ASAP right here.  Layout runs on its own thread, so there may still be a delay.
+ */
+- (void)runLayout;
+
+/// Calls removeObjects:mode: with MaplyThreadAny.
+- (void)removeObject:(MaplyComponentObject *__nonnull)theObj;
+
+/// Calls removeObjects:mode: with MaplyThreadAny.
+- (void)removeObjects:(NSArray *__nonnull)theObjs;
+
+/** 
+    Remove all information associated with the given MaplyComponentObject's.
+    
+    Every add call returns a MaplyComponentObject.  This will remove any visible features, textures, selection data, or anything else associated with it.
+    
+    @param theObjs The MaplyComponentObject's we wish to remove.
+    
+    @param threadMode For MaplyThreadAny we'll do the removal on another thread.  For MaplyThreadCurrent we'll block the current thread to finish the removal.  MaplyThreadAny is preferred.
+ */
+- (void)removeObjects:(NSArray *__nonnull)theObjs mode:(MaplyThreadMode)threadMode;
+
+/** 
+    Disable a group of MaplyComponentObject's all at once.
+    
+    By default all of the geometry created for a given object will appear.  If you set kMaplyEnable to @(NO) then it will exist, but not appear.  This has the effect of setting kMaplyEnable to @(NO).
+    
+    @param theObjs The objects to disable.
+    
+    @param threadMode For MaplyThreadAny we'll do the disable on another thread.  For MaplyThreadCurrent we'll block the current thread to finish the disable.  MaplyThreadAny is preferred.
+  */
+- (void)disableObjects:(NSArray *__nonnull)theObjs mode:(MaplyThreadMode)threadMode;
+
+/** 
+    Enable a group of MaplyComponentObject's all at once.
+    
+    By default all of the geometry created for a given object will appear.  If you set kMaplyEnable to @(NO) then it will exist, but not appear.  This has the effect of setting kMaplyEnable to @(YES).
+    
+    @param theObjs The objects to enable.
+    
+    @param threadMode For MaplyThreadAny we'll do the enable on another thread.  For MaplyThreadCurrent we'll block the current thread to finish the enable.  MaplyThreadAny is preferred.
+*/
+- (void)enableObjects:(NSArray *__nonnull)theObjs mode:(MaplyThreadMode)threadMode;
+
+/**
+    Set the representation to use for the matching UUIDs by specifying the UUIDs directly.
+
+    @param uuids Array of NSString, the UUIDs to update
+    @param repName The representation value to apply, nil to return to the default
+*/
+- (void)setRepresentation:(NSString *__nullable)repName
+                  ofUUIDs:(NSArray<NSString *> *__nonnull)uuids;
+
+/**
+    Set the representation to use for the matching UUIDs by specifying the UUIDs directly.
+
+    @param repName The representation value to apply, nil to return to the default
+    @param fallbackRepName The representation to use if there are no matches
+    @param uuids Array of NSString, the UUIDs to update
+*/
+- (void)setRepresentation:(NSString *__nullable)repName
+          fallbackRepName:(NSString *__nullable)fallbackRepName
+                  ofUUIDs:(NSArray<NSString *> *__nonnull)uuids;
+
+/**
+    Set the representation to use for the matching UUIDs by specifying the UUIDs directly.
+
+    @param uuids Array of NSString, the UUIDs to update
+    @param repName The representation value to apply, nil to return to the default
+    @param threadMode For MaplyThreadAny we'll do the enable on another thread.  For MaplyThreadCurrent we'll block the current thread to finish the enable.  MaplyThreadAny is preferred.
+*/
+- (void)setRepresentation:(NSString *__nullable)repName
+                  ofUUIDs:(NSArray<NSString *> *__nonnull)uuids
+                     mode:(MaplyThreadMode)threadMode;
+
+/**
+    Set the representation to use for the matching UUIDs by specifying the UUIDs directly.
+
+    @param uuids Array of NSString, the UUIDs to update
+    @param repName The representation value to apply, nil to return to the default
+    @param fallbackRepName The representation to use if there are no matches
+    @param threadMode For MaplyThreadAny we'll do the enable on another thread.  For MaplyThreadCurrent we'll block the current thread to finish the enable.  MaplyThreadAny is preferred.
+*/
+- (void)setRepresentation:(NSString *__nullable)repName
+          fallbackRepName:(NSString *__nullable)fallbackRepName
+                  ofUUIDs:(NSArray<NSString *> *__nonnull)uuids
+                     mode:(MaplyThreadMode)threadMode;
+
+/**
+    Set the representation to use for the UUIDs of the given objects.
+
+    @param objects Array of ComponentObject, the UUIDs to update
+    @param repName The representation value to apply, nil to return to the default
+*/
+- (void)setRepresentation:(NSString *__nullable)repName
+                ofObjects:(NSArray<MaplyComponentObject *> *__nonnull)objects;
+
+/**
+    Set the representation to use for the UUIDs of the given objects.
+
+    @param objects Array of ComponentObject, the UUIDs to update
+    @param repName The representation value to apply, nil to return to the default
+*/
+- (void)setRepresentation:(NSString *__nullable)repName
+          fallbackRepName:(NSString *__nullable)fallbackRepName
+                ofObjects:(NSArray<MaplyComponentObject *> *__nonnull)objects;
+
+/**
+    Set the representation to use for the UUIDs of the given objects.
+
+    @param objects Array of ComponentObject, the UUIDs to update
+    @param repName The representation value to apply, nil to return to the default
+    @param fallbackRepName The representation to use if there are no matches
+    @param threadMode For MaplyThreadAny we'll do the enable on another thread.  For MaplyThreadCurrent we'll block the current thread to finish the enable.  MaplyThreadAny is preferred.
+*/
+- (void)setRepresentation:(NSString *__nullable)repName
+          fallbackRepName:(NSString *__nullable)fallbackRepName
+                ofObjects:(NSArray<MaplyComponentObject *> *__nonnull)objects
+                     mode:(MaplyThreadMode)threadMode;
+
+/**
+    Pass a uniform block through to a shader.  Only for Metal.
+ 
+    Custom Metal shaders may have their own uniform blocks associated with a known bufferID.
+    This is how you pass those through for objects you've already created.
+    Useful for things like custom animation.
+  */
+- (void)setUniformBlock:(NSData *__nonnull)uniBlock buffer:(int)bufferID forObjects:(NSArray<MaplyComponentObject *> *__nonnull)compObjs mode:(MaplyThreadMode)threadMode;
+
+/** 
+    Add the given active object to the scene.
+    
+    Active objects are used for immediate, frame based updates.  They're fairly expensive, so be careful.  After you create one, you add it to the scene here.
+  */
+- (void)addActiveObject:(MaplyActiveObject *__nonnull)theObj;
+
+/// Remove an active object from the scene.
+- (void)removeActiveObject:(MaplyActiveObject *__nonnull)theObj;
+
+/// Remove an array of active objects from the scene
+- (void)removeActiveObjects:(NSArray *__nonnull)theObjs;
+
+/** 
+    Add a MaplyControllerLayer to the globe or map.
+    
+    At present, layers are for paged geometry such as image tiles or vector tiles.  You can create someting like a MaplyQuadImageTilesLayer, set it up and then hand it to addLayer: to add to the scene.
+  */
+- (bool)addLayer:(MaplyControllerLayer *__nonnull)layer;
+
+/// Remove a MaplyControllerLayer from the globe or map.
+- (void)removeLayer:(MaplyControllerLayer *__nonnull)layer;
+
+/// Remove zero or more MaplyControllerLayer objects from the globe or map.
+- (void)removeLayers:(NSArray *__nonnull)layers;
+
+/// Remove all the user created MaplyControllerLayer objects from the globe or map.
+- (void)removeAllLayers;
+
+/** 
+    Utility routine to convert from a lat/lon (in radians) to display coordinates
+    
+    This is a simple routine to get display coordinates from geocoordinates.  Display coordinates for the globe are based on a radius of 1.0 and an origin of (0,0,0).
+    
+    @return The input coordinate in display coordinates.
+  */
+- (MaplyCoordinate3d)displayPointFromGeo:(MaplyCoordinate)geoCoord;
+
+/**
+    Utility routine to convert from a lat/lon (in radians) to display coordinates
+    
+    This is a simple routine to get display coordinates from geocoordinates.  Display coordinates for the globe are based on a radius of 1.0 and an origin of (0,0,0).
+    
+    @return The input coordinate in display coordinates.
+  */
+- (MaplyCoordinate3dD)displayPointFromGeoD:(MaplyCoordinate)geoCoord;
+
+/**
+    Utility routine to convert from a lat/lon (in radians) to display coordinates
+    
+    This is a simple routine to get display coordinates from geocoordinates.  Display coordinates for the globe are based on a radius of 1.0 and an origin of (0,0,0).
+    
+    @return The input coordinate in display coordinates.
+  */
+- (MaplyCoordinate3dD)displayPointFromGeoDD:(MaplyCoordinateD)geoCoord;
+
+/** 
+    If you've paused the animation earlier, this will start it again.
+    
+    The renderer relies on a CADisplayLink.  If it's paused, this will unpause it.
+  */
+- (void)startAnimation;
+
+/** 
+    Pause the animation. 
+    
+    The renderer relies on a CADisplayLink.  This will pause it.  You'll want to do this if your app is going into the background or if you generally want the OpenGL ES code to stop doing anything.
+  */
+- (void)stopAnimation;
+
+/** 
+    This shuts down the rendering and it cannot be restarted.
+    
+    There are times we need to explicitly shut down the rendering rather than wait for an unload or release.  This will do that.
+  */
+- (void)teardown;
+
+/** 
+    Add a compiled shader.  We'll refer to it by the scene name.
+    
+    Once you've create a MaplyShader, you'll need to add it to the scene to use it.
+    
+    @param shader The working shader (be sure valid is true) to add to the scene.
+    
+ |Scene Name|Purpose|
+ |:---------|:------|
+ |kMaplyShaderDefaultTri|The shader used on triangles by default when there is lighting.|
+ |kMaplyShaderDefaultTriNoLighting|The shader used when lighting is explicitly turned off.|
+ |kMaplyShaderDefaultTriMultiTex|The shader used when drawables have more than one texture.|
+ |kMaplyShaderDefaultLine|The shader used for line drawing on the globe.  This does a tricky bit of backface culling.|
+ |kMaplyShaderDefaultLineNoBackface|The shader used for line drawing on the map.  This does no backface culling.|
+  */
+- (void)addShaderProgram:(MaplyShader *__nonnull)shader;
+
+/** 
+    Look for a shader with the given name.  
+    
+    This is the shader's own name as specified in the init call, not the scene name as might be specified in addShaderProgram:sceneName:
+    
+    @return Returns the registered shader if it found one.
+  */
+- (MaplyShader *__nullable)getShaderByName:(NSString *__nonnull)name;
+
+/**
+    Remove a shader that was added earlier.
+  */
+- (void)removeShaderProgram:(MaplyShader *__nonnull)shader;
+
+/** 
+    Return the current map scale from the viewpoint.
+    
+    Calculate the map scale denominator (ala Mapnik) based on the current screen size and the 3D viewport.
+    
+    @return Returns the map scale denominator or MAXFLOAT if the system is not yet initialized.
+  */
+- (float)currentMapScale;
+
+/** 
+    Calculate the height that corresponds to a given Mapnik-style map scale.
+    
+    Figure out the viewer height that corresponds to a given scale denominator (ala Mapnik).
+    
+    This height will probably be use for visibility ranges on geometry.  This works as a mechanism for making geometry appear at certain map scales and disappear at others.
+    
+    @return Returns the height or 0.0 if the system isn't initialized yet.
+  */
+- (float)heightForMapScale:(float)scale;
+
+/** 
+    Takes a snapshot of the current OpenGL view and returns it.
+  */
+- (UIImage *__nullable)snapshot;
+
+/**
+    Return the raw data for a render target.
+
+    Copies the pixels for a render target out after rendering and returns them in an NSData object.
+    This is not fast.  Don't call it often.
+  */
+- (NSData * __nullable)shapshotRenderTarget:(MaplyRenderTarget * __nonnull)renderTarget;
+
+/** Add a snapshot delegate.
+ 
+ If you need more regular snapshots, you can fill this in to get a callback every frame.
+ Don't snapshot the screen or even offscreen render targets every frame.  It'll be slow.
+ */
+- (void)addSnapshotDelegate:(NSObject<MaplySnapshotDelegate> *__nonnull)snapshotDelegate;
+
+/** Remove your snapshot delegate.
+ 
+ Don't getting screenshots/render target snapshots?  Get rid of your delegate.  They're expensive.
+ */
+- (void)removeSnapshotDelegate:(NSObject<MaplySnapshotDelegate> *__nonnull)snapshotDelegate;
+
+
+/** 
+    Return the current map zoom from the viewpoint.
+ 
+    Calculate the map zoom (TMS) based on the current screen size and the 3D viewport.
+ 
+    @param coordinate the location to calculate for. This is needed because zoom is dependant on latitude.
+ 
+    @return Returns the map zoom or MAXFLOAT if the system is not yet initialized.
+ */
+- (float)currentMapZoom:(MaplyCoordinate)coordinate;
+
+/** 
+    Return the coordinate system being used for the display.
+    
+    This returns the local coordinate system, which is used to unroll the earth (for the globe) or via a scaling factor (for the flat map).
+  */
+- (MaplyCoordinateSystem *__nullable)coordSystem;
+
+/** 
+    Convert from a local coordinate (probably spherical mercator) to a display coordinate.
+    
+    This converts from a local coordinate (x,y,height) in the view controller's coordinate system (probably spherical mercator) to a coordinate in display space.  For the globe display space is based on a radius of 1.0.  For the flat map it's just stretched with a similar factor.
+  */
+- (MaplyCoordinate3d)displayCoordFromLocal:(MaplyCoordinate3d)localCoord;
+
+/**
+    Convert from a local coordinate (probably spherical mercator) to a display coordinate.
+    
+    This converts from a local coordinate (x,y,height) in the view controller's coordinate system (probably spherical mercator) to a coordinate in display space.  For the globe display space is based on a radius of 1.0.  For the flat map it's just stretched with a similar factor.
+  */
+- (MaplyCoordinate3dD)displayCoordFromLocalD:(MaplyCoordinate3dD)localCoord;
+
+/** 
+    Convert from a coordinate in the given system to display space.
+    
+    This converts from a coordinate (3d) in the given coordinate system to the view controller's display space.  For the globe, display space is based on a radius of 1.0.
+  */
+- (MaplyCoordinate3d)displayCoord:(MaplyCoordinate3d)localCoord fromSystem:(MaplyCoordinateSystem *__nonnull)coordSys;
+
+/** 
+    Convert from a coordinate in the given system to display space.
+ 
+    This converts from a double coordinate (3d) in the given coordinate system to the view controller's display space.  For the globe, display space is based on a radius of 1.0.
+ */
+- (MaplyCoordinate3dD)displayCoordD:(MaplyCoordinate3dD)localCoord fromSystem:(MaplyCoordinateSystem *__nonnull)coordSys;
+
+/** 
+    enable 3d touch object selection.
+ 
+    @param previewDataSource Data source to provide 3d touch preview view controllers.
+ 
+    @return true if 3d touch could be enabled
+ */
+- (BOOL)enable3dTouchSelection:(NSObject<Maply3dTouchPreviewDatasource> *__nonnull)previewDataSource;
+
+/** 
+    Disable 3dtouch object selection
+ */
+- (void)disable3dTouchSelection;
+
+/** 
+    Return all the selectable vector objects at the given location.
+    
+    Objects can be selected via the delegate or the search can be run directly here.
+    
+    This is not thread safe and will block the main thread.
+  */
+- (NSArray * _Nullable)objectsAtCoord:(MaplyCoordinate)coord;
+
+/**
+    Return all the selectable labels and markers at the given location.
+
+    Objects can be selected via the delegate or the search can be run directly here.
+
+    This is not thread safe and will block the main thread.
+ */
+- (NSArray * _Nullable)labelsAndMarkersAtCoord:(MaplyCoordinate)coord;
+
+/// Turn on/off performance output (goes to the log periodically).
+@property (nonatomic,assign) bool performanceOutput;
+
+/// Turn on/off debug outlines for layout objects
+@property (nonatomic,assign) bool showDebugLayoutBoundaries;
+
+/** 
+    See derived class method.
+ */
+- (void)requirePanGestureRecognizerToFailForGesture:(UIGestureRecognizer *__nullable)other;
+
+/** 
+    Start location tracking
+    
+    @param delegate The MaplyLocationTrackerDelegate for receiving location event callbacks
+    
+    @param useHeading Use location services heading information (requires physical magnetometer)
+    
+    @param useCourse Use location services course information as fallback if heading unavailable
+ */
+- (void)startLocationTrackingWithDelegate:(NSObject<MaplyLocationTrackerDelegate> *__nullable)delegate
+                               useHeading:(bool)useHeading
+                                useCourse:(bool)useCourse;
+
+/**
+    Start location tracking
+    
+    @param delegate The MaplyLocationTrackerDelegate for receiving location event callbacks
+    
+    @param simulator The MaplyLocationSimulatorDelegate for producing  locations
+ 
+    @param simInterval The time interval on which to update
+
+    @param useHeading Use location services heading information (requires physical magnetometer)
+    
+    @param useCourse Use location services course information as fallback if heading unavailable
+ */
+- (void)startLocationTrackingWithDelegate:(NSObject<MaplyLocationTrackerDelegate> *__nullable)delegate
+                                simulator:(NSObject<MaplyLocationSimulatorDelegate> *__nullable)simulator
+                              simInterval:(NSTimeInterval)simInterval
+                               useHeading:(bool)useHeading
+                                useCourse:(bool)useCourse;
+
+/**
+ Return the current location tracker, if there is one.
+ */
+- (MaplyLocationTracker * __nullable)getLocationTracker;
+
+/** 
+    Change lock type for location tracking
+    
+    @param lockType The MaplyLocationLockType value for lock behavior
+ */
+- (void)changeLocationTrackingLockType:(MaplyLocationLockType)lockType;
+
+/** 
+    Change lock type for location tracking
+    
+    @param lockType The MaplyLocationLockType value for lock behavior
+    
+    @param forwardTrackOffset The vertical offset if using MaplyLocationLockHeadingUpOffset (positive values are below the view center)
+ */
+- (void)changeLocationTrackingLockType:(MaplyLocationLockType)lockType forwardTrackOffset:(int)forwardTrackOffset;
+
+/** 
+    Stop location tracking
+ */
+- (void)stopLocationTracking;
+
+/** 
+    Get the current location tracker device location
+ 
+    @return The coordinate if valid, else kMaplyNullCoordinate
+ */
+- (MaplyCoordinate)getDeviceLocation;
+
+/** 
+    Exposes MaplyLocationTracker's location manager for use elsewhere
+    
+    @return The CLLocationmanager if it exists, else nil
+ */
+- (CLLocationManager * _Nullable )getTrackingLocationManager;
+
+/** 
+    Return all layers loaded by user.
+ 
+    All layers loaded by user than are currently loaded.
+ */
+-(NSArray * _Nonnull)loadedLayers;
+
+/// Return the renderer type being used
+- (MaplyRenderType)getRenderType;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyBillboard.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyBillboard.h
new file mode 100644
index 0000000..3a24e43
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyBillboard.h
@@ -0,0 +1,74 @@
+/*
+ *  MaplyBillboard.h
+ *  WhirlyGlobeComponent
+ *
+ *  Created by Steve Gifford on 10/28/13.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <UIKit/UIKit.h>
+#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
+#import <WhirlyGlobeMaplyComponent/MaplyScreenObject.h>
+
+/** 
+    A billboard is tied to a specific point, but rotates to face the user.
+    
+    The billboard object represents a rectangle which is rooted at a specific point, but will rotate to face the user.  These are typically used in 3D, when the globe or map has a tilt.  They make little sense in 2D.
+  */
+@interface MaplyBillboard : NSObject
+
+/** 
+    The point this billboard is rooted at.
+    
+    The x and y coordinates are radians.  The z coordinate is in meters.
+  */
+@property (nonatomic) MaplyCoordinate3d center;
+
+/// Set if you want to select these
+@property (nonatomic) bool selectable;
+
+/// The 2D polygonal description of what the billboard should be
+@property (nonatomic,strong) MaplyScreenObject * __nullable screenObj;
+
+/** 
+    Vertex attributes to apply to this billboard.
+    
+    MaplyVertexAttribute objects are passed all the way to the shader.  Read that page for details on what they do.
+    
+    The array of vertex attributes provided here will be copied onto all the vertices we create for the shader.  This means you can use these to do things for a single billboard in your shader.
+ */
+@property (nonatomic,strong) NSArray * __nullable vertexAttributes;
+
+/** 
+    User data object for selection
+    
+    When the user selects a feature and the developer gets it in their delegate, this is an object they can use to figure out what the screen label means to them.
+ */
+@property (nonatomic,strong) id __nullable userObject;
+
+/** 
+    Initialize with a single image, a given background and a size.
+    
+    This will create a simple billboard with a single image pasted on it.
+    
+    @param texture This can either be a UIImage or a MaplyTexture.
+    
+    @param color Color for the polygon that makes up the billboard.
+    
+    @param size Size of the billboard in display space.
+  */
+- (nullable instancetype)initWithImage:(id __nonnull)texture color:(UIColor * __nonnull)color size:(CGSize)size;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyBridge.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyBridge.h
new file mode 100644
index 0000000..152d869
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyBridge.h
@@ -0,0 +1,23 @@
+/*  MaplyBridge.h
+ *  MaplyBridge
+ *
+ *  Created by jmnavarro on 7/19/15.
+ *  Copyright 2015-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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#import <WhirlyGlobeMaplyComponent/MaplyComponent.h>
+#import <WhirlyGlobeMaplyComponent/MaplyBaseViewController.h>
+#import <WhirlyGlobeMaplyComponent/WhirlyGlobeViewController.h>
+#import <WhirlyGlobeMaplyComponent/MaplyGlobeRenderController.h>
+#import <WhirlyGlobeMaplyComponent/MaplyViewController.h>
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyCluster.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyCluster.h
new file mode 100644
index 0000000..aea79cf
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyCluster.h
@@ -0,0 +1,147 @@
+/*
+ *  MaplyCluster.h
+ *  WhirlyGlobe-MaplyComponent
+ *
+ *  Created by Steve Gifford on 9/29/15.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <UIKit/UIKit.h>
+#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
+#import <WhirlyGlobeMaplyComponent/MaplyScreenMarker.h>
+#import <WhirlyGlobeMaplyComponent/MaplyShader.h>
+
+@class MaplyBaseViewController;
+
+/** 
+    Information about the group of objects to cluster.
+    
+    This object is passed in when the developer needs to make an image for a group of objects.
+  */
+@interface MaplyClusterInfo : NSObject
+
+/// Number of objects being clustered
+@property (nonatomic,assign) int numObjects;
+
+/// All the unique IDs from the
+@property (nonatomic,retain) NSArray<NSString *> * __nullable uniqueIDs;
+
+@end
+
+/** 
+    Visual representation for a group of markers.
+    
+    Fill this in when you're implementing a MaplyClusterGenerator.
+  */
+@interface MaplyClusterGroup : NSObject
+
+/// The image to use for the group
+@property (nonatomic,strong) id __nonnull image;
+
+/// Screen size to use for the resulting marker
+@property (nonatomic,assign) CGSize size;
+
+/// Size used for layout.  If it's not set, we use the regular size.
+@property (nonatomic,assign) CGSize layoutSize;
+
+@end
+
+/** 
+    Fill in this protocol to provide images when individual markers/labels are clustered.
+    
+    This is the protocol for marker/label clustering.  You must fill this in and register the cluster
+  */
+@protocol MaplyClusterGenerator <NSObject>
+
+/** 
+    Called at the start of clustering.
+    
+    Called right before we start generating clusters.  Do you setup here if need be.
+  */
+- (void) startClusterGroup;
+
+/** 
+    Generate a cluster group for a given collection of markers.
+    
+    Generate an image and size to represent the number of marker/labels we're consolidating.
+ 
+    @note Will not be called if @c -showMarkerWithHighestImportance returns @c true.
+  */
+- (MaplyClusterGroup *__nonnull) makeClusterGroup:(MaplyClusterInfo *__nonnull)clusterInfo;
+
+/** 
+    Called at the end of clustering.
+    
+    If you were doing optimization (for image reuse, say) clean it up here.
+  */
+- (void) endClusterGroup;
+
+/// Return the cluster number we're covering
+- (int) clusterNumber;
+
+/// The size of the cluster that will be created.
+/// This is the biggest cluster you're likely to create.  We use it to figure overlaps between clusters.
+- (CGSize) clusterLayoutSize;
+
+/// Use appearance and coordinate of cluster group marker with highest importance. If not set then an average of coordinates will be used
+- (bool) showMarkerWithHighestImportance;
+
+/// Set this if you want cluster to be user selectable.  On by default.
+- (bool) selectable;
+
+/// How long to animate markers the join and leave a cluster
+- (double) markerAnimationTime;
+
+/// The shader to use for moving objects around
+/// If you're doing animation from point to cluster you need to provide a suitable shader.
+- (MaplyShader *__nullable) motionShader;
+
+@end
+
+/** 
+    The basic cluster generator installed by default.
+    
+    This cluster generator will make images for grouped clusters of markers/labels.
+  */
+@interface MaplyBasicClusterGenerator : NSObject <MaplyClusterGenerator>
+
+/** 
+    Initialize with a list of colors.
+    
+    Initialize with a list of colors.  Each order of magnitude will use another color.  Must provide at least 1.
+  */
+- (nonnull instancetype)initWithColors:(NSArray *__nonnull)colors clusterNumber:(int)clusterNumber size:(CGSize)markerSize viewC:(NSObject<MaplyRenderControllerProtocol> *__nonnull)viewC;
+
+/// The ID number corresponding to the cluster.  Every marker/label with this cluster ID will be grouped together.
+@property (nonatomic,assign) int clusterNumber;
+
+/// The size of the cluster that will be created.
+/// This is the biggest cluster you're likely to create.  We use it to figure overlaps between clusters.
+@property (nonatomic) CGSize clusterLayoutSize;
+
+/// Set to use appearance and coordinate of cluster group marker with highest importance. Off by default.
+@property (nonatomic) bool showMarkerWithHighestImportance;
+
+/// Set this if you want cluster to be user selectable.  On by default.
+@property (nonatomic) bool selectable;
+
+/// How long to animate markers the join and leave a cluster
+@property (nonatomic) double markerAnimationTime;
+
+/// The shader to use when moving objects around
+/// When warping objects to their new locations we use a motion shader.  Set this if you want to override the default.
+@property (nonatomic,strong) MaplyShader * __nullable motionShader;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyColorRampGenerator.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyColorRampGenerator.h
new file mode 100644
index 0000000..95d2331
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyColorRampGenerator.h
@@ -0,0 +1,42 @@
+//
+//  MaplyColorRampGenerator.h
+//  WhirlyGlobe-MaplyComponent
+//
+//  Created by Steve Gifford on 4/20/16.
+//
+//
+
+#import <UIKit/UIKit.h>
+
+/** The color ramp generator will take a set of color values
+    and generate a linear ramp of those colors in an output
+    image.  You typically feed the color ramp image into a shader.
+  */
+@interface MaplyColorRampGenerator : NSObject
+
+// If set we'll stretch the colors out to the whole image
+// On by default.
+@property (nonatomic,assign) bool stretch;
+
+/// Add a color as a hex value.
+- (void)addHexColor:(int)hexColor;
+
+/// This color has an alpha too
+- (void)addHexColorWithAlpha:(int)hexColor;
+
+/// A color that's present in only one entry
+- (void)addSingleEntryColor:(UIColor *)color;
+
+/// Add a color as a UIColor
+- (void)addColor:(UIColor *)color;
+
+/// Add color with values expressed as integers 0-255
+- (void)addByteRed:(int)red green:(int)green blue:(int)blue alpha:(int)alpha;
+
+/// Generate the image with the color ramp in it
+- (UIImage *)makeImage:(CGSize)size;
+
+/// Get a list of colors (rather than generating an image)
+- (NSArray *)getColors;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyComponent.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyComponent.h
new file mode 100644
index 0000000..8dcb73c
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyComponent.h
@@ -0,0 +1,102 @@
+/*  MaplyComponent.h
+ *  MaplyComponent
+ *
+ *  Created by Steve Gifford on 9/6/12.
+ *  Copyright 2012-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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#import <WhirlyGlobeMaplyComponent/MaplySharedAttributes.h>
+
+#import <WhirlyGlobeMaplyComponent/NSData+Zlib.h>
+#import <WhirlyGlobeMaplyComponent/NSDictionary+StyleRules.h>
+
+#import <WhirlyGlobeMaplyComponent/MaplyGeomBuilder.h>
+#import <WhirlyGlobeMaplyComponent/MaplyIconManager.h>
+#import <WhirlyGlobeMaplyComponent/MaplyLocationTracker.h>
+#import <WhirlyGlobeMaplyComponent/MaplyTextureBuilder.h>
+
+#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
+#import <WhirlyGlobeMaplyComponent/MaplyCoordinateSystem.h>
+#import <WhirlyGlobeMaplyComponent/MaplyMatrix.h>
+
+#import <WhirlyGlobeMaplyComponent/MaplyActiveObject.h>
+#import <WhirlyGlobeMaplyComponent/MaplyAnnotation.h>
+#import <WhirlyGlobeMaplyComponent/MaplyRenderController.h>
+#import <WhirlyGlobeMaplyComponent/MaplyUpdateLayer.h>
+#import <WhirlyGlobeMaplyComponent/MaplyViewTracker.h>
+#import <WhirlyGlobeMaplyComponent/MaplyControllerLayer.h>
+#import <WhirlyGlobeMaplyComponent/MaplyViewController.h>
+#import <WhirlyGlobeMaplyComponent/MaplyBaseViewController.h>
+
+#import <WhirlyGlobeMaplyComponent/MaplyComponentObject.h>
+#import <WhirlyGlobeMaplyComponent/MaplyBillboard.h>
+#import <WhirlyGlobeMaplyComponent/MaplyCluster.h>
+#import <WhirlyGlobeMaplyComponent/MaplyLabel.h>
+#import <WhirlyGlobeMaplyComponent/MaplyGeomModel.h>
+#import <WhirlyGlobeMaplyComponent/MaplyMarker.h>
+#import <WhirlyGlobeMaplyComponent/MaplyMoon.h>
+#import <WhirlyGlobeMaplyComponent/MaplyParticleSystem.h>
+#import <WhirlyGlobeMaplyComponent/MaplyPoints.h>
+#import <WhirlyGlobeMaplyComponent/MaplySticker.h>
+#import <WhirlyGlobeMaplyComponent/MaplyShape.h>
+#import <WhirlyGlobeMaplyComponent/MaplyScreenLabel.h>
+#import <WhirlyGlobeMaplyComponent/MaplySun.h>
+#import <WhirlyGlobeMaplyComponent/MaplyScreenObject.h>
+#import <WhirlyGlobeMaplyComponent/MaplyScreenMarker.h>
+#import <WhirlyGlobeMaplyComponent/MaplyStarsModel.h>
+#import <WhirlyGlobeMaplyComponent/MaplyTexture.h>
+#import <WhirlyGlobeMaplyComponent/MaplyVectorObject.h>
+
+#import <WhirlyGlobeMaplyComponent/MapboxVectorTiles.h>
+#import <WhirlyGlobeMaplyComponent/MapboxVectorInterpreter.h>
+
+#import <WhirlyGlobeMaplyComponent/SLDStyleSet.h>
+#import <WhirlyGlobeMaplyComponent/SLDExpressions.h>
+#import <WhirlyGlobeMaplyComponent/SLDOperators.h>
+#import <WhirlyGlobeMaplyComponent/SLDSymbolizers.h>
+#import <WhirlyGlobeMaplyComponent/SLDWellKnownMarkers.h>
+#import <WhirlyGlobeMaplyComponent/MaplyVectorStyle.h>
+#import <WhirlyGlobeMaplyComponent/MaplyVectorStyleSimple.h>
+#import <WhirlyGlobeMaplyComponent/MaplyVectorTileLineStyle.h>
+#import <WhirlyGlobeMaplyComponent/MaplyVectorTileMarkerStyle.h>
+#import <WhirlyGlobeMaplyComponent/MaplyVectorTilePolygonStyle.h>
+#import <WhirlyGlobeMaplyComponent/MaplyVectorTileStyle.h>
+#import <WhirlyGlobeMaplyComponent/MaplyVectorTileTextStyle.h>
+#import <WhirlyGlobeMaplyComponent/MapboxVectorStyleSet.h>
+#import <WhirlyGlobeMaplyComponent/MapnikStyle.h>
+#import <WhirlyGlobeMaplyComponent/MapnikStyleRule.h>
+#import <WhirlyGlobeMaplyComponent/MapnikStyleSet.h>
+
+#import <WhirlyGlobeMaplyComponent/MaplyQuadLoader.h>
+#import <WhirlyGlobeMaplyComponent/MaplyImageTile.h>
+#import <WhirlyGlobeMaplyComponent/MaplyQuadImageLoader.h>
+#import <WhirlyGlobeMaplyComponent/MaplyQuadImageFrameLoader.h>
+#import <WhirlyGlobeMaplyComponent/MaplyQuadPagingLoader.h>
+#import <WhirlyGlobeMaplyComponent/MaplyTileSourceNew.h>
+#import <WhirlyGlobeMaplyComponent/MaplySimpleTileFetcher.h>
+#import <WhirlyGlobeMaplyComponent/MaplyQuadSampler.h>
+#import <WhirlyGlobeMaplyComponent/MaplyRemoteTileFetcher.h>
+#import <WhirlyGlobeMaplyComponent/GeoJSONSource.h>
+
+#import <WhirlyGlobeMaplyComponent/MaplyWMSTileSource.h>
+#import <WhirlyGlobeMaplyComponent/MaplyMBTileFetcher.h>
+
+#import <WhirlyGlobeMaplyComponent/MaplyVariableTarget.h>
+#import <WhirlyGlobeMaplyComponent/MaplyAtmosphere.h>
+#import <WhirlyGlobeMaplyComponent/MaplyColorRampGenerator.h>
+#import <WhirlyGlobeMaplyComponent/MaplyLight.h>
+#import <WhirlyGlobeMaplyComponent/MaplyRenderTarget.h>
+#import <WhirlyGlobeMaplyComponent/MaplyShader.h>
+#import <WhirlyGlobeMaplyComponent/MaplyVertexAttribute.h>
+
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyComponentObject.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyComponentObject.h
new file mode 100644
index 0000000..59ccde6
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyComponentObject.h
@@ -0,0 +1,37 @@
+/*
+ *  MaplyComponentObject.h
+ *  WhirlyGlobe-MaplyComponent
+ *
+ *  Created by Steve Gifford on 9/18/12.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <Foundation/Foundation.h>
+
+/** 
+    Used to represent the view controller resources attached to one or more visual objects.
+    
+    When you add one or more objects to a view controller, you'll get a component object back. It's an opaque object (seriously, don't look inside) that we use to track various resources within the toolkit.
+    
+    You can keep these around to remove the visual objects you added earlier, but that's about all the interaction you'll have with them.
+  */
+@interface MaplyComponentObject : NSObject
+
+/// Construct with a description.  Uses the kMaplyEnable.
+- (nonnull instancetype)initWithDesc:(NSDictionary *__nonnull)desc;
+
+@end
+
+typedef MaplyComponentObject WGComponentObject;
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyControllerLayer.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyControllerLayer.h
new file mode 100644
index 0000000..d8775d0
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyControllerLayer.h
@@ -0,0 +1,44 @@
+/*
+ *  MaplyControllerLayer.h
+ *  WhirlyGlobe-MaplyComponent
+ *
+ *  Created by Steve Gifford on 10/25/12.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <Foundation/Foundation.h>
+
+/** 
+    The View Controller Layer is a base class for other display layers.
+    
+    You don't create these directly.  This is a base class for other things.  Its hooks into the rest of the system are hidden.
+  */
+@interface MaplyControllerLayer : NSObject
+
+/** 
+    Set the priority for drawing.
+    
+    This is how you control where the geometry produced by this layer shows up with respect to other layers and other geometry.  This must be set immediately after creation.  It will have undefined behavior after the layer has started.
+  */
+@property (nonatomic,assign) int drawPriority;
+
+/** 
+    Set as unique identifier, or group...
+ 
+    use this property in order to localize this layer in the Globe/Map, you use in a predicate to catch as a load layer in Globe...
+ */
+@property (nonatomic, strong) NSString *identifier;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyCoordinate.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyCoordinate.h
new file mode 100644
index 0000000..d1c01e8
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyCoordinate.h
@@ -0,0 +1,342 @@
+/*
+ *  MaplyCoordinate.h
+ *  WhirlyGlobe-MaplyComponent
+ *
+ *  Created by Steve Gifford on 7/21/12.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <Foundation/Foundation.h>
+#import <CoreLocation/CoreLocation.h>
+
+/** 
+    A 2D coordinate representation.
+    
+    The Maply Coordinate is a simple 2 dimensional coordinate
+    passed around to numerous methods.  For geo-coordinates x
+    maps to longitude and y to latitude and the values are
+    in radians.
+  */
+typedef struct
+{
+    float x,y;
+} MaplyCoordinate;
+
+
+static const MaplyCoordinate kMaplyNullCoordinate = {.x = FLT_MIN, .y = FLT_MIN};
+
+
+/** 
+    Double precision version of 2D coordinate.
+    
+    This works the same was as the MaplyCoordinate, but has
+    more precision.
+  */
+typedef struct
+{
+    double x,y;
+} MaplyCoordinateD;
+
+static const MaplyCoordinateD kMaplyNullCoordinateD = {.x = DBL_MIN, .y = DBL_MIN};
+
+
+/** 
+    A 3D coordinate representation.
+    
+    The 3D version of the Maply Coordinate adds a z values, often
+    in meters, but not always.  Consult the appropriate method to
+    be sure.
+  */
+typedef struct
+{
+    float x,y,z;
+} MaplyCoordinate3d;
+
+/** 
+    An NSObject based wrapper for 3D coordinates.
+    
+    This wrapper encapsulates a MaplyCoordinate3d so we can pass them around in NSDictionary objects.
+  */
+@interface MaplyCoordinate3dWrapper : NSObject
+
+/// Initialize with a 3D coordinate
+- (instancetype)initWithCoord:(MaplyCoordinate3d)coord;
+
+/// 3D coordinate
+@property (nonatomic,readonly) MaplyCoordinate3d coord;
+
+@end
+
+typedef struct
+{
+    double x,y,z;
+} MaplyCoordinate3dD;
+
+static const MaplyCoordinate3dD kMaplyNullCoordinate3dD = {.x = DBL_MIN, .y = DBL_MIN, .z = DBL_MIN};
+
+/** 
+    An NSObject based wrapper for 3D coordinates.
+ 
+    This wrapper encapsulates a MaplyCoordinate3d so we can pass them around in NSDictionary objects.
+ */
+@interface MaplyCoordinate3dDWrapper : NSObject
+
+/// Initialize with a 3D coordinate
+- (instancetype)initWithCoord:(MaplyCoordinate3dD)coord;
+
+/// 3D coordinate
+@property (nonatomic,readonly) MaplyCoordinate3dD coord;
+
+@end
+
+/** 
+    Represents a bounding box in a particular coordinate system.
+    
+    ll is the lower left and ur is the upper right.
+  */
+typedef struct
+{
+    MaplyCoordinate ll;
+    MaplyCoordinate ur;
+} MaplyBoundingBox;
+
+static const MaplyBoundingBox kMaplyNullBoundingBox = {
+	.ll = {.x = FLT_MIN, .y = FLT_MIN},
+	.ur = {.x = FLT_MIN, .y = FLT_MIN}
+};
+
+/**
+    A category that uses NSValue to store MaplyCoordinate data
+ */
+@interface NSValue (MaplyCoordinate)
++ (instancetype)valueWithMaplyCoordinate:(MaplyCoordinate)value;
+@property (readonly) MaplyCoordinate maplyCoordinateValue;
+@end
+
+/**
+    A category that uses NSValue to store MaplyCoordinateD data
+ */
+@interface NSValue (MaplyCoordinateD)
++ (instancetype)valueWithMaplyCoordinateD:(MaplyCoordinateD)value;
+@property (readonly) MaplyCoordinateD maplyCoordinateDValue;
+@end
+
+/**
+    A category that uses NSValue to store MaplyBoundingBox data
+ */
+@interface NSValue (MaplyBoundingBox)
++ (instancetype)valueWithMaplyBoundingBox:(MaplyBoundingBox)value;
+@property (readonly) MaplyBoundingBox maplyBoundingBoxValue;
+@end
+
+/** 
+    Represents a bounding box in a particular coordinate system.
+    
+    ll is the lower left and ur is the upper right.
+ */
+typedef struct
+{
+	MaplyCoordinateD ll;
+	MaplyCoordinateD ur;
+} MaplyBoundingBoxD;
+
+static const MaplyBoundingBoxD kMaplyNullBoundingBoxD = {
+	.ll = {.x = DBL_MIN, .y = DBL_MIN},
+	.ur = {.x = DBL_MIN, .y = DBL_MIN}
+};
+
+#if __cplusplus
+extern "C" {
+#endif
+
+/** 
+    Construct a MaplyCoordiante with longitude and latitude values in radians.
+    
+    MaplyCoordinate's are in radians when they represent lon/lat values.  This constructs one with radians as input.
+    
+    @return A 2D MaplyCoordinate in radians (if representing a lon/lat value).
+  */
+MaplyCoordinate MaplyCoordinateMake(float radLon,float radLat);
+
+/** 
+    Construct a MaplyCoordianteD with longitude and latitude values in radians.
+    
+    MaplyCoordinate's are in radians when they represent lon/lat values.  This constructs one with radians as input.
+    
+    @return A 2D MaplyCoordinateD in radians (if representing a lon/lat value).
+    */
+MaplyCoordinateD MaplyCoordinateDMake(double radLon,double radLat);
+    
+/** 
+    Construct a MaplyGeoCoordinate with longitude and latitude values in degrees.
+    
+    MaplyCoordinate's are in radians when they represent lon/lat values.  This function does that conversion for you.
+    
+    @param degLon The longitude value (east to west) in degrees.
+    
+    @param degLat The latitude value (north to south) in degrees.
+    
+    @return A 2D MaplyCoordinate in radians (if representing a lon/lat value).
+  */
+MaplyCoordinate MaplyCoordinateMakeWithDegrees(float degLon,float degLat);
+
+/** 
+    Construct a MaplyGeoCoordinate with longitude and latitude values in degrees.
+ 
+    MaplyCoordinate's are in radians when they represent lon/lat values.  This function does that conversion for you.
+ 
+    @param degLon The longitude value (east to west) in degrees.
+ 
+    @param degLat The latitude value (north to south) in degrees.
+ 
+    @return A 2D MaplyCoordinate in radians (if representing a lon/lat value).
+ */
+MaplyCoordinateD MaplyCoordinateDMakeWithDegrees(double degLon,double degLat);
+
+/** 
+    Construct a MaplyCoordinateD with a MaplyCoordinate.
+    
+    This function constructs a MaplyCoordinateD with the component values of the input MaplyCoordinate.
+    
+    @param c The input MaplyCoordinate value.
+    
+    @return A 2D MaplyCoordinateD in radians (if representing a lon/lat value).
+  */
+MaplyCoordinateD MaplyCoordinateDMakeWithMaplyCoordinate(MaplyCoordinate c);
+
+/**
+    Construct a MaplyCoordinate with a MaplyCoordinateD.
+    
+    This function constructs a MaplyCoordinate with the component values of the input MaplyCoordinateD.
+    
+    @param c The input MaplyCoordinateD value.
+    
+    @return A 2D MaplyCoordinate in radians (if representing a lon/lat value).
+  */
+MaplyCoordinate MaplyCoordinateMakeWithMaplyCoordinateD(MaplyCoordinateD c);
+
+/**
+    Construct a MaplyCoordinat3d from the values given.
+    
+    @param x The x value, or longitude in radians if we're making geo coordinates.
+    
+    @param y The y value, or latitude in radians if we're making geo coordinates.
+    
+    @param z The z value, sometimes this is display coordinates (radius == 1.0 for a sphere)
+              and sometimes this is meters.  It depends on how you're using it.
+    
+    @return A 3D MaplyCoordinate3d in radians + other (if representing a lon/lat value).
+  */
+MaplyCoordinate3d MaplyCoordinate3dMake(float x,float y,float z);
+
+/** 
+    Construct a MaplyCoordinat3d from the values given.
+    
+    @param x The x value, or longitude in radians if we're making geo coordinates.
+    
+    @param y The y value, or latitude in radians if we're making geo coordinates.
+    
+    @param z The z value, sometimes this is display coordinates (radius == 1.0 for a sphere)
+ and sometimes this is meters.  It depends on how you're using it.
+    
+    @return A 3D MaplyCoordinate3d in radians + other (if representing a lon/lat value).
+ */
+MaplyCoordinate3dD MaplyCoordinate3dDMake(double x,double y,double z);
+
+/** 
+    Construct a MaplyBoundingBox from the values given.
+    
+    The inputs are in degrees and the order is longitude *then* latitude.
+    
+    @param degLon0 The left side of the bounding box in degrees.
+    
+    @param degLat0 The bottom of the bounding box in degrees.
+    
+    @param degLon1 The right side of the bounding box in degrees.
+    
+    @param degLat1 The top of the bounding box in degrees.
+    
+    @return A MaplyBoundingBox in radians.
+  */
+MaplyBoundingBox MaplyBoundingBoxMakeWithDegrees(float degLon0,float degLat0,float degLon1,float degLat1);
+
+/** Double version of MaplyBoundingBoxMakeWithDegrees
+  */
+MaplyBoundingBoxD MaplyBoundingBoxDMakeWithDegrees(double degLon0,double degLat0,double degLon1,double degLat1);
+
+/** 
+    Check if two bounding boxes overlap.
+     
+    @return Returns true if they did overlap, false otherwise.
+  */
+bool MaplyBoundingBoxesOverlap(MaplyBoundingBox bbox0,MaplyBoundingBox bbox1);
+    
+/** 
+    Check if a bounding contains a given coordinate.
+     
+    @return Returns true if the bounding box contains the coordinate.
+  */
+bool MaplyBoundingBoxContains(MaplyBoundingBox bbox, MaplyCoordinate c);
+
+/**
+  Set up a bounding box from a list of 2D locations.
+ */
+MaplyBoundingBox MaplyBoundingBoxFromLocations(const CLLocationCoordinate2D locs[], unsigned int numLocs);
+
+/**
+  Set up a bounding box from a list of 2D coordinates
+ */
+MaplyBoundingBox MaplyBoundingBoxFromCoordinates(const MaplyCoordinate coords[], unsigned int numCoords);
+MaplyBoundingBox MaplyBoundingBoxFromCoordinatesD(const MaplyCoordinateD coords[], unsigned int numCoords);
+MaplyBoundingBoxD MaplyBoundingBoxDFromCoordinates(const MaplyCoordinate coords[], unsigned int numCoords);
+MaplyBoundingBoxD MaplyBoundingBoxDFromCoordinatesD(const MaplyCoordinateD coords[], unsigned int numCoords);
+
+/**
+  Expand a bounding box with a list of 2D coordinates
+ */
+MaplyBoundingBox MaplyBoundingBoxAddCoordinates(MaplyBoundingBox box, const MaplyCoordinate coords[], unsigned int numCoords);
+MaplyBoundingBox MaplyBoundingBoxAddCoordinatesD(MaplyBoundingBox box, const MaplyCoordinateD coords[], unsigned int numCoords);
+MaplyBoundingBoxD MaplyBoundingBoxDAddCoordinates(MaplyBoundingBoxD box, const MaplyCoordinate coords[], unsigned int numCoords);
+MaplyBoundingBoxD MaplyBoundingBoxDAddCoordinatesD(MaplyBoundingBoxD box, const MaplyCoordinateD coords[], unsigned int numCoords);
+
+/**
+ Return the intersection of two bounding boxes.
+ */
+MaplyBoundingBox MaplyBoundingBoxIntersection(MaplyBoundingBox bbox0,MaplyBoundingBox bbox1);
+
+/** 
+    Expands a bounding box by a given fraction of its size.
+     
+    @return Returns the expanded bounding box.
+  */
+MaplyBoundingBox MaplyBoundingBoxExpandByFraction(MaplyBoundingBox bbox, float buffer);
+    
+/** 
+    Calculate the great circle distance between two geo coordinates.
+    
+    This calculates the distance on a sphere between one point and another.
+    
+    @param p0 The starting point, lon/lat in radians.
+    
+    @param p1 The end point, lon/lat in radians.
+    
+    @return The distance between p0 and p1 in meters.
+  */
+double MaplyGreatCircleDistance(MaplyCoordinate p0,MaplyCoordinate p1);
+    
+#if __cplusplus
+}
+#endif
+
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyCoordinateSystem.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyCoordinateSystem.h
new file mode 100644
index 0000000..6778bd3
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyCoordinateSystem.h
@@ -0,0 +1,176 @@
+/*  MaplyCoordinateSystem.h
+ *  WhirlyGlobe-MaplyComponent
+ *
+ *  Created by Steve Gifford on 5/13/13.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#import <Foundation/Foundation.h>
+#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
+
+/** 
+    Coordinate system for tiling systems and data sources and such.
+    
+    This object represents the spatial reference system and bounding box for objects like the MaplyTileSource or vectors or other things.  Not all data is in lat/lon geographic (actually MaplyPlateCaree) nor is it always in MaplySphericalMercator.  Sometimes it's in one or the other, or a bit of both.
+    
+    We use this base class to express the coordinate system and we threw in the bounding box, which we will surely come to regret.  Oh well, it's in there.
+    
+    This object gets passed around to tell us what coordinate system data is in or how we're displaying things.  Right now only MaplySphericalMercator and MaplyPlateCarree are represented.  In the future, there will be more.
+   */
+@interface MaplyCoordinateSystem : NSObject
+
+/** 
+    Set the bounding box in the local coordinate system.
+ 
+    This is the bounding box, for things like display coordinates.  If the extents would normally be in degrees, use radians.  Otherwise, the values are in the local system.
+ */
+- (void)setBounds:(MaplyBoundingBox)bounds;
+
+/**
+    Set the bounding box in the local coordinate system.
+ 
+    This is the bounding box, for things like display coordinates.  If the extents would normally be in degrees, use radians.  Otherwise, the values are in the local system.
+ */
+- (void)setBoundsD:(MaplyBoundingBoxD)boundsD;
+
+/** 
+    Set the bounding box in the local coordinate system.
+    
+    This is the bounding box, for things like display coordinates.  If the extents would normally be in degrees, use radians.  Otherwise, the values are in the local system.
+  */
+- (void)setBoundsLL:(MaplyCoordinate * __nonnull)ll ur:(MaplyCoordinate * __nonnull)ll;
+
+/** 
+    Return the bounding box in local coordinates.
+ 
+    This is the bounding box in local coordinates, or if the extents would normally be expressed in degrees, it's radians.
+ */
+- (MaplyBoundingBox)getBounds;
+
+/** 
+    Return the bounding box in local coordinates.
+    
+    This is the bounding box in local coordinates, or if the extents would normally be expressed in degrees, it's radians.
+  */
+- (void)getBoundsLL:(MaplyCoordinate * __nonnull)ret_ll ur:(MaplyCoordinate * __nonnull)ret_ur;
+
+/** 
+    Convert a coordinate from geographic to the local coordinate system.
+    
+    Take a geo coordinate (lon/lat in radians) and convert to the local space.
+  */
+- (MaplyCoordinate)geoToLocal:(MaplyCoordinate)coord;
+
+/** 
+    Convert a coordinate from the local space to geographic.
+    
+    This takes a coordinate in this coordinate system and converts it to geographic (lat/lon in radians).
+  */
+- (MaplyCoordinate)localToGeo:(MaplyCoordinate)coord;
+
+/** 
+    Convert a 3D coordinate from the local space to geocentric.
+    
+    This takes a 3D coordinate (including height) and converts it to geocentric in WGS84.
+  */
+- (MaplyCoordinate3dD)localToGeocentric:(MaplyCoordinate3dD)coord;
+
+/** 
+    Convert a 3D coordinate from geocentric to the local space.
+    
+    This takes a 3D geocentric coordinate (WGS84) and converts it to the local space, including height;
+  */
+- (MaplyCoordinate3dD)geocentricToLocal:(MaplyCoordinate3dD)coord;
+
+/** 
+    Express the coordinate system in an SRS compatible string.
+  */
+- (NSString * __nonnull)getSRS;
+
+/** 
+    Can this coordinate system be expressed in degrees?
+    
+    This is set for coordinate systems that express their extents in degrees.  This is useful for cases where we need to construct some metadata to go along with the system and you'd normally expect it to be in degrees rather than radians.
+  */
+- (bool)canBeDegrees;
+
+@end
+
+/** 
+    Plate Carree is lat/lon stretched out to its full extents.
+    
+    This coordinate system is used when we're tiling things over the whole earth, from -180 to +180 and from -90 to +90.  Use this if you chopped up your data in that way.
+  */
+@interface MaplyPlateCarree : MaplyCoordinateSystem
+
+/// Initialize with Plate Carree covering the whole globe.
+- (nonnull instancetype)init;
+
+/// Initialize with Plate Carree covering the whole globe.
+- (nullable instancetype)initFullCoverage;
+
+/// Initialize with the given bounding box (in radians)
+- (nullable instancetype)initWithBoundingBox:(MaplyBoundingBox)bbox;
+
+/// Initialize with the given bounding box (in radians)
+- (nullable instancetype)initWithBoundingBoxD:(MaplyBoundingBoxD)bbox;
+
+@end
+
+/** 
+    Spherical Mercator is what you'll most commonly see on web maps.
+    
+    The Spherical Mercator system, with web extents is what MapBox, Google, Bing, etc. use for their maps.  If you ever want to annoy a cartographer, suggest that spherical mercator is all you ever really need.
+    
+    The drawback with Spherical Mercator is that it doesn't cover the poles and it distorts (and how) its north and south extents.  Web Standard refers to the extents you'll find in most online maps.  This is probably want you want.
+  */
+@interface MaplySphericalMercator : MaplyCoordinateSystem
+
+/// Initialize with the -85...,+85... extents to match most comm only used online maps
+- (nonnull instancetype)init;
+
+/// Initialize with the -85...,+85... extents to match most commonly used online maps
+- (nonnull instancetype)initWebStandard;
+
+@end
+
+/** 
+    A generic coordinate system wrapper around proj4.
+    
+    You create one of these with a proj4 string.  It'll act like a normal MaplyCoordinateSysterm after that.
+    
+    Be sure to check that the system is valid.  The proj4 string could be wrong.
+  */
+@interface MaplyProj4CoordSystem : MaplyCoordinateSystem
+
+/** 
+    Initialize with a proj4 compatible string
+    
+    Since this is just a proj.4 wrapper, we need an initialization string that it can parse.
+  */
+- (nonnull instancetype)initWithString:(NSString * __nonnull)proj4Str;
+
+/// True if the proj.4 string was valid and the coordinate system can work.
+- (bool)valid;
+
+@end
+
+/** 
+    Generate the correct coordinate system from a standard EPSG.
+    
+    This returns the correct coordinate system from a standard EPSG string.
+    
+    The list of available coordinate systems is very short.
+  */
+MaplyCoordinateSystem * __nullable MaplyCoordinateSystemFromEPSG(NSString * __nonnull crs);
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyDoubleTapDelegate.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyDoubleTapDelegate.h
new file mode 100644
index 0000000..45329e1
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyDoubleTapDelegate.h
@@ -0,0 +1,25 @@
+/*  MaplyDoubleTapDelegate.h
+ *
+ *  Created by Jesse Crocker on 2/3/14.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#import <WhirlyGlobeMaplyComponent/MaplyZoomGestureDelegate.h>
+
+@interface MaplyDoubleTapDelegate : MaplyZoomGestureDelegate
+
+/// How long we animate from starting to end point
+@property (nonatomic) float animTime;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyDoubleTapDragDelegate.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyDoubleTapDragDelegate.h
new file mode 100644
index 0000000..5e55d23
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyDoubleTapDragDelegate.h
@@ -0,0 +1,22 @@
+/*  MaplyDoubleTapDragDelegate.h
+ *
+ *  Created by Steve Gifford on 2/7/14.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#import <WhirlyGlobeMaplyComponent/MaplyZoomGestureDelegate.h>
+
+@interface MaplyDoubleTapDragDelegate : MaplyZoomGestureDelegate
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyGeomBuilder.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyGeomBuilder.h
new file mode 100644
index 0000000..2f05d38
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyGeomBuilder.h
@@ -0,0 +1,301 @@
+/*
+ *  MaplyGeomModelBuilder.h
+ *  WhirlyGlobeComponent
+ *
+ *  Created by Steve Gifford on 1/20/16
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <UIKit/UIKit.h>
+#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
+#import <WhirlyGlobeMaplyComponent/MaplyRenderController.h>
+#import <WhirlyGlobeMaplyComponent/MaplyGeomModel.h>
+
+/** 
+    Geometry State is used to describe the visual look of objects as they're added.
+    
+    Set the various fields in the geometry state to control how geometry looks when you add it.
+            There are defaults for all of these fields.
+  */
+@interface MaplyGeomState : NSObject
+
+/// Color to use for the geometry
+@property (nonatomic,strong) UIColor *color;
+
+/// Background color for text
+@property (nonatomic,strong) UIColor *backColor;
+
+/// UIImage for MaplyTexture to apply to geometry
+@property (nonatomic,strong) id texture;
+
+/// For more than one texture, use addTexture
+- (void)addTexture:(MaplyTexture *)texture;
+
+@end
+
+/** 
+    The geometry builder is used to construct 3D models.
+    
+    You use the geometry builder when you have a custom 3D model to build.  This can include things like airport runways, buildings, or anything else that's particular to a certain location.
+    
+    Start by construting the builder and then adding polygons and strings to it.
+    
+    You can combine multiple geometry builders together to build up repeated portions of a model.
+    
+    The builder has an "immediate mode" where you add points individually to build up polygons and then add those.  This is one of the simpler ways to use the system.
+  */
+@interface MaplyGeomBuilder : NSObject
+
+/// Intialize with the view controller the model will be used in.
+- (id)initWithViewC:(NSObject<MaplyRenderControllerProtocol> *)viewC;
+
+/** 
+    Create a rectangle around the origin.
+    
+    This creates a flat rectangle around the origin (0,0,0) with z = 0.
+    
+    @param size The size of the rectangle (x,y).
+    
+    @param state The visual state to use when creating the geometry.
+  */
+- (void)addRectangleAroundOrigin:(MaplyCoordinateD)size state:(MaplyGeomState *)state;
+
+/** 
+    Create a rectangle around the origin.
+ 
+    This creates a flat rectangle around the origin (0,0,0) with z = 0.
+ 
+    @param x Horizontal size of the rectangle.
+ 
+    @param y Vertical size of the rectangle.
+ 
+    @param state The visual state to use when creating the geometry.
+ */
+- (void)addRectangleAroundOriginX:(double)x y:(double)y state:(MaplyGeomState *)state;
+
+/** 
+    Create a rectangle around the given point.
+ 
+    This creates a flat rectangle around the point x,y with z = 0.
+ 
+    @param x X location around which to create the rectangle.
+ 
+    @param y Y location around which to create the rectangle.
+ 
+    @param width Horizontal size of the rectangle.
+ 
+    @param height Vertical size of the rectangle.
+ 
+    @param state The visual state to use when creating the geometry.
+ */
+- (void)addRectangleAroundX:(double)x y:(double)y width:(double)width height:(double)height state:(MaplyGeomState *)state;
+
+/** 
+    Add an attributed string to the geometry builder.
+    
+    Add an attributed string, which contains information about color and front to the geometry builder.
+    
+    @param str String to add to the geometry.
+    
+    @param state The visual state to use when creating the geometry.
+  */
+- (void)addAttributedString:(NSAttributedString *)str state:(MaplyGeomState *)state;
+
+/** 
+    Add a string to the geometry.
+    
+    Add a string at (0,0) to the geometry with the given font and visual state.  The font determines size.
+    
+    @param str String to add to geometry.
+    
+    @param font Font to use for the string.
+    
+    @param state The visual state to use when creating the geometry.
+  */
+- (void)addString:(NSString *)str font:(UIFont *)font state:(MaplyGeomState *)state;
+
+/** 
+    Add a string to the geometry.
+ 
+    Add a string at (0,0) to the geometry with the given font and visual state.
+ 
+    The string will be scaled to match the width and/or height given.  If one of width or height is 0.0 it will be calculated from the other.
+ 
+    @param str String to add to geometry.
+ 
+    @param width Width of the string in the final geometry.  If set to 0.0, will be calculated.
+ 
+    @param height Height of the string in the final geometry.  If set to 0.0, will be calculated.
+ 
+    @param font Font to use for the string.
+ 
+    @param state The visual state to use when creating the geometry.
+ */
+- (void)addString:(NSString *)str width:(double)width height:(double)height font:(UIFont *)font state:(MaplyGeomState *)state;
+
+/** 
+    Add a polygon with the given visual state.
+    
+    Tesselates the given polygon and adds the resulting triangles to the geometry.
+    
+    @param pts An array of 3D points.
+    
+    @param numPts Number of points in the 3D array.
+    
+    @param state The visual state to use when creating the geometry.
+  */
+- (void)addPolygonWithPts:(MaplyCoordinate3dD *)pts numPts:(int)numPts state:(MaplyGeomState *)state;
+
+/** 
+    Add a polygon with the given visual state.
+ 
+    Tesselates the given polygon and adds the resulting triangles to the geometry.
+ 
+    @param pts An array of 3D points.
+ 
+    @param tex Texture coordinates.  One for each point.
+ 
+    @param norms Normals to go with the points.
+ 
+    @param numPts Number of points in the 3D array.
+ 
+    @param state The visual state to use when creating the geometry.
+ */
+- (void)addPolygonWithPts:(MaplyCoordinate3dD *)pts tex:(MaplyCoordinateD *)tex norms:(MaplyCoordinate3dD *)norms numPts:(int)numPts state:(MaplyGeomState *)state;
+
+/** 
+    Add a point in immediate mode.
+    
+    When in immediate mode points are collected until an addCurPoly call.  This adds a 3D point.
+  */
+- (void)addCurPointX:(double)x y:(double)y z:(double)z;
+
+/** 
+    Add a point in immediate mode
+    
+    When in immediate mode points are collected until an addCurPoly call.  This add a point at (x,y,0).
+  */
+- (void)addCurPointX:(double)x y:(double)y;
+
+/** 
+    Add the current polygon in immediate mode.
+    
+    When in immediate mode points are collected until you call this method.  Then the points will be tesselated into a set of triangles and added to the geometry with the given visual state.
+  */
+- (void)addCurPoly:(MaplyGeomState *)state;
+
+/** 
+    Scale the geometry and strings by this amount.
+    
+    The geometry and strings are scaled by the given amount in each dimension.
+  */
+- (void)scale:(MaplyCoordinate3dD)scale;
+
+/** 
+    Scale the geometry and strings by the given amount.
+    
+    The geometry and strings are scaled by (x,y,z).
+  */
+- (void)scaleX:(double)x y:(double)y z:(double)z;
+
+/** 
+    Translate the geometry and strings by the given amount.
+    
+    The geometry and strings are translated by the given coordinate.
+  */
+- (void)translate:(MaplyCoordinate3dD)trans;
+
+/** 
+    Translate the geometry and strings by the given amount.
+    
+    The geometry and strings are translated by (x,y,z).
+ */
+- (void)translateX:(double)x y:(double)y z:(double)z;
+
+/** 
+    Rotate the geometry around the given axis by the given angle.
+    
+    Roate around the given 3D axis by the number of radians in angle.
+    
+    @param angle The angle in radians to rotate by.
+    
+    @param axis The axis to rotate around.  (0,0,1) would rotate around the Z axis.
+  */
+- (void)rotate:(double)angle around:(MaplyCoordinate3dD)axis;
+
+/** 
+    Rotate the geometry around the given axis by the given angle.
+ 
+    Roate around the given 3D axis by the number of radians in angle.
+ 
+    @param angle The angle in radians to rotate by.
+ 
+    @param x X component of the axis to rotate around.
+ 
+    @param y Y component of the axis to rotate around.
+ 
+    @param z Z component of the axis to rotate around.
+ */
+- (void)rotate:(double)angle aroundX:(double)x y:(double)y z:(double)z;
+
+/** 
+    Apply a transform to the geometry and strings.
+    
+    This applies a general 4x4 transform to the geometry and strings.  You can construct the MaplyMatrix using a number of different options and combine multiple matrices.
+  */
+- (void)transform:(MaplyMatrix *)matrix;
+
+/** 
+    Add the geometry from another builder.
+    
+    Multiple geometry builders can be combined to build complex objects.
+    
+    This method copies geometry and strings, including their transforms to the current builder.
+  */
+- (void)addGeomFromBuilder:(MaplyGeomBuilder *)modelBuilder;
+
+/** 
+    Add the geometry from another builder, applying the given transform.
+    
+    Multiple geometry builders can be combined to build complex objects.
+    
+    This method transform the source geometry and strings and copies them into the current builder.
+  */
+- (void)addGeomFromBuilder:(MaplyGeomBuilder *)modelBuilder transform:(MaplyMatrix *)matrix;
+
+/** 
+    Calculate the bounding box of geometry and strings.
+    
+    Calculates the lower left and upper right corners of a rectangular solid that surrounds the geometry and strings for this builder.
+    
+    This returns false if there is no valid geometry (or strings) and takes transforms into account if there is.
+  */
+- (bool)getSizeLL:(MaplyCoordinate3dD *)ll ur:(MaplyCoordinate3dD *)ur;
+
+/** 
+    Calculate and returns the size of the geometry and strings.
+    
+    Calculates the size of the geometry and strings in the builder, taking transforms into account.
+  */
+- (MaplyCoordinate3dD)getSize;
+
+/** 
+    Generate a valid MaplyGeomModel that can be instanced and used as a 3D model.
+    
+    This call returns a MaplyGeomModel.  You'll need a model to make MaplyGeomModelInstance objects and for the addModelInstances:desc:mode: call to a NSObject<MaplyRenderControllerProtocol> (map or globe).
+  */
+- (MaplyGeomModel *)makeGeomModel:(MaplyThreadMode)threadMode;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyGeomModel.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyGeomModel.h
new file mode 100644
index 0000000..82a3db9
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyGeomModel.h
@@ -0,0 +1,122 @@
+/*
+ *  MaplyGeomModel.h
+ *  WhirlyGlobe-MaplyComponent
+ *
+ *  Created by Steve Gifford on 11/26/14.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <UIKit/UIKit.h>
+#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
+#import <WhirlyGlobeMaplyComponent/MaplyMatrix.h>
+#import <WhirlyGlobeMaplyComponent/MaplyShape.h>
+
+@class MaplyShader;
+
+/** 
+    Contains a big pile of geometry and textures (e.g. a model).
+    
+    The geometry model
+ */
+@interface MaplyGeomModel : NSObject
+
+/** 
+    Initialize with the full path to a Wavefront OBJ model file.
+    
+    This creates a model from a Wavefront OBJ file, a standard, simple file format for models.  You can then instance and place this model where you might like.
+  */
+- (nullable instancetype)initWithObj:(NSString *__nonnull)fullPath;
+
+/** 
+    Initialize with a shape.
+    
+    The given shape will be turned into a geometry model so it can be instanced.
+  */
+- (nonnull instancetype)initWithShape:(MaplyShape *__nonnull)shape;
+
+@end
+
+
+/** 
+    Place a geometry model at a given location
+    
+    Geometry models tend to be expensive so we load and place them in a two step process.  First you create the MaplyGeomModel and then you place it in one or more spots with this MaplyGeomModelInstance.
+  */
+@interface MaplyGeomModelInstance : NSObject
+
+/** 
+    User data object for selection
+ 
+    When the user selects a feature and the developer gets it in their delegate, this is an object they can use to figure out what the model instance means to them.
+ */
+@property (nonatomic,strong,nullable) id userObject;
+
+/// The model to instance
+@property (nonatomic,strong,nullable) MaplyGeomModel *model;
+
+/** 
+    Where we'd like to place the instanced model.
+    
+    This is the center of the object in geographic radians.
+ */
+@property (nonatomic) MaplyCoordinate3d center;
+
+/// Transform used to oriented the model instance
+@property (nonatomic,strong,nullable) MaplyMatrix *transform;
+
+/// Color to force all polygons to use.
+/// If set, this will force all polygons to use this color.  nil by default.
+@property (nonatomic,strong,nullable) UIColor *colorOverride;
+
+/// Set if you want to select these
+@property (nonatomic) bool selectable;
+
+@end
+
+/** 
+    A version of the geometry model instance that moves.
+    
+    This version of the geometry model instance can move in a limited way over time.
+  */
+@interface MaplyMovingGeomModelInstance : MaplyGeomModelInstance
+
+/// The end point for animation
+@property (nonatomic,assign) MaplyCoordinate3d endCenter;
+
+/// How long it will take to get to the endCenter
+@property (nonatomic,assign) NSTimeInterval duration;
+
+@end
+
+/**
+ Sometimes we don't know how many instances there will be of a model until
+ some logic runs on the GPU.  We can then take that number and run that
+ number of instances of the given model.  [Metal only]
+ */
+@interface MaplyGeomModelGPUInstance : NSObject
+
+/// The model to instance
+@property (nonatomic,strong,nullable) MaplyGeomModel *model;
+
+/// Texture to derive the number of instances from (picked out of the highest, smallest level)
+@property (nonatomic,nullable) MaplyTexture *numInstSource;
+
+/// Need a shader to pull the number of instances out of a texture and shove them in the indirect buffer
+@property (nonatomic,nullable) MaplyShader *numInstShader;
+
+/// Shader to run over for this instance
+@property (nonatomic,nullable) MaplyShader *shader;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyGlobeRenderController.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyGlobeRenderController.h
new file mode 100644
index 0000000..95d1b61
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyGlobeRenderController.h
@@ -0,0 +1,115 @@
+/*
+*  MaplyGlobeRenderController.h
+*  WhirlyGlobeComponent
+*
+*  Created by Steve Gifford on 10/23/10.
+*  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.
+*  You may obtain a copy of the License at
+*  http://www.apache.org/licenses/LICENSE-2.0
+*
+*  Unless required by applicable law or agreed to in writing, software
+*  distributed under the License is distributed on an "AS IS" BASIS,
+*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*  See the License for the specific language governing permissions and
+*  limitations under the License.
+*
+*/
+
+#import <UIKit/UIKit.h>
+#import <WhirlyGlobeMaplyComponent/MaplyRenderController.h>
+#import <WhirlyGlobeMaplyComponent/MaplyRemoteTileFetcher.h>
+
+/**
+    Animation State used by the WhirlyGlobeViewControllerAnimationDelegate.
+    
+    You fill out one of these when you're implementing the animation delegate.  Return it and the view controller will set the respective values to match.
+  */
+@interface WhirlyGlobeViewControllerAnimationState : NSObject
+
+/// Heading is calculated from due north
+/// If not set or set to MAXFLOAT, this is ignored
+@property (nonatomic) double heading;
+
+/// Height above the globe
+@property (nonatomic) double height;
+
+/// Tilt as used in the view controller
+/// If not set or set to MAXFLOAT, we calculate tilt the regular way
+@property (nonatomic) double tilt;
+
+/// Roll as used in the view controller
+@property (nonatomic) double roll;
+
+/// Position to move to on the globe
+@property (nonatomic) MaplyCoordinateD pos;
+
+/// If set, this is a point on the screen where pos should be.
+/// By default this is (-1,-1) meaning the screen position is just the middle.  Otherwise, this is where the position should wind up on the screen, if it can.
+@property (nonatomic) CGPoint screenPos;
+
+/// If set, the globe will be centered at this point on the screen
+@property (nonatomic) CGPoint globeCenter;
+
+/**
+    Interpolate a new state between the given states A and B.
+    
+    This does a simple interpolation (lat/lon, not great circle) between the two animation states.
+  */
++ (nonnull WhirlyGlobeViewControllerAnimationState *)Interpolate:(double)t from:(WhirlyGlobeViewControllerAnimationState *__nonnull)stateA to:(WhirlyGlobeViewControllerAnimationState *__nonnull)stateB;
+
+@end
+
+/**
+   The Globe Render Controller is a standalone renderer for the globe.
+      This is separate from the WhirlyGlobeViewController, but performs a similar function for
+    offline rendering.
+ */
+@interface WhirlyGlobeRenderController : MaplyRenderController
+
+/// Initialize with the size of the target rendering buffer
+- (instancetype __nullable) initWithSize:(CGSize)screenSize mode:(MaplyRenderType)renderType;
+
+/// Initialize as an offline renderer of a given target size with default renderer (Metal)
+- (instancetype __nullable)initWithSize:(CGSize)size;
+
+/** Set this if you're doing frame by frame animation.
+    It will move particles along and run any animations you may have going.
+ **/
+@property (nonatomic,assign) NSTimeInterval currentTime;
+
+/**
+    Set the viewing state all at once
+    
+    This sets the position, tilt, height, screen position and heading all at once.
+  */
+- (void)setViewState:(WhirlyGlobeViewControllerAnimationState *__nonnull)viewState;
+
+/**
+    Make a WhirlyGlobeViewControllerAnimationState object from the current view state.
+    
+    This returns the current view parameters in a single WhirlyGlobeViewControllerAnimationState.
+  */
+- (nullable WhirlyGlobeViewControllerAnimationState *)getViewState;
+
+/**
+    Takes a snapshot of the current OpenGL view and returns it.
+  */
+- (UIImage *__nullable)snapshot;
+
+/**
+     This version of snapshot just returns the raw NSData from the "screen".
+ */
+- (NSData *__nullable)snapshotData;
+
+
+/**
+    If set, keep north facing upward on the screen as the user moves around.
+    
+    Off by default.
+  */
+@property(nonatomic,assign) bool keepNorthUp;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyIconManager.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyIconManager.h
new file mode 100644
index 0000000..e6f545a
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyIconManager.h
@@ -0,0 +1,140 @@
+/*
+ *  MaplyIconManager.h
+ *  WhirlyGlobe-MaplyComponent
+ *
+ *  Created by Steve Gifford on 1/11/14.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <UIKit/UIKit.h>
+#import <WhirlyGlobeMaplyComponent/MaplyRenderController.h>
+
+/**
+ Holds info about a single style from the MaplySimpleStyleManager.
+ This is enough to build a marker (or other thing, if you like).
+ */
+@interface MaplySimpleStyle : NSObject
+
+/// If there was a title, this is it
+@property (nonatomic,nullable) NSString *title;
+
+/// If there was a description, this is it
+@property (nonatomic,nullable) NSString *desc;
+
+/// Size (in pixels) of the marker to be built
+@property (nonatomic) CGSize markerSize;
+
+/// How big we consider the marker to be when doing layout.
+/// By default, same as the marker size
+@property (nonatomic) CGSize layoutSize;
+
+/// Offset applied to marker
+@property (nonatomic) CGPoint markerOffset;
+
+/// Texture constructed for this icon, if there was a symbol
+@property (nonatomic,nullable) MaplyTexture *markerTex;
+
+/// If this was 0-9 or a-Z instead, this is that
+@property (nonatomic,nullable) NSString *markerString;
+
+/// Color to set for the markert
+@property (nonatomic,nonnull) UIColor *color;
+
+/// Stroke color if there is one
+@property (nonatomic,nonnull) UIColor *strokeColor;
+
+/// Stroke opacity
+@property (nonatomic) float strokeOpacity;
+
+/// Stroke width, if available.  Takes scale into account.
+@property (nonatomic) float strokeWidth;
+
+/// Fill color if available
+@property (nonatomic,nonnull) UIColor *fillColor;
+
+/// Fill opacity, if available
+@property (nonatomic) float fillOpacity;
+
+@end
+
+/** Used to generate icons and parse styles for the GeoJSON simple Style spec.
+    https://github.com/mapbox/simplestyle-spec
+ 
+    Can also be used to define some very simple icon styles directly.
+ */
+@interface MaplySimpleStyleManager : NSObject
+
+/** Fetch the simple UIImage for the icon with the given name.
+  **/
++ (nullable UIImage *)iconForName:(NSString *__nonnull)name size:(CGSize)size;
+
+/** Slightly more complex icon
+  **/
++ (nullable UIImage *)iconForName:(NSString *__nullable)name size:(CGSize)size color:(UIColor *__nullable)color circleColor:(UIColor *__nullable)circleColor strokeSize:(float)strokeSize strokeColor:(UIColor *__nullable)strokeColor;
+
+/** Clear the cache
+ */
++ (void)clearIconCache;
+
+/**
+ Set up the icon manager this way to build textures associated with a particular view controller.
+ */
+- (nonnull id)initWithViewC:(NSObject<MaplyRenderControllerProtocol> * __nonnull)viewC;
+
+/// Markers can be three different sizes.  These are the actual sizes associated
+@property (nonatomic) CGSize smallSize,medSize,largeSize;
+
+/// Normal scale from device (e.g. 2x for retina and so on)
+@property (nonatomic) CGFloat scale;
+
+/// We normally put a stroke around generated icons
+/// This is the width (in pixels) of that stroek
+@property (nonatomic) CGFloat strokeWidthForIcons;
+
+/// If set (default) we'll center the marker.  If off we'll offset vertically
+@property (nonatomic) bool centerIcon;
+
+/**
+ Mapbox defines a simple style spec that's usually associated with GeoJSON data.  Github is a prominent user.
+
+ Pass in a dictionary parsed from JSON (or just make it up yourself) and this will produce (an optional) icon and parse out the rest.
+ This takes screen scale and such into account.  It will also cache the same description when passed in multiple times.
+*/
+- (MaplySimpleStyle * __nonnull)makeStyle:(NSDictionary *__nonnull)dict;
+
+/**
+ Takes a single vector object.  It will parse out the simple style from the attributes (or provide a default if there is none)
+   and then build the corresponding feature and return a MaplyComponentObject to represent it.
+ 
+ mode controls if this work is done on this thread or another.
+ */
+- (MaplyComponentObject * __nullable)addFeature:(MaplyVectorObject * __nonnull)vecObj mode:(MaplyThreadMode)mode;
+
+/**
+  Takes an array of vector objects and calls addFeature: on each one.
+
+ mode controls if this work is done on this thread or another.
+ */
+- (NSArray<MaplyComponentObject *> * __nonnull)addFeatures:(NSArray<MaplyVectorObject *> * __nonnull)vecObjs mode:(MaplyThreadMode)mode;
+
+/** Clear the icon cache.
+    Any references to the textures should already be cleared.
+ */
+- (void)clearCache;
+
+/// Delete any cached textures and such
+- (void)shutdown;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyImageTile.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyImageTile.h
new file mode 100644
index 0000000..a1a9903
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyImageTile.h
@@ -0,0 +1,113 @@
+/*
+ *  MaplyImageTile.h
+ *  WhirlyGlobe-MaplyComponent
+ *
+ *  Created by Steve Gifford on 10/18/13.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <UIKit/UIKit.h>
+#import <WhirlyGlobeMaplyComponent/MaplyRenderController.h>
+
+@class MaplyElevationChunk;
+
+/** 
+    Describes a single tile worth of data, which may be multiple images.
+    
+    Delegates can pass back a single UIImage or NSData object, but if they want to do anything more complex, they need to do it with this.
+ */
+@interface MaplyImageTile : NSObject
+
+/** 
+    Initialize with an NSData object containing 32 bit pixels.
+    
+    This sets up the tile with an NSData object containing raw pixels.  The pixels are 32 bit RGBA even if you're targeting a smaller pixel format.
+    
+    @param data The NSData object containing 32 bit RGBA pixels.
+    
+    @param width The width of the raw image contained in the data object.
+    
+    @param height The height of the raw image contained in the data object.
+ */
+- (instancetype)initWithRawImage:(NSData *)data width:(int)width height:(int)height viewC:(NSObject<MaplyRenderControllerProtocol> *)viewC;
+
+/**
+ Initialize with an NSData object containing 32 bit pixels.
+ 
+ This sets up the tile with an NSData object containing raw pixels.  The pixels are 32 bit RGBA even if you're targeting a smaller pixel format.
+ 
+ @param data The NSData object containing 32 bit RGBA pixels.
+ 
+ @param width The width of the raw image contained in the data object.
+ 
+ @param height The height of the raw image contained in the data object.
+ 
+ @param comp The number of components (1, 2 or 4)
+ */
+- (instancetype)initWithRawImage:(NSData *)data width:(int)width height:(int)height components:(int)comp viewC:(NSObject<MaplyRenderControllerProtocol> *)viewC;
+
+/**
+Initialize with an NSData object containing pixels of a given format.
+
+This sets up the tile with an NSData object containing raw pixels.  The pixels are defined by the format.
+
+@param data The NSData object containing pixels.
+ 
+@param format The image format the data is already in.
+
+@param width The width of the raw image contained in the data object.
+
+@param height The height of the raw image contained in the data object.
+*/
+- (instancetype)initWithRawImage:(NSData *)data format:(MaplyQuadImageFormat)format width:(int)width height:(int)height viewC:(NSObject<MaplyRenderControllerProtocol> *)viewC;
+
+/** 
+    Initialize with a single UIImage for the tile.
+    
+    This sets up the given UIImage as the return for the given tile.  You can then set targetSize and such.
+ */
+- (instancetype)initWithImage:(UIImage *)image viewC:(NSObject<MaplyRenderControllerProtocol> *)viewC;
+
+/** 
+    Initialize with an NSData object containing PNG or JPEG data that can be interpreted by UIImage.
+    
+    We're expecting PNG, JPEG or another self identified format (e.g. PKM).  These we can interpret ourselves.
+ */
+- (instancetype)initWithPNGorJPEGData:(NSData *)data viewC:(NSObject<MaplyRenderControllerProtocol> *)viewC;
+
+/**
+    Border size that was set on initialization.
+ 
+    If there's a built in border as part of the image data passed in during initialization, set it here.
+    Normally this is 0.
+  */
+@property (nonatomic,assign) int borderSize;
+
+/**
+ Target size for the image(s) represented by this tile.
+ 
+ This instructs the pager to rescale the image(s) to the given target size.  This is probably faster than doing it yourself because we can extract the data and rescale in the same step.
+ */
+@property (nonatomic) CGSize targetSize;
+
+/**
+    Preprocess into a simple texture format.
+ 
+    Extracting from PNG or JPEG or whatever often requires a bit of work.  We'll do that work later,
+    if this isn't called.  But if you do call it here then you can do that work on your own thread.
+  */
+- (void)preprocessTexture;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyLabel.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyLabel.h
new file mode 100644
index 0000000..38af6a7
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyLabel.h
@@ -0,0 +1,101 @@
+/*
+ *  WGLabel.h
+ *  WhirlyGlobeComponent
+ *
+ *  Created by Steve Gifford on 7/24/12.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <UIKit/UIKit.h>
+#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
+
+typedef NS_ENUM(NSInteger, MaplyLabelJustify) {
+	MaplyLabelJustifyLeft,
+	MaplyLabelJustifyMiddle,
+	MaplyLabelJustifyRight
+};
+
+/** 
+    This is a 3D label.
+    
+    The Maply Label is a 3D object that sits on top of the globe (or map) at a specified location.  If you want a 2D label that sits on top of everything else, you want the MaplyScreenLabel.  Seriously, you probably want that.
+  */
+@interface MaplyLabel : NSObject
+
+/** 
+    The location (in geographic) for this label.
+    
+    The Maply Label is a 3D object and this is its location on the globe or map.  The coordinates are in geographic (lon/lat) and the actual layout is controleld by justify.
+  */
+@property (nonatomic,assign) MaplyCoordinate loc;
+
+/** 
+    Size of the label in display units.
+    
+    The Maply Label is a 3D object placed on top of the globe or map. This controls the size of that label in display coordinates.  For the globe display coordinates are based on a radius of 1.0.
+    
+    One or both values of the size can be set.  Typically you want to set the height and let the toolkit calculate the width.
+  */
+@property (nonatomic,assign) CGSize size;
+
+/// The text to display on the globe or map at the given location.
+@property (nonatomic,strong) NSString * __nullable text;
+
+/** 
+    Text can be accompanied by an optional icon image.
+    
+    If set, we'll put this image to the left of the text in the label.  The UIImage (or MaplyTexture) will be tracked by the view controller and reused as needed or disposed of when no longer needed.
+    
+    The name had to change because Apple's private selector search is somewhat weak.
+ */
+@property (nonatomic,strong) id __nullable iconImage2;
+
+/** 
+    An option color override.
+    
+    If set, this color will override the color passed in with the NSDictionary in the view controller's add method.
+ */
+@property (nonatomic,strong) UIColor * __nullable color;
+
+/** 
+    Label selectability.  On by default
+    
+    If set, this label can be selected by the user.  If not set, this label will never appear in selection results.
+ */
+@property (nonatomic,assign) bool selectable;
+
+/** 
+    The text justification based on the location.
+    
+    Text can be placed around the location based on this value.
+ 
+|Justify Value|Description|
+|:------------|:----------|
+|MaplyLabelJustifyLeft|The label will be placed with its left side on the location.|
+|MaplyLabelJustifyMiddle|The label will be centered on the location.|
+|MaplyLabelJustifyRight|The label will be placed with its right side on the location.|
+  */
+@property (nonatomic,assign) MaplyLabelJustify justify;
+
+/** 
+    User data object for selection
+    
+    When the user selects a feature and the developer gets it in their delegate, this is an object they can use to figure out what the label means to them.
+ */
+@property (nonatomic,strong) id __nullable userObject;
+
+@end
+
+typedef MaplyLabel WGLabel;
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyLight.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyLight.h
new file mode 100644
index 0000000..4c83fca
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyLight.h
@@ -0,0 +1,60 @@
+/*  MaplyLight.h
+ *  WhirlyGlobe-MaplyComponent
+ *
+ *  Created by Steve Gifford on 1/30/13.
+ *  Copyright 2012-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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <UIKit/UIKit.h>
+#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
+
+/** 
+    The Light provides a simple interface to basic lighting within the toolkit.
+    
+    You can have up to 8 lights in the current version of the toolkit.  Obviously this is all shader implementation with OpenGL ES 2.0, so you can always just bypass this and do what you like.  However, the default shaders will look for these lights.
+    
+    The lights are very simple, suitable for the globe, and contain a position, a couple of colors, and a view dependent flag.
+  */
+@interface MaplyLight : NSObject
+
+/** 
+    The location of this particular light in display space.
+    
+    This is a single light's location in display space.  Display space for the globe is based on a radius of 1.0.
+  */
+@property (nonatomic,assign) MaplyCoordinate3d pos;
+
+/** 
+    Controls whether the light takes the model matrix into account or not.
+    
+    If set, this light moves with the model (usually the globe).  You'd use this for a real sun position. If not set, the light is static and does not move or rotate.
+  */
+@property (nonatomic,assign) bool viewDependent;
+
+/** 
+    Ambient color for the light.
+    
+    This color will always be added to any given pixel.  It provides a baseline lighting value.
+  */
+@property (nonatomic,strong) UIColor *__nullable ambient;
+
+/** 
+    Diffuse light color.
+    
+    The diffuse color is multiplied by a directional value and so will vary depending on geometry normals.
+  */
+@property (nonatomic,strong) UIColor *__nullable diffuse;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyLocationTracker.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyLocationTracker.h
new file mode 100644
index 0000000..d759183
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyLocationTracker.h
@@ -0,0 +1,174 @@
+/*
+ *  MaplyBaseViewController.h
+ *  MaplyComponent
+ *
+ *  Created by Ranen Ghosh on 11/23/16.
+ *  Copyright 2012-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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <UIKit/UIKit.h>
+#import <CoreLocation/CoreLocation.h>
+#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
+
+#define LOC_TRACKER_POS_MARKER_SIZE 32
+
+@class MaplyBaseViewController;
+
+typedef struct
+{
+    float lonDeg;
+    float latDeg;
+    float headingDeg;
+} MaplyLocationTrackerSimulationPoint;
+
+typedef enum {MaplyLocationLockNone, MaplyLocationLockNorthUp, MaplyLocationLockHeadingUp, MaplyLocationLockHeadingUpOffset} MaplyLocationLockType;
+
+/* 
+    Implement the MaplyLocationTrackerDelegate protocol to receive location services callbacks.
+*/
+@protocol MaplyLocationTrackerDelegate
+
+// This is to handle problems / failures further up the line.
+- (void) locationManager:(CLLocationManager * __nonnull)manager didFailWithError:(NSError * __nonnull)error;
+
+- (void) locationManager:(CLLocationManager * __nonnull)manager didChangeAuthorizationStatus:(CLAuthorizationStatus)status;
+
+@optional
+
+- (void) updateLocation:(CLLocation * __nonnull)location;
+
+@end
+
+/*
+    Implement the MaplyLocationSimulatorDelegate protocol to provide simulated locations
+*/
+@protocol MaplyLocationSimulatorDelegate
+
+- (MaplyLocationTrackerSimulationPoint)getSimulationPoint;
+
+@optional
+
+- (bool)hasValidLocation;
+
+@end
+
+/* 
+    The MaplyLocationTracker class provides support for showing current position and heading on the map or globe.
+   
+    Be sure to set NSLocationWhenInUseUsageDescription in your app's Info.plist before using.
+ */
+@interface MaplyLocationTracker : NSObject <CLLocationManagerDelegate>
+
+/// Exposes MaplyLocationTracker's location manager for use elsewhere
+@property (nonatomic, readonly, nullable) CLLocationManager *locationManager;
+
+/**
+    MaplyLocationTracker constructor
+ 
+    @param viewC The globe or map view controller
+ 
+    @param useHeading Use location services heading information (requires physical magnetometer)
+ 
+    @param useCourse Use location services course information as fallback if heading unavailable
+ */
+- (nonnull instancetype)initWithViewC:(MaplyBaseViewController *__nullable)viewC
+                           useHeading:(bool)useHeading
+                            useCourse:(bool)useCourse;
+
+/** 
+    MaplyLocationTracker constructor
+ 
+    @param viewC The globe or map view controller
+ 
+    @param delegate The MaplyLocationTrackerDelegate for receiving location event callbacks
+ 
+    @param useHeading Use location services heading information (requires physical magnetometer)
+ 
+    @param useCourse Use location services course information as fallback if heading unavailable
+ */
+- (nonnull instancetype)initWithViewC:(MaplyBaseViewController *__nullable)viewC
+                             delegate:(NSObject<MaplyLocationTrackerDelegate> *__nullable)delegate
+                           useHeading:(bool)useHeading
+                            useCourse:(bool)useCourse;
+
+/**
+    MaplyLocationTracker constructor
+ 
+    @param viewC The globe or map view controller
+ 
+    @param delegate The MaplyLocationTrackerDelegate for receiving location event callbacks
+
+    @param simulator  The MaplyLocationSimulatorDelegate for generating simulated locations
+
+    @param useHeading Use location services heading information (requires physical magnetometer)
+ 
+    @param useCourse Use location services course information as fallback if heading unavailable
+ */
+- (nonnull instancetype)initWithViewC:(MaplyBaseViewController *__nullable)viewC
+                             delegate:(NSObject<MaplyLocationTrackerDelegate> *__nullable)delegate
+                            simulator:(NSObject<MaplyLocationSimulatorDelegate> *__nullable)simulator
+                          simInterval:(NSTimeInterval)simInterval
+                           useHeading:(bool)useHeading
+                            useCourse:(bool)useCourse;
+
+/**
+    Min/max visibility for the marker assigned to follow location.
+  */
+@property (nonatomic,assign) float markerMinVis,markerMaxVis;
+
+/**
+    Draw priority for the marker assigned to follow location.
+  */
+@property (nonatomic,assign) int markerDrawPriority;
+
+/** 
+    Change lock type
+ 
+    @param lockType The MaplyLocationLockType value for lock behavior
+ 
+    @param forwardTrackOffset The vertical offset if using MaplyLocationLockHeadingUpOffset (positive values are below the view center)
+ */
+- (void) changeLockType:(MaplyLocationLockType)lockType forwardTrackOffset:(int)forwardTrackOffset;
+
+/** 
+    Stop the MaplyLocationTracker behavior and shut it down.
+ */
+- (void) teardown;
+
+/** 
+    Get the current device location
+ 
+    @return The coordinate if valid, else kMaplyNullCoordinate
+ */
+- (MaplyCoordinate)getLocation;
+
+/**
+    Set the current simulated location.
+ */
+- (void) setLocation:(MaplyLocationTrackerSimulationPoint)point
+            altitude:(double)altitude;
+
+/**
+    Set the current simulated location.
+ */
+- (void) setLocation:(MaplyLocationTrackerSimulationPoint)point
+            altitude:(double)altitude
+  horizontalAccuracy:(double)horizontalAccuracy
+    verticalAccuracy:(double)verticalAccuracy
+               speed:(double)speed;
+;
+
+@end
+
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyMBTileFetcher.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyMBTileFetcher.h
new file mode 100644
index 0000000..84cfab6
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyMBTileFetcher.h
@@ -0,0 +1,46 @@
+/*  MaplyMBTileFetcher.h
+ *  WhirlyGlobe-MaplyComponent
+ *
+ *  Created by Steve Gifford on 9/13/18.
+ *  Copyright 2011-2022 mousebird consulting inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#import <WhirlyGlobeMaplyComponent/MaplyTileSourceNew.h>
+#import <WhirlyGlobeMaplyComponent/MaplySimpleTileFetcher.h>
+#import <WhirlyGlobeMaplyComponent/MaplyCoordinateSystem.h>
+
+/**
+    MBTiles tile fetcher.
+ 
+    This tile fetcher focuses on a single MBTiles file.  You mate this
+    with a QuadImageLoader to do the actual work.
+
+    Will work for image or vector MBTiles files.
+  */
+@interface MaplyMBTileFetcher : MaplySimpleTileFetcher
+
+/// Initialize with the name of the local MBTiles file
+- (nullable instancetype)initWithMBTiles:(NSString *__nonnull)fileName;
+
+/// Initialize with the name of the local MBTiles file and cache size in bytes (rounded up to whole pages)
+- (nullable instancetype)initWithMBTiles:(NSString *__nonnull)fileName
+                               cacheSize:(int)cacheSize;
+
+// Coordinate system (probably Spherical Mercator)
+- (MaplyCoordinateSystem * __nonnull)coordSys;
+
+/// Format directly from the metadata
+@property (nonatomic,nullable) NSString *format;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyMarker.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyMarker.h
new file mode 100644
index 0000000..04d5e59
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyMarker.h
@@ -0,0 +1,85 @@
+/*
+ *  WGMarker.h
+ *  WhirlyGlobeComponent
+ *
+ *  Created by Steve Gifford on 7/24/12.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <UIKit/UIKit.h>
+#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
+
+/** 
+    The Marker places a UIImage on the globe or map at a given location.
+    
+    The Maply Marker takes a location and image, using those to display a textured rectangle on the globe (or map).  Since it's a real 3D object it will get larger and smaller as the user moves around.
+    
+    If you want a screen based object that stays the same size and is displayed on top of everything else, look to the MaplyScreenMarker.
+  */
+@interface MaplyMarker : NSObject
+
+/** 
+    Center of the marker in geographic coordinates (lon/lat in radians).
+    
+    The Maply Marker is a 3D object so this is the center of the marker on the globe or map.
+  */
+@property (nonatomic,assign) MaplyCoordinate loc;
+
+
+/** 
+    Size of the marker in display coordinates.
+    
+    This is the size of the marker in display coordinates.  For the globe display coordinates are based on a radius of 1.0.
+  */
+@property (nonatomic,assign) CGSize size;
+
+/** 
+    Image or MaplyTexture to use for the marker.
+    
+    If set, we'll display a UIImage at the given location of the given size.  If not set, it's just a color rectangle which is not very exciting.  The view controller tracks the UIImage and will reuse it as necessary and release it when finished.
+  */
+@property (nonatomic,strong) id __nullable image;
+
+/** 
+    Images or MaplyTextures to use for the marker.
+    
+    If set we'll animate these images one after the other over the duration.
+  */
+@property (nonatomic,strong) NSArray * __nullable images;
+
+/** 
+    The time we'll take to cycle through all the images for the marker.
+    
+    If images are passed in, this is the time it will take to cycle through them all.  By default this is 5s.
+ */
+@property (nonatomic) double period;
+
+/** 
+    Marker selectability.  On by default
+    
+    If set, this marker can be selected by the user.  If not set, this marker will never appear in selection results.
+ */
+@property (nonatomic,assign) bool selectable;
+
+/** 
+    User data object for selection
+    
+    When the user selects a feature and the developer gets it in their delegate, this is an object they can use to figure out what the label means to them.
+ */
+@property (nonatomic,strong) id  __nullable userObject;
+
+@end
+
+typedef MaplyMarker WGMarker;
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyMatrix.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyMatrix.h
new file mode 100644
index 0000000..646a29b
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyMatrix.h
@@ -0,0 +1,65 @@
+/*
+ *  MaplyMatrix.h
+ *  WhirlyGlobe-MaplyComponent
+ *
+ *  Created by Steve Gifford on 10/16/14.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <Foundation/Foundation.h>
+
+/** 
+    Represents a matrix for position manipulation.
+    
+    Encapsulates a 4x4 matrix used for object placement and other things.  This is more a wrapper than a full service object.
+  */
+@interface MaplyMatrix : NSObject
+
+/** 
+    Construct with yaw, pitch, and roll parameters.
+    
+    Construct the matrix with the standard yaw, pitch, and roll used by aircraft.
+  */
+- (nonnull instancetype)initWithYaw:(double)yaw pitch:(double)pitch roll:(double)roll;
+
+/** 
+    Construct with a consistent scale in each dimension.
+    
+    Construct with the same scale in x,y, and z.
+  */
+- (nonnull instancetype)initWithScale:(double)scale;
+
+/** 
+    Construct with a translation.
+    
+    Construct with a translation in 3D.
+  */
+- (nonnull instancetype)initWithTranslateX:(double)x y:(double)y z:(double)z;
+
+/** 
+    Construct a rotation around the given axis.
+    
+    Build a matrix that rotates the given amount (in radians) around the given axis.
+  */
+- (nonnull instancetype)initWithAngle:(double)ang axisX:(double)x axisY:(double)y axisZ:(double)z;
+
+/** 
+    Multiply the given matrix with this one and return a new one.
+    
+    Multiply the given matrix like so:  ret = this * other.  Return the new one.
+  */
+- (nonnull instancetype)multiplyWith:(MaplyMatrix * __nonnull)other;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyMoon.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyMoon.h
new file mode 100644
index 0000000..f55f616
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyMoon.h
@@ -0,0 +1,50 @@
+/*  MaplyMoon.h
+ *  WhirlyGlobe-MaplyComponent
+ *
+ *  Created by Steve Gifford on 7/2/15.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#import <UIKit/UIKit.h>
+#import <WhirlyGlobeMaplyComponent/MaplyComponentObject.h>
+#import <WhirlyGlobeMaplyComponent/WhirlyGlobeViewController.h>
+#import <WhirlyGlobeMaplyComponent/MaplyLight.h>
+
+/** 
+    Utility for calculating moon position.
+    
+    This is a utility class that figures out where the moon is at a given data and provides the position.
+  */
+@interface MaplyMoon : NSObject
+
+/** 
+    Initialize with a date.
+    
+    Initialize with the given date.  The moon position will correspond to that.  Must be after 2000.
+  */
+- (nonnull instancetype)initWithDate:(NSDate *__nonnull)date;
+
+/// Location on the globe where the moon would land if it fell straight down.  Ouch.
+- (MaplyCoordinate)asCoordinate;
+
+/// Return the location above the globe in lon/lat/distance.  Yay geocentric!
+- (MaplyCoordinate3d)asPosition;
+
+/// Illuminated fraction of the moon
+@property (readonly) double illuminatedFraction;
+
+/// Phase of the moon.
+@property (readonly) double phase;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyPanDelegate.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyPanDelegate.h
new file mode 100644
index 0000000..bf3dc43
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyPanDelegate.h
@@ -0,0 +1,32 @@
+/*  MaplyPanDelegate.h
+ *  WhirlyGlobeLib
+ *
+ *  Created by Steve Gifford on 1/10/12.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#import <UIKit/UIKit.h>
+
+// Custom pan gesture recognizer that plays well with scroll views.
+@interface MinDelay2DPanGestureRecognizer : UIPanGestureRecognizer
+
+- (void)forceEnd;
+
+@end
+
+@interface MaplyPanDelegate : NSObject <UIGestureRecognizerDelegate>
+
+@property (nonatomic,weak) UIGestureRecognizer *gestureRecognizer;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyParticleSystem.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyParticleSystem.h
new file mode 100644
index 0000000..ac92b21
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyParticleSystem.h
@@ -0,0 +1,215 @@
+/*
+ *  MaplyParticleSystem.h
+ *  WhirlyGlobe-MaplyComponent
+ *
+ *  Created by Steve Gifford on 4/26/15.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <UIKit/UIKit.h>
+#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
+#import <WhirlyGlobeMaplyComponent/MaplyShader.h>
+#import <WhirlyGlobeMaplyComponent/MaplyRenderTarget.h>
+
+typedef NS_ENUM(NSInteger, MaplyParticleSystemType) {
+	MaplyParticleSystemTypePoint,
+	MaplyParticleSystemTypeRectangle,
+};
+
+/** 
+    A particle system is used to spawn large numbers of small moving objects.
+    
+    The particle system defines what the objects are and how they're controlled.  Actual data is handled through the MaplyParticleBatch.
+    
+    You set up a particle system and then add MaplyParticleBatches via a view controller.
+  */
+@interface MaplyParticleSystem : NSObject
+
+/** 
+    Name of the particle system.
+    
+    The particle system name is used for performance debugging.
+  */
+@property (nonatomic,strong) NSString * __nullable name;
+
+/** 
+    The type of the particle system.
+    
+    At present particle systems are just point geometry.
+  */
+@property (nonatomic,assign) MaplyParticleSystemType type;
+
+/**
+    Position shader for two stage particles.
+ 
+    If there is a position shader then it is run first and particle data is then
+    shared between this shader and the regular shader.
+  */
+@property (nonatomic,strong) MaplyShader * __nullable positionShader;
+
+/**
+    Shader to use for rendering particles.
+ 
+    This can either be a single stage shader or it can be part of a two stage shader with
+    the positionShader.
+  */
+@property (nonatomic,strong) MaplyShader * __nullable renderShader;
+
+/** 
+    Individual particle lifetime.
+    
+    The created particles will last only a certain amount of time.
+  */
+@property (nonatomic,assign) NSTimeInterval lifetime;
+
+/** 
+    The base that particle time is measured from.
+    
+    Individual particles will measure their own lifetime against this base value.
+  */
+@property (nonatomic,assign) NSTimeInterval baseTime;
+
+/** 
+    Total number of particles to be represented at once.
+    
+    This is the most particles we'll have on the screen at any time.  Space will be allocated for them, so don't overdo it.
+  */
+@property (nonatomic,assign) int totalParticles;
+
+/** 
+    Batch size for MaplyParticleBatch.
+    
+    Particles need to be created in large batches for efficiency.  This is the size of individual batches.
+ 
+    Only for OpenGL ES.  Metal does particles as one big batch.
+  */
+@property (nonatomic,assign) int batchSize;
+
+/**
+   Metal only.
+   Size of a single to be passed in to the calculation and rendering shaders.
+  */
+@property (nonatomic,assign) int vertexSize;
+
+/** 
+    Turn on/off the continuous rendering for particles.
+    
+    Normally particle systems force the renderer to draw every frame.  That's how the particles move.  You can turn that behavior off by setting this to false.
+  */
+@property (nonatomic,assign) bool continuousUpdate;
+
+/** 
+    Initialize a particle system with a name.
+    
+    The particle system needs the name for performance and debugging.  The rest of the values can left to their defaults.
+  */
+- (nonnull instancetype)initWithName:(NSString *__nonnull)name viewC:(NSObject <MaplyRenderControllerProtocol> * __nonnull)viewC;
+
+/** 
+    Add an attribute we'll be expecting in each batch.
+    
+    Adds an attribute name and type which will be present in each batch.
+ 
+    OpenGL ES Only.  Metal handles things as blocks of memory.
+  */
+- (void)addAttribute:(NSString *__nonnull)attrName type:(MaplyShaderAttrType)type;
+
+/**
+    For two stage shaders, these are the varying outputs from one shader to the next.
+ 
+    Two stage shaders run a position shader and then a regular render shader
+    from the position output.  Add any varying values you want to share per
+    vertex from the former to the latter.
+
+    OpenGL ES Only.  Metal does this more simply.
+  */
+- (void)addVarying:(NSString *__nonnull)varyAttrName inputName:(NSString *__nonnull)inputName type:(MaplyShaderAttrType)type;
+
+/**
+ For Metal, we just pass in input and output arrays (at least two) along with the number of entries
+ in those arrays.  The shaders do the rest of the work in Metal.
+ */
+- (void)addCalculationNum:(int)numEntries data:(NSMutableArray<NSData *> * __nonnull)dataEntries;
+
+/** 
+    Add a texture to the particle system.
+    
+    All the textures will be handed over to the shader.
+  */
+- (void)addTexture:(id __nonnull)image;
+
+/**
+    Draw these particles to the given render target.
+ 
+    Rather than being drawn to the screen, these particles will be drawn to the offscreen render target.
+  */
+- (void)setRenderTarget:(MaplyRenderTarget * __nonnull)renderTarget;
+
+@end
+
+
+/** 
+    A particle batch adds a set number of particles to the system.
+    
+    The particle batch holds the number of particles defined in the MaplyParticleSystem batchSize property.  Each attribute array is added individually via an NSData object.  All attributes must be present or the batch is invalid and won't be passed through the system.
+  */
+@interface MaplyParticleBatch : NSObject
+
+/** 
+    The particle system this batch belongs to.
+  */
+@property (nonatomic,weak) MaplyParticleSystem * __nullable partSys;
+
+/** 
+    The current time.
+    
+    This will be set by default.  However, you can control what the time basis for a particle batch is.
+  */
+@property (nonatomic,assign) NSTimeInterval time;
+
+/** 
+    Initialize with the particle system.
+    
+    The batch is initialized with its particle system.  You must then call addAttribute:values: repeatedly with attribute arrays.
+  */
+- (nonnull instancetype)initWithParticleSystem:(MaplyParticleSystem *__nonnull)partSys;
+
+/**
+    OpenGL ES only.
+ 
+    Add an attribute array of the given name.
+    
+    Each attribute in the MaplyParticleSystem must be filled in here.  The name must correspond and the length of the data must match.
+    
+    @return Returns true if the attribute array was valid, false otherwise.
+  */
+- (bool) addAttribute:(NSString *__nonnull)attrName values:(NSData *__nonnull)data;
+
+/**
+   Metal only.
+ 
+   We add the batch as a single blob of data.  Format is up to you and your shader.
+ 
+  */
+- (void) addData:(NSData * __nonnull)data;
+
+/** 
+    Tests if the batch is valid.
+    
+    This checks if all the attribute arrays are present and valid.
+  */
+- (bool) isValid;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyPinchDelegate.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyPinchDelegate.h
new file mode 100644
index 0000000..01c0b9e
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyPinchDelegate.h
@@ -0,0 +1,23 @@
+/*  MaplyPinchDelegate.h
+ *  WhirlyGlobeLib
+ *
+ *  Created by Steve Gifford on 1/10/12.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#import <WhirlyGlobeMaplyComponent/MaplyZoomGestureDelegate.h>
+
+@interface MaplyPinchDelegate : MaplyZoomGestureDelegate
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyPoints.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyPoints.h
new file mode 100644
index 0000000..ee59f35
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyPoints.h
@@ -0,0 +1,84 @@
+/*
+ *  MaplyPoints.h
+ *  WhirlyGlobeComponent
+ *
+ *  Created by Steve Gifford on 10/21/15
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <UIKit/UIKit.h>
+#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
+#import <WhirlyGlobeMaplyComponent/MaplyRenderController.h>
+#import <WhirlyGlobeMaplyComponent/MaplyMatrix.h>
+
+/** 
+    The Maply Points object is used to add a large number of static points to the scene.
+    
+    Rather than add a single 3D point we assume you want to add a lot of them all at once.  This object lets you do that and lets you assign the various data values to input attributes in your custom shader.
+    
+    All the cool kids have custom shaders.
+  */
+@interface MaplyPoints : NSObject
+
+/// Initialie with a hint as to the number of points you'll be adding (not required).
+- (__nonnull id)initWithNumPoints:(int)numPoints;
+
+/// Transform to apply to the point locations.  A center is good.
+@property (nonatomic,strong) MaplyMatrix * __nullable transform;
+
+/// Add a geocoordinate in lon/lat and Z (meters).
+- (void)addGeoCoordLon:(float)x lat:(float)y z:(float)z;
+
+/// Directly add a coordinate in display space.  Remember the globe is a sphere with radius = 1.0.
+- (void)addDispCoordX:(float)x y:(float)y z:(float)z;
+
+/// Add a display space coordinate, but use doubles for precision.
+- (void)addDispCoordDoubleX:(double)x y:(double)y z:(double)z;
+
+/// Add a color, which will be converted to 8 bits before going to the shader.
+- (void)addColorR:(float)r g:(float)g b:(float)b a:(float)a;
+
+/** 
+    Add a new attribute array of the given type.
+    
+    If you have a custom shader, this is a convenient way to pass a large array of attributes to it.  Just specify the name (attribute name in the shader) and the type and then add the appropriate values.  The data will be handed down to the shader at render time.
+    
+    @param attrName The name of the attribute as used by the shader.
+    
+    @param type The data type of the attribute.
+    
+    @return An index (or -1 if invalid) for the attribute.  Use this in the addAttribute calls.
+  */
+- (int)addAttributeType:(NSString *__nonnull)attrName type:(MaplyShaderAttrType)type;
+
+/// Add an integer attribute.
+- (void)addAttribute:(int)whichAttr iVal:(int)val;
+
+/// Add a float attribute.
+- (void)addAttribute:(int)whichAttr fVal:(float)val;
+
+/// Add a two component float attribute.
+- (void)addAttribute:(int)whichAttr fValX:(float)valX fValY:(float)valY;
+
+/// Add a three component float attribute.
+- (void)addAttribute:(int)whichAttr fValX:(float)fValX fValY:(float)valY fValZ:(float)valZ;
+
+/// Add a three component float attribute, but we'll store it at doubles until it gets to the shader.
+- (void)addAttribute:(int)whichAttr valX:(double)valX valY:(double)valY valZ:(double)valZ;
+
+/// Add a four commponent float attribute.
+- (void)addAttribute:(int)whichAttr fValX:(float)valX fValY:(float)valY fValZ:(float)valZ fValW:(float)valW;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyQuadImageFrameLoader.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyQuadImageFrameLoader.h
new file mode 100644
index 0000000..b1da668
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyQuadImageFrameLoader.h
@@ -0,0 +1,191 @@
+/*
+ *  MaplyQuadImageFrameLoader.h
+ *
+ *  Created by Steve Gifford on 9/13/18.
+ *  Copyright 2012-2022 mousebird consulting inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <WhirlyGlobeMaplyComponent/MaplyQuadImageLoader.h>
+#import <WhirlyGlobeMaplyComponent/MaplyActiveObject.h>
+
+@class MaplyQuadImageFrameLoader;
+
+/**
+    Quad Image FrameAnimation runs through the frames in a Quad Image Frame loader over time.
+ 
+    Set this up with a MaplyQuadImageFrameLoader and it'll run through the available frames from start to finish.
+    At the end it will snap back to the beginning.
+  */
+@interface MaplyQuadImageFrameAnimator : MaplyActiveObject
+
+/// Initialize with the image frame loader and view controller
+- (nonnull instancetype)initWithFrameLoader:(MaplyQuadImageFrameLoader * __nonnull)loader viewC:(MaplyBaseViewController * __nonnull)viewC;
+
+/// How long to animate from start to finish.
+@property (nonatomic,assign) NSTimeInterval period;
+
+/// How long to pause at the end of the sequence before starting back
+@property (nonatomic,assign) NSTimeInterval pauseLength;
+
+/// Remove the animator and stop animating
+- (void)shutdown;
+
+@end
+
+/**
+    The Maply Quad Image Frame Loader can generation per-frame stats.  These are them.
+  */
+@interface MaplyQuadImageFrameStats : NSObject
+
+/// Number of tiles this frame is in (loading and loaded)
+@property (nonatomic) int totalTiles;
+
+/// Number of tiles this frame has yet to load
+@property (nonatomic) int tilesToLoad;
+
+@end
+
+/**
+    Stats generated by the Maply Quad Image Frame Loader.
+  */
+@interface MaplyQuadImageFrameLoaderStats : NSObject
+
+/// Total number of tiles managed by the loader
+@property (nonatomic) int numTiles;
+
+/// Per frame stats for current loading state
+@property (nonatomic,nonnull) NSArray<MaplyQuadImageFrameStats *> *frames;
+
+@end
+
+/// How we load frames in the QuadImageFrameLoader
+/// Broad means we load 0 first and the on down
+/// Narrow means we load the frames around the current display first
+typedef NS_ENUM(NSInteger, MaplyLoadFrameMode) {
+    MaplyLoadFrameBroad,
+    MaplyLoadFrameNarrow,
+};
+
+/**
+ The Maply Quad Image Frame Loader is for paging individual frames of image pyramids.
+
+ This works much like the Quad Image Loader, but handles more than one frame.  You can animate
+ between the frames with the QuadImageFrameAnimator
+ */
+@interface MaplyQuadImageFrameLoader : MaplyQuadImageLoaderBase
+
+/**
+ Initialize with multiple tile sources (one per frame).
+ 
+ @param params The sampling parameters describing how to break down the data for projection onto a globe or map.
+ @param tileInfos A list of tile info objects to fetch for each frame.
+ @param viewC the View controller (or renderer) to add objects to.
+ */
+- (nullable instancetype)initWithParams:(MaplySamplingParams *__nonnull)params tileInfos:(NSArray<NSObject<MaplyTileInfoNew> *> *__nonnull)tileInfos viewC:(MaplyBaseViewController * __nonnull)viewC;
+
+/// How frames are loaded (top down vs broad)
+@property (nonatomic,assign) MaplyLoadFrameMode loadFrameMode;
+
+/**
+  Add another rendering focus to the frame loader.
+ 
+  Normally you'd have one point of focus for a frame loader resulting in one image
+  to be displayed.  But if you're using render targets, you may want to have two
+  and combine them in some way yourself.  Or more.  No idea why you'd do that.
+ 
+  If you're going to do this, call addFocus right after you create the FrameLoader.
+  */
+- (void)addFocus;
+
+/**
+  Return the number of focii.  Normally it's 1.
+ 
+  See addFocus for what these are.  You probably don't need to be using them.
+  */
+- (int)getNumFocus;
+
+/**
+  Set the interpolated location within the array of frames.
+ 
+  Each set of frames can be accessed from [0.0,numFrames].  Images will be interpolated between
+  those values and may be snapped if data has not yet loaded.
+ 
+  This value is used once per frame, so feel free to call this as much as you'd like.
+  */
+- (void)setCurrentImage:(double)where;
+
+/**
+  Set the currentImage for the given focus.  See addFocus for what those are.
+  */
+- (void)setFocus:(int)focusID currentImage:(double)where;
+
+/**
+  Return the interpolated location within the array of frames.
+  */
+- (double)getCurrentImage;
+
+/**
+  Return the interpolated location within the array of frames for a given focus.  See addFocus for what that means.
+  */
+- (double)getCurrentImageForFocus:(int)focusID;
+
+/**
+ Set whether we require the top tiles to be loaded before a frame can be displayed.
+ 
+ Normally the system wants all the top level tiles to be loaded (just one at level 0)
+ to be in memory before it will display a frame at all.  You can turn this off.
+ */
+- (void)setRequireTopTiles:(bool)newVal;
+
+/** Number of tile sources passed in as individual frames.
+  */
+- (int)getNumFrames;
+
+/**
+ An optional render target for this loader.
+ 
+ The loader can draw to a render target rather than to the screen.
+ You use this in a multi-pass rendering setup.
+ 
+ This version takes a specific focus.  See addFocus for what that means.
+ */
+- (void)setFocus:(int)focusID renderTarget:(MaplyRenderTarget *__nonnull)renderTarget;
+
+/**
+ Shader to use for rendering the image frames for a particular focus.
+ 
+ Consult addFocus for what this means.
+ */
+- (void)setFocus:(int)focusID shader:(MaplyShader * __nullable)shader;
+
+/**
+  Get the frame stats for what's loaded and what's not.
+  */
+- (MaplyQuadImageFrameLoaderStats * __nonnull)getFrameStats;
+
+/**
+   Change the tile sources and reload all the data.
+   <br>
+   You can change the tile source data is being loaded from.  This will
+   force a reload and everything visual should change as the data comes in.
+  */
+- (void)changeTileInfos:(NSArray<MaplyTileInfoNew> * __nullable)tileInfo;
+
+/** Turn off the image loader and shut things down.
+ This unregisters us with the sampling layer and shuts down the various objects we created.
+ */
+- (void)shutdown;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyQuadImageLoader.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyQuadImageLoader.h
new file mode 100644
index 0000000..b524401
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyQuadImageLoader.h
@@ -0,0 +1,229 @@
+/*
+ *  MaplyQuadImageLoader.h
+ *
+ *  Created by Steve Gifford on 4/10/18.
+ *  Copyright 2012-2022 Saildrone Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <WhirlyGlobeMaplyComponent/MaplyControllerLayer.h>
+#import <WhirlyGlobeMaplyComponent/MaplyCoordinateSystem.h>
+#import <WhirlyGlobeMaplyComponent/MaplyTileSourceNew.h>
+#import <WhirlyGlobeMaplyComponent/MaplyRenderController.h>
+#import <WhirlyGlobeMaplyComponent/MaplyQuadSampler.h>
+#import <WhirlyGlobeMaplyComponent/MaplyRemoteTileFetcher.h>
+#import <WhirlyGlobeMaplyComponent/MaplyQuadLoader.h>
+
+/**
+ This version of the loader return is used by the MaplyImageLoaderInterpreter.
+ 
+ When image tiles load, the interpeter fills in these contents, which can
+ include any sort of ComponentObject and, of course, images.
+ */
+@interface MaplyImageLoaderReturn : MaplyLoaderReturn
+
+/// Initialize with the loader this will be attached to
+- (id __nonnull)initWithLoader:(MaplyQuadLoaderBase * __nonnull)loader;
+
+/// Add an image to this loaded return.
+/// You can add multiple, but the interpreter should be expecting that
+- (void)addImageTile:(MaplyImageTile * __nonnull)image;
+
+/// Add a UIImage to the loader return
+/// This just adds a MaplyImageTile wrapper around the UIImage.
+- (void)addImage:(UIImage * __nonnull)image;
+
+/// Return an array of Images
+- (NSArray<MaplyImageTile *> * __nonnull)getImages;
+
+/// Clear out any images.  Presumably to replace them.
+- (void)clearImages;
+
+/// If any component objects are associated with the tile, these are them.
+/// They need to start disabled.  The system will enable and delete them when it is time.
+- (void)addCompObjs:(NSArray<MaplyComponentObject *> * __nonnull)compObjs;
+
+/// Return the component objects added for this loader return
+- (NSArray<MaplyComponentObject *> *__nonnull)getCompObjs;
+
+/// Clear out any component objects, presumably to replace them
+- (void)clearCompObjs;
+
+/// These component objects are assumed to be overlaid and so only one
+/// set will be displayed at a time.
+- (void)addOvlCompObjs:(NSArray<MaplyComponentObject *> * __nonnull)compObjs;
+
+/// Return the overlay component objects added for this loader return
+- (NSArray<MaplyComponentObject *> *__nonnull)getOvlCompObjs;
+
+/// Clear out any component objects, presumably to replace them
+- (void)clearOvlCompObjs;
+
+@end
+
+/**
+ Image loader intrepreter turns NSData objects into MaplyImageTiles.
+ 
+ This is the default interpreter used by the MaplyQuadImageLoader.
+ */
+@interface MaplyImageLoaderInterpreter : NSObject<MaplyLoaderInterpreter>
+@end
+
+/**
+ This loader interpreter sticks a designator in the middle of tiles
+ and a line around the edge.  Nice for debugging.
+ */
+@interface MaplyOvlDebugImageLoaderInterpreter : MaplyImageLoaderInterpreter
+
+// Intialize with the loader we're using.  Need this for extents of tiles
+- (instancetype __nonnull)initWithViewC:(NSObject<MaplyRenderControllerProtocol> * __nonnull)viewC;
+
+@end
+
+/**
+ This loader interpreter makes up an image for the given frame/tile
+ and returns that.  It doesn't use any returned data.
+ */
+@interface MaplyDebugImageLoaderInterpreter : MaplyImageLoaderInterpreter
+
+- (instancetype __nonnull)initWithViewC:(NSObject<MaplyRenderControllerProtocol> * __nonnull)viewC;
+
+@end
+
+/**
+ This loader interpreter treats input image data objects as PNGs containing raw data.
+ The difference is we'll use a direct PNG reader to tease it out, rather than UIImage.
+ */
+@interface MaplyRawPNGImageLoaderInterpreter : MaplyImageLoaderInterpreter
+
+/// In some cases we just want to pick values out of the input
+- (void)addMappingFrom:(int)inVal to:(int)outVal;
+
+@end
+
+/// Name of the shared MaplyRemoteTileFetcher
+extern NSString * _Nonnull const MaplyQuadImageLoaderFetcherName;
+
+/**
+  Base object for Maply Quad Image loader.
+ 
+  Look to the subclasses for actual functionality.  This holds methods they share.
+  */
+@interface MaplyQuadImageLoaderBase : MaplyQuadLoaderBase
+
+/** Set the base priority values for produced tiles.
+ 
+    The system will use a range of values to deal with overlaps.
+    This is the base value.
+  */
+@property (nonatomic) int baseDrawPriority;
+
+// Offset between levels for a calculated draw priority
+@property (nonatomic) int drawPriorityPerLevel;
+
+// Base color for geometry produced
+@property (nonatomic,retain,nonnull) UIColor *color;
+
+// Write to the z buffer when rendering.  On by default
+@property (nonatomic,assign) bool zBufferWrite;
+
+// Read from the z buffer when rendering.  Off by default
+@property (nonatomic,assign) bool zBufferRead;
+
+// Turn display of loader on or off.  Will still load, though.
+@property bool enable;
+
+/**
+ Shader to use for rendering the image frames.
+ 
+ If not set we'll pick the default visual shader.
+ */
+- (void)setShader:(MaplyShader * __nullable)shader;
+
+/**
+ An optional render target for this loader.
+ 
+ The loader can draw to a render target rather than to the screen.
+ You use this in a multi-pass rendering setup.
+ */
+- (void)setRenderTarget:(MaplyRenderTarget *__nonnull)renderTarget;
+
+/**
+ In special cases we may have tiles that already have borders baked in.  In that case, call this
+ method to set both the total textures size and the number of border pixels around the outside.
+ 
+ By default this functionality is off.
+ */
+- (void)setTextureSize:(int)texSize borderSize:(int)borderSize;
+
+/**
+ Set the image format for internal imagery storage.
+ 
+ OpenGL ES offers us several image formats that are more efficient than 32 bit RGBA, but they're not always appropriate.  This property lets you choose one of them.  The 16 or 8 bit ones can save a huge amount of space and will work well for some imagery, most maps, and a lot of weather overlays.
+ 
+ Be sure to set this at layer creation, it won't do anything later on.
+ 
+ | Image Format | Description |
+ |:-------------|:------------|
+ | MaplyImageIntRGBA | 32 bit RGBA with 8 bits per channel.  The default. |
+ | MaplyImageUShort565 | 16 bits with 5/6/5 for RGB and none for A. |
+ | MaplyImageUShort4444 | 16 bits with 4 bits for each channel. |
+ | MaplyImageUShort5551 | 16 bits with 5/5/5 bits for RGB and 1 bit for A. |
+ | MaplyImageUByteRed | 8 bits, where we choose the R and ignore the rest. |
+ | MaplyImageUByteGreen | 8 bits, where we choose the G and ignore the rest. |
+ | MaplyImageUByteBlue | 8 bits, where we choose the B and ignore the rest. |
+ | MaplyImageUByteAlpha | 8 bits, where we choose the A and ignore the rest. |
+ | MaplyImageUByteRGB | 8 bits, where we average RGB for the value. |
+ | MaplyImage4Layer8Bit | 32 bits, four channels of 8 bits each.  Just like MaplyImageIntRGBA, but a warning not to do anything too clever in sampling. |
+ */
+@property (nonatomic) MaplyQuadImageFormat imageFormat;
+
+@end
+
+/**
+ The Maply Quad Image Loader is for paging image pyramids local or remote.
+ 
+ This layer pages image pyramids.  They can be local or remote, in any coordinate system Maply supports and you provide a MaplyTileInfoNew conformant object to do the actual image tile fetching.
+ 
+ You probably don't have to implement your own tile source.  Go look at the MaplyRemoteTileFetcher and MaplyMBTileFetcher objects.  Those will do remote and local fetching.
+ */
+@interface MaplyQuadImageLoader : MaplyQuadImageLoaderBase
+
+/**
+ Initialize with a single tile info object and the sampling parameters.
+ 
+ @param params The sampling parameters describing how to break down the data for projection onto a globe or map.
+ @param tileInfo A single tile info object describing where the data is and how to get it.
+ @param viewC the View controller (or renderer) to add objects to.
+ */
+- (nullable instancetype)initWithParams:(MaplySamplingParams *__nonnull)params tileInfo:(NSObject<MaplyTileInfoNew> *__nullable)tileInfo viewC:(NSObject<MaplyRenderControllerProtocol> * __nonnull)viewC;
+
+/**
+  Initialize with multiple tile sources and sampling parameters.
+ 
+ @param params The sampling parameters describing how to break down the data for projection onto a globe or map.
+ @param tileInfos A list of tile info objects to fetch for each tile.  If one fails, the tile fails to load.
+ @param viewC the View controller (or renderer) to add objects to.
+  */
+- (nullable instancetype)initWithParams:(MaplySamplingParams *__nonnull)params tileInfos:(NSArray<NSObject<MaplyTileInfoNew> *> *__nonnull)tileInfos viewC:(NSObject<MaplyRenderControllerProtocol> * __nonnull)viewC;
+
+/**
+   Change the tile source and reload all the data.
+   <br>
+   You can change the tile source data is being loaded from.  This will
+   force a reload and everything visual should change as the data comes in.
+  */
+- (void)changeTileInfo:(NSObject<MaplyTileInfoNew> *__nonnull)tileInfo;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyQuadLoader.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyQuadLoader.h
new file mode 100644
index 0000000..3ef22cd
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyQuadLoader.h
@@ -0,0 +1,236 @@
+/*
+ *  MaplyQuadLoader.h
+ *
+ *  Created by Steve Gifford on 2/12/19.
+ *  Copyright 2012-2022 Saildrone Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <Foundation/Foundation.h>
+#import <WhirlyGlobeMaplyComponent/MaplyControllerLayer.h>
+#import <WhirlyGlobeMaplyComponent/MaplyCoordinateSystem.h>
+#import <WhirlyGlobeMaplyComponent/MaplyTileSourceNew.h>
+#import <WhirlyGlobeMaplyComponent/MaplyRenderController.h>
+#import <WhirlyGlobeMaplyComponent/MaplyQuadSampler.h>
+#import <WhirlyGlobeMaplyComponent/MaplyRemoteTileFetcher.h>
+
+@class MaplyQuadLoaderBase;
+
+/**
+ Passed in to and returned by the Loader Interpreter.
+ 
+ We pass this into the interpreter with the unparsed data.  It parses it and passes that
+ data back, possibly with an error.
+ */
+@interface MaplyLoaderReturn : NSObject
+
+/// Initialize with the loader this will be attached to
+- (id __nonnull)initWithLoader:(MaplyQuadLoaderBase * __nonnull)loader;
+
+/// Tile this is the data for
+@property (nonatomic) MaplyTileID tileID;
+
+/// If set, the frame.  -1 by default
+@property (nonatomic,readonly) int frame;
+
+/// Data returned from a tile request.  Unparsed.
+/// You can add multiple of these, but the interpreter should be expecting that
+- (void)addTileData:(id __nonnull) tileData;
+
+/// Return the tile NSData objects as an array
+- (NSArray<id> * __nonnull)getTileData;
+
+/// Return the first data object.  You're probably only expecting the one.
+- (id __nullable)getFirstData;
+
+/// Set when the QuadLoader cancels a tile.  You can check this in your dataForTile:
+- (bool)isCancelled;
+
+/// If this is set, the tile failed to parse
+/// You can set it and the system will deal with the results
+@property (nonatomic,strong) NSError * __nullable error;
+
+@end
+
+/**
+ Loader Interpreter converts raw data into images and objects.
+ 
+ Converts data returned from a remote source (or cache) into images and/or
+ MaplyComponentObjects that have already been added to the view (disabled).
+ */
+@protocol MaplyLoaderInterpreter<NSObject>
+
+/** Set when the loader first starts up.
+ 
+    If you need to tweak loader settings, do it here.
+  */
+- (void)setLoader:(MaplyQuadLoaderBase * __nonnull)loader;
+
+/**
+ Parse the data coming back from a remote request and turn it into something we can use.
+ 
+ Convert the NSData passed in to image and component objects (e.g. add stuff to the view controller).
+ Everything added should be disabled to start.
+ */
+- (void)dataForTile:(MaplyLoaderReturn * __nonnull)loadReturn loader:(MaplyQuadLoaderBase * __nonnull)loader;
+
+/**
+  Notification that the tile was unloaded by the system.  If you're tracking your own resources, you may need this.
+ */
+- (void)tileUnloaded:(MaplyTileID)tileID;
+
+@end
+
+/** Base class for the quad loaders.
+
+    The image, frame, and data paging loaders all share much of the same functionality.
+ */
+@interface MaplyQuadLoaderBase : NSObject
+
+/**
+ Control how tiles are indexed, either from the lower left or the upper left.
+ 
+ If set, we'll use the OSM approach (also Google Maps) to y indexing.  That's that default and it's normally what you're run into.
+ 
+ Strictly speaking, TMS addressing (the standard) is flipped the other way.  So if your tile source looks odd, try setting this to false.
+ 
+ Default value is true.
+ */
+@property (nonatomic) bool flipY;
+
+/// Set for a lot of debugging output
+@property (nonatomic,assign) bool debugMode;
+
+/// View controller this is attached to.
+/// Useful for delegate calls that might not be tracking that.
+@property (nonatomic,readonly,weak,nullable) NSObject<MaplyRenderControllerProtocol> *viewC;
+
+/// If set, we'll call the interpreter on this queue
+@property (nonatomic,nullable,strong) dispatch_queue_t queue;
+
+/// Number of simulataneous tiles we'll parse
+/// This is really just a limit on the number of tiles we'lll parse concurrently to keep memory use under control
+@property (nonatomic) unsigned int numSimultaneousTiles;
+
+// True if the loader is not currently loading anything
+- (bool)isLoading;
+
+/**
+ Calculate the bounding box for a single tile in geographic.
+ 
+ This is a utility method for calculating the extents of a given tile in geographic (e.g. lon/lat).
+ 
+ @param tileID The ID for the tile we're interested in.
+ 
+ @return The lower left and upper right corner of the tile in geographic coordinates. Returns kMaplyNullBoundingBox in case of error
+ */
+- (MaplyBoundingBox)geoBoundsForTile:(MaplyTileID)tileID;
+
+/**
+ Calculate the bounding box for a single tile in geographic using doubles.
+ 
+ This is a utility method for calculating the extents of a given tile in geographic (e.g. lon/lat).
+ 
+ @param tileID The ID for the tile we're interested in.
+ 
+ @return The lower left and upper right corner of the tile in geographic coordinates. Returns kMaplyNullBoundingBoxD in case of error
+ */
+- (MaplyBoundingBoxD)geoBoundsForTileD:(MaplyTileID)tileID;
+
+/**
+ Calculate the bounding box for a single tile in the local coordinate system.
+ 
+ This utility method calculates the bounding box for a tile in the coordinate system used for the layer.
+ 
+ @param tileID The ID for the tile we're interested in.
+ 
+ @return The lower left and upper right corner of the tile in local coordinates.
+ */
+- (MaplyBoundingBox)boundsForTile:(MaplyTileID)tileID;
+
+/**
+ Calculate the bounding box for a single tile in the local coordinate system using doubles.
+ 
+ This utility method calculates the bounding box for a tile in the coordinate system used for the layer.
+ 
+ @param tileID The ID for the tile we're interested in.
+ 
+ @return The lower left and upper right corner of the tile in geographic coordinates.
+ */
+- (MaplyBoundingBoxD)boundsForTileD:(MaplyTileID)tileID;
+
+/**
+ Return the center of the tile in display coordinates.
+ 
+ @param tileID The ID for the tile we're interested in.
+ 
+ @return Return the center in display space for the given tile.
+ */
+- (MaplyCoordinate3d)displayCenterForTile:(MaplyTileID)tileID;
+
+/**
+    Each sampling layer allocates a slot to keep track of continuous zoom levels.
+    Those are passed all the way through to the individual shaders.
+ */
+- (int)getZoomSlot;
+
+/// Use a specific tile fetcher rather than the one shared by everyone else
+- (void)setTileFetcher:(NSObject<MaplyTileFetcher> * __nonnull)tileFetcher;
+
+/// Set the interpreter for the data coming back.  If you're just getting images, don't set this.
+- (void)setInterpreter:(NSObject<MaplyLoaderInterpreter> * __nonnull)interp;
+
+/// Return the current interpreter
+- (NSObject<MaplyLoaderInterpreter> * __nullable)getInterpreter;
+
+/**
+ Change the interpreter and reload all the data.
+ <br>
+ You can change the tile interpreter being used to build objects and images.
+ This will then force a reload of the tiles (hopefully from cache) and the
+ visuals will change as everything comes in.
+ */
+- (void)changeInterpreter:(NSObject<MaplyLoaderInterpreter> *__nonnull)interp;
+
+/**
+  Force a reload of the data.
+  <br>
+  All the current loads will be cancelled, any in flight will be ignored
+  and the loader will ask for a whole new set of data.
+  */
+- (void)reload;
+
+/**
+  Force a reload of the tiles overlapping a bounding box.
+  <br>
+  All the current loads will be cancelled, any in flight will be ignored
+  and the loader will ask for a whole new set of data.
+  */
+- (void)reloadArea:(MaplyBoundingBox)bounds;
+
+
+/**
+  Force a reload of the tiles overlapping a set of bounding boxes
+  <br>
+  All the current loads will be cancelled, any in flight will be ignored
+  and the loader will ask for a whole new set of data.
+  */
+- (void)reloadAreas:(NSArray<NSValue*>* __nullable)bounds;
+
+/** Turn off the loader and shut things down.
+ This unregisters us with the sampling layer and shuts down the various objects we created.
+ */
+- (void)shutdown;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyQuadPagingLoader.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyQuadPagingLoader.h
new file mode 100644
index 0000000..e08a04d
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyQuadPagingLoader.h
@@ -0,0 +1,82 @@
+/*
+ *  MaplyQuadPagingLoader.h
+ *
+ *  Created by Steve Gifford on 2/21/91.
+ *  Copyright 2012-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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <WhirlyGlobeMaplyComponent/MaplyQuadLoader.h>
+
+/**
+ This version of the loader return is used by the MaplyQuadPagingLoader.
+ 
+ The Object pager is only expecting Component Objects and will manage
+ those as things are loaded in and out.
+ */
+@interface MaplyObjectLoaderReturn : MaplyLoaderReturn
+
+/// Initialize with the loader this will be attached to
+- (id __nonnull)initWithLoader:(MaplyQuadLoaderBase *__nonnull)loader;
+
+/// If any component objects are associated with the tile, these are them.
+/// They need to start disabled.  The system will enable and delete them when it is time.
+- (void)addCompObjs:(NSArray<MaplyComponentObject *> * __nonnull)compObjs;
+
+/// Add a component object to the collection if it's non null
+- (void)addCompObj:(MaplyComponentObject * __nullable)compObj;
+
+/// Return an array of component objects that were added to this loader return
+- (NSArray<MaplyComponentObject *> * __nonnull)getCompObjs;
+
+@end
+
+/** General purpose quad paging loader.
+ 
+    This quadtree based paging loader is for fetching and load general geometry.
+    There are other loaders that handle images and image animations.  This one is
+    purely for geometry.
+ 
+    You need to fill in at least a MaplyLoaderInterpreter, which is probably your own
+    implementation.
+ 
+    This replaces the QuadPagingLayer from WhirlyGlobe-Maply 2.x.
+  */
+@interface MaplyQuadPagingLoader : MaplyQuadLoaderBase
+
+/**
+ Initialize with a single tile info object, the interpreter and the sampling parameters.
+ 
+ @param params The sampling parameters describing how to break down the data for projection onto a globe or map.
+ @param tileInfo A optional tile info object describing where the data is and how to get it.
+ @param loadInterp The interpreter makes geometry from the input data.  Or just makes it up if there is no input.
+ @param viewC the View controller (or renderer) to add objects to.
+ */
+- (nullable instancetype)initWithParams:(MaplySamplingParams *__nonnull)params
+                               tileInfo:(NSObject<MaplyTileInfoNew> *__nullable)tileInfo
+                             loadInterp:(NSObject<MaplyLoaderInterpreter> *__nullable)loadInterp
+                                  viewC:(MaplyBaseViewController * __nonnull)viewC;
+
+/**
+  Force a reload of the data.
+  <br>
+  All the current loads will be cancelled, any in flight will be ignored and the loader will ask for a whole new set of data.
+  */
+- (void)reload;
+
+- (void)reloadArea:(MaplyBoundingBox)bound;
+
+- (void)reloadAreas:(NSArray<NSValue*>* __nullable)bounds;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyQuadSampler.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyQuadSampler.h
new file mode 100644
index 0000000..2f9ec39
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyQuadSampler.h
@@ -0,0 +1,103 @@
+/*
+ *  MaplyQuadSampler.h
+ *  WhirlyGlobe-MaplyComponent
+ *
+ *  Created by Steve Gifford on 3/27/18.
+ *  Copyright 2011-2022 Saildrone Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <WhirlyGlobeMaplyComponent/MaplyControllerLayer.h>
+#import <WhirlyGlobeMaplyComponent/MaplyCoordinateSystem.h>
+#import <WhirlyGlobeMaplyComponent/MaplyTileSourceNew.h>
+#import <WhirlyGlobeMaplyComponent/MaplyRenderController.h>
+
+/**
+    Sampling parameters.
+ 
+    These are used to describe how we want to break down the globe or
+    flat projection onto the globe.
+  */
+@interface MaplySamplingParams : NSObject
+
+/// The coordinate system we'll be sampling from.
+@property (nonatomic,nonnull,strong) MaplyCoordinateSystem *coordSys;
+
+/// Min zoom level for sampling.  Don't set this to anything other than 0 or 1
+@property (nonatomic) int minZoom;
+
+/// Max zoom level for sampling
+@property (nonatomic) int maxZoom;
+
+/// We may want to calculate zoom levels beyond what we actually load.
+/// Useful for zoom scaled features and enable/disable based on zoome
+@property (nonatomic) int reportedMaxZoom;
+
+/// Maximum number of tiles to load
+@property (nonatomic) int maxTiles;
+
+/// Cutoff for loading tiles.  This is size in screen space (pixels^2)
+@property (nonatomic) double minImportance;
+
+/// Normally we always load the lowest level
+/// If this is set we only load those lowest level tiles that pass this test
+/// Must be greater than zero and not equal to minImportance to take effect.
+@property (nonatomic) double minImportanceTop;
+
+/// Generate geometry to cover the north and south poles
+/// Only works for world-wide projections
+@property (nonatomic) bool coverPoles;
+
+/// If set, generate skirt geometry to hide the edges between levels
+@property (nonatomic) bool edgeMatching;
+
+/// Tesselation values per level for breaking down the coordinate system (e.g. globe)
+@property (nonatomic) int tessX,tessY;
+
+/// If set, we'll scale the bounding boxes of individual tiles by this before evaluating
+@property (nonatomic) float boundScale;
+
+/// If set, we'll always load the lowest level first and then whatever the target level is
+/// Turn this off to get true single level loading
+/// `forceMinLevelHeight` must be greater than zero for this to have any effect.
+@property (nonatomic) bool forceMinLevel;
+
+/// If set, we'll turn on forceMinLevel and only use it when the viewer is above this height
+@property (nonatomic) double forceMinLevelHeight;
+
+/// If set, we'll try to load a single level
+@property (nonatomic) bool singleLevel;
+
+/// If set, the tiles are clipped to this boundary
+@property (nonatomic) MaplyBoundingBoxD clipBounds;
+@property (nonatomic,readonly) bool hasClipBounds;
+
+/**
+ Detail the levels you want loaded in target level mode.
+ 
+ The layer calculates the optimal target level.  The entries in this array are relative to that level or absolute.  For example [0,-4,-2] means the layer will always try to load levels 0, targetLevel-4 and targetLevel-2, but only the latter two if they make sense.
+ */
+@property (nonatomic,nullable,strong) NSArray *levelLoads;
+
+/**
+ Set the min importance for just one level.
+ 
+ This is useful if you want your lower levels loaded more aggressively.
+ */
+- (void)setMinImportance:(double)minImportance forLevel:(int)level;
+
+/// Decide if these sampling params are the same as others
+- (bool)isEqualTo:(MaplySamplingParams *__nonnull)other;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyRemoteTileFetcher.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyRemoteTileFetcher.h
new file mode 100644
index 0000000..32dba80
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyRemoteTileFetcher.h
@@ -0,0 +1,288 @@
+/*
+ *  MaplyRemoteTileFetcher.h
+ *  WhirlyGlobe-MaplyComponent
+ *
+ *  Created by Steve Gifford on 6/15/18.
+ *  Copyright 2011-2022 Saildrone Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <WhirlyGlobeMaplyComponent/MaplyTileSourceNew.h>
+#import <WhirlyGlobeMaplyComponent/MaplyCoordinateSystem.h>
+
+/**
+ Remote Tile Info Object (New)
+ 
+ Not to be confused with the old one, which works with the older loading subsystem,
+ the new remote tile info object contains min/max zoom, coordinate system and URL
+ information for fetching individual data tiles.
+ */
+@interface MaplyRemoteTileInfoNew : NSObject<MaplyTileInfoNew>
+
+/**
+ Initialize with enough information to fetch remote tiles.
+ 
+ This version of the init method takes all the explicit
+ information needed to fetch remote tiles.  This includes the
+ base URL and min and max zoom levels.
+ 
+ @param baseURL The base URL for fetching TMS tiles.  This is a replacement URL with {x}, {y}, and {z} in the string.
+ 
+ @param minZoom The minimum zoom level to fetch.  This really should be 0.
+ 
+ @param maxZoom The maximum zoom level to fetch.
+ 
+ @return The MaplyRemoteTileInfoNew object or nil on failure.
+ */
+- (nonnull instancetype)initWithBaseURL:(NSString *__nonnull)baseURL minZoom:(int)minZoom maxZoom:(int)maxZoom;
+
+/// Base URL
+@property (nonatomic,readonly,retain,nonnull) NSString *baseURL;
+
+/// Min zoom level
+@property (nonatomic,readonly,assign) int minZoom;
+
+/// Max zoom level
+@property (nonatomic,readonly,assign) int maxZoom;
+
+/**
+ The timeout assigned to the NSMutableURLRequest we're using to fetch tiles.
+ 
+ This is not set by default.  If set, we'll use this value as the timeout on the NSMutableURLRequest we use for fetching tiles.  This lets you extent it where appropriate or shorten it if you like.
+ */
+@property (nonatomic,assign) float timeOut;
+
+/**
+ The cache directory for data tiles.
+ 
+ In general, we want to cache.  The globe, in particular,
+ is going to fetch the same tiles over and over, quite a lot.
+ The cacheing behavior is a little dumb.  It will just write
+ files to the given directory forever.  If you're interacting
+ with a giant image pyramid, that could be problematic.
+ */
+@property (nonatomic, retain,nullable) NSString *cacheDir;
+
+/**
+ Optional headers to add to the NSURLRequest.
+ 
+ These are name/data pairs which will be stuck in the NSURLRequest header.
+ */
+@property (nonatomic, retain) NSDictionary * __nullable headers;
+
+/**
+ Optional coordinate system describing the tile set.
+ 
+ This coordinate system is required if the tile info will need
+ to evaluate valid tiles as defined by the addValidBounds:coordSystem: call.
+ */
+@property (nonatomic, retain) MaplyCoordinateSystem * __nullable coordSys;
+
+/**
+ Add a bounding box that defines validity for any tile before it's fetched.
+ 
+ Not all data sources cover all possible tiles.  If you know your data source does not,
+ you can specify what area is valid ahead of times.  Tiles that do not overlap that area
+ will not be loaded.
+  */
+- (void)addValidBounds:(MaplyBoundingBoxD)bbox coordSystem:(MaplyCoordinateSystem * __nonnull)coordSys;
+
+@end
+
+/**
+    Fetch Info for remote tile fetches.
+ 
+    The URL (required) and cacheFile (optional) for the given fetch.
+    This is the object the RemoteTileFetcher expects for the fetchInfo member of the TileFetchRequest.
+  */
+@interface MaplyRemoteTileFetchInfo : NSObject
+
+/// URL to fetch from
+@property (nonatomic,nonnull,retain) NSURLRequest *urlReq;
+
+/// File name for cached file (if present).  Save it here when fetched if set.
+@property (nonatomic,nullable,retain) NSString *cacheFile;
+
+/// If you're using local storage (separate from the cache) this will be passed on to the MaplyTileLocalStorage manager
+@property (nonatomic,nullable,retain) id localStorageKey;
+
+@end
+
+/**
+    If you provide LocalStore the RemoteTileFetcher will look for data in local storage first,
+    then try the local file cache and lastly go to the network.
+ 
+    You can provide the local storage by filling out this protocol and passing it to the RemoteTileFetcher.
+ 
+    Expect to be called on a random thread and block appropriately.
+ */
+@protocol MaplyTileLocalStorage <NSObject>
+
+/**
+ Return the data for the given tile.  nil means you don't have the tile, so we'll try other sources.
+ fetchInfo is a MaplyRemoteTileFetchInfo describing the rest of the tile characteristics.
+ tileID is the tile in question.
+ */
+- (id __nullable)dataForTile:(MaplyRemoteTileFetchInfo * __nonnull)fetchInfo tileID:(MaplyTileID)tileID;
+
+@end
+
+/**
+    If a tile fetch request fails, this object allows you  second chance to provide the data.
+    Maybe you have an old version in a cache somewhere.  Provide that.  Or fail and
+    the tile fetch will continue to fail.
+ */
+@protocol MaplyTileSecondChance <NSObject>
+
+/**
+ Return data for a tile that's already failed to load from local cache and remote fetch.
+ This might be an old version of the data you have lying around.  It's up to you.
+ Returning nil means the fetch fails as normal.
+ */
+- (id __nullable)dataForTile:(MaplyRemoteTileFetchInfo * __nonnull)fetchInfo tileID:(MaplyTileID)tileID;
+
+@end
+
+@class MaplyRemoteTileFetcherStats;
+@class MaplyRemoteTileFetcherLog;
+
+/**
+  Remote Tile fetcher fetches tiles from remote URLs.
+ 
+  The tile fetcher interacts with loaders that want tiles, as demanded by samplers.
+  It's complicated.  There's a default one of these that will get used if you pass in nil to the MaplyQuadImageLoader.
+  */
+@interface MaplyRemoteTileFetcher : NSObject<MaplyTileFetcher>
+
+/// Initialize with the number of connections the fetcher can have open at once
+- (instancetype __nonnull)initWithName:(NSString * __nonnull)name connections:(int)numConnections;
+
+/// Number of outstanding connections in parallel
+@property (nonatomic) int numConnections;
+
+/// Local storage is for pre-downloaded tiles, rather than a cache.  This is consulted *before* we go out to the network.
+/// If it fails, then we hit the local file cache and then we hit the network
+- (void)setLocalStorage:(NSObject<MaplyTileLocalStorage> * __nullable)localStorage;
+
+/// After a tile fails to load from local storage, local cache and then a remote request, you have one more chance to provide the data
+/// Useful if you've got an old version of the tile lying around you might use in a pinch
+- (void)setSecondChance:(NSObject<MaplyTileSecondChance> * __nullable)secondChance;
+
+/// Return the fetching stats since the beginning or since the last reset
+- (MaplyRemoteTileFetcherStats * __nullable)getStats:(bool)allTime;
+
+/// Reset the counters for one variant of stat
+- (void)resetStats;
+
+/// Reset just the active counters
+- (void)resetActiveStats;
+
+/// Start logging request (and times and such)
+- (void)startLogging;
+
+/// Stop logging and return the log itself
+- (MaplyRemoteTileFetcherLog * __nullable)stopLogging;
+
+// If set, you get way too much debugging output
+@property (nonatomic,assign) bool debugMode;
+
+@end
+
+/// Stats collected by the fetcher
+@interface MaplyRemoteTileFetcherStats : NSObject
+
+@property (nonatomic,readonly,weak,nullable) MaplyRemoteTileFetcher *fetcher;
+
+// Start of stats collection
+@property (nonatomic,nonnull,strong) NSDate *startDate;
+
+// Total requests, remote and cached
+@property (nonatomic) int totalRequests;
+
+// Requests that resulted in a remote HTTP call
+@property (nonatomic) int remoteRequests;
+
+// Total requests cancelled
+@property (nonatomic) int totalCancels;
+
+// Requests failed
+@property (nonatomic) int totalFails;
+
+// Bytes of remote data loaded
+@property (nonatomic) int remoteData;
+
+// Bytes of cached data loaded
+@property (nonatomic) int localData;
+
+// Total time spent waiting for successful remote data requests
+@property (nonatomic) NSTimeInterval totalLatency;
+
+// The maximum number of requests we've had at once (since the last reset)
+@property (nonatomic) int maxActiveRequests;
+
+// Current number of active requests
+@property (nonatomic) int activeRequests;
+
+// Add the given stats to ours
+- (void)addStats:(MaplyRemoteTileFetcherStats * __nonnull)stats;
+
+// Print out the stats
+- (void)dump;
+
+@end
+
+/**
+  Single entry for the logging.  Reports on the status of a specific fetch.
+ */
+@interface MaplyRemoteTileFetcherLogEntry : NSObject
+
+/// URL this is about
+@property (nonatomic,nonnull) NSURLRequest *urlReq;
+
+/// Total size of data
+@property (nonatomic) int size;
+
+/// Did we get it at all?
+@property (nonatomic) bool success;
+
+/// True if it was cached on local storage
+@property (nonatomic) bool wasCached;
+
+/// Time when the request was first presented to the RemotetTileFetcher
+@property (nonatomic) NSTimeInterval queuedTime;
+
+/// Time when the remote request was initiated by the system
+@property (nonatomic) NSTimeInterval startedTime;
+
+/// If successful, when we got the request back
+@property (nonatomic) NSTimeInterval finishedTime;
+
+@end
+
+/// Log of remote fetches, how long they took, their results and so on
+@interface MaplyRemoteTileFetcherLog : NSObject
+
+/// When this log begins
+@property (nonatomic) NSTimeInterval startTime;
+
+/// When the log ends
+@property (nonatomic) NSTimeInterval endTime;
+
+/// Individual log entries sorted by finishedTime (probably)
+- (NSArray<MaplyRemoteTileFetcherLogEntry *> * __nullable)getEntries;
+
+/// Print it all out
+- (NSString * __nonnull)dump;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyRenderController.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyRenderController.h
new file mode 100644
index 0000000..cddd63d
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyRenderController.h
@@ -0,0 +1,1007 @@
+/*
+ *  MaplyRenderController.h
+ *  WhirlyGlobeMaplyComponent
+ *
+ *  Created by Stephen Gifford on 1/19/18.
+ *  Copyright 2012-2022 Saildrone Inc.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
+#import <WhirlyGlobeMaplyComponent/MaplyScreenMarker.h>
+#import <WhirlyGlobeMaplyComponent/MaplyVectorObject.h>
+#import <WhirlyGlobeMaplyComponent/MaplyComponentObject.h>
+#import <WhirlyGlobeMaplyComponent/MaplySharedAttributes.h>
+#import <WhirlyGlobeMaplyComponent/MaplyLight.h>
+#import <WhirlyGlobeMaplyComponent/MaplyShader.h>
+#import <WhirlyGlobeMaplyComponent/MaplyTexture.h>
+#import <WhirlyGlobeMaplyComponent/MaplyParticleSystem.h>
+#import <WhirlyGlobeMaplyComponent/MaplyPoints.h>
+#import <WhirlyGlobeMaplyComponent/MaplyCluster.h>
+#import <WhirlyGlobeMaplyComponent/MaplyRenderTarget.h>
+#import <WhirlyGlobeMaplyComponent/MaplyActiveObject.h>
+#import <WhirlyGlobeMaplyComponent/MaplyControllerLayer.h>
+
+@class MaplyRemoteTileFetcher;
+
+/// Where we'd like an add to be executed.  If you need immediate feedback,
+///  then be on the main thread and use MaplyThreadCurrent.  Any is the default.
+typedef NS_ENUM(NSInteger, MaplyThreadMode) {
+    MaplyThreadCurrent,
+    MaplyThreadAny,
+};
+
+/// The various image formats we support.  RGBA is the default, and most expensive.
+typedef NS_ENUM(NSInteger, MaplyQuadImageFormat) {
+    MaplyImageIntRGBA,
+    MaplyImageUShort565,
+    MaplyImageUShort4444,
+    MaplyImageUShort5551,
+    MaplyImageUByteRed,MaplyImageUByteGreen,MaplyImageUByteBlue,MaplyImageUByteAlpha,
+    MaplyImageUByteRG,
+    MaplyImageUByteRGB,
+    MaplyImageETC2RGB8,MaplyImageETC2RGBA8,MaplyImageETC2RGBPA8,
+    MaplyImageEACR11,MaplyImageEACR11S,MaplyImageEACRG11,MaplyImageEACRG11S,
+    MaplyImage4Layer8Bit,
+    // Metal only
+    MaplyImageSingleFloat16,MaplyImageSingleFloat32,MaplyImageDoubleFloat16,MaplyImageDoubleFloat32,MaplyImageQuadFloat16,MaplyImageQuadFloat32,
+    MaplyImageInt16,MaplyImageUInt32,MaplyImageDoubleUInt32,MaplyImageQuadUInt32
+};
+
+/// Wrap values for certain types of textures
+#define MaplyImageWrapNone (0)
+#define MaplyImageWrapX (1<<0)
+#define MaplyImageWrapY (1<<1)
+
+@class MaplyRenderController;
+
+/// The system can set up as either GL or Metal
+typedef NS_ENUM(NSInteger, MaplyRenderType) {
+//    MaplyRenderGLES,
+    MaplyRenderMetal,
+    MaplyRenderUnknown
+};
+
+/**
+    Render Controller Protocol defines the methods required of a render controller.
+ 
+    The view controllers and offscreen renderers implement this protocol.
+  */
+@protocol MaplyRenderControllerProtocol <NSObject>
+
+/**
+ Set the offset for the screen space objects.
+ 
+ In general you want the screen space objects to appear on top of everything else.  There used to be structural versions for this, but now you can mix and match where everything appears.  This controls the offset that's used to push screen space objects behind everything else in the list (and thus, on top).
+ 
+ If you set this to 0, you can control the ordering of everything more precisely.
+ */
+@property (nonatomic,assign) int screenObjectDrawPriorityOffset;
+
+/**
+ Clear all the currently active lights.
+ 
+ There are a default set of lights, so you'll want to do this before adding your own.
+ */
+- (void)clearLights;
+
+/**
+ Reset the lighting back to its default state at startup.
+ 
+ This clears out all the lights and adds in the default starting light source.
+ */
+- (void)resetLights;
+
+/**
+ Add the given light to the list of active lights.
+ 
+ This method will add the given light to our active lights.  Most shaders will recognize these lights and do the calculations.  If you have a custom shader in place, it may or may not use these.
+ 
+ Triangle shaders use the lights, but line shaders do not.
+ */
+- (void)addLight:(MaplyLight *__nonnull)light;
+
+/// Remove the given light (assuming it's active) from the list of lights.
+- (void)removeLight:(MaplyLight *__nonnull)light;
+
+/**
+ Set the rendering hints to control how the renderer is configured.
+ 
+ This is a bit vestigial, but still has a few important uses.  The hints should be set right after the init call.  Any later and they'll probably be ignored.
+ 
+ The rendering hints are as follows.
+ 
+ |Key|Type|Description|
+ |:--|:---|:----------|
+ |kMaplyRenderHintZBuffer|bool|If set, we'll explicitly turn on the Z buffer.  Normally it's off until a drawable requests it, allowing us to play neat tricks with overlays.  The only time you should be turning this on is if you're doing 3D elevation.  The default is off.|
+ |kMaplyRenderHintCulling|bool|If set, we'll use the internal culling logic.  Texture and drawable atlases have largely made this pointless.  Leave it off unless you have a compelling reason to turn it on.|
+ |kMaplyRendererLightingMode|NSString|This can be set to @"none", in which case we use optimized shaders that do no lighting or "regular".  The latter is the default.|
+ */
+- (void)setHints:(NSDictionary *__nonnull)hintsDict;
+
+/**
+    Add a cluster generator for making clustered marker images on demand.
+    
+    When the layout system clusters a bunch of markers or labels together, it needs new images to represent the cluster.
+    
+    You can provide a custom image for each group of markers by filling in one of these generates and passing it in.
+  */
+- (void)addClusterGenerator:(NSObject <MaplyClusterGenerator> *__nonnull)clusterGen;
+
+/**
+ Add one or more screen markers to the current scene.
+ 
+ This method will add the given MaplyScreenMaker objects to the current scene.  It will use the parameters in the description dictionary and it will do it on the thread specified.
+ 
+ @param markers An NSArray of MaplyScreenMarker objects.
+ 
+ @param desc The desciption dictionary which controls how the markers will be constructed.  It takes the following entries.
+ 
+ |Key|Type|Description|
+ |:--|:---|:----------|
+ |kMaplyColor|UIColor|The color we'll use for the rectangle that makes up a marker. White by default.|
+ |kMaplyMinVis|NSNumber|This is viewer height above the globe or map.  The marker will only be visible if the user is above this height.  Off by default.|
+ |kMaplyMaxVis|NSNumber|This is viewer height above the globe or map.  The marker will only be visible if the user is below this height.  Off by default.|
+ |kMaplyMinViewerDist|NSNumber|Minimum distance from the viewer at which to display object(s).|
+ |kMaplyMaxViewerDist|NSNumber|Maximum distance from the viewer at which to display object(s).|
+ |kMaplyViewableCenterX|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center X coordinate.|
+ |kMaplyViewableCenterY|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center Y coordinate.|
+ |kMaplyViewableCenterZ|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center Z coordinate.|
+ |kMaplyDrawPriority|NSNumber|If set, the markers are sorted by this number.  Larger numbers will be sorted later.|
+ |kMaplyFade|NSNumber|The number of seconds to fade a marker in when it appears and out when it disappears.|
+ |kMaplyFadeIn|NSNumber|The number of seconds to fade a marker in when it appears.  This overrides kMaplyFade.|
+ |kMaplyFadeOut|NSNumber|The number of seconds to fade a marker out when it disappears.  This override kMaplyFade.|
+ |kMaplyFadeOutTime|NSNumber|If you want to create an object, just to have it fade out at a specific time, this is what you set.|
+ |kMaplyShader|NSString|If set, this is the name of the MaplyShader to use when rendering the screen markers.|
+ |kMaplyEnable|NSNumber boolean|On by default, but if off then the feature exists, but is not turned on.  It can be enabled with enableObjects:|
+ |kMaplyEnableStart|NSNumber|If set, this controls when the resulting objects will be activated.|
+ |kMaplyEnableEnd|NSNumber|If set, this controls when the resulting objects will be deactivated.|
+ |kMaplyUUID|NSString|Unique ID to match up alternate representations of the same element.|
+ |kMaplyRepresentation|NSString|Name of the representation presented by this object.|
+ |kMaplyClusterGroup|NSNumber|If set, the screen markers will be clustered together according to the given group ID.  Off by default, but 0 is the default cluster.|
+ 
+ 
+ @param threadMode MaplyThreadAny is preferred and will use another thread, thus not blocking the one you're on.  MaplyThreadCurrent will make the changes immediately, blocking this thread.
+ 
+ 
+ @return Returns a MaplyComponentObject, which can be used to make modifications or delete the objects created.
+ */
+- (MaplyComponentObject *__nullable)addScreenMarkers:(NSArray *__nonnull)markers desc:(NSDictionary *__nullable)desc mode:(MaplyThreadMode)threadMode;
+
+/**
+ Add one or more 3D markers to the current scene.
+ 
+ This method will add the given MaplyMarker objects to the current scene.  It will use the parameters in the description dictionary and it will do it on the thread specified.
+ 
+ @param markers An NSArray of MaplyMarker objects.
+ 
+ @param desc The desciption dictionary which controls how the markers will be constructed.  It takes the following entries.
+ 
+ |Key|Type|Description|
+ |:--|:---|:----------|
+ |kMaplyColor|UIColor|The color we'll use for the rectangle that makes up a marker. White by default.|
+ |kMaplyMinVis|NSNumber|This is viewer height above the globe or map.  The marker will only be visible if the user is above this height.  Off by default.|
+ |kMaplyMaxVis|NSNumber|This is viewer height above the globe or map.  The marker will only be visible if the user is below this height.  Off by default.|
+ |kMaplyMinViewerDist|NSNumber|Minimum distance from the viewer at which to display object(s).|
+ |kMaplyMaxViewerDist|NSNumber|Maximum distance from the viewer at which to display object(s).|
+ |kMaplyViewableCenterX|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center X coordinate.|
+ |kMaplyViewableCenterY|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center Y coordinate.|
+ |kMaplyViewableCenterZ|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center Z coordinate.|
+ |kMaplyFade|NSNumber|The number of seconds to fade a marker in when it appears and out when it disappears.|
+ |kMaplyFadeIn|NSNumber|The number of seconds to fade a marker in when it appears.  This overrides kMaplyFade.|
+ |kMaplyFadeOut|NSNumber|The number of seconds to fade a marker out when it disappears.  This override kMaplyFade.|
+ |kMaplyFadeOutTime|NSNumber|If you want to create an object, just to have it fade out at a specific time, this is what you set.|
+ |kMaplyDrawPriority|NSNumber|Geometry is sorted by this value before being drawn.  This ensures that some objects can come out on top of others.  By default this is kMaplyMarkerDrawPriorityDefault.|
+ |kMaplyZBufferRead|NSNumber boolean|If set this geometry will respect the z buffer.  It's off by default, meaning that the geometry will draw on top of anything (respecting the kMaplyDrawPriority).|
+ |kMaplyZBufferWrite|NSNumber boolean|If set this geometry will write to the z buffer.  That means following geometry that reads the z buffer will be occluded.  This is off by default.|
+ |kMaplyEnable|NSNumber boolean|On by default, but if off then the feature exists, but is not turned on.  It can be enabled with enableObjects:|
+ |kMaplyUUID|NSString|Unique ID to match up alternate representations of the same element.|
+ |kMaplyRepresentation|NSString|Name of the representation presented by this object.|
+ 
+ @param threadMode MaplyThreadAny is preferred and will use another thread, thus not blocking the one you're on.  MaplyThreadCurrent will make the changes immediately, blocking this thread.
+ 
+ 
+ @return Returns a MaplyComponentObject, which can be used to make modifications or delete the objects created.
+ */
+- (MaplyComponentObject *__nullable)addMarkers:(NSArray *__nonnull)markers desc:(NSDictionary *__nullable)desc mode:(MaplyThreadMode)threadMode;
+
+/**
+ Add one or more screen labels to the current scene.
+ 
+ This method will add the given MaplyScreenLabel objects to the current scene.  It will use the parameters in the description dictionary and it will do it on the thread specified.
+ 
+ @param labels An NSArray of MaplyScreenLabel objects.
+ 
+ @param desc The desciption dictionary which controls how the labels will be constructed.  It takes the following entries.
+ 
+ |Key|Type|Description|
+ |:--|:---|:----------|
+ |kMaplyTextColor|UIColor|Color we'll use for the text. Black by default.|
+ |kMaplyBackgroundColor|UIColor|Color we'll use for the rectangle background.  Use clearColor to make this invisible.|
+ |kMaplyFont|UIFont|The font we'll use for the text.|
+ |kMaplyLabelHeight|NSNumber|Height of the text in points.|
+ |kMaplyLabelWidth|NSNumber|Width of the text in points.  It's best to set Height and leave this out.  That way the width will be calculated by the toolkit.|
+ |kMaplyJustify|NSString|This can be set to @"middle", @"left", or @"right" to justify the text around the location.|
+ |kMaplyTextJustify|NSString|This can be kMaplyTextJustifyRight, kMaplyTextJustifyCenter, or kMaplyTextJustifyLeft|
+ |kMaplyShadowSize|NSNumber|If set, we'll draw a shadow with the kMaplyShadowColor offset by this amount.  We recommend using an outline instead.|
+ |kMaplyShadowColor|UIColor|If we're drawing a shadow, this is its color.|
+ |kMaplyTextOutlineSize|NSNumber|If set, we'll draw an outline around the text (really draw it twice).  The outline will be this large.|
+ |kMaplyTextOutlineColor|UIColor|If we're drawing an outline, it's in this color.|
+ |kMaplyMinVis|NSNumber|This is viewer height above the globe or map.  The label will only be visible if the user is above this height.  Off by default.|
+ |kMaplyMaxVis|NSNumber|This is viewer height above the globe or map.  The label will only be visible if the user is below this height.  Off by default.|
+ |kMaplyMinViewerDist|NSNumber|Minimum distance from the viewer at which to display object(s).|
+ |kMaplyMaxViewerDist|NSNumber|Maximum distance from the viewer at which to display object(s).|
+ |kMaplyViewableCenterX|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center X coordinate.|
+ |kMaplyViewableCenterY|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center Y coordinate.|
+ |kMaplyViewableCenterZ|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center Z coordinate.|
+ |kMaplyDrawPriority|NSNumber|If set, the labels are sorted by this number.  Larger numbers will be sorted later.|
+ |kMaplyFade|NSNumber|The number of seconds to fade a screen label in when it appears and out when it disappears.|
+ |kMaplyEnable|NSNumber boolean|On by default, but if off then the feature exists, but is not turned on.  It can be enabled with enableObjects:|
+ |kMaplyEnableStart|NSNumber|If set, this controls when the resulting objects will be activated.|
+ |kMaplyEnableEnd|NSNumber|If set, this controls when the resulting objects will be deactivated.|
+ |kMaplyUUID|NSString|Unique ID to match up alternate representations of the same element.|
+ |kMaplyRepresentation|NSString|Name of the representation presented by this object.|
+ 
+ @param threadMode MaplyThreadAny is preferred and will use another thread, thus not blocking the one you're on.  MaplyThreadCurrent will make the changes immediately, blocking this thread.
+ 
+ 
+ @return Returns a MaplyComponentObject, which can be used to make modifications or delete the objects created.
+ */
+- (MaplyComponentObject *__nullable)addScreenLabels:(NSArray *__nonnull)labels desc:(NSDictionary *__nullable)desc mode:(MaplyThreadMode)threadMode;
+
+/**
+ Add one or more 3D labels to the current scene.
+ 
+ This method will add the given MaplyLabel objects to the current scene.  It will use the parameters in the description dictionary and it will do it on the thread specified.
+ 
+ @param labels An NSArray of MaplyLabel objects.
+ 
+ @param desc The desciption dictionary which controls how the labels will be constructed.  It takes the following entries.
+ 
+ |Key|Type|Description|
+ |:--|:---|:----------|
+ |kMaplyTextColor|UIColor|Color we'll use for the text. Black by default.|
+ |kMaplyBackgroundColor|UIColor|Color we'll use for the rectangle background.  Use clearColor to make this invisible.|
+ |kMaplyFont|UIFont|The font we'll use for the text.|
+ |kMaplyLabelHeight|NSNumber|Height of the text in display coordinates.  For the globe these are based on radius = 1.0.|
+ |kMaplyLabelWidth|NSNumber|Width of the text in display coordinates.  It's best to set Height and leave this out.  That way the width will be calculated by the toolkit.|
+ |kMaplyJustify|NSString|This can be set to @"middle", @"left", or @"right" to justify the text around the location.|
+ |kMaplyShadowSize|NSNumber|If set, we'll draw a shadow with the kMaplyShadowColor offset by this amount.  We recommend using an outline instead.|
+ |kMaplyShadowColor|UIColor|If we're drawing a shadow, this is its color.|
+ |kMaplyMinVis|NSNumber|This is viewer height above the globe or map.  The label will only be visible if the user is above this height.  Off by default.|
+ |kMaplyMaxVis|NSNumber|This is viewer height above the globe or map.  The label will only be visible if the user is below this height.  Off by default.|
+ |kMaplyMinViewerDist|NSNumber|Minimum distance from the viewer at which to display object(s).|
+ |kMaplyMaxViewerDist|NSNumber|Maximum distance from the viewer at which to display object(s).|
+ |kMaplyViewableCenterX|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center X coordinate.|
+ |kMaplyViewableCenterY|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center Y coordinate.|
+ |kMaplyViewableCenterZ|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center Z coordinate.|
+ |kMaplyFade|NSNumber|The number of seconds to fade a label in when it appears and out when it disappears.|
+ |kMaplyDrawPriority|NSNumber|Geometry is sorted by this value before being drawn.  This ensures that some objects can come out on top of others.  By default this is kMaplyLabelDrawPriorityDefault.|
+ |kMaplyZBufferRead|NSNumber boolean|If set this geometry will respect the z buffer.  It's off by default, meaning that the geometry will draw on top of anything (respecting the kMaplyDrawPriority).|
+ |kMaplyZBufferWrite|NSNumber boolean|If set this geometry will write to the z buffer.  That means following geometry that reads the z buffer will be occluded.  This is off by default.|
+ |kMaplyEnable|NSNumber boolean|On by default, but if off then the feature exists, but is not turned on.  It can be enabled with enableObjects:|
+ |kMaplyUUID|NSString|Unique ID to match up alternate representations of the same element.|
+ |kMaplyRepresentation|NSString|Name of the representation presented by this object.|
+
+ @param threadMode MaplyThreadAny is preferred and will use another thread, thus not blocking the one you're on.  MaplyThreadCurrent will make the changes immediately, blocking this thread.
+ 
+ 
+ @return Returns a MaplyComponentObject, which can be used to make modifications or delete the objects created.
+ */
+- (MaplyComponentObject *__nullable)addLabels:(NSArray *__nonnull)labels desc:(NSDictionary *__nullable)desc mode:(MaplyThreadMode)threadMode;
+
+/**
+ Add one or more vectors to the current scene.
+ 
+ This method will add the given MaplyVectorObject objects to the current scene.  It will use the parameters in the description dictionary and it will do it on the thread specified.
+ 
+ @param vectors An NSArray of MaplyVectorObject objects.
+ 
+ @param desc The desciption dictionary which controls how the vectors will look.  It takes the following entries.
+ 
+ |Key|Type|Description|
+ |:--|:---|:----------|
+ |kMaplyColor|UIColor|Color we'll use for the vector features.|
+ |kMaplyVecWidth|NSNumber|If the geometry is not filled, this is the width of the GL lines.|
+ |kMaplyFilled|NSNumber boolean|If set, the areal geometry will be tesselated, taking holes into account.  The resulting triangles will be displayed instead of the vectors.|
+ |kMaplySubdivType|NSString|When present, this requests that the geometry be broken up to follow the globe (really only makes sense there).  It can be set to kMaplySubdivGreatCircle or kMaplySubdivSimple which do a great circle subdivision and a simple 3-space subdivision respectively.  If the key is missing, we do no subdivision at all.|
+ |kMaplySubdivEpsilon|NSNumber|If there's a kMaplySubdivType set this is the epsilon we'll pass into the subdivision routine.  The value is in display coordinates. 0.01 is a reasonable value.  Smaller results in more subdivision.|
+ |kMaplyVecTexture|UIImage|If set and the kMaplyFilled attribute is set, we will apply the given texture across any areal features.  How the texture is applied can be controlled by kMaplyVecTexScaleX, kMaplyVecTexScaleY, kMaplyVecCenterX, kMaplyVecCenterY, and kMaplyVecTextureProjection|
+ |kMaplyVecTexScaleX,kMaplyVecTexScaleY|NSNumber|These control the scale of the texture application.  We'll multiply by these numbers before generating texture coordinates from the vertices.|
+ |kMaplyVecCenterX,kMaplyVecCenterY|NSNumber|These control the center of a texture application.  If not set we'll use the areal's centroid.  If set, we'll use these instead.  They should be in local coordinates (probably geographic radians).|
+ |kMaplyVecTextureProjection|NSString|This controls how a texture is projected onto an areal feature.  By default we just use the geographic coordinates and stretch them out.  This looks odd for very large features.  If you set this to kMaplyProjectionTangentPlane then we'll take the center of the feature, make a tangent plane and then project the coordinates onto that tangent plane to get texture coordinates.  This looks nice at the poles.  If set to kMaplyProjectionScreen the texture is mapped on after screen space projection around the center of the feature.|
+ |kMaplyMinVis|NSNumber|This is viewer height above the globe or map.  The vectors will only be visible if the user is above this height.  Off by default.|
+ |kMaplyMaxVis|NSNumber|This is viewer height above the globe or map.  The vectors will only be visible if the user is below this height.  Off by default.|
+ |kMaplyMinViewerDist|NSNumber|Minimum distance from the viewer at which to display object(s).|
+ |kMaplyMaxViewerDist|NSNumber|Maximum distance from the viewer at which to display object(s).|
+ |kMaplyViewableCenterX|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center X coordinate.|
+ |kMaplyViewableCenterY|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center Y coordinate.|
+ |kMaplyViewableCenterZ|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center Z coordinate.|
+ |kMaplyFade|NSNumber|The number of seconds to fade a vector in when it appears and out when it disappears.|
+ |kMaplyDrawPriority|NSNumber|Geometry is sorted by this value before being drawn.  This ensures that some objects can come out on top of others.  By default this is kMaplyVectorDrawPriorityDefault.|
+ |kMaplyZBufferRead|NSNumber boolean|If set this geometry will respect the z buffer.  It's off by default, meaning that the geometry will draw on top of anything (respecting the kMaplyDrawPriority).|
+ |kMaplyZBufferWrite|NSNumber boolean|If set this geometry will write to the z buffer.  That means following geometry that reads the z buffer will be occluded.  This is off by default.|
+ |kMaplyEnable|NSNumber boolean|On by default, but if off then the feature exists, but is not turned on.  It can be enabled with enableObjects:|
+ |kMaplySelectable|NSNumber boolean|Off by default.  When enabled, the vector feature will be selectable by a user.|
+ |kMaplyUUID|NSString|Unique ID to match up alternate representations of the same element.|
+ |kMaplyRepresentation|NSString|Name of the representation presented by this object.|
+
+ @param threadMode MaplyThreadAny is preferred and will use another thread, thus not blocking the one you're on.  MaplyThreadCurrent will make the changes immediately, blocking this thread.
+ 
+ 
+ @return Returns a MaplyComponentObject, which can be used to make modifications or delete the objects created.
+ */
+- (MaplyComponentObject *__nullable)addVectors:(NSArray *__nonnull)vectors desc:(NSDictionary *__nullable)desc mode:(MaplyThreadMode)threadMode;
+
+/**
+ Make a copy of the base object and apply the attributes given for the new version.
+ 
+ This call makes a cheap copy of the vectors in the given MaplyComponentObject and applies the given description to them.  You can use this to make a wider or thinner version of a set of vectors, or change their color, while continuing to draw the originals.  Or not, as the case may be.
+ 
+ This is useful for vector maps where we tend to reuse the same geometry at multiple levels and with different colors and line widths.
+ 
+ Instancing only works with a handful of visual changes.  For instance, you can't make a filled and non-filled version.
+ 
+ @param baseObj The MaplyComponentObject returned by an addVectors: call.  This only works for vectors.
+ 
+ @param desc The description dictionary with controls how vectors will be displayed.  It takes the following entries.
+ 
+ |Key|Type|Description|
+ |:--|:---|:----------|
+ |kMaplyColor|UIColor|Color we'll use for the vector features.|
+ |kMaplyVecWidth|NSNumber|If the geometry is not filled, this is the width of the GL lines.|
+ |kMaplyMinVis|NSNumber|This is viewer height above the globe or map.  The vectors will only be visible if the user is above this height.  Off by default.|
+ |kMaplyMaxVis|NSNumber|This is viewer height above the globe or map.  The vectors will only be visible if the user is below this height.  Off by default.|
+ |kMaplyMinViewerDist|NSNumber|Minimum distance from the viewer at which to display object(s).|
+ |kMaplyMaxViewerDist|NSNumber|Maximum distance from the viewer at which to display object(s).|
+ |kMaplyViewableCenterX|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center X coordinate.|
+ |kMaplyViewableCenterY|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center Y coordinate.|
+ |kMaplyViewableCenterZ|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center Z coordinate.|
+ |kMaplyDrawPriority|NSNumber|Geometry is sorted by this value before being drawn.  This ensures that some objects can come out on top of others.  By default this is kMaplyVectorDrawPriorityDefault.|
+ |kMaplyEnable|NSNumber boolean|On by default, but if off then the feature exists, but is not turned on.  It can be enabled with enableObjects:|
+ |kMaplyUUID|NSString|Unique ID to match up alternate representations of the same element.|
+ |kMaplyRepresentation|NSString|Name of the representation presented by this object.|
+
+ @param threadMode MaplyThreadAny is preferred and will use another thread, thus not blocking the one you're on.  MaplyThreadCurrent will make the changes immediately, blocking this thread.
+ 
+ 
+ @return Returns a MaplyComponentObject, which can be used to make modifications or delete the objects created.
+ */
+- (MaplyComponentObject *__nullable)instanceVectors:(MaplyComponentObject *__nonnull)baseObj desc:(NSDictionary *__nullable)desc mode:(MaplyThreadMode)threadMode;
+
+/**
+ Add one or more widened vectors to the current scene.
+ 
+ Build widened vectors
+ 
+ 
+ @param desc The description dictionary which controls how vectors will be displayed.  It takes the following entries.
+ 
+ |Key|Type|Description|
+ |:--|:---|:----------|
+ |kMaplyColor|UIColor|Color we'll use for the features.|
+ |kMaplyVecWidth|NSNumber|If the geometry is not filled, this is the width of the lines.|
+ |kMaplyWideVecCoordType|NSNumber|Vectors can be widened in real coordinates (kMaplyWideVecCoordTypeReal) or screen coordinates (kMaplyWideVecCoordTypeScreen).  In the latter case they stay the same size now matter how you zoom.|
+ |kMaplyWideVecJoinType|NSNumber|When lines meet in a join there are several options for representing them.  These include kMaplyWideVecMiterJoin, which is a simple miter join and kMaplyWideVecBevelJoin which is a more complicated bevel.  See http://www.w3.org/TR/SVG/painting.html#StrokeLinejoinProperty for how these look.|
+ |kMaplyWideVecMiterLimit|NSNumber|When using miter joins you can trigger them at a certain threshold.|
+ |kMaplyWideVecTexRepeatLen|NSNumber|This is the repeat size for a texture applied along the widened line.  For kMaplyWideVecCoordTypeScreen this is pixels.|
+ |kMaplyVecTexture|UIImage or MaplyTexture|This the texture to be applied to the widened vector.|
+ |kMaplyMinVis|NSNumber|This is viewer height above the globe or map.  The vectors will only be visible if the user is above this height.  Off by default.|
+ |kMaplyMaxVis|NSNumber|This is viewer height above the globe or map.  The vectors will only be visible if the user is below this height.  Off by default.|
+ |kMaplyMinViewerDist|NSNumber|Minimum distance from the viewer at which to display object(s).|
+ |kMaplyMaxViewerDist|NSNumber|Maximum distance from the viewer at which to display object(s).|
+ |kMaplyViewableCenterX|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center X coordinate.|
+ |kMaplyViewableCenterY|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center Y coordinate.|
+ |kMaplyViewableCenterZ|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center Z coordinate.|
+ |kMaplyDrawPriority|NSNumber|Geometry is sorted by this value before being drawn.  This ensures that some objects can come out on top of others.  By default this is kMaplyVectorDrawPriorityDefault.|
+ |kMaplyEnable|NSNumber boolean|On by default, but if off then the feature exists, but is not turned on.  It can be enabled with enableObjects:|
+ |kMaplyUUID|NSString|Unique ID to match up alternate representations of the same element.|
+ |kMaplyRepresentation|NSString|Name of the representation presented by this object.|
+
+ @param threadMode MaplyThreadAny is preferred and will use another thread, thus not blocking the one you're on.  MaplyThreadCurrent will make the changes immediately, blocking this thread.
+ 
+ 
+ @return Returns a MaplyComponentObject, which can be used to make modifications or delete the objects created.
+ */
+- (MaplyComponentObject *__nullable)addWideVectors:(NSArray *__nonnull)vectors desc:(NSDictionary *__nullable)desc mode:(MaplyThreadMode)threadMode;
+
+/**
+ Add one or more model instances.
+ 
+ Each MaplyGeomInstance points to a MaplyGeomModel.  All those passed in here will be grouped and processed together.
+ 
+ 
+ @param desc The description dictionary which controls how the models are displayed, selected, and so forth.
+ 
+ |Key|Type|Description|
+ |:--|:---|:----------|
+ |kMaplySelectable|NSNumber boolean|Off by default.  When enabled, the vector feature will be selectable by a user.|
+ |kMaplyEnable|NSNumber boolean|On by default, but if off then the feature exists, but is not turned on.  It can be enabled with enableObjects:|
+ |kMaplyUUID|NSString|Unique ID to match up alternate representations of the same element.|
+ |kMaplyRepresentation|NSString|Name of the representation presented by this object.|
+
+ @param threadMode MaplyThreadAny is preferred and will use another thread, thus not blocking the one you're on.  MaplyThreadCurrent will make the changes immediately, blocking this thread.
+ 
+ 
+ @return Returns a MaplyComponentObject, which can be used to make modifications or delete the objects created.
+ */
+- (MaplyComponentObject *__nullable)addModelInstances:(NSArray *__nonnull)modelInstances desc:(NSDictionary *__nullable)desc mode:(MaplyThreadMode)threadMode;
+
+/**
+ Add one or raw geometry models.
+ 
+ Each MaplyGeometryModel holds points and triangles in display space.  These are relatively "raw" geometry and are passed to the geometry manager as is.
+ 
+ 
+ @param desc The description dictionary which controls how the geometry is displayed, selected, and so forth.
+ 
+ |Key|Type|Description|
+ |:--|:---|:----------|
+ |kMaplySelectable|NSNumber boolean|Off by default.  When enabled, the vector feature will be selectable by a user.|
+ |kMaplyEnable|NSNumber boolean|On by default, but if off then the feature exists, but is not turned on.  It can be enabled with enableObjects:|
+ |kMaplyUUID|NSString|Unique ID to match up alternate representations of the same element.|
+ |kMaplyRepresentation|NSString|Name of the representation presented by this object.|
+
+ @param threadMode MaplyThreadAny is preferred and will use another thread, thus not blocking the one you're on.  MaplyThreadCurrent will make the changes immediately, blocking this thread.
+ 
+ 
+ @return Returns a MaplyComponentObject, which can be used to make modifications or delete the objects created.
+ */
+- (MaplyComponentObject *__nullable)addGeometry:(NSArray *__nonnull)geom desc:(NSDictionary *__nullable)desc mode:(MaplyThreadMode)threadMode;
+
+/**
+ Add one or more MaplyShape children to the current scene.
+ 
+ This method will add the given MaplyShape derived objects to the current scene.  It will use the parameters in the description dictionary and it will do it on the thread specified.
+ 
+ @param shapes An NSArray of MaplyShape derived objects.
+ 
+ @param desc The desciption dictionary which controls how the shapes will look.  It takes the following entries.
+ 
+ |Key|Type|Description|
+ |:--|:---|:----------|
+ |kMaplyColor|UIColor|Color we'll use for the shape features.|
+ |kMaplyShapeSampleX|NSNumber|Number of samples to use in one direction when converting to polygons.|
+ |kMaplyShapeSampleY|NSNumber|Number of samples to use in the other direction when converting to polygons.|
+ |kMaplyShapeInsideOut|NSNumber boolean|If set to YES, we'll make the spheres inside out and such.  Set to NO by default.|
+ |kMaplyMinVis|NSNumber|This is viewer height above the globe or map.  The shapes will only be visible if the user is above this height.  Off by default.|
+ |kMaplyMaxVis|NSNumber|This is viewer height above the globe or map.  The shapes will only be visible if the user is below this height.  Off by default.|
+ |kMaplyMinViewerDist|NSNumber|Minimum distance from the viewer at which to display object(s).|
+ |kMaplyMaxViewerDist|NSNumber|Maximum distance from the viewer at which to display object(s).|
+ |kMaplyViewableCenterX|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center X coordinate.|
+ |kMaplyViewableCenterY|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center Y coordinate.|
+ |kMaplyViewableCenterZ|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center Z coordinate.|
+ |kMaplyFade|NSNumber|The number of seconds to fade a shape in when it appears and out when it disappears.|
+ |kMaplyDrawPriority|NSNumber|Geometry is sorted by this value before being drawn.  This ensures that some objects can come out on top of others.  By default this is kMaplyVectorShapePriorityDefault.|
+ |kMaplyZBufferRead|NSNumber boolean|If set this geometry will respect the z buffer.  It's on by default, meaning that the geometry can be occluded by things drawn first.|
+ |kMaplyZBufferWrite|NSNumber boolean|If set this geometry will write to the z buffer.  That means following geometry that reads the z buffer will be occluded.  This is off by default.|
+ |kMaplyEnable|NSNumber boolean|On by default, but if off then the feature exists, but is not turned on.  It can be enabled with enableObjects:|
+ |kMaplyUUID|NSString|Unique ID to match up alternate representations of the same element.|
+ |kMaplyRepresentation|NSString|Name of the representation presented by this object.|
+
+ @param threadMode MaplyThreadAny is preferred and will use another thread, thus not blocking the one you're on.  MaplyThreadCurrent will make the changes immediately, blocking this thread.
+ 
+ 
+ @return Returns a MaplyComponentObject, which can be used to make modifications or delete the objects created.
+ */
+- (MaplyComponentObject *__nullable)addShapes:(NSArray *__nonnull)shapes desc:(NSDictionary *__nullable)desc mode:(MaplyThreadMode)threadMode;
+
+/**
+ Add one or more MaplySticker objects to the current scene.
+ 
+ This method will add the given MaplySticker objects to the current scene.  It will use the parameters in the description dictionary and it will do it on the thread specified.
+ 
+ @param stickers An NSArray of MaplySticker derived objects.
+ 
+ @param desc The desciption dictionary which controls how the stickers will look.  It takes the following entries.
+ 
+ |Key|Type|Description|
+ |:--|:---|:----------|
+ |kMaplyColor|UIColor|Color we'll use for the stickers.|
+ |kMaplyMinVis|NSNumber|This is viewer height above the globe or map.  The stickers will only be visible if the user is above this height.  Off by default.|
+ |kMaplyMaxVis|NSNumber|This is viewer height above the globe or map.  The stickers will only be visible if the user is below this height.  Off by default.|
+ |kMaplyMinViewerDist|NSNumber|Minimum distance from the viewer at which to display object(s).|
+ |kMaplyMaxViewerDist|NSNumber|Maximum distance from the viewer at which to display object(s).|
+ |kMaplyViewableCenterX|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center X coordinate.|
+ |kMaplyViewableCenterY|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center Y coordinate.|
+ |kMaplyViewableCenterZ|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center Z coordinate.|
+ |kMaplyFade|NSNumber|The number of seconds to fade a sticker in when it appears and out when it disappears.|
+ |kMaplySampleX|NSNumber|Stickers are broken up along two dimensions to adhere to the globe.  By default this is done adaptively.  If you want to override it, this is the X dimension for the sticker.|
+ |kMaplySampleY|NSNumber|If you want to override it, this is the Y dimension for the sticker.|
+ |kMaplyDrawPriority|NSNumber|Geometry is sorted by this value before being drawn.  This ensures that some objects can come out on top of others.  By default this is kMaplyVectorShapePriorityDefault.|
+ |kMaplyZBufferRead|NSNumber boolean|If set this geometry will respect the z buffer.  It's off by default, meaning that it will draw on top of things before it..|
+ |kMaplyZBufferWrite|NSNumber boolean|If set this geometry will write to the z buffer.  That means following geometry that reads the z buffer will be occluded.  This is off by default.|
+ |kMaplyEnable|NSNumber boolean|On by default, but if off then the feature exists, but is not turned on.  It can be enabled with enableObjects:|
+ |kMaplyShader|NSString|If set, this is the name of the MaplyShader to use when rendering the sticker(s).|
+ |kMaplyUUID|NSString|Unique ID to match up alternate representations of the same element.|
+ |kMaplyRepresentation|NSString|Name of the representation presented by this object.|
+
+ @param threadMode MaplyThreadAny is preferred and will use another thread, thus not blocking the one you're on.  MaplyThreadCurrent will make the changes immediately, blocking this thread.
+ 
+ 
+ @return Returns a MaplyComponentObject, which can be used to make modifications or delete the objects created.
+ */
+- (MaplyComponentObject *__nullable)addStickers:(NSArray *__nonnull)stickers desc:(NSDictionary *__nullable)desc mode:(MaplyThreadMode)threadMode;
+
+/**
+ Modify an existing sticker.  This only supports changing the active textures.
+ 
+ This method will change attributes of a sticker that's currently in use.  At present that's just the images it's displaying.
+ 
+ @param compObj The component object representing one or more existing stickers.
+ 
+ @param desc The description dictionary for changes we're making to the sticker.
+ 
+ |Key|Type|Description|
+ |:--|:---|:----------|
+ |kMaplyStickerImages|NSARray|The array of images to apply to the sticker.  You can reuse old ones or introduce new ones.|
+ */
+- (void)changeSticker:(MaplyComponentObject *__nonnull)compObj desc:(NSDictionary *__nullable)desc mode:(MaplyThreadMode)threadMode;
+
+/**
+ Add one or more MaplyBillboard objects to the current scene.
+ 
+ This method will add the given MaplyBillboard objects to the current scene.  It will use the parameters in the description dictionary and it will do it on the thread specified.
+ 
+ @param billboards An NSArray of MaplyBillboard objects.
+ 
+ @param desc The description dictionary that controls how the billboards will look.  It takes the following entries.
+ 
+ |Key|Type|Description|
+ |:--|:---|:----------|
+ |kMaplyColor|UIColor|Color we'll use for the billboards.|
+ |kMaplyMinVis|NSNumber|This is viewer height above the globe or map.  The billboards will only be visible if the user is above this height.  Off by default.|
+ |kMaplyMaxVis|NSNumber|This is viewer height above the globe or map.  The billboards will only be visible if the user is below this height.  Off by default.|
+ |kMaplyMinViewerDist|NSNumber|Minimum distance from the viewer at which to display object(s).|
+ |kMaplyMaxViewerDist|NSNumber|Maximum distance from the viewer at which to display object(s).|
+ |kMaplyViewableCenterX|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center X coordinate.|
+ |kMaplyViewableCenterY|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center Y coordinate.|
+ |kMaplyViewableCenterZ|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center Z coordinate.|
+ |kMaplyDrawPriority|NSNumber|Geometry is sorted by this value before being drawn.  This ensures that some objects can come out on top of others.  By default this is kMaplyBillboardDrawPriorityDefault.|
+ |kMaplyBillboardOrient|NSNumber|Controls the billboard orientation.  It's either directly toward the eye with kMaplyBillboardOrientEye or takes the ground into account with kMaplyBillboardOrientGround.  Ground is the default.
+ 
+ 
+ @param threadMode MaplyThreadAny is preferred and will use another thread, thus not blocking the one you're on.  MaplyThreadCurrent will make the changes immediately, blocking this thread.
+ */
+- (MaplyComponentObject *__nullable)addBillboards:(NSArray *__nonnull)billboards desc:(NSDictionary *__nullable)desc mode:(MaplyThreadMode)threadMode;
+
+/**
+    Add a particle system to the scene.
+    
+    This adds a particle system to the scene, but does not kick off any particles.
+    
+    @param partSys The particle system to start.
+    
+    @param desc Any additional standard parameters (none at present).
+    
+    @param threadMode MaplyThreadAny will use another thread, thus not blocking the one you're on.  MaplyThreadCurrent will make the changes immediately, blocking this thread.  For particles, it's best to make a separate thread and use MaplyThreadCurrent.
+  */
+- (MaplyComponentObject *__nullable)addParticleSystem:(MaplyParticleSystem *__nonnull)partSys desc:(NSDictionary *__nullable)desc mode:(MaplyThreadMode)threadMode;
+
+/**
+    Change the render target for a particle system.
+
+    This changes the render target for an existing particle system that's already been created.
+    Can pass in nil, which means the particles are rendered to the screen directly.
+    This change takes place immediately, so call it on the main thread.
+ */
+- (void)changeParticleSystem:(MaplyComponentObject *__nonnull)compObj renderTarget:(MaplyRenderTarget *__nullable)target;
+
+/**
+    Add a batch of particles to the current scene.
+    
+    Particles are short term objects, typically very small.  We create them in large groups for efficience.
+    
+    You'll need to fill out the MaplyParticleSystem initially and then the MaplyParticleBatch to create them.
+    
+    @param batch The batch of particles to add to an active particle system.
+    
+    @param threadMode MaplyThreadAny will use another thread, thus not blocking the one you're on.  MaplyThreadCurrent will make the changes immediately, blocking this thread.  For particles, it's best to make a separate thread and use MaplyThreadCurrent.
+  */
+- (void)addParticleBatch:(MaplyParticleBatch *__nonnull)batch mode:(MaplyThreadMode)threadMode;
+
+/**
+ Change the representation of the given vector features.
+ 
+ This will change how any vector features represented by the compObj look.
+ 
+ You can change kMaplyColor, kMaplyMinVis, kMaplyMaxVis, and kMaplyDrawPriority.
+ 
+ This version takes a thread mode.
+ */
+- (void)changeVector:(MaplyComponentObject *__nonnull)compObj desc:(NSDictionary *__nullable)desc mode:(MaplyThreadMode)threadMode;
+
+/**
+ Adds the MaplyVectorObject's passed in as lofted polygons.
+ 
+ Lofted polygons are filled polygons draped on top of the globe with height.  By using a transparent color, these can be used to represent selection or relative values on the globe (or map).
+ 
+ 
+ @param polys An NSArray of MaplyVectorObject.
+  
+ @param desc The desciption dictionary which controls how the lofted polys will look.  It takes the following entries.
+ 
+ @param threadMode For MaplyThreadAny we'll do the add on another thread.  For MaplyThreadCurrent we'll block the current thread to finish the add.  MaplyThreadAny is preferred.
+ 
+ |Key|Type|Description|
+ |:--|:---|:----------|
+ |kMaplyColor|UIColor|Color we'll use for the lofted polygons.  A bit of alpha looks good.|
+ |kMaplyLoftedPolyHeight|NSNumber|Height of the top of the lofted polygon in display units.  For the globe display units are based on a radius of 1.0.|
+ |kMaplyLoftedPolyBase|NSNumber|If present, we'll start the lofted poly at this height.  The height is in globe units, based on a radius of 1.0.|
+ |kMaplyLoftedPolyTop|NSNumber boolean|If on we'll create the geometry for the top.  On by default.|
+ |kMaplyLoftedPolySide|NSNumber boolean|If on we'll create geometry for the sides.  On by default.|
+ |kMaplyLoftedPolyGridSize|NSNumber|The size of the grid (in degrees) we'll use to chop up the vector features to make them follow the sphere (for a globe).|
+ |kMaplyLoftedPolyOutline|NSNumber boolean|If set to @(YES) this will draw an outline around the top of the lofted poly in lines.|
+ |kMaplyLoftedPolyOutlineBottom|NSNumber boolean|If set to @(YES) this will draw an outline around the bottom of the lofted poly in lines.|
+ |kMaplyLoftedPolyOutlineColor|UIColor|If the outline is one this is the outline's color.|
+ |kMaplyLoftedPolyOutlineWidth|NSNumber|This is the outline's width if it's turned on.|
+ |kMaplyLoftedPolyOutlineDrawPriority|NSNumber|Draw priority of the lines created for the lofted poly outline.|
+ |kMaplyLoftedPolyOutlineSide|NSNumber boolean|If set and we're drawing an outline, this will create lines up the sides.|
+ |kMaplyMinVis|NSNumber|This is viewer height above the globe or map.  The lofted polys will only be visible if the user is above this height.  Off by default.|
+ |kMaplyMaxVis|NSNumber|This is viewer height above the globe or map.  The lofted polys will only be visible if the user is below this height.  Off by default.|
+ |kMaplyMinViewerDist|NSNumber|Minimum distance from the viewer at which to display object(s).|
+ |kMaplyMaxViewerDist|NSNumber|Maximum distance from the viewer at which to display object(s).|
+ |kMaplyViewableCenterX|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center X coordinate.|
+ |kMaplyViewableCenterY|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center Y coordinate.|
+ |kMaplyViewableCenterZ|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center Z coordinate.|
+ |kMaplyFade|NSNumber|The number of seconds to fade a lofted poly in when it appears and out when it disappears.|
+ |kMaplyDrawPriority|NSNumber|Geometry is sorted by this value before being drawn.  This ensures that some objects can come out on top of others.  By default this is kMaplyLoftedPolysShapePriorityDefault.|
+ |kMaplyZBufferRead|NSNumber boolean|If set this geometry will respect the z buffer.  It's on by default, meaning that it can be occluded by geometry coming before it.|
+ |kMaplyZBufferWrite|NSNumber boolean|If set this geometry will write to the z buffer.  That means following geometry that reads the z buffer will be occluded.  This is off by default.|
+ |kMaplyEnable|NSNumber boolean|On by default, but if off then the feature exists, but is not turned on.  It can be enabled with enableObjects:|
+ |kMaplyUUID|NSString|Unique ID to match up alternate representations of the same element.|
+ |kMaplyRepresentation|NSString|Name of the representation presented by this object.|
+
+ @return Returns a MaplyComponentObject, which can be used to make modifications or delete the objects created.
+ */
+- (MaplyComponentObject *__nullable)addLoftedPolys:(NSArray *__nonnull)polys desc:(NSDictionary *__nullable)desc mode:(MaplyThreadMode)threadMode;
+
+/**
+ Add a group of points to the display.
+ 
+ Adds a group of points all at once.  We're assuming you want to draw a lot of points, so you have to group them together into a MaplyPoints.
+ 
+ 
+ @param points The points to add to the scene.
+ 
+ @param desc The desciption dictionary which controls how the points will look.  It takes the following entries.
+ 
+ @param threadMode For MaplyThreadAny we'll do the add on another thread.  For MaplyThreadCurrent we'll block the current thread to finish the add.  MaplyThreadAny is preferred.
+ 
+ |Key|Type|Description|
+ |:--|:---|:----------|
+ |kMaplyColor|UIColor|Color we'll use for the lofted polygons.  A bit of alpha looks good.|
+ |kMaplyMinVis|NSNumber|This is viewer height above the globe or map.  The lofted polys will only be visible if the user is above this height.  Off by default.|
+ |kMaplyMaxVis|NSNumber|This is viewer height above the globe or map.  The lofted polys will only be visible if the user is below this height.  Off by default.|
+ |kMaplyMinViewerDist|NSNumber|Minimum distance from the viewer at which to display object(s).|
+ |kMaplyMaxViewerDist|NSNumber|Maximum distance from the viewer at which to display object(s).|
+ |kMaplyViewableCenterX|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center X coordinate.|
+ |kMaplyViewableCenterY|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center Y coordinate.|
+ |kMaplyViewableCenterZ|MaplyCoordinate3dWrapper|When evaulating min/max viewer distance, we'll use this center Z coordinate.|
+ |kMaplyFade|NSNumber|The number of seconds to fade a lofted poly in when it appears and out when it disappears.|
+ |kMaplyDrawPriority|NSNumber|Geometry is sorted by this value before being drawn.  This ensures that some objects can come out on top of others.  By default this is kMaplyLoftedPolysShapePriorityDefault.|
+ |kMaplyZBufferRead|NSNumber boolean|If set this geometry will respect the z buffer.  It's on by default, meaning that it can be occluded by geometry coming before it.|
+ |kMaplyZBufferWrite|NSNumber boolean|If set this geometry will write to the z buffer.  That means following geometry that reads the z buffer will be occluded.  This is off by default.|
+ |kMaplyEnable|NSNumber boolean|On by default, but if off then the feature exists, but is not turned on.  It can be enabled with enableObjects:|
+ |kMaplyUUID|NSString|Unique ID to match up alternate representations of the same element.|
+ |kMaplyRepresentation|NSString|Name of the representation presented by this object.|
+
+ @return Returns a MaplyComponentObject, which can be used to make modifications or delete the objects created.
+ */
+- (MaplyComponentObject *__nullable)addPoints:(NSArray * __nonnull)points desc:(NSDictionary *__nullable)desc mode:(MaplyThreadMode)threadMode;
+
+/**
+ Represent an image as a MaplyTexture.
+ 
+ This version of addTexture: allows more precise control over how the texture is represented.  It replaces the other addTexture: and addTextureToAtlas calls.
+ 
+ @param image The UIImage to add as a texture.
+ 
+ @param desc A description dictionary controlling how the image is converted to a texture and represented in the system.
+ 
+ |Key|Type|Description|
+ |:--|:---|:----------|
+ |kMaplyTexFormat|NSNumber|The texture format to use for the image.  Consult addTexture:imageFormat:wrapFlags:mode: for a list.  Default is MaplyImageIntRGBA.|
+ |kMaplyTexMinFilter|NSNumber|Filter to use for minification.  This can be kMaplyMinFilterNearest or kMaplyMinFilterLinear. Default is kMaplyMinFilterLinear.|
+ |kMaplyTexMagFilter|NSNumber|Filter to use for magnification.  This can be kMaplyMinFilterNearest or kMaplyMinFilterLinear. Default is kMaplyMinFilterLinear.|
+ |kMaplyTexWrapX|NSNumber boolean|Texture wraps in x direction.  Off by default.|
+ |kMaplyTexWrapY|NSNumber boolean|Texture wraps in y direction.  Off by default.|
+ |kMaplyTexAtlas|NSNumber boolean|If set, the texture goes into an appropriate atlas.  If not set, it's a standalone texture (default).|
+ 
+ @param threadMode For MaplyThreadAny we'll do the add on another thread.  For MaplyThreadCurrent we'll block the current thread to finish the add.  MaplyThreadAny is preferred.
+ */
+- (MaplyTexture *__nullable)addTexture:(UIImage *__nonnull)image desc:(NSDictionary *__nullable)desc mode:(MaplyThreadMode)threadMode;
+
+/**
+ Create an empty texture and return it.
+ 
+ Empty textures are used for offscreen rendering and other crazy stuff.  You probably don't want to do this.
+ 
+ @param spec The description dictionary controlling the format and other textures goodies.
+ 
+ |Key|Type|Description|
+ |:--|:---|:----------|
+ |kMaplyTexFormat|NSNumber|The texture format to use for the image.  Consult addTexture:imageFormat:wrapFlags:mode: for a list.  Default is MaplyImageIntRGBA.|
+ |kMaplyTexMinFilter|NSNumber|Filter to use for minification.  This can be kMaplyMinFilterNearest or kMaplyMinFilterLinear. Default is kMaplyMinFilterLinear.|
+ |kMaplyTexMagFilter|NSNumber|Filter to use for magnification.  This can be kMaplyMinFilterNearest or kMaplyMinFilterLinear. Default is kMaplyMinFilterLinear.|
+ |kMaplyTexWrapX|NSNumber boolean|Texture wraps in x direction.  Off by default.|
+ |kMaplyTexWrapY|NSNumber boolean|Texture wraps in y direction.  Off by default.|
+ |kMaplyTexAtlas|NSNumber boolean|If set, the texture goes into an appropriate atlas.  If not set, it's a standalone texture (default).|
+ |kMaplyTexMipmap|NSNumber boolean|If set, we'll create the given texture with mipmap levels.|
+ 
+ @param sizeX The horizontal size of the textures (in pixels).
+ 
+ @param sizeY Vertical size of the texture (in pixels).
+ */
+- (MaplyTexture *__nullable)createTexture:(NSDictionary * _Nullable)spec sizeX:(int)sizeX sizeY:(int)sizeY mode:(MaplyThreadMode)threadMode;
+
+/**
+ Creates a new texture that references part of an existing texture.
+ 
+ @param x Horizontal offset within the existing texture.
+ @param y Vertical offset within the existing texture.
+ @param width Width of the chunk to make a new texture.
+ @param height Height of the chunk to make a new texture.
+ @param threadMode For MaplyThreadAny we'll do the add on another thread.  For MaplyThreadCurrent we'll block the current thread to finish the add.  MaplyThreadAny is preferred if you're on the main thread.
+ */
+- (MaplyTexture *__nullable)addSubTexture:(MaplyTexture *__nonnull)tex xOffset:(int)x yOffset:(int)y width:(int)width height:(int)height mode:(MaplyThreadMode)threadMode;
+
+/**
+ Remove the OpenGL ES textures associated with the given MaplyTextures.
+ 
+ MaplyTextures will remove their associated OpenGL textures when they go out of scope.  This method does it expicitly and clears out the internals of the MaplyTexture.
+ 
+ Only call this if you're managing the texture explicitly and know you're finished with them.
+ */
+- (void)removeTextures:(NSArray *__nonnull)texture mode:(MaplyThreadMode)threadMode;
+
+/**
+ Add a render target to the system
+ 
+ Sets up a render target and will start rendering to it on the next frame.
+ 
+ Keep the render target around so you can remove it later.
+ */
+- (void)addRenderTarget:(MaplyRenderTarget * _Nonnull)renderTarget;
+
+/**
+ Set the texture a given render target is writing to.
+ 
+ Render targets start out with one, but you may wish to change it.
+ */
+- (void)changeRenderTarget:(MaplyRenderTarget * __nonnull)renderTarget tex:(MaplyTexture * __nullable)tex;
+
+/**
+ Remove the given render target from the system.
+ 
+ Ask the system to stop drawing to the given render target.  It will do this on the next frame.
+ */
+- (void)removeRenderTarget:(MaplyRenderTarget * _Nonnull)renderTarget;
+
+/**
+    Set up the the mask render target.  We use it to keep one set of features from render on top of another set.
+ */
+- (void)startMaskTarget:(NSNumber * __nullable)scale;
+
+/**
+    Turn off the render target for masks.
+ */
+- (void)stopMaskTarget;
+
+/**
+    Normally the layout layer runs periodically if you change something or when you move around.
+    You can ask it to run ASAP right here.  Layout runs on its own thread, so there may still be a delay.
+ */
+- (void)runLayout;
+
+/**
+  Request a one time clear for the render target.
+
+  Rather than clearing every frame, you may want to specifically request a clear.  This will
+  be executed at the next frame and then not again.
+*/
+- (void)clearRenderTarget:(MaplyRenderTarget * _Nonnull)renderTarget mode:(MaplyThreadMode)threadMode;
+
+/**
+ Remove all information associated with the given MaplyComponentObject's.
+ 
+ Every add call returns a MaplyComponentObject.  This will remove any visible features, textures, selection data, or anything else associated with it.
+ 
+ @param theObjs The MaplyComponentObject's we wish to remove.
+ 
+ @param threadMode For MaplyThreadAny we'll do the removal on another thread.  For MaplyThreadCurrent we'll block the current thread to finish the removal.  MaplyThreadAny is preferred.
+ */
+- (void)removeObjects:(NSArray *__nonnull)theObjs mode:(MaplyThreadMode)threadMode;
+
+/**
+ Disable a group of MaplyComponentObject's all at once.
+ 
+ By default all of the geometry created for a given object will appear.  If you set kMaplyEnable to @(NO) then it will exist, but not appear.  This has the effect of setting kMaplyEnable to @(NO).
+ 
+ @param theObjs The objects to disable.
+ 
+ @param threadMode For MaplyThreadAny we'll do the disable on another thread.  For MaplyThreadCurrent we'll block the current thread to finish the disable.  MaplyThreadAny is preferred.
+ */
+- (void)disableObjects:(NSArray *__nonnull)theObjs mode:(MaplyThreadMode)threadMode;
+
+/**
+ Enable a group of MaplyComponentObject's all at once.
+ 
+ By default all of the geometry created for a given object will appear.  If you set kMaplyEnable to @(NO) then it will exist, but not appear.  This has the effect of setting kMaplyEnable to @(YES).
+ 
+ @param theObjs The objects to enable.
+ 
+ @param threadMode For MaplyThreadAny we'll do the enable on another thread.  For MaplyThreadCurrent we'll block the current thread to finish the enable.  MaplyThreadAny is preferred.
+ */
+- (void)enableObjects:(NSArray *__nonnull)theObjs mode:(MaplyThreadMode)threadMode;
+
+/**
+    Set the representation to use for one or more UUIDs
+ 
+    @param uuids Array of NSString UUIDs to update
+    @param repName The representation name to apply, nil to return to the default
+    @param threadMode For MaplyThreadAny we'll do the enable on another thread.  For MaplyThreadCurrent we'll block the current thread to finish the enable.  MaplyThreadAny is preferred.
+ */
+- (void)setRepresentation:(NSString *__nullable)repName
+                  ofUUIDs:(NSArray<NSString *> *__nonnull)uuids
+                     mode:(MaplyThreadMode)threadMode;
+
+/**
+    Set the representation to use for one or more UUIDs
+ 
+    @param uuids Array of NSString UUIDs to update
+    @param repName The representation name to apply, nil to return to the default
+    @param fallbackRepName The representation to use of no item with `repName` exists.
+    @param threadMode For MaplyThreadAny we'll do the enable on another thread.  For MaplyThreadCurrent we'll block the current thread to finish the enable.  MaplyThreadAny is preferred.
+ */
+- (void)setRepresentation:(NSString *__nullable)repName
+          fallbackRepName:(NSString *__nullable)fallbackRepName
+                  ofUUIDs:(NSArray<NSString *> *__nonnull)uuids
+                     mode:(MaplyThreadMode)threadMode;
+
+/**
+ Pass a uniform block through to a shader.  Only for Metal.
+ 
+ Custom Metal shaders may have their own uniform blocks associated with a known bufferID.
+ This is how you pass those through for objects you've already created.
+ Useful for things like custom animation.
+ */
+- (void)setUniformBlock:(NSData *__nonnull)uniBlock buffer:(int)bufferID forObjects:(NSArray<MaplyComponentObject *> *__nonnull)compObjs mode:(MaplyThreadMode)threadMode;
+
+/**
+ Call this to start journaling changes for this thread.
+ 
+ Your can collect up your add/remove/enable changes on the current thread.  Call startChanges to start collecting and endChanges to flush the changes.
+ 
+ This has no real meaning on the main thread and don't collect too many changes.  They take memory.
+ */
+- (void)startChanges;
+
+/**
+ Call this to flush your journal changes out ot the scene.
+ 
+ This is the other end of startChanges.
+ */
+- (void)endChanges;
+
+/**
+ Add a compiled shader.  We'll refer to it by the scene name.
+ 
+ Once you've create a MaplyShader, you'll need to add it to the scene to use it.
+ 
+ @param shader The working shader (be sure valid is true) to add to the scene.
+ */
+- (void)addShaderProgram:(MaplyShader *__nonnull)shader;
+
+/**
+ Look for a shader with the given name.
+ 
+ This is the shader's own name as specified in the init call, not the scene name as might be specified in addShaderProgram:sceneName:
+ 
+ @return Returns the registered shader if it found one.
+ */
+- (MaplyShader *__nullable)getShaderByName:(NSString *__nonnull)name;
+
+/**
+ Remove a shader that was added earlier.
+ */
+- (void)removeShaderProgram:(MaplyShader *__nonnull)shader;
+
+/**
+ Return the coordinate system being used for the display.
+ 
+ This returns the local coordinate system, which is used to unroll the earth (for the globe) or via a scaling factor (for the flat map).
+ */
+- (MaplyCoordinateSystem *__nullable)coordSystem;
+
+- (void)setClearColor:(UIColor *__nonnull)clearColor;
+
+/// Return the framebuffer size in pixels (no scale)
+- (CGSize)getFramebufferSize;
+
+// For internal use only
+- (MaplyRenderController * __nullable)getRenderControl;
+
+/// Return the renderer type being used
+- (MaplyRenderType)getRenderType;
+
+/**
+    Add the given active object to the scene.
+    
+    Active objects are used for immediate, frame based updates.  They're fairly expensive, so be careful.  After you create one, you add it to the scene here.
+  */
+- (void)addActiveObject:(MaplyActiveObject *__nonnull)theObj;
+
+/// Remove an active object from the scene.
+- (void)removeActiveObject:(MaplyActiveObject *__nonnull)theObj;
+
+/// Remove an array of active objects from the scene
+- (void)removeActiveObjects:(NSArray *__nonnull)theObjs;
+
+/**
+    Add a MaplyControllerLayer to the globe or map.
+    
+    At present, layers are for paged geometry such as image tiles or vector tiles.  You can create someting like a MaplyQuadImageTilesLayer, set it up and then hand it to addLayer: to add to the scene.
+  */
+- (bool)addLayer:(MaplyControllerLayer *__nonnull)layer;
+
+/// Remove a MaplyControllerLayer from the globe or map.
+- (void)removeLayer:(MaplyControllerLayer *__nonnull)layer;
+
+/// Remove zero or more MaplyControllerLayer objects from the globe or map.
+- (void)removeLayers:(NSArray *__nonnull)layers;
+
+/// Remove all the user created MaplyControllerLayer objects from the globe or map.
+- (void)removeAllLayers;
+
+/// Return a tile fetcher we may share between loaders
+- (MaplyRemoteTileFetcher * __nullable)addTileFetcher:(NSString * __nonnull)name;
+
+/**
+    If in Metal rendering mode, return the Metal device being used.
+  */
+- (id<MTLDevice> __nullable)getMetalDevice;
+
+/**
+   If in Metal rendering mode, return the shader library set up by the toolkit.
+  */
+- (id<MTLLibrary> __nullable)getMetalLibrary;
+
+/**
+ An explicit teardown.  For render controllers you allocate standalone, this is a good idea.
+ */
+- (void)teardown;
+
+@end
+
+/**
+ The Render Controller is a standalone WhirlyGlobe-Maply renderer.
+ 
+ This Render Controller is used for offline rendering.
+ */
+@interface MaplyRenderController : NSObject<MaplyRenderControllerProtocol>
+
+/// Initialize as an offline renderer of a given target size of the given rendering type
+- (instancetype __nullable)initWithSize:(CGSize)size mode:(MaplyRenderType)renderType;
+
+/// Initialize as an offline renderer of a given target size with default renderer (Metal)
+- (instancetype __nullable)initWithSize:(CGSize)size;
+
+/// If set up in offline mode, this is how we draw
+- (UIImage * __nullable)renderToImage;
+
+/// Return the raw RGBA pixels from the rendered image rather than a UIImage
+- (NSData * __nullable)renderToImageData;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyRenderTarget.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyRenderTarget.h
new file mode 100644
index 0000000..82b283f
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyRenderTarget.h
@@ -0,0 +1,119 @@
+/*
+ *  MaplyRenderTarget.h
+ *  WhirlyGlobe-MaplyComponent
+ *
+ *  Created by Steve Gifford on 1/13/17.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <UIKit/UIKit.h>
+#import <WhirlyGlobeMaplyComponent/MaplyTexture.h>
+
+typedef NS_ENUM(NSUInteger,MaplyMipmapType) {
+    /// Don't generate a mipmap
+    MaplyMipmapNone,
+    /// Generate a basic mipmap
+    MaplyMipmapAverage,
+    /// Generate a mipmap using Gauss blurring
+    MaplyMipmapGauss
+};
+
+/** 
+    Represents a render target (other than the screen)
+    
+    Individual objects can ask to be drawn somewhere other than the screen.
+    This is how we do that.
+    
+    A render target is just a link between a render every frame and a MaplyTexture.  To get at the actual image you use the MaplyTexture.
+    
+    At the moment a render target can only draw the full screen, possibly at a lower resolution.
+  */
+@interface MaplyRenderTarget : NSObject
+
+/** 
+    The texture we'll draw into.
+    
+    This is the texture we'll draw into.  Use createTexture to set it up.
+  */
+@property (nonatomic,strong) MaplyTexture *texture;
+
+/**
+    If set, we'll clear the target textures every frame before rendering to it.
+ 
+    If not set, we won't clear the render target texture between frames.
+ 
+    True by default.
+  */
+@property (nonatomic) bool clearEveryFrame;
+
+/**
+    If we're generating a mipmap for the attached texture of a render target, this controls
+        how we do it. The default is none.
+ */
+@property (nonatomic) MaplyMipmapType mipmapType;
+
+/**
+ If set, we'll caclulate the min/max for this render target every frame.
+    This is a GPU based calculation for Metal.
+ */
+@property (nonatomic) bool calculateMinMax;
+
+/**
+    Clear the render target to this color every frame.
+ 
+    Default is clear black.
+  */
+@property (nonatomic,strong) UIColor *clearColor;
+
+
+/**
+    Clear the render target to this value on every frame.
+ 
+    This is for render targets that are not purely color, such as multiple floats.
+  */
+@property (nonatomic,assign) float clearVal;
+
+/**
+    If set, anything rendered to this render target will blend with what's there.
+ 
+    If not set, what's rendered will replace what was there before.
+    This is the way it normally works for screen rendering.
+
+    Set to false by default.
+  */
+@property (nonatomic) bool blend;
+
+/**
+ Retrieves a single data value out of the render target.  Size is the number of components * size of components.
+ It's best to call this in the snapshot callback.  We know the destination isn't being written to at the moment.
+  Metal only.
+ */
+- (NSData *)getValueAtX:(int)x y:(int)y;
+
+/**
+  Returns the whole render target snapshot in the NSData.
+ It's best to call this in the snapshot callback.  We know the destination isn't being written to at the moment.
+ Metal only.
+ */
+- (NSData *)getSnapshot;
+
+/**
+  Retreives the min/max data values if those are being calculated.
+   It's best to call this in the snapshot callback.  We know the destination isn't being written to at the moment.
+ Metal only.
+ */
+- (NSData *)getMinMaxValues;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyRotateDelegate.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyRotateDelegate.h
new file mode 100644
index 0000000..2cb073b
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyRotateDelegate.h
@@ -0,0 +1,29 @@
+/*  MaplyRotateDelegate.h
+ *  WhirlyGlobeLib
+ *
+ *  Created by rghosh0 around 9/26/13.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#import <UIKit/UIKit.h>
+
+@interface MaplyRotateDelegate : NSObject <UIGestureRecognizerDelegate>
+
+//The gesture recognizer
+@property (nonatomic,retain) UIGestureRecognizer* gestureRecognizer;
+
+/// The minimum angle (degrees) that must be subtended before rotation begins
+@property(nonatomic,assign) float rotateThreshold;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyScreenLabel.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyScreenLabel.h
new file mode 100644
index 0000000..3893d2f
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyScreenLabel.h
@@ -0,0 +1,187 @@
+/*
+ *  WGScreenLabel.h
+ *  WhirlyGlobeComponent
+ *
+ *  Created by Steve Gifford on 7/24/12.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <UIKit/UIKit.h>
+#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
+
+@class MaplyVectorObject;
+
+/// Don't move the label at all
+#define kMaplyLayoutNone (1<<0)
+/// Okay to place centered on point
+#define kMaplyLayoutCenter  (1<<1)
+/// Okay to place to the right of a point
+#define kMaplyLayoutRight  (1<<2)
+/// Okay to place it to the left of a point
+#define kMaplyLayoutLeft   (1<<3)
+/// Okay to place on top of a point
+#define kMaplyLayoutAbove  (1<<4)
+/// Okay to place below a point
+#define kMaplyLayoutBelow  (1<<5)
+
+/** 
+    The Screen Label is a 2D label that tracks a given geographic location.
+    
+    This screen label will track the given geographic position.  If it's behind the globe it will disappear.  The label is rendered in a fixed size and will always appear on top of other geometry.
+  */
+@interface MaplyScreenLabel : NSObject
+
+/** 
+    Location of the screen label in geographic (lat/lon) in radians.
+    
+    The screen label will track this position.  If it would be behind the globe (in globe mode), then it will disappear.
+  */
+@property (nonatomic,assign) MaplyCoordinate loc;
+
+/** 
+    An optional rotation to apply to the screen label.
+    
+    This is a rotation we'll apply after the screen position has been calculated.  You can use this to do things like track the orientation of roads.
+    
+    Rotation is in radians counter-clockwise from north.
+  */
+@property (nonatomic,assign) float rotation;
+
+/** 
+    When the screen is rotated, try to keep the label upright.
+    
+    This tells the layout and display engine to keep the label oriented upright no matter what.  In practice this means it will manipulate the rotation by 180 degrees.
+  */
+@property (nonatomic,assign) bool keepUpright;
+
+/** 
+    The actual text to display.
+    
+    This is a simple NSString for the text.  Things like font are set in the NSDictionary passed in to the add call in the view controller.
+  */
+@property (nonatomic,strong) NSString * __nullable text;
+
+/** 
+    Text can be accompanied by an optional icon image.
+    
+    If set, we'll put this image to the left of the text in the screen label.  The UIImage will be tracked by the view controller and reused as needed or disposed of when no longer needed.
+    
+    The name had to change because Apple's private selector search is somewhat weak.
+  */
+@property (nonatomic,strong) UIImage * __nullable iconImage2;
+
+/** 
+    Icon size in points.
+    
+    If there is an icon image, this is how big it is.
+  */
+@property (nonatomic,assign) CGSize iconSize;
+
+/** 
+    An optional offset for the whole screen label.
+    
+    If set, we'll move the screen label around by this amount before rendering it.  These are screen coordinates, not geographic.
+  */
+@property (nonatomic,assign) CGPoint offset;
+
+/** 
+    An optional color override.
+    
+    If set, this color will override the color passed in with the NSDictionary in the view controller's add method.
+  */
+@property (nonatomic,strong) UIColor * __nullable color;
+
+/** 
+    Label selectability.  On by default
+    
+    If set, this label can be selected by the user.  If not set, this screen label will never appear in selection results.
+  */
+@property (nonatomic,assign) bool selectable;
+
+/** 
+    The layout importance compared to other features, 0 by default.
+ 
+    The toolkit has a simple layout engine that runs several times per second.  It controls the placement of all participating screen based features, such as MaplyScreenLabel and MaplyScreenMaker objects.  This value controls the relative importance of this particular object.  By default that importance is 0 so the object must compete with others.  Setting it to MAXFLOAT will bypass the layout engine entirely and the object will always appear.
+ */
+@property (nonatomic,assign) float layoutImportance;
+
+/** 
+    The placement rules for the layout engine to follow.
+    
+    The layout engine isn't the brightest bulb in the string and it needs placement hints.  This value tells the engine where we can move the label around.  These are bit flags, so OR them together as needed.  The default is everything.
+ 
+|Layout Flag|Meaning|
+|:----------|:------|
+|kMaplyLayoutRight|The layout engine can put this label to the right of the location point.|
+|kMaplyLayoutLeft|The layout engine can put this label to the left of the location point.|
+|kMaplyLayoutAbove|The layout engine may put this label above the location point, centered.|
+|kMaplyLayoutBelow|The layout engine may put this albel below the location point, centered.|
+ */
+@property (nonatomic,assign) int layoutPlacement;
+
+/**
+ The size of the label for layout purposes.
+ 
+ If layoutImportance is not set to MAXFLOAT, the screen label will get throw into the mix when doing screen layout.  With this, you can set the size of the label when considering layout.  If you set this to (0,0) the maker will take up no space, but still be considered in the layout.
+ */
+@property (nonatomic,assign) CGSize layoutSize;
+
+/**
+    If this is present, we'll render an ID into the mask layer to be used by other features to mask against.
+ */
+@property (nonatomic,retain,nullable) NSString *maskID;
+
+/**
+    If set, we'll lay out the the text along the given linear or areal feature.
+    Takes the first feature in the vector, if there are multiple.
+ */
+@property (nonatomic,retain,nullable) MaplyVectorObject *layoutVec;
+
+
+/**
+    Used to resolve to resolve labels that show the same thing.
+ 
+    By default this is nil and not used to resolve conflicts.  When you set it to
+    something, such as a string, it will be used to resolve display conflicts.
+    Only one object that has this unique ID (evaluated with isEqualToString:) will be displayed.
+    Importance is evaluated first, so the most important will be placed first.
+  */
+@property (nonatomic,retain,nullable) NSString *uniqueID;
+
+/** 
+    User data object for selection
+    
+    When the user selects a feature and the developer gets it in their delegate, this is an object they can use to figure out what the screen label means to them.
+  */
+@property (nonatomic,strong) id  __nullable userObject;
+
+@end
+
+/** 
+    A version of the maply screen label that moves.
+    
+    This version of the screen label can move in a limited way over time.
+ */
+@interface MaplyMovingScreenLabel : MaplyScreenLabel
+
+/// The end point for animation
+@property (nonatomic,assign) MaplyCoordinate endLoc;
+
+/// How long it will take the screen label to get to endLoc
+@property (nonatomic,assign) NSTimeInterval duration;
+
+@end
+
+typedef MaplyScreenLabel WGScreenLabel;
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyScreenMarker.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyScreenMarker.h
new file mode 100644
index 0000000..3481876
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyScreenMarker.h
@@ -0,0 +1,168 @@
+/*  MaplyScreenMarker.h
+ *  WhirlyGlobeComponent
+ *
+ *  Created by Steve Gifford on 7/21/12.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#import <UIKit/UIKit.h>
+#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
+
+@class MaplyVectorObject;
+
+/** 
+    The Screen Marker is a 2D object that displays an image on the screen tracking a given location.
+    
+    The screen marker will track the given geographic location and display a centered rectangle with the given image.  Essentially it's a free floating icon, similar to the MaplyScreenLabel and it will always be drawn on top of other objects.  If the location would be behind the globe (in globe mode), the marker will disappear.
+    
+    If you're looking for a 3D marker object, that's the MaplyMarker.
+  */
+@interface MaplyScreenMarker : NSObject
+
+/** 
+    The location we're tracking for this particular screen marker.
+    
+    Locations are in geographic (lon/lat in radians).
+  */
+@property (nonatomic,assign) MaplyCoordinate loc;
+
+/** 
+    Screen size in points.
+    
+    The marker will always be this size on the screen.  The size is specified in pixels.
+  */
+@property (nonatomic,assign) CGSize size;
+
+/** 
+    An optional rotation to apply to the screen marker.
+    
+    This is a rotation we'll apply after the screen position has been calculated.  The angle is in radians counter-clockwise from north.
+ */
+@property (nonatomic,assign) double rotation;
+
+/** 
+    Image or texture to use for the marker.
+    
+    If set we'll stretch this UIImage (or MaplyTexture) out over the marker rectangle.  If not set, the marker will just be a colored rectangle.  The view controller tracks this object and will reuse its texture and dispose of it as needed.
+  */
+@property (nonatomic,strong) id  __nullable image;
+
+/** 
+    Images to display on the sticker.
+    
+    If this is set rather than image, we will cycle through these images on the screen marker.  It will take period time to cycle through them all.
+  */
+@property (nonatomic,strong) NSArray * __nullable images;
+
+/** 
+    The time we'll take to cycle through all the images for the marker.
+    
+    If images are passed in, this is the time it will take to cycle through them all.  By default this is 5s.
+  */
+@property (nonatomic) double period;
+
+/** 
+    Color for this particular marker.
+    
+    If set, this the color we'll use for the marker or how we'll tint the image.
+    
+    This overrides the color set in the description dictionary.
+  */
+@property (nonatomic,strong) UIColor * __nullable color;
+
+/** 
+    The layout importance compared to other features, 0 by default.
+    
+    The toolkit has a simple layout engine that runs several times per second.  It controls the placement of all participating screen based features, such as MaplyScreenLabel and MaplyScreenMaker objects.  This value controls the relative importance of this particular object.  By default that importance is 0 so the object must compete with others.  Setting it to MAXFLOAT will bypass the layout engine entirely and the object will always appear.
+ */
+@property (nonatomic,assign) float layoutImportance;
+
+/** 
+    The size of the marker for layout purposes.
+    
+    If layoutImportance is not set to MAXFLOAT, the screen marker will get throw into the mix when doing screen layout.  With this, you can set the size of the marker when considering layout.  If you set this to (0,0) the maker will take up no space, but still be considered in the layout.
+  */
+@property (nonatomic,assign) CGSize layoutSize;
+
+/**
+    Screen markers are usually grouped together for rendering efficiency.  This controls the order of the marker within that grouping.
+    orderBy is less important than drawPriority.
+    Default is 0 and means no ordering.
+ */
+@property (nonatomic,assign) long orderBy;
+
+/** 
+    Offset in screen coordinates.
+    
+    Set to zero by default, this is the offset we'll apply to a given screen marker before it's drawn.  The values are screen points.
+  */
+@property (nonatomic,assign) CGPoint offset;
+
+/** 
+    Vertex attributes to apply to this screen marker.
+    
+    MaplyVertexAttribute objects are passed all the way to the shader.  Read that page for details on what they do.
+    
+    The array of vertex attributes provided here will be copied onto all the vertices we create for the shader.  This means you can use these to do things for a single billboard in your shader.
+ */
+@property (nonatomic,strong) NSArray * __nullable vertexAttributes;
+
+/** 
+    Screen marker selectability.  On by default
+    
+    If set, this marker can be selected by the user.  If not set, this screen marker will never appear in selection results.
+ */
+@property (nonatomic,assign) bool selectable;
+
+/**
+    A unique identifier for the marker that's propagated through the system.
+  */
+@property (nonatomic,retain,nullable) NSString *uniqueID;
+
+/**
+    If this is present, we'll render an ID into the mask layer to be used by other features to mask against.
+ */
+@property (nonatomic,retain,nullable) NSString *maskID;
+
+/**
+    If set, we'll lay out the marker along the given linear or areal feature.
+    Takes the first feature in the vector, if there are multiple.
+ */
+@property (nonatomic,retain,nullable) MaplyVectorObject *layoutVec;
+
+/** 
+    User data object for selection
+ 
+    When the user selects a feature and the developer gets it in their delegate, this is an object they can use to figure out what the screen marker means to them.
+ */
+@property (nonatomic,strong) id  __nullable userObject;
+
+@end
+
+/** 
+    A version of the maply screen marker that moves.
+    
+    This version of the screen marker can move in a limited way over time.
+  */
+@interface MaplyMovingScreenMarker : MaplyScreenMarker
+
+/// The end point for animation
+@property (nonatomic,assign) MaplyCoordinate endLoc;
+
+/// How long it will take the screen marker to get to endLoc
+@property (nonatomic,assign) NSTimeInterval duration;
+
+@end
+
+typedef MaplyScreenMarker WGScreenMarker;
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyScreenObject.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyScreenObject.h
new file mode 100644
index 0000000..48028ae
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyScreenObject.h
@@ -0,0 +1,106 @@
+/*
+ *  MaplyScreenObject
+ *  WhirlyGlobeComponent
+ *
+ *  Created by Steve Gifford on 2/28/15
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <UIKit/UIKit.h>
+#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
+#import <WhirlyGlobeMaplyComponent/MaplyRenderController.h>
+
+/** 
+    The Maply Screen Object is used to build up a more complex screen object from multiple pieces.
+    
+    You can use one or more of these to build up a combination of labels and images that form a single marker, label, or billboard.
+  */
+@interface MaplyScreenObject : NSObject
+
+/** 
+    Add a string to the screen object
+    
+    @param str The string to add
+    
+    @param font The font to use
+    
+    @param color The foreground color of the string.
+  */
+- (void)addString:(NSString *)str font:(UIFont *)font color:(UIColor *)color;
+
+/** 
+    Add an attributed string to the screen object.
+    
+    This adds an annotated string to the screen object.  The size will be based on the length of the string and the font.
+  */
+- (void)addAttributedString:(NSAttributedString *)str;
+
+/** 
+    Add an image scaled to the given size.
+    
+    Adds a UIImage or MaplyTexture object scaled to the given size.
+  */
+- (void)addImage:(id)image color:(UIColor *)color size:(CGSize)size;
+
+/**
+    Add an image scaled to the given size and offset by the given amount.
+ 
+    The other version of this call centers around (0,0) so this lets you nudge it.
+ */
+- (void)addImage:(id)image color:(UIColor *)color size:(CGSize)size offset:(CGPoint)offset;
+
+/** 
+    Calculate and return the current bounding box of the screen object.
+  */
+- (MaplyBoundingBox)getSize;
+
+/** 
+    Apply a scale to all the pieces of the screen object.
+  */
+- (void)scaleX:(double)x y:(double)y;
+
+/** 
+    Apply a translation to all the pieces of the screen object.
+  */
+- (void)translateX:(double)x y:(double)y;
+
+/** 
+    Add the contents of the given screen object to this screen object.
+  */
+- (void)addScreenObject:(MaplyScreenObject *)screenObj;
+
+@end
+
+/**
+ Features missing to replicate ScreenMarker and ScreenLabel.
+    rotation
+    images (for animation)
+    period (for animation)
+    color
+    layoutImportance
+    layoutSize
+    layoutPlacement (right, left, above, below)
+    vertexAttributes
+    keepUpright
+ 
+ ScreenObjectInstance (new object)
+    location
+    endLoc/duration (moving fields)
+    selectable
+    ScreenObject pointer
+    Selected version ScreenObject pointer
+    uniqueID
+    userObject (for selection)
+ */
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyShader.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyShader.h
new file mode 100644
index 0000000..45e309e
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyShader.h
@@ -0,0 +1,174 @@
+/*
+ *  MaplyShader.h
+ *  WhirlyGlobe-MaplyComponent
+ *
+ *  Created by Steve Gifford on 2/7/13.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <Foundation/Foundation.h>
+#import <Metal/Metal.h>
+
+@protocol MaplyRenderControllerProtocol;
+@class MaplyTexture;
+
+/** 
+    The various types of attributes that can be passed in to shaders.
+  */
+typedef NS_ENUM(NSInteger, MaplyShaderAttrType){
+	MaplyShaderAttrTypeInt,
+	MaplyShaderAttrTypeFloat,
+	MaplyShaderAttrTypeFloat2,
+	MaplyShaderAttrTypeFloat3,
+	MaplyShaderAttrTypeFloat4
+};
+
+/** 
+    The shader is a direct interface to OpenGL ES 2.0 shader language.
+    
+    You can set your own shader programs in the toolkit!  Yeah, that's as complex as it sounds.
+    
+    The underyling toolkit makes a distinction between the name of the shader and the scene name.  The scene name is used as a way to replace the default shaders we use for triangles and lines.  This would let you replace the shaders you're already using with your own.  See the addShaderProgram: method in the MaplyBaseViewController.
+    
+    You can also add your own shader and hook it up to any features that can call out a specific shader, such as the MaplyQuadImageTilesLayer.
+    
+    When writing a new shader, go take a look at DefaultShaderPrograms.mm, particularly the vertexShaderTri and fragmentShaderTri.  The documentation here is for the uniforms and attributes the system is going to hook up for you.  All of these are optional, but obviously nothing much will happen if you don't use the vertices.
+ 
+**Uniform Values**
+ 
+These are uniform values provided to each shader, if requested.
+ 
+ |uniform|type|description|
+ |:------|:---|:----------|
+ |u_mvpMatrix|mat4| The model/view/projection matrix.  Shaders typically run vertices through this. |
+ |u_mvMatrix|mat4| The model/view matrix.  Less comonly used. |
+ |u_mvNormalMatrix|mat4| The model/view matrix for normals.  A shader typically uses this when we want view dependent lighting. |
+ |u_fade|float| Available in regular drawables, but not yet in big drawables (e.g. atlases).  This is intended to fade geometry in and out over time. |
+ |u_interp|float| If we're doing multiple textures, this is how to interpolate them. |
+ |u_numLights|int| The number of active lights to use. |
+ |light[8]|directional_light| A data structure for each active light.  See the table below. |
+ |material|material_properties| Material information used to calculate lighting.  See the table below. |
+ |u_hasTexture|bool| True if there's a texture available to fetch data from. |
+ |s_baseMapX|sampler2D| s_baseMap0, s_baseMap1 and so forth are references to texture data. |
+
+**Material properties**
+ 
+These are the fields for the material properties.
+ 
+|field|type|description|
+|:----|:---|:----------|
+|ambient|vec4| The ambient value for the material.  Shaders typically multiply by this value when calculating ambient lighting. |
+|diffuse|vec4| The diffuse value for the material.  Shaders typically multiply by this value when calculating diffuse lighting. |
+|specular|vec4| Not currently used. |
+|specular_exponent|float| Not currently used. |
+ 
+**Light properties**
+
+These are the fields for each individual light.
+ 
+ |field|type|description|
+ |:----|:---|:----------|
+ |direction|vec3| The light's direction, used in diffuse lighting. |
+ |halfplane|vec3| This would be used in specular lighting. |
+ |ambient|vec4| The ambient value of the light. |
+ |diffuse|vec4| The diffuse value of the light. |
+ |specular|vec4| Not currently used. |
+ |viewdepend|float| If greater than 0.0, the shader should run each normal through the u_mvNormalMatrix. |
+ 
+**Attributes**
+ 
+These are the per vertex attributes provided to each vertex shader.
+
+ |field|type|description|
+ |:----|:---|:----------|
+ |a_position|vec3| The position in display space for a vertex.  Shaders typically multiply this by u_mvpMatrix. |
+ |a_texCoord0|vec2| If textures are present, this is the texture coordinate for the first one. |
+ |a_texCoord1|vec2| If two textures are present, this is the texture coordinate for the second. |
+ |a_color|vec4| An RGBA color for the vertex. |
+ |a_normal|vec3| A normal in display space.  This is used purely for lighting and often run through u_mvNormalMatrix. |
+ |a_elev|float| An optional elevation value provided by the MaplyQuadImageTiles layer.  You can use it to do elevation dependent shading. |
+ 
+  */
+@interface MaplyShader : NSObject
+
+/**
+    Initialize with Metal shader functions tied to a particular view controller.  Metal only.
+ 
+    This initializer just ties the given functions to this MaplyShader.  All the real work is
+    done by Metal.
+ 
+     @param name The name of the shader program.  Used for identification and sometimes lookup.
+ 
+     @param vertexFunc The MTLFunction for vertex processing.
+ 
+     @param fragFunc The MTLFunction for fragment processing.
+
+     @param baseViewC The view controller where we'll register the new shader.
+ 
+     @return Returns a shader program if it succeeded.  IT may not work, however, so call valid first.
+  */
+- (nullable instancetype)initMetalWithName:(NSString *__nonnull)name vertex:(id<MTLFunction> __nonnull)vertexFunc fragment:(id<MTLFunction> __nullable)fragFunc viewC:(NSObject<MaplyRenderControllerProtocol> *__nonnull)baseViewC;
+
+/** 
+    Name of the shader program.
+    
+    This is the name passed in to the init call.  You can search by this name in some circumstances.
+  */
+@property (nonatomic,strong) NSString * __nullable name;
+
+/**
+   Present a texture to this shader for use.  Metal Only.
+ 
+   For a Metal shader we can pass in zero or more textures starting at WKSTextureEntryLookup (DefaultShadersMTL.h).
+   This index is offset from there.  Start at 0.
+  */
+- (void)setTexture:(MaplyTexture * __nonnull)tex forIndex:(int)idx viewC:(NSObject<MaplyRenderControllerProtocol> * __nonnull)viewC;
+
+/**
+ Remove a texture we presented to the Shader ealier.  Metal Only.
+ 
+ The texture itself will not be deleted, just the reference to it in the shader.
+ */
+- (void)removeTexture:(MaplyTexture * __nonnull)tex viewC:(NSObject<MaplyRenderControllerProtocol> * __nonnull)viewC;
+
+/**
+    For Metal shaders we don't set the individual uniform values passed in, we set them all together as a block.  These are typically set
+    through the ComponentObject interface, but can be set gobally here.
+ 
+    Metal Only.
+ */
+- (bool)setUniformBlock:(NSData *__nonnull)uniBlock buffer:(int)bufferID;
+
+/**
+   If set, this program is expecting to be called once for each level of a render target's texture.
+ Essentially, it runs a reduce operation, starting from some source and working its way up to the 1x1 texture at the top.
+ */
+- (void)setReduceMode:(bool)reduceMode;
+
+/** 
+    Check if the shader is valid.
+    
+    The shader setup can fail in a number of ways.  Check this after creating the shader to see if it succeded.  If not, look to getError to see why.
+  */
+- (bool)valid;
+
+/** 
+    Return the compilation error if there was one.
+    
+    Shader construction can fail in a number of interesting ways.  Call valid to see if it did fail, and then call this method to see why.
+  */
+- (NSString *__nullable)getError;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyShape.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyShape.h
new file mode 100644
index 0000000..baed55f
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyShape.h
@@ -0,0 +1,318 @@
+/*
+ *  MaplyShape.h
+ *  WhirlyGlobe-MaplyComponent
+ *
+ *  Created by Steve Gifford on 9/28/12.
+ *  Copyright 2012-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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <UIKit/UIKit.h>
+#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
+#import <WhirlyGlobeMaplyComponent/MaplyMatrix.h>
+#import <WhirlyGlobeMaplyComponent/MaplyTexture.h>
+
+/** 
+    Maply Shape is the base class for the actual shape objects.
+    
+    The maply shape is just the base class.  Look to MaplyShapeCircle, MaplyShapeCylinder, MaplyShapeSphere, MaplyShapeGreatCircle, and MaplyShapeLinear.
+  */
+@interface MaplyShape : NSObject
+
+/** 
+    The color of the shape.
+    
+    We can set object color in the NSDictionary passed in with the add method.  We can also override that here.
+ */
+@property (nonatomic,strong) UIColor * __nullable color;
+
+/** 
+    If set, the object is selectable
+ 
+    The object is selectable if this is set when the object is passed in to an add call.  If not set, you'll never see it in selection.
+ */
+@property (nonatomic,assign) bool selectable;
+
+/** 
+    User data object for selection
+ 
+    When the user selects a feature and the developer gets it in their delegate, this is an object they can use to figure out what the shape means to them.
+ */
+@property (nonatomic,strong) id  __nullable userObject;
+
+/** 
+    If set, this shape is in clip coordinates and will not be transformed.
+    
+    Some objects (the rectangle) can be used as overlays in clip coordinates.  This is set if that's the case.
+  */
+@property (nonatomic,assign) bool clipCoords;
+
+@end
+
+/** 
+    Shows a circle at the given location on the globe or map.
+    
+    This object represents a circle at the given geographic location.  It needs a radius (in display coordinates) and can optionally have a height above the globe or map.
+ */
+@interface MaplyShapeCircle : MaplyShape
+
+/** 
+    Center of the circle in local coordinates.
+    
+    This is the center of the circle in geographic.
+  */
+@property (nonatomic,assign) MaplyCoordinate center;
+
+/** 
+    Radius of the circle in display units.
+    
+    This is the radius of the circle, but not in geographic.  It's in display units.  Display units for the globe are based on a radius of 1.0.  Scale accordingly.  For the map, display units typically run from -PI to +PI, depending on the coordinate system.
+  */
+@property (nonatomic,assign) float radius;
+
+/** 
+    Offset height above the globe in display units.
+    
+    This is the height above the globe for the center of the circle.  It's also in display units, like the radius.
+  */
+@property (nonatomic,assign) float height;
+
+@end
+
+typedef MaplyShapeCircle WGShapeCircle;
+
+/** 
+    Display a sphere at the given location with the given radius.
+    
+    This object represents a sphere at the
+  */
+@interface MaplyShapeSphere : MaplyShape
+
+/** 
+    Center of the sphere in local coordinates.
+    
+    The x and y coordinates correspond to longitude and latitude and are in geographic (radians).  The Z value is in display coordinates.  For that globe that's based on a radius of 1.0.  Scale accordingly.
+ */
+@property (nonatomic,assign) MaplyCoordinate center;
+
+/** 
+    Radius of the sphere in display units.
+    
+    This is the radius of the sphere, but not in geographic.  It's in display units.  Display units for the globe are based on a radius of 1.0.  Scale accordingly.  For the map, display units typically run from -PI to +PI, depending on the coordinate system.
+ */
+@property (nonatomic,assign) float radius;
+
+/** 
+    Offset height above the globe in display units.
+    
+    This is the height above the globe for the center of the sphere.  It's also in display units, like the radius.
+ */
+@property (nonatomic,assign) float height;
+
+@end
+
+typedef MaplyShapeSphere WGShapeSphere;
+
+/** 
+    Represent a cyclinder on the globe or map.
+    
+    This object represents a cylinder with it's base tied to the surface of the globe or map and it's top pointed outward (on the globe anyway).  The base can be offset and the overall radius and height are adjustable.
+  */
+@interface MaplyShapeCylinder : MaplyShape
+
+/** 
+    Center of the cylinder's base in geographic.
+    
+    The x and y coordinates correspond to longitude and latitude and are in geographic (radians).
+ */
+@property (nonatomic,assign) MaplyCoordinate baseCenter;
+
+/** 
+    Base height above the globe in display units.
+    
+    This is an optional base offset from the globe or map.  The cylinder will be offset by this amount.  It's also in display units, like the radius.
+ */
+@property (nonatomic,assign) float baseHeight;
+
+/** 
+    Radius of the cylinder in display units.
+    
+    This is the radius of the cylinder, but not in geographic.  It's in display units.  Display units for the globe are based on a radius of 1.0.  Scale accordingly.  For the map, display units typically run from -PI to +PI, depending on the coordinate system.
+ */
+@property (nonatomic,assign) float radius;
+
+/** 
+    Height of the cylinder in display units.
+    
+    This is the height of the cylinder.  The top of the cylinder will be at baseHeight+height.  It's also in display units, like the radius.
+ */
+@property (nonatomic,assign) float height;
+
+@end
+
+typedef MaplyShapeCylinder WGShapeCylinder;
+
+/** 
+    Represents an great circle or great circle with height.
+    
+    Great circles are the shortest distance between two points on a globe.  We extend that a bit here, by adding height.  The result is a curved object that can either sit on top of the globe or rise above it.  In either case it begins and ends at the specified points on the globe.
+ */
+@interface MaplyShapeGreatCircle : MaplyShape
+
+/// Starting point in geographic coordinates.
+@property (nonatomic,assign) MaplyCoordinate startPt;
+
+/// End point in geographic coordinates
+@property (nonatomic,assign) MaplyCoordinate endPt;
+
+/** 
+    Height of the great circle shape right in its middle.
+    
+    This is the height of the great circle right in the middle.  It will built toward that height and then go back down as it reaches the endPt.  The height is in display units.  For the globe that's based on a radius of 1.0.
+ */
+@property (nonatomic,assign) float height;
+
+/** 
+    Line width for the great circle geometry.
+    
+    The great circle is implemented as a set of lines. This is the width, in pixels, of those lines.
+  */
+@property (nonatomic,assign) float lineWidth;
+
+/** 
+    Angle between start and end points in radians
+  */
+- (float)calcAngleBetween;
+
+@end
+
+/** 
+    Represents a simple rectangle in 3D.
+    
+    The rectangle is a 2D object in 3D.  Specify the lower left and upper right coordinates as
+    well as an optional texture.
+  */
+@interface MaplyShapeRectangle : MaplyShape
+
+/// Lower left corner in 3D
+@property (nonatomic,assign) MaplyCoordinate3dD ll;
+
+/// Upper right corner in 3D
+@property (nonatomic,assign) MaplyCoordinate3dD ur;
+
+/// If set, the textures to stretch across the rectangle.
+@property (nonatomic,nullable,strong) NSMutableArray *textures;
+
+/// Add a texture to stretch across the rectangle
+- (void)addTexture:(MaplyTexture * __nonnull)texture;
+
+@end
+
+/** 
+    A linear feature offset from the globe.
+    
+    The main difference between this object and a regular MaplyVectorObject is that you specify coordiantes in 3D.  You can use this to create linear features that are offset from the globe.
+  */
+@interface MaplyShapeLinear : MaplyShape
+
+/** 
+    Line width in pixels
+    
+    The linear is implemented as a set of line segments in OpenGL ES.  This is their line width in pixels.
+  */
+@property (nonatomic,assign) float lineWidth;
+
+/** 
+    Initialize with coordinates and coordinate array size
+    
+    This initializer will make a copy of the coordinates and use them to draw the lines.  The x and y values are in geographic.  The z values are offsets from the globe (or map) and are in display units.  For the globe display units are based on a radius of 1.0.
+  */
+- (nullable instancetype)initWithCoords:(MaplyCoordinate3d * __nonnull)coords numCoords:(int)numCoords;
+
+/** 
+    Return the coordinates for this linear feature.
+    
+    @return Returns the number of coordinates and a pointer to the coordinate array.
+  */
+- (int)getCoords:(MaplyCoordinate3d *__nullable *__nonnull)retCoords;
+
+@end
+
+/** 
+    An extruded shape with an arbitrary outline.
+    
+    This object represents an extruded shape with the given thickness.  It can be oriented according to the pitch, roll, yaw and height.
+  */
+@interface MaplyShapeExtruded : MaplyShape
+
+/** 
+    Construct with the coordinates for the outline to extrude.
+ 
+    Pass in pairs of doubles that correspond to the
+ */
+- (nonnull instancetype)initWithOutline:(NSArray * __nonnull)coords;
+
+/** 
+    Construct with the coordinates for the outline to extrude.
+    
+    Pass in pairs of doubles that correspond to the
+  */
+- (nonnull instancetype)initWithOutline:(double * __nonnull)coords numCoordPairs:(int)numCoordPairs;
+
+/** 
+    Number of coordinate pairs in this shape.
+  */
+@property (nonatomic,readonly) int numCoordPairs;
+
+/** 
+    Array of coordinate values.
+  */
+@property (nonatomic,readonly) double * __nullable coordData;
+
+/** 
+    Where we'd like to place the extruded shape.
+    
+    This is the center of the object in geographic radians.
+  */
+@property (nonatomic) MaplyCoordinate center;
+
+/** 
+    Scale for coordinates.  Set to 1/EarthRadiusInMeters by default.
+    
+    The coordinates will be scaled by this before creating the geometry.  By default this is set to 1/EarthRadius(m) so you can build your shape in meters.  Also applies to thickness and height.
+  */
+@property (nonatomic,assign) double scale;
+
+/** 
+    Thickness for the resulting shape.
+    
+    We build an extruded shape out of this information and this is its thickness.  If this is zero, you just get a double sided polygon.
+  */
+@property (nonatomic,assign) double thickness;
+
+/** 
+    Height to place the resulting shape at.
+    
+    We'll put this shape at the given height above the surface of the globe or map.
+  */
+@property (nonatomic,assign) double height;
+
+/** 
+    The transform to apply to this shape.
+    
+    If set, this transform is applied before placing the feature.  You can set a transform matrix up with roll, pitch, and yaw.
+  */
+@property (nonatomic,strong) MaplyMatrix * __nullable transform;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplySharedAttributes.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplySharedAttributes.h
new file mode 100644
index 0000000..00bd24d
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplySharedAttributes.h
@@ -0,0 +1,406 @@
+/*
+ *  MaplySharedAttributes.h
+ *  WhirlyGlobe-MaplyComponent
+ *
+ *  Created by Steve Gifford on 9/19/12.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <Foundation/Foundation.h>
+
+/// Use this hint to turn the zbuffer on or off.  Pass in an NSNumber boolean.  Takes effect on the next frame.
+extern NSString* const kMaplyRenderHintZBuffer;
+#define kWGRenderHintZBuffer kMaplyRenderHintZBuffer
+/// Use this hint to turn culling optimization on or off.  Pass in an NSNumber boolean.
+extern NSString* const kMaplyRenderHintCulling;
+#define kWGRenderHintCulling kMaplyRenderHintCulling
+/// These are options for lighting modes, basically different default shader programs.  Only works with OpenGL ES 2.0 mode.
+/// Accepted values are: none,regular
+extern NSString* const kMaplyRendererLightingMode;
+#define kWGRendererLightingMode kMaplyRendererLightingMode
+
+/// These are used for all object descriptions.
+
+/// If the z buffer is on, this will let you resolve.  Takes an NSNumber boolean
+extern NSString* const kMaplyDrawOffset;
+#define kWGDrawOffset kMaplyDrawOffset
+/// This helps decide what order things are drawn in.  Useful when the z buffer is off or you're using transparency.
+/// Takes an NSNumber int.
+extern NSString* const kMaplyDrawPriority;
+#define kWGDrawPriority kMaplyDrawPriority
+/// Minimum point at which a feature is visible.  Takes an NSNumber float.  The radius of the globe is 1.0
+extern NSString* const kMaplyMinVis;
+#define kWGMinVis kMaplyMinVis
+/// Maximum point at which a feature is visible.  Takes an NSNumber float.  The radius of the globe is 1.0
+extern NSString* const kMaplyMaxVis;
+#define kWGMaxVis kMaplyMaxVis
+/// Minimum distance from the viewer at which to display geometry.
+extern NSString* const kMaplyViewerMinDist;
+/// Maximum distance from the viewer at which to display geometry.
+extern NSString* const kMaplyViewerMaxDist;
+/// Center to use when evaluating distance to viewable geometry (X)
+extern NSString* const kMaplyViewableCenterX;
+/// Center to use when evaluating distance to viewable geometry (Y)
+extern NSString* const kMaplyViewableCenterY;
+/// Center to use when evaluating distance to viewable geometry (Z)
+extern NSString* const kMaplyViewableCenterZ;
+/// The amount of time for a feature to fade in or out.  Takes an NSNumber float for seconds.
+extern NSString* const kMaplyFade;
+#define kWGFade kMaplyFade
+/// Fade the feature in over time.
+extern NSString* const kMaplyFadeIn;
+/// Fade the feature out over time
+extern NSString* const kMaplyFadeOut;
+/// When to start fading out
+extern NSString* const kMaplyFadeOutTime;
+/// Enable or disable an object.  This can be used to create an object disabled.
+extern NSString* const kMaplyEnable;
+/// If set, we'll enable the objects only between the start and end time
+extern NSString* const kMaplyEnableStart;
+/// If set, we'll enable the objects only between the start and end time
+extern NSString* const kMaplyEnableEnd;
+/// Request a given object take the z buffer into account
+extern NSString* const kMaplyZBufferRead;
+/// Have a given object write itself to the z buffer
+extern NSString* const kMaplyZBufferWrite;
+/// Set the render target if the given geometry type supports it
+extern NSString* const kMaplyRenderTarget;
+/// The the UUID of the object
+extern NSString* const kMaplyUUID;
+/// The representation of the UUID this object embodies
+extern NSString* const kMaplyRepresentation;
+
+/// Assign a shader program to a particular feature.  Use the shader program's name
+extern NSString* const kMaplyShader;
+/// An NSDictionary containing uniforms to apply to a shader before drawing
+extern NSString* const kMaplyShaderUniforms;
+
+/// Keep drawing for this number of frames after we'd normally stop
+extern NSString* const kMaplyExtraFrames;
+
+/// Stars, moon, stars, atmosphere
+extern const int kMaplyStarsDrawPriorityDefault;
+extern const int kMaplySunDrawPriorityDefault;
+extern const int kMaplyMoonDrawPriorityDefault;
+extern const int kMaplyAtmosphereDrawPriorityDefault;
+/// Where we start image layer draw priorities
+extern const int kMaplyImageLayerDrawPriorityDefault;
+/// We'll start filling in features right around here
+extern const int kMaplyFeatureDrawPriorityBase;
+extern const int kMaplyStickerDrawPriorityDefault;
+extern const int kMaplyMarkerDrawPriorityDefault;
+extern const int kMaplyVectorDrawPriorityDefault;
+extern const int kMaplyParticleSystemDrawPriorityDefault ;
+extern const int kMaplyLabelDrawPriorityDefault;
+extern const int kMaplyLoftedPolysDrawPriorityDefault;
+extern const int kMaplyShapeDrawPriorityDefault;
+extern const int kMaplyBillboardDrawPriorityDefault;
+extern const int kMaplyModelDrawPriorityDefault;
+extern const int kMaplyMaxDrawPriorityDefault;
+
+#define kWGMarkerDrawPriorityDefault kMaplyMarkerDrawPriorityDefault
+#define kWGVectorDrawPriorityDefault kMaplyVectorDrawPriorityDefault
+#define kWGStickerDrawPriorityDefault kMaplyStickerDrawPriorityDefault
+
+/// These are used just for the screen and regular labels
+
+/// Color of the text being rendered.  Takes a UIColor.
+extern NSString* const kMaplyTextColor;
+#define kWGTextColor kMaplyTextColor
+/// Background color for the text.  Takes a UIColor.
+extern NSString* const kMaplyBackgroundColor;
+#define kWGBackgroundColor kMaplyBackgroundColor
+/// Font to use in rendering text.  Takes a UIFont.
+extern NSString* const kMaplyFont;
+#define kWGFont kMaplyFont
+/// Default height of the text.  If for screen space, this in points.  If for 3D, remember that
+//   the radius of the globe is 1.0.  Expects an NSNumber float.
+extern NSString* const kMaplyLabelHeight;
+#define kWGLabelHeight kMaplyLabelHeight
+/// Default width of the text.  See height for more info and, in general, use height instead.
+extern NSString* const kMaplyLabelWidth;
+#define kWGLabelWidth kMaplyLabelWidth
+/// Justification for label placement.  This takes an NSString with one of:
+///  middle, left, right
+extern NSString* const kMaplyJustify;
+#define kWGJustify kMaplyJustify
+/// If set, we'll draw a shadow behind each label with this as the stroke size
+extern NSString* const kMaplyShadowSize;
+#define kWGShadowSize kMaplyShadowSize
+/// If shadow size is being used, we can control the shadow color like so
+extern NSString* const kMaplyShadowColor;
+#define kWGShadowColor kMaplyShadowColor
+/// If outline is being used, we can control the color
+extern NSString* const kMaplyTextOutlineSize;
+/// Vertical line spacing.  Defaults to the Font's line spacing
+extern NSString* const kMaplyTextLineSpacing;
+/// If outline is being used, we can control the stroke size
+extern NSString* const kMaplyTextOutlineColor;
+/// When creating textures, we may pass in the size
+extern NSString* const kMaplyTexSizeX;
+/// When creating textures, we may pass in the size
+extern NSString* const kMaplyTexSizeY;
+
+/// How to justify multi-line text
+extern NSString* const kMaplyTextJustify;
+/// Justify text to the right
+extern NSString* const kMaplyTextJustifyRight;
+/// Justify text to the left
+extern NSString* const kMaplyTextJustifyLeft;
+/// Justify text to the center
+extern NSString* const kMaplyTextJustifyCenter;
+
+/// Controls how text is laid out along a line or polygon.  Set a number (- for left or inside, + for right or outside)
+extern NSString* const kMaplyTextLayoutOffset;
+/// If laying out along a line (or polygon), the amount of screen space to leave between labels
+extern NSString* const kMaplyTextLayoutSpacing;
+/// Layout as many labels as possible along a line (or polygon).  Set a number (0 for no repeat, -1 for as many as possible, or a number of instances)
+extern NSString* const kMaplyTextLayoutRepeat;
+/// Turn on debugging lines for the layout engine
+extern NSString* const kMaplyTextLayoutDebug;
+
+/// These are used for screen and regular markers.
+extern NSString* const kMaplyClusterGroup;
+
+/// Color is used for the polygon generated for a marker.  It will combine with the image,
+///  if there is one or it will be visible if there is no texture.  Takes a UIColor
+extern NSString* const kMaplyColor;
+#define kWGColor kMaplyColor
+
+/// Width is used by the vector layer for line widths
+extern NSString* const kMaplyVecWidth;
+#define kWGVecWidth kMaplyVecWidth
+
+/// If filled is set, we draw the areals as filled polygons
+extern NSString* const kMaplyFilled;
+#define kWGFilled kMaplyFilled
+
+/// If set, the texture to apply to the feature
+extern NSString* const kMaplyVecTexture;
+/// The format of the image given by kMaplyVecTexture, default MaplyImage4Layer8Bit
+extern NSString* const kMaplyVecTextureFormat;
+/// X scale for textures applied to vectors
+extern NSString* const kMaplyVecTexScaleX;
+/// Y scale for textures applied to vectors
+extern NSString* const kMaplyVecTexScaleY;
+
+/// The projection to use when generating texture coordinates
+extern NSString* const kMaplyVecTextureProjection;
+/// Tangent plane projection for texture coordinates
+extern NSString* const kMaplyProjectionTangentPlane;
+/// Screen space "projection" for texture coordinates
+extern NSString* const kMaplyProjectionScreen;
+/// No projection for texture coordinates
+extern NSString* const kMaplyProjectionNone;
+
+/// If set to true we'll centered any drawables we create for features
+/// This fixes the jittering problem when zoomed in close
+extern NSString* const kMaplyVecCentered;
+
+/// Center of the feature, to use for texture calculations
+extern NSString* const kMaplyVecCenterX;
+extern NSString* const kMaplyVecCenterY;
+
+/// For wide vectors, we can widen them in screen space or display space
+extern NSString* const kMaplyWideVecCoordType;
+
+/// Widened vectors are widened in real space.  The width is in meters.
+extern NSString* const kMaplyWideVecCoordTypeReal;
+/// Widened vectors are widened in screen space.  The width is in pixels.
+extern NSString* const kMaplyWideVecCoordTypeScreen;
+
+/// Controls the wide vector implementation.  Basic implementation by default.
+extern NSString* const kMaplyWideVecImpl;
+
+/// Default/old implementation of the wide vectors
+extern NSString* const kMaplyWideVecImplDefault;
+
+/// Performance implementation of the wide vectors
+extern NSString* const kMaplyWideVecImplPerf;
+
+/// For wide vectors we can control the line joins
+/// See: http://www.w3.org/TR/SVG/painting.html#StrokeLinejoinProperty
+extern NSString* const kMaplyWideVecJoinType;
+
+/// Widened vectors are joined with miters
+extern NSString* const kMaplyWideVecMiterJoin;
+// Note: Not yet implemented
+/// Widened vectors are joined with a curve
+//extern NSString* const kMaplyWideVecRoundJoin @"round"
+/// Widened vectors are joined with a bevel
+extern NSString* const kMaplyWideVecBevelJoin;
+
+/// Number of pixels to use in blending the edges of the wide vectors
+extern NSString* const kMaplyWideVecEdgeFalloff;
+
+/// For wide vectors we can control the ends
+/// See: http://www.w3.org/TR/SVG/painting.html#StrokeLinecapProperty
+//extern NSString* const kMaplyWideVecLineCapType @"wideveclinecaptype"
+
+// Note: These are not currently implemented
+
+/// Widened vector ends are flush
+//extern NSString* const kMaplyWideVecButtCap;
+/// Widened vector ends are round (e.g. hot dog roads)
+//extern NSString* const kMaplyWideVecRoundCap;
+/// Widened vector ends are extended a bit and then flush
+//extern NSString* const kMaplyWideVecSquareCap;
+
+/// Miter joins will turn to bevel joins past this number of degrees
+extern NSString* const kMaplyWideVecMiterLimit;
+
+/// This is the length you'd like the texture to start repeating after.
+/// It's real world coordinates for kMaplyWideVecCoordTypeReal and pixel size for kMaplyWideVecCoordTypeScreen
+extern NSString* const kMaplyWideVecTexRepeatLen;
+
+/// Offset to left (negative) or right (positive) of the centerline
+extern NSString* const kMaplyWideVecOffset;
+
+/// Close any un-closed areal features when drawing lines for them
+extern NSString* const kMaplyVecCloseAreals;
+
+/// If set we'll break up a vector feature to the given epsilon on a globe surface
+extern NSString* const kMaplySubdivEpsilon;
+/// If subdiv epsilon is set we'll look for a subdivision type. Default is simple.
+extern NSString* const kMaplySubdivType;
+/// Subdivide the vector edges along a great circle
+extern NSString* const kMaplySubdivGreatCircle;
+/// Subdivide the vector edges along a great circle with ellipsoidal math
+extern NSString* const kMaplySubdivGreatCirclePrecise;
+/// Subdivide into a fixed number of segmenets
+extern NSString* const kMaplySubdivStatic;
+/// Subdivide the vectors edges along lat/lon
+extern NSString* const kMaplySubdivSimple;
+/// Clip features along a grid of the given size
+extern NSString* const kMaplySubdivGrid;
+/// Used to turn off selection in vectors
+extern NSString* const kMaplySelectable;
+
+/// These are used for stickers
+
+/// Sampling size along one dimension
+extern NSString* const kMaplySampleX;
+#define kWGSampleX kMaplySampleX
+/// Sampling size along one dimension
+extern NSString* const kMaplySampleY;
+#define kWGSampleY kMaplySampleY
+/// Images to use when changing a sticker
+extern NSString* const kMaplyStickerImages;
+/// Image format to use for the new images
+extern NSString* const kMaplyStickerImageFormat;
+
+/// These are used for billboards
+
+/// Billboard orientation
+extern NSString* const kMaplyBillboardOrient;
+/// Billboards are oriented toward the eye, but rotate on the ground
+extern NSString* const kMaplyBillboardOrientGround;
+/// Billboards are oriented only towards the eye
+extern NSString* const kMaplyBillboardOrientEye;
+
+/// These are used for lofted polygons
+
+/// Height above the ground
+extern NSString* const kMaplyLoftedPolyHeight;
+/// Boolean that turns on/off top (on by default)
+extern NSString* const kMaplyLoftedPolyTop;
+/// Boolean that turns on/off sides (on by default)
+extern NSString* const kMaplyLoftedPolySide;
+/// If present, we'll start the lofted poly above 0 height
+extern NSString* const kMaplyLoftedPolyBase;
+/// Grid size we used to chop the lofted polygons up (10 degress by default)
+extern NSString* const kMaplyLoftedPolyGridSize;
+/// If set to @(YES) this will draw an outline around the top of the lofted poly in lines
+extern NSString* const kMaplyLoftedPolyOutline;
+/// If set to @(YES) this will draw an outline around the bottom of the lofted poly in lines
+extern NSString* const kMaplyLoftedPolyOutlineBottom;
+/// If the outline is one this is the outline's color
+extern NSString* const kMaplyLoftedPolyOutlineColor;
+/// This is the outline's width if it's turned on
+extern NSString* const kMaplyLoftedPolyOutlineWidth;
+/// Draw priority of the lines created for the lofted poly outline
+extern NSString* const kMaplyLoftedPolyOutlineDrawPriority;
+/// If set and we're drawing an outline, this will create lines up the sides
+extern NSString* const kMaplyLoftedPolyOutlineSide;
+
+/// These are used for shapes
+
+/// Samples (x) to use when converting shape to polygons
+extern NSString* const kMaplyShapeSampleX;
+/// Samples (y) to use when converting shape to polygons
+extern NSString* const kMaplyShapeSampleY;
+/// If set to true, we'll tessellate a shape using the opposite vertex ordering
+extern NSString* const kMaplyShapeInsideOut;
+/// Center for the shape geometry
+extern NSString* const kMaplyShapeCenterX;
+extern NSString* const kMaplyShapeCenterY;
+extern NSString* const kMaplyShapeCenterZ;
+
+/// These are used by active vector objects
+extern NSString* const kMaplyVecHeight;
+extern NSString* const kMaplyVecMinSample;
+
+/// These are used by the particle systems
+extern NSString* const kMaplyPointSize;
+extern const float kMaplyPointSizeDefault;
+
+/// These are used by the texture
+extern NSString* const kMaplyTexFormat;
+extern NSString* const kMaplyTexMinFilter;
+extern NSString* const kMaplyTexMagFilter;
+extern NSString* const kMaplyMinFilterNearest;
+extern NSString* const kMaplyMinFilterLinear;
+extern NSString* const kMaplyTexAtlas;
+extern NSString* const kMaplyTexWrapX;
+extern NSString* const kMaplyTexWrapY;
+extern NSString* const kMaplyTexMipmap;
+
+/// These are the various shader programs we set up by default
+extern NSString* const kMaplyShaderDefaultTri;
+extern NSString* const kMaplyDefaultTriangleShader;
+extern NSString* const kMaplyShaderTriExp;
+
+extern NSString* const kMaplyShaderDefaultModelTri;
+
+extern NSString* const kMaplyShaderDefaultTriNoLighting;
+extern NSString* const kMaplyNoLightTriangleShader;
+extern NSString* const kMaplyShaderNoLightTriangleExp;
+extern NSString* const kMaplyShaderDefaultMarker;
+
+extern NSString* const kMaplyShaderDefaultTriScreenTex;
+
+extern NSString* const kMaplyShaderDefaultTriMultiTex;
+extern NSString* const kMaplyShaderDefaultTriMultiTexRamp;
+extern NSString* const kMaplyShaderDefaultTriNightDay;
+
+extern NSString* const kMaplyShaderDefaultLine;
+extern NSString* const kMaplyDefaultLineShader;
+
+extern NSString* const kMaplyShaderDefaultLineNoBackface;
+extern NSString* const kMaplyNoBackfaceLineShader;
+
+extern NSString* const kMaplyShaderBillboardGround;
+extern NSString* const kMaplyShaderBillboardEye;
+
+extern NSString* const kMaplyShaderDefaultWideVector;
+extern NSString* const kMaplyShaderWideVectorPerformance;
+extern NSString* const kMaplyShaderWideVectorExp;
+
+extern NSString* const kMaplyScreenSpaceDefaultMotionProgram;
+extern NSString* const kMaplyScreenSpaceDefaultProgram;
+extern NSString* const kMaplyScreenSpaceMaskProgram;
+extern NSString* const kMaplyScreenSpaceExpProgram;
+
+extern NSString* const kMaplyShaderParticleSystemPointDefault;
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplySimpleTileFetcher.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplySimpleTileFetcher.h
new file mode 100644
index 0000000..f500c68
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplySimpleTileFetcher.h
@@ -0,0 +1,88 @@
+/*
+ *  MaplySimpleTileFetcher.h
+ *  WhirlyGlobe-MaplyComponent
+ *
+ *  Created by Steve Gifford on 5/31/19.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <WhirlyGlobeMaplyComponent/MaplyTileSourceNew.h>
+
+/** Simple Tile Fetcher is meant for sub classing.
+ 
+    Some data sources aren't all that complex.  You read from a local source,
+    you return the data.  Something else turns it into visible objects.  Simple.
+ 
+    To implement one of those, subclass the Simple Tile Fetcher and let it do the
+    tricky bits.
+  */
+@interface MaplySimpleTileFetcher : NSObject<MaplyTileFetcher>
+
+/// Your Subclass must call this init method
+- (nullable instancetype)initWithName:(NSString * __nonnull)name minZoom:(int)minZoom maxZoom:(int)maxZoom;
+
+/// The quad paging loader variants need a TileInfo object, even if it's very simple
+- (nullable NSObject<MaplyTileInfoNew> *)tileInfo;
+
+/// Dispatch queue the data fetcher is doing its work on
+@property (nonnull) dispatch_queue_t queue;
+
+/// Set by default.  We won't every return an error on failing to load.  Useful for sparse data sets
+@property bool neverFail;
+
+/// Name used for debugging
+@property NSString * __nonnull name;
+
+/// Min zoom level
+- (int)minZoom;
+
+/// Max zoom level
+- (int)maxZoom;
+
+/** Override dataForTile:tileID: to return your own data for a given tile.
+    The fetchInfo can be a custom object (if you set it up that way) or
+    you can just use the tileID argument.
+ 
+    You'll be called on the dispatch queue.
+ 
+    You can return either an NSData or a MaplyLoaderReturn
+  */
+- (id __nullable)dataForTile:(id __nonnull)fetchInfo tileID:(MaplyTileID)tileID;
+
+/** Override the shutdown method.
+ 
+    Call the superclass shutdown method *first* and then run your own shutdown.
+  */
+- (void)shutdown;
+
+@end
+
+// Internal object used by the QuadImageLoader to generate tile load info
+@interface MaplySimpleTileInfo : NSObject<MaplyTileInfoNew>
+
+// Initialize with a min/max zoom
+- (instancetype __nonnull)initWithMinZoom:(int)inMinZoom maxZoom:(int)inMaxZoom;
+
+@end
+
+
+// Encapsulates a single tile load request
+@interface MaplySimpleTileFetchInfo : NSObject
+
+@property (nonatomic,assign) int x;
+@property (nonatomic,assign) int y;
+@property (nonatomic,assign) int level;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyStarsModel.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyStarsModel.h
new file mode 100644
index 0000000..951afbc
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyStarsModel.h
@@ -0,0 +1,59 @@
+/*  MaplyStarsModel.h
+ *  WhirlyGlobe-MaplyComponent
+ *
+ *  Created by Steve Gifford on 6/4/15.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#import <UIKit/UIKit.h>
+#import <WhirlyGlobeMaplyComponent/MaplyComponentObject.h>
+#import <WhirlyGlobeMaplyComponent/WhirlyGlobeViewController.h>
+
+/** 
+    The Stars Model parses and then displays a star field.
+    
+     This is used to display a star field around the earth.
+  */
+@interface MaplyStarsModel : NSObject
+
+/// Read stars from the given file
+- (nullable instancetype)initWithFileName:(NSString *__nonnull)fileName;
+
+/// Use the given image for each point.
+/// The given image will be sampled for individual points.
+- (void)setImage:(UIImage *__nonnull)image;
+
+/** 
+    Add stars to the given view controller
+    
+    Turn the star positions into geometry to display.  This object will track the resulting geometry objects.
+    
+    @param viewC The view controller to add the start geometry to.
+    
+    @param date The date for the 
+    
+    @param desc Additional parameters that may related to the geometry.
+    
+    @param mode Thread mode to use when adding the geometry.
+  */
+- (bool)addToViewC:(WhirlyGlobeViewController *__nonnull)viewC date:(NSDate *__nonnull)date desc:(NSDictionary *__nullable)desc mode:(MaplyThreadMode)mode;
+
+/** 
+    Remove star geometry from the registered view controller.
+    
+    Removes any objects created for the star geometry.
+  */
+- (void)removeFromViewC;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplySticker.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplySticker.h
new file mode 100644
index 0000000..91e886b
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplySticker.h
@@ -0,0 +1,85 @@
+/*
+ *  MaplySticker.h
+ *  WhirlyGlobeComponent
+ *
+ *  Created by Steve Gifford on 11/27/12.
+ *  Copyright 2012-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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <UIKit/UIKit.h>
+#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
+#import <WhirlyGlobeMaplyComponent/MaplyRenderController.h>
+
+/** 
+    Stickers are rectangles placed on the globe with an image.
+    
+    The Maply Sticker will stretch a rectangle (in geographic) over the given extents and tack the given image on top of it.  Stickers differ from MaplyMarker objects in that they're big.  They can stretch over a larger are and need to be subdivided as such.
+  */
+@interface MaplySticker : NSObject
+
+/// The lower left corner (in geographic) of the sticker
+@property (nonatomic,assign) MaplyCoordinate ll;
+
+/// The upper right corner (in geographic) of the sticker
+@property (nonatomic,assign) MaplyCoordinate ur;
+
+/// Angle of rotation around center
+@property (nonatomic,assign) float rotation;
+
+/** 
+    If present, this is the coordinate system the sticker is represented in.
+    
+    By default the coordinates are in geographic.  If this is present, the coordinates are in this system.
+  */
+@property (nonatomic,strong) MaplyCoordinateSystem * __nullable coordSys;
+
+/** 
+    Image (or MaplyTexture) to stretch over the sticker.
+    
+    The UIImage (or MaplyTexture) is cached in the view controller, so multiple references will result in the same texture being used.  The view controller also cleans up the images when it's done with it.
+  */
+@property (nonatomic,strong) id __nullable image;
+
+/** 
+    Images to stretch over the sticker.
+    
+    This is an NSArray of UIImages (or MaplyTextures).  The images will be cached in the view controller, so multiple references will result in the same texture being used.  The view controller also cleans up the images when it's done with them.
+    
+    All the images passed in here will be presented to the shader program, if it has variables for them.  It's up to you to do something with them in the shader.
+  */
+@property (nonatomic,strong) NSArray * __nullable images;
+
+/** 
+    Set the image format for the created textures.
+    
+    OpenGL ES offers us several image formats that are more efficient than 32 bit RGBA, but they're not always appropriate.  This property lets you choose one of them.  The 16 or 8 bit ones can save a huge amount of space and will work well for some imagery, most maps, and a lot of weather overlays.
+ 
+ | Image Format | Description |
+ |:-------------|:------------|
+ | MaplyImageIntRGBA | 32 bit RGBA with 8 bits per channel.  The default. |
+ | MaplyImageUShort565 | 16 bits with 5/6/5 for RGB and none for A. |
+ | MaplyImageUShort4444 | 16 bits with 4 bits for each channel. |
+ | MaplyImageUShort5551 | 16 bits with 5/5/5 bits for RGB and 1 bit for A. |
+ | MaplyImageUByteRed | 8 bits, where we choose the R and ignore the rest. |
+ | MaplyImageUByteGreen | 8 bits, where we choose the G and ignore the rest. |
+ | MaplyImageUByteBlue | 8 bits, where we choose the B and ignore the rest. |
+ | MaplyImageUByteAlpha | 8 bits, where we choose the A and ignore the rest. |
+ | MaplyImageUByteRGB | 8 bits, where we average RGB for the value. |
+ | MaplyImage4Layer8Bit | 32 bits, four channels of 8 bits each.  Just like MaplyImageIntRGBA, but a warning not to do anything too clever in sampling. |
+ */
+@property (nonatomic) MaplyQuadImageFormat imageFormat;
+
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplySun.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplySun.h
new file mode 100644
index 0000000..c106a09
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplySun.h
@@ -0,0 +1,47 @@
+/*  MaplySun.h
+ *  WhirlyGlobe-MaplyComponent
+ *
+ *  Created by Steve Gifford on 6/24/15.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#import <UIKit/UIKit.h>
+#import <WhirlyGlobeMaplyComponent/MaplyComponentObject.h>
+#import <WhirlyGlobeMaplyComponent/WhirlyGlobeViewController.h>
+#import <WhirlyGlobeMaplyComponent/MaplyLight.h>
+
+/** 
+    Utility for calculating sun position and shading info.
+    
+    This is a utility class that figures out where the sun is at a given date and provides positional information for lighting calculations.
+  */
+@interface MaplySun : NSObject
+
+/** 
+    Initialize with a date.
+    
+    Initialize with the given date.  The sun position will correspond to that.
+  */
+- (nonnull instancetype)initWithDate:(NSDate *__nonnull)date;
+
+/// Return the vector corresponding to the sun location from the earth.
+- (MaplyCoordinate3d)getDirection;
+
+/// Makes up a light that corresponds to the sun's location at a given time
+- (nonnull MaplyLight *)makeLight;
+
+/// Returns the location above the globe in lon/lat.  Yay geocentrism!
+- (MaplyCoordinate3d)asPosition;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyTapDelegate.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyTapDelegate.h
new file mode 100644
index 0000000..34589f1
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyTapDelegate.h
@@ -0,0 +1,30 @@
+/*  MaplyTapDelegate.h
+ *  WhirlyGlobeLib
+ *
+ *  Created by Steve Gifford on 1/20/12.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#import <UIKit/UIKit.h>
+#import <WhirlyGlobeMaplyComponent/MaplyTapMessage.h>
+
+/** Maply tap gesture delegate responds to a tap
+ by sending out a notification.
+ */
+@interface MaplyTapDelegate : NSObject <UIGestureRecognizerDelegate>
+
+/// Gesture recognizer created for the delegate
+@property (nonatomic,weak) UITapGestureRecognizer *gestureRecognizer;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyTapMessage.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyTapMessage.h
new file mode 100644
index 0000000..6500e2f
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyTapMessage.h
@@ -0,0 +1,35 @@
+/*  MaplyTapMessage.h
+ *  WhirlyGlobeLib
+ *
+ *  Created by Steve Gifford on 9/19/11.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <UIKit/UIKit.h>
+
+/** Tap Message is an
+	indication that the user tapped on the map.
+	It's passed as the object in a notification.
+ */
+@interface MaplyTapMessage : NSObject
+
+/// View that was touched
+@property (nonatomic,retain) UIView *view;
+//// Touch location on view in 2D
+@property (nonatomic,assign) CGPoint touchLoc;
+/// Where the eye was.
+@property (nonatomic,assign) float heightAboveSurface;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyTexture.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyTexture.h
new file mode 100644
index 0000000..d9eb9df
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyTexture.h
@@ -0,0 +1,31 @@
+/*
+ *  MaplyTexture.h
+ *  WhirlyGlobe-MaplyComponent
+ *
+ *  Created by Steve Gifford on 10/25/13.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <Foundation/Foundation.h>
+
+/** 
+    Represents an OpenGL texture.
+    
+    The MaplyTexture is an opaque object used to track OpenGL ES textures.  You create one from the MaplyBaseViewController's addImage call.  Then that texture will live until this object is released.
+    
+    These can be used in place of UIImages in the various objects (e.g. MaplyScreenMarker).
+  */
+@interface MaplyTexture : NSObject
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyTextureBuilder.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyTextureBuilder.h
new file mode 100644
index 0000000..74d842c
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyTextureBuilder.h
@@ -0,0 +1,47 @@
+/*
+ *  MaplyTextureBuilder.h
+ *  WhirlyGlobe-MaplyComponent
+ *
+ *  Created by Steve Gifford on 5/30/14.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <UIKit/UIKit.h>
+
+/** 
+    The Maply Linear Texture Builder is used to construct linear textures
+    for use on widened vectors.
+    
+    Linear textures of this type are used to represent dotted and dashed lines.  These may come from Mapnik configuration files or you can just make them up yourself.
+    
+    After creating an image with this object, you'll want to pass it as a parameter to the widened vector add method.
+  */
+@interface MaplyLinearTextureBuilder : NSObject
+
+/** 
+    Set the pattern of dots and empty spaces.
+    
+    This is an array of NSNumbers (treated as integers) that specify how big an element in the given pattern is.  The first element is on, the next off and so forth.
+  */
+- (void)setPattern:(NSArray *)elements;
+
+/** 
+    Build the image from the size and elements specified.
+    
+    If you've set a reasonable size and added a pattern, this will render the pattern into the image and return it.  If the size of the image differs from the size of the elements, they will be scaled to the image.
+  */
+- (UIImage *)makeImage;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyTileSourceNew.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyTileSourceNew.h
new file mode 100644
index 0000000..8100007
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyTileSourceNew.h
@@ -0,0 +1,161 @@
+/*
+ *  MaplyTileSourceNew.h
+ *  WhirlyGlobe-MaplyComponent
+ *
+ *  Created by Steve Gifford on 9/13/18.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <UIKit/UIKit.h>
+#import <WhirlyGlobeMaplyComponent/MaplyImageTile.h>
+#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
+#import <WhirlyGlobeMaplyComponent/MaplyCoordinateSystem.h>
+
+/**
+ This represents the indentifier for a unique tile in the pyramid.
+ 
+ Each tile in an image (or vector tile) pyramid can be uniquely
+ identified by an x, y, and level.  The levels start at zero and run to
+ a maximum.  x and y also start at zero and run to 2^level-1.
+ 
+ 
+ How these are interpreted is up to the tile source itself.  For example, some tile sources start at the lower left for (0,0) and run to the upper left.  Others do it the opposite way.  There's a flipY option in the MaplyQuadImageTileLayer to deal with this, but the system doesn't care all that much as long as you are consistent.
+ @see MaplyTileSource
+ @see MaplyQuadPagingLayer
+ @see MaplyQuadImageTilesLayer
+ */
+typedef struct
+{
+    int x, y, level;
+} MaplyTileID;
+
+/// Convert a MaplyTileID to an NSString
+NSString *__nonnull MaplyTileIDString(MaplyTileID tileID);
+
+/**
+    Tile Info Protocol.
+ 
+    This describes a single source of data tiles.  A uses these to
+    figure out what to load when and where.  The loader passes the result of
+    fetchInfoForTile to a MaplyTileFetcher to get the data it wants.
+  */
+@protocol MaplyTileInfoNew<NSObject>
+
+/**
+ The minimum zoom level available.
+ 
+ This is the lowest level we'll try to fetch.  Any levels below that will be filled in with placeholders.  Those are empty, but they allow us to load tiles beneath.
+ */
+- (int)minZoom;
+
+/**
+ The maximum zoom level available.
+ 
+ This is the highest level (e.g. largest) that we'll
+ fetch for a given pyramid tile source.  The source can sparse,
+ so you are not required to have these tiles available, but this
+ is as high as the loader will fetch.
+ */
+- (int)maxZoom;
+
+/**
+  FetchInfo object for a given tile.
+ 
+  The FetchInfo object is specific to the type of TileFetcher you're using and
+  tells the fetcher how to get the data you wawnt.
+  RemoteTileFetchers want a RemoteTileInfoNew object.
+ */
+- (id __nullable)fetchInfoForTile:(MaplyTileID)tileID flipY:(bool)flipY;
+
+@end
+
+/**
+  A tile source that just returns nil.  You can use this like a tile source where you need one that doesn't do anything.
+ */
+@interface MaplyTileInfoNone : NSObject<MaplyTileInfoNew>
+@end
+
+
+
+/**
+ Generic Tile fetcher request.
+ 
+ A single request for a single tile of data from a single source.
+ The tile fetcher will... fetch this and call the success or failure callback.
+ */
+@interface MaplyTileFetchRequest : NSObject
+
+/// Priority before importance.  Less is more important.
+@property (nonatomic) int priority;
+/// How important this is to us.  Probably screen space.
+@property (nonatomic) float importance;
+/// If all other values are equal, sort by this.
+/// It keeps requests we're waiting for grouped together
+@property (nonatomic) int group;
+
+/// Tile ID for this tile
+@property (nonatomic,assign) MaplyTileID tileID;
+
+/// An object representing the tile source.  Used for sorting.  Not accessed by the fetcher.
+@property (nonatomic,weak,nullable) id tileSource;
+
+/** This is requested from a TileInfo object by a loader and then passed
+ along to the TileFetcher.  TileFetchers expect certain objects.
+ The RemoteTileFetcher wants a RemoteFetchInfo object and will check.
+ Other fetchers will want other things.
+ */
+@property (nonatomic,nonnull,strong) id fetchInfo;
+
+/**
+ Tile Fetcher success callback.
+ 
+ Called on a new dispatch queue and won't be marked as loaded until it returns.
+ This is a good way to limit how many things are loading/parsing at the same time.
+ */
+@property (nonatomic,nullable) void (^success)(MaplyTileFetchRequest * __nonnull,id __nonnull);
+
+/**
+ Tile Fetcher failure callback.
+ */
+@property (nonatomic,nullable) void (^failure)(MaplyTileFetchRequest * __nonnull,NSError * __nonnull);
+
+@end
+
+/**
+    Tile Fetcher protocol.
+ 
+    The tile fetcher interacts with loaders that want tiles, as demanded by samplers.
+    A given data source (e.g. remote URL, MBTiles) needs one of these to fetch and return data.
+  */
+@protocol MaplyTileFetcher<NSObject>
+
+/// Add a whole group of requests at once.
+/// This is useful if we want to avoid low priority tiles grabbing the slots first
+- (void)startTileFetches:(NSArray<MaplyTileFetchRequest *> *__nonnull)requests;
+
+/// Update an active request with a new priority and importance
+- (id __nullable)updateTileFetch:(id __nonnull)fetchID priority:(int)priority importance:(double)importance;
+
+/// Name of this tile fetcher.  Used for coordinating tile sources.
+- (NSString * __nonnull)name;
+
+/// Cancel a group of requests at once
+/// Use the object returned by the startTileFetch call (which is just a Request object)
+- (void)cancelTileFetches:(NSArray * __nonnull)requestRets;
+
+/// Kill all outstanding connections and clean up
+- (void)shutdown;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyTouchCancelAnimationDelegate.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyTouchCancelAnimationDelegate.h
new file mode 100644
index 0000000..74c1391
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyTouchCancelAnimationDelegate.h
@@ -0,0 +1,26 @@
+/*  MaplyTouchCancelAnimationDelegate.h
+ *  WhirlyGlobeLib
+ *
+ *  Created by Jesse Crocker on 7/15/14.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#import <UIKit/UIKit.h>
+
+@interface MaplyTouchCancelAnimationDelegate : NSObject <UIGestureRecognizerDelegate>
+
+/// The gesture recognizer
+@property (nonatomic,strong) UIGestureRecognizer *gestureRecognizer;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyTwoFingerTapDelegate.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyTwoFingerTapDelegate.h
new file mode 100644
index 0000000..ad373c8
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyTwoFingerTapDelegate.h
@@ -0,0 +1,25 @@
+/*  MaplyTwoFingerTapDelegate.h
+ *
+ *  Created by Jesse Crocker on 2/4/14.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#import <WhirlyGlobeMaplyComponent/MaplyZoomGestureDelegate.h>
+
+@interface MaplyTwoFingerTapDelegate : MaplyZoomGestureDelegate
+
+// How long we animate from one place to the next
+@property (nonatomic) float animTime;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyUpdateLayer.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyUpdateLayer.h
new file mode 100644
index 0000000..4ff9ede
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyUpdateLayer.h
@@ -0,0 +1,100 @@
+/*
+ *  MaplyUpdateLayer.h
+ *  WhirlyGlobe-MaplyComponent
+ *
+ *  Created by Steve Gifford on 4/13/15.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <WhirlyGlobeMaplyComponent/MaplyComponentObject.h>
+#import <WhirlyGlobeMaplyComponent/MaplyControllerLayer.h>
+#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
+#import <WhirlyGlobeMaplyComponent/MaplyCoordinateSystem.h>
+#import <WhirlyGlobeMaplyComponent/MaplyTileSourceNew.h>
+#import <WhirlyGlobeMaplyComponent/MaplyRenderController.h>
+
+@class MaplyUpdateLayer;
+
+/** 
+    An encapsulation of where the viewer is and what they're looking at.
+    
+    This wraps information about where the viewer is currently looking from and at.
+  */
+@interface MaplyViewerState : NSObject
+
+/// Position of the viewer
+- (MaplyCoordinate3d) eyePos;
+
+@end
+
+
+/** 
+    The update delegate is called if the viewer moves, but not too often.
+    
+    Use this delegate to generate features around the viewer when they move.  You can control how far they have to move (in display coordinates) and how often you'll receive updates.
+  */
+@protocol MaplyUpdateDelegate
+
+/** 
+    Called when the MaplyUpdateLayer is initialized.
+    
+    This is called after things are set up.  You'll be on the layer thread here.
+  */
+- (void)start:(MaplyUpdateLayer *__nonnull)layer;
+
+/** 
+    Called when the viewer moves.
+    
+    You'll be called on the layer thread when the viewer moves more than your moveDist, subject to calls no more frequent than the minTime.
+  */
+- (void)viewerMovedTo:(MaplyViewerState *__nonnull)viewState layer:(MaplyUpdateLayer *__nonnull)layer;
+
+/** 
+    Called when the update layer is shutting down.
+    
+    Clean up your own data here.
+  */
+- (void)teardown:(MaplyUpdateLayer *__nonnull)layer;
+
+@end
+
+/** 
+    This layer will call a delegate as the user moves around, but constrained to distance and time.
+    
+    This layer is responsible for calling a delegate you provide as the user moves their viewpoint around.  You'll be called if they move from than a certain amount, but not more often than the minimum time.
+  */
+@interface MaplyUpdateLayer : MaplyControllerLayer
+
+/// The minimum distance that will trigger a delegate call.  Distance is in display units (radius of the earth = 1.0).
+@property (nonatomic,readonly) double moveDist;
+
+/// The delegate will be called no more often than this amount (in seconds).
+@property (nonatomic,readonly) double minTime;
+
+/// Maximum time to go without getting an update (if things are moving)
+@property (nonatomic) double maxLag;
+
+/** 
+    Initalize the update layer with a delegate and parameters.
+    
+    @param delegate The delegate that will be called every time the user moves, subject to the values.
+    
+    @param moveDist The minimum distance that will trigger a delegate call.  Distance is in display units (radius of the earth = 1.0).
+    
+    @param minTime The delegate will be called no more often than this amount (in seconds).
+  */
+- (nonnull instancetype)initWithDelegate:(NSObject<MaplyUpdateDelegate> *__nullable)delegate moveDist:(double)moveDist minTime:(double)minTime;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVariableTarget.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVariableTarget.h
new file mode 100644
index 0000000..d6ba490
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVariableTarget.h
@@ -0,0 +1,88 @@
+/*
+ *  MaplyVariableTarget.h
+ *  WhirlyGlobe-MaplyComponent
+ *
+ *  Created by Steve Gifford on 9/18/18.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <UIKit/UIKit.h>
+#import <WhirlyGlobeMaplyComponent/MaplyTexture.h>
+#import <WhirlyGlobeMaplyComponent/MaplyRenderTarget.h>
+#import <WhirlyGlobeMaplyComponent/MaplyRenderController.h>
+
+/**
+    A variable target manages two pass rendering for one type of variable.
+ 
+    Set up the variable target
+  */
+@interface MaplyVariableTarget : NSObject
+
+/// Initialize with the variable type and view controller
+- (nonnull instancetype)initWithType:(MaplyQuadImageFormat)type viewC:(NSObject<MaplyRenderControllerProtocol> * __nonnull)viewC;
+
+/// Render target created for this variable target
+@property (nonatomic,readonly,strong,nonnull) MaplyRenderTarget *renderTarget;
+
+/// Scale the screen by this amount for the render target
+- (void)setScale:(double)scale;
+
+/// Color of the rectangle used to draw the render target
+@property (nonatomic,strong,nonnull) UIColor *color;
+
+/// Draw priority of the rectangle we'll use to draw the render target to the screen
+@property (nonatomic,assign) int drawPriority;
+
+/// If set (by default), then we clear out the render target every frame
+@property (nonatomic,assign) bool clearEveryFrame;
+
+/// When we're clearing, use this value.  0 by default
+@property (nonatomic,assign) float clearVal;
+
+/// Shader used to draw the render target to the screen.
+/// Leave this empty and we'll provide our own
+@property (nonatomic,strong,nullable) MaplyShader *shader;
+
+/// By default we'll build a rectangle to display the target
+@property (nonatomic,assign) bool buildRectangle;
+
+/// If set, the rectangle rendered to the screen will read from the z Buffer
+/// Useful, when doing depth comparisons
+@property (nonatomic,assign) bool zBuffer;
+
+/// Rectangle created to show the variable target (if that's set)
+@property (nonatomic,readonly,nullable) MaplyComponentObject *rectObj;
+
+/// Size of the texture in pixels for the render target
+@property (nonatomic,readonly) CGSize texSize;
+
+/// The texture we're rendering to (as part of the render target)
+@property (nonatomic,readonly,strong,nullable) MaplyTexture *renderTex;
+
+/// Passing in another variable target will let us assign that target to the
+/// rectangle used to render this variable target's data.  This is used if
+/// you need the contents of more than one target in a shader.
+- (void)addVariableTarget:(MaplyVariableTarget * __nonnull)target;
+
+// Pass this uniform block to the geometry we create for rendering (if it was created)
+- (void)setUniformBlock:(NSData *__nonnull)uniBlock buffer:(int)bufferID;
+
+/// Clear the target for the next frame
+- (void)clear;
+
+/// Stop rendering to the target and release everything
+- (void)shutdown;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVectorObject.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVectorObject.h
new file mode 100644
index 0000000..e85aeb4
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVectorObject.h
@@ -0,0 +1,562 @@
+/*  MaplyVectorObject.h
+ *  WhirlyGlobeComponent
+ *
+ *  Created by Steve Gifford on 8/2/12.
+ *  Copyright 2012-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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
+#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
+#import <WhirlyGlobeMaplyComponent/MaplyCoordinateSystem.h>
+
+@class MaplyBaseViewController;
+
+/// Data type for the vector.  Multi means it contains multiple types
+typedef NS_ENUM(NSInteger, MaplyVectorObjectType) {
+	MaplyVectorNoneType,
+	MaplyVectorPointType,
+    MaplyVectorLinearType,
+    MaplyVectorLinear3dType,
+	MaplyVectorArealType,
+	MaplyVectorMultiType,
+};
+
+
+/** 
+    Maply Vector Object represents zero or more vector features.
+    
+    The Vector Object can hold several vector features of the same or different types.  It's meant to be a fairly opaque structure, often read from GeoJSON or Shapefiles.  It's less opaque than originally planned, however, and sports a number of specific methods.
+    
+    If you're doing real vector manipulation, it's best to do it somewhere else and then create one of these as needed for display.
+    
+    Vector Objects can be created directly or read from a MaplyVectorDatabase.  They are typically then displayed on top of a MaplyViewController or WhirlyGlobeViewController as vectors.
+    
+    Vector Objects vertices are always in geographic, with longitude = x and latitude = y.
+  */
+@interface MaplyVectorObject : NSObject
+
+/// Turn this off to make this vector invisible to selection.
+/// On by default.
+@property (nonatomic,assign) bool selectable;
+
+/** 
+    Return the attributes for the vector object.
+    
+    All vectors should have some set of attribution.  If there's more than one vector feature here, we'll return the attributes on the first one.
+    
+    The attribution is returned as an NSDictionary and, though you can modify it, you probably shouldn't.
+  */
+@property (nonatomic,readonly) NSMutableDictionary *__nullable attributes;
+
+/** 
+    Parse vector data from geoJSON.
+    
+    Returns one object to represent the whole thing, which might include multiple different vectors.  This version uses the faster JSON parser.
+    
+    We assume the geoJSON is all in decimal degrees in WGS84.
+  */
++ (MaplyVectorObject *__nullable)VectorObjectFromGeoJSON:(NSData *__nonnull)geoJSON;
+
+/** 
+    Parse vector data from geoJSON.
+    
+    Returns one object to represent the whole thing, which might include multiple different vectors.  This version uses slower JSON parser.
+    
+    We assume the geoJSON is all in decimal degrees in WGS84.
+*/
++ (MaplyVectorObject *__nullable)VectorObjectFromGeoJSONApple:(NSData *__nonnull)geoJSON;
+
+/** 
+    Parse vector data from geoJSON.
+    
+    Returns one object to represent the whole thing, which might include multiple different vectors.  This version parses its data from an NSDictionary, which had to be parsed from JSON at some point.  Probably the slower path.
+    
+    We assume the geoJSON is all in decimal degrees in WGS84.
+ */
++ (MaplyVectorObject *__nullable)VectorObjectFromGeoJSONDictionary:(NSDictionary *__nonnull)geoJSON;
+
+// Note: Reader turned off
+#if 0
+/** 
+    Read vector objects from the given cache file.
+    
+    MaplyVectorObject's can be written and read from a binary file.  We use this for caching data locally on the device.
+    
+    @param fileName Name of the binary vector file.
+    
+    @return The vector object(s) read from the file or nil on failure.
+  */
++ (MaplyVectorObject *__nullable)VectorObjectFromFile:(NSString *__nonnull)fileName;
+#endif
+
+/** 
+    Read vector objects from the given shapefile.
+    
+    This will read all the shapes in the given shapefile into memory and return them as one MaplyVectorObject.
+    
+    @param fileName The basename of the shape file.  Don't include the extension.
+    
+    @return The vector object(s) read from the file or nil on failure.
+  */
++ (MaplyVectorObject *__nullable)VectorObjectFromShapeFile:(NSString *__nonnull)fileName;
+
+/** 
+    Parse vector objects from a JSON assembly.
+    
+    This version can deal with non-compliant assemblies returned by the experimental OSM server
+  */
++ (NSDictionary *__nullable)VectorObjectsFromGeoJSONAssembly:(NSData *__nonnull)geoJSON;
+
+/** 
+    Initialize with a single data point and attribution.
+ 
+    This version takes a single coordinate and the attributes to go with it.
+ */
+- (nonnull instancetype)initWithPoint:(MaplyCoordinate)coord attributes:(NSDictionary *__nullable)attr;
+
+/** 
+    Initialize with a single data point and attribution.
+    
+    This version takes a single coordinate and the attributes to go with it.
+  */
+- (nonnull instancetype)initWithPointRef:(const MaplyCoordinate *__nonnull)coord attributes:(NSDictionary *__nullable)attr;
+
+/** 
+    Initialize with a linear feature.
+ 
+    This version takes an array of coordinates (2 `NSNumber`s per coordinate, in degrees) and the attribution.
+    With this it will make a linear feature.
+    Prefer the `inDegrees:` overload to reduce ambiguity.
+    Returns nil if the coordinate array contains an odd number of values.
+ */
+- (nullable instancetype)initWithLineString:(const NSArray<NSNumber*> *__nonnull)coords
+                                attributes:(NSDictionary *__nullable)attr;
+
+/**
+    Initialize with a linear feature.
+ 
+    This version takes an array of coordinate pairs (as NSNumber) and the attribution.  With this it will make a linear feature.
+    Returns nil if the coordinate array contains an odd number of values.
+ */
+- (nullable instancetype)initWithLineString:(const NSArray<NSNumber*> *__nonnull)coords
+                                attributes:(NSDictionary *__nullable)attr
+                                 inDegrees:(bool)inDegrees;
+
+/** 
+    Initialize with a linear feature.
+ 
+    This version takes an array of coordinates, the size of that array and the attribution.  With this it will make a linear feature.
+  */
+- (nonnull instancetype)initWithLineString:(const MaplyCoordinate *__nonnull)coords
+                                 numCoords:(int)numCoords
+                                attributes:(NSDictionary *__nullable)attr;
+
+/** 
+    Inintialize as an areal feature.
+ 
+    This version takes an array of coordinates, the size of that array and the attribution.
+    With this it will make a single area feature with one (exterior) loop.  To add loops, call `addHole:numCoords:`
+  */
+- (nonnull instancetype)initWithAreal:(const MaplyCoordinate *__nonnull)coords
+                            numCoords:(int)numCoords
+                           attributes:(NSDictionary *__nullable)attr;
+
+/**
+  Inintialize as an areal feature.
+ 
+    This version takes an array of coordinates (2 `NSNumber`s per coordinate, in radians).
+    With this it will make a single area feature with one (exterior) loop.  To add loops, call addHole:numCoords:
+    Prefer the `inDegrees:` overload to reduce ambiguity.
+    Returns nil if the coordinate array contains an odd number of values.
+*/
+- (nullable instancetype)initWithArealArray:(const NSArray<NSNumber *> *__nonnull)coords
+                                 attributes:(NSDictionary *__nullable)attr;
+
+/**
+    Inintialize as an areal feature.
+ 
+    This version takes an array of coordinates (2 `NSNumber`s per coordinate, in radians).
+    With this it will make a single area feature with one (exterior) loop.  To add loops, call `addHole:numCoords:`
+    Returns nil if the coordinate array contains an odd number of values.
+*/
+- (nullable instancetype)initWithArealArray:(const NSArray<NSNumber *> *__nonnull)coords
+                                 attributes:(NSDictionary *__nullable)attr
+                                  inDegrees:(bool)inDegrees;
+
+/** 
+    Initializes with vectors parsed from geoJSON.
+	
+    Returns one object to represent the whole thing, which might include multiple different vectors.  This version uses the faster JSON parser.
+    
+    We assume the geoJSON is all in decimal degrees in WGS84.
+ */
+- (nullable instancetype)initWithGeoJSON:(NSData *__nonnull)geoJSON;
+
+/** 
+    Initializes with vector parsed from geoJSON.
+	
+    Returns one object to represent the whole thing, which might include multiple different vectors.  This version uses slower JSON parser.
+	
+    We assume the geoJSON is all in decimal degrees in WGS84.
+ */
+- (nullable instancetype)initWithGeoJSONApple:(NSData *__nonnull)geoJSON;
+
+/** 
+    Initializes with vector parsed from geoJSON.
+	
+    Returns one object to represent the whole thing, which might include multiple different vectors.  This version parses its data from an NSDictionary, which had to be parsed from JSON at some point.  Probably the slower path.
+	
+    We assume the geoJSON is all in decimal degrees in WGS84.
+ */
+- (nullable instancetype)initWithGeoJSONDictionary:(NSDictionary *__nonnull)geoJSON;
+
+// Note: Turned off with reading
+#if 0
+/** 
+    Initializes with vectors read from the given cache file.
+	
+    MaplyVectorObject's can be written and read from a binary file.  We use this for caching data locally on the device.
+	
+    @param fileName Name of the binary vector file.
+	
+    @return The vector object(s) read from the file or nil on failure.
+ */
+- (nullable instancetype)initWithFile:(NSString *__nonnull)fileName;
+#endif
+
+/** 
+    Initializes with vectors read from the given shapefile.
+	
+    This will read all the shapes in the given shapefile into memory and return them as one MaplyVectorObject.
+	
+    @param fileName The basename of the shape file.  Don't include the extension.
+	
+    @return The vector object(s) read from the file or nil on failure.
+ */
+- (nullable instancetype)initWithShapeFile:(NSString *__nonnull)fileName;
+
+
+// Note: Vector writing turned off
+#if 0
+/** 
+    Write the vector object to the given file on the device.
+    
+    We support a binary format for caching vector data.  Typically you write these files on the device or in the simulator and then put them in a place you can easily find them when needed.
+    
+    @param fileName The file to read the vector data from.
+    
+    @return Returns true on succes, false on failure.
+  */
+- (bool)writeToFile:(NSString *__nonnull)fileName;
+#endif
+
+/** 
+    Make a deep copy of the vector object and return it.
+    
+    This makes a complete copy of the vector object, with all features and nothing shared.
+    
+    Had to rename this because Apple's private method scanner is dumb.
+  */
+- (MaplyVectorObject *__nonnull)deepCopy2;
+
+/** 
+    Reproject from one coordinate system to another.
+    
+    This reprojects every single point in the points, linears, and areals (and mesh) from the source coordinate system to the destionation.
+    
+    Typically, you'll want Plate Carree for display, the destSystem is probably that.
+    
+    For various reasons (e.g. scale), this will probably not work right for you.
+    
+    @param srcSystem The source coordinate system.  The data is already in this sytem.
+    
+    @param destSystem The destination coordinate system.  The data will be in this system on return.
+  */
+- (void)reprojectFrom:(MaplyCoordinateSystem *__nonnull)srcSystem to:(MaplyCoordinateSystem *__nonnull)destSystem;
+
+/** 
+    Dump the feature(s) out as text
+    
+    This will write each feature out as text for debugging.
+  */
+- (NSString *__nonnull)log;
+
+/** 
+    Add a hole to an existing feature.
+    
+    This method is expecting to find exactly one areal feature.  If it finds one, it will add the given hole as a loop on the end of the list of loops.
+  */
+- (void)addHole:(const MaplyCoordinate *__nonnull)coords numCoords:(int)numCoords;
+
+/** 
+    Returns the type of the vector feature.
+    
+    This method returns the type of the vector.  Since vector objects can contain multiple types of vectors at once, this is somewhat complicated.
+ 
+|Type | Description |
+|:----|:-----------:|
+|MaplyVectorNoneType | There are no features in this object. |
+|MaplyVectorPointType | There are only points (and multi-points) in the object. |
+|MaplyVectorLinearType | There are only linear features in the object. |
+|MaplyVectorLinear3dType | There are only linear features with Z values in the object. |
+|MaplyVectorArealType | There are only areal features in the object. |
+|MaplyVectorMultiType | There are multiple features of different types in the object. |
+  */
+- (MaplyVectorObjectType)vectorType;
+
+/** 
+    Run a point in polygon test on all the areal features within the object.
+    
+    We'll run a point in polygon test on all the areal features within the vector object.  If the point is within one of them, we return true, otherwise false.
+  */
+- (bool)pointInAreal:(MaplyCoordinate)coord;
+
+/**
+    Test if any linear feature is within distance of coord
+ */
+- (bool)pointNearLinear:(MaplyCoordinate)coord distance:(float)maxDistance inViewController:(MaplyBaseViewController *__nonnull)vc;
+
+/** 
+    Calculate the center of the entire set of vectors in this object.
+  */
+- (MaplyCoordinate)center;
+
+/** 
+    Copy the vectors in the given vector object into this one.
+  */
+- (void)mergeVectorsFrom:(MaplyVectorObject *__nonnull)otherVec;
+
+/** 
+    For a linear feature, calculate the mid oint and rotation at that point.
+    
+    The vector object contains a number of half baked geometric queries, this being one of them.
+    
+    This finds the middle (as measured by distance) of a linear feature and then calculations an angle corresponding to the line segment that middle sits in.
+    
+    Why?  Think label road placement.
+  */
+- (bool)linearMiddle:(MaplyCoordinate *__nonnull)middle rot:(double *__nonnull)rot;
+
+- (bool)linearMiddle:(MaplyCoordinate *__nullable)middle rot:(double *__nullable)rot displayCoordSys:(MaplyCoordinateSystem *__nonnull)coordSys;
+
+/** 
+    For a linear feature, calculate the mid point.
+ 
+    This is a convenience method to be called without pointers (Swift)
+ 
+    If you need both the mid point and the rotation, this method is less efficient than the method with pointers.
+ 
+    @return kMaplyNullCoordinate in case of error
+
+ */
+- (MaplyCoordinate)linearMiddle:(MaplyCoordinateSystem *__nonnull)coordSys;
+
+/** 
+    For a linear feature, calculate the mid point and returns the rotation at that point.
+ 
+    This is a convenience method to be called without pointers (Swift)
+ 
+    If you need both the mid point and the rotation, this method is less efficient than the method with pointers.
+ 
+    @return DBL_MIN in case of error
+ */
+- (double)linearMiddleRotation:(MaplyCoordinateSystem *__nonnull)coordSys;
+
+/** 
+    return the middle coordinate in a line feature
+    
+    @return kMaplyNullCoordinate in case of error
+ */
+- (MaplyCoordinate)middleCoordinate;
+
+/** 
+    return the middle coordinate in a line feature.
+ */
+- (bool)middleCoordinate:(MaplyCoordinate *__nonnull)middle;
+
+/** 
+    Calculate the center and extents of the largest loop in an areal feature.
+    
+    The vector object contains a number of half baked geometric queries, this being one of them.
+    
+    If this vector contains at least one areal feature, we'll determine which loop is the largest and return the center of that loop, as well as its bounding box.
+    
+    Why?  Think label placement on an areal feature.
+    
+    @return Returns false if there was no loop (i.e. probably isn't an areal)
+  */
+- (bool)largestLoopCenter:(MaplyCoordinate *__nullable)center mbrLL:(MaplyCoordinate *__nullable)ll mbrUR:(MaplyCoordinate *__nullable)ur;
+
+/** 
+    Calculate the centroid of the largest loop in the areal feature.
+ 
+    The centroid is a better center for label placement than the middle of the largest loop as calculated by largestLoopCenter:mbrLL:mbrUR:
+ 
+    @return Returns the centroid structure. If there was no loop (i.e. probably isn't an areal), the result will be kMaplyNullCoordinate
+ */
+- (MaplyCoordinate)centroid;
+
+/** 
+    Calculate the centroid of the largest loop in the areal feature.
+    
+    The centroid is a better center for label placement than the middle of the largest loop as calculated by largestLoopCenter:mbrLL:mbrUR:
+    
+    @return Returns false if there was no loop (probably wasn't an areal).
+  */
+- (bool)centroid:(MaplyCoordinate *__nonnull)centroid;
+
+/** 
+    Calculate the bounding box of all the features in this vector object.
+ 
+    @return kMaplyNullBoundingBox in case of error
+ */
+- (MaplyBoundingBox)boundingBox;
+
+/** 
+    Calculate the bounding box of all the features in this vector object.
+  */
+- (bool)boundingBoxLL:(MaplyCoordinate *__nonnull)ll ur:(MaplyCoordinate *__nonnull)ur;
+
+/** 
+    Calculate the area of the outer loops.
+    
+    This returns the area of the outer loops of any areal features in the VectorObject.
+  */
+- (double)areaOfOuterLoops;
+
+/** 
+    Convert any linear features into areal features.
+    
+    Convert linear features to areal features by closing each one individually.
+  */
+- (MaplyVectorObject * _Nonnull )linearsToAreals;
+
+/**
+    Convert any areal features into outlines.
+  */
+- (MaplyVectorObject * __nonnull)arealsToLinears;
+
+/**
+    Reverse the direction of areal loops in-place
+ */
+- (void)reverseAreals;
+
+/**
+    Return a copy with the areal loops reversed
+ */
+- (MaplyVectorObject * __nonnull)reversedAreals;
+
+/**
+    Filter out edges created from clipping areal features on the server.
+ 
+    In some very specific cases (OSM water) we get polygons that are obviously clipped
+    along internal boundaries.  We can clear this up with some very, very specific logic.
+ 
+    Input must be closed areals and output is linears.
+  */
+- (MaplyVectorObject *__nonnull)filterClippedEdges;
+
+/** 
+    Convert a feature to an NSArray of NSArrays of CLLocation points.
+    
+    This is intended for areal features.  It will convert those coordinates to CLLocation values and return them.  Obviously this is intended for things that need CLLocation values.
+    
+    @return Returns an NSArray of NSArray's which then contain CLLocation points.
+  */
+- (NSArray *__nullable)asCLLocationArrays;
+
+/** 
+    Return the data as an NSArray of NSNumbers.
+    
+    If this is a linear, we'll return the points as an NSArray of NSNumbers.
+  */
+- (NSArray *__nullable)asNumbers;
+
+/** 
+    Split up this feature into individual features and return an array of them.
+    
+    A vector object can represent multiple features with no real rhyme or reason to it.  This method will make one vector object per feature, allowing you to operate on those individually.
+    
+    @return An NSArray of MaplyVectorObject.
+  */
+- (NSArray<MaplyVectorObject *> *__nonnull)splitVectors;
+
+/** 
+    Subdivide the edges in this feature to a given tolerance.
+    
+    This will break up long edges in a vector until they lie flat on a globe to a given epsilon.  The epislon is in display coordinates (radius = 1.0). This routine breaks this up along geographic boundaries.
+  */
+- (void)subdivideToGlobe:(float)epsilon;
+
+/** 
+    Subdivide the edges in this feature to a given tolerance, using great circle math.
+    
+    This will break up long edges in a vector until they lie flat on a globe to a given epsilon using a great circle route.  The epsilon is in display coordinates (radius = 1.0).
+  */
+- (void)subdivideToGlobeGreatCircle:(float)epsilon;
+
+/** 
+    Subdivide the edges in this feature to a given tolerance, using great circle math.
+ 
+    This version samples a great circle to display on a flat map.
+ */
+- (void)subdivideToFlatGreatCircle:(float)epsilon;
+
+
+/**
+    Subdivide the edges in this feature to a given tolerance, using ellipsoidal great circle math.
+    
+    This will break up long edges in a vector until they lie flat on a globe to a given epsilon using a great circle route.  The epsilon is in display coordinates (radius = 1.0).
+  */
+- (void)subdivideToGlobeGreatCirclePrecise:(float)epsilon;
+
+/**
+    Subdivide the edges in this feature to a given tolerance, using ellipsoidal  great circle math.
+ 
+    This version samples a great circle to display on a flat map.
+ */
+- (void)subdivideToFlatGreatCirclePrecise:(float)epsilon;
+
+/** 
+    Tesselate the areal geometry in this vector object and return triangles.
+    
+    This will attempt to tesselate the areals (with holes) and turn them into triangles.  No attribution will be assigned to the new triangles, so be aware.  The tesselator is the GLU based one and does a decent job.  Odds are if there's something wrong it's in the input data.
+  */
+- (MaplyVectorObject *__nonnull)tesselate;
+
+/** 
+    Clip the given (presumably areal) feature(s) to a grid in radians of the given size.
+    
+    This will run through the loops in the input vectors and clip them against a grid.  The grid size is given in radians.
+    
+    @return New areal features broken up along the grid.
+  */
+- (MaplyVectorObject *__nullable)clipToGrid:(CGSize)gridSize;
+
+/**
+    
+    Clip the given (probably areal) features to the given bounding box.
+    
+    This will run through the loops of the areal features and clip them against a bounding box.
+    
+    The bounding box should be in the same coordinate system as the grid, probably radians.
+    
+    @return The new areal features will be clipped along the bounding box.
+  */
+- (MaplyVectorObject *__nullable)clipToMbr:(MaplyCoordinate)ll upperRight:(MaplyCoordinate)ur;
+
+@end
+
+typedef MaplyVectorObject WGVectorObject;
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVectorStyle.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVectorStyle.h
new file mode 100644
index 0000000..cecf6d9
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVectorStyle.h
@@ -0,0 +1,214 @@
+/*  MaplyVectorStyle.h
+ *  WhirlyGlobe-MaplyComponent
+ *
+ *  Created by Steve Gifford on 1/3/14.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#import <UIKit/UIKit.h>
+#import <WhirlyGlobeMaplyComponent/MaplyTileSourceNew.h>
+#import <WhirlyGlobeMaplyComponent/MaplyBaseViewController.h>
+
+@class MaplyVectorTileData;
+
+/** 
+    Settings that control how vector tiles look in relation to their styles.
+    
+    These are set based on the sort of device we're on, particularly retina vs. non-retina.  They can be manipulated directly as well for your needs.
+  */
+@interface MaplyVectorStyleSettings : NSObject
+
+/// Initialize with the (presumably) retina scale
+- (instancetype __nonnull)initWithScale:(CGFloat)scale;
+
+/// Line widths will be scaled by this amount before display.
+@property (nonatomic) float lineScale;
+/// Text sizes will be scaled by this amount before display.
+@property (nonatomic) float textScale;
+/// Markers (symbols+circles) will be scaled by this amount before display.
+@property (nonatomic) float markerScale;
+/// Symbols will be scaled by this amount before display.
+@property (nonatomic) float symbolScale;
+/// Circles will be scaled by this amount before display.
+@property (nonatomic) float circleScale;
+/// Importance for markers in the layout engine
+@property (nonatomic) float markerImportance;
+/// Default marker size when none is specified
+@property (nonatomic) float markerSize;
+/// Importance for labels in the layout engine
+@property (nonatomic) float labelImportance;
+/// If set we'll use the zoom levels defined in the style
+@property (nonatomic) bool useZoomLevels;
+
+/// For symbols we'll try to pull a UUID out of this field to stick in the marker and label uniqueID
+@property (nonatomic,nullable) NSString *uuidField;
+
+/// Draw priority calculated as offset from here
+@property (nonatomic) int baseDrawPriority;
+
+/// Offset between levels
+@property (nonatomic) int drawPriorityPerLevel;
+
+/** 
+    The overall map scale calculations will be scaled by this amount.
+    
+    We use the map scale calculations to figure out what is dispalyed and when.  Not what to load in, mind you, that's a separate, but related calculation.  This controls the scaling of those calculations.  Scale it down to load things in later, up to load them in sooner.
+  */
+@property (nonatomic) float mapScaleScale;
+
+/// Dashed lines will be scaled by this amount before display.
+@property (nonatomic) float dashPatternScale;
+
+/// Use widened vectors (which do anti-aliasing and such)
+@property (nonatomic) bool useWideVectors;
+
+/// Where we're using old vectors (e.g. not wide) scale them by this amount
+@property (nonatomic) float oldVecWidthScale;
+
+/// If we're using widened vectors, only activate them for strokes wider than this.  Defaults to zero.
+@property (nonatomic) float wideVecCuttoff;
+
+/// If set, this is the shader we'll use on the areal features.
+@property (nonatomic,strong) NSString * _Nullable arealShaderName;
+
+/// If set, we'll make all the features selectable.  If not, we won't.
+@property (nonatomic) bool selectable;
+
+/// If set, icons will be loaded from this directory
+@property (nonatomic, strong) NSString * _Nullable iconDirectory;
+
+/// The default font family for all text
+@property (nonatomic,strong) NSString * _Nullable fontName;
+
+@end
+
+@protocol MaplyVectorStyle;
+
+/** 
+    Protocol for styling the vectors.
+ 
+    You pass in an object which adheres to this protocol and will style
+ the vectors read by a MaplyMapnikVectorTiles object.  In general, this will be
+ a parsed Mapnik vector file, but you can substitute your own logic as well.
+ */
+@protocol MaplyVectorStyleDelegate <NSObject>
+
+/** 
+    Return the styles that apply to the given feature (attributes).
+ */
+- (nullable NSArray *)stylesForFeatureWithAttributes:(NSDictionary *__nonnull)attributes
+                                              onTile:(MaplyTileID)tileID
+                                             inLayer:(NSString *__nonnull)layer
+                                               viewC:(NSObject<MaplyRenderControllerProtocol> *__nonnull)viewC;
+
+/// Return true if the given layer is meant to display for the given tile (zoom level)
+- (BOOL)layerShouldDisplay:(NSString *__nonnull)layer tile:(MaplyTileID)tileID;
+
+/// Return the style associated with the given UUID.
+- (nullable NSObject<MaplyVectorStyle> *)styleForUUID:(long long)uiid viewC:(NSObject<MaplyRenderControllerProtocol> *__nonnull)viewC;
+
+/// Return the style for the background
+- (nullable NSObject<MaplyVectorStyle> *)backgroundStyleViewC:(NSObject<MaplyRenderControllerProtocol> *__nonnull)viewC;
+
+// Return a list of all the styles in no particular order.  Needed for categories and indexing
+- (NSArray * __nonnull)allStyles;
+
+@end
+
+/** 
+    Base protocol for the vector styles.
+    
+    Maply Vector Style is the protocol the your vector style needs to
+    implement for the vector tile parsers to recognize it.
+  */
+@protocol MaplyVectorStyle<NSObject>
+
+/// Unique Identifier for this style
+- (long long) uuid;
+
+/// Category used for sorting
+- (NSString * _Nullable) getCategory;
+
+/// Set if this geometry is additive (e.g. sticks around) rather than replacement
+- (bool) geomAdditive;
+
+/// Construct objects related to this style based on the input data.
+- (void)buildObjects:(NSArray * _Nonnull)vecObjs
+             forTile:(MaplyVectorTileData * __nonnull)tileData
+               viewC:(NSObject<MaplyRenderControllerProtocol> * _Nonnull)viewC
+                desc:(NSDictionary * _Nullable)desc;
+
+/// Construct objects related to this style based on the input data.
+- (void)buildObjects:(NSArray * _Nonnull)vecObjs
+             forTile:(MaplyVectorTileData * __nonnull)tileData
+               viewC:(NSObject<MaplyRenderControllerProtocol> * _Nonnull)viewC
+                desc:(NSDictionary * _Nullable)desc
+            cancelFn:(bool(^__nullable)(void))cancelFn;
+
+@end
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+/** 
+    Use a style delegate to interpret vector data.
+ 
+    Run the style delegate against the given vectors.  The resulting features are added to the
+ given view controller using the thread mode specified.
+ 
+    @param vecObjs An array of MaplyVectorObject.
+ 
+    @param styleDelegate The style delegate that controls how the vectors will look.
+ 
+    @param viewC View controller to add the geometry to.
+ 
+    @param threadMode MaplyThreadCurrent will block until all the features are added.  MaplyThreadAny will do some of the work on another thread.
+ */
+NSArray<MaplyComponentObject*> * _Nonnull AddMaplyVectorsUsingStyle(NSArray<MaplyVectorObject*> * _Nonnull vecObjs,
+                                                                    NSObject<MaplyVectorStyleDelegate> * _Nonnull styleDelegate,
+                                                                    NSObject<MaplyRenderControllerProtocol> * _Nonnull viewC,
+                                                                    MaplyThreadMode threadMode);
+
+/**
+    Use a style delegate to interpret vector data.
+ 
+    Run the style delegate against the given vectors.  The resulting features are added to the
+ given view controller using the thread mode specified.
+ 
+    @param vecObjs An array of MaplyVectorObject.
+ 
+    @param styleDelegate The style delegate that controls how the vectors will look.
+ 
+    @param viewC View controller to add the geometry to.
+
+    @param tileId The tile where the feature originates.
+ 
+    @param enable Automatically enable the generated objects
+ 
+    @param threadMode MaplyThreadCurrent will block until all the features are added.  MaplyThreadAny will do some of the work on another thread.
+ 
+    @param desc Additional attributes to include with the generated component objects
+ */
+NSArray<MaplyComponentObject*> * _Nonnull AddMaplyVectorsUsingStyleAndAttributes(
+    NSArray<MaplyVectorObject*> * _Nonnull vecObjs,
+    NSObject<MaplyVectorStyleDelegate> * _Nonnull styleDelegate,
+    NSObject<MaplyRenderControllerProtocol> * _Nonnull viewC,
+    MaplyTileID tileId,
+    bool enable,
+    MaplyThreadMode threadMode,
+    NSDictionary * _Nullable desc);
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVectorStyleSimple.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVectorStyleSimple.h
new file mode 100644
index 0000000..3543e30
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVectorStyleSimple.h
@@ -0,0 +1,85 @@
+/*  MaplyVectorStyleSimple.m
+ *  WhirlyGlobe-MaplyComponent
+ *
+ *  Created by Steve Gifford on 3/15/16.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#import <Foundation/Foundation.h>
+#import <WhirlyGlobeMaplyComponent/MapboxVectorTiles.h>
+
+/** 
+    Simple default style to see something in vector tile data.
+    
+    A simple vector style that displays each layer in a random color.
+    Use this as a starting point for your own style.
+  */
+@interface MaplyVectorStyleSimpleGenerator : NSObject<MaplyVectorStyleDelegate>
+
+@property (nonatomic,weak) NSObject<MaplyRenderControllerProtocol> *viewC;
+
+/// Initialize with a map view controller
+- (id)initWithViewC:(NSObject<MaplyRenderControllerProtocol> *)viewC;
+
+/// uuid for the styles
+- (long long)generateID;
+
+@end
+
+/** 
+    Base class for the simple vector style.
+  */
+@interface MaplyVectorStyleSimple : NSObject<MaplyVectorStyle>
+
+/// Unique Identifier for this style
+@property (nonatomic) long long uuid;
+
+/// Set if this geometry is additive (e.g. sticks around) rather than replacement
+@property (nonatomic) bool geomAdditive;
+
+/// Priority for sorting among layers
+@property (nonatomic) int drawPriority;
+
+@property (nonatomic,weak) NSObject<MaplyRenderControllerProtocol> *viewC;
+
+- (id)initWithGen:(MaplyVectorStyleSimpleGenerator *)gen viewC:(NSObject<MaplyRenderControllerProtocol> *)viewC;
+
+@end
+
+/** 
+    Simple filled polygon with a random color.
+  */
+@interface MaplyVectorStyleSimplePolygon : MaplyVectorStyleSimple
+
+@property (nonatomic,strong) UIColor *color;
+
+@end
+
+/** 
+    Simple point we'll convert to a label.
+  */
+@interface MaplyVectorStyleSimplePoint : MaplyVectorStyleSimple
+
+@property (nonatomic,strong) UIFont *font;
+
+@end
+
+/** 
+    Simple linear with a random color.
+  */
+@interface MaplyVectorStyleSimpleLinear : MaplyVectorStyleSimple
+
+@property (nonatomic,strong) UIColor *color;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVectorTileLineStyle.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVectorTileLineStyle.h
new file mode 100644
index 0000000..ce3984a
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVectorTileLineStyle.h
@@ -0,0 +1,29 @@
+/*  MaplyVectorLineStyle.h
+ *  WhirlyGlobe-MaplyComponent
+ *
+ *  Created by Steve Gifford on 1/3/14.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#import <WhirlyGlobeMaplyComponent/MaplyVectorStyle.h>
+#import <WhirlyGlobeMaplyComponent/MaplyVectorTileStyle.h>
+
+/** 
+    Implementation of the line style symbolizer for Maply Vector Tiles.
+  */
+@interface MaplyVectorTileStyleLine : MaplyVectorTileStyle
+
+- (instancetype)initWithStyleEntry:(NSDictionary *)styleEntry settings:(MaplyVectorStyleSettings *)settings viewC:(NSObject<MaplyRenderControllerProtocol> *)viewC;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVectorTileMarkerStyle.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVectorTileMarkerStyle.h
new file mode 100644
index 0000000..9dac65a
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVectorTileMarkerStyle.h
@@ -0,0 +1,29 @@
+/*  MaplyVectorMarkerStyle.h
+ *  WhirlyGlobe-MaplyComponent
+ *
+ *  Created by Steve Gifford on 1/3/14.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#import <WhirlyGlobeMaplyComponent/MaplyVectorStyle.h>
+#import <WhirlyGlobeMaplyComponent/MaplyVectorTileStyle.h>
+
+/** 
+    Implementation of the marker style symbolizer for Maply Vector Tiles.
+ */
+@interface MaplyVectorTileStyleMarker : MaplyVectorTileStyle
+
+- (instancetype)initWithStyleEntry:(NSDictionary *)styleEntry settings:(MaplyVectorStyleSettings *)settings viewC:(NSObject<MaplyRenderControllerProtocol> *)viewC;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVectorTilePolygonStyle.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVectorTilePolygonStyle.h
new file mode 100644
index 0000000..509916a
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVectorTilePolygonStyle.h
@@ -0,0 +1,29 @@
+/*  MaplyVectorPolygonStyle.h
+ *  WhirlyGlobe-MaplyComponent
+ *
+ *  Created by Steve Gifford on 1/3/14.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#import <WhirlyGlobeMaplyComponent/MaplyVectorStyle.h>
+#import <WhirlyGlobeMaplyComponent/MaplyVectorTileStyle.h>
+
+/** 
+    Implementation of the polygon style symbolizer for Maply Vector Tiles.
+ */
+@interface MaplyVectorTileStylePolygon : MaplyVectorTileStyle
+
+- (instancetype)initWithStyleEntry:(NSDictionary *)styleEntry settings:(MaplyVectorStyleSettings *)settings viewC:(NSObject<MaplyRenderControllerProtocol> *)viewC;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVectorTileStyle.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVectorTileStyle.h
new file mode 100644
index 0000000..c917859
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVectorTileStyle.h
@@ -0,0 +1,60 @@
+/*  MaplyVectorTileStyle.h
+ *  WhirlyGlobe-MaplyComponent
+ *
+ *  Created by Steve Gifford on 1/3/14.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#import <UIKit/UIKit.h>
+#import <WhirlyGlobeMaplyComponent/MaplyVectorStyle.h>
+
+/** The Maply Vector Tile Style is an internal representation of the style JSON coming out
+    of a Maply Vector Tile database.
+  */
+@interface MaplyVectorTileStyle : NSObject<MaplyVectorStyle>
+
+/** 
+    Construct a style entry from an NSDictionary.
+  */
++ (id)styleFromStyleEntry:(NSDictionary *)styleEntry settings:(MaplyVectorStyleSettings *)settings viewC:(NSObject<MaplyRenderControllerProtocol> *)viewC;
+
+/// Unique Identifier for this style
+@property (nonatomic) long long uuid;
+
+/// Set if this geometry is additive (e.g. sticks around) rather than replacement
+@property (nonatomic) bool geomAdditive;
+
+/// Construct a style entry from an NSDictionary
+- (instancetype)initWithStyleEntry:(NSDictionary *)styleEntry viewC:(NSObject<MaplyRenderControllerProtocol> *)viewC;
+
+/// Turn the min/maxscaledenom into height ranges for minVis/maxVis
+- (void)resolveVisibility:(NSDictionary *)styleEntry settings:(MaplyVectorStyleSettings *)settings desc:(NSMutableDictionary *)desc;
+
+/// parse a mapnik style template string
+- (NSString*)formatText:(NSString*)formatString forObject:(MaplyVectorObject*)vec;
+
+/// The view controller we're constructing objects in
+@property (nonatomic,weak) NSObject<MaplyRenderControllerProtocol> *viewC;
+
+/// If set, we create selectable objects
+/// This controls whether the objects we create are selectable.  Off by default.
+@property (nonatomic) bool selectable;
+
+/// Parse the various types of color strings
++ (UIColor *) ParseColor:(NSString *)colorStr;
+
+/// Parse an RGB color and fill in the alpha
++ (UIColor *) ParseColor:(NSString *)colorStr alpha:(CGFloat)alpha;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVectorTileTextStyle.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVectorTileTextStyle.h
new file mode 100644
index 0000000..b69b826
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVectorTileTextStyle.h
@@ -0,0 +1,29 @@
+/*  MaplyVectorTextStyle.h
+ *  WhirlyGlobe-MaplyComponent
+ *
+ *  Created by Steve Gifford on 1/3/14.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#import <WhirlyGlobeMaplyComponent/MaplyVectorStyle.h>
+#import <WhirlyGlobeMaplyComponent/MaplyVectorTileStyle.h>
+
+/** 
+    Implementation of the text style symbolizer for Maply Vector Tiles.
+ */
+@interface MaplyVectorTileStyleText : MaplyVectorTileStyle
+
+- (instancetype _Nullable)initWithStyleEntry:(NSDictionary * _Nonnull)styleEntry settings:(MaplyVectorStyleSettings * _Nonnull)settings viewC:(NSObject<MaplyRenderControllerProtocol> * _Nonnull)viewC;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVertexAttribute.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVertexAttribute.h
new file mode 100644
index 0000000..07e220a
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVertexAttribute.h
@@ -0,0 +1,49 @@
+/*
+ *  MaplyVertexAttribute.h
+ *  WhirlyGlobe-MaplyComponent
+ *
+ *  Created by Steve Gifford on 11/29/13.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <UIKit/UIKit.h>
+
+/** 
+    Vertex Attributes are passed all the way though on objects to shaders.
+    
+    If you have your own custom shader, you often need a way to feed it data.  The toolkit will set up the standard data, like vertices, texture coordinates and normals, but sometimes you need something custom.
+    
+    Vertex attributes are the mechanism you use to pass that custom data all the way down to the shader.
+    
+    How the vertex attributes are used depends on the data type, so consult the appropriate object.
+  */
+@interface MaplyVertexAttribute : NSObject
+
+/// Construct a vertex attribute as a single float
+- (nonnull instancetype)initWithName:(NSString * __nonnull)name slot:(int)slot float:(float)val;
+
+/// Construct a vertex attribute as two floats
+- (nonnull instancetype)initWithName:(NSString * __nonnull)name slot:(int)slot floatX:(float)x y:(float)y;
+
+/// Construct a vertex attribute as three flaots
+- (nonnull instancetype)initWithName:(NSString * __nonnull)name slot:(int)slot floatX:(float)x y:(float)y z:(float)z;
+
+/// Construct a vertex attribute as an RGBA value
+- (nonnull instancetype)initWithName:(NSString * __nonnull)name slot:(int)slot color:(UIColor * __nonnull)color;
+
+/// Construct a vertex attribute as an int
+- (nonnull instancetype)initWithName:(NSString * __nonnull)name slot:(int)slot int:(int)val;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyViewController.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyViewController.h
new file mode 100644
index 0000000..fc5b2eb
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyViewController.h
@@ -0,0 +1,651 @@
+/*  MaplyViewController.h
+ *  MaplyComponent
+ *
+ *  Created by Steve Gifford on 9/6/12.
+ *  Copyright 2012-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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#import <UIKit/UIKit.h>
+#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
+#import <WhirlyGlobeMaplyComponent/MaplyScreenMarker.h>
+#import <WhirlyGlobeMaplyComponent/MaplyVectorObject.h>
+#import <WhirlyGlobeMaplyComponent/MaplyViewTracker.h>
+#import <WhirlyGlobeMaplyComponent/MaplyComponentObject.h>
+#import <WhirlyGlobeMaplyComponent/MaplySharedAttributes.h>
+#import <WhirlyGlobeMaplyComponent/MaplyBaseViewController.h>
+
+@class MaplyControllerLayer;
+@class MaplyViewController;
+
+
+/** 
+    Animation State used by the MaplyViewControllerAnimationDelegate.
+ 
+    You fill out one of these when you're implementing the animation delegate.  Return it and the view controller will set the respective values to match.
+ */
+@interface MaplyViewControllerAnimationState : NSObject
+
+/// Heading is calculated from due north
+/// If not set or set to MAXFLOAT, this is ignored
+@property (nonatomic) double heading;
+
+/// Height above the map
+@property (nonatomic) double height;
+
+/// Position to move to on the map
+@property (nonatomic) MaplyCoordinateD pos;
+
+/// If set, this is a point on the screen where pos should be.
+/// By default this is (-1,-1) meaning the screen position is just the middle.  Otherwise, this is where the position should wind up on the screen, if it can.
+@property (nonatomic) CGPoint screenPos;
+
+/** 
+    Interpolate a new state between the given states A and B.
+ 
+    This does a simple interpolation (lat/lon, not great circle) between the two animation states.
+ */
++ (nonnull MaplyViewControllerAnimationState *)Interpolate:(double)t from:(MaplyViewControllerAnimationState *__nonnull)stateA to:(MaplyViewControllerAnimationState *__nonnull)stateB;
+
+@end
+
+/** 
+    An animation delegate that can be set on a MaplyViewController to control the view over time.
+ 
+    Filling out these methods will get you animation callbacks at the proper time to control position, heading and height on a frame basis.
+ 
+    You pass the resulting object in to
+ */
+@protocol MaplyViewControllerAnimationDelegate <NSObject>
+
+/** 
+    This method is called when the animation starts.
+ 
+    At the animation start we collect up the various parameters of the current visual view state and pas them in via the startState.  You probably want to keep track of this for later.
+ 
+    @param viewC The view controller doing the animation.
+ 
+    @param startState The starting point for the visual view animation.  Cache this somewhere for your own interpolation.
+ 
+    @param startTime When the animation starts (e.g. now)
+ 
+    @param endTime When the animation ends.  This is an absolute value.
+ */
+- (void)mapViewController:(MaplyViewController *__nonnull)viewC startState:(MaplyViewControllerAnimationState *__nonnull)startState startTime:(NSTimeInterval)startTime endTime:(NSTimeInterval)endTime;
+
+/** 
+    This method is called at the beginning of every frame draw to position the viewer.
+ 
+    This is the method that does all the work.  You need to fill out the returned MaplyViewControllerAnimationState according to whatever interpolation your'e doing based on the currentTime.
+ 
+    @param viewC The view controller doing the animation.
+ 
+    @param currentTime The time for this frame.  Use this rather than calculating the time yourself.
+ 
+    @return The MaplyViewControllerAnimationState expressing where you want the viewer to be and where they are looking.
+ */
+- (nonnull MaplyViewControllerAnimationState *)mapViewController:(MaplyViewController *__nonnull)viewC stateForTime:(NSTimeInterval)currentTime;
+
+@optional
+
+/** 
+    This method is called at the end of the animation.
+ 
+    The map view controller calls this method when the animation is finished.  Do your cleanup here if need be.
+ 
+    @param viewC The map view controller.
+ */
+- (void)mapViewControllerDidFinishAnimation:(MaplyViewController *__nonnull)viewC;
+
+@end
+
+/** 
+    A simple animation delegate for moving the map around.
+ 
+    The animation delegate support provides a lot of flexibility.  This version just provides all the standard fields and interpolates from beginning to end.
+ */
+@interface MaplyViewControllerSimpleAnimationDelegate : NSObject <MaplyViewControllerAnimationDelegate>
+
+/// Initialize with an animation state to copy
+- (nonnull instancetype)initWithState:(MaplyViewControllerAnimationState *__nonnull)endState;
+
+/// Location at the end of the animation
+@property (nonatomic) MaplyCoordinateD loc;
+
+/// Heading at the end of the animation
+@property (nonatomic) double heading;
+
+/// Height at the end of the animation
+@property (nonatomic) double height;
+
+/// Custom easing
+@property (readwrite,copy) ZoomEasingBlock _Nullable zoomEasing;
+
+@end
+
+/** 
+    A protocol to fill out for selection and tap messages from the MaplyViewController.
+    
+    Fill out the protocol when you want to get back selection and tap messages.  All the methods are optional.
+  */
+@protocol MaplyViewControllerDelegate <NSObject>
+
+@optional
+
+/** 
+    Called when the user taps on or near an object.
+    
+    You're given the object you passed in originally, such as a MaplyScreenMarker.  You can set a userObject on most of these to put your own data in there for tracking.
+  */
+- (void)maplyViewController:(MaplyViewController *__nonnull)viewC didSelect:(NSObject *__nonnull)selectedObj;
+
+/** 
+    User selected a given object and tapped at a given location.
+    
+    This is called when the user selects an object.  It differs from maplyViewController:didSelect: in that it passes on the location (in the local coordinate system) and the position on screen.
+    
+    @param viewC View Controller that saw the selection.
+    
+    @param selectedObj The object selected.  Probably one of MaplyVectorObject or MaplyScreenLabel or so on.
+    
+    @param coord Location in the local coordinate system where the user tapped.
+    
+    @param screenPt Location on screen where the user tapped.
+ */
+- (void)maplyViewController:(MaplyViewController *__nonnull)viewC didSelect:(NSObject *__nonnull)selectedObj atLoc:(MaplyCoordinate)coord onScreen:(CGPoint)screenPt;
+
+/** 
+    User selected one or more objects at a given location.
+    
+    @param viewC View Controller that saw the selection(s).
+    
+    @param selectedObjs The object(s) selected.  Probably one of MaplyVectorObject or MaplyScreenLabel or so on.
+    
+    @param coord Location in the local coordinate system where the user tapped.
+    
+    @param screenPt Location on screen where the user tapped.
+  */
+- (void)maplyViewController:(MaplyViewController *__nonnull)viewC allSelect:(NSArray *__nonnull)selectedObjs atLoc:(MaplyCoordinate)coord onScreen:(CGPoint)screenPt;
+
+/** 
+    User tapped at a given location.
+    
+    This is a tap at a specific location on the map.  This won't be called if they tapped and selected, just for taps.
+  */
+- (void)maplyViewController:(MaplyViewController *__nonnull)viewC didTapAt:(MaplyCoordinate)coord;
+
+/** 
+    Called when the map starts moving.
+ 
+    @param viewC The map view controller.
+ 
+    @param userMotion Set if this is motion being caused by the user, rather than a call to set location.
+ 
+    This is called when something (probably the user) starts moving the map.
+ */
+- (void)maplyViewControllerDidStartMoving:(MaplyViewController *__nonnull)viewC userMotion:(bool)userMotion;
+
+/** 
+    Called when the map stops moving.
+ 
+    This is called when the map stops moving.  It passes in the corners of the current viewspace.
+ 
+    @param viewC The globe view controller.
+ 
+    @param userMotion Set if this is motion being caused by the user, rather than a call to set location.
+ 
+    @param corners An array of length 4 containing the corners of the view space (lower left, lower right, upper right, upper left).  If any of those corners does not intersect the map (think zoomed out), its values are set to MAXFLOAT.
+ */
+- (void)maplyViewController:(MaplyViewController *__nonnull)viewC didStopMoving:(MaplyCoordinate *__nonnull)corners userMotion:(bool)userMotion;
+
+/** 
+    Called whenever the viewpoint moves.
+ 
+    This is called whenever the viewpoint moves.  That includes user motion as well as animations.
+ 
+    It may be triggered as often as every frame.  If that's a problem, use one of the other variants.
+ 
+    @param viewC The map view controller.
+ 
+    @param corners An array of length 4 containing the corners of the view space (lower left, lower right, upper right, upper left).  If any of those corners does not intersect the globe (think zoomed out), its values are set to MAXFLOAT.
+ */
+- (void)maplyViewController:(MaplyViewController *__nonnull)viewC didMove:(MaplyCoordinate *__nonnull)corners;
+
+
+/** 
+    Called when the user taps on one of your annotations.
+    
+    This is called when the user taps on an annotation.
+    
+    @param annotation Which annotation they tapped on.
+  */
+- (void)maplyViewController:(MaplyViewController *__nonnull)viewC didTapAnnotation:(MaplyAnnotation*__nonnull)annotation;
+
+/// Old version for compatibility.  Use tap instead.
+- (void)maplyViewController:(MaplyViewController *__nonnull)viewC didClickAnnotation:(MaplyAnnotation*__nonnull)annotation __deprecated;
+
+@end
+
+
+typedef NS_ENUM(NSInteger, MaplyMapType) {
+	MaplyMapType3D,
+	MaplyMapTypeFlat,
+};
+
+/** 
+    This view controller implements a map.
+    
+    This is the main entry point for displaying a 2D or 3D map.  Create one of these, fill it with data and let your users mess around with it.
+    
+    You can display a variety of features on the map, including tile base maps (MaplyQuadImageTilesLayer), vectors (MaplyVectorObject), shapes (MaplyShape), and others.  Check out the add calls in the MaplyBaseViewController for details.
+    
+    The Maply View Controller can be initialized in 3D map, 2D map mode.  The 2D mode can be tethered to a UIScrollView if you want to handle gestures that way.  That mode is very specific at the moment.
+    
+    To get selection and tap callbacks, fill out the MaplyViewControllerDelegate and assign the delegate.
+    
+    Most of the functionality is shared with MaplyBaseViewController.  Be sure to look in there first.
+  */
+@interface MaplyViewController : MaplyBaseViewController
+
+/// Initialize as a flat or 3D map.
+- (nonnull instancetype)initWithMapType:(MaplyMapType)mapType;
+
+/// Initialize as a 2D map.
+- (nonnull instancetype)init;
+
+/// Set the coordinate system to use in display.
+/// The coordinate system needs to be valid in flat mode.  The extents, if present, will be used to define the coordinate system origin.
+/// nil is the default and will result in a full web style Spherical Mercator.
+@property(nonatomic,strong) MaplyCoordinateSystem *__nullable coordSys;
+
+/** 
+    Set the center of the display coordinate system.
+    
+    This is (0,0,0) by default.  If you set it to something else all display coordinates will be offset from that origin.
+    
+    The option is useful when displaying small maps (of a city, say) at very high resolution.
+  */
+@property(nonatomic) MaplyCoordinate3d displayCenter;
+
+/** 
+    Turn the pinch (zoom) gesture recognizer on and off
+    
+    On by default.
+  */
+@property(nonatomic,assign) bool pinchGesture;
+
+/** 
+    Turn the rotate gesture recognizer on and off
+    
+    On by default.
+ */
+@property(nonatomic,assign) bool rotateGesture;
+
+/** 
+    Turn the pan gesture on and off
+    
+    Pan gesture is on by default
+  */
+@property(nonatomic,assign) bool panGesture;
+
+/** 
+    Turn the double tap to zoom gesture recognizer on and off
+    
+    On by default.
+ */
+@property(nonatomic,assign) bool doubleTapZoomGesture;
+
+/** 
+    Turn the 2 finger tap to zoom out gesture recognizer on and off
+    
+    On by default.
+ */
+@property(nonatomic,assign) bool twoFingerTapGesture;
+
+/** 
+    Turn on the double tap and drag gesture to zoom in and out.
+    
+    On by default.
+  */
+@property(nonatomic,assign) bool doubleTapDragGesture;
+
+/** 
+    If set, we use a modified pan gesture recognizer to play nice
+ with the scroll view.  For the UIScrollView object, set clipsToBounds,
+ pagingEnabled, and delaysContentTouches to YES, and set scrollEnabled
+ and canCancelContentTouches to NO.  Add swipe gesture recognizers
+ to the scroll view to control paging, and call
+ requirePanGestureRecognizerToFailForGesture: for each.
+ 
+    Off by default.
+ */
+@property(nonatomic,assign) bool inScrollView;
+
+/** 
+    turn the touch to cancel animation gesture on and off
+    
+    off by default
+ */
+@property(nonatomic,assign) bool cancelAnimationOnTouch;
+
+/** 
+    The current rotation away from north.
+ */
+@property(nonatomic,assign) float heading;
+
+/**
+    The minimum angle, in degrees, which a rotate gesture must subtend before rotation begins.
+        i.e., larger values are "stickier"
+        default is zero, causing rotation to begin immediately
+ */
+@property(nonatomic,assign) float rotateGestureThreshold;
+
+/** 
+    If set, we'll automatically move to wherever the user tapped.
+    
+    When on we'll move the current location to wherever the user tapped if they tapped the globe.  That's true for selection as well.  On by default.
+ */
+@property(nonatomic,assign) bool autoMoveToTap;
+
+/** 
+    Delegate for selection and location tapping.
+    
+    Fill in the MaplyViewControllerDelegate and assign it here to get callbacks for object selection and tapping.
+  */
+@property(nonatomic,weak) NSObject<MaplyViewControllerDelegate> *__nullable delegate;
+
+/** 
+    Current height above terrain.
+    
+    In 3D map mode this is the height from which the user is viewing the map.  Maps are usually -PI to +PI along their horizontal edges.
+  */
+@property (nonatomic,assign) float height;
+
+/** 
+    2D visual views can do some simple wrapping.  This turns that on and off (off by default).
+    
+    On some 2D visual views we're allowed to wrap across the edge of the world.  This will attempt to do that.
+  */
+@property (nonatomic,assign) bool viewWrap;
+
+/** 
+    The box the view point can be in.
+ 
+    This is the box the view point is allowed to be within.  The view controller will constrain it to be within that box.  Coordinates are in geographic (radians).
+ */
+- (MaplyBoundingBox)getViewExtents;
+
+/** 
+    The box the view point can be in.
+    
+    This is the box the view point is allowed to be within.  The view controller will constrain it to be within that box.  Coordinates are in geographic (radians).
+  */
+- (void)getViewExtentsLL:(MaplyCoordinate *__nonnull)ll ur:(MaplyCoordinate *__nonnull)ur;
+
+/** 
+    The box the view point can be in.
+ 
+    This is the box the view point is allowed to be within.  The view controller will constrain it to be within that box. Coordinates are in geographic (radians).
+ */
+- (void)setViewExtents:(MaplyBoundingBox)box;
+
+/** 
+    The box the view point can be in.
+    
+    This is the box the view point is allowed to be within.  The view controller will constrain it to be within that box. Coordinates are in geographic (radians).
+ */
+- (void)setViewExtentsLL:(MaplyCoordinate)ll ur:(MaplyCoordinate)ur;
+
+/** 
+    Animate to the given position over time.
+    
+    @param newPos A coordinate in geographic (lon/lat radians)
+    
+    @param howLong A time in seconds.
+  */
+- (void)animateToPosition:(MaplyCoordinate)newPos time:(NSTimeInterval)howLong;
+
+/** 
+    Animate the given position to the screen position over time.
+    
+    This is similar to animateToPosition:time: except that it will attempt to match up the screen position and the geographic position.  This is how you offset the location you're looking at.
+    
+    If it's impossible to move newPos to loc, then nothing happens.
+    
+    @param newPos The geographic position (lon/lat in radians) to move to.
+    
+    @param loc The location on the screen where we'd like it to go.
+    
+    @param howLong How long in seconds to take getting there.
+  */
+- (bool)animateToPosition:(MaplyCoordinate)newPos onScreen:(CGPoint)loc time:(NSTimeInterval)howLong;
+
+/** 
+    Animate the given position and height to the screen position over time.
+ 
+    This is similar to animateToPosition:time: but it also takes a height paramater
+ 
+    @param newPos The geographic position (lon/lat in radians) to move to.
+ 
+    @param newHeight  the view point height above the map.
+ 
+    @param howLong How long in seconds to take getting there.
+ */
+- (void)animateToPosition:(MaplyCoordinate)newPos height:(float)newHeight time:(NSTimeInterval)howLong;
+
+/** 
+    Animate to the given position, heading and height over time.
+ 
+    @param newPos A coordinate in geographic (lon/lat radians)
+ 
+    @param newHeight New height to animate to.
+ 
+    @param newHeading New heading to finish on.
+ 
+    @param howLong A time interval in seconds.
+ */
+- (bool)animateToPosition:(MaplyCoordinate)newPos height:(float)newHeight heading:(float)newHeading time:(NSTimeInterval)howLong;
+
+/** 
+    Animate to the given position, heading and height over time.
+ 
+    @param newPos A coordinate in geographic (lon/lat radians) (double precision)
+ 
+    @param newHeight New height to animate to. (double)
+ 
+    @param newHeading New heading to finish on. (double)
+ 
+    @param howLong A time interval in seconds.
+ */
+- (bool)animateToPositionD:(MaplyCoordinateD)newPos height:(double)newHeight heading:(double)newHeading time:(NSTimeInterval)howLong;
+
+/** 
+    Animate to the given position, screen position, heading and height over time.
+ 
+    If it's impossible to move newPos to loc, then nothing happens.
+ 
+    @param newPos A coordinate in geographic (lon/lat radians)
+ 
+    @param loc The location on the screen where we'd like it to go.
+ 
+    @param newHeight New height to animate to.
+ 
+    @param newHeading New heading to finish on.
+ 
+    @param howLong A time interval in seconds.
+ */
+- (bool)animateToPosition:(MaplyCoordinate)newPos onScreen:(CGPoint)loc height:(float)newHeight heading:(float)newHeading time:(NSTimeInterval)howLong;
+
+/** 
+    Set the center of the screen to the given position immediately.
+    
+    @param newPos The geographic position (lon/lat in radians) to move to.
+  */
+- (void)setPosition:(MaplyCoordinate)newPos;
+
+/** 
+    Set the center of the screen and the height offset immediately.
+    
+    @param newPos The geographic position (lon/lat in radians) to move to.
+    
+    @param height Height the view point above the map.
+  */
+- (void)setPosition:(MaplyCoordinate)newPos height:(float)height;
+
+/** 
+    Return the current center position
+ */
+- (MaplyCoordinate)getPosition;
+
+/** 
+    Return the current view point's height above the map.
+ */
+- (float)getHeight;
+
+/** 
+    Return the current center position and height.
+    
+    @param pos The center of the screen in geographic (lon/lat in radians).
+    
+    @param height The current view point's height above the map.
+  */
+- (void)getPosition:(MaplyCoordinate *__nonnull)pos height:(float *__nonnull)height;
+
+
+/** 
+    Set the viewing state all at once
+ 
+    This sets the position, height, screen position and heading all at once.
+ */
+- (void)setViewState:(MaplyViewControllerAnimationState *__nonnull)viewState;
+
+/** 
+    Make a MaplyViewControllerAnimationState object from the current view state.
+ 
+    This returns the current view parameters in a single MaplyViewControllerAnimationState.
+ */
+- (nullable MaplyViewControllerAnimationState *)getViewState;
+
+/** 
+    Return the closest a viewer is allowed to get to the map surface.
+ 
+    @return FLT_MIN if there's no pitchDelegate set
+ */
+- (float)getMinZoom;
+
+/** 
+    Return the farthest away a viewer is allowed to get from the map surface
+ 
+    @return FLT_MIN if there's no pitchDelegate set
+ */
+- (float)getMaxZoom;
+
+/** 
+    Return the zoom limits for 3D map mode.
+    
+    @param minHeight The closest a viewer is allowed to get to the map surface.
+    
+    @param maxHeight The farthest away a viewer is allowed to get from the map surface.
+  */
+- (void)getZoomLimitsMin:(float *__nonnull)minHeight max:(float *__nonnull)maxHeight;
+
+/** 
+    Set the zoom limits for 3D map mode.
+    
+    @param minHeight The closest a viewer is allowed to get to the map surface.
+    
+    @param maxHeight The farthest away a viewer is allowed to get from the map surface.
+ */
+- (void)setZoomLimitsMin:(float)minHeight max:(float)maxHeight;
+
+/** 
+    Return the geographic (lon/lat radians) coordinate in radians for a given screen point.
+    
+    @return Returns the geo coordinate corresponding to a given screen point in radians.
+ */
+- (MaplyCoordinate)geoFromScreenPoint:(CGPoint)point;
+
+/** 
+    Find a height that shows the given bounding box.
+    
+    This method will search for a height that shows the given bounding box within the view.  The search is inefficient, so don't call this a lot.
+    
+    @param bbox The bounding box (in radians) we're trying to view.
+    
+    @param pos Where the view will be looking.
+  */
+- (float)findHeightToViewBounds:(MaplyBoundingBox)bbox
+                            pos:(MaplyCoordinate)pos;
+
+/** 
+    Find a height that shows the given bounding box.
+    This method will search for a height that shows the given bounding box within the view.  The search is inefficient, so don't call this a lot.
+
+    This version takes a margin to add around the outside of the area.  Positive margins increase the screen area considered, making the
+    given area larger.  Negative margins make the specified area smaller.
+ 
+    @param bbox The bounding box (in radians) we're trying to view.
+    @param pos Where the view will be looking.
+    @param marginX Horizontal boundary around the area
+    @param marginY Vertical boundary around the area
+ */
+- (float)findHeightToViewBounds:(MaplyBoundingBox)bbox
+                            pos:(MaplyCoordinate)pos
+                        marginX:(double)marginX
+                        marginY:(double)marginY;
+
+/**
+    Find a height that shows the given bounding box.
+    This method will search for a height that shows the given bounding box within the view.  The search is inefficient, so don't call this a lot.
+
+    This version takes a margin to add around the outside of the area.  Positive margins increase the screen area considered, making the
+    given area larger.  Negative margins make the specified area smaller.
+
+    This version attempts to place the given bounds within a rectangle other than the whole view frame.
+
+    @param bbox The bounding box (in radians) we're trying to view.
+    @param pos Where the view will be looking.
+    @param frame The screen area to consider.
+    @param newPos (out,optional) The center location needed to place \c pos at the center of \c frame
+    @param marginX Horizontal boundary around the area
+    @param marginY Vertical boundary around the area
+ */
+- (float)findHeightToViewBounds:(MaplyBoundingBox)bbox
+                            pos:(MaplyCoordinate)pos
+                          frame:(CGRect)frame
+                         newPos:(MaplyCoordinate *_Nullable)newPos
+                        marginX:(double)marginX
+                        marginY:(double)marginY;
+
+/**
+ 
+    Return the extents of the current view
+ 
+    @return Returns the Bounding Box (in radians) corresponding to the current view
+ */
+- (MaplyBoundingBox)getCurrentExtents;
+
+/**
+ 
+    Make a gesture recognizer's success depend on the pan gesture
+ recognizer's failure.
+ 
+    When using the map view within a scroll view, add swipe gesture
+ recognizers to the scroll view to control paging, and call this method
+ for each.  See also the inScrollView property and its comment.
+ 
+    @param other The other, subordinate gesture recognizer.
+ */
+- (void)requirePanGestureRecognizerToFailForGesture:(UIGestureRecognizer *__nullable)other;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyViewTracker.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyViewTracker.h
new file mode 100644
index 0000000..b54b45c
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyViewTracker.h
@@ -0,0 +1,68 @@
+/*
+ *  WGViewTracker.h
+ *  WhirlyGlobeComponent
+ *
+ *  Created by Steve Gifford on 7/26/12.
+ *  Copyright 2012-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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <UIKit/UIKit.h>
+#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
+
+/** 
+    The View Tracker associates a view with a geographic location.
+    
+    The Maply View Tracker will move a UIView around to keep track of a geographic location.  This is basically used for popups.  The system will move the view around at the end of the frame render.  It will hide the UIView if needed or make it reappear.  The UIView should be a child of view controller's view.
+  */
+@interface MaplyViewTracker : NSObject
+
+/** 
+    The UIView we want moved around.
+    
+    This is the UIView we'll tie to the geographic location.  If you want to center it, use offsets within the UIView.
+  */
+@property (nonatomic,strong) UIView *__nullable view;
+
+/** 
+    The geographic location where we want to place the UIView.
+    
+    This is the location (lon/lat in radians) where we want to stick the UIView.  The location on screen will be updated as the user manipulates the map or globe.
+  */
+@property (nonatomic,assign) MaplyCoordinate loc;
+
+/** 
+    An offset in screen space for the view tracker.
+    
+    This offset is added to the location after it's projected into screen space.
+ */
+@property (nonatomic, assign) CGPoint offset;
+
+/** 
+    The lowest height at which we'll see the view tracker.
+    
+    This value is in display coordinates.
+  */
+@property (nonatomic,assign) float minVis;
+
+/** 
+    the maximum height at which we'll see the view being tracked.
+    
+    This value is in display coordinates.
+  */
+@property (nonatomic,assign) float maxVis;
+
+@end
+
+typedef MaplyViewTracker WGViewTracker;
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyWMSTileSource.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyWMSTileSource.h
new file mode 100644
index 0000000..0c25ea3
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyWMSTileSource.h
@@ -0,0 +1,183 @@
+/*  MaplyWMSTileSource.h
+ *  WhirlyGlobe-MaplyComponent
+ *
+ *  Created by Steve Gifford on 7/25/13.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#import <WhirlyGlobeMaplyComponent/MaplyTileSourceNew.h>
+#import <WhirlyGlobeMaplyComponent/MaplyCoordinateSystem.h>
+
+/** A bounding box for a specific CRS in that coordinate
+    system.  This is part of the Web Map Server parser.
+  */
+@interface MaplyWMSLayerBoundingBox : NSObject
+
+/// Coordinate Reference System
+@property (nonatomic,strong,nullable) NSString *crs;
+
+/// Left side of the bounding box
+@property (nonatomic) double minx;
+/// Bottom of the bounding box
+@property (nonatomic) double miny;
+/// Right side of the bounding box
+@property (nonatomic) double maxx;
+/// Top of the bounding box
+@property (nonatomic) double maxy;
+
+/// Generate the coordinate system, if we can
+- (nullable MaplyCoordinateSystem *)buildCoordinateSystem;
+
+@end
+
+/** Style of a WMS layer as returned by GetCapabilities.
+    This is part of the Web Map Service parser.
+  */
+@interface MaplyWMSStyle : NSObject
+
+/// The name as returned by the service
+@property (nonatomic,strong,nullable) NSString *name;
+/// The title as returned by the service
+@property (nonatomic,strong,nullable) NSString *title;
+
+@end
+
+/** Description of a WMS layer as returned by a GetCapabilities call.
+    This is part of the Web Map Service parser.
+  */
+@interface MaplyWMSLayer : NSObject
+
+/// The name as returned by the service
+@property (nonatomic,strong,nullable) NSString *name;
+/// The title as returned by the service
+@property (nonatomic,strong,nullable) NSString *title;
+/// The abstract as returned by the service
+@property (nonatomic,strong,nullable) NSString *abstract;
+
+/// Coordinate reference systems supported by the layer
+@property (nonatomic,strong,nullable) NSArray *coordRefSystems;
+
+/// Styles we can choose
+@property (nonatomic,strong,nullable) NSArray *styles;
+
+/// Bounding boxes for zero or more of the CRS'
+@property (nonatomic,strong,nullable) NSArray *boundingBoxes;
+
+/// Lower left corner in longitude/latitude
+@property (nonatomic) MaplyCoordinate ll;
+/// Upper right corner in longitude/latitude
+@property (nonatomic) MaplyCoordinate ur;
+
+/// Try to build a coordinate system we understand
+- (nullable MaplyCoordinateSystem *)buildCoordSystem;
+
+/// Find the style with the given name
+- (nullable MaplyWMSStyle *)findStyle:(NSString *__nonnull)styleName;
+
+@end
+
+@class DDXMLDocument;
+
+/** Encapsulates the capabilities coming back from a WMS server.
+    We can query this to see what layers and coordinate systems are available.
+    Part of the Web Map Service parser.
+  */
+@interface MaplyWMSCapabilities : NSObject
+
+/// We can fetch the capabilities from this URL
++ (nonnull NSString *)CapabilitiesURLFor:(NSString *__nonnull)baseURL;
+
+/// The name as returned by the service
+@property (nonatomic,strong,nullable) NSString *name;
+/// The title as returned by the service
+@property (nonatomic,strong,nullable) NSString *title;
+
+/// Available formats (strings)
+@property (nonatomic,strong,nullable) NSArray *formats;
+
+/// Layers we can fetch from
+@property (nonatomic,strong,nullable) NSArray *layers;
+
+/// This constructor will initialize with an XML document that
+///  we've fetched from the server, presumably.
+- (nullable instancetype)initWithXML:(DDXMLDocument *__nonnull)xmlDoc;
+
+/// Look for a layer with the given name.
+- (nullable MaplyWMSLayer *)findLayer:(NSString *__nonnull)name;
+
+@end
+
+/** This is a MaplyTileSource that works with a remote
+    Web Map Service implementation.  WMS is not the most
+    efficient way to access remote image data, but there
+    are still a few places that use it.
+  */
+@interface MaplyWMSTileSource : NSObject<MaplyTileInfoNew>
+
+/// Base URL for the Map Service
+@property (nonatomic,strong,nullable) NSString *baseURL;
+
+/// Capabilities describing the service
+@property (nonatomic,strong,nullable) MaplyWMSCapabilities *capabilities;
+
+/// Image type to request
+@property (nonatomic,strong,nullable) NSString *imageType;
+
+/// Layer we're grabbing
+@property (nonatomic,strong,nonnull) MaplyWMSLayer *layer;
+
+/// Optional style we're using
+@property (nonatomic,strong,nonnull) MaplyWMSStyle *style;
+
+/// Minimum zoom level we'll expect
+@property (nonatomic,readonly) int minZoom;
+/// Maximum zoom level we'll expect
+@property (nonatomic,readonly) int maxZoom;
+
+/// Tile size provided to caller
+@property (nonatomic,readonly) int tileSize;
+
+/// If set we'll ask for a transparent background from the server
+@property (nonatomic) bool transparent;
+
+/// Coordinate system (used to build URLs)
+@property (nonatomic,readonly,nonnull) MaplyCoordinateSystem *coordSys;
+
+/// If set, we'll cache the images locally (a good idea with WMS)
+@property (nonatomic,strong,nullable) NSString *cacheDir;
+
+/** Initialize with the parameters the WMS server is going to want.
+    
+    @param baseURL The main URL we'll use to construct queries.
+    
+    @param cap The capabilities as parsed from the service.
+    
+    @param layer The layer we'll access.  There can be multiple and it's
+            up to you to pick one.
+    
+    @param style The style variant of the layer we want.  Again there can
+            be multiple and it's up to you to pick.
+    
+    @param coordSys The coordinate system we're expecting to work in.
+    
+    @param minZoom The min zoom level we want.  Note that WMS doesn't handle
+            this directly.  Our tile source just controls what areas it
+            asks for based on the overall extents and the zoom levels.
+    
+    @param maxZoom The max zoom level we'll query.
+  */
+- (nullable instancetype)initWithBaseURL:(NSString *__nonnull)baseURL capabilities:(MaplyWMSCapabilities *__nullable)cap layer:(MaplyWMSLayer *__nonnull)layer style:(MaplyWMSStyle *__nonnull)style coordSys:(MaplyCoordinateSystem *__nonnull)coordSys minZoom:(int)minZoom maxZoom:(int)maxZoom tileSize:(int)tileSize;
+
+@end
+
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyZoomGestureDelegate.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyZoomGestureDelegate.h
new file mode 100644
index 0000000..442a976
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyZoomGestureDelegate.h
@@ -0,0 +1,31 @@
+/*  MaplyZoomGestureDelegate.h
+ *
+ *  Created by Jesse Crocker on 2/4/14.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#import <UIKit/UIKit.h>
+
+@interface MaplyZoomGestureDelegate : NSObject <UIGestureRecognizerDelegate>
+
+/// Minimum allowable zoom level
+@property (nonatomic,assign) float minZoom;
+/// Maximum allowable zoom level
+
+@property (nonatomic,assign) float maxZoom;
+
+//The gesture recognizer
+@property (nonatomic,strong) UIGestureRecognizer *gestureRecognizer;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MapnikStyle.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MapnikStyle.h
new file mode 100644
index 0000000..3f489ef
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MapnikStyle.h
@@ -0,0 +1,33 @@
+/*
+ *  MapnikStyle.h
+ *  WhirlyGlobe-MaplyComponent
+ *
+ *  Created by Jesse Crocker, Trailbehind inc. on 3/31/14.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <Foundation/Foundation.h>
+#import <WhirlyGlobeMaplyComponent/MapnikStyleRule.h>
+
+@interface MapnikStyle : NSObject
+
+@property (nonatomic, readonly) NSMutableArray *rules;
+@property (nonatomic, strong) NSString *name;
+@property (nonatomic, assign) BOOL filterModeFirst;
+@property (nonatomic, assign) float opacity;
+
+- (void)addRule:(MapnikStyleRule*)rule;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MapnikStyleRule.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MapnikStyleRule.h
new file mode 100644
index 0000000..f462857
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MapnikStyleRule.h
@@ -0,0 +1,36 @@
+/*
+ *  MapnikStyleRule.h
+ *  WhirlyGlobe-MaplyComponent
+ *
+ *  Created by Jesse Crocker, Trailbehind inc. on 3/31/14.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <Foundation/Foundation.h>
+
+@interface MapnikStyleRule : NSObject
+
+@property (nonatomic, strong) NSPredicate *filterPredicate;
+
+@property (nonatomic, assign) NSUInteger minScaleDenominator;
+@property (nonatomic, assign) NSUInteger maxScaleDenomitator;
+@property (nonatomic, assign) NSUInteger minZoom;
+@property (nonatomic, assign) NSUInteger maxZoom;
+
+@property (nonatomic, readonly) NSMutableArray *symbolizers;
+
+- (void)setFilter:(NSString*)filterExpression;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MapnikStyleSet.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MapnikStyleSet.h
new file mode 100644
index 0000000..0d615f5
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MapnikStyleSet.h
@@ -0,0 +1,47 @@
+/*
+ *  MapnikXmlStyle.h
+ *  WhirlyGlobe-MaplyComponent
+ *
+ *  Created by Jesse Crocker, Trailbehind inc. on 3/31/14.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+
+#import <Foundation/Foundation.h>
+#import <WhirlyGlobeMaplyComponent/MapboxVectorTiles.h>
+
+@class MaplyVectorStyleSettings;
+
+@interface MapnikStyleSet : NSObject <NSXMLParserDelegate, MaplyVectorStyleDelegate>
+
+@property (nonatomic, strong, nullable) MaplyVectorStyleSettings *tileStyleSettings;
+@property (nonatomic, strong, nullable) NSMutableDictionary *styleDictionary;
+@property (nonatomic, weak, nullable) NSObject<MaplyRenderControllerProtocol> *viewC;
+@property (nonatomic, readonly) BOOL parsing;
+@property (nonatomic, strong, nullable) UIColor *backgroundColor;
+@property (nonatomic, assign) NSInteger tileMaxZoom;
+@property (nonatomic, assign) NSInteger drawPriorityOffset;
+@property (nonatomic, assign) CGFloat alpha;
+
+- (nonnull instancetype)initForViewC:(NSObject<MaplyRenderControllerProtocol> *__nonnull)viewC;
+
+- (void)loadXmlFile:(NSString *__nonnull)filePath;
+- (void)loadXmlData:(NSData *__nonnull)docData;
+- (void)loadJsonData:(NSData *__nonnull)jsonData;
+- (void)loadJsonFile:(NSString*__nonnull)filePath;
+- (void)saveAsJSON:(NSString *__nonnull)filePath;
+- (void)generateStyles;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/NSData+Zlib.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/NSData+Zlib.h
new file mode 100644
index 0000000..4a28f18
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/NSData+Zlib.h
@@ -0,0 +1,37 @@
+/*
+ *  NSData+Zlib.h
+ *  WhirlyGlobe-MaplyComponent
+ *
+ *  Created by Steve Gifford on 9/7/13.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <Foundation/Foundation.h>
+
+/** The NSData zlib category adds compress and uncompress methods to
+    NSData.
+  */
+@interface NSData(zlib)
+
+/// Return a compressed version of the data.
+- (NSData *) compressData;
+
+/// Return an uncompressed verison of the given data
+- (NSData *) uncompressGZip;
+
+/// Returns true if the data is zlib compressed
+- (BOOL)isCompressed;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/NSDictionary+StyleRules.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/NSDictionary+StyleRules.h
new file mode 100644
index 0000000..9c4ab96
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/NSDictionary+StyleRules.h
@@ -0,0 +1,33 @@
+//
+//  NSDictionary+StyleRules.h
+//  WhirlyGlobe-MaplyComponent
+//
+//  Created by Jesse Crocker on 4/9/14.
+//
+//
+
+#import <Foundation/Foundation.h>
+
+@interface NSMutableDictionary (StyleRules)
+
+- (NSMutableArray*)styles;
+- (NSMutableArray*)rules;
+- (NSMutableArray*)symbolizers;
+- (NSMutableArray*)layers;
+- (NSString*)filter;
+- (void)setFilter:(NSString*)filter;
+- (NSString*)name;
+
+- (NSNumber*)minScaleDenom;
+- (void)setMinScaleDenom:(NSNumber*)num;
+- (NSNumber*)maxScaleDenom;
+- (void)setMaxScaleDenom:(NSNumber*)num;
+- (NSMutableDictionary*)parameters;
+
+@end
+
+// A function we can call to force the linker to bring in categories
+#ifdef __cplusplus
+extern "C"
+#endif
+void NSDictionaryStyleDummyFunc(void);
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/SLDExpressions.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/SLDExpressions.h
new file mode 100644
index 0000000..43a042d
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/SLDExpressions.h
@@ -0,0 +1,55 @@
+//
+//  SLDExpressions.h
+//  SLDTest
+//
+//  Created by Ranen Ghosh on 2016-08-12.
+//  Copyright 2016-2019 mousebird consulting.
+//
+
+#import <Foundation/Foundation.h>
+@class DDXMLNode;
+@class DDXMLElement;
+
+/** @brief Base class for elements derived from the ogc:expression abstract element.
+ @see http://schemas.opengis.net/filter/1.1.0/expr.xsd for SLD v1.1.0
+ @see http://schemas.opengis.net/filter/1.0.0/expr.xsd for SLD v1.0.0
+ */
+@interface SLDExpression : NSObject
+@property (nonatomic, strong) NSExpression * _Nonnull expression;
++ (BOOL)matchesElementNamed:(NSString * _Nonnull)elementName;
++ (SLDExpression * _Nullable)expressionForNode:(DDXMLNode * _Nonnull )node;
+@end
+
+
+/** @brief Class corresponding to the ogc:PropertyName element
+ @see http://schemas.opengis.net/filter/1.1.0/expr.xsd for SLD v1.1.0
+ @see http://schemas.opengis.net/filter/1.0.0/expr.xsd for SLD v1.0.0
+ */
+@interface SLDPropertyNameExpression : SLDExpression
+@property (nonatomic, strong) NSString * _Nonnull propertyName;
+- (_Nullable id)initWithElement:(DDXMLElement * _Nonnull)element;
+@end
+
+/** @brief Class corresponding to the ogc:Literal element
+ @see http://schemas.opengis.net/filter/1.1.0/expr.xsd for SLD v1.1.0
+ @see http://schemas.opengis.net/filter/1.0.0/expr.xsd for SLD v1.0.0
+ */
+@interface SLDLiteralExpression : SLDExpression
+@property (nonatomic, strong) id _Nonnull literal;
+- (_Nullable id)initWithElement:(DDXMLElement * _Nonnull)element;
+@end
+
+/** @brief Class corresponding to the ogc:BinaryOperatorType elements
+ @see http://schemas.opengis.net/filter/1.1.0/expr.xsd for SLD v1.1.0
+ @see http://schemas.opengis.net/filter/1.0.0/expr.xsd for SLD v1.0.0
+ */
+@interface SLDBinaryOperatorExpression : SLDExpression
+
+@property (nonatomic, strong) NSString * _Nonnull elementName;
+
+@property (nonatomic, strong) SLDExpression * _Nonnull leftExpression;
+@property (nonatomic, strong) SLDExpression * _Nonnull rightExpression;
+
+- (_Nullable id)initWithElement:(DDXMLElement * _Nonnull)element;
+@end
+
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/SLDOperators.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/SLDOperators.h
new file mode 100644
index 0000000..2457979
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/SLDOperators.h
@@ -0,0 +1,101 @@
+//
+//  SLDOperators.h
+//  SLDTest
+//
+//  Created by Ranen Ghosh on 2016-08-12.
+//  Copyright 2016-2019 mousebird consulting.
+//
+
+#import <Foundation/Foundation.h>
+#import <WhirlyGlobeMaplyComponent/SLDExpressions.h>
+
+/** @brief Base class for elements of ogc:comparisonOps or ogc:logicOps.
+ 
+    Elements of ogc:spatialOps are not supported.
+ @see http://schemas.opengis.net/filter/1.1.0/filter.xsd for SLD v1.1.0
+ @see http://schemas.opengis.net/filter/1.0.0/filter.xsd for SLD v1.0.0
+ */
+@interface SLDOperator : NSObject
+@property (nonatomic, strong) NSPredicate * _Nonnull predicate;
++ (BOOL)matchesElementNamed:(NSString * _Nonnull)elementName;
++ (SLDOperator * _Nullable)operatorForNode:(DDXMLNode * _Nonnull )node;
+@end
+
+
+/** @brief Class corresponding to the ogc:BinaryComparisonOpType elements
+ @see http://schemas.opengis.net/filter/1.1.0/expr.xsd for SLD v1.1.0
+ @see http://schemas.opengis.net/filter/1.0.0/expr.xsd for SLD v1.0.0
+ */
+@interface SLDBinaryComparisonOperator : SLDOperator
+
+@property (nonatomic, assign) BOOL matchCase;
+@property (nonatomic, strong) NSString * _Nonnull elementName;
+
+@property (nonatomic, strong) SLDExpression * _Nonnull leftExpression;
+@property (nonatomic, strong) SLDExpression * _Nonnull rightExpression;
+
+
+- (_Nullable id)initWithElement:(DDXMLElement * _Nonnull)element;
+
+@end
+
+
+@interface SLDIsNullOperator : SLDOperator
+
+@property (nonatomic, strong) SLDExpression * _Nonnull subExpression;
+
+- (_Nullable id)initWithElement:(DDXMLElement * _Nonnull)element;
+
+@end
+
+
+@interface SLDIsLikeOperator : SLDOperator
+
+@property (nonatomic, strong, nullable) NSString *wildCardStr;
+@property (nonatomic, strong, nullable) NSString *singleCharStr;
+@property (nonatomic, strong, nullable) NSString *escapeCharStr;
+@property (nonatomic, assign) BOOL matchCase;
+@property (nonatomic, strong) SLDPropertyNameExpression * _Nonnull propertyExpression;
+@property (nonatomic, strong) SLDLiteralExpression * _Nonnull literalExpression;
+
+- (_Nullable id)initWithElement:(DDXMLElement * _Nonnull)element;
+
+@end
+
+@interface SLDIsBetweenOperator : SLDOperator
+
+@property (nonatomic, strong) SLDExpression * _Nonnull subExpression;
+@property (nonatomic, strong) SLDExpression * _Nonnull lowerBoundaryExpression;
+@property (nonatomic, strong) SLDExpression * _Nonnull upperBoundaryExpression;
+
+- (_Nullable id)initWithElement:(DDXMLElement * _Nonnull)element;
+
+@end
+
+
+
+/** @brief Class corresponding to the ogc:Not element
+ @see http://schemas.opengis.net/filter/1.1.0/expr.xsd for SLD v1.1.0
+ @see http://schemas.opengis.net/filter/1.0.0/expr.xsd for SLD v1.0.0
+ */
+@interface SLDNotOperator : SLDOperator
+
+@property (nonatomic, strong) SLDOperator * _Nonnull subOperator;
+
+- (_Nullable id)initWithElement:(DDXMLElement * _Nonnull)element;
+
+@end
+
+/** @brief Class corresponding to the ogc:BinaryLogicOpType elements
+ @see http://schemas.opengis.net/filter/1.1.0/expr.xsd for SLD v1.1.0
+ @see http://schemas.opengis.net/filter/1.0.0/expr.xsd for SLD v1.0.0
+ */
+@interface SLDLogicalOperator : SLDOperator
+
+@property (nonatomic, strong) NSString * _Nonnull elementName;
+@property (nonatomic, strong) NSArray<SLDOperator *> * _Nonnull subOperators;
+
+- (_Nullable id)initWithElement:(DDXMLElement * _Nonnull)element;
+
+@end
+
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/SLDStyleSet.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/SLDStyleSet.h
new file mode 100644
index 0000000..2000b20
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/SLDStyleSet.h
@@ -0,0 +1,119 @@
+//
+//  SLDStyleSet.h
+//  SLDTest
+//
+//  Created by Ranen Ghosh on 2016-08-12.
+//  Copyright 2016-2019 mousebird consulting.
+//
+
+#import <Foundation/Foundation.h>
+#import <WhirlyGlobeMaplyComponent/MapboxVectorTiles.h>
+
+/** @brief Class corresponding to the sld:NamedLayer element
+ @see http://schemas.opengis.net/sld/1.1.0/StyledLayerDescriptor.xsd for SLD v1.1.0
+ @see http://schemas.opengis.net/sld/1.0.0/StyledLayerDescriptor.xsd for SLD v1.0.0
+ */
+@interface SLDNamedLayer : NSObject
+
+@property (nonatomic, strong) NSString * _Nullable name;
+@property (nonatomic, strong) NSArray * _Nullable userStyles;
+
+@end
+
+/** @brief Class corresponding to the sld:UserStyle element
+ @see http://schemas.opengis.net/sld/1.1.0/StyledLayerDescriptor.xsd for SLD v1.1.0
+ @see http://schemas.opengis.net/sld/1.0.0/StyledLayerDescriptor.xsd for SLD v1.0.0
+ */
+@interface SLDUserStyle : NSObject
+
+@property (nonatomic, strong) NSString * _Nullable name;
+@property (nonatomic, strong) NSArray * _Nullable featureTypeStyles;
+
+@end
+
+/** @brief Class corresponding to the se:FeatureTypeStyle element
+ @see http://schemas.opengis.net/se/1.1.0/FeatureStyle.xsd for SLD v1.1.0
+ @see http://schemas.opengis.net/sld/1.0.0/StyledLayerDescriptor.xsd for SLD v1.0.0
+ */
+@interface SLDFeatureTypeStyle : NSObject
+
+@property (nonatomic, strong) NSArray * _Nullable rules;
+
+@end
+
+/** @brief Class corresponding to the se:Rule element
+ @see http://schemas.opengis.net/se/1.1.0/FeatureStyle.xsd for SLD v1.1.0
+ @see http://schemas.opengis.net/sld/1.0.0/StyledLayerDescriptor.xsd for SLD v1.0.0
+ */
+@interface SLDRule : NSObject
+
+@property (nonatomic, strong) NSArray * _Nullable filters;
+@property (nonatomic, strong) NSArray * _Nullable elseFilters;
+
+@property (nonatomic, strong) NSNumber * _Nullable minScaleDenominator;
+@property (nonatomic, strong) NSNumber * _Nullable maxScaleDenominator;
+@property (nonatomic, strong) NSNumber * _Nullable relativeDrawPriority;
+
+@property (nonatomic, strong) NSMutableArray * _Nullable symbolizers;
+
+@end
+
+
+
+@class SLDOperator;
+@class SLDExpression;
+
+/** @brief Class corresponding to the ogc:Filter element
+ @see http://schemas.opengis.net/filter/1.1.0/filter.xsd for SLD v1.1.0
+ @see http://schemas.opengis.net/filter/1.0.0/filter.xsd for SLD v1.0.0
+ */
+@interface SLDFilter : NSObject
+
+@property (nonatomic, strong) SLDOperator * _Nonnull sldOperator;
+
+@end
+
+/** @brief Class corresponding to the sld:StyledLayerDescriptor element
+ 
+    The sld:StyledLayerDescriptor element is the root element of the Styled Layer Descriptor document.
+ 
+    Implements the MaplyVectorStyleDelegate protocol for matching and applying styles to vector objects.
+ @see http://schemas.opengis.net/sld/1.1.0/StyledLayerDescriptor.xsd for SLD v1.1.0
+ @see http://schemas.opengis.net/sld/1.0.0/StyledLayerDescriptor.xsd for SLD v1.0.0
+ @see MaplyVectorStyleDelegate
+ */
+@interface SLDStyleSet : NSObject <MaplyVectorStyleDelegate>
+
+@property (nonatomic, assign) BOOL useLayerNames;
+@property (nonatomic, weak, nullable) NSObject<MaplyRenderControllerProtocol> *viewC;
+@property (nonatomic, strong, nullable) MaplyVectorStyleSettings *tileStyleSettings;
+
+/** 
+    Constructs a SLDStyleSet object.
+ 
+    After constructing the SLDStyleSet object, call loadSldURL: or loadSldData:baseURL: to parse the desired SLD document tree and create the corresponding symbolizers.
+ 
+    @param viewC The map or globe view controller.
+ 
+    @param useLayerNames Whether to use names of NamedLayer elements as a criteria in matching styles.
+ 
+    @param relativeDrawPriority The z-order relative to other vector features. This will be incremented internally for each style rule, so if you have multiple SLDStyleSets, leave some space between the relativeDrawPriority of each.
+ */
+- (id _Nullable)initWithViewC:(NSObject<MaplyRenderControllerProtocol> * _Nonnull)viewC useLayerNames:(BOOL)useLayerNames relativeDrawPriority:(int)relativeDrawPriority;
+
+- (void)loadSldURL:(NSURL *__nullable)url;
+- (void)loadSldData:(NSData *__nonnull)sldData baseURL:(NSURL *__nonnull)baseURL;
+
+@end
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/SLDSymbolizers.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/SLDSymbolizers.h
new file mode 100644
index 0000000..4eb7151
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/SLDSymbolizers.h
@@ -0,0 +1,82 @@
+//
+//  SLDSymbolizers.h
+//  SLDTest
+//
+//  Created by Ranen Ghosh on 2016-08-12.
+//  Copyright 2016-2019 mousebird consulting.
+//
+
+#import <Foundation/Foundation.h>
+@class DDXMLNode;
+@class DDXMLElement;
+#import <WhirlyGlobeMaplyComponent/MaplyVectorTileStyle.h>
+
+/** @brief Base class for Symbolizer elements
+ @see http://schemas.opengis.net/se/1.1.0/Symbolizer.xsd for SLD v1.1.0
+ @see http://schemas.opengis.net/sld/1.0.0/StyledLayerDescriptor.xsd for SLD v1.0.0
+ */
+@interface SLDSymbolizer : NSObject
+
+/** 
+    Returns whether this class can parse the symbolizer corresponding to the provided element name.
+ 
+    Each subclass matches different symbolizer elements.
+ */
++ (BOOL)matchesSymbolizerNamed:(NSString * _Nonnull)symbolizerName;
+
+/** 
+    Produces MaplyVectorTileStyle objects for an SLD Symbolizer element
+ 
+    Parses the XML subtree and returns an array of corresponding MaplyVectorTileStyle objects.
+ 
+    @param element The XML element corresponding to a symbolizer
+ 
+    @param tileStyleSettings The base MaplyVectorStyleSettings settings to apply.
+ 
+    @param viewC The map or globe view controller.
+ 
+    @param minScaleDenom If non-null, the minimum map scale at which to apply any constructed symbolizer.
+ 
+    @param maxScaleDenom If non-null, the maximum map scale at which to apply any constructed symbolizer.
+ 
+    @param relativeDrawPriority The z-order relative to other vector features.
+ 
+    @param baseURL The base URL from which external resources (e.g. images) will be located.
+ 
+    @return An array of MaplyVectorTileStyle objects corresponding to the particular XML element.
+ @see MaplyVectorTileStyle
+ @see MaplyVectorStyleSettings
+ */
++ (NSArray<MaplyVectorTileStyle *> * _Nullable) maplyVectorTileStyleWithElement:(DDXMLElement * _Nonnull)element tileStyleSettings:(MaplyVectorStyleSettings * _Nonnull)tileStyleSettings viewC:(NSObject<MaplyRenderControllerProtocol> * _Nonnull)viewC minScaleDenom:(NSNumber * _Nonnull)minScaleDenom maxScaleDenom:(NSNumber * _Nonnull)maxScaleDenom relativeDrawPriority:(int)relativeDrawPriority crossSymbolizerParams:(NSMutableDictionary * _Nonnull)crossSymbolizerParams baseURL:(NSURL * _Nonnull)baseURL;
+@end
+
+/** @brief Class corresponding to the LineSymbolizer element
+ @see http://schemas.opengis.net/se/1.1.0/Symbolizer.xsd for SLD v1.1.0
+ @see http://schemas.opengis.net/sld/1.0.0/StyledLayerDescriptor.xsd for SLD v1.0.0
+ */
+@interface SLDLineSymbolizer : SLDSymbolizer
+@end
+
+/** @brief Class corresponding to the PolygonSymbolizer element
+ @see http://schemas.opengis.net/se/1.1.0/Symbolizer.xsd for SLD v1.1.0
+ @see http://schemas.opengis.net/sld/1.0.0/StyledLayerDescriptor.xsd for SLD v1.0.0
+ */
+@interface SLDPolygonSymbolizer : SLDSymbolizer
+@end
+
+/** @brief Class corresponding to the PointSymbolizer element
+ @see http://schemas.opengis.net/se/1.1.0/Symbolizer.xsd for SLD v1.1.0
+ @see http://schemas.opengis.net/sld/1.0.0/StyledLayerDescriptor.xsd for SLD v1.0.0
+ */
+@interface SLDPointSymbolizer : SLDSymbolizer
+@end
+
+/** @brief Class corresponding to the TextSymbolizer element
+ @see http://schemas.opengis.net/se/1.1.0/Symbolizer.xsd for SLD v1.1.0
+ @see http://schemas.opengis.net/sld/1.0.0/StyledLayerDescriptor.xsd for SLD v1.0.0
+ */
+@interface SLDTextSymbolizer : SLDSymbolizer
+@end
+
+
+
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/SLDWellKnownMarkers.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/SLDWellKnownMarkers.h
new file mode 100644
index 0000000..cdb4cc8
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/SLDWellKnownMarkers.h
@@ -0,0 +1,23 @@
+//
+//  SLDWellKnownMarkers.h
+//  SLDTest
+//
+//  Created by Ranen Ghosh on 2016-08-23.
+//  Copyright 2016-2019 mousebird consulting.
+//
+
+#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
+
+/** 
+    Class for generating images corresponding to WellKnownName elements.
+ 
+    Each static method uses low-level Core Graphics calls to generate an appropriate UIImage object.
+ @see http://schemas.opengis.net/se/1.1.0/Symbolizer.xsd for SLD v1.1.0
+ @see http://schemas.opengis.net/sld/1.0.0/StyledLayerDescriptor.xsd for SLD v1.0.0
+*/
+@interface SLDWellKnownMarkers : NSObject
+
++ (UIImage *)imageWithName:(NSString *)wellKnownName strokeColor:(UIColor *)strokeColor fillColor:(UIColor *)fillColor size:(int)size;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/WGCoordinate.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/WGCoordinate.h
new file mode 100644
index 0000000..39b882f
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/WGCoordinate.h
@@ -0,0 +1,34 @@
+/*
+ *  WGCoordinate.h
+ *  WhirlyGlobe-MaplyComponent
+ *
+ *  Created by Steve Gifford on 9/17/12.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
+
+/// WhirlyGlobe just takes geo coordinates.
+/// This contains lon and lat values in the x and y fields.
+typedef MaplyCoordinate WGCoordinate;
+
+/// Construct a WGCoordinate with longitude and latitude values in degrees
+#if __cplusplus
+extern "C" {
+#endif
+    WGCoordinate WGCoordinateMakeWithDegrees(float degLon,float degLat);
+#if __cplusplus
+}
+#endif
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/WhirlyGlobeComponent.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/WhirlyGlobeComponent.h
new file mode 100644
index 0000000..5142734
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/WhirlyGlobeComponent.h
@@ -0,0 +1,23 @@
+/*
+ *  WhirlyGlobeComponent.h
+ *  WhirlyGlobeComponent
+ *
+ *  Created by Steve Gifford on 7/21/12.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <WhirlyGlobeMaplyComponent/MaplyComponent.h>
+#import <WhirlyGlobeMaplyComponent/MaplyGlobeRenderController.h>
+#import <WhirlyGlobeMaplyComponent/WhirlyGlobeViewController.h>
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/WhirlyGlobeMaplyComponent.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/WhirlyGlobeMaplyComponent.h
new file mode 100644
index 0000000..e15c8e8
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/WhirlyGlobeMaplyComponent.h
@@ -0,0 +1,121 @@
+//
+//  WhirlyGlobeMaplyComponent.h
+//  WhirlyGlobeMaplyComponent
+//
+//  Created by Steve Gifford on 6/29/16.
+//  Copyright © 2016-2019 mousebird consulting.
+//
+
+#import <UIKit/UIKit.h>
+
+//! Project version number for WhirlyGlobeMaplyComponent.
+FOUNDATION_EXPORT double WhirlyGlobeMaplyComponentVersionNumber;
+
+//! Project version string for WhirlyGlobeMaplyComponent.
+FOUNDATION_EXPORT const unsigned char WhirlyGlobeMaplyComponentVersionString[];
+
+// In this header, you should import all the public headers of your framework using statements like #import <WhirlyGlobeMaplyComponent/PublicHeader.h>
+
+#import <WhirlyGlobeMaplyComponent/GeographicLib_ObjC.h>
+#import <WhirlyGlobeMaplyComponent/GeoJSONSource.h>
+#import <WhirlyGlobeMaplyComponent/GlobeDoubleTapDelegate.h>
+#import <WhirlyGlobeMaplyComponent/GlobeDoubleTapDragDelegate.h>
+#import <WhirlyGlobeMaplyComponent/GlobePanDelegate.h>
+#import <WhirlyGlobeMaplyComponent/GlobePinchDelegate.h>
+#import <WhirlyGlobeMaplyComponent/GlobeRotateDelegate.h>
+#import <WhirlyGlobeMaplyComponent/GlobeTapDelegate.h>
+#import <WhirlyGlobeMaplyComponent/GlobeTiltDelegate.h>
+#import <WhirlyGlobeMaplyComponent/GlobeTwoFingerTapDelegate.h>
+#import <WhirlyGlobeMaplyComponent/MapboxVectorInterpreter.h>
+#import <WhirlyGlobeMaplyComponent/MapboxVectorStyleSet.h>
+#import <WhirlyGlobeMaplyComponent/MapboxVectorTiles.h>
+#import <WhirlyGlobeMaplyComponent/Maply3DTouchPreviewDatasource.h>
+#import <WhirlyGlobeMaplyComponent/Maply3dTouchPreviewDelegate.h>
+#import <WhirlyGlobeMaplyComponent/MaplyActiveObject.h>
+#import <WhirlyGlobeMaplyComponent/MaplyAnnotation.h>
+#import <WhirlyGlobeMaplyComponent/MaplyAtmosphere.h>
+#import <WhirlyGlobeMaplyComponent/MaplyBaseViewController.h>
+#import <WhirlyGlobeMaplyComponent/MaplyBillboard.h>
+#import <WhirlyGlobeMaplyComponent/MaplyBridge.h>
+#import <WhirlyGlobeMaplyComponent/MaplyBridge.h>
+#import <WhirlyGlobeMaplyComponent/MaplyCluster.h>
+#import <WhirlyGlobeMaplyComponent/MaplyColorRampGenerator.h>
+#import <WhirlyGlobeMaplyComponent/MaplyComponent.h>
+#import <WhirlyGlobeMaplyComponent/MaplyComponent.h>
+#import <WhirlyGlobeMaplyComponent/MaplyComponentObject.h>
+#import <WhirlyGlobeMaplyComponent/MaplyControllerLayer.h>
+#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
+#import <WhirlyGlobeMaplyComponent/MaplyCoordinateSystem.h>
+#import <WhirlyGlobeMaplyComponent/MaplyDoubleTapDelegate.h>
+#import <WhirlyGlobeMaplyComponent/MaplyDoubleTapDragDelegate.h>
+#import <WhirlyGlobeMaplyComponent/MaplyGeomBuilder.h>
+#import <WhirlyGlobeMaplyComponent/MaplyGeomModel.h>
+#import <WhirlyGlobeMaplyComponent/MaplyGlobeRenderController.h>
+#import <WhirlyGlobeMaplyComponent/MaplyIconManager.h>
+#import <WhirlyGlobeMaplyComponent/MaplyImageTile.h>
+#import <WhirlyGlobeMaplyComponent/MaplyLabel.h>
+#import <WhirlyGlobeMaplyComponent/MaplyLight.h>
+#import <WhirlyGlobeMaplyComponent/MaplyLocationTracker.h>
+#import <WhirlyGlobeMaplyComponent/MaplyMarker.h>
+#import <WhirlyGlobeMaplyComponent/MaplyMatrix.h>
+#import <WhirlyGlobeMaplyComponent/MaplyMBTileFetcher.h>
+#import <WhirlyGlobeMaplyComponent/MaplyMoon.h>
+#import <WhirlyGlobeMaplyComponent/MaplyPanDelegate.h>
+#import <WhirlyGlobeMaplyComponent/MaplyParticleSystem.h>
+#import <WhirlyGlobeMaplyComponent/MaplyPinchDelegate.h>
+#import <WhirlyGlobeMaplyComponent/MaplyPoints.h>
+#import <WhirlyGlobeMaplyComponent/MaplyQuadImageFrameLoader.h>
+#import <WhirlyGlobeMaplyComponent/MaplyQuadImageLoader.h>
+#import <WhirlyGlobeMaplyComponent/MaplyQuadLoader.h>
+#import <WhirlyGlobeMaplyComponent/MaplyQuadPagingLoader.h>
+#import <WhirlyGlobeMaplyComponent/MaplyQuadSampler.h>
+#import <WhirlyGlobeMaplyComponent/MaplyRemoteTileFetcher.h>
+#import <WhirlyGlobeMaplyComponent/MaplyRenderController.h>
+#import <WhirlyGlobeMaplyComponent/MaplyRenderTarget.h>
+#import <WhirlyGlobeMaplyComponent/MaplyRotateDelegate.h>
+#import <WhirlyGlobeMaplyComponent/MaplyScreenLabel.h>
+#import <WhirlyGlobeMaplyComponent/MaplyScreenMarker.h>
+#import <WhirlyGlobeMaplyComponent/MaplyScreenObject.h>
+#import <WhirlyGlobeMaplyComponent/MaplyShader.h>
+#import <WhirlyGlobeMaplyComponent/MaplyShape.h>
+#import <WhirlyGlobeMaplyComponent/MaplySharedAttributes.h>
+#import <WhirlyGlobeMaplyComponent/MaplySimpleTileFetcher.h>
+#import <WhirlyGlobeMaplyComponent/MaplyStarsModel.h>
+#import <WhirlyGlobeMaplyComponent/MaplySticker.h>
+#import <WhirlyGlobeMaplyComponent/MaplySun.h>
+#import <WhirlyGlobeMaplyComponent/MaplyTapDelegate.h>
+#import <WhirlyGlobeMaplyComponent/MaplyTapMessage.h>
+#import <WhirlyGlobeMaplyComponent/MaplyTexture.h>
+#import <WhirlyGlobeMaplyComponent/MaplyTextureBuilder.h>
+#import <WhirlyGlobeMaplyComponent/MaplyTileSourceNew.h>
+#import <WhirlyGlobeMaplyComponent/MaplyTouchCancelAnimationDelegate.h>
+#import <WhirlyGlobeMaplyComponent/MaplyTwoFingerTapDelegate.h>
+#import <WhirlyGlobeMaplyComponent/MaplyUpdateLayer.h>
+#import <WhirlyGlobeMaplyComponent/MaplyVariableTarget.h>
+#import <WhirlyGlobeMaplyComponent/MaplyVectorObject.h>
+#import <WhirlyGlobeMaplyComponent/MaplyVectorStyle.h>
+#import <WhirlyGlobeMaplyComponent/MaplyVectorStyleSimple.h>
+#import <WhirlyGlobeMaplyComponent/MaplyVectorTileLineStyle.h>
+#import <WhirlyGlobeMaplyComponent/MaplyVectorTileMarkerStyle.h>
+#import <WhirlyGlobeMaplyComponent/MaplyVectorTilePolygonStyle.h>
+#import <WhirlyGlobeMaplyComponent/MaplyVectorTileStyle.h>
+#import <WhirlyGlobeMaplyComponent/MaplyVectorTileTextStyle.h>
+#import <WhirlyGlobeMaplyComponent/MaplyVertexAttribute.h>
+#import <WhirlyGlobeMaplyComponent/MaplyViewController.h>
+#import <WhirlyGlobeMaplyComponent/MaplyViewTracker.h>
+#import <WhirlyGlobeMaplyComponent/MaplyWMSTileSource.h>
+#import <WhirlyGlobeMaplyComponent/MaplyZoomGestureDelegate.h>
+#import <WhirlyGlobeMaplyComponent/MapnikStyle.h>
+#import <WhirlyGlobeMaplyComponent/MapnikStyleRule.h>
+#import <WhirlyGlobeMaplyComponent/MapnikStyleSet.h>
+#import <WhirlyGlobeMaplyComponent/NSData+Zlib.h>
+#import <WhirlyGlobeMaplyComponent/NSDictionary+StyleRules.h>
+#import <WhirlyGlobeMaplyComponent/SLDExpressions.h>
+#import <WhirlyGlobeMaplyComponent/SLDOperators.h>
+#import <WhirlyGlobeMaplyComponent/SLDStyleSet.h>
+#import <WhirlyGlobeMaplyComponent/SLDSymbolizers.h>
+#import <WhirlyGlobeMaplyComponent/SLDWellKnownMarkers.h>
+#import <WhirlyGlobeMaplyComponent/WGCoordinate.h>
+#import <WhirlyGlobeMaplyComponent/WhirlyGlobeComponent.h>
+#import <WhirlyGlobeMaplyComponent/WhirlyGlobeComponent.h>
+#import <WhirlyGlobeMaplyComponent/WhirlyGlobeViewController.h>
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/WhirlyGlobeViewController.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/WhirlyGlobeViewController.h
new file mode 100644
index 0000000..ae3c444
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/WhirlyGlobeViewController.h
@@ -0,0 +1,809 @@
+/*
+ *  WhirlyGlobeViewController.h
+ *  WhirlyGlobeComponent
+ *
+ *  Created by Steve Gifford on 7/21/12.
+ *  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.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#import <UIKit/UIKit.h>
+#import <WhirlyGlobeMaplyComponent/MaplyGlobeRenderController.h>
+#import <WhirlyGlobeMaplyComponent/MaplyBaseViewController.h>
+
+@class WGViewControllerLayer;
+@class WhirlyGlobeViewController;
+
+/**
+    An animation delegate that can be set on a WhirlyGlobeViewController to control the view over time.
+    
+    Filling out these methods will get you animation callbacks at the proper time to control position, heading, tilt, and height on a frame basis.
+    
+    You pass the resulting object in to
+  */
+@protocol WhirlyGlobeViewControllerAnimationDelegate <NSObject>
+
+/**
+    This method is called when the animation starts.
+    
+    At the animation start we collect up the various parameters of the current visual view state and pas them in via the startState.  You probably want to keep track of this for later.
+    
+    @param viewC The view controller doing the animation.
+    
+    @param startState The starting point for the visual view animation.  Cache this somewhere for your own interpolation.
+    
+    @param startTime When the animation starts (e.g. now)
+    
+    @param endTime When the animation ends.  This is an absolute value.
+  */
+- (void)globeViewController:(WhirlyGlobeViewController *__nonnull)viewC startState:(WhirlyGlobeViewControllerAnimationState *__nonnull)startState startTime:(NSTimeInterval)startTime endTime:(NSTimeInterval)endTime;
+
+/**
+    This method is called at the beginning of every frame draw to position the viewer.
+    
+    This is the method that does all the work.  You need to fill out the returned WhirlyGlobeViewControllerAnimationState according to whatever interpolation your'e doing based on the currentTime.
+    
+    @param viewC The view controller doing the animation.
+    
+    @param currentTime The time for this frame.  Use this rather than calculating the time yourself.
+    
+    @return The WhirlyGlobeViewControllerAnimationState expressing where you want the viewer to be and where they are looking.
+  */
+- (nonnull WhirlyGlobeViewControllerAnimationState *)globeViewController:(WhirlyGlobeViewController *__nonnull)viewC stateForTime:(NSTimeInterval)currentTime;
+
+@optional
+
+/**
+    This method is called at the end of the animation.
+    
+    The globe view controller calls this method when the animation is finished.  Do your cleanup here if need be.
+    
+    @param viewC The globe view controller.
+  */
+- (void)globeViewControllerDidFinishAnimation:(WhirlyGlobeViewController *__nonnull)viewC;
+
+@end
+
+/**
+    A simple animation delegate for moving the globe around.
+    
+    The animation delegate support provides a lot of flexibility.  This version just provides all the standard fields and interpolates from beginning to end.
+  */
+@interface WhirlyGlobeViewControllerSimpleAnimationDelegate : NSObject <WhirlyGlobeViewControllerAnimationDelegate>
+
+/// Initialize with an animation state to copy
+- (nonnull instancetype)initWithState:(WhirlyGlobeViewControllerAnimationState *__nonnull)endState;
+
+/// Location at the end of the animation
+@property (nonatomic) MaplyCoordinateD loc;
+
+/// Heading at the end of the animation
+@property (nonatomic) double heading;
+
+/// Height at the end of the animation
+@property (nonatomic) double height;
+
+/// Tilt at the end of the animation
+@property (nonatomic) double tilt;
+
+/// Roll at the end of the animation
+@property (nonatomic) double roll;
+
+/// Globe center at the end of the animation
+@property (nonatomic) CGPoint globeCenter;
+
+/// Custom easing
+@property (readwrite,copy) ZoomEasingBlock _Nullable zoomEasing;
+
+@end
+
+/** 
+    Globe View Controller Delegate protocol for getting back selection and tap events.
+    
+    Fill out the methods in this protocol and assign yourself as a delegate in the WhirlyGlobeViewController to get selection and tap events.
+  */
+@protocol WhirlyGlobeViewControllerDelegate <NSObject>
+
+@optional
+/** 
+    Called when the user taps on or near an object.
+    
+    You're given the object you passed in originally, such as a MaplyScreenMarker.  Most of those objects have userObject properties, which is a good place to stash your own data.
+    
+    @param viewC The view controller where the user selected something.
+    
+    @param selectedObj The Maply object they selected.
+  */
+- (void)globeViewController:(WhirlyGlobeViewController *__nonnull)viewC didSelect:(NSObject *__nonnull)selectedObj;
+
+/** 
+    Called when the user taps on or near an object.
+    
+    This will call back with the closest object it finds near (or on) where the user tapped.
+    
+    You're given the object you passed in originally, such as a MaplyScreenMarker.
+    
+    This version is called preferentially if it exists.  Otherwise globeViewController:didSelect: is called if it exists.
+    
+    @param viewC The view controller where the user selected something.
+    
+    @param selectedObj The Maply object they selected.
+    
+    @param coord The location (geographic lon/lat in radians) where the user tapped.
+    
+    @param screenPt The location on screen where the user tapped.
+  */
+- (void)globeViewController:(WhirlyGlobeViewController *__nonnull)viewC didSelect:(NSObject *__nonnull)selectedObj atLoc:(MaplyCoordinate)coord onScreen:(CGPoint)screenPt;
+
+/** 
+    Called when the user taps on or near one or more objects.  Returns them all.
+    
+    This method is called when the
+    
+    @param viewC The view controller where the user selected something.
+    
+    @param selectedObjs A list of
+    
+    @param coord The location (geographic lon/lat in radians) where the user tapped.
+    
+    @param screenPt The location on screen where the user tapped.
+  */
+- (void)globeViewController:(WhirlyGlobeViewController *__nonnull)viewC allSelect:(NSArray *__nonnull)selectedObjs atLoc:(MaplyCoordinate)coord onScreen:(CGPoint)screenPt;
+
+/** 
+    Called when the user taps outside the globe.
+  */
+- (void)globeViewControllerDidTapOutside:(WhirlyGlobeViewController *__nonnull)viewC;
+
+/** 
+    Called when the user taps the globe but doesn't select anything.
+    
+    @param viewC The view controller where the user selected something.
+    
+    @param coord The location (geographic lon/lat in radians) where the user tapped.
+  */
+- (void)globeViewController:(WhirlyGlobeViewController *__nonnull)viewC didTapAt:(MaplyCoordinate)coord;
+
+/** 
+    This is an older method called when some layers load.
+    
+    Certain image layers call this method when they finish loading.  More modern layers don't, so don't rely on this.
+  */
+- (void)globeViewController:(WhirlyGlobeViewController *__nonnull)viewC layerDidLoad:(WGViewControllerLayer *__nonnull)layer;
+
+/** 
+    Called when the globe starts moving.
+    
+    @param viewC The globe view controller.
+    
+    @param userMotion Set if this is motion being caused by the user, rather than a call to set location.
+    
+    This is called when something (probably the user) starts moving the globe.
+  */
+- (void)globeViewControllerDidStartMoving:(WhirlyGlobeViewController *__nonnull)viewC userMotion:(bool)userMotion;
+
+/** 
+    Called when the globe stops moving.
+    
+    This is called when the globe stops moving.  It passes in the corners of the current viewspace.
+    
+    @param viewC The globe view controller.
+    
+    @param userMotion Set if this is motion being caused by the user, rather than a call to set location.
+    
+    @param corners An array of length 4 containing the corners of the view space (lower left, lower right, upper right, upper left).  If any of those corners does not intersect the globe (think zoomed out), its values are set to MAXFLOAT.
+  */
+- (void)globeViewController:(WhirlyGlobeViewController *__nonnull)viewC didStopMoving:(MaplyCoordinate *__nonnull)corners userMotion:(bool)userMotion;
+
+/** 
+    Called when an animation that knows where it's going to stop start ups.
+    
+    This is called when we know where the globe will stop.  It passes in the corners of that future viewspace.
+    
+    @param viewC The globe view controller.
+    
+    @param corners An array of length 4 containing the corners of the view space (lower left, lower right, upper right, upper left).  If any of those corners does not intersect the globe (think zoomed out), its values are set to MAXFLOAT.
+    
+    @param userMotion Set if this is motion being caused by the user, rather than a call to set location.
+ */
+- (void)globeViewController:(WhirlyGlobeViewController *__nonnull)viewC willStopMoving:(MaplyCoordinate *__nonnull)corners userMotion:(bool)userMotion;
+
+/** 
+    Called whenever the viewpoint moves.
+    
+    This is called whenever the viewpoint moves.  That includes user motion as well as animations.
+    
+    It may be triggered as often as every frame.  If that's a problem, use the globeViewController:didStopMoving:userMotion: or globeViewController:willStopMoving:userMotion: calls.
+    
+    @param viewC The globe view controller.
+    
+    @param corners An array of length 4 containing the corners of the view space (lower left, lower right, upper right, upper left).  If any of those corners does not intersect the globe (think zoomed out), its values are set to MAXFLOAT.
+  */
+- (void)globeViewController:(WhirlyGlobeViewController *__nonnull)viewC didMove:(MaplyCoordinate *__nonnull)corners;
+
+@end
+
+/** 
+    This view controller implements a 3D interactive globe.
+    
+    This is the main entry point for displaying a globe.  Create one of these, fill it with data and let your users mess around with it.
+    
+    You can display a variety of features on the globe, including tiled base maps (MaplyQuadImageTilesLayer), vectors (MaplyVectorObject), shapes (MaplyShape), and others.  Check out the add calls in the MaplyBaseViewController for details.
+    
+    To get selection and tap callbacks, fill out the WhirlyGlobeViewControllerDelegate and assign the delegate.
+    
+    Most of the functionality is shared with MaplyBaseViewController.  Be sure to look in there first.
+ */
+@interface WhirlyGlobeViewController : MaplyBaseViewController
+
+/** 
+    If set, keep north facing upward on the screen as the user moves around.
+    
+    Off by default.
+  */
+@property(nonatomic,assign) bool keepNorthUp;
+
+/** 
+    Turn the pan gesture recognizer on and off
+ 
+    On by default.
+ */
+@property(nonatomic,assign) bool panGesture;
+
+/** 
+    Turn the pinch (zoom) gesture recognizer on and off
+    
+    On by default.
+ */
+@property(nonatomic,assign) bool pinchGesture;
+
+/**
+ Turn the rotate globe functionality for pinch gesture gesture recognizer on and off
+ 
+ On by default.
+ */
+@property(nonatomic,assign) bool zoomAroundPinch;
+
+/** 
+    Turn the rotate gesture recognizer on and off
+    
+    On by default.
+ */
+@property(nonatomic,assign) bool rotateGesture;
+
+/** 
+    Turn the tilt gesture recognizer on and off
+    
+    Off by default.
+ */
+@property(nonatomic,assign) bool tiltGesture;
+
+/** 
+    Turn the double tap to zoom gesture recognizer on and off
+ 
+    On by default.
+ */
+@property(nonatomic,assign) bool doubleTapZoomGesture;
+
+/** 
+    Turn the 2 finger tap to zoom out gesture recognizer on and off
+ 
+    On by default.
+ */
+@property(nonatomic,assign) bool twoFingerTapGesture;
+
+/** 
+    Turn on the double tap and drag gesture to zoom in and out.
+ 
+    On by default.
+ */
+@property(nonatomic,assign) bool doubleTapDragGesture;
+
+/** 
+    If set, we use a modified pan gesture recognizer to play nice
+        with the scroll view.  For the UIScrollView object, set clipsToBounds,
+        pagingEnabled, and delaysContentTouches to YES, and set scrollEnabled
+        and canCancelContentTouches to NO.  Add swipe gesture recognizers
+        to the scroll view to control paging, and call
+        requirePanGestureRecognizerToFailForGesture: for each.
+ 
+    Off by default.
+ */
+@property(nonatomic,assign) bool inScrollView;
+
+
+/** 
+    If set, we'll automatically move to wherever the user tapped.
+    
+    When on we'll move the current location to wherever the user tapped if they tapped the globe.  That's true for selection as well.  On by default.
+  */
+@property(nonatomic,assign) bool autoMoveToTap;
+
+/** 
+    Delegate for the selection and tap events.
+    
+    Fill in the WhirlyGlobeViewControllerDelegate protocol, assign the object here and you'll get selection and tap events.
+  */
+@property(nonatomic,weak,nullable) NSObject<WhirlyGlobeViewControllerDelegate> *delegate;
+
+/** 
+    Current viewer height above terrain.
+    
+    This is the height from with the viewer is viewing the globe.  Values range from minHeight to maxHeight.  Smaller is closer.  See getZoomLimitsMin:max: for values.  The display units are based on a globe with a radius of 1.0.
+ */
+@property (nonatomic,assign) float height;
+
+/** 
+    Tilt in radians.  0 is looking straight down (the default).  PI/2 is looking toward the horizon.
+  */
+@property(nonatomic,assign) float tilt;
+
+/**
+    If set, the globe will be centered to this point on the screen.
+ */
+@property(nonatomic,assign) CGPoint globeCenter;
+
+/** 
+    The current rotation away from north.
+    
+    If keepNorthUp is set this is always 0.
+  */
+@property(nonatomic,assign) float heading;
+
+/**
+    The current roll around the axis pointed out of the user's nose.
+    */
+@property (nonatomic,assign) double roll;
+
+/** 
+    Returns the closest a viewer is allowed to get to the map surface.
+ 
+    @return FLT_MIN if there's no pinchDelegate set
+ */
+- (float)getZoomLimitsMin;
+
+/** 
+    Returns the farthest away a viewer is allowed to get from the map surface
+ 
+    @return FLT_MIN if there's no pinchDelegate set
+ */
+- (float)getZoomLimitsMax;
+
+/** 
+    Return the zoom limits for the globe.
+    
+    @param minHeight The closest a viewer is allowed to get to the globe surface.
+    
+    @param maxHeight The farthest away a viewer is allowed to get from the globe surface.
+ */
+- (void)getZoomLimitsMin:(float *__nonnull)minHeight max:(float *__nonnull)maxHeight;
+
+/** 
+    Set the zoom limits for the globe.
+    
+    @param minHeight The closest a viewer is allowed to get to the globe surface.
+    
+    @param maxHeight The farthest away a viewer is allowed to get from the globe surface.
+ */
+- (void)setZoomLimitsMin:(float)minHeight max:(float)maxHeight;
+
+/** 
+    How much we zoom in or out by when the user double taps or two finger taps.
+    
+    This sets the factor we'll use to zoom in by (e.g. *2.0) when the user double taps.  It also sets how much we zoom out by when the user two finger taps.  This will only have an effect if those gestures are active.
+  */
+@property (nonatomic) float zoomTapFactor;
+
+/** 
+    How long we take to zoom in or out when the user double taps or two finger taps.
+    
+    This controls the duration of the zoom animation.  You can set it to zero to avoid the animation entirely.
+  */
+@property (nonatomic) float zoomTapAnimationDuration;
+
+/** 
+    Reset the far clipping plane.
+    
+    This is advanced functionality.  Make sure you actually need to do this before you do it.
+    
+    The far clipping plane is usually set to something like 4.0.
+  */
+- (void)setFarClipPlane:(double)farClipPlane;
+
+/** 
+    Set the simplified tilt mode.  We'll tilt toward the horizon as the user gets closer to the ground.
+    
+    This implements a simplified mode for tilting.  As the user gets closer to the ground we tilt more toward the horizon.
+    
+    @param minHeight The minimum height corresponding to minTilt.
+    
+    @param maxHeight The height at which to start interoplating tilt.
+    
+    @param minTilt The most tilt toward the horizon.  Invoked when the user is at minHeight or below.
+    
+    @param maxTilt The tilt at the maximum height and over.  The tilt will never be less than this, so typically 0.
+  */
+- (void)setTiltMinHeight:(float)minHeight maxHeight:(float)maxHeight minTilt:(float)minTilt maxTilt:(float)maxTilt;
+
+/// Turn off the varying tilt set up by setTiltMinHeight:maxHeight:minTilt:maxTilt:
+- (void)clearTiltHeight;
+
+/** 
+    Turn on autorotate to rotate by the given amount every second.
+    
+    This turns on an auto-rotate mode.  The globe will start rotating after a delay by the given number of degrees per second.  Very pleasant.
+    
+    @param autoRotateInterval Wait this number of seconds after user interaction to auto rotate.
+    
+    @param autoRotateDegrees Rotate this number of degrees (not radians) per second.
+  */
+- (void)setAutoRotateInterval:(float)autoRotateInterval degrees:(float)autoRotateDegrees;
+
+/** 
+    Animate to the given position over time.
+    
+    @param newPos A coordinate in geographic (lon/lat radians)
+    
+    @param howLong A time interval in seconds.
+ */
+- (void)animateToPosition:(MaplyCoordinate)newPos time:(NSTimeInterval)howLong;
+
+/** 
+    Animate the given position to the screen position over time.
+    
+    This is similar to animateToPosition:time: except that it will attempt to match up the screen position and the geographic position.  This is how you offset the location you're looking at.
+    
+    If it's impossible to move newPos to loc, then nothing happens.
+    
+    @param newPos The geographic position (lon/lat in radians) to move to.
+    
+    @param loc The location on the screen where we'd like it to go.
+    
+    @param howLong How long in seconds to take getting there.
+ */
+- (bool)animateToPosition:(MaplyCoordinate)newPos onScreen:(CGPoint)loc time:(NSTimeInterval)howLong;
+
+/** 
+    Animate to the given position, heading and height over time.
+    
+    @param newPos A coordinate in geographic (lon/lat radians)
+    
+    @param newHeight New height to animate to.
+    
+    @param newHeading New heading to finish on.
+    
+    @param howLong A time interval in seconds.
+ */
+- (bool)animateToPosition:(MaplyCoordinate)newPos height:(float)newHeight heading:(float)newHeading time:(NSTimeInterval)howLong;
+
+/** 
+    Animate to the given position, heading and height over time.
+    
+    @param newPos A coordinate in geographic (lon/lat radians) (double precision)
+    
+    @param newHeight New height to animate to. (double)
+    
+    @param newHeading New heading to finish on. (double)
+    
+    @param howLong A time interval in seconds.
+ */
+- (bool)animateToPositionD:(MaplyCoordinateD)newPos height:(double)newHeight heading:(double)newHeading time:(NSTimeInterval)howLong;
+
+/** 
+    Animate to the given position, screen position, heading and height over time.
+    
+    If it's impossible to move newPos to loc, then nothing happens. 
+    
+    @param newPos A coordinate in geographic (lon/lat radians)
+    
+    @param loc The location on the screen where we'd like it to go.
+    
+    @param newHeight New height to animate to.
+    
+    @param newHeading New heading to finish on.
+    
+    @param howLong A time interval in seconds.
+ */
+- (bool)animateToPosition:(MaplyCoordinate)newPos onScreen:(CGPoint)loc height:(float)newHeight heading:(float)newHeading time:(NSTimeInterval)howLong;
+
+/** 
+    Animate with a delegate over time.
+    
+    Fill in the WhirlyGlobeViewControllerAnimationDelegate and you can control the visual view on a frame by frame basis.  You'll get called back at the appropriate time on the main thread over the time period.
+    
+    You'll also be called one at the end of the animation to establish the final position.
+    
+    @param animationDelegate The objects that implements the WhirlyGlobeViewControllerAnimationDelegate protocol.
+    
+    @param howLong How long the animation will run from the present time.
+  */
+- (void)animateWithDelegate:(NSObject<WhirlyGlobeViewControllerAnimationDelegate> *__nonnull)animationDelegate time:(NSTimeInterval)howLong;
+
+/** 
+    Set the center of the screen to the given position immediately.
+    
+    @param newPos The geographic position (lon/lat in radians) to move to.
+ */
+- (void)setPosition:(MaplyCoordinate)newPos;
+
+/** 
+    Set the center of the screen and the height offset immediately.
+    
+    @param newPos The geographic position (lon/lat in radians) to move to.
+    
+    @param height Height the view point above the globe.
+ */
+- (void)setPosition:(MaplyCoordinate)newPos height:(float)height;
+
+/** 
+    Returns the center of the screen in geographic (lon/lat in radians).
+ */
+- (MaplyCoordinate)getPosition;
+
+/** 
+    Returns the center of the screen in geographic (lon/lat in radians as doubles).
+ */
+- (MaplyCoordinateD)getPositionD;
+
+/** 
+    Returns the current view point's height above the globe.
+ */
+- (double)getHeight;
+
+/** 
+    Set the center of the screen and the height offset immediately.
+    
+    Set the center and height using double.s
+    
+    @param newPos The geographic position (lon/lat in radians) to move to.
+    
+    @param height Height the view point above the globe.
+ */
+- (void)setPositionD:(MaplyCoordinateD)newPos height:(double)height;
+
+/** 
+    Return the current center position and height.
+    
+    @param pos The center of the screen in geographic (lon/lat in radians).
+    
+    @param height The current view point's height above the globe.
+ */
+- (void)getPosition:(MaplyCoordinate *__nonnull)pos height:(float *__nonnull)height;
+
+/** 
+    Return the current center position and height in doubles.
+    
+    @param pos The center of the screen in geographic (lon/lat in radians).
+    
+    @param height The current view point's height above the globe.
+ */
+- (void)getPositionD:(MaplyCoordinateD *__nonnull)pos height:(double *__nonnull)height;
+
+/** 
+    Set the viewing state all at once
+    
+    This sets the position, tilt, height, screen position and heading all at once.
+  */
+- (void)setViewState:(WhirlyGlobeViewControllerAnimationState *__nonnull)viewState;
+
+/** 
+    Make a WhirlyGlobeViewControllerAnimationState object from the current view state.
+    
+    This returns the current view parameters in a single WhirlyGlobeViewControllerAnimationState.
+  */
+- (nullable WhirlyGlobeViewControllerAnimationState *)getViewState;
+
+/** 
+    Return a view state looking at the given location.
+    
+    Creates a view state that looks at the given location, taking tilt and heading into account.
+    
+    @param coord The location the user will be looking at.
+    
+    @param tilt Tilt off of vertical.
+    
+    @param heading Heading calculated from due north.
+    
+    @param alt Altitude of the point the user will be looking at (0, is a good value).
+    
+    @param range How far the user will be from the location they're looking at.
+    
+    @return The view state encapsulating the user location.  Will be nil if the parameters weren't valid.
+  */
+- (nullable WhirlyGlobeViewControllerAnimationState *)viewStateForLookAt:(MaplyCoordinate)coord tilt:(float)tilt heading:(float)heading altitude:(float)alt range:(float)range;
+
+/** 
+    Apply viewing constraints to the given view state.
+    
+    This applies active viewing constraints, such as min and max height and calculated tilt, if it's on to the given view state. This is particularly useful when controlled tilt is on.
+  */
+- (void)applyConstraintsToViewState:(WhirlyGlobeViewControllerAnimationState *__nonnull)viewState;
+
+/** 
+    Find a selectable object at or near the given location.
+    
+    This runs immediately and looks for a Maply object at the given location.  It differs from the WhirlyGlobeViewControllerDelegate in that it doesn't require user interaction.
+    
+    @param screenPt The location on screen where we're looking for an object.
+    
+    @return Returns a Maply object such as MaplyScreenLabel or MaplyShape or nil if it failed to find anything.
+  */
+- (nullable id)findObjectAtLocation:(CGPoint)screenPt;
+
+/** 
+    Return a location on the screen for a given geographic coordinate or CGPointZero if it's not on the screen.
+ 
+    @param geoCoord Point on the earth in lat/lon radians you want a screen position for.
+ 
+    @return the point or CGPointZero
+ */
+- (CGPoint)screenPointFromGeo:(MaplyCoordinate)geoCoord;
+
+/** 
+    Return a location on the screen for a given geographic coordinate or false if it's not on the screen.
+    
+    @param geoCoord Point on the earth in lat/lon radians you want a screen position for.
+    
+    @param screenPt Location on the screen.
+    
+    @return True if the geo coord was on the screen, false otherwise.
+  */
+- (bool)screenPointFromGeo:(MaplyCoordinate)geoCoord screenPt:(CGPoint *__nonnull)screenPt;
+
+/** 
+    Calculate a geo coordinate from a point on the screen.
+    
+    @param screenPt Location on the screen.
+    
+    @param geoCoord Point on the earth in lat/lon radians.
+    
+    @return True if the point was on the globe, false otherwise.
+  */
+- (bool)geoPointFromScreen:(CGPoint)screenPt geoCoord:(MaplyCoordinate *__nonnull)geoCoord;
+
+/**
+    Calculate a geo coordinate from a point on the screen.
+    
+    @param screenPt Location on the screen.
+    
+    @return The corresponding MaplyCoordinate wrapped in an NSValue  if the point was on the globe, nil otherwise.
+  */
+- (nullable NSValue *)geoPointFromScreen:(CGPoint)screenPt;
+
+/** 
+    Calculate a geocentric coordinate from a point on the screen.
+ 
+    @param screenPt Location on the screen.
+ 
+    @return An array of 3 NSNumber (with doubles). If the point wasn't on the globe, returns nil
+ */
+- (nullable NSArray *)geocPointFromScreen:(CGPoint)screenPt;
+
+/** 
+    Calculate a geocentric coordinate from a point on the screen.
+    
+    @param screenPt Location on the screen.
+    
+    @param retCoords An array of 3 doubles.  The geocentric coordinate will be returned here.
+    
+    @return True if the point was on the globe, false otherwise.
+ */
+- (bool)geocPointFromScreen:(CGPoint)screenPt geocCoord:(double *__nonnull)retCoords;
+
+/**
+    Calculate a size in meters by projecting the two screen points onto the globe.
+    Return -1, -1 if the points weren't on the globe.
+  */
+- (CGSize)realWorldSizeFromScreenPt0:(CGPoint)pt0 pt1:(CGPoint)pt1;
+
+/** 
+    Find a height that shows the given bounding box.
+    
+    This method will search for a height that shows the given bounding box within the view.  The search is inefficient, so don't call this a lot.
+    
+    @param bbox The bounding box (in radians) we're trying to view.
+    
+    @param pos The position the viewer will be at.
+ */
+- (float)findHeightToViewBounds:(MaplyBoundingBox)bbox pos:(MaplyCoordinate)pos;
+
+/**
+    Find a height that shows the given bounding box.
+    This method will search for a height that shows the given bounding box within the view.  The search is inefficient, so don't call this a lot.
+
+    This version takes a margin to add around the outside of the area.  Positive margins increase the screen area considered, making the
+    given area larger.  Negative margins make the specified area smaller.
+
+    @param bbox The bounding box (in radians) we're trying to view.
+    @param pos Where the view will be looking.
+    @param marginX Horizontal boundary around the area
+    @param marginY Vertical boundary around the area
+ */
+- (float)findHeightToViewBounds:(MaplyBoundingBox)bbox
+                            pos:(MaplyCoordinate)pos
+                        marginX:(double)marginX
+                        marginY:(double)marginY;
+
+/**
+    Find a height that shows the given bounding box.
+    This method will search for a height that shows the given bounding box within the view.  The search is inefficient, so don't call this a lot.
+
+    This version takes a margin to add around the outside of the area.  Positive margins increase the screen area considered, making the
+    given area larger.  Negative margins make the specified area smaller.
+ 
+    This version attempts to place the given bounds within a rectangle other than the whole view frame.
+    Note that this doesn't work well when the bounds are very large.
+
+    @param bbox The bounding box (in radians) we're trying to view.
+    @param pos Where the view will be looking.
+    @param frame The screen area to consider.
+    @param newPos (out,optional) The center location needed to place \c pos at the center of \c frame
+    @param marginX Horizontal boundary around the area
+    @param marginY Vertical boundary around the area
+ */
+- (float)findHeightToViewBounds:(MaplyBoundingBox)bbox
+                            pos:(MaplyCoordinate)pos
+                          frame:(CGRect)frame
+                         newPos:(MaplyCoordinate *_Nullable)newPos
+                        marginX:(double)marginX
+                        marginY:(double)marginY;
+
+/**
+ 
+    Return the extents of the current view.
+ 
+    When we're dealing with a globe the corners could be outside of the globe, in this case kMaplyNullBoundingBox is returned.
+ 
+    @return Returns the bounding box if exists a bounding bbox for the current view, otherwise returns kMaplyNullBoundingBox.
+ */
+- (MaplyBoundingBox)getCurrentExtents;
+
+/**
+ 
+    Return the extents of the current view.
+ 
+    When we're dealing with a globe the corners could be outside of the globe, in this case false is returned.
+ 
+    @param bbox The bbox will be returned here.
+ 
+    @return Returns true if exists a bounding bbox for the current view, otherwise returns false
+ */
+- (bool)getCurrentExtents:(MaplyBoundingBox *__nonnull)bbox;
+
+/**
+  
+    From the current view figure out a usable geo bounding box.
+  
+    This is similar to the WhirlyGlobeViewControllerDelegate methods and getCurrentExtents except that it goes a little deeper.  It starts with the four corners of the screen and then tries to take tilt and orientation into account.  Ideally it produces a bounding box that covers everything the user is looking at as opposed to where the four corners are.
+ 
+    @param bboxes The bounding boxes to fill in.  Pass in two.
+ 
+    @param visualBoxes If set, we'll build bounding boxes you can display.  If not set, we'll build a single bounding box usable for math.
+  */
+- (int)getUsableGeoBoundsForView:(MaplyBoundingBox *__nonnull)bboxes visual:(bool)visualBoxes;
+
+/**
+ 
+    Make a gesture recognizer's success depend on the pan gesture
+      recognizer's failure.
+ 
+    When using the globe view within a scroll view, add swipe gesture
+      recognizers to the scroll view to control paging, and call this method
+      for each.  See also the inScrollView property and its comment.
+ 
+    @param other The other, subordinate gesture recognizer.
+ */
+- (void)requirePanGestureRecognizerToFailForGesture:(UIGestureRecognizer *__nullable)other;
+
+@end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Info.plist b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Info.plist
new file mode 100644
index 0000000..5e73e17
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Info.plist
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Modules/module.modulemap b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Modules/module.modulemap
new file mode 100644
index 0000000..85d15cc
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Modules/module.modulemap
@@ -0,0 +1,6 @@
+framework module WhirlyGlobeMaplyComponent {
+  umbrella header "WhirlyGlobeMaplyComponent.h"
+
+  export *
+  module * { export * }
+}
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/WhirlyGlobeMaplyComponent b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/WhirlyGlobeMaplyComponent
new file mode 100755
index 0000000..589100d
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/WhirlyGlobeMaplyComponent
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/_CodeSignature/CodeResources b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/_CodeSignature/CodeResources
new file mode 100644
index 0000000..1441796
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/_CodeSignature/CodeResources
@@ -0,0 +1,1246 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>files</key>
+	<dict>
+		<key>Config-ac.h.in</key>
+		<data>
+		9/EeTy4NmqD1NMmDBmUoAMtipP0=
+		</data>
+		<key>Headers/GeoJSONSource.h</key>
+		<data>
+		937zuFWkc1QBB4G3Hgth718qkcE=
+		</data>
+		<key>Headers/GeographicLib_ObjC.h</key>
+		<data>
+		wi0hbesUhx7xqv0FV6rJxu0rs/A=
+		</data>
+		<key>Headers/GlobeDoubleTapDelegate.h</key>
+		<data>
+		QqBi2N/9Est7YCV+CXBPcmISEhc=
+		</data>
+		<key>Headers/GlobeDoubleTapDragDelegate.h</key>
+		<data>
+		xStPD+muKbR+h9e3w6ajP11LUSs=
+		</data>
+		<key>Headers/GlobePanDelegate.h</key>
+		<data>
+		8oYBkNU3Rf4sDMQ/W5KXDOcIEpI=
+		</data>
+		<key>Headers/GlobePinchDelegate.h</key>
+		<data>
+		CSQu/RleIn4NHh8kR5q3JAR8TaI=
+		</data>
+		<key>Headers/GlobeRotateDelegate.h</key>
+		<data>
+		EOdhuii8DgQkjPidSZkVgoZceIk=
+		</data>
+		<key>Headers/GlobeTapDelegate.h</key>
+		<data>
+		A06RyXkRGCQN5Bp80B6Nq3YmpRQ=
+		</data>
+		<key>Headers/GlobeTiltDelegate.h</key>
+		<data>
+		sWfGRmGRT/hpG8wl993hXlG+tR0=
+		</data>
+		<key>Headers/GlobeTwoFingerTapDelegate.h</key>
+		<data>
+		5XYlbJGAVtXGXoEUiEfK9+BYI7A=
+		</data>
+		<key>Headers/MapboxVectorInterpreter.h</key>
+		<data>
+		WLuGcosoeQMKdq8JuJEGUnNnkE4=
+		</data>
+		<key>Headers/MapboxVectorStyleSet.h</key>
+		<data>
+		K+4Brx0I5wiD/W9yWP7LIQNXZyE=
+		</data>
+		<key>Headers/MapboxVectorTiles.h</key>
+		<data>
+		0VqWE9nrKxw/P/51anQ3TMNn/9U=
+		</data>
+		<key>Headers/Maply3DTouchPreviewDatasource.h</key>
+		<data>
+		veOjOMM7qE1UtogzjI8DRrsuNPg=
+		</data>
+		<key>Headers/Maply3dTouchPreviewDelegate.h</key>
+		<data>
+		GhyXHa4AgXMAFuq3LU0ttD1Dly0=
+		</data>
+		<key>Headers/MaplyActiveObject.h</key>
+		<data>
+		gv2jeu6hqWC1symP6lBUg6lNenI=
+		</data>
+		<key>Headers/MaplyAnnotation.h</key>
+		<data>
+		bwTVeyclnU18fBTQMkCXxGInwVs=
+		</data>
+		<key>Headers/MaplyAtmosphere.h</key>
+		<data>
+		vpmM4chkSjVfshM9MhOOopXAZf8=
+		</data>
+		<key>Headers/MaplyBaseViewController.h</key>
+		<data>
+		laIE4y5bJtCZpWkNtwhZlaRTAC8=
+		</data>
+		<key>Headers/MaplyBillboard.h</key>
+		<data>
+		t+0yZyuc8uq+j8Z5Yktc5n7GUS4=
+		</data>
+		<key>Headers/MaplyBridge.h</key>
+		<data>
+		LdS+E0jZeW+78EUBIl+BmD/QHEw=
+		</data>
+		<key>Headers/MaplyCluster.h</key>
+		<data>
+		IfPMUJU7Cjhu4ThUtr9i30+kS+Q=
+		</data>
+		<key>Headers/MaplyColorRampGenerator.h</key>
+		<data>
+		HyRswbCNLClgGqPfaDayUgMi1Ik=
+		</data>
+		<key>Headers/MaplyComponent.h</key>
+		<data>
+		dVdP2Q/AT4dQkntL6pIoL1cUrdA=
+		</data>
+		<key>Headers/MaplyComponentObject.h</key>
+		<data>
+		4eS1jK32SUcD1rVC97OVvfnNKPw=
+		</data>
+		<key>Headers/MaplyControllerLayer.h</key>
+		<data>
+		szeESgaZW8ohSXXfimPwp9CVkb4=
+		</data>
+		<key>Headers/MaplyCoordinate.h</key>
+		<data>
+		8Bjz2ahBYo5zsMMYDKbe6bhwdtI=
+		</data>
+		<key>Headers/MaplyCoordinateSystem.h</key>
+		<data>
+		kILANaUh7pnsL1l/aWJdyv4pzqs=
+		</data>
+		<key>Headers/MaplyDoubleTapDelegate.h</key>
+		<data>
+		XGNWfVk2gdn8mt+NaC7No9eiOlY=
+		</data>
+		<key>Headers/MaplyDoubleTapDragDelegate.h</key>
+		<data>
+		d7fr4Z6uqBWvvzmGrNYxuA5G/Do=
+		</data>
+		<key>Headers/MaplyGeomBuilder.h</key>
+		<data>
+		r6R0mhvncgqfdAz4ip4Lr7ZmXYo=
+		</data>
+		<key>Headers/MaplyGeomModel.h</key>
+		<data>
+		UapH92S1iiGjWQuyp/bngpU0i5c=
+		</data>
+		<key>Headers/MaplyGlobeRenderController.h</key>
+		<data>
+		y3zV9QoBuXrLSPV+ZoqcHgtKuOk=
+		</data>
+		<key>Headers/MaplyIconManager.h</key>
+		<data>
+		nK7FXvdaNNJlMG2gkme0mvLrQCc=
+		</data>
+		<key>Headers/MaplyImageTile.h</key>
+		<data>
+		ZZmLOCDB9e7GFGkszefkC/aXn38=
+		</data>
+		<key>Headers/MaplyLabel.h</key>
+		<data>
+		D8Qv7leEaKdKu4FAyfBci+ubZiY=
+		</data>
+		<key>Headers/MaplyLight.h</key>
+		<data>
+		sKyD68yinBeEZPs8TEukTYp2W9c=
+		</data>
+		<key>Headers/MaplyLocationTracker.h</key>
+		<data>
+		Tfi92LCIdwR+FJfYOJHPy3E/v24=
+		</data>
+		<key>Headers/MaplyMBTileFetcher.h</key>
+		<data>
+		cnXHxCPZD/FivXeYoK/4525mnzU=
+		</data>
+		<key>Headers/MaplyMarker.h</key>
+		<data>
+		QdlpRu30qMHHhagOfxX1z4kf2jk=
+		</data>
+		<key>Headers/MaplyMatrix.h</key>
+		<data>
+		N35AfRn0T614wk3FcINbEQtWF0o=
+		</data>
+		<key>Headers/MaplyMoon.h</key>
+		<data>
+		4Xt5665zNpl5AE16Gh7ZYM5aIUo=
+		</data>
+		<key>Headers/MaplyPanDelegate.h</key>
+		<data>
+		+XRT+yzcf/oUIrFc6DM07ft0PII=
+		</data>
+		<key>Headers/MaplyParticleSystem.h</key>
+		<data>
+		n7FrS8/yNdRLvZSk9dVG7eulxh4=
+		</data>
+		<key>Headers/MaplyPinchDelegate.h</key>
+		<data>
+		nin3Yyzz5GIcMDYL5cPD0ZSv2Tg=
+		</data>
+		<key>Headers/MaplyPoints.h</key>
+		<data>
+		V860eYyJPBC5Z66zRSQdeoahJHo=
+		</data>
+		<key>Headers/MaplyQuadImageFrameLoader.h</key>
+		<data>
+		A9iSacaxRYqA7uZWgIlTWDA7bW0=
+		</data>
+		<key>Headers/MaplyQuadImageLoader.h</key>
+		<data>
+		8LkkWx3WfQGVO94r8r109ZQe80I=
+		</data>
+		<key>Headers/MaplyQuadLoader.h</key>
+		<data>
+		nJOeQ62UtLOKFwTYGqyV3vZt2oI=
+		</data>
+		<key>Headers/MaplyQuadPagingLoader.h</key>
+		<data>
+		+coy3fyJrIsHClyEMZCgDEvb9Us=
+		</data>
+		<key>Headers/MaplyQuadSampler.h</key>
+		<data>
+		e7/dyK5Dev6qeUPuMqU3EoGU/q8=
+		</data>
+		<key>Headers/MaplyRemoteTileFetcher.h</key>
+		<data>
+		sBW6ZE4BgyloyEsN1FKwdZ/gPp4=
+		</data>
+		<key>Headers/MaplyRenderController.h</key>
+		<data>
+		BNk++voDMy9ildkdMmAUiK1/g6U=
+		</data>
+		<key>Headers/MaplyRenderTarget.h</key>
+		<data>
+		TXoMwuhTR7zuTQFcn26qxB8auKY=
+		</data>
+		<key>Headers/MaplyRotateDelegate.h</key>
+		<data>
+		78P45X/02M5h7ZiarlD7QnPrXnQ=
+		</data>
+		<key>Headers/MaplyScreenLabel.h</key>
+		<data>
+		oj7/vmKOCcR2tebFPSm0+LD6muY=
+		</data>
+		<key>Headers/MaplyScreenMarker.h</key>
+		<data>
+		VZ56mE8IOEkjEMvAngUdecjarNQ=
+		</data>
+		<key>Headers/MaplyScreenObject.h</key>
+		<data>
+		C7UC0uvQf3a2fpACbODlm2tix/I=
+		</data>
+		<key>Headers/MaplyShader.h</key>
+		<data>
+		vZZ1SSdaLFATZPOIm03Ps1SVtfI=
+		</data>
+		<key>Headers/MaplyShape.h</key>
+		<data>
+		uneK25mhPQg4dHV2QR1IzSnFCe0=
+		</data>
+		<key>Headers/MaplySharedAttributes.h</key>
+		<data>
+		Lg9QAnH7ddyZ9yw9rU1iB6chs9A=
+		</data>
+		<key>Headers/MaplySimpleTileFetcher.h</key>
+		<data>
+		R4vw2zDAYDnEcMpNef2xK6UGzNs=
+		</data>
+		<key>Headers/MaplyStarsModel.h</key>
+		<data>
+		I3isMTXLSsH/WEeOlENufJeI44k=
+		</data>
+		<key>Headers/MaplySticker.h</key>
+		<data>
+		enz/waha8xpb3IFnm03qjnDQ1gI=
+		</data>
+		<key>Headers/MaplySun.h</key>
+		<data>
+		3U74Fiduk+nqrWgSoiaaiCMd298=
+		</data>
+		<key>Headers/MaplyTapDelegate.h</key>
+		<data>
+		diOK0TbP1CXUksxX37tLxXmjDB8=
+		</data>
+		<key>Headers/MaplyTapMessage.h</key>
+		<data>
+		iNQtsyXu26IXU7Vix6utQOoK7gg=
+		</data>
+		<key>Headers/MaplyTexture.h</key>
+		<data>
+		y0AHjS3maNppktArt/dwY1ijKFI=
+		</data>
+		<key>Headers/MaplyTextureBuilder.h</key>
+		<data>
+		m4xwlqmFemTDO+66mIsnemnInyM=
+		</data>
+		<key>Headers/MaplyTileSourceNew.h</key>
+		<data>
+		Q50UqYfnOFixtkarc7GgLr0X3HI=
+		</data>
+		<key>Headers/MaplyTouchCancelAnimationDelegate.h</key>
+		<data>
+		UDKJWRB0ugd+lkP5bvunOpYD+V4=
+		</data>
+		<key>Headers/MaplyTwoFingerTapDelegate.h</key>
+		<data>
+		qKPSoCHimn9NO1ZYnb6m8+Bs7p0=
+		</data>
+		<key>Headers/MaplyUpdateLayer.h</key>
+		<data>
+		9JKBY+zNKBaFIDPP+DOnA8BVnbU=
+		</data>
+		<key>Headers/MaplyVariableTarget.h</key>
+		<data>
+		sMPC450ZY6ZRgJVGvGOflstxRFw=
+		</data>
+		<key>Headers/MaplyVectorObject.h</key>
+		<data>
+		lAk2Q3lXJun/2KNqbBssKKocvf0=
+		</data>
+		<key>Headers/MaplyVectorStyle.h</key>
+		<data>
+		uUWc22f6STb7UnrcEyg2N01lqLE=
+		</data>
+		<key>Headers/MaplyVectorStyleSimple.h</key>
+		<data>
+		A1HV9J2gHYMGVehLcN2BTU1LwB8=
+		</data>
+		<key>Headers/MaplyVectorTileLineStyle.h</key>
+		<data>
+		bIOr+1Wh+WDzf8jLF4y+N1vRgCE=
+		</data>
+		<key>Headers/MaplyVectorTileMarkerStyle.h</key>
+		<data>
+		N1TIgSolZa/x48Fp7ZQ4FPo6kcQ=
+		</data>
+		<key>Headers/MaplyVectorTilePolygonStyle.h</key>
+		<data>
+		J2tM5FFefDD5as2elNI7JVQZezE=
+		</data>
+		<key>Headers/MaplyVectorTileStyle.h</key>
+		<data>
+		dqMwJcpfeWq57aGFuVpzOJsVCBg=
+		</data>
+		<key>Headers/MaplyVectorTileTextStyle.h</key>
+		<data>
+		doEljzxWF5K95Oy3P2pOzGXXCeI=
+		</data>
+		<key>Headers/MaplyVertexAttribute.h</key>
+		<data>
+		cgeR0Lm2OkTO04MtaFIYUR4uHFY=
+		</data>
+		<key>Headers/MaplyViewController.h</key>
+		<data>
+		hyE5IoF47F8m8WtrBhCjA0HEsOQ=
+		</data>
+		<key>Headers/MaplyViewTracker.h</key>
+		<data>
+		J1pPLfjOaWAYCJNiSRbwwppWfaw=
+		</data>
+		<key>Headers/MaplyWMSTileSource.h</key>
+		<data>
+		IuDijOCRB2DsjKEnIGBeZ5JNPpU=
+		</data>
+		<key>Headers/MaplyZoomGestureDelegate.h</key>
+		<data>
+		vjYe7vTevTdOagktXppng/iT8+Q=
+		</data>
+		<key>Headers/MapnikStyle.h</key>
+		<data>
+		pPxP9zN7RyXXWka1aTc8B7SVN9w=
+		</data>
+		<key>Headers/MapnikStyleRule.h</key>
+		<data>
+		DEgwkhgj+VyJ6GR+B26aCQ1GIeM=
+		</data>
+		<key>Headers/MapnikStyleSet.h</key>
+		<data>
+		vgq0mYNtPuQBRHDc3NJqhlHnhXw=
+		</data>
+		<key>Headers/NSData+Zlib.h</key>
+		<data>
+		Gsek7/5n4OLrTwAU/RBpfk5rcf4=
+		</data>
+		<key>Headers/NSDictionary+StyleRules.h</key>
+		<data>
+		uphDMxI5vMG/TqKHx4diLyAwLjM=
+		</data>
+		<key>Headers/SLDExpressions.h</key>
+		<data>
+		njrUuR9+9OJ016pPutGDMIvn4T4=
+		</data>
+		<key>Headers/SLDOperators.h</key>
+		<data>
+		YvWTgLCIF5yjz61K6WyzcDW+CtA=
+		</data>
+		<key>Headers/SLDStyleSet.h</key>
+		<data>
+		wWIJ23sN0O+LUCM4JlB1wtkEG1A=
+		</data>
+		<key>Headers/SLDSymbolizers.h</key>
+		<data>
+		FhQLrH9s1bTxGJs3ZUAyjkd46kg=
+		</data>
+		<key>Headers/SLDWellKnownMarkers.h</key>
+		<data>
+		4rJuYX7cc7wpnDKXRFwKoZLaIFE=
+		</data>
+		<key>Headers/WGCoordinate.h</key>
+		<data>
+		REsmTre6QdPnJq3au42JyOnicjc=
+		</data>
+		<key>Headers/WhirlyGlobeComponent.h</key>
+		<data>
+		bwdezuwBxjv+fQBqWtLD0aC04u0=
+		</data>
+		<key>Headers/WhirlyGlobeMaplyComponent.h</key>
+		<data>
+		WSYB8LU4bDMUiufeha0G4rWdaEs=
+		</data>
+		<key>Headers/WhirlyGlobeViewController.h</key>
+		<data>
+		jR220Or+oVvIToUnAapk826eXHY=
+		</data>
+		<key>Info.plist</key>
+		<data>
+		+4BGxzLsdf7vW/Dx9wGuDODqXvU=
+		</data>
+		<key>Modules/module.modulemap</key>
+		<data>
+		1T0ltU0zboDAiMub6gKuHoacj7c=
+		</data>
+		<key>default.metallib</key>
+		<data>
+		h/kQT5dH50b8/G0qP9YHYt8GCrs=
+		</data>
+	</dict>
+	<key>files2</key>
+	<dict>
+		<key>Config-ac.h.in</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			BrnjgI9i/RJ2l/sj2GvqsuKk1qYLLdJ/xeCm8SyKeMI=
+			</data>
+		</dict>
+		<key>Headers/GeoJSONSource.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			BR9FQVudT17atfZjlNa0RGg/HdtiwDR9miRdwtxA1T0=
+			</data>
+		</dict>
+		<key>Headers/GeographicLib_ObjC.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			EwkqPPmw+FhUv/t2zEjM5YDp1dtDNoTSTsfSj/6Kn2g=
+			</data>
+		</dict>
+		<key>Headers/GlobeDoubleTapDelegate.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			Tetu4dRav5CC4HKuckECAsIB3tS2TnFikAHEqxROayg=
+			</data>
+		</dict>
+		<key>Headers/GlobeDoubleTapDragDelegate.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			4vppNK67pWkTQhJyN0QmPuHngMAr5j/3AkziNXt3NMs=
+			</data>
+		</dict>
+		<key>Headers/GlobePanDelegate.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			hlHwsT4O/RascLHvBrN6RBi49usoTsaFP8FSwhSCDNg=
+			</data>
+		</dict>
+		<key>Headers/GlobePinchDelegate.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			ggsyNl86MZTZjTt3Rr+GIawY/MxqcJ4/d7MlbD6woVU=
+			</data>
+		</dict>
+		<key>Headers/GlobeRotateDelegate.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			FFGYRwjFuun3b7QFcxhYOrL2Pl/bwpowfZxIf+2E9sU=
+			</data>
+		</dict>
+		<key>Headers/GlobeTapDelegate.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			lgaeoilq/MXWbVKVLLzbkEW2hbvmbrekJy40rDjF6MA=
+			</data>
+		</dict>
+		<key>Headers/GlobeTiltDelegate.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			XneMslqShuBE+7Of4lZKK0dZTy/NMxPMDp4jwJKhyUE=
+			</data>
+		</dict>
+		<key>Headers/GlobeTwoFingerTapDelegate.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			LZs/tyEygzHGahueGTihkbzrdwFZg8ZCT7j6fS2n540=
+			</data>
+		</dict>
+		<key>Headers/MapboxVectorInterpreter.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			3tBMW6v+Lbt9J58yXHcWd7ExJQ/Y/cwzHqE8ndcsuPU=
+			</data>
+		</dict>
+		<key>Headers/MapboxVectorStyleSet.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			8iFoK4bjwg8LEcKllmv/Zj2i1Ee3O7+H8QhXwCP2So4=
+			</data>
+		</dict>
+		<key>Headers/MapboxVectorTiles.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			fHS2g1b2GslAdBouT5ik99j22t9kzKz0+dOqqBy1qNU=
+			</data>
+		</dict>
+		<key>Headers/Maply3DTouchPreviewDatasource.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			SGA2k3ZgFOs8HBrttWY0WwS98S6zvA/tIQA6TnMOOBA=
+			</data>
+		</dict>
+		<key>Headers/Maply3dTouchPreviewDelegate.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			RGt2NCZA98UKbW5BAf+NqqyfGtBwlRmQScU6oWaC4Ns=
+			</data>
+		</dict>
+		<key>Headers/MaplyActiveObject.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			gZGmPb+XxM76ChWjwxT4pJRIlyuyrPozC8pt24ZhZAo=
+			</data>
+		</dict>
+		<key>Headers/MaplyAnnotation.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			Bp67CxFhiBs4uvgMN18vron8OQmULAcvCf0jc1hgJxQ=
+			</data>
+		</dict>
+		<key>Headers/MaplyAtmosphere.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			40ZachVmaxjBEF9Vz73G7sXEgvb5VATH0KERCa26yAA=
+			</data>
+		</dict>
+		<key>Headers/MaplyBaseViewController.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			PcZI8sJVG8mlDg4rLwfPBZ9GR5Vwp6W8FGLT9MU/zY4=
+			</data>
+		</dict>
+		<key>Headers/MaplyBillboard.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			7g7wp0EX25Q9mJmBqYSrhxDWlaFKQCF6AgMqwP382aM=
+			</data>
+		</dict>
+		<key>Headers/MaplyBridge.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			+e9eonOgnFVgdnMxGIIYupk10bIEvlbLXx2oa46hq0w=
+			</data>
+		</dict>
+		<key>Headers/MaplyCluster.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			yj9U4huuAQRwL0XeqKFw07/WDRRsG6yRc5bkggDgWRY=
+			</data>
+		</dict>
+		<key>Headers/MaplyColorRampGenerator.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			V0KmZBBhDdsgXVuQk5nd1Q++c4SnwnXGGaA9N07w8bY=
+			</data>
+		</dict>
+		<key>Headers/MaplyComponent.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			7qAtCsTC9zGeQdXXscusy0cDzxz/4lFpjadkLRQcmTM=
+			</data>
+		</dict>
+		<key>Headers/MaplyComponentObject.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			ENmgvhH1Tvo+faJ5SReD3/z/PoC7UPzw5HXEGrav45c=
+			</data>
+		</dict>
+		<key>Headers/MaplyControllerLayer.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			e8v5br8s6oiZ3j37KlA55aN/6JKzQp+/aEceVId5xUk=
+			</data>
+		</dict>
+		<key>Headers/MaplyCoordinate.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			Sr+8g1mVH5mhKiDpsl8dTYcwxI4yqFU0HtVeOHGxqO0=
+			</data>
+		</dict>
+		<key>Headers/MaplyCoordinateSystem.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			55C8OPhmu9z1Xq2UNAYGReWIuZkKResLLDPxD3kr8xE=
+			</data>
+		</dict>
+		<key>Headers/MaplyDoubleTapDelegate.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			jRAnvC9YJkLDDuHOw88K26PnutShjtj0nv0rY95Xj1k=
+			</data>
+		</dict>
+		<key>Headers/MaplyDoubleTapDragDelegate.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			5auRA9mLEKoKeiN1QH6b3bpg4a+fQG6oHlGI6NGDU2o=
+			</data>
+		</dict>
+		<key>Headers/MaplyGeomBuilder.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			Ms2AmBsL8UX7x/HXBzyCQt5mLxw1V0vUkEECy0wyqcI=
+			</data>
+		</dict>
+		<key>Headers/MaplyGeomModel.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			rOSDj8Q6345wdWHbnzUzpp5023Rvx7Vcjgcpv3e6PIc=
+			</data>
+		</dict>
+		<key>Headers/MaplyGlobeRenderController.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			xPWd0rkE7GaS19VtE/CPjtA14glNqURmy6yzF6CvUHc=
+			</data>
+		</dict>
+		<key>Headers/MaplyIconManager.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			kqPQ5fKmnYIbvYZgFwZJWzIHX6629tSap8S5FX98hJ0=
+			</data>
+		</dict>
+		<key>Headers/MaplyImageTile.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			7u0wIwfiZm/uO5vpmWr3NO7gu6qRFvKvBHiVPwYZeX4=
+			</data>
+		</dict>
+		<key>Headers/MaplyLabel.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			c5m4eVs3tUFd0QDzdCVKoQmytZy/GNO9iBvl1TME3bg=
+			</data>
+		</dict>
+		<key>Headers/MaplyLight.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			zJl6mJBZzqe1UynfO31NurLj8ijKVzlOIJc+s6xM/O8=
+			</data>
+		</dict>
+		<key>Headers/MaplyLocationTracker.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			GE8hzHSI0oLxAP2eKd0JiYJHKBvUnTcunqpAYu4Ds1Q=
+			</data>
+		</dict>
+		<key>Headers/MaplyMBTileFetcher.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			yJQH80FSlLNs5ILAXu8zgppOap/MyHrpE8JVuSiKB4w=
+			</data>
+		</dict>
+		<key>Headers/MaplyMarker.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			wOXO2utU9tXmRtkYsxmCXlz0wpfZTucHxB3UtcPJ6ws=
+			</data>
+		</dict>
+		<key>Headers/MaplyMatrix.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			SJw/BHcbrI2SCNMwFaVT2C3pTxUITcLWhXEejTxu14c=
+			</data>
+		</dict>
+		<key>Headers/MaplyMoon.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			mql0HTjPDgAWlhPeGoTCGi/l8bpTFlfsL3ezawdSiwc=
+			</data>
+		</dict>
+		<key>Headers/MaplyPanDelegate.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			E3pdxgV/fdV2EaFsvRV7Ze5/2jjSdPEAoNdLbth2Cbc=
+			</data>
+		</dict>
+		<key>Headers/MaplyParticleSystem.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			BWRUq+olSAQIq2Y24Nj7OLzoQFZkGlG4EAFG8yVOPr4=
+			</data>
+		</dict>
+		<key>Headers/MaplyPinchDelegate.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			9bI+2DoZnptTq2h04H9tKp2Y+/D6ilv/GYX4wKSa6m8=
+			</data>
+		</dict>
+		<key>Headers/MaplyPoints.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			XJBXbONYn2YK+S+AEMPu7EOxIdJ63P/r05Lce/TlZDk=
+			</data>
+		</dict>
+		<key>Headers/MaplyQuadImageFrameLoader.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			neKxj+ttdZVRdc70Mw1cjiOIU/Kqlz0YWzyncOXOT0c=
+			</data>
+		</dict>
+		<key>Headers/MaplyQuadImageLoader.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			wv63ffphBCXeMY2Uz2j28i7gjyStZrpE3bx01+Z6IZ4=
+			</data>
+		</dict>
+		<key>Headers/MaplyQuadLoader.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			RB5eAEloaf9af+AVyhtCsnSOMFMPU5Jgx0WZH5X6E/A=
+			</data>
+		</dict>
+		<key>Headers/MaplyQuadPagingLoader.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			wo60Bn721xYnksFF+4AP1zKAgka6DXE2is3F+jG3JFc=
+			</data>
+		</dict>
+		<key>Headers/MaplyQuadSampler.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			OgXj+sk51fobG1zO5syFvMaPW3+YcU5TV+KlZLskdWc=
+			</data>
+		</dict>
+		<key>Headers/MaplyRemoteTileFetcher.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			UnQYFM5Yor/CBrUNN4v1l4y7oc6gpToMibVmS+w9m0g=
+			</data>
+		</dict>
+		<key>Headers/MaplyRenderController.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			pEK6F6Dm2XoXKB6TKzj8n1BtjtrIwcS8NsCWAG9fvW0=
+			</data>
+		</dict>
+		<key>Headers/MaplyRenderTarget.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			5nhoiPd48ouIE+/Bf3kLIUlZmMh22R0wKIZPaAX7H/M=
+			</data>
+		</dict>
+		<key>Headers/MaplyRotateDelegate.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			sy/fP0+ocjA34p1NDXlzlKM/kt8y0uFUHQAFPrts6xU=
+			</data>
+		</dict>
+		<key>Headers/MaplyScreenLabel.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			6JZwaHM68zOo8hwxihchc+mcjUKFuS8DvXcf1Zk5rMc=
+			</data>
+		</dict>
+		<key>Headers/MaplyScreenMarker.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			wCwfHq+VUJcC05JQvSzEEeBDBVAYGGJh8ddkI+npTBs=
+			</data>
+		</dict>
+		<key>Headers/MaplyScreenObject.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			D0N/0wBSrS+g1Vctrl1hopQuca0XXeCmdnCjG/Xf+pQ=
+			</data>
+		</dict>
+		<key>Headers/MaplyShader.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			JnQZpUzF+ciGb8/7mLmTEJVdXW9fojwVl8zorpYnohU=
+			</data>
+		</dict>
+		<key>Headers/MaplyShape.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			3etFggI8Z9OSaF+jmg+hXm0AJXXWhs3LuBp8aID82V8=
+			</data>
+		</dict>
+		<key>Headers/MaplySharedAttributes.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			DOiqgZLQzTKzX5Kj5SxhzZSApIIRN0W2yr/rbKPp/I8=
+			</data>
+		</dict>
+		<key>Headers/MaplySimpleTileFetcher.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			tWG4E+EUgw0/ZFufAApUC5UeMDJf7PNz/85mr5sTGXk=
+			</data>
+		</dict>
+		<key>Headers/MaplyStarsModel.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			3s96Ghh0R9uzzrxCpzvc1BRDOBrZfoAU85LI1+kBF4c=
+			</data>
+		</dict>
+		<key>Headers/MaplySticker.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			MkAnRDlKB5JbkmXvZ0Mef3UV7T4/k+e/Dgz5T2cVaGc=
+			</data>
+		</dict>
+		<key>Headers/MaplySun.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			aBFBB37VeV3COc9QRDslifQnwCJJt//ae7BjHmYDCEA=
+			</data>
+		</dict>
+		<key>Headers/MaplyTapDelegate.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			7CoA/hJBug69a4EBeJ6Wi/iqPznGtxcxHdNDMmmzHiw=
+			</data>
+		</dict>
+		<key>Headers/MaplyTapMessage.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			vTEQDVmjnN0KKUkNr/txcbqHR3P2vJso3QyVC+RPZJY=
+			</data>
+		</dict>
+		<key>Headers/MaplyTexture.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			KOQpK7ZV2Nh8Kd1qdVPPEJf3yTmpm5Wnx1T0ji8yfFA=
+			</data>
+		</dict>
+		<key>Headers/MaplyTextureBuilder.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			AEmO3A/esFMpTNQkEfWEusCS6JtWpoOVYB3opZ9QbMU=
+			</data>
+		</dict>
+		<key>Headers/MaplyTileSourceNew.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			c2GDTSIOHz4HeWgwBCe7aGRGGoudMeyLdPmnokSS96g=
+			</data>
+		</dict>
+		<key>Headers/MaplyTouchCancelAnimationDelegate.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			4t6DqxTvF4wtsbOFGGfcYUjx2gY+47ogeyMZlSUq+e0=
+			</data>
+		</dict>
+		<key>Headers/MaplyTwoFingerTapDelegate.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			9jIozUkZs1+S0LxO4BFonQmWw1M0mRbxZh+GnNcISqM=
+			</data>
+		</dict>
+		<key>Headers/MaplyUpdateLayer.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			XZoM2hcfC5TOChF+p6ft/MViS90KguMBV0GD+EupLZ4=
+			</data>
+		</dict>
+		<key>Headers/MaplyVariableTarget.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			j8VYJkwbPQdTB4kxx70+csEKxvKU0KyaEpjmXFoG4+c=
+			</data>
+		</dict>
+		<key>Headers/MaplyVectorObject.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			bO67LMvnkAebp4CuTyRh++5eejskrKlXPB4CipSsOgE=
+			</data>
+		</dict>
+		<key>Headers/MaplyVectorStyle.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			X9l3QkebUyCol3IYa2XyrEO2A+7cjh3QQyZbQ+MJIec=
+			</data>
+		</dict>
+		<key>Headers/MaplyVectorStyleSimple.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			pTY/7uS72HHO7CB0yVtNuRD2ZvFP/VkegCLyzvchuL8=
+			</data>
+		</dict>
+		<key>Headers/MaplyVectorTileLineStyle.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			KmyJ4LCP+ADvVNbbzbc8ZRYgOR6D3Z3nOWFPoq2+6h4=
+			</data>
+		</dict>
+		<key>Headers/MaplyVectorTileMarkerStyle.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			MROAiyS5kOem3S8qsqDpJ/20cJwynZKldl8CFWRiJVg=
+			</data>
+		</dict>
+		<key>Headers/MaplyVectorTilePolygonStyle.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			LmK8mewi+r/hk6RQTpG6058b2+RxPAhXsmjfgBDi9hU=
+			</data>
+		</dict>
+		<key>Headers/MaplyVectorTileStyle.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			f4jJGM8ase6IDBqBESN0rg/OlbFCCGWJt6Qt+pDLCrU=
+			</data>
+		</dict>
+		<key>Headers/MaplyVectorTileTextStyle.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			Ma3Ak55xQ0x4vwYOdlV/PRx24QxlEXxdYO9RQSW69+Q=
+			</data>
+		</dict>
+		<key>Headers/MaplyVertexAttribute.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			mmmrVh838rtoKuUVUc6xuFO4Eyl1bOoWH+4J050FAp4=
+			</data>
+		</dict>
+		<key>Headers/MaplyViewController.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			4tccbvPLHo0FuUi/pT0yvC93/bxVDNCDxYsUzoSOO1Q=
+			</data>
+		</dict>
+		<key>Headers/MaplyViewTracker.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			7FbbNMPiU1IgaNzCMaKAHJEM+FPPGOJKf61JTytgWWc=
+			</data>
+		</dict>
+		<key>Headers/MaplyWMSTileSource.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			2LILAvTZMnJeWhE55HmKRf+j/s47LYOJSCZHVXySBKM=
+			</data>
+		</dict>
+		<key>Headers/MaplyZoomGestureDelegate.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			XRwdLyjEKAuT0SI73DIw2boCO9eGkBBVsonhJEynv1c=
+			</data>
+		</dict>
+		<key>Headers/MapnikStyle.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			S3gBj95xXb8guxlIUBmDjjjbqGZlP01IGiRbJ7/bRNU=
+			</data>
+		</dict>
+		<key>Headers/MapnikStyleRule.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			Aq6950RPbjL+d3OMmPyqu/F/8z1Losl6i1AO3p78k24=
+			</data>
+		</dict>
+		<key>Headers/MapnikStyleSet.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			8lR03NUWRHH4FR9bORDOBhqN4e/9B6NK6mkwRahpPNg=
+			</data>
+		</dict>
+		<key>Headers/NSData+Zlib.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			JQbrnrN+lNyruOEnF+WouqBXzAO+SgWmAKZFYSx5xbA=
+			</data>
+		</dict>
+		<key>Headers/NSDictionary+StyleRules.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			Q036mSm6ONEvutWOdPKRgh/nlmpUM+qVv2fIgEB3w20=
+			</data>
+		</dict>
+		<key>Headers/SLDExpressions.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			VnWjxKgmbETPsaM844p7Zh4icc4gGRCtZ3+OyGRqRM4=
+			</data>
+		</dict>
+		<key>Headers/SLDOperators.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			wa8KTavISBxIHU40jvxMCnao552tDWqqzBsBnwyvpi8=
+			</data>
+		</dict>
+		<key>Headers/SLDStyleSet.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			QQ0v0kSrA2medfFHwe2Oy3sNa8cibG/VLcJi4p5z1Ps=
+			</data>
+		</dict>
+		<key>Headers/SLDSymbolizers.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			FgMEE0T3xnDtLrFYmE9Aqy9d76FnuRhL2E/oy2sARtQ=
+			</data>
+		</dict>
+		<key>Headers/SLDWellKnownMarkers.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			c1ldci6hgzLyJc5KwxoLZCleo8pHO/5R28mdJJu+LhE=
+			</data>
+		</dict>
+		<key>Headers/WGCoordinate.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			qtSkqYi/2qiDH55BR6PeJi5/7tfcvDm/mNrm4GWCzEk=
+			</data>
+		</dict>
+		<key>Headers/WhirlyGlobeComponent.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			oxvPzm1dMVY33QZ0D3kG1n7fI0m5XXttw0hgxjoCatE=
+			</data>
+		</dict>
+		<key>Headers/WhirlyGlobeMaplyComponent.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			j+jwTmZLwWVb3tIMYEXjaNu4ZGvWbXVJIOTt1UsA08E=
+			</data>
+		</dict>
+		<key>Headers/WhirlyGlobeViewController.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			oE7ShvtD5UPiD/LdcTHU3X/XxC3u30VKXxAIrhESilY=
+			</data>
+		</dict>
+		<key>Modules/module.modulemap</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			07zKiWkZBXgx32pzc10uPMUrkT+4D4AQHAzU0p3By5g=
+			</data>
+		</dict>
+		<key>default.metallib</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			QVj3R4tZ+fgGhFVAPnXf7idXqZHndGb/awDKvAoep0I=
+			</data>
+		</dict>
+	</dict>
+	<key>rules</key>
+	<dict>
+		<key>^.*</key>
+		<true/>
+		<key>^.*\.lproj/</key>
+		<dict>
+			<key>optional</key>
+			<true/>
+			<key>weight</key>
+			<real>1000</real>
+		</dict>
+		<key>^.*\.lproj/locversion.plist$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>1100</real>
+		</dict>
+		<key>^Base\.lproj/</key>
+		<dict>
+			<key>weight</key>
+			<real>1010</real>
+		</dict>
+		<key>^version.plist$</key>
+		<true/>
+	</dict>
+	<key>rules2</key>
+	<dict>
+		<key>.*\.dSYM($|/)</key>
+		<dict>
+			<key>weight</key>
+			<real>11</real>
+		</dict>
+		<key>^(.*/)?\.DS_Store$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>2000</real>
+		</dict>
+		<key>^.*</key>
+		<true/>
+		<key>^.*\.lproj/</key>
+		<dict>
+			<key>optional</key>
+			<true/>
+			<key>weight</key>
+			<real>1000</real>
+		</dict>
+		<key>^.*\.lproj/locversion.plist$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>1100</real>
+		</dict>
+		<key>^Base\.lproj/</key>
+		<dict>
+			<key>weight</key>
+			<real>1010</real>
+		</dict>
+		<key>^Info\.plist$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>20</real>
+		</dict>
+		<key>^PkgInfo$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>20</real>
+		</dict>
+		<key>^embedded\.provisionprofile$</key>
+		<dict>
+			<key>weight</key>
+			<real>20</real>
+		</dict>
+		<key>^version\.plist$</key>
+		<dict>
+			<key>weight</key>
+			<real>20</real>
+		</dict>
+	</dict>
+</dict>
+</plist>
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/default.metallib b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/default.metallib
new file mode 100644
index 0000000..3f65869
--- /dev/null
+++ b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/default.metallib
diff --git a/iosApp/iosApp.xcodeproj/project.pbxproj b/iosApp/iosApp.xcodeproj/project.pbxproj
index 501d272..5596364 100644
--- a/iosApp/iosApp.xcodeproj/project.pbxproj
+++ b/iosApp/iosApp.xcodeproj/project.pbxproj
@@ -15,6 +15,13 @@
 		E33A236527A530F300DD647F /* SmallLabelStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = E33A236427A530F300DD647F /* SmallLabelStyle.swift */; };
 		E33A236727A64E4500DD647F /* MarkerTransformations.swift in Sources */ = {isa = PBXBuildFile; fileRef = E33A236627A64E4500DD647F /* MarkerTransformations.swift */; };
 		E33A236A27A6898700DD647F /* SwiftUIX in Frameworks */ = {isa = PBXBuildFile; productRef = E33A236927A6898700DD647F /* SwiftUIX */; };
+		E33A236D27A7545500DD647F /* WhirlyGlobeMaplyComponent.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = E33A236B27A7543700DD647F /* WhirlyGlobeMaplyComponent.xcframework */; };
+		E33A236E27A7545500DD647F /* WhirlyGlobeMaplyComponent.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = E33A236B27A7543700DD647F /* WhirlyGlobeMaplyComponent.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		E33A237127A7553500DD647F /* BaseMapView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E33A237027A7553500DD647F /* BaseMapView.swift */; };
+		E33A237327A7581A00DD647F /* Utils.swift in Sources */ = {isa = PBXBuildFile; fileRef = E33A237227A7581A00DD647F /* Utils.swift */; };
+		E34A2F4427A77D9500AD8AEB /* MapWrapperView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E34A2F4327A77D9400AD8AEB /* MapWrapperView.swift */; };
+		E34A2F4827A7878200AD8AEB /* HyperlinkText.swift in Sources */ = {isa = PBXBuildFile; fileRef = E34A2F4727A7878200AD8AEB /* HyperlinkText.swift */; };
+		E34A2F4B27A7881200AD8AEB /* SwiftUIFlowLayout in Frameworks */ = {isa = PBXBuildFile; productRef = E34A2F4A27A7881200AD8AEB /* SwiftUIFlowLayout */; };
 		E38F241527A242870069FC45 /* Inject.swift in Sources */ = {isa = PBXBuildFile; fileRef = E38F241427A242870069FC45 /* Inject.swift */; };
 		E38F241727A242C70069FC45 /* Resolver.swift in Sources */ = {isa = PBXBuildFile; fileRef = E38F241627A242C70069FC45 /* Resolver.swift */; };
 		E38F241C27A26DD70069FC45 /* RootViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = E38F241B27A26DD70069FC45 /* RootViewModel.swift */; };
@@ -27,6 +34,20 @@
 		E3E77EE6279E6CE400150070 /* FlowCollector.swift in Sources */ = {isa = PBXBuildFile; fileRef = E3E77EE5279E6CE400150070 /* FlowCollector.swift */; };
 /* End PBXBuildFile section */
 
+/* Begin PBXCopyFilesBuildPhase section */
+		E33A236F27A7545500DD647F /* Embed Frameworks */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "";
+			dstSubfolderSpec = 10;
+			files = (
+				E33A236E27A7545500DD647F /* WhirlyGlobeMaplyComponent.xcframework in Embed Frameworks */,
+			);
+			name = "Embed Frameworks";
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXCopyFilesBuildPhase section */
+
 /* Begin PBXFileReference section */
 		058557BA273AAA24004C7B11 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		058557D8273AAEEB004C7B11 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = "<group>"; };
@@ -37,6 +58,11 @@
 		E33A235F27A4FD2C00DD647F /* MapView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapView.swift; sourceTree = "<group>"; };
 		E33A236427A530F300DD647F /* SmallLabelStyle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SmallLabelStyle.swift; sourceTree = "<group>"; };
 		E33A236627A64E4500DD647F /* MarkerTransformations.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MarkerTransformations.swift; sourceTree = "<group>"; };
+		E33A236B27A7543700DD647F /* WhirlyGlobeMaplyComponent.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; path = WhirlyGlobeMaplyComponent.xcframework; sourceTree = "<group>"; };
+		E33A237027A7553500DD647F /* BaseMapView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseMapView.swift; sourceTree = "<group>"; };
+		E33A237227A7581A00DD647F /* Utils.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Utils.swift; sourceTree = "<group>"; };
+		E34A2F4327A77D9400AD8AEB /* MapWrapperView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapWrapperView.swift; sourceTree = "<group>"; };
+		E34A2F4727A7878200AD8AEB /* HyperlinkText.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HyperlinkText.swift; sourceTree = "<group>"; };
 		E38F241427A242870069FC45 /* Inject.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Inject.swift; sourceTree = "<group>"; };
 		E38F241627A242C70069FC45 /* Resolver.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Resolver.swift; sourceTree = "<group>"; };
 		E38F241B27A26DD70069FC45 /* RootViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RootViewModel.swift; sourceTree = "<group>"; };
@@ -54,7 +80,9 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				E33A236D27A7545500DD647F /* WhirlyGlobeMaplyComponent.xcframework in Frameworks */,
 				E33A236A27A6898700DD647F /* SwiftUIX in Frameworks */,
+				E34A2F4B27A7881200AD8AEB /* SwiftUIFlowLayout in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -106,6 +134,7 @@
 		7555FFB0242A642200829871 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				E33A236B27A7543700DD647F /* WhirlyGlobeMaplyComponent.xcframework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -114,6 +143,8 @@
 			isa = PBXGroup;
 			children = (
 				E33A235F27A4FD2C00DD647F /* MapView.swift */,
+				E33A237027A7553500DD647F /* BaseMapView.swift */,
+				E34A2F4327A77D9400AD8AEB /* MapWrapperView.swift */,
 			);
 			path = Map;
 			sourceTree = "<group>";
@@ -154,6 +185,8 @@
 				E38F241F27A27B550069FC45 /* LoadingView.swift */,
 				E33A236427A530F300DD647F /* SmallLabelStyle.swift */,
 				E33A236627A64E4500DD647F /* MarkerTransformations.swift */,
+				E33A237227A7581A00DD647F /* Utils.swift */,
+				E34A2F4727A7878200AD8AEB /* HyperlinkText.swift */,
 			);
 			path = Shared;
 			sourceTree = "<group>";
@@ -169,6 +202,7 @@
 				7555FF77242A565900829871 /* Sources */,
 				7555FF78242A565900829871 /* Frameworks */,
 				7555FF79242A565900829871 /* Resources */,
+				E33A236F27A7545500DD647F /* Embed Frameworks */,
 			);
 			buildRules = (
 			);
@@ -177,6 +211,7 @@
 			name = iosApp;
 			packageProductDependencies = (
 				E33A236927A6898700DD647F /* SwiftUIX */,
+				E34A2F4A27A7881200AD8AEB /* SwiftUIFlowLayout */,
 			);
 			productName = iosApp;
 			productReference = 7555FF7B242A565900829871 /* iosApp.app */;
@@ -209,6 +244,7 @@
 			mainGroup = 7555FF72242A565900829871;
 			packageReferences = (
 				E33A236827A6898700DD647F /* XCRemoteSwiftPackageReference "SwiftUIX" */,
+				E34A2F4927A7881200AD8AEB /* XCRemoteSwiftPackageReference "swiftui-flow-layout" */,
 			);
 			productRefGroup = 7555FF7C242A565900829871 /* Products */;
 			projectDirPath = "";
@@ -257,15 +293,19 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				E33A237127A7553500DD647F /* BaseMapView.swift in Sources */,
 				E38F241727A242C70069FC45 /* Resolver.swift in Sources */,
 				E33A236027A4FD2C00DD647F /* MapView.swift in Sources */,
 				E33A236727A64E4500DD647F /* MarkerTransformations.swift in Sources */,
 				E38F241527A242870069FC45 /* Inject.swift in Sources */,
 				E39ABC4827A4EDEC00965D05 /* DeviceRow.swift in Sources */,
 				E38F241C27A26DD70069FC45 /* RootViewModel.swift in Sources */,
+				E33A237327A7581A00DD647F /* Utils.swift in Sources */,
 				E3E77EE6279E6CE400150070 /* FlowCollector.swift in Sources */,
 				E33A236527A530F300DD647F /* SmallLabelStyle.swift in Sources */,
 				E39ABC4327A4E88C00965D05 /* UnitsViewModel.swift in Sources */,
+				E34A2F4827A7878200AD8AEB /* HyperlinkText.swift in Sources */,
+				E34A2F4427A77D9500AD8AEB /* MapWrapperView.swift in Sources */,
 				2152FB042600AC8F00CF470E /* iOSApp.swift in Sources */,
 				E39ABC4627A4EBD500965D05 /* DevicesView.swift in Sources */,
 				E38F242027A27B550069FC45 /* LoadingView.swift in Sources */,
@@ -485,6 +525,14 @@
 				kind = branch;
 			};
 		};
+		E34A2F4927A7881200AD8AEB /* XCRemoteSwiftPackageReference "swiftui-flow-layout" */ = {
+			isa = XCRemoteSwiftPackageReference;
+			repositoryURL = "https://github.com/globulus/swiftui-flow-layout";
+			requirement = {
+				kind = upToNextMajorVersion;
+				minimumVersion = 1.0.0;
+			};
+		};
 /* End XCRemoteSwiftPackageReference section */
 
 /* Begin XCSwiftPackageProductDependency section */
@@ -493,6 +541,11 @@
 			package = E33A236827A6898700DD647F /* XCRemoteSwiftPackageReference "SwiftUIX" */;
 			productName = SwiftUIX;
 		};
+		E34A2F4A27A7881200AD8AEB /* SwiftUIFlowLayout */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = E34A2F4927A7881200AD8AEB /* XCRemoteSwiftPackageReference "swiftui-flow-layout" */;
+			productName = SwiftUIFlowLayout;
+		};
 /* End XCSwiftPackageProductDependency section */
 	};
 	rootObject = 7555FF73242A565900829871 /* Project object */;
diff --git a/iosApp/iosApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/iosApp/iosApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
index 9e38855..01275f3 100644
--- a/iosApp/iosApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/iosApp/iosApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -2,6 +2,15 @@
   "object": {
     "pins": [
       {
+        "package": "SwiftUIFlowLayout",
+        "repositoryURL": "https://github.com/globulus/swiftui-flow-layout",
+        "state": {
+          "branch": null,
+          "revision": "96f9a3fdb83fd0b73525f6324b8a35ef0dc235fd",
+          "version": "1.0.4"
+        }
+      },
+      {
         "package": "SwiftUIX",
         "repositoryURL": "https://github.com/ivan-avalos/SwiftUIX",
         "state": {
diff --git a/iosApp/iosApp.xcodeproj/project.xcworkspace/xcuserdata/avalos.xcuserdatad/UserInterfaceState.xcuserstate b/iosApp/iosApp.xcodeproj/project.xcworkspace/xcuserdata/avalos.xcuserdatad/UserInterfaceState.xcuserstate
index 1ceca8b..abb551a 100644
--- a/iosApp/iosApp.xcodeproj/project.xcworkspace/xcuserdata/avalos.xcuserdatad/UserInterfaceState.xcuserstate
+++ b/iosApp/iosApp.xcodeproj/project.xcworkspace/xcuserdata/avalos.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/iosApp/iosApp/Map/BaseMapView.swift b/iosApp/iosApp/Map/BaseMapView.swift
new file mode 100644
index 0000000..a3d2d70
--- /dev/null
+++ b/iosApp/iosApp/Map/BaseMapView.swift
@@ -0,0 +1,102 @@
+//
+//  BaseMapView.swift
+//  iosApp
+//
+//  Created by Iván on 30/01/22.
+//  Copyright © 2022 orgName. All rights reserved.
+//
+
+import SwiftUI
+import WhirlyGlobeMaplyComponent
+import CryptoKit
+import shared
+
+struct BaseMapView: UIViewControllerRepresentable {
+    typealias UIViewControllerType = MaplyViewController
+    
+    @Binding var mapLayer: MapLayer
+    
+    class Coordinator: NSObject, MaplyViewControllerDelegate {
+        var parent: BaseMapView
+        var loader: MaplyQuadImageLoader? = nil
+        
+        init(_ uiViewController: BaseMapView) {
+            self.parent = uiViewController
+        }
+        
+        func maplyViewController(_ viewC: MaplyViewController, didClick annotation: MaplyAnnotation) {
+            print("Clicked map! :D")
+        }
+    }
+    
+    func makeCoordinator() -> Coordinator {
+        Coordinator(self)
+    }
+    
+    func makeUIViewController(context: Context) -> MaplyViewController {
+        let mapViewController = MaplyViewController(mapType: .typeFlat)
+        mapViewController.viewWrap = true
+        mapViewController.delegate = context.coordinator
+        
+        let tileInfo = tileInfoFrom(layer: mapLayer)
+        setZoomLimits(uiViewController: mapViewController,
+                      minZoom: mapLayer.minZoom,
+                      maxZoom: mapLayer.maxZoom)
+        
+        let sampleParams = MaplySamplingParams()
+        sampleParams.coordSys = MaplySphericalMercator(webStandard: ())
+        sampleParams.coverPoles = true
+        sampleParams.edgeMatching = true
+        sampleParams.minZoom = tileInfo.minZoom
+        sampleParams.maxZoom = tileInfo.maxZoom
+        sampleParams.singleLevel = true
+        
+        let loader = MaplyQuadImageLoader(params: sampleParams, tileInfo: tileInfo, viewC: mapViewController)
+        loader?.baseDrawPriority = kMaplyImageLayerDrawPriorityDefault
+        loader?.imageFormat = .imageUShort565
+        context.coordinator.loader = loader
+        
+        let point = MaplyCoordinate(x: -100.36 * Float.pi / 180,
+                                    y: 23.191 * Float.pi / 180)
+        let height = Float(0.4)
+        mapViewController.setPosition(point, height: height)
+        
+        return mapViewController
+    }
+    
+    func updateUIViewController(_ uiViewController: MaplyViewController, context: Context) {
+        // MARK: - Set map layer
+        context.coordinator.loader?.changeTileInfo(tileInfoFrom(layer: mapLayer))
+        setZoomLimits(uiViewController: uiViewController,
+                      minZoom: mapLayer.minZoom,
+                      maxZoom: mapLayer.maxZoom)
+    }
+    
+    static func dismantleUIViewController(_ uiViewController: MaplyViewController, coordinator: Coordinator) {
+        coordinator.loader?.shutdown()
+        uiViewController.teardown()
+    }
+    
+    private func tileInfoFrom(layer: MapLayer) -> MaplyRemoteTileInfoNew {
+        let cacheDir = NSSearchPathForDirectoriesInDomains(.cachesDirectory, .userDomainMask, true)[0]
+        let thisCacheDir = "\(cacheDir)/\(Utils.MD5(string: mapLayer.url))"
+        
+        let tileInfo = MaplyRemoteTileInfoNew(baseURL: mapLayer.url,
+                                              minZoom: mapLayer.minZoom,
+                                              maxZoom: mapLayer.maxZoom)
+        tileInfo.cacheDir = thisCacheDir
+        return tileInfo
+    }
+    
+    private func setZoomLimits(uiViewController: MaplyViewController, minZoom: Int32, maxZoom: Int32) {
+        uiViewController.setZoomLimitsMin(
+            uiViewController.height(forMapScale: Float(truncating:
+                MapCalculus.companion.zoomLevelToScale(zoom: maxZoom)
+                ?? MapCalculus.companion.zoomLevelToScale(zoom: 21)!
+            )),
+            max: uiViewController.height(forMapScale: Float(truncating:
+                MapCalculus.companion.zoomLevelToScale(zoom: minZoom)
+                ?? MapCalculus.companion.zoomLevelToScale(zoom: 1)!
+            )))
+    }
+}
diff --git a/iosApp/iosApp/Map/MapView.swift b/iosApp/iosApp/Map/MapView.swift
index 8732ef4..33b9932 100644
--- a/iosApp/iosApp/Map/MapView.swift
+++ b/iosApp/iosApp/Map/MapView.swift
@@ -7,18 +7,12 @@
 //
 
 import SwiftUI
+import shared
 
 struct MapView: View {
     @StateObject var unitsViewModel: UnitsViewModel
     
     var body: some View {
-        VStack {
-            Text("Unimplemented!")
-            if let deviceName = unitsViewModel.selectedUnit?.device.name {
-                Text("Selected: \(deviceName)")
-                    .padding()
-            }
-            
-        }
+        MapWrapperView(layer: $unitsViewModel.mapLayerType)
     }
 }
diff --git a/iosApp/iosApp/Map/MapWrapperView.swift b/iosApp/iosApp/Map/MapWrapperView.swift
new file mode 100644
index 0000000..2a99f87
--- /dev/null
+++ b/iosApp/iosApp/Map/MapWrapperView.swift
@@ -0,0 +1,63 @@
+//
+//  MapWrapperView.swift
+//  iosApp
+//
+//  Created by Iván on 30/01/22.
+//  Copyright © 2022 orgName. All rights reserved.
+//
+
+import SwiftUI
+import WhirlyGlobeMaplyComponent
+import shared
+
+struct MapWrapperView: View {
+    @Binding var layer: MapLayer
+    
+    var body: some View {
+        ZStack {
+            // MARK: - Map
+            BaseMapView(mapLayer: $layer)
+            
+            // MARK: - Attribution
+            VStack {
+                HyperlinkText(html: layer.attribution)
+                    .font(.footnote)
+                    .lineLimit(3)
+                    .foregroundColor(.label.opacity(0.35))
+                    .padding()
+                    .background(.systemBackground.opacity(0.35))
+            }
+            .frame(maxWidth: .infinity,
+                   maxHeight: .infinity,
+                   alignment: .bottom)
+            .allowsHitTesting(false)
+            
+            // MARK: - Controls
+            VStack {
+                Group {
+                    Button {
+                        print ("Zoom in!")
+                    } label: {
+                        Image(systemName: "plus")
+                            .imageScale(.large)
+                    }
+                    
+                    Button {
+                        print("Zoom out!")
+                    } label: {
+                        Image(systemName: "minus")
+                            .imageScale(.large)
+                    }
+                }
+                .frame(width: 50, height: 50)
+                .foregroundColor(.primary)
+                .background(.systemBackground)
+                .clipShape(Circle())
+            }
+            .frame(maxWidth: .infinity,
+                   maxHeight: .infinity,
+                   alignment: .topTrailing)
+            .padding()
+        }
+    }
+}
diff --git a/iosApp/iosApp/Shared/HyperlinkText.swift b/iosApp/iosApp/Shared/HyperlinkText.swift
new file mode 100644
index 0000000..4b966eb
--- /dev/null
+++ b/iosApp/iosApp/Shared/HyperlinkText.swift
@@ -0,0 +1,126 @@
+// Source: https://swiftuirecipes.com/blog/hyperlinks-in-swiftui-text
+import SwiftUI
+import SwiftUIFlowLayout
+
+struct HyperlinkText: View {
+    private let pairs: [StringWithAttributes]
+    
+    init(_ attributedString: NSAttributedString) {
+        pairs = attributedString.stringsWithAttributes
+    }
+    
+    init?(html: String) {
+        if let data = html.data(using: .utf8),
+           let attributedString = try? NSAttributedString(data: data,
+                                                          options: [.documentType: NSAttributedString.DocumentType.html],
+                                                          documentAttributes: nil) {
+            self.init(attributedString)
+        } else {
+            return nil
+        }
+    }
+    
+    var body: some View {
+        FlowLayout(mode: .vstack,
+                   binding: .constant(false),
+                   items: pairs,
+                   itemSpacing: 0) { pair in
+            if let link = pair.attrs[.link],
+               let url = link as? URL {
+                Text(pair)
+                    .onTapGesture {
+                        if UIApplication.shared.canOpenURL(url) {
+                            UIApplication.shared.open(url)
+                        }
+                    }
+            } else {
+                Text(pair)
+            }
+        }
+    }
+}
+
+struct StringWithAttributes: Hashable, Identifiable {
+    let id = UUID()
+    let string: String
+    let attrs: [NSAttributedString.Key: Any]
+    
+    static func == (lhs: StringWithAttributes, rhs: StringWithAttributes) -> Bool {
+        lhs.id == rhs.id
+    }
+    
+    func hash(into hasher: inout Hasher) {
+        hasher.combine(id)
+    }
+}
+
+extension NSAttributedString {
+    var stringsWithAttributes: [StringWithAttributes] {
+        var attributes = [StringWithAttributes]()
+         enumerateAttributes(in: NSRange(location: 0, length: length), options: []) { (attrs, range, _) in
+             let string = attributedSubstring(from: range).string
+            attributes.append(StringWithAttributes(string: string, attrs: attrs))
+         }
+        return attributes
+    }
+}
+
+extension Text {
+    init(_ singleAttribute: StringWithAttributes) {
+        let string = singleAttribute.string
+        let attrs = singleAttribute.attrs
+        var text = Text(string)
+        
+        /*if let font = attrs[.font] as? UIFont {
+            text = text.font(.init(font))
+        }
+        
+        if let color = attrs[.foregroundColor] as? UIColor {
+            text = text.foregroundColor(Color(color))
+        }*/
+        
+        if let kern = attrs[.kern] as? CGFloat {
+            text = text.kerning(kern)
+        }
+        
+        if #available(iOS 14.0, *) {
+            if let tracking = attrs[.tracking] as? CGFloat {
+                text = text.tracking(tracking)
+            }
+        }
+        
+        if let strikethroughStyle = attrs[.strikethroughStyle] as? NSNumber, strikethroughStyle != 0 {
+            if let strikethroughColor = (attrs[.strikethroughColor] as? UIColor) {
+                text = text.strikethrough(true, color: Color(strikethroughColor))
+            } else {
+                text = text.strikethrough(true)
+            }
+        }
+        
+        if let underlineStyle = attrs[.underlineStyle] as? NSNumber,
+           underlineStyle != 0 {
+            if let underlineColor = (attrs[.underlineColor] as? UIColor) {
+                text = text.underline(true, color: Color(underlineColor))
+            } else {
+                text = text.underline(true)
+            }
+        }
+        
+        if let baselineOffset = attrs[.baselineOffset] as? NSNumber {
+            text = text.baselineOffset(CGFloat(baselineOffset.floatValue))
+        }
+        
+        self = text
+    }
+    
+    init(_ attributes: [StringWithAttributes]) {
+        self.init("")
+        for singleAttribute in attributes {
+            self = self + Text(singleAttribute)
+        }
+    }
+    
+    init(_ attributedString: NSAttributedString) {
+        self.init(attributedString.stringsWithAttributes)
+    }
+}
diff --git a/iosApp/iosApp/Shared/Utils.swift b/iosApp/iosApp/Shared/Utils.swift
new file mode 100644
index 0000000..cacf49b
--- /dev/null
+++ b/iosApp/iosApp/Shared/Utils.swift
@@ -0,0 +1,19 @@
+//
+//  Utils.swift
+//  iosApp
+//
+//  Created by Iván on 30/01/22.
+//  Copyright © 2022 orgName. All rights reserved.
+//
+
+import Foundation
+import CryptoKit
+
+class Utils {
+    static func MD5(string: String) -> String {
+        let digest = Insecure.MD5.hash(data: string.data(using: .utf8) ?? Data())
+        return digest.map {
+            String(format: "%02hhx", $0)
+        }.joined()
+    }
+}
diff --git a/iosApp/iosApp/Units/UnitsView.swift b/iosApp/iosApp/Units/UnitsView.swift
index fc4952f..33598c3 100644
--- a/iosApp/iosApp/Units/UnitsView.swift
+++ b/iosApp/iosApp/Units/UnitsView.swift
@@ -12,6 +12,7 @@ import shared
 
 struct UnitsView: View {
     @StateObject var unitsViewModel = UnitsViewModel()
+    @State var shouldShowMenu = false
     
     var body: some View {
         NavigationView {
@@ -44,7 +45,14 @@ struct UnitsView: View {
                 .navigationSearchBarHiddenWhenScrolling(false)
                 .toolbar {
                     ToolbarItem(placement: .navigationBarTrailing) {
-                        Button(action: {}) {
+                        Menu {
+                            Picker (selection: $unitsViewModel.mapLayerType, label: Text("Map layer")) {
+                                Text("OpenStreetMap")
+                                    .tag(MapLayer.companion.layers[MapLayer.Type_.streets]!)
+                                Text("Satellite")
+                                    .tag(MapLayer.companion.layers[MapLayer.Type_.satellite]!)
+                            }
+                        } label: {
                             Image(systemName: "square.stack.3d.up")
                         }
                         .visible(unitsViewModel.unitsDisplayMode == .map)
diff --git a/iosApp/iosApp/Units/UnitsViewModel.swift b/iosApp/iosApp/Units/UnitsViewModel.swift
index 648e429..f7e1a21 100644
--- a/iosApp/iosApp/Units/UnitsViewModel.swift
+++ b/iosApp/iosApp/Units/UnitsViewModel.swift
@@ -7,6 +7,7 @@
 //
 
 import Foundation
+import WhirlyGlobeMaplyComponent
 import shared
 
 class UnitsViewModel: ObservableObject {
@@ -18,6 +19,17 @@ class UnitsViewModel: ObservableObject {
         case list
     }
     
+    class Camera {
+        let point: MaplyCoordinate?
+        let height: Float?
+        
+        init(_ point: MaplyCoordinate? = nil,
+             height: Float? = nil) {
+            self.point = point
+            self.height = height
+        }
+    }
+    
     @Published var searchQuery = "" {
         didSet {
             unitsDisplayMode = .list
@@ -28,7 +40,9 @@ class UnitsViewModel: ObservableObject {
     @Published var unitsDisplayMode: UnitsDisplayMode = .list
     @Published var units: [UnitInformation] = []
     @Published var selectedUnit: UnitInformation? = nil
+    @Published var mapLayerType: MapLayer = .companion.defaultLayer
     @Published var geofences: [Int: Geofence] = [:]
+    @Published var camera: Camera = Camera()
     
     init() {
         setupObservers()