Merge pull request #1312 from mousebird/develop

Develop
mousebird-consulting-inc · Mar 31, 2021 · 5eb32a1 · 5eb32a1
2 parents b9e1fd3 + 93edb8a
commit 5eb32a1
Show file tree

Hide file tree

Showing 611 changed files with 59,519 additions and 19,752 deletions.
diff --git a/WhirlyGlobe.podspec b/WhirlyGlobe.podspec
@@ -26,25 +26,31 @@ Pod::Spec.new do |s|
 
   s.source = { :git => 'https://github.com/mousebird/WhirlyGlobe.git', :branch => 'develop' }
 
-  s.compiler_flags = '-D__USE_SDL_GLES__ -D__IPHONEOS__ -DSQLITE_OPEN_READONLY -DHAVE_PTHREAD=1 -DUNORDERED=1 -DLASZIPDLL_EXPORTS=1'
-  s.xcconfig = { "HEADER_SEARCH_PATHS" => " \"$(PODS_ROOT)/WhirlyGlobe/common/local_libs/eigen/\" \"$(PODS_ROOT)/KissXML/KissXML/\" \"${PODS_ROOT}/WhirlyGlobe/common/local_libs/nanopb/\" \"${PODS_ROOT}/WhirlyGlobe/common/local_libs/clipper\" \"${PODS_ROOT}/WhirlyGlobe/common/local_libs/lodepng\" \"$(SDKROOT)/usr/include/libxml2\" \"${PODS_ROOT}/WhirlyGlobe/common/local_libs/glues/include/\" \"$(PODS_ROOT)/WhirlyGlobe/ios/library/WhirlyGlobe-MaplyComponent/include/private/\" \"$(PODS_ROOT)/WhirlyGlobe/ios/library/WhirlyGlobe-MaplyComponent/include/\" \"$(PODS_ROOT)/WhirlyGlobe/ios/library/WhirlyGlobe-MaplyComponent/include/vector_tiles/\" " }
+  s.compiler_flags = '-D__USE_SDL_GLES__ -D__IPHONEOS__ -DSQLITE_OPEN_READONLY -DHAVE_PTHREAD=1 -DUNORDERED=1 '
+  s.xcconfig = { "HEADER_SEARCH_PATHS" => " \"$(SDKROOT)/usr/include/libxml2\" \"$(PODS_ROOT)/KissXML/KissXML/\" \"$(PODS_ROOT)/WhirlyGlobe/common/local_libs/eigen/\" \"${PODS_ROOT}/WhirlyGlobe/common/local_libs/nanopb/\" \"${PODS_ROOT}/WhirlyGlobe/common/local_libs/clipper\" \"${PODS_ROOT}/WhirlyGlobe/common/local_libs/lodepng\" \"${PODS_ROOT}/WhirlyGlobe/common/local_libs/glues/include/\" \"$(PODS_ROOT)/WhirlyGlobe/common/local_libs/GeographicLib/include/\" \"$(PODS_ROOT)/WhirlyGlobe/ios/library/WhirlyGlobe-MaplyComponent/include/private/\" \"$(PODS_ROOT)/WhirlyGlobe/ios/library/WhirlyGlobe-MaplyComponent/include/\" \"$(PODS_ROOT)/WhirlyGlobe/ios/library/WhirlyGlobe-MaplyComponent/include/vector_tiles/\" " }
 
   s.default_subspec = 'MaplyComponent'
 
   s.subspec 'locallibs' do |ll|
-    ll.source_files = 'common/local_libs/aaplus/**/*.{h,cpp}',
+    ll.source_files =
+        'common/local_libs/aaplus/**/*.{h,cpp}',
         'common/local_libs/clipper/cpp/*.{cpp,hpp}',
         'common/local_libs/shapefile/**/*.{c,h}',
         'common/local_libs/lodepng/*.{cpp,h}',
-        'common/local_libs/nanopb/*.{c,h}'
-    ll.preserve_paths = 'common/local_libs/laszip/include/laszip/*.h', 'common/local_libs/laszip/src/*.hpp',
-        'common/local_libs/eigen/Eigen/*', 'common/local_libs/eigen/Eigen/**/*.h',
+        'common/local_libs/nanopb/*.{c,h}',
+        'common/local_libs/GeographicLib/src/*.cpp'
+    ll.preserve_paths = 
+        'common/local_libs/eigen/Eigen/*',
+        'common/local_libs/eigen/Eigen/**/*.h',
         'common/local_libs/lodepng/*.h',
-        'common/local_libs/nanopb/*.h'
-    ll.private_header_files = 'common/local_libs/aaplus/**/*.h',
+        'common/local_libs/nanopb/*.h',
+        'common/local_libs/GeographicLib/include/GeographicLib/*.{h,hpp}'
+    ll.private_header_files =
+        'common/local_libs/aaplus/**/*.h',
         'common/local_libs/clipper/cpp/*.hpp',
         'common/local_libs/shapefile/**/*.h',
-        'common/local_libs/nanopb/*.h'
+        'common/local_libs/nanopb/*.h',
+        'common/local_libs/GeographicLib/include/GeographicLib/*.{h,hpp}'
   end
 
   s.subspec 'glues' do |gl|
@@ -54,9 +60,21 @@ Pod::Spec.new do |s|
   end
 
   s.subspec 'MaplyComponent' do |mc|
-    mc.source_files = 'common/WhirlyGlobeLib/include/*.h', 'common/WhirlyGlobeLib/src/*.{c,cpp}', 'ios/library/WhirlyGlobeLib/src/*.{mm,m,cpp,metal}', 'ios/library/WhirlyGlobeLib/include/*.h', 'ios/library/WhirlyGlobe-MaplyComponent/include/**/*.h', 'ios/library/WhirlyGlobe-MaplyComponent/src/**/*.{mm,m,cpp,metal}'
-    mc.public_header_files = 'ios/library/WhirlyGlobe-MaplyComponent/include/*.h', "ios/library/WhirlyGlobe-MaplyComponent/include/vector_tiles/*.h"
-    mc.private_header_files = 'ios/library/WhirlyGlobeLib/include/*.h', 'ios/**/vector_tile.pb.h', 'ios/**/MaplyBridge.h'
+    mc.source_files =
+        'common/WhirlyGlobeLib/include/*.h',
+        'common/WhirlyGlobeLib/src/*.{c,cpp}',
+        'ios/library/WhirlyGlobeLib/src/*.{mm,m,cpp,metal}',
+        'ios/library/WhirlyGlobeLib/include/*.h',
+        'ios/library/WhirlyGlobe-MaplyComponent/include/**/*.h',
+        'ios/library/WhirlyGlobe-MaplyComponent/src/**/*.{mm,m,cpp,metal}'
+    mc.public_header_files =
+        'ios/library/WhirlyGlobe-MaplyComponent/include/*.h',
+        "ios/library/WhirlyGlobe-MaplyComponent/include/vector_tiles/*.h",
+        'ios/library/WhirlyGlobeLib/include/GeographicLib.h'    # That we have to name it here means it probably belongs somewhere else...
+    mc.private_header_files =
+        'ios/library/WhirlyGlobeLib/include/*.h',
+        'ios/**/vector_tile.pb.h',
+        'ios/**/MaplyBridge.h'
     mc.dependency 'WhirlyGlobe/locallibs'
     mc.dependency 'WhirlyGlobe/glues'
     mc.dependency 'SMCalloutView'

diff --git a/android/apps/AutoTesterAndroid/app/build.gradle b/android/apps/AutoTesterAndroid/app/build.gradle
@@ -4,8 +4,11 @@ apply plugin: 'kotlin-android-extensions'
 
 android {
     compileOptions {
-        sourceCompatibility 1.8
-        targetCompatibility 1.8
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_1_8
     }
     signingConfigs {
         config {
@@ -18,7 +21,7 @@ android {
     compileSdkVersion 28
     defaultConfig {
         applicationId "com.mousebirdconsulting.autotester"
-        minSdkVersion 19
+        minSdkVersion 21
         targetSdkVersion 28
         versionCode 1
         versionName "1.0"

diff --git a/android/apps/AutoTesterAndroid/app/src/debug/AndroidManifest.xml b/android/apps/AutoTesterAndroid/app/src/debug/AndroidManifest.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <!--
+    <uses-permission android:name="android.permission.ACCESS_MOCK_LOCATION" />
+    -->
+</manifest>
diff --git a/android/apps/AutoTesterAndroid/app/src/main/AndroidManifest.xml b/android/apps/AutoTesterAndroid/app/src/main/AndroidManifest.xml
@@ -2,6 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.mousebirdconsulting.autotester">
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
 
     <application
         android:allowBackup="true"

diff --git a/android/apps/AutoTesterAndroid/app/src/main/assets/maki icons b/android/apps/AutoTesterAndroid/app/src/main/assets/maki icons
@@ -0,0 +1 @@
+../../../../../../../resources/maki icons